diff --git a/.agents/skills/ai-chat/SKILL.md b/.agents/skills/ai-chat/SKILL.md
new file mode 100644
index 0000000000..f670b2ffb7
--- /dev/null
+++ b/.agents/skills/ai-chat/SKILL.md
@@ -0,0 +1,40 @@
+---
+name: ai-chat
+description: Guidance for improving the Windmill AI chat (copilot), especially global mode — tools, prompts, and context-window discipline. Use when editing chat tools, system prompts, or tool-result shapes under frontend/src/lib/components/copilot/chat, or when changing how the chat manages its context window.
+---
+
+## Always benchmark before and after
+
+No context or behavior change ships without an `ai_evals` A/B on the affected mode.
+Add or adjust cases for exactly what you changed — see the `ai-evals` skill for
+authoring and the full run reference.
+
+Run the affected mode **before** your change and **after**, same model(s), same cases.
+
+## Measure the window first, and cumulative second
+
+Optimize **`finalContextTokens`** (window occupancy — what drives overflow and
+compaction), then cumulative prompt tokens.
+
+## Context discipline
+
+The dominant fixed cost is per-iteration overhead: the system prompt **plus every
+tool schema** is re-sent on every loop iteration. So:
+
+- **Every tool and every parameter is a permanent tax.** Justify each one and measure
+  it; an extra "locate" round-trip can cost more than the reads it saves. Strip dead
+  params rather than leaving them in the schema.
+- **Tool results return the minimum.** Never echo content the model already has. The
+  canonical mistake: a write tool that returns the whole edited artifact right after
+  the model authored it — return `{ success, message }` instead. When you touch a
+  *shared* write helper (e.g. `finishAppDraftWrite` in `global/core.ts`), re-check
+  this invariant for **all** the write tools routing through it — the echo has
+  regressed before via a shared refactor.
+
+## Prompts and tool descriptions are part of the surface
+
+The system prompt and tool descriptions steer behavior as much as the tools
+themselves, and are benchmarkable the same way. A description that advertises
+truncation makes the model self-limit; the path-conventions block changes where
+drafts land. Treat prompt/description edits as real changes and A/B them — a
+pure-prompt change is a legitimate, measurable improvement.
\ No newline at end of file
diff --git a/.agents/skills/ai-evals/SKILL.md b/.agents/skills/ai-evals/SKILL.md
new file mode 100644
index 0000000000..ad334e2c6b
--- /dev/null
+++ b/.agents/skills/ai-evals/SKILL.md
@@ -0,0 +1,87 @@
+---
+name: ai-evals
+description: Author and run black-box benchmark cases for the Windmill AI generation modes (flow/app/script/cli/global) in ai_evals/. Use when adding or changing eval cases, or when running before/after benchmarks for AI chat / copilot changes.
+---
+
+# AI evals — authoring and running benchmark cases
+
+`ai_evals/` is a black-box benchmark runner for the Windmill AI generation modes:
+`flow`, `app`, `script`, `cli`, `global`. It always tests the **current** production
+prompts, tools, and guidance in this checkout. Each attempt runs the real production
+path, deterministic validation, then LLM judging.
+
+The goal is to test current production guidance with realistic user requests — **not**
+to pin one exact implementation shape.
+
+## Running benchmarks
+
+```bash
+cd ai_evals
+bun install                       # first time; frontend modes also need `cd frontend && bun install`
+bun run cli -- models             # list model aliases
+bun run cli -- cases global       # list cases for a mode
+bun run cli -- run global global-test1-script-create --model sonnet
+```
+
+Frontend modes (`flow`/`script`/`app`/`global`) route model calls through a Windmill
+backend's `/api/w/<ws>/ai/proxy`, so you need **any** reachable backend:
+
+```bash
+WMILL_AI_EVAL_BACKEND_URL=http://127.0.0.1:<port> WMILL_AI_EVAL_BACKEND_WORKSPACE=integration-tests \
+  bun run cli -- run global <caseIds...> --models sonnet,gpt-5.5,gemini-3.1-pro-preview
+```
+
+- **Reuse an existing workspace.** CE builds cap workspaces, so temp-workspace
+  creation 400s ("reached workspace limit"). Always set
+  `WMILL_AI_EVAL_BACKEND_WORKSPACE=integration-tests` (or any existing workspace) to
+  reuse one. The only side effect of a run is upserting an `f/evals/ai/<provider>`
+  resource there.
+- Provider keys live in `ai_evals/.env` and are auto-loaded by bun. The judge is a
+  separate Anthropic call (default `claude-sonnet-4-6`) regardless of the model under
+  test.
+
+## Authoring core rules
+
+1. Write prompts like a real user request.
+2. Prefer behavior, inputs, constraints, and outcomes over internal implementation.
+3. Keep deterministic validation narrow and hard.
+4. Put semantic expectations in `judgeChecklist`.
+5. Use `expected` fixtures only when exact structure really matters.
+
+### Prompt writing
+
+Prompts should sound like something a user would naturally ask. Do not write prompts
+as if the user knows Windmill internals unless the case explicitly tests a power-user
+workflow.
+
+Good:
+- "Create a flow that routes support requests based on customer tier."
+- "Add a reset button that sets the counter back to 0."
+- "Create a flow that reuses the existing greeting script instead of duplicating the logic."
+
+Bad:
+- "Use `branchone` with 3 branches and a default branch."
+- "Create a `rawscript` step with this exact topology."
+- "This is a benchmark harness."
+
+### Deterministic validation
+
+Use deterministic checks only for hard failures: missing required files; unexpected
+extra files when the prompt says not to create them; syntax errors; unresolved flow
+refs; missing required special modules or suspend config; obvious corruption.
+
+Do **not** encode one preferred implementation. Bad hard checks: exact step topology
+for a creation flow; exact branch structure when the prompt only asked for routing;
+exact input shape when multiple reasonable shapes are acceptable.
+
+### Judge checklist
+
+Every non-trivial case should have a `judgeChecklist` capturing user-visible behavior
+that must be present, important constraints, and key completion criteria — not
+low-level implementation details unless truly required.
+
+Good: "the flow calculates the order total with 8% tax"; "the flow reuses the existing
+workspace script instead of rewriting the logic". Bad: "uses `branchone`"; "contains a
+`rawscript` node".
+
+See `ai_evals/README.md` for the full case format, fields, and fixture details.
\ No newline at end of file
diff --git a/.claude/skills/ai-chat/SKILL.md b/.claude/skills/ai-chat/SKILL.md
new file mode 120000
index 0000000000..f8c527f3c9
--- /dev/null
+++ b/.claude/skills/ai-chat/SKILL.md
@@ -0,0 +1 @@
+../../../.agents/skills/ai-chat/SKILL.md
\ No newline at end of file
diff --git a/.claude/skills/ai-evals/SKILL.md b/.claude/skills/ai-evals/SKILL.md
new file mode 120000
index 0000000000..8b714cb50d
--- /dev/null
+++ b/.claude/skills/ai-evals/SKILL.md
@@ -0,0 +1 @@
+../../../.agents/skills/ai-evals/SKILL.md
\ No newline at end of file
diff --git a/.github/DockerfileBackendTests b/.github/DockerfileBackendTests
index 88275f204b..9b29f72a64 100644
--- a/.github/DockerfileBackendTests
+++ b/.github/DockerfileBackendTests
@@ -28,7 +28,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
 # UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.9.25/uv-installer.sh | sh && mv /usr/local/cargo/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.11.24/uv-installer.sh | sh && mv /usr/local/cargo/bin/uv /usr/local/bin/uv
 
 ENV TZ=Etc/UTC
 
diff --git a/.github/scripts/check-docs-links.mjs b/.github/scripts/check-docs-links.mjs
new file mode 100644
index 0000000000..122d098197
--- /dev/null
+++ b/.github/scripts/check-docs-links.mjs
@@ -0,0 +1,126 @@
+// Extracts every windmill.dev/docs link referenced in the frontend source and
+// verifies none of them 404. Run: `node .github/scripts/check-docs-links.mjs`.
+// Used by the check-docs-links GitHub workflow (release / manual trigger only).
+
+import { readdir, readFile } from 'node:fs/promises'
+import { join, extname } from 'node:path'
+
+const ROOT = 'frontend/src'
+const EXTS = new Set(['.ts', '.js', '.svelte', '.mjs', '.cjs'])
+const DOCS_RE = /https?:\/\/(?:www\.)?windmill\.dev\/docs\/[^\s"'`)>\]}]*/g
+// `const someBaseUrl = 'https://www.windmill.dev/docs/...'` used later as `${someBaseUrl}/foo`
+const BASE_RE = /(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*['"`](https?:\/\/(?:www\.)?windmill\.dev\/docs\/[^'"`]+)['"`]/g
+
+const CONCURRENCY = 24
+const TIMEOUT_MS = 20000
+const RETRIES = 2
+
+async function walk(dir) {
+	const out = []
+	for (const entry of await readdir(dir, { withFileTypes: true })) {
+		const p = join(dir, entry.name)
+		if (entry.isDirectory()) {
+			if (entry.name === 'node_modules' || entry.name === '.svelte-kit') continue
+			out.push(...(await walk(p)))
+		} else if (EXTS.has(extname(entry.name))) {
+			out.push(p)
+		}
+	}
+	return out
+}
+
+// url (no fragment) -> Set of source files it appears in
+const urls = new Map()
+const unresolved = []
+
+function record(url, file) {
+	const clean = url
+		.replace(/\\.*$/, '') // cut at an escape sequence embedded in a string literal (e.g. \n)
+		.replace(/#.*$/, '') // drop anchor fragment — irrelevant to a 404 check
+		.replace(/[.,;:'")\]]+$/, '')
+	if (!clean) return
+	// A `{`/`${` means the URL is built from an unresolved template/interpolation var.
+	if (clean.includes('{')) {
+		unresolved.push(`${clean}  (${file})`)
+		return
+	}
+	if (!urls.has(clean)) urls.set(clean, new Set())
+	urls.get(clean).add(file)
+}
+
+for (const file of await walk(ROOT)) {
+	let content = await readFile(file, 'utf8')
+	// Inline file-local base-url constants so `${base}/page` template literals resolve.
+	const bases = []
+	for (const m of content.matchAll(BASE_RE)) bases.push({ name: m[1], value: m[2], decl: m[0] })
+	for (const { name, value } of bases) {
+		content = content.replaceAll('${' + name + '}', value)
+	}
+	// Blank each base declaration so a prefix-only base (no index page of its own,
+	// e.g. .../app_configuration_settings) isn't checked as a standalone link.
+	// A genuinely bare `${base}` usage was already inlined above, so it's still covered.
+	for (const { decl } of bases) content = content.replace(decl, '')
+	for (const m of content.matchAll(DOCS_RE)) record(m[0], file)
+}
+
+const allUrls = [...urls.keys()].sort()
+console.log(`Found ${allUrls.length} distinct docs links across ${ROOT}`)
+if (unresolved.length) {
+	console.log(`\n⚠️  ${unresolved.length} link(s) built from an unrecognized base URL — skipped (register the base const so they can be checked):`)
+	for (const u of [...new Set(unresolved)].sort()) console.log(`   ${u}`)
+}
+
+async function check(url) {
+	for (let attempt = 0; attempt <= RETRIES; attempt++) {
+		const ctrl = new AbortController()
+		const timer = setTimeout(() => ctrl.abort(), TIMEOUT_MS)
+		try {
+			let res = await fetch(url, {
+				method: 'HEAD',
+				redirect: 'follow',
+				signal: ctrl.signal,
+				headers: { 'user-agent': 'windmill-docs-link-check' }
+			})
+			// Some hosts reject HEAD — fall back to GET.
+			if (res.status === 405 || res.status === 501) {
+				res = await fetch(url, {
+					method: 'GET',
+					redirect: 'follow',
+					signal: ctrl.signal,
+					headers: { 'user-agent': 'windmill-docs-link-check' }
+				})
+			}
+			clearTimeout(timer)
+			return { url, status: res.status, ok: res.status < 400 }
+		} catch (err) {
+			clearTimeout(timer)
+			if (attempt === RETRIES) return { url, status: 0, ok: false, error: String(err?.message || err) }
+			await new Promise((r) => setTimeout(r, 500 * (attempt + 1)))
+		}
+	}
+}
+
+// Simple concurrency pool.
+const results = []
+let idx = 0
+async function worker() {
+	while (idx < allUrls.length) {
+		const url = allUrls[idx++]
+		results.push(await check(url))
+	}
+}
+await Promise.all(Array.from({ length: CONCURRENCY }, worker))
+
+const failures = results.filter((r) => !r.ok)
+if (failures.length === 0) {
+	console.log(`\n✅ All ${allUrls.length} docs links are reachable.`)
+	process.exit(0)
+}
+
+console.log(`\n❌ ${failures.length} broken docs link(s):`)
+for (const f of failures.sort((a, b) => a.url.localeCompare(b.url))) {
+	console.log(`\n  ${f.url}`)
+	console.log(`    status: ${f.error ? `error (${f.error})` : f.status}`)
+	for (const file of urls.get(f.url)) console.log(`    ↳ ${file}`)
+}
+process.exit(1)
diff --git a/.github/workflows/ai-agent-tests.yml b/.github/workflows/ai-agent-tests.yml
new file mode 100644
index 0000000000..3a5c51f153
--- /dev/null
+++ b/.github/workflows/ai-agent-tests.yml
@@ -0,0 +1,132 @@
+name: AI Agent Integration Tests
+
+# Exercises the AI agent flow path (preview_flow with `aiagent` modules) against
+# real LLM providers. Runs only when AI-agent backend code or the tests change,
+# because each run makes real (paid) LLM calls. To avoid spending on every commit,
+# the PR side triggers only when a PR is marked ready for review (out of draft) —
+# not on `synchronize` — plus push to main and manual dispatch.
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+    paths:
+      - "integration_tests/ai_agent_tests/**"
+      - "backend/windmill-ai/**"
+      - "backend/windmill-api/src/ai.rs"
+      - "backend/windmill-worker/src/ai_executor.rs"
+      - "backend/windmill-worker/src/ai/**"
+      - "backend/windmill-worker/src/memory_common.rs"
+      - "backend/windmill-common/src/flow_conversations.rs"
+      - ".github/workflows/ai-agent-tests.yml"
+  pull_request:
+    types: [opened, reopened, ready_for_review]
+    paths:
+      - "integration_tests/ai_agent_tests/**"
+      - "backend/windmill-ai/**"
+      - "backend/windmill-api/src/ai.rs"
+      - "backend/windmill-worker/src/ai_executor.rs"
+      - "backend/windmill-worker/src/ai/**"
+      - "backend/windmill-worker/src/memory_common.rs"
+      - "backend/windmill-common/src/flow_conversations.rs"
+      - ".github/workflows/ai-agent-tests.yml"
+
+concurrency:
+  group: ai-agent-tests-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  ai_agent_e2e:
+    # Skip draft PRs; the `opened`/`reopened` types would otherwise fire while
+    # still a draft. `ready_for_review` always arrives non-draft.
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    runs-on: ubicloud-standard-16
+    services:
+      postgres:
+        image: postgres:16
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_DB: windmill
+          POSTGRES_PASSWORD: changeme
+        options: >-
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache-workspaces: backend
+          toolchain: 1.93.0
+
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: 1.3.10
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      # CE build (no enterprise/license needed for AI agents). `quickjs` powers
+      # flow input-transform JS eval; `mcp` is required by the deepwiki MCP tool
+      # test. Bun tool scripts run via the always-on worker (BUN_PATH).
+      - name: Build Windmill
+        working-directory: ./backend
+        env:
+          SQLX_OFFLINE: true
+          CARGO_BUILD_JOBS: 12
+          RUSTFLAGS: ""
+        run: cargo build --features quickjs,mcp
+
+      - name: Start Windmill
+        working-directory: ./backend
+        env:
+          DATABASE_URL: postgres://postgres:changeme@localhost:5432/windmill
+          BUN_PATH: bun
+          NODE_BIN_PATH: node
+          RUST_LOG: info
+        run: |
+          mkdir -p ../integration_tests/logs
+          ./target/debug/windmill > ../integration_tests/logs/windmill.log 2>&1 &
+          echo "Waiting for Windmill to be ready..."
+          for i in $(seq 1 60); do
+            if curl -sf http://localhost:8000/api/version > /dev/null 2>&1; then
+              echo "Windmill is ready"
+              break
+            fi
+            sleep 2
+          done
+          curl -sf http://localhost:8000/api/version > /dev/null || { echo "Windmill failed to start"; tail -50 ../integration_tests/logs/windmill.log; exit 1; }
+
+      - name: Run AI agent integration tests
+        timeout-minutes: 20
+        working-directory: ./integration_tests/ai_agent_tests
+        env:
+          WINDMILL_URL: http://localhost:8000
+          # Only the providers we have org secrets for. Other providers
+          # (Azure, Bedrock, OpenRouter) are skipped by conftest when their
+          # keys are absent — see skip_provider_without_credentials.
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          GOOGLE_AI_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+        run: |
+          python -m venv .venv
+          .venv/bin/pip install -r requirements.txt
+          # The S3/vision-attachment tests need MinIO large-file storage and
+          # image-capable provider setup; out of scope for this cost-controlled
+          # smoke. Add MinIO secrets + a storage service to enable them.
+          .venv/bin/python -m pytest -v \
+            --ignore=test_user_attachments.py \
+            --ignore=test_user_images.py \
+            --ignore=test_image_output.py
+
+      - name: Archive Windmill logs
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: ai-agent-tests-windmill-logs
+          path: integration_tests/logs
diff --git a/.github/workflows/ai-evals-test.yml b/.github/workflows/ai-evals-test.yml
new file mode 100644
index 0000000000..a255a4df94
--- /dev/null
+++ b/.github/workflows/ai-evals-test.yml
@@ -0,0 +1,166 @@
+name: AI Evals (global mode)
+
+# Smoke-tests the production global AI chat proxy/frontend execution path via
+# the ai_evals harness, one case across one cheap model per provider. Runs only
+# when the eval harness or the global chat code change, since each run makes real
+# (paid) LLM calls. The backend is built from source purely as the AI proxy the
+# harness routes model calls through; the global tools/drafts run in-process in
+# the Vitest bridge against production frontend code. To avoid spending on every
+# commit, the PR side triggers only when a PR is marked ready for review (out of
+# draft) — not on `synchronize` — plus push to main and manual dispatch.
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+    paths:
+      - "ai_evals/**"
+      - "backend/windmill-api/src/ai.rs"
+      - "backend/windmill-ai/**"
+      - "frontend/src/lib/components/copilot/**"
+      # The eval harness runs production frontend code in-process; these are the
+      # AI/draft-specific deps outside copilot/ that the global smoke exercises.
+      - "frontend/src/lib/userDraft.svelte.ts"
+      - "frontend/src/lib/userDraftDbSyncer.svelte.ts"
+      - "frontend/src/lib/infer.ts"
+      - ".github/workflows/ai-evals-test.yml"
+  pull_request:
+    types: [opened, reopened, ready_for_review]
+    paths:
+      - "ai_evals/**"
+      - "backend/windmill-api/src/ai.rs"
+      - "backend/windmill-ai/**"
+      - "frontend/src/lib/components/copilot/**"
+      # The eval harness runs production frontend code in-process; these are the
+      # AI/draft-specific deps outside copilot/ that the global smoke exercises.
+      - "frontend/src/lib/userDraft.svelte.ts"
+      - "frontend/src/lib/userDraftDbSyncer.svelte.ts"
+      - "frontend/src/lib/infer.ts"
+      - ".github/workflows/ai-evals-test.yml"
+
+concurrency:
+  group: ai-evals-test-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  ai_evals_global:
+    # Provider secrets are unavailable to forked and Dependabot PRs.
+    if: >-
+      github.event_name != 'pull_request' ||
+      (
+        github.event.pull_request.draft == false &&
+        github.event.pull_request.head.repo.full_name == github.repository &&
+        github.event.pull_request.user.login != 'dependabot[bot]'
+      )
+    runs-on: ubicloud-standard-16
+    services:
+      postgres:
+        image: postgres:16
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_DB: windmill
+          POSTGRES_PASSWORD: changeme
+        options: >-
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache-workspaces: backend
+          toolchain: 1.93.0
+
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: 1.3.10
+
+      - uses: actions/setup-node@v4
+        with:
+          # Node 22.19+ is required by the frontend's undici 8.x, which the
+          # Vitest bridge loads; Node 20 fails with markAsUncloneable.
+          node-version: "22"
+
+      # CE build used only as the AI proxy (login, workspace, provider resource,
+      # /ai/proxy). No worker execution or MCP needed — global tools/drafts run
+      # in the Vitest bridge. quickjs matches the standard CE feature set.
+      - name: Build Windmill (AI proxy)
+        working-directory: ./backend
+        env:
+          SQLX_OFFLINE: true
+          CARGO_BUILD_JOBS: 12
+          RUSTFLAGS: ""
+        run: cargo build --features quickjs
+
+      - name: Start Windmill
+        working-directory: ./backend
+        env:
+          DATABASE_URL: postgres://postgres:changeme@localhost:5432/windmill
+          RUST_LOG: info
+        run: |
+          mkdir -p ../ai_evals/logs
+          ./target/debug/windmill > ../ai_evals/logs/windmill.log 2>&1 &
+          echo "Waiting for Windmill to be ready..."
+          for i in $(seq 1 60); do
+            if curl -sf http://localhost:8000/api/version > /dev/null 2>&1; then
+              echo "Windmill is ready"
+              break
+            fi
+            sleep 2
+          done
+          curl -sf http://localhost:8000/api/version > /dev/null || { echo "Windmill failed to start"; tail -50 ../ai_evals/logs/windmill.log; exit 1; }
+
+      - name: Install frontend deps + generate client
+        working-directory: ./frontend
+        run: |
+          npm ci
+          npm run generate-backend-client
+
+      - name: Run global AI evals
+        timeout-minutes: 20
+        working-directory: ./ai_evals
+        env:
+          WMILL_AI_EVAL_BACKEND_URL: http://localhost:8000
+          WMILL_AI_EVAL_BACKEND_WORKSPACE: integration-tests
+          # Anthropic backs the haiku model. Google AI uses GEMINI_API_KEY.
+          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          GEMINI_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+          DEEPSEEK_API_KEY: ${{ secrets.DEEPSEEK_API_KEY }}
+        run: |
+          bun install
+          mkdir -p results
+          # One cheap model per provider (anthropic/openai/googleai/deepseek).
+          fail=0
+          for m in haiku 4o gemini-3-flash-preview deepseek-v4-flash; do
+            echo "::group::global-test1-script-create ($m)"
+            if ! bun run cli -- run global global-test1-script-create \
+                  --model "$m" --execution-only --output "$PWD/results/ci-$m.json"; then
+              echo "$m: harness/proxy errored"
+              fail=1
+              echo "::endgroup::"
+              continue
+            fi
+            # The CLI exits 0 when the harness records failed attempts, so gate
+            # on execution-only pass counts while ignoring model output quality.
+            if jq -e \
+              '.attemptCount > 0 and .passedAttempts == .attemptCount' \
+              "results/ci-$m.json" > /dev/null; then
+              echo "$m: OK — proxy/frontend execution completed"
+            else
+              echo "$m: FAILED proxy/frontend execution"
+              jq -c '.cases[0].attempts[0].checks' "results/ci-$m.json" || true
+              fail=1
+            fi
+            echo "::endgroup::"
+          done
+          [ "$fail" = 0 ] || { echo "ai_evals global smoke failed"; exit 1; }
+
+      - name: Archive logs and results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: ai-evals-global-logs
+          path: |
+            ai_evals/logs
+            ai_evals/results
diff --git a/.github/workflows/backend-test-windows.yml b/.github/workflows/backend-test-windows.yml
index 1c73e5d429..7065547b28 100644
--- a/.github/workflows/backend-test-windows.yml
+++ b/.github/workflows/backend-test-windows.yml
@@ -58,7 +58,9 @@ jobs:
 
       - uses: denoland/setup-deno@v2
         with:
-          deno-version: v2.x
+          # Pin to the Deno version shipped in the runtime image (Dockerfile) so CI
+          # tests what production runs, instead of floating on the latest v2.x.
+          deno-version: 2.2.1
 
       - uses: actions/setup-go@v2
         with:
@@ -74,7 +76,7 @@ jobs:
 
       - uses: astral-sh/setup-uv@v6.2.1
         with:
-          version: "0.9.25"
+          version: "0.11.24"
 
       - uses: shivammathur/setup-php@v2
         with:
diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index 8f1f15447c..0be727d4bd 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -50,7 +50,9 @@ jobs:
           dotnet-version: "9.0.x"
       - uses: denoland/setup-deno@v2
         with:
-          deno-version: v2.x
+          # Pin to the Deno version shipped in the runtime image (Dockerfile) so CI
+          # tests what production runs, instead of floating on the latest v2.x.
+          deno-version: 2.2.1
       - uses: actions/setup-go@v2
         with:
           go-version: 1.21.5
@@ -62,7 +64,7 @@ jobs:
           node-version: "20"
       - uses: astral-sh/setup-uv@v6.2.1
         with:
-          version: "0.9.25"
+          version: "0.11.24"
       - uses: shivammathur/setup-php@v2
         with:
           php-version: "8.3"
diff --git a/.github/workflows/check-docs-links.yml b/.github/workflows/check-docs-links.yml
new file mode 100644
index 0000000000..ec17c06771
--- /dev/null
+++ b/.github/workflows/check-docs-links.yml
@@ -0,0 +1,23 @@
+name: Check frontend docs links
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+jobs:
+  check-docs-links:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            frontend/src
+            .github/scripts
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+      - name: Verify docs links are not 404
+        run: node .github/scripts/check-docs-links.mjs
diff --git a/.github/workflows/check-org-membership.yml b/.github/workflows/check-org-membership.yml
deleted file mode 100644
index eb338d3188..0000000000
--- a/.github/workflows/check-org-membership.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-name: Check Organization Membership
-
-on:
-  workflow_call:
-    inputs:
-      commenter:
-        required: false
-        type: string
-        default: ''
-        description: 'The username to check. Auto-detected from the event context if not provided.'
-      organization:
-        required: false
-        type: string
-        default: 'windmill-labs'
-        description: 'The organization to check membership for'
-      trusted_bot:
-        required: false
-        type: string
-        default: 'windmill-internal-app[bot]'
-        description: 'The trusted bot username to allow'
-    secrets:
-      access_token:
-        required: true
-        description: 'The access token to use for org membership check'
-    outputs:
-      is_member:
-        description: 'Whether the user is an organization member or trusted bot'
-        value: ${{ jobs.check-membership.outputs.is_member }}
-
-jobs:
-  check-membership:
-    runs-on: ubicloud-standard-2
-    outputs:
-      is_member: ${{ steps.check-membership.outputs.is_member }}
-    steps:
-      - name: Determine commenter
-        id: determine-commenter
-        run: |
-          COMMENTER="${{ inputs.commenter }}"
-          if [[ -z "$COMMENTER" ]]; then
-            if [[ "${{ github.event_name }}" == "issue_comment" || \
-                  "${{ github.event_name }}" == "pull_request_review_comment" ]]; then
-              COMMENTER="${{ github.event.comment.user.login }}"
-            elif [[ "${{ github.event_name }}" == "pull_request_review" ]]; then
-              COMMENTER="${{ github.event.review.user.login }}"
-            else
-              COMMENTER="${{ github.event.issue.user.login }}"
-            fi
-          fi
-          echo "commenter=$COMMENTER" >> $GITHUB_OUTPUT
-
-      - name: Check organization membership
-        id: check-membership
-        env:
-          ORG_ACCESS_TOKEN: ${{ secrets.access_token }}
-          COMMENTER: ${{ steps.determine-commenter.outputs.commenter }}
-          ORG: ${{ inputs.organization }}
-          TRUSTED_BOT: ${{ inputs.trusted_bot }}
-        run: |
-          # 1. Allow the trusted bot straight away
-          if [[ "$COMMENTER" == "$TRUSTED_BOT" ]]; then
-            echo "is_member=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          # 2. Disallow other bots
-          if [[ "${COMMENTER}" =~ \[bot\]$ ]]; then
-            echo "is_member=false" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          # 3. Otherwise check if the user is a member of the organization
-          STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
-            -H "Authorization: token $ORG_ACCESS_TOKEN" \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            "https://api.github.com/orgs/$ORG/members/$COMMENTER")
-
-          if [ "$STATUS" -eq 204 ]; then
-            echo "is_member=true" >> $GITHUB_OUTPUT
-          else
-            echo "is_member=false" >> $GITHUB_OUTPUT
-          fi
\ No newline at end of file
diff --git a/.github/workflows/check-write-access.yml b/.github/workflows/check-write-access.yml
new file mode 100644
index 0000000000..5e9494e74a
--- /dev/null
+++ b/.github/workflows/check-write-access.yml
@@ -0,0 +1,66 @@
+name: Check Write Access
+
+# Authorizes a user to trigger privileged command workflows (/review, /ai, /plan,
+# /updatesqlx, ...). The webhook author_association reports PRIVATE org members as
+# CONTRIBUTOR/NONE (only public members show as MEMBER), so command jobs can't gate on
+# it alone. This mints the internal GitHub App token — which can see private members —
+# and confirms the user is a member or has write access to the repo. The app token is
+# minted fresh per run, so unlike the old ORG_ACCESS_TOKEN PAT it never expires.
+
+on:
+  workflow_call:
+    inputs:
+      username:
+        required: true
+        type: string
+        description: 'The user whose access to verify'
+      trusted_bot:
+        required: false
+        type: string
+        default: 'windmill-internal-app[bot]'
+        description: 'A bot login that is always authorized'
+    outputs:
+      authorized:
+        description: 'true if the user is the trusted bot, an org member, or has repo write access'
+        value: ${{ jobs.check.outputs.authorized }}
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    outputs:
+      authorized: ${{ steps.check.outputs.authorized }}
+    steps:
+      - name: Mint internal app token
+        id: app
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.INTERNAL_APP_ID }}
+          private-key: ${{ secrets.INTERNAL_APP_KEY }}
+          owner: ${{ github.repository_owner }}
+
+      - name: Resolve authorization
+        id: check
+        env:
+          GH_TOKEN: ${{ steps.app.outputs.token }}
+          USERNAME: ${{ inputs.username }}
+          TRUSTED_BOT: ${{ inputs.trusted_bot }}
+          REPO: ${{ github.repository }}
+        run: |
+          if [ "$USERNAME" = "$TRUSTED_BOT" ]; then
+            echo "authorized=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          ORG="${REPO%%/*}"
+          # Org membership resolves private members too (204 = member, 404 = not).
+          if gh api "orgs/$ORG/members/$USERNAME" --silent 2>/dev/null; then
+            echo "authorized=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          # Fallback: effective repo permission (also covers outside collaborators).
+          PERM=$(gh api "repos/$REPO/collaborators/$USERNAME/permission" --jq '.permission' 2>/dev/null || echo none)
+          if [ "$PERM" = "admin" ] || [ "$PERM" = "write" ]; then
+            echo "authorized=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "authorized=false" >> "$GITHUB_OUTPUT"
+            echo "$USERNAME is neither the trusted bot, an org member, nor a repo writer."
+          fi
diff --git a/.github/workflows/claude-plan.yml b/.github/workflows/claude-plan.yml
index c63e3fe1aa..ef25554f83 100644
--- a/.github/workflows/claude-plan.yml
+++ b/.github/workflows/claude-plan.yml
@@ -11,20 +11,24 @@ on:
     types: [submitted]
 
 jobs:
-  check-membership:
+  # author_association misses private org members; check-access resolves them via the
+  # internal app token. Both are OR'd below so public members still pass instantly.
+  check-access:
     if: |
       (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/plan')) ||
       (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '/plan')) ||
       (github.event_name == 'pull_request_review' && contains(github.event.review.body, '/plan')) ||
       (github.event_name == 'issues' && contains(github.event.issue.body, '/plan'))
-    uses: ./.github/workflows/check-org-membership.yml
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
+    uses: ./.github/workflows/check-write-access.yml
+    with:
+      username: ${{ github.event.comment.user.login || github.event.review.user.login || github.event.issue.user.login }}
+    secrets: inherit
 
   claude-plan-action:
-    needs: check-membership
+    needs: [check-access]
     if: |
-      needs.check-membership.outputs.is_member == 'true'
+      needs.check-access.outputs.authorized == 'true' ||
+      contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association || github.event.review.author_association || github.event.issue.author_association)
     runs-on: ubicloud-standard-4
     timeout-minutes: 20
     permissions:
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 0d9df9f0ac..115115dac6 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -11,20 +11,24 @@ on:
     types: [submitted]
 
 jobs:
-  check-membership:
+  # author_association misses private org members; check-access resolves them via the
+  # internal app token. Both are OR'd below so public members still pass instantly.
+  check-access:
     if: |
       (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '/ai') && !startsWith(github.event.comment.body, '/ai-fast')) ||
       (github.event_name == 'pull_request_review_comment' && startsWith(github.event.comment.body, '/ai') && !startsWith(github.event.comment.body, '/ai-fast')) ||
       (github.event_name == 'pull_request_review' && startsWith(github.event.review.body, '/ai') && !startsWith(github.event.review.body, '/ai-fast')) ||
       (github.event_name == 'issues' && startsWith(github.event.issue.body, '/ai') && !startsWith(github.event.issue.body, '/ai-fast'))
-    uses: ./.github/workflows/check-org-membership.yml
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
+    uses: ./.github/workflows/check-write-access.yml
+    with:
+      username: ${{ github.event.comment.user.login || github.event.review.user.login || github.event.issue.user.login }}
+    secrets: inherit
 
   claude-code-action:
-    needs: check-membership
+    needs: [check-access]
     if: |
-      needs.check-membership.outputs.is_member == 'true'
+      needs.check-access.outputs.authorized == 'true' ||
+      contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association || github.event.review.author_association || github.event.issue.author_association)
     runs-on: ubicloud-standard-8
     permissions:
       contents: write
@@ -37,6 +41,44 @@ jobs:
         with:
           fetch-depth: 1
 
+      # Make the EE source (the *_ee.rs files in the companion repo) available so the
+      # reviewer can see EE-only code (e.g. windmill-queue/src/jobs_ee.rs), not just the
+      # CE surface. The EE ref is read from the PR head's backend/ee-repo-ref.txt (via the
+      # API, so it reflects the PR's EE pin regardless of which ref is checked out here).
+      - name: Check EE access
+        id: ee
+        env:
+          EE_TOKEN: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
+        run: |
+          if [ -z "$EE_TOKEN" ] || [ -z "$PR_NUMBER" ]; then
+            echo "available=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          HEAD_SHA=$(gh api "repos/${{ github.repository }}/pulls/$PR_NUMBER" --jq .head.sha)
+          REF=$(gh api "repos/${{ github.repository }}/contents/backend/ee-repo-ref.txt?ref=$HEAD_SHA" --jq .content | base64 -d | tr -d '[:space:]')
+          if [ -z "$REF" ]; then
+            echo "available=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "available=true" >> "$GITHUB_OUTPUT"
+            echo "ee_repo_ref=$REF" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Checkout EE repository
+        if: steps.ee.outputs.available == 'true'
+        uses: actions/checkout@v4
+        with:
+          repository: windmill-labs/windmill-ee-private
+          path: ./windmill-ee-private
+          ref: ${{ steps.ee.outputs.ee_repo_ref }}
+          token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
+          fetch-depth: 1
+
+      - name: Substitute EE code
+        if: steps.ee.outputs.available == 'true'
+        run: ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private
+
       - name: Run Claude PR Action
         uses: anthropics/claude-code-action@v1
         with:
diff --git a/.github/workflows/codex-pr-review.yml b/.github/workflows/codex-pr-review.yml
index 66cc4b5f10..ea622914bc 100644
--- a/.github/workflows/codex-pr-review.yml
+++ b/.github/workflows/codex-pr-review.yml
@@ -32,27 +32,19 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check-membership:
-    if: github.event_name == 'pull_request'
-    uses: ./.github/workflows/check-org-membership.yml
-    with:
-      commenter: ${{ github.event.pull_request.user.login }}
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
-
   codex-review:
-    needs: check-membership
     runs-on: ubicloud-standard-2
     timeout-minutes: 30
+    # A non-fork PR (head.repo.fork == false) can only be opened by someone with push
+    # access to this repo, so fork==false already enforces write access. Do NOT re-add
+    # an author_association gate: the pull_request webhook payload reports private org
+    # members as CONTRIBUTOR/NONE (only public members show as MEMBER), which silently
+    # skips auto-review for every private member.
     if: |
-      always() &&
+      github.event_name == 'workflow_call' ||
       (
-        needs.check-membership.result == 'skipped' ||
-        (needs.check-membership.result == 'success' && needs.check-membership.outputs.is_member == 'true')
-      ) &&
-      (
-        github.event_name == 'workflow_call' ||
-        (github.event.pull_request.draft == false && github.event.pull_request.head.repo.fork == false)
+        github.event.pull_request.draft == false &&
+        github.event.pull_request.head.repo.fork == false
       )
     permissions:
       contents: read
diff --git a/.github/workflows/git-commands.yaml b/.github/workflows/git-commands.yaml
index f1cc380563..3443b7e649 100644
--- a/.github/workflows/git-commands.yaml
+++ b/.github/workflows/git-commands.yaml
@@ -5,21 +5,22 @@ on:
     types: [created]
 
 jobs:
-  check-membership:
-    if: >-
-      github.event.issue.pull_request && (
-        startsWith(github.event.comment.body, '/updatesqlx') ||
-        startsWith(github.event.comment.body, '/demo') ||
-        startsWith(github.event.comment.body, '/eeref') ||
-        startsWith(github.event.comment.body, '/docs')
-      )
-    uses: ./.github/workflows/check-org-membership.yml
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
+  # /command comments can come from anyone; author_association misses private org
+  # members, so check-access resolves them via the internal app token. Runs once and is
+  # OR'd into each job's guard (public members still pass on author_association alone).
+  check-access:
+    if: github.event.issue.pull_request != null && startsWith(github.event.comment.body, '/')
+    uses: ./.github/workflows/check-write-access.yml
+    with:
+      username: ${{ github.event.comment.user.login }}
+    secrets: inherit
 
   update-sqlx:
-    needs: check-membership
-    if: needs.check-membership.outputs.is_member == 'true' && startsWith(github.event.comment.body, '/updatesqlx')
+    needs: [check-access]
+    if: >-
+      github.event.issue.pull_request &&
+      (contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) || needs.check-access.outputs.authorized == 'true') &&
+      startsWith(github.event.comment.body, '/updatesqlx')
     runs-on: ubicloud-standard-8
     permissions:
       contents: write
@@ -147,8 +148,11 @@ jobs:
             })
 
   demo:
-    needs: check-membership
-    if: needs.check-membership.outputs.is_member == 'true' && startsWith(github.event.comment.body, '/demo')
+    needs: [check-access]
+    if: >-
+      github.event.issue.pull_request &&
+      (contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) || needs.check-access.outputs.authorized == 'true') &&
+      startsWith(github.event.comment.body, '/demo')
     runs-on: ubicloud-standard-2
     permissions:
       contents: read
@@ -227,8 +231,11 @@ jobs:
           fi
 
   update-ee-ref:
-    needs: check-membership
-    if: needs.check-membership.outputs.is_member == 'true' && startsWith(github.event.comment.body, '/eeref')
+    needs: [check-access]
+    if: >-
+      github.event.issue.pull_request &&
+      (contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) || needs.check-access.outputs.authorized == 'true') &&
+      startsWith(github.event.comment.body, '/eeref')
     runs-on: ubicloud-standard-2
     permissions:
       contents: write
@@ -313,8 +320,11 @@ jobs:
             })
 
   update-docs:
-    needs: check-membership
-    if: needs.check-membership.outputs.is_member == 'true' && startsWith(github.event.comment.body, '/docs')
+    needs: [check-access]
+    if: >-
+      github.event.issue.pull_request &&
+      (contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) || needs.check-access.outputs.authorized == 'true') &&
+      startsWith(github.event.comment.body, '/docs')
     runs-on: ubicloud-standard-2
     permissions:
       contents: read
diff --git a/.github/workflows/pi-pr-review.yml b/.github/workflows/pi-pr-review.yml
index 9fbe43e9f0..72553b0d83 100644
--- a/.github/workflows/pi-pr-review.yml
+++ b/.github/workflows/pi-pr-review.yml
@@ -30,27 +30,19 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check-membership:
-    if: github.event_name == 'pull_request'
-    uses: ./.github/workflows/check-org-membership.yml
-    with:
-      commenter: ${{ github.event.pull_request.user.login }}
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
-
   pi-review:
-    needs: check-membership
     runs-on: ubicloud-standard-2
     timeout-minutes: 30
+    # A non-fork PR (head.repo.fork == false) can only be opened by someone with push
+    # access to this repo, so fork==false already enforces write access. Do NOT re-add
+    # an author_association gate: the pull_request webhook payload reports private org
+    # members as CONTRIBUTOR/NONE (only public members show as MEMBER), which silently
+    # skips auto-review for every private member.
     if: |
-      always() &&
+      github.event_name == 'workflow_call' ||
       (
-        needs.check-membership.result == 'skipped' ||
-        (needs.check-membership.result == 'success' && needs.check-membership.outputs.is_member == 'true')
-      ) &&
-      (
-        github.event_name == 'workflow_call' ||
-        (github.event.pull_request.draft == false && github.event.pull_request.head.repo.fork == false)
+        github.event.pull_request.draft == false &&
+        github.event.pull_request.head.repo.fork == false
       )
     permissions:
       contents: read
diff --git a/.github/workflows/pr-ready-review.yml b/.github/workflows/pr-ready-review.yml
index 4d722df4af..eb634977d1 100644
--- a/.github/workflows/pr-ready-review.yml
+++ b/.github/workflows/pr-ready-review.yml
@@ -30,26 +30,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check-membership:
-    if: github.event_name == 'pull_request'
-    uses: ./.github/workflows/check-org-membership.yml
-    with:
-      commenter: ${{ github.event.pull_request.user.login }}
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
-
   auto-review:
-    needs: check-membership
     runs-on: ubuntu-latest
+    # A non-fork PR (head.repo.fork == false) can only be opened by someone with push
+    # access to this repo, so fork==false already enforces write access. Do NOT re-add
+    # an author_association gate: the pull_request webhook payload reports private org
+    # members as CONTRIBUTOR/NONE (only public members show as MEMBER), which silently
+    # skips auto-review for every private member.
     if: |
-      always() &&
+      github.event_name == 'workflow_call' ||
       (
-        needs.check-membership.result == 'skipped' ||
-        (needs.check-membership.result == 'success' && needs.check-membership.outputs.is_member == 'true')
-      ) &&
-      (
-        github.event_name == 'workflow_call' ||
-        (github.event.pull_request.draft == false || github.event.pull_request.ready_for_review == true)
+        (github.event.pull_request.draft == false || github.event.pull_request.ready_for_review == true) &&
+        github.event.pull_request.head.repo.fork == false
       )
     permissions:
       contents: read
diff --git a/.github/workflows/pr-review-commands.yml b/.github/workflows/pr-review-commands.yml
index ba55bfea2f..ef93274d7e 100644
--- a/.github/workflows/pr-review-commands.yml
+++ b/.github/workflows/pr-review-commands.yml
@@ -42,16 +42,24 @@ jobs:
               ;;
           esac
 
-  check-membership:
-    needs: parse
+  # author_association misses private org members; check-access resolves them via the
+  # internal app token. Both are OR'd so public members still pass instantly.
+  check-access:
+    needs: [parse]
     if: needs.parse.outputs.command != ''
-    uses: ./.github/workflows/check-org-membership.yml
-    secrets:
-      access_token: ${{ secrets.ORG_ACCESS_TOKEN }}
+    uses: ./.github/workflows/check-write-access.yml
+    with:
+      username: ${{ github.event.comment.user.login }}
+    secrets: inherit
 
   acknowledge:
-    needs: [parse, check-membership]
-    if: needs.parse.outputs.command != '' && needs.check-membership.outputs.is_member == 'true'
+    needs: [parse, check-access]
+    if: |
+      needs.parse.outputs.command != '' &&
+      (
+        contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) ||
+        needs.check-access.outputs.authorized == 'true'
+      )
     runs-on: ubuntu-latest
     permissions:
       issues: write
@@ -68,9 +76,12 @@ jobs:
             -f content=eyes >/dev/null
 
   claude:
-    needs: [parse, check-membership]
+    needs: [parse, check-access]
     if: |
-      needs.check-membership.outputs.is_member == 'true' &&
+      (
+        contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) ||
+        needs.check-access.outputs.authorized == 'true'
+      ) &&
       (needs.parse.outputs.command == 'review' || needs.parse.outputs.command == 'claude')
     permissions:
       contents: read
@@ -86,9 +97,12 @@ jobs:
       WINDMILL_EE_PRIVATE_ACCESS: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
 
   codex:
-    needs: [parse, check-membership]
+    needs: [parse, check-access]
     if: |
-      needs.check-membership.outputs.is_member == 'true' &&
+      (
+        contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) ||
+        needs.check-access.outputs.authorized == 'true'
+      ) &&
       (needs.parse.outputs.command == 'review' || needs.parse.outputs.command == 'codex')
     permissions:
       contents: read
@@ -105,9 +119,12 @@ jobs:
       WINDMILL_EE_PRIVATE_ACCESS: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
 
   pi:
-    needs: [parse, check-membership]
+    needs: [parse, check-access]
     if: |
-      needs.check-membership.outputs.is_member == 'true' &&
+      (
+        contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association) ||
+        needs.check-access.outputs.authorized == 'true'
+      ) &&
       (needs.parse.outputs.command == 'review' || needs.parse.outputs.command == 'pi')
     permissions:
       contents: read
diff --git a/.github/workflows/refresh-docs-snapshot.yml b/.github/workflows/refresh-docs-snapshot.yml
new file mode 100644
index 0000000000..a000f44df8
--- /dev/null
+++ b/.github/workflows/refresh-docs-snapshot.yml
@@ -0,0 +1,52 @@
+name: Refresh docs snapshot
+
+# The backend embeds a vendored docs snapshot (backend/windmill-api/docs_snapshot/*.gz)
+# so in-product docs search works with no runtime egress. This job re-fetches it from
+# windmill.dev on a schedule and opens a PR when it changed, keeping the embedded docs
+# fresh independently of the release cadence (the binary embeds whatever is on the
+# source tree at build time, so a merged refresh rides into the next release build).
+on:
+  schedule:
+    - cron: "0 6 * * 1" # Mondays 06:00 UTC
+  workflow_dispatch:
+
+jobs:
+  refresh:
+    runs-on: ubicloud
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/create-github-app-token@v2
+        id: app
+        with:
+          app-id: ${{ vars.INTERNAL_APP_ID }}
+          private-key: ${{ secrets.INTERNAL_APP_KEY }}
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app.outputs.token }}
+      - name: Fetch + re-gzip docs snapshot
+        run: cd backend/windmill-api/docs_snapshot && ./fetch.sh
+      - name: Sanity-check the fetched corpus
+        # curl -f in fetch.sh rejects HTTP errors, but not a valid-but-garbage 200
+        # (truncated file, error page). Guard against embedding a broken snapshot.
+        run: |
+          cd backend/windmill-api/docs_snapshot
+          test "$(wc -c < llms-full.txt.gz)" -gt 100000
+          test "$(wc -c < llms.txt.gz)" -gt 1000
+          pages=$(gzip -dc llms-full.txt.gz | grep -c '^Source:' || true)
+          echo "pages in snapshot: $pages"
+          test "${pages:-0}" -ge 200
+      - uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ steps.app.outputs.token }}
+          branch: chore/refresh-docs-snapshot
+          add-paths: backend/windmill-api/docs_snapshot/*.gz
+          commit-message: "chore: refresh vendored docs snapshot"
+          title: "chore: refresh vendored docs snapshot"
+          body: |
+            Automated refresh of the embedded docs snapshot
+            (`backend/windmill-api/docs_snapshot/*.gz`) from windmill.dev.
+
+            Review the diff for unexpected churn (a bad upstream docs deploy would
+            show up as a large drop in pages or content) before merging.
diff --git a/AGENTS.md b/AGENTS.md
index aead237e59..83b68f7d36 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -24,6 +24,8 @@ Open-source platform for internal tools, workflows, API integrations, background
 ## Dev Environment
 
 - **Backend**: `cargo run` from `backend/` (API at http://localhost:8000)
+- **DuckDB local jobs**: before running DuckDB scripts locally, build the FFI shared library with `cd backend/windmill-duckdb-ffi-internal && ./build_dev.sh`. Re-run it after clean builds or when `backend/target/debug/libwindmill_duckdb_ffi_internal.*` is missing. The bundled DuckDB compile (~2min) is cached in a per-user dir shared across worktrees, so a fresh worktree reuses it and the build is near-instant.
+- **Data pipelines (DuckLake) from source**: a plain `cargo run` (even `--features quickjs`) advertises a `duckdb` worker tag but **cannot** execute DuckDB scripts and has **no** working S3 proxy (DuckLake writes 404). Build CE DuckLake with `cargo run --features quickjs,duckdb,parquet,private` (add `,python` for Python scripts, `,enterprise,license` for EE) **and** build the FFI (bullet above). See `backend/CLAUDE.md` → "Running data pipelines (DuckLake) from source" for the exact feature sets and the two feature-gate gotchas.
 - **Frontend**: `REMOTE=http://localhost:8000 npm run dev` from `frontend/` (port 3000+)
 - **DB**: `psql postgres://postgres:changeme@localhost:5432/windmill`
 - **Login**: `admin@windmill.dev` / `changeme`
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0bc5876af..5c7cea1e37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,436 @@
 # Changelog
 
+## [1.753.0](https://github.com/windmill-labs/windmill/compare/v1.752.0...v1.753.0) (2026-07-08)
+
+
+### Features
+
+* AI chat background jobs tray with detach, approval and preview ([#9982](https://github.com/windmill-labs/windmill/issues/9982)) ([286da00](https://github.com/windmill-labs/windmill/commit/286da005ef2faad1d193640f74f8e96999358707))
+* condensed top bar for session preview editors ([#10011](https://github.com/windmill-labs/windmill/issues/10011)) ([b847ca2](https://github.com/windmill-labs/windmill/commit/b847ca2bc7f06f494aa802d4350d6f032ba2bb58))
+* **db-health:** add connection sizing guidance ([#10014](https://github.com/windmill-labs/windmill/issues/10014)) ([f28ea9c](https://github.com/windmill-labs/windmill/commit/f28ea9cb991bbda32ed1b7a37a5f1b3552a589a8))
+* **sessions:** scoped preview refresh + multi-target live editors + pipeline preview ([#10006](https://github.com/windmill-labs/windmill/issues/10006)) ([32c398f](https://github.com/windmill-labs/windmill/commit/32c398f27de8cd5b1478ef60d247c13705b6b50f))
+* shared tab system, universal markdown code blocks, subtle scrollbars ([#10003](https://github.com/windmill-labs/windmill/issues/10003)) ([a00ee51](https://github.com/windmill-labs/windmill/commit/a00ee5196b2c013e9672ab029f5477079ac5da21))
+
+
+### Bug Fixes
+
+* bump bundled Go CLIs to patched versions to clear image CVEs ([#9996](https://github.com/windmill-labs/windmill/issues/9996)) ([d467161](https://github.com/windmill-labs/windmill/commit/d467161117444d7d9b18def627e90d9622512e02))
+* name the offending item when a fork fails on a NUL escape ([#10013](https://github.com/windmill-labs/windmill/issues/10013)) ([99d0047](https://github.com/windmill-labs/windmill/commit/99d00475156def6faad255c4e728923253f9169f))
+* preserve worker group tag override on 'Run again' ([#10004](https://github.com/windmill-labs/windmill/issues/10004)) ([c4cb2f3](https://github.com/windmill-labs/windmill/commit/c4cb2f373b6361f0f3ce6b1c8e32a4c010207760))
+* replicate external secret backend secrets when forking a workspace ([#10007](https://github.com/windmill-labs/windmill/issues/10007)) ([f65fe7b](https://github.com/windmill-labs/windmill/commit/f65fe7bf585d353f7d88746e947d68e2f351e516))
+* session preview editors and picker dropdown overflow ([#10010](https://github.com/windmill-labs/windmill/issues/10010)) ([fb12b23](https://github.com/windmill-labs/windmill/commit/fb12b23e0169ba2cdcf454a27dcf814a2caf26b3))
+
+## [1.752.0](https://github.com/windmill-labs/windmill/compare/v1.751.0...v1.752.0) (2026-07-07)
+
+
+### Features
+
+* add fork_parent_workspace claim to OIDC tokens for fork workspaces ([#9987](https://github.com/windmill-labs/windmill/issues/9987)) ([7efeae2](https://github.com/windmill-labs/windmill/commit/7efeae26d821b10667b6e3edd220468f6ae48936))
+* add SQL migrations for data tables ([#9693](https://github.com/windmill-labs/windmill/issues/9693)) ([e47aeda](https://github.com/windmill-labs/windmill/commit/e47aedac0a4af40dd697d5fc4d54dd3c8efe9ab8))
+* **cli:** clarify fork-branch workspace auto-targeting in output ([#9988](https://github.com/windmill-labs/windmill/issues/9988)) ([88c2d0e](https://github.com/windmill-labs/windmill/commit/88c2d0e8e32c218787c01daed80ef41efc39dd11))
+* open runs/schedules pages from AI chat in session preview tabs ([#9976](https://github.com/windmill-labs/windmill/issues/9976)) ([4bb82ad](https://github.com/windmill-labs/windmill/commit/4bb82ad6cdb62eae7b69b1054714333e54558632))
+* **raw-apps:** runtime-error overlay + AI import-React instruction ([#9966](https://github.com/windmill-labs/windmill/issues/9966)) ([8df613b](https://github.com/windmill-labs/windmill/commit/8df613b4d2f88765f49cc988a894ca323c4ec4f7))
+* **sessions:** v2 unified sidebar with family/fork scoping and preview router ([#9816](https://github.com/windmill-labs/windmill/issues/9816)) ([9503190](https://github.com/windmill-labs/windmill/commit/95031903ebe223dc03b49a6bcd3e4ee67cefc4bb))
+* smooth bursty AI chat streaming with a typewriter reveal ([#9991](https://github.com/windmill-labs/windmill/issues/9991)) ([a6276b5](https://github.com/windmill-labs/windmill/commit/a6276b590082d06480434a8ea002c335ea1cfb59))
+* update base image to debian 13 (trixie) ([#9973](https://github.com/windmill-labs/windmill/issues/9973)) ([c5c1ead](https://github.com/windmill-labs/windmill/commit/c5c1eadeb18e509a98d1e787206c0438417683fc))
+
+
+### Bug Fixes
+
+* **ai-agent:** align agent_actions_success with agent_actions for mcp and websearch ([#9983](https://github.com/windmill-labs/windmill/issues/9983)) ([87f8d46](https://github.com/windmill-labs/windmill/commit/87f8d46aafffd5e88a336192c51e0c95ff2e6f18))
+* **ai:** flow writer builds approval steps as scripts, not identity ([#9985](https://github.com/windmill-labs/windmill/issues/9985)) ([6b01caa](https://github.com/windmill-labs/windmill/commit/6b01caaf26a4f0a08f643db4e22a70e27d0dc554))
+* clear old path asset usage when renaming a script ([#9979](https://github.com/windmill-labs/windmill/issues/9979)) ([927b8d0](https://github.com/windmill-labs/windmill/commit/927b8d064f693384978184992b8f8a1cd708e711))
+* **cli:** auto-derive cascade triggers in --local pipeline graph ([#9978](https://github.com/windmill-labs/windmill/issues/9978)) ([edfe7b4](https://github.com/windmill-labs/windmill/commit/edfe7b415af6670c5855b7a0b52db4c1f7781964))
+* **pipelines:** live materialize/dataset editing — stale graph, phantom drafts, stale Save-all deploys ([#9990](https://github.com/windmill-labs/windmill/issues/9990)) ([f7efb64](https://github.com/windmill-labs/windmill/commit/f7efb646bf1f2e132d1e3ff031b142383ae01c5e))
+* **sessions:** auto-rename regression + preview-panel and fork nits ([#9993](https://github.com/windmill-labs/windmill/issues/9993)) ([804178f](https://github.com/windmill-labs/windmill/commit/804178f5e1c904c3f8e35e2b660f33c78964c6eb))
+* **sessions:** scope fork session Edits to session-edited items only ([#9989](https://github.com/windmill-labs/windmill/issues/9989)) ([7046dc6](https://github.com/windmill-labs/windmill/commit/7046dc6dfb474ef49313377855bb2bd60294e25a))
+
+## [1.751.0](https://github.com/windmill-labs/windmill/compare/v1.750.0...v1.751.0) (2026-07-06)
+
+
+### Features
+
+* add cosmetic dev/staging label for dev workspaces ([#9959](https://github.com/windmill-labs/windmill/issues/9959)) ([fd8e64d](https://github.com/windmill-labs/windmill/commit/fd8e64d11fea3ffdb7858100c67cb2e9ca841ed6))
+* **auth:** add runtime NO_AUTH mode for authentication bypass ([#9962](https://github.com/windmill-labs/windmill/issues/9962)) ([91e1b08](https://github.com/windmill-labs/windmill/commit/91e1b087a206efb7189824b4184e1f3f4cda7211))
+* **frontend:** custom skills — detail modal, batch manage, shared validation ([#9847](https://github.com/windmill-labs/windmill/issues/9847)) ([2e14302](https://github.com/windmill-labs/windmill/commit/2e14302e4abbad595584806bff12548d520fcb58))
+* **pipelines:** auto-derive cascade edges from ducklake/s3 reads (+ muted-read badge) ([#9963](https://github.com/windmill-labs/windmill/issues/9963)) ([3dcd394](https://github.com/windmill-labs/windmill/commit/3dcd3949a14199b106506994ea31ca3de7e636b3))
+
+
+### Bug Fixes
+
+* **ai:** centralize Anthropic Messages API routing across completion paths ([#9960](https://github.com/windmill-labs/windmill/issues/9960)) ([cc2f638](https://github.com/windmill-labs/windmill/commit/cc2f638de6cebeffb9fee1d4835a0cfd565af86c))
+* **assets:** responsive layout for small screens ([#9961](https://github.com/windmill-labs/windmill/issues/9961)) ([45946d1](https://github.com/windmill-labs/windmill/commit/45946d1185c0bd07948d4d8454880c2801571f9d))
+* **cli:** quote non-identifier property names in resource-type namespace ([#9964](https://github.com/windmill-labs/windmill/issues/9964)) ([dc6b997](https://github.com/windmill-labs/windmill/commit/dc6b99775b550e7433fee8a159c30eaf296500c5))
+* critical alerts modal mute toggles no longer close popover or fail to save ([#9969](https://github.com/windmill-labs/windmill/issues/9969)) ([6587019](https://github.com/windmill-labs/windmill/commit/6587019d263374ee5707d258f5d8eec7e73c690d))
+* **frontend:** theme-aware code block background in prose markdown ([#9968](https://github.com/windmill-labs/windmill/issues/9968)) ([9821596](https://github.com/windmill-labs/windmill/commit/9821596251cff698958ffbfbd11fffa6a7988c6c))
+
+## [1.750.0](https://github.com/windmill-labs/windmill/compare/v1.749.0...v1.750.0) (2026-07-06)
+
+
+### Features
+
+* chat-scoped session changes bar + unified diff drawer ([#9762](https://github.com/windmill-labs/windmill/issues/9762)) ([a6c0b37](https://github.com/windmill-labs/windmill/commit/a6c0b3756be78ca3fadc7bad6bae98c0887fd538))
+* **pipelines:** require data uploads before running a pipeline ([#9953](https://github.com/windmill-labs/windmill/issues/9953)) ([a1c5b7a](https://github.com/windmill-labs/windmill/commit/a1c5b7aa3ed2841f09f4f148ded5c5b5ef10fd3d))
+* **pipelines:** wm_partition macro for grain-agnostic partition filters ([#9950](https://github.com/windmill-labs/windmill/issues/9950)) ([43044c2](https://github.com/windmill-labs/windmill/commit/43044c2e28139b1dbde6844c781a821f8de68f58))
+
+
+### Bug Fixes
+
+* **ai:** test key routes Azure Foundry Claude models via Anthropic Messages API ([#9956](https://github.com/windmill-labs/windmill/issues/9956)) ([ea19cc9](https://github.com/windmill-labs/windmill/commit/ea19cc9dc459bd259e27f7fcc29601a010c5f8f0))
+* **cli:** HD-1 test_edges + HD-2 scd2 _current write in --local pipeline graph ([#9947](https://github.com/windmill-labs/windmill/issues/9947)) ([ad6f23d](https://github.com/windmill-labs/windmill/commit/ad6f23d6bfcf1056bcb6d8c6b552114e88177328))
+* **pipelines:** make node & pipeline-level run affordances always visible ([#9948](https://github.com/windmill-labs/windmill/issues/9948)) ([6eabb96](https://github.com/windmill-labs/windmill/commit/6eabb96ae78fb966f9916f907bb693d569b04c0b))
+* read chat drafts via own-draft route so drawer-kind drafts deploy ([#9913](https://github.com/windmill-labs/windmill/issues/9913)) ([056ebdb](https://github.com/windmill-labs/windmill/commit/056ebdb03543a93094c80ca354c117236cd8d6c8))
+* resolve extensionless bun relative imports on windows loader ([#9949](https://github.com/windmill-labs/windmill/issues/9949)) ([bf96621](https://github.com/windmill-labs/windmill/commit/bf9662172ad7e0ff53d39adc338fd7886672c8f9))
+
+## [1.749.0](https://github.com/windmill-labs/windmill/compare/v1.748.0...v1.749.0) (2026-07-05)
+
+
+### Features
+
+* **pipelines:** mid-DAG selective execution (dbt `model+`) for pipeline runs ([#9945](https://github.com/windmill-labs/windmill/issues/9945)) ([2d3a773](https://github.com/windmill-labs/windmill/commit/2d3a77344104a587548f23f1b614ceffd52a5778))
+* **pipelines:** partition run-arg picker + first-run setup signpost ([#9943](https://github.com/windmill-labs/windmill/issues/9943)) ([475b072](https://github.com/windmill-labs/windmill/commit/475b072987b33d50111f5251a5f69f4245f930ae))
+* **pipelines:** self-teaching custom data_test errors + scaffold ([#9937](https://github.com/windmill-labs/windmill/issues/9937)) ([0ad174f](https://github.com/windmill-labs/windmill/commit/0ad174fa490e17eeb26280b5bdfd62956dfed9ff))
+
+
+### Bug Fixes
+
+* **cli:** macro-library parity in --local pipeline graph + read-only run --dry-run ([#9942](https://github.com/windmill-labs/windmill/issues/9942)) ([e3f4303](https://github.com/windmill-labs/windmill/commit/e3f43033cafcdb5df253aeb55ce93e599b2584d2))
+* **datatable:** self-teaching error for unresolved datatable:// references ([#9941](https://github.com/windmill-labs/windmill/issues/9941)) ([55451db](https://github.com/windmill-labs/windmill/commit/55451db009e3060c21948ece2c97e102a3c9b171))
+* **object-storage:** remove 20-file bucket-browser listing cap in CE ([#9935](https://github.com/windmill-labs/windmill/issues/9935)) ([22452ce](https://github.com/windmill-labs/windmill/commit/22452ce54034a9bea8f7d48946818fd148b938c0))
+* **pipelines:** dedup guard for keyed merge + deploy-time SCD2 validation ([#9936](https://github.com/windmill-labs/windmill/issues/9936)) ([52ce805](https://github.com/windmill-labs/windmill/commit/52ce805f619747af4f998cde7819a164c754205a))
+* **pipelines:** link SCD2 &lt;dim&gt;_current view to its producer across all graph surfaces ([#9933](https://github.com/windmill-labs/windmill/issues/9933)) ([574d3ac](https://github.com/windmill-labs/windmill/commit/574d3ac9ff5015b5d3f53040c9d4dfbfd161a076))
+* **pipelines:** order data_test relationships refs before the tested script in a cascade ([#9934](https://github.com/windmill-labs/windmill/issues/9934)) ([46be39d](https://github.com/windmill-labs/windmill/commit/46be39dfb7fbfb2b70e61819d6065b45810c41c9))
+* **pipelines:** pipeline-level run control, tables label, data-test rollback + fork badges ([#9944](https://github.com/windmill-labs/windmill/issues/9944)) ([6ae8dd3](https://github.com/windmill-labs/windmill/commit/6ae8dd37b1de930ab17344cebf7c28385c6cfdba))
+* rebuild windows bun loader main.ts filter from forward-slash cdir ([#9946](https://github.com/windmill-labs/windmill/issues/9946)) ([a582e04](https://github.com/windmill-labs/windmill/commit/a582e04bf40cf685f88bceaf88e3d24bde3d420a))
+
+## [1.748.0](https://github.com/windmill-labs/windmill/compare/v1.747.0...v1.748.0) (2026-07-05)
+
+
+### Features
+
+* **ai-agent:** support reasoning effort in AI agent workflow steps ([#9886](https://github.com/windmill-labs/windmill/issues/9886)) ([a368d49](https://github.com/windmill-labs/windmill/commit/a368d49bd8786a2dca6771f2051f1d44d1b2363d))
+* **ducklake:** scheduled lake maintenance (expiry, compaction, orphan cleanup) ([#9916](https://github.com/windmill-labs/windmill/issues/9916)) ([3352150](https://github.com/windmill-labs/windmill/commit/33521505dbc34f22b575d21fda1cc76d698a8840))
+* **pipelines:** asset freshness — fresh/stale badge (CE) + watchdog (EE) ([#9909](https://github.com/windmill-labs/windmill/issues/9909)) ([5d7fb6d](https://github.com/windmill-labs/windmill/commit/5d7fb6deca3e02e89d77e5d3856483beb8b8bfeb))
+* **pipelines:** capture violating-row samples for data tests ([#9919](https://github.com/windmill-labs/windmill/issues/9919)) ([d4b4374](https://github.com/windmill-labs/windmill/commit/d4b4374de8f8a7875b050c16d1236fcd0355812b))
+* **pipelines:** fork data environments for ducklake materialization (dev data) ([#9915](https://github.com/windmill-labs/windmill/issues/9915)) ([39eb9de](https://github.com/windmill-labs/windmill/commit/39eb9de1bce400109c130a081807e40e995ae068))
+* **pipelines:** on_schema_change write guardrails + data_test deploy validation ([#9930](https://github.com/windmill-labs/windmill/issues/9930)) ([377c02e](https://github.com/windmill-labs/windmill/commit/377c02ec47389e64b7ef5cbbae0de05df648266d))
+* **pipelines:** record upstream snapshot ids on cascade-dispatched jobs ([#9910](https://github.com/windmill-labs/windmill/issues/9910)) ([af36498](https://github.com/windmill-labs/windmill/commit/af36498432e643108308e1c03b5d986d0f0f8888))
+* **pipelines:** schema contracts — save-time consumer checks vs captured schemas ([#9917](https://github.com/windmill-labs/windmill/issues/9917)) ([42e11c6](https://github.com/windmill-labs/windmill/commit/42e11c6570b62ffaa86598438fa8ddf462c4035f))
+* **pipeline:** write-audit-publish for materialization data tests ([#9911](https://github.com/windmill-labs/windmill/issues/9911)) ([dce247c](https://github.com/windmill-labs/windmill/commit/dce247c6d2678a2c95bd728027e17ae3965638e2))
+* **sdk:** enforce s3:// URIs for string S3 params + ingestion (EL) docs ([#9912](https://github.com/windmill-labs/windmill/issues/9912)) ([5ad2de9](https://github.com/windmill-labs/windmill/commit/5ad2de91a26b312bf27124ceca16ef331621bde8))
+
+
+### Bug Fixes
+
+* **cli:** pipeline + workspace UX batch (init/bind stub, run errors, macro libs, lock-job report, upgrade errors) ([#9929](https://github.com/windmill-labs/windmill/issues/9929)) ([28a6b08](https://github.com/windmill-labs/windmill/commit/28a6b086c842105298f236baa0a61868f71a5eb1))
+* **cli:** publish all windmill-parser-wasm-* deps so local pipeline graph keeps write edges ([#9926](https://github.com/windmill-labs/windmill/issues/9926)) ([744a759](https://github.com/windmill-labs/windmill/commit/744a7597edaf3ca9a7fd2b21a34fb33457913a64))
+* **pipelines:** activity-axis label clarity + select failed node on cascade failure ([#9931](https://github.com/windmill-labs/windmill/issues/9931)) ([5769b60](https://github.com/windmill-labs/windmill/commit/5769b6036cf14b0cb424c5b3d9d878c600a5652e))
+
+## [1.747.0](https://github.com/windmill-labs/windmill/compare/v1.746.0...v1.747.0) (2026-07-03)
+
+
+### Features
+
+* **frontend:** add federatedTokenFile field to instance object storage Azure config ([#9904](https://github.com/windmill-labs/windmill/issues/9904)) ([ae85d27](https://github.com/windmill-labs/windmill/commit/ae85d274371a24c5badb6081f00deeb409123252))
+
+
+### Bug Fixes
+
+* **ai:** route Azure Foundry Claude models via Anthropic Messages API ([#9908](https://github.com/windmill-labs/windmill/issues/9908)) ([d600c7e](https://github.com/windmill-labs/windmill/commit/d600c7ecfe305533798e82e8d05e5f2f297f9b54))
+* **forks:** clone only the current raw-app bundle, via server-side copy ([#9899](https://github.com/windmill-labs/windmill/issues/9899)) ([5c521d8](https://github.com/windmill-labs/windmill/commit/5c521d808a2b5d6d6bb7cf3da17fb2addc53fdf4))
+* **kafka:** set https.ca.location=probe for OAUTHBEARER OIDC token endpoint ([#9897](https://github.com/windmill-labs/windmill/issues/9897)) ([1b6065f](https://github.com/windmill-labs/windmill/commit/1b6065fa9201fd548c4b2ef199f1009200645929))
+* prevent truncated tool call args from bricking AI chat sessions ([#9902](https://github.com/windmill-labs/windmill/issues/9902)) ([4ba17d0](https://github.com/windmill-labs/windmill/commit/4ba17d0f9cd70489f89c84f982a0c8f0062fed1a))
+* strip NUL characters from app values at save time ([#9903](https://github.com/windmill-labs/windmill/issues/9903)) ([3ec1f16](https://github.com/windmill-labs/windmill/commit/3ec1f164be9c8c6c40e003188ce593a963c65a43))
+
+## [1.746.0](https://github.com/windmill-labs/windmill/compare/v1.745.0...v1.746.0) (2026-07-02)
+
+
+### Features
+
+* **ai:** add Azure AI Foundry as a native AI provider ([#9879](https://github.com/windmill-labs/windmill/issues/9879)) ([d9b080f](https://github.com/windmill-labs/windmill/commit/d9b080f57fa0be144cefa773d39742c45b40f043))
+* **frontend:** group compare & deploy items by folder ([#9880](https://github.com/windmill-labs/windmill/issues/9880)) ([7b04820](https://github.com/windmill-labs/windmill/commit/7b04820f8ef8c7f02f79dd4239a877f667d23e6a))
+* **frontend:** pipelines index page and sql editor hint ([#9881](https://github.com/windmill-labs/windmill/issues/9881)) ([20351a6](https://github.com/windmill-labs/windmill/commit/20351a6b4c262184c5f815eeb5de007ab1eaf4a0))
+* **pipeline:** backfill a range of partitions from the asset drawer ([#9885](https://github.com/windmill-labs/windmill/issues/9885)) ([53bbb92](https://github.com/windmill-labs/windmill/commit/53bbb92953178eb6d0017818ef870f3cb2399dfd))
+* **pipelines:** workspace duckdb macro libraries (// macros / // use) ([#9890](https://github.com/windmill-labs/windmill/issues/9890)) ([84141ad](https://github.com/windmill-labs/windmill/commit/84141add1ddf35c2573e3c213366ce7c5f1f2258))
+* **s3:** replace CE 50MB upload cap with 10GiB workspace storage quota ([#9874](https://github.com/windmill-labs/windmill/issues/9874)) ([af01e90](https://github.com/windmill-labs/windmill/commit/af01e90b5c65d1b1cfacf4433f8cff7effe73768))
+* support workspace forks on cloud using parent workspace limits ([#9864](https://github.com/windmill-labs/windmill/issues/9864)) ([7c7d747](https://github.com/windmill-labs/windmill/commit/7c7d7474cc86a4052272032f281cc4d7a85db37b))
+
+
+### Bug Fixes
+
+* **duckdb:** auto-declare partition arg for `// partitioned` scripts ([#9878](https://github.com/windmill-labs/windmill/issues/9878)) ([b883adb](https://github.com/windmill-labs/windmill/commit/b883adbc0011073da592dc5b39e1b79db492c83c))
+* **frontend:** home New submenus fall back below, hugging the right edge ([#9894](https://github.com/windmill-labs/windmill/issues/9894)) ([186ac49](https://github.com/windmill-labs/windmill/commit/186ac4933b79aed57fce23ebcf3b525fcfd1c474))
+* **frontend:** show inline workspace name editor on general settings (Fixes GIT-911) ([#9892](https://github.com/windmill-labs/windmill/issues/9892)) ([a49c087](https://github.com/windmill-labs/windmill/commit/a49c0871d7ab2aaf78a7713b8a786ead937434da))
+* **frontend:** stack cron field and cron builder button on narrow screens ([#9871](https://github.com/windmill-labs/windmill/issues/9871)) ([7989795](https://github.com/windmill-labs/windmill/commit/79897950e7646b00d92a28a009174d91c705b251))
+* invalidate bun bundle cache on transitive relative-import changes ([#9891](https://github.com/windmill-labs/windmill/issues/9891)) ([d15033c](https://github.com/windmill-labs/windmill/commit/d15033cde6a474b548ebbaf18ff02223fc21f701))
+* make SMTP username and password optional in frontend validation ([#9895](https://github.com/windmill-labs/windmill/issues/9895)) ([37bb574](https://github.com/windmill-labs/windmill/commit/37bb57474e8336823bb31527f2a708ef41cd39c4))
+* **parsers:** infer py s3 assets from S3Object constructor and dict forms ([#9877](https://github.com/windmill-labs/windmill/issues/9877)) ([659642e](https://github.com/windmill-labs/windmill/commit/659642e4889361f86e8addb038cda62fc3471006))
+* pipeline dogfooding fixes — SCD2 data-test scope, --partition, s3object upload binding ([#9875](https://github.com/windmill-labs/windmill/issues/9875)) ([d65f58c](https://github.com/windmill-labs/windmill/commit/d65f58c388d88fff71cda22dfa21aecdae70c450))
+* polish pipeline graph view (layout, viewport, minimap, lineage, timestamps) ([#9883](https://github.com/windmill-labs/windmill/issues/9883)) ([b92a86b](https://github.com/windmill-labs/windmill/commit/b92a86b8b3a60b877540c3a7f0ffefe36ccbb053))
+* stale AI chat context picker after workspace item changes ([#9893](https://github.com/windmill-labs/windmill/issues/9893)) ([5af91a6](https://github.com/windmill-labs/windmill/commit/5af91a677cad88faccba702e3556fc4fb7b6e640))
+* **triggers:** retry transient websocket connect failures before disabling ([#9887](https://github.com/windmill-labs/windmill/issues/9887)) ([7894507](https://github.com/windmill-labs/windmill/commit/789450731b0a3c8dffa336f7bfc3f3de528c09fb))
+
+## [1.745.0](https://github.com/windmill-labs/windmill/compare/v1.744.0...v1.745.0) (2026-07-01)
+
+
+### Features
+
+* **forks:** partial-visibility deploy + surface hidden items ([#9868](https://github.com/windmill-labs/windmill/issues/9868)) ([20cd1a0](https://github.com/windmill-labs/windmill/commit/20cd1a02d582c0715bedacce52cc5c1e1e8d70ca))
+* **frontend:** add zoom and download to Mermaid graphs ([#9859](https://github.com/windmill-labs/windmill/issues/9859)) ([289017b](https://github.com/windmill-labs/windmill/commit/289017bcb28c049c8258b2ffd7da0ec3e6ef120b))
+* use derived username instead of email for non-member superadmins ([#9857](https://github.com/windmill-labs/windmill/issues/9857)) ([76a9523](https://github.com/windmill-labs/windmill/commit/76a95230095ca3f43c9dc9eecde0e9de6520242f))
+
+
+### Bug Fixes
+
+* **cli:** correct misleading delete-fork command description ([#9870](https://github.com/windmill-labs/windmill/issues/9870)) ([a73b14d](https://github.com/windmill-labs/windmill/commit/a73b14d902d759226d0af2f2faf9bdd6588e358c))
+* **folders:** allow dots and at-signs in folder owner validation ([#9856](https://github.com/windmill-labs/windmill/issues/9856)) ([383c705](https://github.com/windmill-labs/windmill/commit/383c70523bf81c5c07784a4379ef6b1c93ff86e5))
+* **forks:** require admin of both sides for the compare visibility guard ([#9869](https://github.com/windmill-labs/windmill/issues/9869)) ([7363d2c](https://github.com/windmill-labs/windmill/commit/7363d2c217cb04391f03b2f9958be70a9d0b5325))
+* **forks:** reset diff tally on trigger delete + guard compare visibility for admins ([#9866](https://github.com/windmill-labs/windmill/issues/9866)) ([6a6f129](https://github.com/windmill-labs/windmill/commit/6a6f12960e29c314d11ad541519c71412f42567b))
+* **jobs:** give flow dynselect a path and its worker tag, like scripts ([#9867](https://github.com/windmill-labs/windmill/issues/9867)) ([1a9debb](https://github.com/windmill-labs/windmill/commit/1a9debb689f756f38db085d1360c8fe7691ada48))
+* **offboarding:** make global reassignment per-workspace and optional ([#9863](https://github.com/windmill-labs/windmill/issues/9863)) ([3586164](https://github.com/windmill-labs/windmill/commit/35861641f807a02b5c205608fb592e20ee7cad7f))
+
+## [1.744.0](https://github.com/windmill-labs/windmill/compare/v1.743.0...v1.744.0) (2026-07-01)
+
+
+### Features
+
+* add copy-to-clipboard button to rendered Mermaid diagrams in AI chat ([#9838](https://github.com/windmill-labs/windmill/issues/9838)) ([a27e814](https://github.com/windmill-labs/windmill/commit/a27e814a03c615259381eaf684aa90d56569b0af))
+* add dev workspaces paired with a lockable prod workspace ([#9793](https://github.com/windmill-labs/windmill/issues/9793)) ([b4b0c6a](https://github.com/windmill-labs/windmill/commit/b4b0c6a93e52152251fadefe319773faf42549b2))
+* **ansible:** support repo-provided ansible.cfg in delegate_to_git_repo ([#9851](https://github.com/windmill-labs/windmill/issues/9851)) ([68bf0da](https://github.com/windmill-labs/windmill/commit/68bf0daf5815307cda6ce23214dd5159b6aa33b4))
+* **licensing:** enforce offline license seat cap ([#9845](https://github.com/windmill-labs/windmill/issues/9845)) ([83f3d7f](https://github.com/windmill-labs/windmill/commit/83f3d7f910b331c09f60cc9ff556728afa3dec07))
+* **object-store:** make GCS service account key optional for Workload Identity ([#9842](https://github.com/windmill-labs/windmill/issues/9842)) ([83ed011](https://github.com/windmill-labs/windmill/commit/83ed011e264f20ffa66a7bf933f2fe3615cf6b67))
+* **pipeline:** local development for data pipelines (CLI --local + pipeline dev preview) ([#9840](https://github.com/windmill-labs/windmill/issues/9840)) ([74f579e](https://github.com/windmill-labs/windmill/commit/74f579e6d9ef08e74460f904a4c22ed9d6a3b5b0))
+* **pipelines:** add managed SCD2 history materialize strategy ([#9850](https://github.com/windmill-labs/windmill/issues/9850)) ([5a66127](https://github.com/windmill-labs/windmill/commit/5a661279a3690e2393b9b16996f5d1a5a509259c))
+
+
+### Bug Fixes
+
+* **ai-chat:** replay anthropic turns verbatim to keep thinking valid ([#9843](https://github.com/windmill-labs/windmill/issues/9843)) ([a37a144](https://github.com/windmill-labs/windmill/commit/a37a144e81cf6b3de935688a617e9d0e1756004a))
+* grant dispatch_event table to windmill roles ([#9852](https://github.com/windmill-labs/windmill/issues/9852)) ([f05b50d](https://github.com/windmill-labs/windmill/commit/f05b50d29ac2fdbb808a97057fb92c8e425b4a2f))
+* grant workspace_diff, materialized_partition, debounce_stale_data to windmill roles ([#9853](https://github.com/windmill-labs/windmill/issues/9853)) ([293647d](https://github.com/windmill-labs/windmill/commit/293647de4c13cb8468cbd81ff1924cba90e164b4))
+* honor verify-ca/verify-full sslmode for postgres connections ([#9835](https://github.com/windmill-labs/windmill/issues/9835)) ([bf6be96](https://github.com/windmill-labs/windmill/commit/bf6be967fa8c74e1299cf63f813c1cfa34b97f3e))
+* **mcp:** stop double-escaping string query params in build_query_string ([#9855](https://github.com/windmill-labs/windmill/issues/9855)) ([1c46f89](https://github.com/windmill-labs/windmill/commit/1c46f899ca03edf62053f4f14d65b4eabff4255d))
+* **s3_proxy:** preserve URL-encoding on Hive-partition proxy writes ([#9848](https://github.com/windmill-labs/windmill/issues/9848)) ([6b79bdd](https://github.com/windmill-labs/windmill/commit/6b79bddd42fe55f891c17cb71a7e36ee31337bac))
+* validate workspace name length (max 50 chars) on create and fork ([#9854](https://github.com/windmill-labs/windmill/issues/9854)) ([b52972d](https://github.com/windmill-labs/windmill/commit/b52972d0de89004e98d18241d238ca028e4eecba))
+
+## [1.743.0](https://github.com/windmill-labs/windmill/compare/v1.742.0...v1.743.0) (2026-06-29)
+
+
+### Features
+
+* **home:** redesign create-new popover and home header ([#9827](https://github.com/windmill-labs/windmill/issues/9827)) ([2493eaf](https://github.com/windmill-labs/windmill/commit/2493eaf031f30072637a297398674e761f039005))
+* **pipeline:** AI-chat data-pipeline editor (route + in-session) + home surfacing ([#9805](https://github.com/windmill-labs/windmill/issues/9805)) ([c910278](https://github.com/windmill-labs/windmill/commit/c91027824be1f1f49cdd14148baf6aad092a1dd0))
+
+
+### Bug Fixes
+
+* **gcp:** require token verification for authenticated push delivery ([#9834](https://github.com/windmill-labs/windmill/issues/9834)) ([9b65161](https://github.com/windmill-labs/windmill/commit/9b65161c643bf3f120d2ebd82f786c17233a971b))
+
+## [1.742.0](https://github.com/windmill-labs/windmill/compare/v1.741.0...v1.742.0) (2026-06-28)
+
+
+### Features
+
+* **apps:** add labels input to app editor deploy drawer ([#9828](https://github.com/windmill-labs/windmill/issues/9828)) ([da45e69](https://github.com/windmill-labs/windmill/commit/da45e699c8aefeede172c90769ef4f4b182fec0c))
+* column-level lineage for DuckLake pipelines (SQL-AST inferred + traceable) ([#9814](https://github.com/windmill-labs/windmill/issues/9814)) ([003a262](https://github.com/windmill-labs/windmill/commit/003a262a4e9d6c2a63ada01aa8429aea1fbb6031))
+
+
+### Bug Fixes
+
+* **audit:** don't read pg_authid from an elevated context in S3 export migration ([#9832](https://github.com/windmill-labs/windmill/issues/9832)) ([75ba81b](https://github.com/windmill-labs/windmill/commit/75ba81b2d27fb0722095780312064cb93d20287e))
+* close unauthenticated DAP debugger program-mode launch bypass ([#9829](https://github.com/windmill-labs/windmill/issues/9829)) ([c0768de](https://github.com/windmill-labs/windmill/commit/c0768de0acdf63eaba5fb97d04bfc64f2f03b93d))
+* redeploy older app version from deployment history ([#9826](https://github.com/windmill-labs/windmill/issues/9826)) ([c479afa](https://github.com/windmill-labs/windmill/commit/c479afab8ebceccbee050e923dc5c27a6712ea62))
+
+## [1.741.0](https://github.com/windmill-labs/windmill/compare/v1.740.0...v1.741.0) (2026-06-26)
+
+
+### Features
+
+* **ai-chat:** add create_folder tool to global chat ([#9819](https://github.com/windmill-labs/windmill/issues/9819)) ([44c25de](https://github.com/windmill-labs/windmill/commit/44c25de418612ab98341adb15d5671222b54367e))
+* **ai-chat:** hint /compact in context usage tooltip ([#9777](https://github.com/windmill-labs/windmill/issues/9777)) ([aadfb62](https://github.com/windmill-labs/windmill/commit/aadfb620c0b7dcd7e94367b761875e14ef9abe69))
+* **ai-chat:** let global chat edit the user's personal instructions ([#9771](https://github.com/windmill-labs/windmill/issues/9771)) ([3be2752](https://github.com/windmill-labs/windmill/commit/3be27521b05de33e48582e80c6651071f889f048))
+* **ai-chat:** surface raw apps in the @-mention context picker ([#9800](https://github.com/windmill-labs/windmill/issues/9800)) ([1602244](https://github.com/windmill-labs/windmill/commit/16022447c7b445be753b9545b10b4c67da0893d5))
+* capture managed-materialize output schema as asset metadata ([#2](https://github.com/windmill-labs/windmill/issues/2)a) ([#9812](https://github.com/windmill-labs/windmill/issues/9812)) ([ade74b2](https://github.com/windmill-labs/windmill/commit/ade74b297f6a03441e700a20ffc2d7291c8a85fd))
+* **sdk:** allow overriding worker tag when running jobs (WIN-2105) ([#9807](https://github.com/windmill-labs/windmill/issues/9807)) ([52fc7bf](https://github.com/windmill-labs/windmill/commit/52fc7bf94cf3f87f68d9dba9884944d87e7d5d57))
+
+
+### Bug Fixes
+
+* apply step timeout to 'Test this step' preview ([#9810](https://github.com/windmill-labs/windmill/issues/9810)) ([d04062b](https://github.com/windmill-labs/windmill/commit/d04062bff58c9c4c79ce542a4321e71bcbcf0e98))
+* **flows:** reject corrupt step paths at deploy + atomic cache writes ([#9751](https://github.com/windmill-labs/windmill/issues/9751)) ([#9813](https://github.com/windmill-labs/windmill/issues/9813)) ([3cda447](https://github.com/windmill-labs/windmill/commit/3cda44762148bcd2ee5c0ea821db884950376ead))
+* **frontend:** clarify instance data table unavailable on cloud ([#9806](https://github.com/windmill-labs/windmill/issues/9806)) ([c3e8c78](https://github.com/windmill-labs/windmill/commit/c3e8c789ac05c9c28991d9ab6f2358f61fa87971))
+* hide GCS service account key behind a reveal in object storage settings ([#9815](https://github.com/windmill-labs/windmill/issues/9815)) ([0ec5061](https://github.com/windmill-labs/windmill/commit/0ec5061270749ed078e01f5a4bc7397a1755ca32))
+* ping job during volume setup to prevent false zombie restarts ([#9803](https://github.com/windmill-labs/windmill/issues/9803)) ([43bb676](https://github.com/windmill-labs/windmill/commit/43bb676dc5652cb06fe1414b8d3aacf295bae36b))
+* skipped suspend step no longer parks the flow forever ([#9821](https://github.com/windmill-labs/windmill/issues/9821)) ([40110bc](https://github.com/windmill-labs/windmill/commit/40110bc7158bc42c3d84bd4637a12b82fcd72a9a))
+
+
+### Performance Improvements
+
+* **audit:** re-anchor S3 audit export on enable + opt-in backfill ([#9818](https://github.com/windmill-labs/windmill/issues/9818)) ([577ceee](https://github.com/windmill-labs/windmill/commit/577ceeee8679f054c6898d1a7889df30ab830f8f))
+
+## [1.740.0](https://github.com/windmill-labs/windmill/compare/v1.739.0...v1.740.0) (2026-06-25)
+
+
+### Features
+
+* **api:** add structured endpoint for flow logs ([#9797](https://github.com/windmill-labs/windmill/issues/9797)) ([ba768fe](https://github.com/windmill-labs/windmill/commit/ba768fee888682cb50142d6e76c0422c40307f46))
+* bounded-cascade selective execution for pipelines (UI + CLI) ([#9695](https://github.com/windmill-labs/windmill/issues/9695)) ([248540a](https://github.com/windmill-labs/windmill/commit/248540ac4d6e4ee9ee7c3e6f2cc822c63cc6426e))
+* data tests for ducklake pipeline materialization ([#9708](https://github.com/windmill-labs/windmill/issues/9708)) ([f6998ec](https://github.com/windmill-labs/windmill/commit/f6998ec54cba2507703790bf33427e7567d42c4b))
+* detect and guard against deploying stale drafts ([#9768](https://github.com/windmill-labs/windmill/issues/9768)) ([d865518](https://github.com/windmill-labs/windmill/commit/d8655189347f58df9d17e83dc55798baf7964279))
+* ducklake time-travel UX (snapshot history + AT VERSION reads) ([#9709](https://github.com/windmill-labs/windmill/issues/9709)) ([d131d75](https://github.com/windmill-labs/windmill/commit/d131d754e1fc9674abf5de383d2bc93596df9bd1))
+* self-host docs search for chat, mcp, cli; drop inkeep ([#9772](https://github.com/windmill-labs/windmill/issues/9772)) ([9d61e4e](https://github.com/windmill-labs/windmill/commit/9d61e4e59e4101de84217f7c7846f1aa94e84d89))
+
+
+### Bug Fixes
+
+* allow hyphens in postgresql database name validation ([#9782](https://github.com/windmill-labs/windmill/issues/9782)) ([170cd79](https://github.com/windmill-labs/windmill/commit/170cd79aaf92152fc3c0f675f155853c7f0e5b25))
+* **debounce:** never supersede a running debounce survivor ([#9780](https://github.com/windmill-labs/windmill/issues/9780)) ([5549bdc](https://github.com/windmill-labs/windmill/commit/5549bdc67a5559a764616c44b1018543bc0568fe))
+* decrypt secret variables via external backend in common resolvers ([#9784](https://github.com/windmill-labs/windmill/issues/9784)) ([cd42c6c](https://github.com/windmill-labs/windmill/commit/cd42c6ca18261328055554788932c3fe876a4a5b))
+* enforce containment of python module dir for preview jobs ([#9704](https://github.com/windmill-labs/windmill/issues/9704)) ([88fca6a](https://github.com/windmill-labs/windmill/commit/88fca6a8c130b9e3b0f0cd410e422d4e074fc11f))
+* **frontend:** apply script editor timeout to preview/Test runs ([#9794](https://github.com/windmill-labs/windmill/issues/9794)) ([6664ce6](https://github.com/windmill-labs/windmill/commit/6664ce6dc0c5fbc283303148de06d6bb85e4acf7))
+* **frontend:** nested-loop "Test this step" resolves iter to innermost loop ([#9778](https://github.com/windmill-labs/windmill/issues/9778)) ([74ebfc6](https://github.com/windmill-labs/windmill/commit/74ebfc67f069047875db738926865bd4bd6fe9e9))
+* opt out of Deno minimum-dependency-age for private npm registries ([#9802](https://github.com/windmill-labs/windmill/issues/9802)) ([b28f974](https://github.com/windmill-labs/windmill/commit/b28f974e5069f635419d9ea56fad6a0e417894e8))
+* pass SSL cert env vars to `uv python install` ([#9790](https://github.com/windmill-labs/windmill/issues/9790)) ([962758c](https://github.com/windmill-labs/windmill/commit/962758c02de5f6d962c681fe9c39769b99429e8d))
+* **python:** re-verify wheel RECORD on local cache reuse (once per worker) ([#9775](https://github.com/windmill-labs/windmill/issues/9775)) ([6c71c33](https://github.com/windmill-labs/windmill/commit/6c71c33470e3ea547f3b994db829eb4d04882443))
+* **python:** serialize concurrent installs into shared wheel cache dir ([#9787](https://github.com/windmill-labs/windmill/issues/9787)) ([11d83ab](https://github.com/windmill-labs/windmill/commit/11d83ab1ec559be5d3263010228e6db65358e04b))
+* re-pin stale-draft fork base when restoring an app deployment ([#9792](https://github.com/windmill-labs/windmill/issues/9792)) ([b9711e5](https://github.com/windmill-labs/windmill/commit/b9711e5ace8585315a1c2b85bb25ac8dd7832d6f))
+* restore libargon2-1 for PHP runtime in server image ([#9795](https://github.com/windmill-labs/windmill/issues/9795)) ([e9cb806](https://github.com/windmill-labs/windmill/commit/e9cb80639b2dec63ede69fc3a4e3720bb1a3c319))
+* use transaction for parallel_monitor_lock DELETE in last-iteration path ([#9789](https://github.com/windmill-labs/windmill/issues/9789)) ([754cae9](https://github.com/windmill-labs/windmill/commit/754cae956ac8d431ddeb055453835e249cdd07b7))
+
+
+### Performance Improvements
+
+* drop v2_job side-table ON DELETE CASCADE FKs to speed retention deletes ([#9786](https://github.com/windmill-labs/windmill/issues/9786)) ([aa098c7](https://github.com/windmill-labs/windmill/commit/aa098c70c0271b2b1917749d1f607c0559cf04de))
+* eliminate dual-connection DB pool contention across worker, queue, and api ([#9798](https://github.com/windmill-labs/windmill/issues/9798)) ([0dbd9c1](https://github.com/windmill-labs/windmill/commit/0dbd9c1231b00d4693af68835fe1d9e7c8869b43))
+
+## [1.739.0](https://github.com/windmill-labs/windmill/compare/v1.738.0...v1.739.0) (2026-06-24)
+
+
+### Features
+
+* add /compact session chat command ([#9764](https://github.com/windmill-labs/windmill/issues/9764)) ([83cc553](https://github.com/windmill-labs/windmill/commit/83cc5533ee92e59356a117eefeaf42dad23287f6))
+* add session chat slash commands ([#9748](https://github.com/windmill-labs/windmill/issues/9748)) ([24b95e9](https://github.com/windmill-labs/windmill/commit/24b95e9fe12ba4abdfe1ff6e9f9fe42cb2ded011))
+* **ai-chat:** add /clear session command to start a fresh conversation ([#9769](https://github.com/windmill-labs/windmill/issues/9769)) ([3fafac2](https://github.com/windmill-labs/windmill/commit/3fafac275d2100a6f89924040650cf959945d209))
+* **ai-chat:** context usage gauge + unified model settings menu ([#9763](https://github.com/windmill-labs/windmill/issues/9763)) ([2e020b2](https://github.com/windmill-labs/windmill/commit/2e020b2ccc7a649a5923bff72a98f07d4fc85381))
+* **apps:** show raw-app fork diffs as per-file tree items ([#9491](https://github.com/windmill-labs/windmill/issues/9491)) ([e98df38](https://github.com/windmill-labs/windmill/commit/e98df38ac43823ee85209a4b09cd70690469302d))
+* **frontend:** add filter submenu to collapsed AI sessions popover ([#9757](https://github.com/windmill-labs/windmill/issues/9757)) ([3d48ba7](https://github.com/windmill-labs/windmill/commit/3d48ba7738c3d3356539b5fc44a871f6b7f9d548))
+* **frontend:** restore raw app 'open preview in separate window' ([#9765](https://github.com/windmill-labs/windmill/issues/9765)) ([a116715](https://github.com/windmill-labs/windmill/commit/a116715c418c39d48a91e6c0b4484a31537dff38))
+* **frontend:** show approval wait as a distinct segment in flow timeline ([#9756](https://github.com/windmill-labs/windmill/issues/9756)) ([2a70ccc](https://github.com/windmill-labs/windmill/commit/2a70ccc38675c7c2353807a4f85764a8a35224e2))
+* scope AI sessions per workspace root with lifecycle reconcile ([#9734](https://github.com/windmill-labs/windmill/issues/9734)) ([42c5e7a](https://github.com/windmill-labs/windmill/commit/42c5e7a3fc9b74256de8806ec0d7b62e8bbf029c))
+
+
+### Bug Fixes
+
+* **ai-chat:** strip unclosed &lt;summary&gt; tag leaking into compaction summary ([#9750](https://github.com/windmill-labs/windmill/issues/9750)) ([250a05f](https://github.com/windmill-labs/windmill/commit/250a05f544ae397bb91af5fc83bf408cfe1c554d))
+* **apps:** realign legacy raw-app drafts to raw_app draft kind ([#9761](https://github.com/windmill-labs/windmill/issues/9761)) ([288318a](https://github.com/windmill-labs/windmill/commit/288318ac269714fc03b15622dbb86b1c28268a36))
+* **backend:** resolve folder_labels search_path on non-public (PG_SCHEMA) schemas ([#9758](https://github.com/windmill-labs/windmill/issues/9758)) ([f582878](https://github.com/windmill-labs/windmill/commit/f5828780fd6a8be070b2933ebd41ee6dff98a9e1))
+* forbid superadmin job tokens from global user and token management ([#9715](https://github.com/windmill-labs/windmill/issues/9715)) ([043c2c0](https://github.com/windmill-labs/windmill/commit/043c2c05b7678c49faca0ccb28e5f6393567ba4d))
+* **frontend:** highlight the runtime-chosen branch in flow graph viewer ([#9755](https://github.com/windmill-labs/windmill/issues/9755)) ([de6192b](https://github.com/windmill-labs/windmill/commit/de6192bec1695883a07452f7db2fb51c94dbfd43))
+* **frontend:** keep #content portal target present on AI-session route ([#9754](https://github.com/windmill-labs/windmill/issues/9754)) ([5e09c50](https://github.com/windmill-labs/windmill/commit/5e09c501713ebbe05b28ce0084eca641f0dbe95c))
+* **frontend:** show AI skills settings only when global mode enabled ([#9747](https://github.com/windmill-labs/windmill/issues/9747)) ([c017f7f](https://github.com/windmill-labs/windmill/commit/c017f7f8919a51292ddf01574961d1774bc1ba23))
+* **frontend:** stop flow step id generation from being poisoned by non-canonical keys ([#9766](https://github.com/windmill-labs/windmill/issues/9766)) ([4dbf873](https://github.com/windmill-labs/windmill/commit/4dbf8737238ccc4dc2c67365e6d43f04f46c75b5))
+* persist on-behalf-of user across app deploy paths ([#9773](https://github.com/windmill-labs/windmill/issues/9773)) ([f99781c](https://github.com/windmill-labs/windmill/commit/f99781ca5f77248206c951935cc44acfa5f072eb))
+* reject symlink traversal in job-dir path validation ([#9713](https://github.com/windmill-labs/windmill/issues/9713)) ([b5bd824](https://github.com/windmill-labs/windmill/commit/b5bd8245d81b84fc14d3ea955bf1e66ac576bf37))
+
+
+### Performance Improvements
+
+* **audit:** adaptive timestamp floor for S3 audit-log export ([#9752](https://github.com/windmill-labs/windmill/issues/9752)) ([55bed4a](https://github.com/windmill-labs/windmill/commit/55bed4abcfce2a611b16054573980d2eb613ccb3))
+* **monitor:** vacuum job_perms/job_result_stream right after each orphan sweep ([#9753](https://github.com/windmill-labs/windmill/issues/9753)) ([8912e21](https://github.com/windmill-labs/windmill/commit/8912e21d1571e57b5cf21b7d4d9520e20a28e70d))
+
+## [1.738.0](https://github.com/windmill-labs/windmill/compare/v1.737.0...v1.738.0) (2026-06-23)
+
+
+### Features
+
+* add resource and infrastructure telemetry ([#9737](https://github.com/windmill-labs/windmill/issues/9737)) ([9793d01](https://github.com/windmill-labs/windmill/commit/9793d01575415963a89609a1baf2cd64f0d050cc))
+* render mermaid diagrams in chat code blocks ([#9738](https://github.com/windmill-labs/windmill/issues/9738)) ([cfb9f1d](https://github.com/windmill-labs/windmill/commit/cfb9f1dbc23110ecf8f91bb3c8c81fc6e35dc09b))
+
+
+### Bug Fixes
+
+* **ai-chat:** Fix incorrect editor edits from ai chat [#1](https://github.com/windmill-labs/windmill/issues/1) ([#9741](https://github.com/windmill-labs/windmill/issues/9741)) ([fc797a3](https://github.com/windmill-labs/windmill/commit/fc797a35fe7885630c81453df0fc94769e73873a))
+* allow object storage test for non-super-admins, harden on cloud ([#9739](https://github.com/windmill-labs/windmill/issues/9739)) ([24446e8](https://github.com/windmill-labs/windmill/commit/24446e80093ade349f7fbf65063d2d1cb5551c1e))
+* **frontend:** debounce external code→Monaco sync in Editor ([#9743](https://github.com/windmill-labs/windmill/issues/9743)) ([29c67ce](https://github.com/windmill-labs/windmill/commit/29c67ced97bf2919584986f9d9eceb4337c34ad9))
+* **frontend:** preserve editor content when closing instance settings drawer ([#9740](https://github.com/windmill-labs/windmill/issues/9740)) ([11d0e65](https://github.com/windmill-labs/windmill/commit/11d0e65f3af9a048bc1921bbdd3d676a07483a57))
+* pipeline annotation false-positives from body comments ([#9736](https://github.com/windmill-labs/windmill/issues/9736)) ([984ea72](https://github.com/windmill-labs/windmill/commit/984ea728d98649b66b1cae899bdab9af3176caa7))
+* preserve fork parent linkage on workspace id change ([#9716](https://github.com/windmill-labs/windmill/issues/9716)) ([cbf54d4](https://github.com/windmill-labs/windmill/commit/cbf54d4eb432638e27f67c4c8b879cbcc0291da3))
+* prevent variable push from corrupting is_secret variables ([#9705](https://github.com/windmill-labs/windmill/issues/9705)) ([ba4b368](https://github.com/windmill-labs/windmill/commit/ba4b368706e95e22f346a10e5fe145b0795ac3f6))
+
+
+### Performance Improvements
+
+* **monitor:** skip protected prefix in retention delete via cross-batch watermark (WIN-2088) ([#9744](https://github.com/windmill-labs/windmill/issues/9744)) ([e90b2be](https://github.com/windmill-labs/windmill/commit/e90b2be8fade1eb78cd685890291f5a4553a6a10))
+
+## [1.737.0](https://github.com/windmill-labs/windmill/compare/v1.736.0...v1.737.0) (2026-06-23)
+
+
+### Features
+
+* **apps:** opt-in sandbox isolation for published & raw apps (alpha) ([#9420](https://github.com/windmill-labs/windmill/issues/9420)) ([2879cbb](https://github.com/windmill-labs/windmill/commit/2879cbb65a4122c86b4a472206d74d9009b07904))
+
+
+### Bug Fixes
+
+* allow SQL args in managed // materialize scripts ([#9733](https://github.com/windmill-labs/windmill/issues/9733)) ([fa35968](https://github.com/windmill-labs/windmill/commit/fa3596885bf2d7ee8859f295e820ee362c756911))
+* bound orphan-cleanup drain rate with capped multi-batch loop ([#9730](https://github.com/windmill-labs/windmill/issues/9730)) ([31d9215](https://github.com/windmill-labs/windmill/commit/31d9215e5a61f19662cc87be8147007e1d47ebb6))
+* **ext-jwt:** reject external JWT auth for non-existent workspaces ([#9723](https://github.com/windmill-labs/windmill/issues/9723)) ([c644311](https://github.com/windmill-labs/windmill/commit/c644311eca4bcaf4b68058cf1d5d79d4078aee1a))
+* optimize cleanup_job_perms_orphaned and job_result_stream cleanup queries ([#9727](https://github.com/windmill-labs/windmill/issues/9727)) ([6d94865](https://github.com/windmill-labs/windmill/commit/6d9486510933af9109f52011d93b13847dbdbb39))
+* prevent silent audit-partition outage via monitor watchdog + alert ([#9729](https://github.com/windmill-labs/windmill/issues/9729)) ([8dea383](https://github.com/windmill-labs/windmill/commit/8dea38383f884f59b2956c39f1424005a21265bd))
+
+
+### Performance Improvements
+
+* **monitor:** hash active-root exclusion in retention delete (WIN-2088) ([#9732](https://github.com/windmill-labs/windmill/issues/9732)) ([75bafab](https://github.com/windmill-labs/windmill/commit/75bafabeeec76cf6da33eef41f588e37071df011))
+
+## [1.736.0](https://github.com/windmill-labs/windmill/compare/v1.735.0...v1.736.0) (2026-06-23)
+
+
+### Features
+
+* **ai-chat:** workspace AI chat skills (SKILL.md upload + read_skill tool) ([#9648](https://github.com/windmill-labs/windmill/issues/9648)) ([6f4017d](https://github.com/windmill-labs/windmill/commit/6f4017d694494a158ebd0579c93336c378cba0fd))
+
+
+### Bug Fixes
+
+* **drafts:** stop mis-filing workspace-blind legacy drafts on migration ([#9725](https://github.com/windmill-labs/windmill/issues/9725)) ([3bf5b72](https://github.com/windmill-labs/windmill/commit/3bf5b72afab3241ea41a261a40c2434764bdaf72))
+* **frontend:** destroy old WebsocketProvider on workspace switch in MultiplayerMenu ([#9719](https://github.com/windmill-labs/windmill/issues/9719)) ([6e96f90](https://github.com/windmill-labs/windmill/commit/6e96f90065dfe2f6ccc5eb4f85f4facd3515c70c))
+* **frontend:** ensure type:object in test_run_flow tool schema for Anthropic ([#9721](https://github.com/windmill-labs/windmill/issues/9721)) ([d5cb944](https://github.com/windmill-labs/windmill/commit/d5cb944cf92f074b2ee42c876595eacdfa2f4d76))
+* **health:** detect read-only replica via pg_is_in_recovery() ([#9722](https://github.com/windmill-labs/windmill/issues/9722)) ([e16061d](https://github.com/windmill-labs/windmill/commit/e16061df06babeae935a9396de5bdcd46e8119a9))
+* re-enforce scoped API token boundaries across handlers ([#9712](https://github.com/windmill-labs/windmill/issues/9712)) ([e19594d](https://github.com/windmill-labs/windmill/commit/e19594df2ad015a0336ade95e04562f5562ec3f6))
+
+## [1.735.0](https://github.com/windmill-labs/windmill/compare/v1.734.0...v1.735.0) (2026-06-22)
+
+
+### Features
+
+* clarify session draft bar tracks all workspace draft changes ([#9714](https://github.com/windmill-labs/windmill/issues/9714)) ([ed016a5](https://github.com/windmill-labs/windmill/commit/ed016a5edb4527877bf7e6bf92feafc2710669c2))
+* **copilot:** improve global-mode path selection + add path-selection evals ([#9698](https://github.com/windmill-labs/windmill/issues/9698)) ([74a2329](https://github.com/windmill-labs/windmill/commit/74a2329d2e8395141807c43acef07ef132490039))
+* link files & folders to the global AI chat ([#9520](https://github.com/windmill-labs/windmill/issues/9520)) ([84cc043](https://github.com/windmill-labs/windmill/commit/84cc043406d63a1e1472165cf24ce8c09905fc5f))
+* scope default instance db name to workspace (dt_/dl_) ([#9699](https://github.com/windmill-labs/windmill/issues/9699)) ([4a8a724](https://github.com/windmill-labs/windmill/commit/4a8a724895dcecb835e1eb1e4fd7d1bbc8b3e0fb))
+
+
+### Bug Fixes
+
+* enforce job_dir containment when writing module files ([#9703](https://github.com/windmill-labs/windmill/issues/9703)) ([e403f92](https://github.com/windmill-labs/windmill/commit/e403f92d7e84cebc78709dce1a0928048ba2506d))
+* **frontend:** deploy full script/flow draft from AI chat via shared module ([#9642](https://github.com/windmill-labs/windmill/issues/9642)) ([23bf6bf](https://github.com/windmill-labs/windmill/commit/23bf6bf3da01d552d2dfab6dbcfd30f758ed34d2))
+* **frontend:** strip raw-app post-deploy diff noise (raw_app/lock/data) ([#9706](https://github.com/windmill-labs/windmill/issues/9706)) ([e20a277](https://github.com/windmill-labs/windmill/commit/e20a27745a08d552e6d2c5a8bbaf08ccfe89c68f))
+* ignore NotFound errors when deleting log files from object store ([#9707](https://github.com/windmill-labs/windmill/issues/9707)) ([8a0b0ab](https://github.com/windmill-labs/windmill/commit/8a0b0abead71320c4f69eb3007739a19f76d4126))
+* **oauth:** restore bring-your-own CC token URL override ([#9711](https://github.com/windmill-labs/windmill/issues/9711)) ([ef4962e](https://github.com/windmill-labs/windmill/commit/ef4962e52aba0bc79bf72523de9101853c660654))
+* sanitize git credentials from ansible executor errors and logs ([#9697](https://github.com/windmill-labs/windmill/issues/9697)) ([ace7b68](https://github.com/windmill-labs/windmill/commit/ace7b68a28b00d715298ffcb6ae907c1974a74b8))
+
+## [1.734.0](https://github.com/windmill-labs/windmill/compare/v1.733.1...v1.734.0) (2026-06-20)
+
+
+### Features
+
+* ducklake materialization for data pipelines ([#9689](https://github.com/windmill-labs/windmill/issues/9689)) ([3ebf243](https://github.com/windmill-labs/windmill/commit/3ebf24359d66048d6361ce65cd879cdc04b737ed))
+
+
+### Bug Fixes
+
+* **frontend:** clear branch step state when switching outer loop iterations ([#9650](https://github.com/windmill-labs/windmill/issues/9650)) ([09a8004](https://github.com/windmill-labs/windmill/commit/09a80040ca268a4379d5302e3401435ba93247e0))
+
 ## [1.733.1](https://github.com/windmill-labs/windmill/compare/v1.733.0...v1.733.1) (2026-06-19)
 
 
diff --git a/Dockerfile b/Dockerfile
index d327c9b394..a86fb60d2f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-ARG DEBIAN_IMAGE=debian:bookworm-slim
-ARG RUST_IMAGE=rust:1.93-slim-bookworm
+ARG DEBIAN_IMAGE=debian:trixie-slim
+ARG RUST_IMAGE=rust:1.93-slim-trixie
 
-FROM debian:bookworm-slim AS nsjail
+FROM debian:trixie-slim AS nsjail
 
 WORKDIR /nsjail
 
@@ -9,12 +9,12 @@ RUN apt-get -y update \
     && apt-get install -y \
     bison=2:3.8.* \
     flex=2.6.* \
-    g++=4:12.2.* \
-    gcc=4:12.2.* \
-    git=1:2.39.* \
+    g++=4:14.2.* \
+    gcc=4:14.2.* \
+    git=1:2.47.* \
     libprotobuf-dev=3.21.* \
     libnl-route-3-dev=3.7.* \
-    make=4.3-4.1 \
+    make=4.4.* \
     pkg-config=1.8.* \
     protobuf-compiler=3.21.*
 
@@ -44,7 +44,7 @@ FROM rust_base AS windmill_duckdb_ffi_internal_builder
 
 WORKDIR /windmill-duckdb-ffi-internal
 
-RUN apt-get update && apt-get install -y clang=1:14.0-55.* libclang-dev=1:14.0-55.* cmake=3.25.* && \
+RUN apt-get update && apt-get install -y clang=1:19.0* libclang-dev=1:19.0* cmake=3.31.* && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -98,7 +98,7 @@ ARG features=""
 
 COPY --from=planner /windmill/recipe.json recipe.json
 
-RUN apt-get update && apt-get install -y libxml2-dev=2.9.* libxmlsec1-dev=1.2.* libkrb5-dev libsasl2-dev libcurl4-openssl-dev clang=1:14.0-55.* libclang-dev=1:14.0-55.* cmake=3.25.* && \
+RUN apt-get update && apt-get install -y libxml2-dev=2.12.* libxmlsec1-dev=1.2.* libkrb5-dev libsasl2-dev libcurl4-openssl-dev clang=1:19.0* libclang-dev=1:19.0* cmake=3.31.* && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -135,9 +135,8 @@ FROM ${DEBIAN_IMAGE}
 
 ARG TARGETPLATFORM
 ARG POWERSHELL_VERSION=7.5.0
-ARG POWERSHELL_DEB_VERSION=7.5.0-1
-ARG KUBECTL_VERSION=1.28.7
-ARG HELM_VERSION=3.14.3
+ARG KUBECTL_VERSION=1.36.2
+ARG HELM_VERSION=3.21.2
 # NOTE: If changing, also change go version in workspace dependencies template at WorkspaceDependenciesEditor.svelte
 ARG GO_VERSION=1.26.0
 ARG APP=/usr/src/app
@@ -163,14 +162,14 @@ ENV PATH /usr/local/bin:/root/.local/bin:/tmp/.local/bin:$PATH
 
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends netbase tzdata ca-certificates wget curl jq unzip build-essential unixodbc xmlsec1 software-properties-common tini gnupg lsb-release \
+    && apt-get install -y --no-install-recommends netbase tzdata ca-certificates wget curl jq unzip build-essential unixodbc xmlsec1 tini gnupg libargon2-1 \
     && if echo "$features" | grep -q "ee"; then apt-get install -y --no-install-recommends libsasl2-modules-gssapi-mit krb5-user; fi \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # Install latest PostgreSQL client (pg_dump) from official PostgreSQL apt repository
 RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgresql-archive-keyring.gpg \
-    && echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.gpg] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+    && echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.gpg] https://apt.postgresql.org/pub/repos/apt $(. /etc/os-release; echo "$VERSION_CODENAME")-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends postgresql-client \
     && apt-get clean \
@@ -183,12 +182,14 @@ RUN if [ "$WITH_GIT" = "true" ]; then \
     && rm -rf /var/lib/apt/lists/*; \
     else echo 'Building the image without git'; fi;
 
+# PowerShell ships as a tarball: the upstream .deb depends on libicu<=74 which no longer exists in trixie
 RUN if [ "$WITH_POWERSHELL" = "true" ]; then \
-    if [ "$TARGETPLATFORM" = "linux/amd64" ]; then apt-get update -y && apt install libicu-dev -y && wget -O 'pwsh.deb' "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell_${POWERSHELL_DEB_VERSION}.deb_amd64.deb" && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* && \
-    dpkg --install 'pwsh.deb' && \
-    rm 'pwsh.deb'; \
-    elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then apt-get update -y && apt install libicu-dev -y && wget -O powershell.tar.gz "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-linux-arm64.tar.gz" && apt-get clean \
+    case "$TARGETPLATFORM" in \
+    "linux/amd64") pwsh_arch=x64 ;; \
+    "linux/arm64") pwsh_arch=arm64 ;; \
+    *) pwsh_arch="" ;; \
+    esac; \
+    if [ -n "$pwsh_arch" ]; then apt-get update -y && apt install libicu76 -y && wget -O powershell.tar.gz "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-linux-${pwsh_arch}.tar.gz" && apt-get clean \
     && rm -rf /var/lib/apt/lists/* && \
     mkdir -p /opt/microsoft/powershell/7 && \
     tar zxf powershell.tar.gz -C /opt/microsoft/powershell/7 && \
@@ -233,7 +234,7 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GO_PATH=/usr/local/go/bin/go
 
 # Install UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.9.25/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.11.24/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
 
 # Preinstall python runtimes to temp build location (will copy with world-writable perms later)
 # --compile-bytecode precompiles the stdlib to .pyc so jobs don't recompile it on every run
@@ -292,7 +293,7 @@ RUN bun install -g windmill-cli \
 RUN curl -fsSL https://claude.ai/install.sh | bash \
     && cp /root/.local/share/claude/versions/* /usr/bin/claude
 
-COPY --from=php:8.3.30-cli-bookworm /usr/local/bin/php /usr/bin/php
+COPY --from=php:8.3.30-cli-trixie /usr/local/bin/php /usr/bin/php
 COPY --from=composer:2.9.5 /usr/bin/composer /usr/bin/composer
 
 # add the docker client to call docker from a worker if enabled
@@ -303,13 +304,13 @@ ENV CARGO_HOME="/tmp/windmill/cache/cargo"
 ENV LD_LIBRARY_PATH="."
 
 # nsjail runtime deps and binary
-RUN apt-get update && apt-get install -y --no-install-recommends libprotobuf32 libnl-route-3-200 libnl-3-200 \
+RUN apt-get update && apt-get install -y --no-install-recommends libprotobuf32t64 libnl-route-3-200 libnl-3-200 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
 # crane: pulls + flattens images for the sandboxed container runtime (`# sandbox <image>`).
 # Single static binary — no daemon/store/root needed. See docs/docker-v2-runtime.md.
-ARG CRANE_VERSION=v0.20.6
+ARG CRANE_VERSION=v0.21.7
 RUN arch="$(dpkg --print-architecture)"; \
     case "$arch" in amd64) crane_arch=x86_64 ;; arm64) crane_arch=arm64 ;; *) echo >&2 "error: unsupported arch '$arch' for crane"; exit 1 ;; esac; \
     wget -O /tmp/crane.tgz "https://github.com/google/go-containerregistry/releases/download/${CRANE_VERSION}/go-containerregistry_Linux_${crane_arch}.tar.gz" \
diff --git a/ai_evals/AGENTS.md b/ai_evals/AGENTS.md
index af5427abae..6e63c4037e 100644
--- a/ai_evals/AGENTS.md
+++ b/ai_evals/AGENTS.md
@@ -1,208 +1,14 @@
-# AI Evals Authoring Guide
+# AI Evals
 
-This folder contains black-box benchmark cases for:
+Black-box benchmark cases for the Windmill AI generation modes (`flow`, `app`,
+`script`, `cli`, `global`).
 
-- `flow`
-- `app`
-- `script`
-- `cli`
-- `global`
+**Authoring and running cases is documented in the `ai-evals` skill** — load it
+before adding/changing a case or running a benchmark. Claude Code reads
+`.claude/skills/ai-evals/SKILL.md`; Codex and Pi read
+`.agents/skills/ai-evals/SKILL.md` (same canonical file). Invoke with `/ai-evals` in
+Claude Code, `$ai-evals` in Codex, or `pi --skill ai-evals`.
 
-The goal is to test the current production prompts and guidance with realistic user requests, not to test one exact implementation shape.
+For AI chat / copilot changes that these evals measure, see the `ai-chat` skill.
 
-## Core rules
-
-1. Write prompts like a real user request.
-2. Prefer behavior, inputs, constraints, and outcomes over internal implementation details.
-3. Keep deterministic validation narrow and hard.
-4. Put semantic expectations in `judgeChecklist`.
-5. Use `expected` fixtures only when exact structure really matters.
-
-## Prompt writing
-
-Prompts should sound like something a user would naturally ask.
-
-Good:
-
-- "Create a flow that routes support requests based on customer tier."
-- "Add a reset button that sets the counter back to 0."
-- "Create a flow that reuses the existing greeting script instead of duplicating the logic."
-
-Bad:
-
-- "Use `branchone` with 3 branches and a default branch."
-- "Create a `rawscript` step with this exact topology."
-- "This is a benchmark harness."
-
-Do not write prompts as if the user knows Windmill internals unless the case is explicitly testing a power-user workflow.
-
-## Flow-specific rules
-
-This is the main principle you asked for:
-
-- flow prompts should read like requests from a user who does not know the product internals
-- the user should ask for behavior, not for `branchone`, `branchall`, `rawscript`, `preprocessor_module`, `failure_module`, exact graph topology, or other internal constructs
-
-That means:
-
-- creation cases should describe the business behavior and expected result
-- modification cases may mention existing step names, because the user can see the current flow
-- only mention special Windmill constructs when the case is explicitly about those constructs
-
-Examples:
-
-- acceptable creation prompt:
-  "Create a purchase approval flow that pauses for approval and asks the approver for a comment."
-- avoid:
-  "Create a suspend step with one required event and a resume form."
-
-For flow cases, do not fail a case just because the model chose a different valid topology.
-
-## App-specific rules
-
-App prompts should focus on user-visible behavior:
-
-- what the UI should let the user do
-- what should persist
-- what backend behavior is needed
-
-Avoid prompting in terms of React structure, component names, or implementation unless the case is specifically about editing an existing app.
-
-## CLI-specific rules
-
-CLI prompts can be more explicit about paths and file names because real CLI users often do specify them.
-
-Still, avoid benchmark phrasing. The prompt should read like a repo task, not a harness instruction.
-
-When relevant, ask the assistant to tell the user which `wmill` commands to run next. That is part of the benchmarked behavior.
-
-## Global-specific rules
-
-Global prompts should exercise workspace-level drafting behavior:
-
-- inspecting existing scripts, flows, apps, schedules, triggers, resources, and variables when relevant
-- writing AI drafts rather than saving or deploying by default
-- producing coherent multi-artifact changes when the request crosses artifact boundaries
-
-Keep deterministic validation focused on the draft contract: required draft type/path, required content snippets, forbidden draft paths, and forbidden mutating tools such as deploy/delete unless the case explicitly asks for them.
-
-Datatable cases should set `skipJudge: true` and validate through tool-use
-(`requiredToolsUsed` / `forbiddenToolsUsed`) and SQL-argument assertions
-(`toolCallArgs` with `stringIncludesAnyOf`, e.g. `['select']`, `['create table']`,
-`['update', 'insert into']`). Two reasons the judge is unreliable here:
-
-- `list_datatables`, `get_datatable_table_schema`, and `exec_datatable_sql`
-  produce no drafts, and the global judge only sees the drafts artifact — it
-  scores a no-draft conversational answer as empty (same as the
-  `askUserQuestion` cases).
-- Even a case that *does* produce a draft (a script reading the data table via
-  `wmill.datatable()` at runtime) is mis-judged: the judge has no datatable SDK
-  reference and penalizes correct `wmill.datatable()` usage as wrong. Verify the
-  SDK call deterministically instead — `requiredDrafts.valueIncludes: ['wmill.datatable(']`
-  plus forbidding `exec_datatable_sql` (keeping chat-time SQL distinct from
-  runtime SDK use).
-
-`stringIncludesAnyOf` is existential over calls (at least one matching call), so a
-mutation case still passes when the model mixes its UPDATE/INSERT with
-verification SELECTs. The in-memory engine (`datatableSqlEngine.ts`) is stateful
-within a case — writes persist, so a model that re-queries to verify its
-CREATE/UPDATE sees the change and does not loop. But the engine is best-effort
-(SELECT returns all rows of the referenced/first table with no WHERE/projection),
-so still never assert specific returned row values. Seed data via
-`workspace.datatables` in the `initial` fixture (see README).
-
-## Deterministic validation
-
-Use deterministic validation only for hard failures such as:
-
-- missing required files
-- unexpected extra files when the prompt says not to create them
-- syntax errors
-- unresolved flow refs
-- missing required special modules or suspend config
-- obvious artifact corruption
-
-Do not use deterministic validation to enforce one preferred implementation for broad creation tasks.
-
-Examples of bad hard checks:
-
-- exact step topology for a creation flow
-- exact branch structure when the prompt only asked for routing behavior
-- exact input shape when multiple reasonable shapes are acceptable
-
-## Judge checklist
-
-Every non-trivial case should have a `judgeChecklist`.
-
-The checklist should capture:
-
-- the user-visible behavior that must be present
-- important constraints
-- key completion criteria
-
-The checklist should not duplicate low-level implementation details unless they are truly required by the task.
-
-Good checklist items:
-
-- "the flow calculates the order total with 8% tax"
-- "the app persists recipes appropriately for a raw Windmill app"
-- "the flow reuses the existing workspace script instead of rewriting the logic"
-
-Bad checklist items:
-
-- "uses `branchone`"
-- "contains a `rawscript` node"
-
-## When to use `expected`
-
-Use `expected` fixtures when the case is structure-sensitive, for example:
-
-- exact file creation
-- exact script content
-- modification cases where a specific file must change in a specific way
-- cases where preserving an existing structure is part of the requirement
-
-Do not use a full `expected` artifact as the semantic oracle for broad creation tasks when multiple valid outputs should pass.
-
-## When to use `initial`
-
-Use `initial` when the benchmark is about:
-
-- editing an existing artifact
-- reusing existing workspace assets
-- preserving existing behavior while adding a change
-
-If the case is greenfield, prefer no `initial`.
-
-## Case design ladder
-
-Prefer suites that get gradually harder:
-
-1. trivial create case
-2. realistic create case
-3. reuse-existing-assets case
-4. modification case
-5. refactor case
-6. edge-case or niche product behavior
-
-The last cases in a suite should cover unusual or product-specific behavior.
-
-## Anti-patterns
-
-Avoid these:
-
-- benchmark framing in prompts
-- over-specified internal topology for creation tasks
-- judge checklists that just restate implementation details
-- deterministic validation that encodes one preferred solution
-- fixtures that are so minimal or brittle that they create false negatives
-
-## Before adding a case
-
-Ask:
-
-1. Would a real user plausibly write this prompt?
-2. If the model solves it in a different valid way, would the case still pass?
-3. Are the hard deterministic checks only catching objectively broken output?
-4. Does the `judgeChecklist` describe the real success criteria?
-5. If this case fails, will the reason be understandable from the saved artifacts?
+The full case format, fields, and fixture details remain in `ai_evals/README.md`.
diff --git a/ai_evals/README.md b/ai_evals/README.md
index 88825f4ee7..33bb47ae46 100644
--- a/ai_evals/README.md
+++ b/ai_evals/README.md
@@ -75,6 +75,8 @@ Public CLI surface:
 - `--model <alias>`: choose the model under test
 - `--models <a,b,c>`: run the same cases sequentially against several model aliases
 - `--verbose`: stream assistant output for frontend runs
+- `--skip-judge`: skip LLM judge scoring for the run
+- `--execution-only`: only require the model/proxy/frontend loop to complete; skip validators, tool expectations, backend artifact validation, and judge scoring
 - `--record`: append a compact tracked summary line to `ai_evals/history/<mode>.jsonl` for full-suite runs only
 - `--backend-validation <mode>`: optional backend smoke validation (`off` or `preview`) for `script` and `flow` evals
 
@@ -99,7 +101,7 @@ Notes:
 - the command also prints accepted alias spellings such as `gpt-4o`, `gpt-55`, `claude-opus-4.6`, and `claude-haiku-4.5`
 - frontend modes (`flow`, `script`, `app`, `global`) can use Anthropic, OpenAI, Gemini, and DeepSeek-backed aliases
 - `cli` mode always uses the Anthropic agent SDK, so only Anthropic aliases are valid there
-- the judge model is separate and currently defaults to `claude-sonnet-4-6`
+- the judge model is separate and currently defaults to `claude-sonnet-4-6`; use `--skip-judge` for deterministic-only runs
 
 ## Case Format
 
diff --git a/ai_evals/adapters/frontend/benchmarkRunner.ts b/ai_evals/adapters/frontend/benchmarkRunner.ts
index 32107eadf1..b45f880699 100644
--- a/ai_evals/adapters/frontend/benchmarkRunner.ts
+++ b/ai_evals/adapters/frontend/benchmarkRunner.ts
@@ -25,6 +25,12 @@ export async function runFrontendBenchmarkFromEnv(): Promise<BenchmarkRunResult>
   );
   const emitProgress = process.env.WMILL_FRONTEND_AI_EVAL_PROGRESS === "1";
   const verbose = process.env.WMILL_FRONTEND_AI_EVAL_VERBOSE === "1";
+  const executionOnly =
+    process.env.WMILL_FRONTEND_AI_EVAL_EXECUTION_ONLY === "1";
+  const judgeModel =
+    process.env.WMILL_FRONTEND_AI_EVAL_SKIP_JUDGE === "1" || executionOnly
+      ? null
+      : DEFAULT_JUDGE_MODEL;
   const model = resolveEvalModel(
     mode,
     process.env.WMILL_FRONTEND_AI_EVAL_MODEL,
@@ -48,7 +54,8 @@ export async function runFrontendBenchmarkFromEnv(): Promise<BenchmarkRunResult>
     cases: selectedCases,
     runs,
     runModel,
-    judgeModel: DEFAULT_JUDGE_MODEL,
+    judgeModel,
+    executionOnly,
     concurrency: verbose ? 1 : undefined,
     verbose,
     onProgress: emitProgress
@@ -60,7 +67,7 @@ export async function runFrontendBenchmarkFromEnv(): Promise<BenchmarkRunResult>
     mode,
     runs,
     runModel,
-    judgeModel: DEFAULT_JUDGE_MODEL,
+    judgeModel,
     caseResults,
   });
 }
diff --git a/ai_evals/adapters/frontend/core/global/globalEvalRunner.ts b/ai_evals/adapters/frontend/core/global/globalEvalRunner.ts
index a6d78da36b..e553d15f56 100644
--- a/ai_evals/adapters/frontend/core/global/globalEvalRunner.ts
+++ b/ai_evals/adapters/frontend/core/global/globalEvalRunner.ts
@@ -50,6 +50,20 @@ export interface GlobalLiveEditorDraftFixture {
   value?: unknown;
 }
 
+// Identity the global system prompt builds paths from. Production reads
+// `userStore` (whoami) to fill `u/{username}/...`; the eval harness never logs
+// in, so without this the prompt sees an empty username (`u//...`) and no
+// path-selection case is meaningful. Seeded per-case via the initial fixture and
+// passed straight to `prepareGlobalSystemMessage` (no global-store mutation).
+export interface GlobalUserFixture {
+  username: string;
+  is_admin?: boolean;
+  /** Folders the user can write to (the writable set whoami returns). */
+  folders?: string[];
+  /** Folders the user can read; read-only folders = folders_read \ folders. */
+  folders_read?: string[];
+}
+
 export interface GlobalEvalResult {
   success: boolean;
   state: GlobalDraftState;
@@ -65,6 +79,7 @@ export interface GlobalEvalResult {
 export interface GlobalEvalOptions {
   workspaceFixtures?: BenchmarkWorkspaceRunnables;
   liveEditorDrafts?: GlobalLiveEditorDraftFixture[];
+  user?: GlobalUserFixture;
   model?: string;
   maxIterations?: number;
   provider?: AIProvider;
@@ -90,9 +105,11 @@ export async function runGlobalEval(
     const model = options.model ?? "claude-haiku-4-5-20251001";
     const injectActiveEditorContext =
       process.env[DISABLE_ACTIVE_EDITOR_CONTEXT_ENV] !== "1";
+    // Pass the seeded identity straight to the prompt builder rather than mutating
+    // the process-global `userStore`, so concurrent cases never race on it.
     const rawResult = await runEval({
       userPrompt,
-      systemMessage: prepareGlobalSystemMessage(),
+      systemMessage: prepareGlobalSystemMessage(undefined, { user: options.user }),
       userMessage: prepareGlobalUserMessage(
         userPrompt,
         [],
diff --git a/ai_evals/adapters/frontend/mockBackend.ts b/ai_evals/adapters/frontend/mockBackend.ts
index b78351512d..f9023449a2 100644
--- a/ai_evals/adapters/frontend/mockBackend.ts
+++ b/ai_evals/adapters/frontend/mockBackend.ts
@@ -11,6 +11,7 @@ import type {
 	DataTableTables,
 	DataTableTableSchema,
 	GetDraftForUserResponse,
+	GetOwnDraftResponse,
 	ListDraftsResponse,
 	ScriptLang,
 	UpdateDraftResponse,
@@ -90,6 +91,13 @@ export function resetBenchmarkMockBackend(): void {
 	benchmarkDrafts.clear()
 }
 
+// Stand-in for FolderService.createFolder so the global create_folder tool runs in
+// memory instead of mutating the real backend. Folders aren't otherwise modelled
+// (no folder-listing in evals), so this just echoes the created name.
+export function createBenchmarkFolder(_workspace: string, name: string): string {
+	return name
+}
+
 export function registerBenchmarkWorkspace(workspace: string): void {
 	benchmarkWorkspaces.add(workspace)
 }
@@ -287,8 +295,8 @@ export function getBenchmarkJobLogs(workspace: string, jobId: string): string {
 /**
  * In-memory stand-in for the per-user draft backend (`DraftService`). The global
  * AI chat now persists and reads drafts through the backend DB instead of an
- * in-tab `UserDraft` cell, so the eval mocks the three draft endpoints it
- * exercises (`updateDraft` / `getDraftForUser` / `listDrafts`) and keeps the
+ * in-tab `UserDraft` cell, so the eval mocks the draft endpoints it exercises
+ * (`updateDraft` / `getOwnDraft` / `getDraftForUser` / `listDrafts`) and keeps the
  * saved values here, keyed by workspace + draft kind + storage path. Mirrors the
  * semantics of the production unit test's mock in
  * `frontend/src/lib/components/copilot/chat/global/core.test.ts`.
@@ -372,6 +380,20 @@ export function getBenchmarkDraftForUser(input: {
 	return { value: entry.value, created_at: BENCHMARK_DRAFT_TIMESTAMP }
 }
 
+/** Mirror `DraftService.getOwnDraft`: `null` (200) when absent — unlike
+ * `getDraftForUser`, absence is not an error on this route. */
+export function getBenchmarkOwnDraft(input: {
+	workspace: string
+	kind: UserDraftItemKind
+	path: string
+}): GetOwnDraftResponse {
+	const entry = benchmarkDrafts.get(benchmarkDraftKey(input.workspace, input.kind, input.path))
+	if (!entry) {
+		return null
+	}
+	return { value: entry.value, created_at: BENCHMARK_DRAFT_TIMESTAMP }
+}
+
 /** Mirror `DraftService.listDrafts`: metadata rows (no value) for a workspace. */
 export function listBenchmarkDrafts(workspace: string): ListDraftsResponse {
 	return [...benchmarkDrafts.values()]
diff --git a/ai_evals/adapters/frontend/mockBackendDrafts.test.ts b/ai_evals/adapters/frontend/mockBackendDrafts.test.ts
index a720de5e43..0ab79d216e 100644
--- a/ai_evals/adapters/frontend/mockBackendDrafts.test.ts
+++ b/ai_evals/adapters/frontend/mockBackendDrafts.test.ts
@@ -2,6 +2,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'bun:test'
 import {
 	clearBenchmarkDrafts,
 	getBenchmarkDraftForUser,
+	getBenchmarkOwnDraft,
 	listBenchmarkDrafts,
 	resetBenchmarkMockBackend,
 	seedBenchmarkDraft,
@@ -55,6 +56,27 @@ describe('mockBackend drafts', () => {
 		expect(() => getBenchmarkDraftForUser({ workspace: WORKSPACE, kind: 'variable', path: 'f/evals/token' })).toThrow()
 	})
 
+	it('returns null from getOwnDraft when no draft exists', () => {
+		expect(
+			getBenchmarkOwnDraft({ workspace: WORKSPACE, kind: 'trigger_schedule', path: 'u/evals/missing' })
+		).toBeNull()
+	})
+
+	// The global chat hydrates drawer-kind drafts (schedule/trigger/resource/variable)
+	// through getOwnDraft — getDraftForUser rejects those kinds as private.
+	it('hydrates a saved drawer-kind draft through getOwnDraft', () => {
+		const value = { path: 'u/evals/nightly', schedule: '0 0 9 * * *' }
+		updateBenchmarkDraft({
+			workspace: WORKSPACE,
+			kind: 'trigger_schedule',
+			path: 'u/evals/nightly',
+			requestBody: { value }
+		})
+		expect(
+			getBenchmarkOwnDraft({ workspace: WORKSPACE, kind: 'trigger_schedule', path: 'u/evals/nightly' })?.value
+		).toEqual(value)
+	})
+
 	it('throws a 404-shaped error when no draft exists', () => {
 		try {
 			getBenchmarkDraftForUser({ workspace: WORKSPACE, kind: 'script', path: 'f/evals/missing' })
diff --git a/ai_evals/adapters/frontend/runtime.ts b/ai_evals/adapters/frontend/runtime.ts
index 347e15191c..9a54e86084 100644
--- a/ai_evals/adapters/frontend/runtime.ts
+++ b/ai_evals/adapters/frontend/runtime.ts
@@ -24,6 +24,8 @@ export async function runFrontendBenchmarkAdapter(input: {
   runs: number;
   model?: string;
   verbose?: boolean;
+  skipJudge?: boolean;
+  executionOnly?: boolean;
   backendValidation?: string;
 }): Promise<BenchmarkRunResult> {
   const tempDir = await mkdtemp(
@@ -40,6 +42,9 @@ export async function runFrontendBenchmarkAdapter(input: {
     WMILL_FRONTEND_AI_EVAL_MODEL: input.model ?? "",
     WMILL_FRONTEND_AI_EVAL_PROGRESS: "1",
     WMILL_FRONTEND_AI_EVAL_VERBOSE: input.verbose ? "1" : "0",
+    WMILL_FRONTEND_AI_EVAL_SKIP_JUDGE:
+      input.skipJudge || input.executionOnly ? "1" : "0",
+    WMILL_FRONTEND_AI_EVAL_EXECUTION_ONLY: input.executionOnly ? "1" : "0",
     WMILL_FRONTEND_AI_EVAL_BACKEND_VALIDATION: input.backendValidation ?? "",
   };
 
diff --git a/ai_evals/adapters/frontend/vitestAdapter.test.ts b/ai_evals/adapters/frontend/vitestAdapter.test.ts
index 621ecaefcd..92e33414df 100644
--- a/ai_evals/adapters/frontend/vitestAdapter.test.ts
+++ b/ai_evals/adapters/frontend/vitestAdapter.test.ts
@@ -40,6 +40,7 @@ vi.mock('$lib/gen', async () => {
 		getBenchmarkDraftForUser,
 		getBenchmarkFlowByPath,
 		getBenchmarkJobLogs,
+		getBenchmarkOwnDraft,
 		getBenchmarkScriptByHash,
 		getBenchmarkScriptByPath,
 		hasBenchmarkWorkspace,
@@ -49,6 +50,7 @@ vi.mock('$lib/gen', async () => {
 		listBenchmarkFlows,
 		listBenchmarkJobs,
 		listBenchmarkScripts,
+		createBenchmarkFolder,
 		createBenchmarkHttpTrigger,
 		createBenchmarkSchedule,
 		previewBenchmarkSchedule,
@@ -85,11 +87,21 @@ vi.mock('$lib/gen', async () => {
 				hasBenchmarkWorkspace(data.workspace)
 					? getBenchmarkDraftForUser(data)
 					: actual.DraftService.getDraftForUser(data),
+			getOwnDraft: async (data: { workspace: string; kind: any; path: string }) =>
+				hasBenchmarkWorkspace(data.workspace)
+					? getBenchmarkOwnDraft(data)
+					: actual.DraftService.getOwnDraft(data),
 			listDrafts: async (data: { workspace: string }) =>
 				hasBenchmarkWorkspace(data.workspace)
 					? listBenchmarkDrafts(data.workspace)
 					: actual.DraftService.listDrafts(data)
 		}),
+		FolderService: wrapService(actual.FolderService, {
+			createFolder: async (data: { workspace: string; requestBody: { name: string } }) =>
+				hasBenchmarkWorkspace(data.workspace)
+					? createBenchmarkFolder(data.workspace, data.requestBody.name)
+					: actual.FolderService.createFolder(data)
+		}),
 		ScriptService: wrapService(actual.ScriptService, {
 			listScripts: async (data: { workspace: string }) =>
 				hasBenchmarkWorkspace(data.workspace)
diff --git a/ai_evals/cases/flow.yaml b/ai_evals/cases/flow.yaml
index 5f4abafc48..a21ae81f17 100644
--- a/ai_evals/cases/flow.yaml
+++ b/ai_evals/cases/flow.yaml
@@ -359,6 +359,8 @@
       - request_approval
       - finalize_purchase
     topLevelStepTypes:
+      - id: request_approval
+        type: [rawscript, script]
       - id: finalize_purchase
         type: rawscript
     schemaRequiredPaths:
@@ -373,6 +375,7 @@
   judgeChecklist:
     - "the flow includes an approval step named `request_approval`"
     - "`request_approval` pauses the flow and asks the approver for a comment"
+    - "`request_approval` is a real script step that generates approval/resume URLs (e.g. via `getResumeUrls`) so approvers receive an actionable link, not a no-op passthrough (identity) step"
     - one approval is enough to continue
     - "the flow includes a final step named `finalize_purchase`"
     - "`finalize_purchase` returns an approved status object after approval"
diff --git a/ai_evals/cases/global.yaml b/ai_evals/cases/global.yaml
index 319d13b272..0f7f2a4717 100644
--- a/ai_evals/cases/global.yaml
+++ b/ai_evals/cases/global.yaml
@@ -3,8 +3,9 @@
     Create a draft Bun script at `f/evals/global/greet_user`.
     It should take a string `name` input and return `Hello, ${name}!`.
     Leave it as an AI draft only; do not deploy or save it.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json
   runtime:
-    maxTurns: 8
+    maxTurns: 10
   validate:
     draftCountExactly: 1
     requiredDrafts:
@@ -871,6 +872,207 @@
     - fetches the logs for the requested job id
     - explains the failure from the returned logs (connection refused to the upstream API)
 
+# --- Page navigation (open_page) ---
+# The assistant should take the user to a Windmill page (Runs/Schedules) with the
+# right filters via open_page, rather than describing where to click or dumping the
+# data. No draft is produced, so the global judge is skipped and we validate the
+# tool call and its arguments.
+
+- id: global-openpage1-runs-failed-of-script
+  prompt: |-
+    Take me to the failed runs of the script at f/evals/global/greet_user so I can see what's going wrong.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - open_page
+    forbiddenToolsUsed:
+      - write_script
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: open_page
+        field: page
+        stringIncludesAnyOf:
+          - runs
+      - tool: open_page
+        field: status
+        stringIncludesAnyOf:
+          - failure
+      - tool: open_page
+        field: path
+        stringIncludesAnyOf:
+          - f/evals/global/greet_user
+  skipJudge: true
+  judgeChecklist:
+    - opens the Runs page filtered to the failed runs of f/evals/global/greet_user
+    - applies both the failure status and the script path as filters
+    - does not write, deploy, or delete anything
+
+- id: global-openpage2-runs-of-schedule
+  prompt: |-
+    Open the runs page filtered to the jobs triggered by the schedule f/evals/global/nightly_digest.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - open_page
+    forbiddenToolsUsed:
+      - write_script
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: open_page
+        field: page
+        stringIncludesAnyOf:
+          - runs
+      - tool: open_page
+        field: schedule_path
+        stringIncludesAnyOf:
+          - f/evals/global/nightly_digest
+  skipJudge: true
+  judgeChecklist:
+    - opens the Runs page filtered to jobs triggered by the f/evals/global/nightly_digest schedule
+    - passes the schedule path as the filter
+    - does not write, deploy, or delete anything
+
+- id: global-openpage3-open-schedule
+  prompt: |-
+    Open the schedule f/evals/global/nightly_digest so I can review and edit it.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - open_page
+    forbiddenToolsUsed:
+      - write_schedule
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: open_page
+        field: page
+        stringIncludesAnyOf:
+          - schedules
+      - tool: open_page
+        field: open
+        stringIncludesAnyOf:
+          - f/evals/global/nightly_digest
+  skipJudge: true
+  judgeChecklist:
+    - opens the Schedules page and targets the f/evals/global/nightly_digest schedule for editing
+    - passes the schedule path so the editor opens on it
+    - does not write, deploy, or delete anything
+
+- id: global-openpage4-workspace-settings-tab
+  prompt: |-
+    Take me to the Git sync configuration for this workspace.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - open_page
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: open_page
+        field: page
+        stringIncludesAnyOf:
+          - workspace_settings
+      - tool: open_page
+        field: tab
+        stringIncludesAnyOf:
+          - git_sync
+  skipJudge: true
+  judgeChecklist:
+    - opens the Workspace settings page on the git_sync tab
+    - does not write, deploy, or delete anything
+
+- id: global-openpage5-audit-logs-user
+  prompt: |-
+    Open the audit logs filtered to actions performed by the user admin.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - open_page
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: open_page
+        field: page
+        stringIncludesAnyOf:
+          - audit_logs
+      - tool: open_page
+        field: username
+        stringIncludesAnyOf:
+          - admin
+  skipJudge: true
+  judgeChecklist:
+    - opens the Audit logs page filtered to the admin user
+    - does not write, deploy, or delete anything
+
+- id: global-openpage6-triggers-kind
+  prompt: |-
+    Take me to the Kafka triggers for this workspace.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - open_page
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: open_page
+        field: page
+        stringIncludesAnyOf:
+          - triggers
+      - tool: open_page
+        field: trigger_kind
+        stringIncludesAnyOf:
+          - kafka
+  skipJudge: true
+  judgeChecklist:
+    - opens the Kafka triggers page
+    - does not write, deploy, or delete anything
+
+- id: global-closepage1-close-runs-tab
+  prompt: |-
+    You just opened the runs page for me in the side panel. Close that tab, I'm done looking at it.
+  runtime:
+    maxTurns: 6
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - close_page
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+    toolCallArgs:
+      - tool: close_page
+        field: match
+        stringIncludesAnyOf:
+          - runs
+  skipJudge: true
+  judgeChecklist:
+    - closes the runs preview tab in the side panel
+    - does not write, deploy, or delete anything
+
 # --- Documentation search (search_docs) ---
 # Pure product-knowledge questions: the assistant should consult the docs via
 # search_docs and answer conversationally, not draft or mutate anything. No
@@ -1113,3 +1315,197 @@
     - renames the formatCurrency definition, imports, and all call sites to formatMoney
     - leaves the unrelated formatCurrencyPrecise helper unchanged
     - leaves the result as an AI draft only
+
+# --- Path selection (u/<user> vs f/<folder>) ---
+# These cases assert how the assistant picks a workspace path when the user gives
+# none: a bare name defaults to the personal scope `u/<user>/`, an existing folder
+# whose purpose matches is used, a non-admin targets a writable folder and never a
+# read-only one, and shared intent with no matching folder asks rather than invents.
+# Each depends on the seeded `user` fixture (username / is_admin / folders /
+# folders_read) so the prompt's folder guidance and `u/{username}` are well-formed.
+
+- id: global-path1-bare-name-defaults-to-personal
+  prompt: |-
+    Stage a quick draft helper that takes a string and returns it trimmed of
+    leading and trailing whitespace. Just keep it as a draft.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_empty.json
+  runtime:
+    maxTurns: 8
+  validate:
+    draftCountExactly: 1
+    requiredDrafts:
+      - type: script
+        pathStartsWith: u/admin/
+  toolExpect:
+    requiredToolsUsed:
+      - write_script
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+  skipJudge: true
+  judgeChecklist:
+    - stages a single script draft for a trim helper
+    - defaults the path to the current user's personal scope (u/admin/...) since no path or folder was given
+    - does not invent an f/<folder> path
+    - leaves the result as a draft only
+
+- id: global-path2-match-existing-folder
+  prompt: |-
+    Draft a flow for the marketing team's weekly campaign report.
+    It should take a week number and return a short summary string.
+    Keep it as a draft only.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_folders.json
+  runtime:
+    maxTurns: 10
+  validate:
+    draftCountExactly: 1
+    requiredDrafts:
+      - type: flow
+        pathStartsWith: f/marketing/
+  toolExpect:
+    requiredToolsUsed:
+      - write_flow
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+  skipJudge: true
+  judgeChecklist:
+    - drafts a flow for the marketing campaign report
+    - places it in the existing marketing folder (f/marketing/...) rather than the personal scope or an invented folder
+    - leaves the result as a draft only
+
+- id: global-path3-shared-intent-unknown-folder-asks
+  prompt: |-
+    Put together a draft onboarding checklist flow for the People Ops team to use
+    when a new hire joins. Keep it as a draft.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_folders.json
+  runtime:
+    maxTurns: 8
+  validate:
+    draftCountExactly: 0
+  toolExpect:
+    requiredToolsUsed:
+      - askUserQuestion
+    forbiddenToolsUsed:
+      - write_flow
+      - write_script
+      - deploy_workspace_item
+      - delete_workspace_item
+  skipJudge: true
+  judgeChecklist:
+    - recognizes the request implies shared/team work but names no existing folder (none of marketing/data_engineering/shared_utils fit People Ops)
+    - asks which folder to use instead of guessing or inventing one
+    - does not create a draft until the folder is known
+
+- id: global-path4-nonadmin-avoids-readonly-folder
+  prompt: |-
+    Draft a small flow that returns today's date as an ISO string, and stage it in
+    one of our shared team folders. Keep it as a draft.
+  initial: ai_evals/fixtures/frontend/global/initial/user_bob_nonadmin_teams.json
+  runtime:
+    maxTurns: 10
+  validate:
+    draftCountExactly: 1
+    requiredDrafts:
+      - type: flow
+        pathStartsWith: f/team_a/
+    forbiddenDrafts:
+      - type: flow
+        pathStartsWith: f/team_b/
+  toolExpect:
+    requiredToolsUsed:
+      - write_flow
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+  skipJudge: true
+  judgeChecklist:
+    - drafts a flow that returns the current date as an ISO string
+    - places it in team_a (writable by this non-admin user) and not team_b (read-only)
+    - leaves the result as a draft only
+
+- id: global-test-pipeline-create-node
+  prompt: |-
+    Set up the first step of a data pipeline at `f/evals/global/orders_ingest`.
+    On a schedule, it should pull raw orders and land them in a managed DuckLake
+    table so later steps can build on it. Keep it as an AI draft only — don't
+    deploy or save it.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json
+  runtime:
+    maxTurns: 10
+  validate:
+    draftCountExactly: 1
+    requiredDrafts:
+      - type: script
+        path: f/evals/global/orders_ingest
+        valueIncludes:
+          - pipeline
+    forbiddenDrafts:
+      - type: flow
+        pathStartsWith: f/evals/global/
+  toolExpect:
+    requiredToolsUsed:
+      - write_script
+    forbiddenToolsUsed:
+      - write_flow
+      - deploy_workspace_item
+      - delete_workspace_item
+  judgeChecklist:
+    - builds a data pipeline node as a script (not a flow)
+    - marks the script as a pipeline member with the pipeline annotation in the script's comment syntax (`-- pipeline` for a DuckDB/SQL node, not `// pipeline`)
+    - declares a schedule trigger and writes its output to a managed DuckLake table
+    - leaves the result as an AI draft and does not deploy or save it
+
+- id: global-test-pipeline-two-node-chain
+  prompt: |-
+    Build a small data pipeline in the `f/evals/global` folder: one step that
+    ingests orders into a DuckLake table, and a second step that reads that table
+    and writes a daily order-count rollup table. Wire the second step to run off
+    the first step's output. Keep everything as drafts — don't deploy.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json
+  runtime:
+    maxTurns: 14
+  validate:
+    draftCountAtLeast: 2
+    forbiddenDrafts:
+      - type: flow
+        pathStartsWith: f/evals/global/
+  toolExpect:
+    requiredToolsUsed:
+      - write_script
+    forbiddenToolsUsed:
+      - write_flow
+      - deploy_workspace_item
+      - delete_workspace_item
+  judgeChecklist:
+    - creates two data pipeline nodes as scripts (not a flow) in f/evals/global
+    - both scripts carry the pipeline annotation in their comment syntax (`-- pipeline` for DuckDB/SQL nodes, not `// pipeline`)
+    - the first ingests orders into a DuckLake table
+    - the second reads that same table and writes a daily rollup, wired to the first step's output asset
+    - leaves both as AI drafts without deploying
+
+- id: global-path5-create-folder-then-draft
+  prompt: |-
+    Create a new shared folder called "analytics" for our data work, then draft a
+    script in it that returns the current timestamp as an ISO string. Keep the
+    script as a draft.
+  initial: ai_evals/fixtures/frontend/global/initial/user_admin_empty.json
+  runtime:
+    maxTurns: 10
+  validate:
+    draftCountExactly: 1
+    requiredDrafts:
+      - type: script
+        pathStartsWith: f/analytics/
+  toolExpect:
+    requiredToolsUsed:
+      - create_folder
+      - write_script
+    forbiddenToolsUsed:
+      - deploy_workspace_item
+      - delete_workspace_item
+  skipJudge: true
+  judgeChecklist:
+    - creates a new shared folder named "analytics" via create_folder
+    - drafts a script placed in that folder (f/analytics/...) returning an ISO timestamp
+    - leaves the script as a draft only
diff --git a/ai_evals/cli/index.ts b/ai_evals/cli/index.ts
index f92d6d7027..504b8a8d13 100644
--- a/ai_evals/cli/index.ts
+++ b/ai_evals/cli/index.ts
@@ -25,7 +25,9 @@ import {
 import { runSuite } from "../core/runSuite";
 import { EVAL_MODES, type EvalMode } from "../core/types";
 import { DEFAULT_JUDGE_MODEL } from "../core/judge";
-import { createCliModeRunner } from "../modes/cli";
+// createCliModeRunner is imported lazily in runCliBenchmark so the non-cli modes
+// (global/flow/script/app) don't pull in the wmill CLI toolchain and its JSR deps
+// (e.g. @cliffy/*) just to load this entrypoint.
 import { runFrontendBenchmarkAdapter } from "../adapters/frontend/runtime";
 import { resolveWindmillBackendSettings } from "../core/windmillBackendSettings";
 import { assertWindmillBackendReachable } from "../adapters/frontend/windmillBackend";
@@ -97,6 +99,11 @@ async function main() {
       "comma-separated model aliases to run sequentially",
     )
     .option("--verbose", "stream assistant output during frontend runs")
+    .option("--skip-judge", "skip LLM judge scoring for this run")
+    .option(
+      "--execution-only",
+      "only require the model/proxy/frontend loop to complete",
+    )
     .option(
       "--record",
       "append a compact summary line to ai_evals/history/<mode>.jsonl",
@@ -115,6 +122,8 @@ async function main() {
           model?: string;
           models?: string;
           verbose?: boolean;
+          skipJudge?: boolean;
+          executionOnly?: boolean;
           record?: boolean;
           backendValidation?: string;
         },
@@ -127,6 +136,8 @@ async function main() {
           model: options.model,
           models: options.models,
           verbose: options.verbose ?? false,
+          skipJudge: options.skipJudge ?? false,
+          executionOnly: options.executionOnly ?? false,
           record: options.record ?? false,
           backendValidation: options.backendValidation,
         });
@@ -175,6 +186,8 @@ async function handleRun(input: {
   model?: string;
   models?: string;
   verbose: boolean;
+  skipJudge: boolean;
+  executionOnly: boolean;
   record: boolean;
   backendValidation?: string;
 }) {
@@ -230,6 +243,8 @@ async function handleRun(input: {
             input.runs,
             getCliEvalModel(model),
             runModel,
+            input.skipJudge,
+            input.executionOnly,
           )
         : await runFrontendBenchmarkAdapter({
             mode: input.mode,
@@ -237,6 +252,8 @@ async function handleRun(input: {
             runs: input.runs,
             model: model.id,
             verbose: input.verbose,
+            skipJudge: input.skipJudge,
+            executionOnly: input.executionOnly,
             backendValidation,
           });
 
@@ -278,20 +295,25 @@ async function runCliBenchmark(
   runs: number,
   model: ReturnType<typeof getCliEvalModel>,
   runModel: string,
+  skipJudge: boolean,
+  executionOnly: boolean,
 ) {
+  const { createCliModeRunner } = await import("../modes/cli");
+  const judgeModel = skipJudge || executionOnly ? null : DEFAULT_JUDGE_MODEL;
   const caseResults = await runSuite({
     modeRunner: createCliModeRunner(model),
     cases,
     runs,
     runModel,
-    judgeModel: DEFAULT_JUDGE_MODEL,
+    judgeModel,
+    executionOnly,
   });
 
   return buildRunResult({
     mode: "cli",
     runs,
     runModel,
-    judgeModel: DEFAULT_JUDGE_MODEL,
+    judgeModel,
     caseResults,
   });
 }
diff --git a/ai_evals/core/cases.test.ts b/ai_evals/core/cases.test.ts
index 9955a73fa9..5d6e3245db 100644
--- a/ai_evals/core/cases.test.ts
+++ b/ai_evals/core/cases.test.ts
@@ -212,6 +212,9 @@ describe("loadCases", () => {
         },
       ],
     });
+    expect(caseEntry?.initialPath).toContain(
+      "ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json"
+    );
     expect(caseEntry?.toolExpect).toMatchObject({
       requiredToolsUsed: ["write_script"],
       forbiddenToolsUsed: ["deploy_workspace_item", "delete_workspace_item"],
diff --git a/ai_evals/core/runSuite.test.ts b/ai_evals/core/runSuite.test.ts
new file mode 100644
index 0000000000..26f300a5aa
--- /dev/null
+++ b/ai_evals/core/runSuite.test.ts
@@ -0,0 +1,102 @@
+import { describe, expect, it } from "bun:test";
+import { runSuite } from "./runSuite";
+import type { ModeRunner } from "./types";
+
+const modeRunner: ModeRunner<undefined, undefined, { ok: boolean }> = {
+  mode: "global",
+  concurrency: 1,
+  loadInitial: async () => undefined,
+  loadExpected: async () => undefined,
+  run: async () => ({
+    success: true,
+    actual: { ok: true },
+    assistantMessageCount: 1,
+    toolCallCount: 0,
+    toolsUsed: [],
+    skillsInvoked: [],
+    tokenUsage: null,
+  }),
+  validate: () => [],
+};
+
+describe("runSuite", () => {
+  it("skips judge checks when the run disables judge scoring", async () => {
+    const [caseResult] = await runSuite({
+      modeRunner,
+      cases: [
+        {
+          id: "case-1",
+          prompt: "Create a draft script",
+          judgeChecklist: ["the output satisfies the prompt"],
+        },
+      ],
+      runs: 1,
+      runModel: "model-under-test",
+      judgeModel: null,
+    });
+
+    const [attempt] = caseResult.attempts;
+    expect(attempt.passed).toBe(true);
+    expect(attempt.judgeScore).toBeNull();
+    expect(attempt.judgeSummary).toBeNull();
+    expect(attempt.checks.map((check) => check.name)).toEqual([
+      "run succeeded",
+    ]);
+  });
+
+  it("only requires run success when execution-only is enabled", async () => {
+    let loadExpectedCalls = 0;
+    let validateCalls = 0;
+    let backendValidateCalls = 0;
+
+    const executionOnlyRunner: ModeRunner<
+      undefined,
+      undefined,
+      { ok: boolean }
+    > = {
+      ...modeRunner,
+      loadExpected: async () => {
+        loadExpectedCalls++;
+        return undefined;
+      },
+      validate: () => {
+        validateCalls++;
+        return [{ name: "validator failed", passed: false }];
+      },
+      backendValidate: async () => {
+        backendValidateCalls++;
+        return {
+          checks: [{ name: "backend validation failed", passed: false }],
+        };
+      },
+    };
+
+    const [caseResult] = await runSuite({
+      modeRunner: executionOnlyRunner,
+      cases: [
+        {
+          id: "case-1",
+          prompt: "Create a draft script",
+          expectedPath: "fixtures/expected.json",
+          toolExpect: { requiredToolsUsed: ["write_script"] },
+          judgeChecklist: ["the output satisfies the prompt"],
+        },
+      ],
+      runs: 1,
+      runModel: "model-under-test",
+      judgeModel: "judge-model",
+      executionOnly: true,
+    });
+
+    const [attempt] = caseResult.attempts;
+    expect(attempt.passed).toBe(true);
+    expect(attempt.judgeScore).toBeNull();
+    expect(attempt.judgeSummary).toBeNull();
+    expect(attempt.checks.map((check) => check.name)).toEqual([
+      "run succeeded",
+    ]);
+    expect(loadExpectedCalls).toBe(0);
+    expect(validateCalls).toBe(0);
+    expect(backendValidateCalls).toBe(0);
+  });
+});
diff --git a/ai_evals/core/runSuite.ts b/ai_evals/core/runSuite.ts
index 1438749a11..4a8c9dab7b 100644
--- a/ai_evals/core/runSuite.ts
+++ b/ai_evals/core/runSuite.ts
@@ -15,11 +15,13 @@ export async function runSuite<TInitial, TExpected, TActual>(input: {
   runs: number;
   runModel: string | null;
   judgeModel?: string | null;
+  executionOnly?: boolean;
   concurrency?: number;
   verbose?: boolean;
   onProgress?: (event: FrontendBenchmarkProgressEvent) => void;
 }): Promise<BenchmarkCaseResult[]> {
-  const judgeModel = input.judgeModel ?? DEFAULT_JUDGE_MODEL;
+  const judgeModel =
+    input.judgeModel === undefined ? DEFAULT_JUDGE_MODEL : input.judgeModel;
   const concurrency = Math.max(1, input.concurrency ?? input.modeRunner.concurrency);
   const results = new Array<BenchmarkCaseResult>(input.cases.length);
   let cursor = 0;
@@ -52,6 +54,7 @@ export async function runSuite<TInitial, TExpected, TActual>(input: {
           runs: input.runs,
           judgeModel,
           judgeThreshold: input.modeRunner.judgeThreshold ?? 80,
+          executionOnly: input.executionOnly ?? false,
           modeRunner: input.modeRunner,
           totalCases: input.cases.length,
           verbose: input.verbose ?? false,
@@ -72,8 +75,9 @@ async function runCaseAttempts<TInitial, TExpected, TActual>(input: {
   caseIndex: number;
   evalCase: EvalCase;
   runs: number;
-  judgeModel: string;
+  judgeModel: string | null;
   judgeThreshold: number;
+  executionOnly: boolean;
   modeRunner: ModeRunner<TInitial, TExpected, TActual>;
   totalCases: number;
   verbose: boolean;
@@ -99,7 +103,9 @@ async function runCaseAttempts<TInitial, TExpected, TActual>(input: {
 
     try {
       const initial = await input.modeRunner.loadInitial(input.evalCase.initialPath);
-      const expected = await input.modeRunner.loadExpected(input.evalCase.expectedPath);
+      const expected = input.executionOnly
+        ? undefined
+        : await input.modeRunner.loadExpected(input.evalCase.expectedPath);
       const run = await input.modeRunner.run(input.evalCase.prompt, initial, {
         evalCase: input.evalCase,
         caseId: input.evalCase.id,
@@ -162,22 +168,30 @@ async function runCaseAttempts<TInitial, TExpected, TActual>(input: {
       });
       const checks: BenchmarkCheck[] = [
         buildCheck("run succeeded", run.success, run.error),
-        ...input.modeRunner.validate({
-          evalCase: input.evalCase,
-          prompt: input.evalCase.prompt,
-          initial,
-          expected,
-          actual: run.actual,
-          run,
-        }),
-        ...validateToolExpectations({
-          run,
-          toolExpect: input.evalCase.toolExpect,
-        }),
       ];
+      if (!input.executionOnly) {
+        checks.push(
+          ...input.modeRunner.validate({
+            evalCase: input.evalCase,
+            prompt: input.evalCase.prompt,
+            initial,
+            expected,
+            actual: run.actual,
+            run,
+          }),
+          ...validateToolExpectations({
+            run,
+            toolExpect: input.evalCase.toolExpect,
+          })
+        );
+      }
       const artifactFiles = input.modeRunner.buildArtifacts?.(run.actual) ?? [];
 
-      if (run.success && input.modeRunner.backendValidate) {
+      if (
+        run.success &&
+        !input.executionOnly &&
+        input.modeRunner.backendValidate
+      ) {
         try {
           const backendValidation = await input.modeRunner.backendValidate({
             evalCase: input.evalCase,
@@ -218,7 +232,12 @@ async function runCaseAttempts<TInitial, TExpected, TActual>(input: {
       let judgeScore: number | null = null;
       let judgeSummary: string | null = null;
 
-      if (run.success && !input.evalCase.skipJudge) {
+      if (
+        run.success &&
+        !input.executionOnly &&
+        input.judgeModel !== null &&
+        !input.evalCase.skipJudge
+      ) {
         const judge = await judgeOutput({
           mode: input.modeRunner.mode,
           prompt: input.evalCase.prompt,
diff --git a/ai_evals/core/types.ts b/ai_evals/core/types.ts
index 52667fa321..f142bc8d36 100644
--- a/ai_evals/core/types.ts
+++ b/ai_evals/core/types.ts
@@ -47,7 +47,7 @@ export interface FlowValidationSpec {
   }>;
   topLevelStepTypes?: Array<{
     id: string;
-    type: string;
+    type: string | string[];
   }>;
   moduleRules?: Array<{
     id: string;
diff --git a/ai_evals/core/validators.ts b/ai_evals/core/validators.ts
index 23a6709f9b..7570ccd12d 100644
--- a/ai_evals/core/validators.ts
+++ b/ai_evals/core/validators.ts
@@ -1378,11 +1378,14 @@ function validateFlowRequirements(
       continue;
     }
 
+    const allowedTypes = Array.isArray(requiredStep.type)
+      ? requiredStep.type
+      : [requiredStep.type];
     checks.push(
       check(
         `${requiredStep.id} type matches required`,
-        getModuleType(module) === requiredStep.type,
-        `expected ${requiredStep.type}, got ${getModuleType(module) ?? "(missing)"}`
+        allowedTypes.includes(getModuleType(module) ?? ""),
+        `expected ${allowedTypes.join(" or ")}, got ${getModuleType(module) ?? "(missing)"}`
       )
     );
   }
diff --git a/ai_evals/fixtures/frontend/global/initial/user_admin_empty.json b/ai_evals/fixtures/frontend/global/initial/user_admin_empty.json
new file mode 100644
index 0000000000..8c81142fb0
--- /dev/null
+++ b/ai_evals/fixtures/frontend/global/initial/user_admin_empty.json
@@ -0,0 +1,6 @@
+{
+  "user": {
+    "username": "admin",
+    "is_admin": true
+  }
+}
diff --git a/ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json b/ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json
new file mode 100644
index 0000000000..236f091bc2
--- /dev/null
+++ b/ai_evals/fixtures/frontend/global/initial/user_admin_evals_folder.json
@@ -0,0 +1,8 @@
+{
+  "user": {
+    "username": "admin",
+    "is_admin": true,
+    "folders": ["evals"],
+    "folders_read": ["evals"]
+  }
+}
diff --git a/ai_evals/fixtures/frontend/global/initial/user_admin_folders.json b/ai_evals/fixtures/frontend/global/initial/user_admin_folders.json
new file mode 100644
index 0000000000..7f7e237f36
--- /dev/null
+++ b/ai_evals/fixtures/frontend/global/initial/user_admin_folders.json
@@ -0,0 +1,8 @@
+{
+  "user": {
+    "username": "admin",
+    "is_admin": true,
+    "folders": ["marketing", "data_engineering", "shared_utils"],
+    "folders_read": ["marketing", "data_engineering", "shared_utils"]
+  }
+}
diff --git a/ai_evals/fixtures/frontend/global/initial/user_bob_nonadmin_teams.json b/ai_evals/fixtures/frontend/global/initial/user_bob_nonadmin_teams.json
new file mode 100644
index 0000000000..6320cef4d3
--- /dev/null
+++ b/ai_evals/fixtures/frontend/global/initial/user_bob_nonadmin_teams.json
@@ -0,0 +1,8 @@
+{
+  "user": {
+    "username": "bob",
+    "is_admin": false,
+    "folders": ["team_a"],
+    "folders_read": ["team_a", "team_b"]
+  }
+}
diff --git a/ai_evals/modes/global.ts b/ai_evals/modes/global.ts
index 2cf5413f59..050a4caad9 100644
--- a/ai_evals/modes/global.ts
+++ b/ai_evals/modes/global.ts
@@ -4,6 +4,7 @@ import { loadAppFixtureForEval } from "../adapters/frontend/core/app/appFixtureL
 import {
   runGlobalEval,
   type GlobalLiveEditorDraftFixture,
+  type GlobalUserFixture,
 } from "../adapters/frontend/core/global/globalEvalRunner";
 import type { BenchmarkWorkspaceRunnables } from "../adapters/frontend/mockBackend";
 import type { FrontendEvalModelConfig } from "../core/models";
@@ -15,6 +16,7 @@ import { getFrontendApiKey } from "./frontendCommon";
 export interface GlobalInitialFixture {
   workspace?: BenchmarkWorkspaceRunnables;
   liveEditorDrafts?: GlobalLiveEditorDraftFixture[];
+  user?: GlobalUserFixture;
 }
 
 export function createGlobalModeRunner(
@@ -38,6 +40,7 @@ export function createGlobalModeRunner(
         {
           workspaceFixtures: initial?.workspace,
           liveEditorDrafts: initial?.liveEditorDrafts,
+          user: initial?.user,
           maxIterations: context.evalCase?.runtime?.maxTurns,
           provider: modelConfig.provider,
           model: modelConfig.model,
@@ -104,6 +107,7 @@ async function loadGlobalInitialFixture(path: string): Promise<GlobalInitialFixt
   return {
     workspace: parsed.workspace ?? {},
     liveEditorDrafts: parsed.liveEditorDrafts ?? [],
+    user: parsed.user,
   };
 }
 
diff --git a/backend/.sqlx/query-002a606e71364b0581dbc496bf4337f276861dc71d2e277a7aef711543eb14d7.json b/backend/.sqlx/query-002a606e71364b0581dbc496bf4337f276861dc71d2e277a7aef711543eb14d7.json
new file mode 100644
index 0000000000..abae0ba456
--- /dev/null
+++ b/backend/.sqlx/query-002a606e71364b0581dbc496bf4337f276861dc71d2e277a7aef711543eb14d7.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n               COUNT(*)::bigint AS \"total!\",\n               COUNT(*) FILTER (WHERE name = ANY($2::text[]))::bigint AS \"replacing!\"\n           FROM ai_skill\n           WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "replacing!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "002a606e71364b0581dbc496bf4337f276861dc71d2e277a7aef711543eb14d7"
+}
diff --git a/backend/.sqlx/query-00e9fc3fed9379264881c58df9404ab3569a0611b33c261602d62e9c847c583e.json b/backend/.sqlx/query-00e9fc3fed9379264881c58df9404ab3569a0611b33c261602d62e9c847c583e.json
new file mode 100644
index 0000000000..13536a244e
--- /dev/null
+++ b/backend/.sqlx/query-00e9fc3fed9379264881c58df9404ab3569a0611b33c261602d62e9c847c583e.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM datatable_migrations WHERE workspace_id = $1 AND datatable = ANY($2::text[])",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "00e9fc3fed9379264881c58df9404ab3569a0611b33c261602d62e9c847c583e"
+}
diff --git a/backend/.sqlx/query-01732ca02b1888145c48c4e51e5b5829657224a743af9c0b2d5a140ad70e13dd.json b/backend/.sqlx/query-01732ca02b1888145c48c4e51e5b5829657224a743af9c0b2d5a140ad70e13dd.json
new file mode 100644
index 0000000000..a0d8b66a26
--- /dev/null
+++ b/backend/.sqlx/query-01732ca02b1888145c48c4e51e5b5829657224a743af9c0b2d5a140ad70e13dd.json
@@ -0,0 +1,33 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE materialized_asset_schema\n                    SET snapshot_id = $5, job_id = $6, captured_at = now()\n                  WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3\n                    AND version = $4",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        },
+        "Text",
+        "Int8",
+        "Int8",
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "01732ca02b1888145c48c4e51e5b5829657224a743af9c0b2d5a140ad70e13dd"
+}
diff --git a/backend/.sqlx/query-02e526146f3584cd599dec708e1be48db3b0cd1c74adbfa2e4039377daa016f0.json b/backend/.sqlx/query-02e526146f3584cd599dec708e1be48db3b0cd1c74adbfa2e4039377daa016f0.json
deleted file mode 100644
index 5ca75fe782..0000000000
--- a/backend/.sqlx/query-02e526146f3584cd599dec708e1be48db3b0cd1c74adbfa2e4039377daa016f0.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        DELETE FROM asset\n        WHERE (workspace_id, path, kind) IN (\n            SELECT workspace_id, path, kind FROM (\n                SELECT a.workspace_id, a.path, a.kind, a.usage_kind, ROW_NUMBER() OVER (\n                    PARTITION BY a.workspace_id, a.path, a.kind\n                    ORDER BY a.created_at DESC\n                ) as rn,\n                limits.max_n\n                FROM asset a\n                INNER JOIN (\n                    SELECT * FROM UNNEST(\n                        $1::varchar[], \n                        $2::varchar[], \n                        $3::asset_kind[],\n                        $4::int[]\n                    ) AS t(workspace_id, path, kind, max_n)\n                ) limits\n                ON a.workspace_id = limits.workspace_id \n                AND a.path = limits.path \n                AND a.kind = limits.kind\n                WHERE a.usage_kind = 'job'\n            ) ranked\n            WHERE rn > max_n\n        )",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "VarcharArray",
-        "VarcharArray",
-        {
-          "Custom": {
-            "name": "asset_kind[]",
-            "kind": {
-              "Array": {
-                "Custom": {
-                  "name": "asset_kind",
-                  "kind": {
-                    "Enum": [
-                      "s3object",
-                      "resource",
-                      "variable",
-                      "ducklake",
-                      "datatable",
-                      "volume"
-                    ]
-                  }
-                }
-              }
-            }
-          }
-        },
-        "Int4Array"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "02e526146f3584cd599dec708e1be48db3b0cd1c74adbfa2e4039377daa016f0"
-}
diff --git a/backend/.sqlx/query-0621faf69b1ef866a95f6310c9651875df409a2d2d72ada629bd71e8abdbbf8b.json b/backend/.sqlx/query-0621faf69b1ef866a95f6310c9651875df409a2d2d72ada629bd71e8abdbbf8b.json
new file mode 100644
index 0000000000..036e8e4b57
--- /dev/null
+++ b/backend/.sqlx/query-0621faf69b1ef866a95f6310c9651875df409a2d2d72ada629bd71e8abdbbf8b.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace_settings SET deploy_to = $1 WHERE deploy_to = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0621faf69b1ef866a95f6310c9651875df409a2d2d72ada629bd71e8abdbbf8b"
+}
diff --git a/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json b/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json
index e7ed0aee65..d29a18c691 100644
--- a/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json
+++ b/backend/.sqlx/query-07168aaf14cb6beff0ad4274b441f7f387f5055c47f493271d26731336257384.json
@@ -46,11 +46,11 @@
       ]
     },
     "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
+      true,
+      true,
+      true,
+      true,
+      true,
       true,
       true
     ]
diff --git a/backend/.sqlx/query-074dd26f6427f4ff97e92c35163ad042144e656adcca56a4936a2eb196d3f48c.json b/backend/.sqlx/query-074dd26f6427f4ff97e92c35163ad042144e656adcca56a4936a2eb196d3f48c.json
new file mode 100644
index 0000000000..173fe9d05c
--- /dev/null
+++ b/backend/.sqlx/query-074dd26f6427f4ff97e92c35163ad042144e656adcca56a4936a2eb196d3f48c.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT SUM(pg_database_size(datname))::BIGINT AS \"v!\" FROM pg_database",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "v!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "074dd26f6427f4ff97e92c35163ad042144e656adcca56a4936a2eb196d3f48c"
+}
diff --git a/backend/.sqlx/query-089d7bc7acdbb97cf477159e111bc7e9ee85289ff5c52af43166928337c257e7.json b/backend/.sqlx/query-089d7bc7acdbb97cf477159e111bc7e9ee85289ff5c52af43166928337c257e7.json
index a779aa0e95..6efb66005d 100644
--- a/backend/.sqlx/query-089d7bc7acdbb97cf477159e111bc7e9ee85289ff5c52af43166928337c257e7.json
+++ b/backend/.sqlx/query-089d7bc7acdbb97cf477159e111bc7e9ee85289ff5c52af43166928337c257e7.json
@@ -35,7 +35,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-0d6c3399bc637e2c599534c2cafacf623cd6e5fde2d075a4f1f0d4852efcedca.json b/backend/.sqlx/query-0d6c3399bc637e2c599534c2cafacf623cd6e5fde2d075a4f1f0d4852efcedca.json
new file mode 100644
index 0000000000..ee50840b07
--- /dev/null
+++ b/backend/.sqlx/query-0d6c3399bc637e2c599534c2cafacf623cd6e5fde2d075a4f1f0d4852efcedca.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT args->>$2 FROM v2_job WHERE id = ANY($1)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "UuidArray",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "0d6c3399bc637e2c599534c2cafacf623cd6e5fde2d075a4f1f0d4852efcedca"
+}
diff --git a/backend/.sqlx/query-0e22295e40bfc173d85f0a962d491f3afd87eeea5e4e8d935b1b86eb02f061e7.json b/backend/.sqlx/query-0e22295e40bfc173d85f0a962d491f3afd87eeea5e4e8d935b1b86eb02f061e7.json
new file mode 100644
index 0000000000..906c710fdf
--- /dev/null
+++ b/backend/.sqlx/query-0e22295e40bfc173d85f0a962d491f3afd87eeea5e4e8d935b1b86eb02f061e7.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM pipeline_freshness_state WHERE workspace_id = $1 AND script_path = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0e22295e40bfc173d85f0a962d491f3afd87eeea5e4e8d935b1b86eb02f061e7"
+}
diff --git a/backend/.sqlx/query-0ee4a4dc8c6f09e7027bd99f98d8d1d346f9d67056ef272314dd9b80bee9f285.json b/backend/.sqlx/query-0ee4a4dc8c6f09e7027bd99f98d8d1d346f9d67056ef272314dd9b80bee9f285.json
new file mode 100644
index 0000000000..238522a3ff
--- /dev/null
+++ b/backend/.sqlx/query-0ee4a4dc8c6f09e7027bd99f98d8d1d346f9d67056ef272314dd9b80bee9f285.json
@@ -0,0 +1,77 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT DISTINCT ON (mp.asset_kind, mp.asset_path)\n                  mp.asset_kind AS \"asset_kind: AssetKind\", mp.asset_path,\n                  mp.snapshot_id AS \"snapshot_id!\", mp.partition\n             FROM materialized_partition mp\n             JOIN unnest($2::ASSET_KIND[], $3::text[]) AS u(kind, path)\n               ON mp.asset_kind = u.kind AND mp.asset_path = u.path\n            WHERE mp.workspace_id = $1\n              AND mp.status = 'materialized' AND mp.snapshot_id IS NOT NULL\n            ORDER BY mp.asset_kind, mp.asset_path, mp.snapshot_id DESC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "asset_kind: AssetKind",
+        "type_info": {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "asset_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "snapshot_id!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "partition",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
+          "Custom": {
+            "name": "asset_kind[]",
+            "kind": {
+              "Array": {
+                "Custom": {
+                  "name": "asset_kind",
+                  "kind": {
+                    "Enum": [
+                      "s3object",
+                      "resource",
+                      "variable",
+                      "ducklake",
+                      "datatable",
+                      "volume"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        },
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "0ee4a4dc8c6f09e7027bd99f98d8d1d346f9d67056ef272314dd9b80bee9f285"
+}
diff --git a/backend/.sqlx/query-0f141ca6a58901dee1ddcf25694d76a4e5702c0324a27ef3a5740ef5d98d8946.json b/backend/.sqlx/query-0f141ca6a58901dee1ddcf25694d76a4e5702c0324a27ef3a5740ef5d98d8946.json
new file mode 100644
index 0000000000..0dbcf04c6e
--- /dev/null
+++ b/backend/.sqlx/query-0f141ca6a58901dee1ddcf25694d76a4e5702c0324a27ef3a5740ef5d98d8946.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n            schedule.path, t.jobs FROM schedule,\n            LATERAL(SELECT ARRAY(\n                SELECT json_build_object('id', id, 'success', status = 'success', 'duration_ms', duration_ms)\n                FROM v2_job_completed c JOIN v2_job j USING (id)\n                WHERE trigger_kind = 'schedule'\n                    AND trigger = schedule.path\n                    AND c.workspace_id = $1\n                    AND j.workspace_id = $1\n                    AND parent_job IS NULL AND runnable_path = schedule.script_path\n                    AND status <> 'skipped'\n                ORDER BY completed_at DESC\n                LIMIT 20\n            ) AS jobs) t\n        WHERE workspace_id = $1 AND NOT starts_with(schedule.path, $4)\n        ORDER BY edited_at DESC\n        LIMIT $2 OFFSET $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "jobs",
+        "type_info": "JsonArray"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "0f141ca6a58901dee1ddcf25694d76a4e5702c0324a27ef3a5740ef5d98d8946"
+}
diff --git a/backend/.sqlx/query-0ff0b7abad7717d7de398f629853b22cb831e91026dcd59d362a6d4382dc240b.json b/backend/.sqlx/query-0ff0b7abad7717d7de398f629853b22cb831e91026dcd59d362a6d4382dc240b.json
new file mode 100644
index 0000000000..c43b9e53a1
--- /dev/null
+++ b/backend/.sqlx/query-0ff0b7abad7717d7de398f629853b22cb831e91026dcd59d362a6d4382dc240b.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO script (workspace_id, path, hash, content, summary, description, language, created_by, created_at, archived, schema_validation, ws_error_handler_muted, deleted, extra_perms)\n         VALUES ('test-workspace', 'f/restricted/item', 314159, 'def main(): return 1', '', '', 'python3', 'test-user', NOW(), false, false, false, false, '{}'::jsonb)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "0ff0b7abad7717d7de398f629853b22cb831e91026dcd59d362a6d4382dc240b"
+}
diff --git a/backend/.sqlx/query-11813108dbf6b104eba968c3609c74ac5a589542d3e76b1e756a82fb19d49ee8.json b/backend/.sqlx/query-11813108dbf6b104eba968c3609c74ac5a589542d3e76b1e756a82fb19d49ee8.json
new file mode 100644
index 0000000000..cef272c219
--- /dev/null
+++ b/backend/.sqlx/query-11813108dbf6b104eba968c3609c74ac5a589542d3e76b1e756a82fb19d49ee8.json
@@ -0,0 +1,58 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT language AS \"language!: _\", COUNT(*)::BIGINT AS \"count!\"\n        FROM script\n        WHERE archived = false AND deleted = false AND kind = 'script'\n          AND (auto_kind IS NULL OR auto_kind <> 'wac')\n        GROUP BY language\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "language!: _",
+        "type_info": {
+          "Custom": {
+            "name": "script_lang",
+            "kind": {
+              "Enum": [
+                "python3",
+                "deno",
+                "go",
+                "bash",
+                "postgresql",
+                "nativets",
+                "bun",
+                "mysql",
+                "bigquery",
+                "snowflake",
+                "graphql",
+                "powershell",
+                "mssql",
+                "php",
+                "bunnative",
+                "rust",
+                "ansible",
+                "csharp",
+                "oracledb",
+                "nu",
+                "java",
+                "duckdb",
+                "ruby",
+                "rlang"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "11813108dbf6b104eba968c3609c74ac5a589542d3e76b1e756a82fb19d49ee8"
+}
diff --git a/backend/.sqlx/query-12dec9fa086fd231cdba2ecaa4585b62e55f43d448332ff88d8f036443b1edd7.json b/backend/.sqlx/query-12dec9fa086fd231cdba2ecaa4585b62e55f43d448332ff88d8f036443b1edd7.json
new file mode 100644
index 0000000000..f2faa9f48a
--- /dev/null
+++ b/backend/.sqlx/query-12dec9fa086fd231cdba2ecaa4585b62e55f43d448332ff88d8f036443b1edd7.json
@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name, params, body, is_table_macro, provider_path FROM macro_definition WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "params",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "body",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_table_macro",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "provider_path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "12dec9fa086fd231cdba2ecaa4585b62e55f43d448332ff88d8f036443b1edd7"
+}
diff --git a/backend/.sqlx/query-142ae6939440654da21ebb06acf838563f28e832e37e5c165329441d8471acdb.json b/backend/.sqlx/query-142ae6939440654da21ebb06acf838563f28e832e37e5c165329441d8471acdb.json
new file mode 100644
index 0000000000..c19df789d4
--- /dev/null
+++ b/backend/.sqlx/query-142ae6939440654da21ebb06acf838563f28e832e37e5c165329441d8471acdb.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO schedule (\n            workspace_id, path, edited_by, edited_at, schedule, enabled, script_path,\n            args, extra_perms, is_flow, email, error, timezone, on_failure,\n            on_recovery, on_failure_times, on_failure_exact, on_failure_extra_args,\n            on_recovery_times, on_recovery_extra_args, ws_error_handler_muted, retry,\n            summary, no_flow_overlap, tag, paused_until, on_success, on_success_extra_args,\n            cron_version, description, dynamic_skip, permissioned_as, labels\n        )\n        SELECT\n            $1, path, edited_by, edited_at, schedule, FALSE, script_path,\n            args, extra_perms, is_flow, email, error, timezone, on_failure,\n            on_recovery, on_failure_times, on_failure_exact, on_failure_extra_args,\n            on_recovery_times, on_recovery_extra_args, ws_error_handler_muted, retry,\n            summary, no_flow_overlap, tag, paused_until, on_success, on_success_extra_args,\n            cron_version, description, dynamic_skip, permissioned_as, labels\n        FROM schedule WHERE workspace_id = $2 AND path NOT LIKE $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "142ae6939440654da21ebb06acf838563f28e832e37e5c165329441d8471acdb"
+}
diff --git a/backend/.sqlx/query-1437b432d2c23e30eb05443e83069cdb049f65ec299b0778ce14677728cf6346.json b/backend/.sqlx/query-1437b432d2c23e30eb05443e83069cdb049f65ec299b0778ce14677728cf6346.json
deleted file mode 100644
index 911d6c3b07..0000000000
--- a/backend/.sqlx/query-1437b432d2c23e30eb05443e83069cdb049f65ec299b0778ce14677728cf6346.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        WITH completed AS (\n            INSERT INTO v2_job_completed\n                (workspace_id, id, started_at, duration_ms, result,\n                 flow_status, workflow_as_code_status, status, worker)\n            SELECT\n                q.workspace_id, q.id, q.started_at,\n                (EXTRACT('epoch' FROM now()) - EXTRACT('epoch' FROM COALESCE(q.started_at, now()))) * 1000,\n                CASE WHEN q.running\n                    THEN $3::text::jsonb\n                    ELSE $4::text::jsonb\n                END,\n                s.flow_status,\n                s.workflow_as_code_status,\n                'skipped'::job_status,\n                q.worker\n            FROM v2_job_queue q\n            LEFT JOIN v2_job_status s ON s.id = q.id\n            WHERE q.id = $1\n            ON CONFLICT (id) DO UPDATE SET status = EXCLUDED.status, result = EXCLUDED.result\n            RETURNING 1 AS x\n        ), _deleted AS (\n            DELETE FROM v2_job_queue WHERE id = $1\n        ), _logged AS (\n            INSERT INTO job_logs (logs, job_id, workspace_id)\n            VALUES ($5, $1, $2)\n            ON CONFLICT (job_id) DO UPDATE SET logs = concat(job_logs.logs, EXCLUDED.logs)\n        )\n        SELECT x FROM completed\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "x",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Varchar",
-        "Text",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "1437b432d2c23e30eb05443e83069cdb049f65ec299b0778ce14677728cf6346"
-}
diff --git a/backend/.sqlx/query-15c0584e9eb078442f6928adb894324c47e010e3554c14e755a7e045453745bb.json b/backend/.sqlx/query-15c0584e9eb078442f6928adb894324c47e010e3554c14e755a7e045453745bb.json
new file mode 100644
index 0000000000..47bfec9e5c
--- /dev/null
+++ b/backend/.sqlx/query-15c0584e9eb078442f6928adb894324c47e010e3554c14e755a7e045453745bb.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "15c0584e9eb078442f6928adb894324c47e010e3554c14e755a7e045453745bb"
+}
diff --git a/backend/.sqlx/query-165abf847773c7fe718fa6c832b259bf2dc531bc468d2ab27f76c9c653be0b9a.json b/backend/.sqlx/query-165abf847773c7fe718fa6c832b259bf2dc531bc468d2ab27f76c9c653be0b9a.json
new file mode 100644
index 0000000000..f548727abb
--- /dev/null
+++ b/backend/.sqlx/query-165abf847773c7fe718fa6c832b259bf2dc531bc468d2ab27f76c9c653be0b9a.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id, name FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "165abf847773c7fe718fa6c832b259bf2dc531bc468d2ab27f76c9c653be0b9a"
+}
diff --git a/backend/.sqlx/query-16a67b92dbd32024838983184e6974f2ce577b78decd6b821096c9f2f252ae8b.json b/backend/.sqlx/query-16a67b92dbd32024838983184e6974f2ce577b78decd6b821096c9f2f252ae8b.json
deleted file mode 100644
index d099d97bd3..0000000000
--- a/backend/.sqlx/query-16a67b92dbd32024838983184e6974f2ce577b78decd6b821096c9f2f252ae8b.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT ws.datatable->'datatables' AS datatable_name\n                FROM workspace_settings ws\n                WHERE ws.workspace_id = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "datatable_name",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "16a67b92dbd32024838983184e6974f2ce577b78decd6b821096c9f2f252ae8b"
-}
diff --git a/backend/.sqlx/query-16c7838ecfcea5fd231f2a4766f691a9a11ca7bb9797b81444419d6a72883531.json b/backend/.sqlx/query-16c7838ecfcea5fd231f2a4766f691a9a11ca7bb9797b81444419d6a72883531.json
new file mode 100644
index 0000000000..058018a8ee
--- /dev/null
+++ b/backend/.sqlx/query-16c7838ecfcea5fd231f2a4766f691a9a11ca7bb9797b81444419d6a72883531.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT (parent_workspace_id IS NOT NULL) AS \"has_parent!\", is_dev_workspace\n           FROM workspace WHERE id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "has_parent!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "is_dev_workspace",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      false
+    ]
+  },
+  "hash": "16c7838ecfcea5fd231f2a4766f691a9a11ca7bb9797b81444419d6a72883531"
+}
diff --git a/backend/.sqlx/query-19f1cb1c7a1974920549917a6392ff0d56f31ca5662062f4a71fed0ccf859cc4.json b/backend/.sqlx/query-19f1cb1c7a1974920549917a6392ff0d56f31ca5662062f4a71fed0ccf859cc4.json
new file mode 100644
index 0000000000..e576cf8fae
--- /dev/null
+++ b/backend/.sqlx/query-19f1cb1c7a1974920549917a6392ff0d56f31ca5662062f4a71fed0ccf859cc4.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT kind::text as \"kind!\", parent_job, runnable_path\n           FROM v2_job WHERE id = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "kind!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "parent_job",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 2,
+        "name": "runnable_path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      true,
+      true
+    ]
+  },
+  "hash": "19f1cb1c7a1974920549917a6392ff0d56f31ca5662062f4a71fed0ccf859cc4"
+}
diff --git a/backend/.sqlx/query-1b05728b33decc39766ccacca50464b5ff9f34e43fbcc38154939461aadfca9f.json b/backend/.sqlx/query-1b05728b33decc39766ccacca50464b5ff9f34e43fbcc38154939461aadfca9f.json
new file mode 100644
index 0000000000..708922a0cb
--- /dev/null
+++ b/backend/.sqlx/query-1b05728b33decc39766ccacca50464b5ff9f34e43fbcc38154939461aadfca9f.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace_multipart_inflight\n           (workspace_id, upload_id, storage, inflight_bytes, target_existing_size)\n         VALUES ($1, $2, $3, $4, $5)\n         ON CONFLICT (workspace_id, upload_id)\n         DO UPDATE SET inflight_bytes = $4",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1b05728b33decc39766ccacca50464b5ff9f34e43fbcc38154939461aadfca9f"
+}
diff --git a/backend/.sqlx/query-1c5caaaa86e3488549cad179e992172315be5d53dcc266d713da01fd27f310b6.json b/backend/.sqlx/query-1c5caaaa86e3488549cad179e992172315be5d53dcc266d713da01fd27f310b6.json
deleted file mode 100644
index 75957a4f2f..0000000000
--- a/backend/.sqlx/query-1c5caaaa86e3488549cad179e992172315be5d53dcc266d713da01fd27f310b6.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM asset WHERE workspace_id = $1 AND usage_path = $2 AND usage_kind = $3",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        {
-          "Custom": {
-            "name": "asset_usage_kind",
-            "kind": {
-              "Enum": [
-                "script",
-                "flow",
-                "job"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1c5caaaa86e3488549cad179e992172315be5d53dcc266d713da01fd27f310b6"
-}
diff --git a/backend/.sqlx/query-1cd7c77e7a6a5c13c4ca521098bb07c1d805d21899fe0ebac22132b248ffd242.json b/backend/.sqlx/query-1cd7c77e7a6a5c13c4ca521098bb07c1d805d21899fe0ebac22132b248ffd242.json
new file mode 100644
index 0000000000..b84cd8a14e
--- /dev/null
+++ b/backend/.sqlx/query-1cd7c77e7a6a5c13c4ca521098bb07c1d805d21899fe0ebac22132b248ffd242.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO workspace_protection_rule (workspace_id, name, rules, bypass_groups, bypass_users)\n            VALUES ($1, $2, $3, $4, $5)\n            ON CONFLICT (workspace_id, name)\n            DO UPDATE SET rules = EXCLUDED.rules,\n                          bypass_groups = EXCLUDED.bypass_groups,\n                          bypass_users = EXCLUDED.bypass_users\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int4",
+        "TextArray",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1cd7c77e7a6a5c13c4ca521098bb07c1d805d21899fe0ebac22132b248ffd242"
+}
diff --git a/backend/.sqlx/query-21242859ee6b72466c6bfb9d826a7159de4488adccb9349cddfbdd572b4005e9.json b/backend/.sqlx/query-21242859ee6b72466c6bfb9d826a7159de4488adccb9349cddfbdd572b4005e9.json
new file mode 100644
index 0000000000..1a3d7ef0e4
--- /dev/null
+++ b/backend/.sqlx/query-21242859ee6b72466c6bfb9d826a7159de4488adccb9349cddfbdd572b4005e9.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT consumer_path AS \"consumer_path!\", macro_name AS \"macro_name!\"\n           FROM macro_usage\n           WHERE workspace_id = $1\n             AND ($2::text IS NULL OR consumer_path LIKE $2)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "consumer_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "macro_name!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "21242859ee6b72466c6bfb9d826a7159de4488adccb9349cddfbdd572b4005e9"
+}
diff --git a/backend/.sqlx/query-212553c83e4dcdc6d045eb2fe2dadbb2860ce52d37a56b2861de1215260ecff8.json b/backend/.sqlx/query-212553c83e4dcdc6d045eb2fe2dadbb2860ce52d37a56b2861de1215260ecff8.json
index a53d131a3f..704883d4f1 100644
--- a/backend/.sqlx/query-212553c83e4dcdc6d045eb2fe2dadbb2860ce52d37a56b2861de1215260ecff8.json
+++ b/backend/.sqlx/query-212553c83e4dcdc6d045eb2fe2dadbb2860ce52d37a56b2861de1215260ecff8.json
@@ -38,7 +38,9 @@
                 "google",
                 "ci_test",
                 "github",
-                "azure"
+                "azure",
+                "asset",
+                "freshness"
               ]
             }
           }
@@ -75,7 +77,9 @@
                 "google",
                 "ci_test",
                 "github",
-                "azure"
+                "azure",
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-de06f44bad94710f14e9be4c0a6e6080e3c4faae5052500b93cc24b6fe556f2b.json b/backend/.sqlx/query-231475dc825518aa88f562698f8061d2562c3ac4af8d088f9eea9f0bc11d5fe7.json
similarity index 54%
rename from backend/.sqlx/query-de06f44bad94710f14e9be4c0a6e6080e3c4faae5052500b93cc24b6fe556f2b.json
rename to backend/.sqlx/query-231475dc825518aa88f562698f8061d2562c3ac4af8d088f9eea9f0bc11d5fe7.json
index 2ba317edc6..e3f72d9c3a 100644
--- a/backend/.sqlx/query-de06f44bad94710f14e9be4c0a6e6080e3c4faae5052500b93cc24b6fe556f2b.json
+++ b/backend/.sqlx/query-231475dc825518aa88f562698f8061d2562c3ac4af8d088f9eea9f0bc11d5fe7.json
@@ -1,12 +1,23 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            kind AS \"kind!: AssetKind\",\n            path AS \"path!\"\n        FROM asset\n        WHERE workspace_id = $1\n          AND usage_kind = 'script'\n          AND usage_path = $2\n          AND usage_access_type IN ('w', 'rw')\n        ",
+  "query": "SELECT version, columns AS \"columns: Json<Vec<SchemaColumn>>\"\n             FROM materialized_asset_schema\n            WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3\n            ORDER BY version DESC\n            LIMIT 1",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "kind!: AssetKind",
-        "type_info": {
+        "name": "version",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "columns: Json<Vec<SchemaColumn>>",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
           "Custom": {
             "name": "asset_kind",
             "kind": {
@@ -20,17 +31,7 @@
               ]
             }
           }
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "path!",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
+        },
         "Text"
       ]
     },
@@ -39,5 +40,5 @@
       false
     ]
   },
-  "hash": "de06f44bad94710f14e9be4c0a6e6080e3c4faae5052500b93cc24b6fe556f2b"
+  "hash": "231475dc825518aa88f562698f8061d2562c3ac4af8d088f9eea9f0bc11d5fe7"
 }
diff --git a/backend/.sqlx/query-246e302feda95892d5eb1a43a29d4d4739fd663cf34f00d947f24b47c481f035.json b/backend/.sqlx/query-246e302feda95892d5eb1a43a29d4d4739fd663cf34f00d947f24b47c481f035.json
new file mode 100644
index 0000000000..f828b906cd
--- /dev/null
+++ b/backend/.sqlx/query-246e302feda95892d5eb1a43a29d4d4739fd663cf34f00d947f24b47c481f035.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_definition WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "246e302feda95892d5eb1a43a29d4d4739fd663cf34f00d947f24b47c481f035"
+}
diff --git a/backend/.sqlx/query-255310c81beab0bc4cff13e966c84af7833264f208a94d20a5c8f216040c43cd.json b/backend/.sqlx/query-255310c81beab0bc4cff13e966c84af7833264f208a94d20a5c8f216040c43cd.json
new file mode 100644
index 0000000000..3e617e3f0c
--- /dev/null
+++ b/backend/.sqlx/query-255310c81beab0bc4cff13e966c84af7833264f208a94d20a5c8f216040c43cd.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM native_retry_attempt nra WHERE NOT EXISTS (SELECT 1 FROM v2_job WHERE id = nra.job_id)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "255310c81beab0bc4cff13e966c84af7833264f208a94d20a5c8f216040c43cd"
+}
diff --git a/backend/.sqlx/query-256a302afef987857016f2fa636d15474599734bc46ede6930650e2cba5d8a46.json b/backend/.sqlx/query-256a302afef987857016f2fa636d15474599734bc46ede6930650e2cba5d8a46.json
new file mode 100644
index 0000000000..5f74d57491
--- /dev/null
+++ b/backend/.sqlx/query-256a302afef987857016f2fa636d15474599734bc46ede6930650e2cba5d8a46.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO script_trigger (workspace_id, runnable_kind, runnable_path, trigger_kind, trigger_ref, join_all, debounce_s, retry_count, retry_delay_s)\n         SELECT $2, runnable_kind, runnable_path, trigger_kind, trigger_ref, join_all, debounce_s, retry_count, retry_delay_s\n         FROM script_trigger WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "256a302afef987857016f2fa636d15474599734bc46ede6930650e2cba5d8a46"
+}
diff --git a/backend/.sqlx/query-25ecae25ebc03d6296b0e72482a9201c2bffb0f0f7419b0b598b2786bdb326ab.json b/backend/.sqlx/query-25ecae25ebc03d6296b0e72482a9201c2bffb0f0f7419b0b598b2786bdb326ab.json
new file mode 100644
index 0000000000..36ea3d7fb2
--- /dev/null
+++ b/backend/.sqlx/query-25ecae25ebc03d6296b0e72482a9201c2bffb0f0f7419b0b598b2786bdb326ab.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM job_perms\n             WHERE ctid IN (\n                 SELECT jp.ctid FROM job_perms jp\n                 WHERE NOT EXISTS (SELECT 1 FROM v2_job_queue q WHERE q.id = jp.job_id)\n                 LIMIT 100000\n             )",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "25ecae25ebc03d6296b0e72482a9201c2bffb0f0f7419b0b598b2786bdb326ab"
+}
diff --git a/backend/.sqlx/query-27a131537cee699ae53088cfd710b70eb81b4e6b8f79d57db9d1d12d7f3ffde2.json b/backend/.sqlx/query-27a131537cee699ae53088cfd710b70eb81b4e6b8f79d57db9d1d12d7f3ffde2.json
new file mode 100644
index 0000000000..508eb32ed6
--- /dev/null
+++ b/backend/.sqlx/query-27a131537cee699ae53088cfd710b70eb81b4e6b8f79d57db9d1d12d7f3ffde2.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH RECURSIVE chain AS (\n                SELECT id, parent_workspace_id, 0 AS depth\n                FROM workspace WHERE id = $1\n                UNION ALL\n                SELECT w.id, w.parent_workspace_id, chain.depth + 1\n                FROM workspace w\n                JOIN chain ON w.id = chain.parent_workspace_id\n                WHERE chain.depth < 20\n            )\n            SELECT COALESCE(MAX(depth), 0)::bigint AS \"depth!\" FROM chain\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "depth!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "27a131537cee699ae53088cfd710b70eb81b4e6b8f79d57db9d1d12d7f3ffde2"
+}
diff --git a/backend/.sqlx/query-e004ebd5b5532a4b85984a62f8ad48a81aa3460c1ca07701f386135d72cdecf5.json b/backend/.sqlx/query-282b56cfb8504312ac586cd4c1f3f914cf1651c08b8edd1b06d9a6454ed779bf.json
similarity index 59%
rename from backend/.sqlx/query-e004ebd5b5532a4b85984a62f8ad48a81aa3460c1ca07701f386135d72cdecf5.json
rename to backend/.sqlx/query-282b56cfb8504312ac586cd4c1f3f914cf1651c08b8edd1b06d9a6454ed779bf.json
index 0769d083d6..4e5f9f6ed7 100644
--- a/backend/.sqlx/query-e004ebd5b5532a4b85984a62f8ad48a81aa3460c1ca07701f386135d72cdecf5.json
+++ b/backend/.sqlx/query-282b56cfb8504312ac586cd4c1f3f914cf1651c08b8edd1b06d9a6454ed779bf.json
@@ -1,12 +1,12 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT 1",
+  "query": "SELECT NOT pg_is_in_recovery()",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
         "name": "?column?",
-        "type_info": "Int4"
+        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -16,5 +16,5 @@
       null
     ]
   },
-  "hash": "e004ebd5b5532a4b85984a62f8ad48a81aa3460c1ca07701f386135d72cdecf5"
+  "hash": "282b56cfb8504312ac586cd4c1f3f914cf1651c08b8edd1b06d9a6454ed779bf"
 }
diff --git a/backend/.sqlx/query-28ec31481bdaae8b0512d21d074da5d913caa8d935b33ad8f21336dedefd1c23.json b/backend/.sqlx/query-28ec31481bdaae8b0512d21d074da5d913caa8d935b33ad8f21336dedefd1c23.json
new file mode 100644
index 0000000000..a1e3edbbe2
--- /dev/null
+++ b/backend/.sqlx/query-28ec31481bdaae8b0512d21d074da5d913caa8d935b33ad8f21336dedefd1c23.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM schedule WHERE workspace_id = $1 AND path = ANY($2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "28ec31481bdaae8b0512d21d074da5d913caa8d935b33ad8f21336dedefd1c23"
+}
diff --git a/backend/.sqlx/query-29eb2c40e13d6e1ff7c37a05ab107829242f015a331bf15600986be3963878ee.json b/backend/.sqlx/query-29eb2c40e13d6e1ff7c37a05ab107829242f015a331bf15600986be3963878ee.json
new file mode 100644
index 0000000000..3ad3666413
--- /dev/null
+++ b/backend/.sqlx/query-29eb2c40e13d6e1ff7c37a05ab107829242f015a331bf15600986be3963878ee.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace (id, name, owner, deleted, premium, parent_workspace_id, is_dev_workspace)\n         SELECT $1, $2, owner, false, premium,\n                CASE WHEN $4 THEN parent_workspace_id ELSE NULL END, $5\n         FROM workspace WHERE id = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Bool",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "29eb2c40e13d6e1ff7c37a05ab107829242f015a331bf15600986be3963878ee"
+}
diff --git a/backend/.sqlx/query-2a28f13c1f06a77bc9a164393cccf0d8d2a3d7e8552d8ad09512d2d6bf27c3fb.json b/backend/.sqlx/query-2a28f13c1f06a77bc9a164393cccf0d8d2a3d7e8552d8ad09512d2d6bf27c3fb.json
new file mode 100644
index 0000000000..f940f25b4a
--- /dev/null
+++ b/backend/.sqlx/query-2a28f13c1f06a77bc9a164393cccf0d8d2a3d7e8552d8ad09512d2d6bf27c3fb.json
@@ -0,0 +1,62 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT version, columns AS \"columns: Json<Vec<SchemaColumn>>\",\n                  snapshot_id, job_id, captured_at\n             FROM materialized_asset_schema\n            WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3\n            ORDER BY version DESC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "version",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "columns: Json<Vec<SchemaColumn>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 2,
+        "name": "snapshot_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "job_id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 4,
+        "name": "captured_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        },
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "2a28f13c1f06a77bc9a164393cccf0d8d2a3d7e8552d8ad09512d2d6bf27c3fb"
+}
diff --git a/backend/.sqlx/query-2bed492ef32edf36e60e8a03268fa25bfb67dd641153d1ca23f7d0d2ae73624e.json b/backend/.sqlx/query-2bed492ef32edf36e60e8a03268fa25bfb67dd641153d1ca23f7d0d2ae73624e.json
index 7e13b3aa44..241778d359 100644
--- a/backend/.sqlx/query-2bed492ef32edf36e60e8a03268fa25bfb67dd641153d1ca23f7d0d2ae73624e.json
+++ b/backend/.sqlx/query-2bed492ef32edf36e60e8a03268fa25bfb67dd641153d1ca23f7d0d2ae73624e.json
@@ -42,7 +42,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-2c543583bcf7bcaf2f422638ce0741a2e193f18ffa11d08e8ca49cef5c3b850c.json b/backend/.sqlx/query-2c543583bcf7bcaf2f422638ce0741a2e193f18ffa11d08e8ca49cef5c3b850c.json
new file mode 100644
index 0000000000..2f1ad395b6
--- /dev/null
+++ b/backend/.sqlx/query-2c543583bcf7bcaf2f422638ce0741a2e193f18ffa11d08e8ca49cef5c3b850c.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE datatable_migrations SET datatable = $3 WHERE workspace_id = $1 AND datatable = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2c543583bcf7bcaf2f422638ce0741a2e193f18ffa11d08e8ca49cef5c3b850c"
+}
diff --git a/backend/.sqlx/query-2eb746c4cc5c65e277d4c3a12e0bc9b6a776a4941e68d8e2b31904c677493e2d.json b/backend/.sqlx/query-2eb746c4cc5c65e277d4c3a12e0bc9b6a776a4941e68d8e2b31904c677493e2d.json
new file mode 100644
index 0000000000..44d9f8f36d
--- /dev/null
+++ b/backend/.sqlx/query-2eb746c4cc5c65e277d4c3a12e0bc9b6a776a4941e68d8e2b31904c677493e2d.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH RECURSIVE tree AS (\n                SELECT id, deleted, 0 AS depth FROM workspace WHERE id = $1\n                UNION ALL\n                SELECT w.id, w.deleted, tree.depth + 1 FROM workspace w\n                JOIN tree ON w.parent_workspace_id = tree.id\n                WHERE tree.depth < 20\n            )\n            SELECT COALESCE(MAX(depth) FILTER (WHERE NOT deleted), 0)::bigint AS \"height!\" FROM tree\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "height!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "2eb746c4cc5c65e277d4c3a12e0bc9b6a776a4941e68d8e2b31904c677493e2d"
+}
diff --git a/backend/.sqlx/query-0b8e5fe95f4a2855678ca041b50405b698a368626da42dd9f4ce9d0681d016a1.json b/backend/.sqlx/query-2ec9f88ad80d192a2066764222fdfed7c553de4df8e876ff8589738dea93d0cf.json
similarity index 71%
rename from backend/.sqlx/query-0b8e5fe95f4a2855678ca041b50405b698a368626da42dd9f4ce9d0681d016a1.json
rename to backend/.sqlx/query-2ec9f88ad80d192a2066764222fdfed7c553de4df8e876ff8589738dea93d0cf.json
index 50ed7549e8..6163a0f9fb 100644
--- a/backend/.sqlx/query-0b8e5fe95f4a2855678ca041b50405b698a368626da42dd9f4ce9d0681d016a1.json
+++ b/backend/.sqlx/query-2ec9f88ad80d192a2066764222fdfed7c553de4df8e876ff8589738dea93d0cf.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork FROM workspace_diff\n        WHERE source_workspace_id = $1 AND fork_workspace_id = $2",
+  "query": "SELECT path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork FROM workspace_diff\n        WHERE source_workspace_id = $1 AND fork_workspace_id = $2\n        AND NOT EXISTS (\n            SELECT 1 FROM ws_specific ws\n            WHERE ws.path = workspace_diff.path\n              AND ws.item_kind = workspace_diff.kind\n              AND ws.workspace_id IN (workspace_diff.source_workspace_id, workspace_diff.fork_workspace_id)\n        )",
   "describe": {
     "columns": [
       {
@@ -55,5 +55,5 @@
       true
     ]
   },
-  "hash": "0b8e5fe95f4a2855678ca041b50405b698a368626da42dd9f4ce9d0681d016a1"
+  "hash": "2ec9f88ad80d192a2066764222fdfed7c553de4df8e876ff8589738dea93d0cf"
 }
diff --git a/backend/.sqlx/query-3020d5477b4822f1b0e3b2e4f2947e24754b919f7ee1aa2e7c1cb8c36e9e94b1.json b/backend/.sqlx/query-3020d5477b4822f1b0e3b2e4f2947e24754b919f7ee1aa2e7c1cb8c36e9e94b1.json
new file mode 100644
index 0000000000..71615c6466
--- /dev/null
+++ b/backend/.sqlx/query-3020d5477b4822f1b0e3b2e4f2947e24754b919f7ee1aa2e7c1cb8c36e9e94b1.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO ws_specific (workspace_id, item_kind, path)\n                 SELECT $1::varchar, 'resource', $2::varchar\n                 WHERE EXISTS (SELECT 1 FROM resource WHERE workspace_id = $1::varchar AND path = $2::varchar)\n                 ON CONFLICT DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3020d5477b4822f1b0e3b2e4f2947e24754b919f7ee1aa2e7c1cb8c36e9e94b1"
+}
diff --git a/backend/.sqlx/query-3211c7631f46975fc0127f106e84676237a3b37ffa59ff6c9134df79eed3b680.json b/backend/.sqlx/query-3211c7631f46975fc0127f106e84676237a3b37ffa59ff6c9134df79eed3b680.json
new file mode 100644
index 0000000000..0624b86e0c
--- /dev/null
+++ b/backend/.sqlx/query-3211c7631f46975fc0127f106e84676237a3b37ffa59ff6c9134df79eed3b680.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace_diff\n         (source_workspace_id, fork_workspace_id, path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork)\n         VALUES ('test-workspace', 'wm-fork-guard-test', 'f/restricted/item', 'script', 1, 0, true, true, true)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "3211c7631f46975fc0127f106e84676237a3b37ffa59ff6c9134df79eed3b680"
+}
diff --git a/backend/.sqlx/query-dadf78bae0299b24f6798e7a2cc86f0ecfcf63daa0b185994a410eb2fe41fad9.json b/backend/.sqlx/query-333a703a53cc760842b047ad420efef25885a9bca64bb2ba4bb173bc19dcbdba.json
similarity index 59%
rename from backend/.sqlx/query-dadf78bae0299b24f6798e7a2cc86f0ecfcf63daa0b185994a410eb2fe41fad9.json
rename to backend/.sqlx/query-333a703a53cc760842b047ad420efef25885a9bca64bb2ba4bb173bc19dcbdba.json
index 6ae3f60e49..dfbc2b75e6 100644
--- a/backend/.sqlx/query-dadf78bae0299b24f6798e7a2cc86f0ecfcf63daa0b185994a410eb2fe41fad9.json
+++ b/backend/.sqlx/query-333a703a53cc760842b047ad420efef25885a9bca64bb2ba4bb173bc19dcbdba.json
@@ -1,11 +1,11 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT email FROM usr WHERE workspace_id = $1 AND username = $2",
+  "query": "SELECT path FROM schedule WHERE workspace_id = $1 AND path LIKE $2",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "email",
+        "name": "path",
         "type_info": "Varchar"
       }
     ],
@@ -19,5 +19,5 @@
       false
     ]
   },
-  "hash": "dadf78bae0299b24f6798e7a2cc86f0ecfcf63daa0b185994a410eb2fe41fad9"
+  "hash": "333a703a53cc760842b047ad420efef25885a9bca64bb2ba4bb173bc19dcbdba"
 }
diff --git a/backend/.sqlx/query-3419f7b1ec6dad074f1688cc790a42db9eb56c32047ab28457e04776c1bff76a.json b/backend/.sqlx/query-3419f7b1ec6dad074f1688cc790a42db9eb56c32047ab28457e04776c1bff76a.json
new file mode 100644
index 0000000000..b475d068d5
--- /dev/null
+++ b/backend/.sqlx/query-3419f7b1ec6dad074f1688cc790a42db9eb56c32047ab28457e04776c1bff76a.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM native_retry_attempt WHERE job_id = $1) AS \"exists!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "3419f7b1ec6dad074f1688cc790a42db9eb56c32047ab28457e04776c1bff76a"
+}
diff --git a/backend/.sqlx/query-34b94da001dafbbe66b3b945e71e33128bbc0dcdba9850ccbe4dc278836513bd.json b/backend/.sqlx/query-34b94da001dafbbe66b3b945e71e33128bbc0dcdba9850ccbe4dc278836513bd.json
new file mode 100644
index 0000000000..1ca539c46d
--- /dev/null
+++ b/backend/.sqlx/query-34b94da001dafbbe66b3b945e71e33128bbc0dcdba9850ccbe4dc278836513bd.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT (parent_workspace_id IS NOT NULL) AS \"is_fork!\" FROM workspace WHERE id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "is_fork!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "34b94da001dafbbe66b3b945e71e33128bbc0dcdba9850ccbe4dc278836513bd"
+}
diff --git a/backend/.sqlx/query-3535965aed37a1cc853b229e062d4aac2dbb2ef7596d819db222fb87187d9c4b.json b/backend/.sqlx/query-3535965aed37a1cc853b229e062d4aac2dbb2ef7596d819db222fb87187d9c4b.json
new file mode 100644
index 0000000000..b814575234
--- /dev/null
+++ b/backend/.sqlx/query-3535965aed37a1cc853b229e062d4aac2dbb2ef7596d819db222fb87187d9c4b.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM skip_workspace_diff_tally WHERE workspace_id IN ('test-workspace', 'wm-fork-guard-test')",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "3535965aed37a1cc853b229e062d4aac2dbb2ef7596d819db222fb87187d9c4b"
+}
diff --git a/backend/.sqlx/query-3571fb1e1aee51850d5789e28025a055b6972eb00e4dc1818f7a68bcf04c1ba7.json b/backend/.sqlx/query-3571fb1e1aee51850d5789e28025a055b6972eb00e4dc1818f7a68bcf04c1ba7.json
new file mode 100644
index 0000000000..16063b9a3f
--- /dev/null
+++ b/backend/.sqlx/query-3571fb1e1aee51850d5789e28025a055b6972eb00e4dc1818f7a68bcf04c1ba7.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT target_existing_size FROM workspace_multipart_inflight\n         WHERE workspace_id = $1 AND upload_id = $2 LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "target_existing_size",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "3571fb1e1aee51850d5789e28025a055b6972eb00e4dc1818f7a68bcf04c1ba7"
+}
diff --git a/backend/.sqlx/query-36da136cf9b9554702e3b3ec364368a6862e35350ae43383fb2335e2c82a9419.json b/backend/.sqlx/query-36da136cf9b9554702e3b3ec364368a6862e35350ae43383fb2335e2c82a9419.json
new file mode 100644
index 0000000000..d05abd4f3a
--- /dev/null
+++ b/backend/.sqlx/query-36da136cf9b9554702e3b3ec364368a6862e35350ae43383fb2335e2c82a9419.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT DISTINCT path AS \"asset_path!\", usage_path AS \"producer_path!\"\n             FROM asset\n            WHERE workspace_id = $1 AND kind = 'ducklake' AND path = ANY($2)\n              AND usage_kind = 'script' AND usage_access_type IN ('w', 'rw')",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "asset_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "producer_path!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "36da136cf9b9554702e3b3ec364368a6862e35350ae43383fb2335e2c82a9419"
+}
diff --git a/backend/.sqlx/query-36fb69f46ccfb559cd5a25db5fb35bd5a777effb1e61f530f3c1868b407e74e4.json b/backend/.sqlx/query-36fb69f46ccfb559cd5a25db5fb35bd5a777effb1e61f530f3c1868b407e74e4.json
new file mode 100644
index 0000000000..d95cc6dc75
--- /dev/null
+++ b/backend/.sqlx/query-36fb69f46ccfb559cd5a25db5fb35bd5a777effb1e61f530f3c1868b407e74e4.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO macro_usage (workspace_id, consumer_path, macro_name)\n         SELECT $2, consumer_path, macro_name\n         FROM macro_usage WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "36fb69f46ccfb559cd5a25db5fb35bd5a777effb1e61f530f3c1868b407e74e4"
+}
diff --git a/backend/.sqlx/query-3703847d0cef9df3a480af8b6a5c21b6af282c68f06ce037a11f703284d8980d.json b/backend/.sqlx/query-3703847d0cef9df3a480af8b6a5c21b6af282c68f06ce037a11f703284d8980d.json
new file mode 100644
index 0000000000..3a784490ef
--- /dev/null
+++ b/backend/.sqlx/query-3703847d0cef9df3a480af8b6a5c21b6af282c68f06ce037a11f703284d8980d.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT DISTINCT trigger_ref AS \"trigger_ref!\"\n           FROM script_trigger\n           WHERE workspace_id = $1\n             AND runnable_path = $2\n             AND trigger_kind = 'asset'\n             AND runnable_kind = 'script'\n           ORDER BY trigger_ref",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "trigger_ref!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "3703847d0cef9df3a480af8b6a5c21b6af282c68f06ce037a11f703284d8980d"
+}
diff --git a/backend/.sqlx/query-3740ea8dfc666c8b098e55784af185331f8b03eec083fa80c007f6f23019a5d2.json b/backend/.sqlx/query-3740ea8dfc666c8b098e55784af185331f8b03eec083fa80c007f6f23019a5d2.json
new file mode 100644
index 0000000000..dcb81f26b8
--- /dev/null
+++ b/backend/.sqlx/query-3740ea8dfc666c8b098e55784af185331f8b03eec083fa80c007f6f23019a5d2.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_usage WHERE workspace_id = $1 AND (consumer_path = $2 OR macro_name IN (SELECT name FROM macro_definition WHERE workspace_id = $1 AND provider_path = $2))",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3740ea8dfc666c8b098e55784af185331f8b03eec083fa80c007f6f23019a5d2"
+}
diff --git a/backend/.sqlx/query-39870bcb46af48191794e77d9205c6fb9518738e14ca13796395df05c7ab1c91.json b/backend/.sqlx/query-39870bcb46af48191794e77d9205c6fb9518738e14ca13796395df05c7ab1c91.json
new file mode 100644
index 0000000000..7d46bd5a66
--- /dev/null
+++ b/backend/.sqlx/query-39870bcb46af48191794e77d9205c6fb9518738e14ca13796395df05c7ab1c91.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO native_retry_attempt (job_id, attempt) VALUES ($1, $2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "39870bcb46af48191794e77d9205c6fb9518738e14ca13796395df05c7ab1c91"
+}
diff --git a/backend/.sqlx/query-5190528997a879981a87420ddf3d28c978c8a5876f5c1ac1613391e86ffb550f.json b/backend/.sqlx/query-3a03aa24f77e5729c54fd896281da45d4873c38ef68f9ac480b220405fe1ade1.json
similarity index 52%
rename from backend/.sqlx/query-5190528997a879981a87420ddf3d28c978c8a5876f5c1ac1613391e86ffb550f.json
rename to backend/.sqlx/query-3a03aa24f77e5729c54fd896281da45d4873c38ef68f9ac480b220405fe1ade1.json
index d165e78ad2..dd243cc2bb 100644
--- a/backend/.sqlx/query-5190528997a879981a87420ddf3d28c978c8a5876f5c1ac1613391e86ffb550f.json
+++ b/backend/.sqlx/query-3a03aa24f77e5729c54fd896281da45d4873c38ef68f9ac480b220405fe1ade1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "DELETE FROM v2_job WHERE id = $1",
+  "query": "UPDATE v2_job_queue SET running = true WHERE id = $1",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "5190528997a879981a87420ddf3d28c978c8a5876f5c1ac1613391e86ffb550f"
+  "hash": "3a03aa24f77e5729c54fd896281da45d4873c38ef68f9ac480b220405fe1ade1"
 }
diff --git a/backend/.sqlx/query-3a20f8f159b7185940639716b2ae0d5d1c3769d095352002daf8c11d10eac57b.json b/backend/.sqlx/query-3a20f8f159b7185940639716b2ae0d5d1c3769d095352002daf8c11d10eac57b.json
new file mode 100644
index 0000000000..291dc00310
--- /dev/null
+++ b/backend/.sqlx/query-3a20f8f159b7185940639716b2ae0d5d1c3769d095352002daf8c11d10eac57b.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n             (SELECT COALESCE(SUM(bytes), 0) FROM workspace_storage_usage WHERE workspace_id = $1)::bigint as \"committed!\",\n             (SELECT COALESCE(SUM(GREATEST(inflight_bytes - target_existing_size, 0)), 0)\n                FROM workspace_multipart_inflight\n                WHERE workspace_id = $1 AND upload_id <> $2 AND created_at > now() - ($3::text)::interval)::bigint as \"other_reserved!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "committed!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "other_reserved!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "3a20f8f159b7185940639716b2ae0d5d1c3769d095352002daf8c11d10eac57b"
+}
diff --git a/backend/.sqlx/query-3b06ecd4339e966bab32de0b85b7197b2f99174a0066e25d975c303b2e60a2e2.json b/backend/.sqlx/query-3b06ecd4339e966bab32de0b85b7197b2f99174a0066e25d975c303b2e60a2e2.json
new file mode 100644
index 0000000000..8a79de3aa4
--- /dev/null
+++ b/backend/.sqlx/query-3b06ecd4339e966bab32de0b85b7197b2f99174a0066e25d975c303b2e60a2e2.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT count(*) as \"c!\" FROM v2_job_debounce_batch",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "c!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "3b06ecd4339e966bab32de0b85b7197b2f99174a0066e25d975c303b2e60a2e2"
+}
diff --git a/backend/.sqlx/query-3b439ae7af0fcbb9df8e19faf84abf590e5e94898954711d57a602e6fd8a2f84.json b/backend/.sqlx/query-3b439ae7af0fcbb9df8e19faf84abf590e5e94898954711d57a602e6fd8a2f84.json
new file mode 100644
index 0000000000..eabe7f9bf6
--- /dev/null
+++ b/backend/.sqlx/query-3b439ae7af0fcbb9df8e19faf84abf590e5e94898954711d57a602e6fd8a2f84.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)::INT AS \"v!\" FROM pg_stat_activity",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "v!",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "3b439ae7af0fcbb9df8e19faf84abf590e5e94898954711d57a602e6fd8a2f84"
+}
diff --git a/backend/.sqlx/query-3c057e0284f1219865b8f7dc6eb3c1293c4b72d0b52abeefd1e954617984a2d8.json b/backend/.sqlx/query-3c057e0284f1219865b8f7dc6eb3c1293c4b72d0b52abeefd1e954617984a2d8.json
new file mode 100644
index 0000000000..3206ba4433
--- /dev/null
+++ b/backend/.sqlx/query-3c057e0284f1219865b8f7dc6eb3c1293c4b72d0b52abeefd1e954617984a2d8.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3 RETURNING name",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "3c057e0284f1219865b8f7dc6eb3c1293c4b72d0b52abeefd1e954617984a2d8"
+}
diff --git a/backend/.sqlx/query-3c84781704b84b8a927ecce5a3fcb3adcf0175d0a71013f2497397c1c8ccc619.json b/backend/.sqlx/query-3c84781704b84b8a927ecce5a3fcb3adcf0175d0a71013f2497397c1c8ccc619.json
index 3568d1723e..f5ee767768 100644
--- a/backend/.sqlx/query-3c84781704b84b8a927ecce5a3fcb3adcf0175d0a71013f2497397c1c8ccc619.json
+++ b/backend/.sqlx/query-3c84781704b84b8a927ecce5a3fcb3adcf0175d0a71013f2497397c1c8ccc619.json
@@ -128,7 +128,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-3d4b21ca3f6dce2141b0a943d3b1bdb31f26e82fb0dc97bef7114d85959b6129.json b/backend/.sqlx/query-3d4b21ca3f6dce2141b0a943d3b1bdb31f26e82fb0dc97bef7114d85959b6129.json
new file mode 100644
index 0000000000..137af7638b
--- /dev/null
+++ b/backend/.sqlx/query-3d4b21ca3f6dce2141b0a943d3b1bdb31f26e82fb0dc97bef7114d85959b6129.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n             (SELECT COALESCE(SUM(bytes), 0) FROM workspace_storage_usage WHERE workspace_id = $1)::bigint as \"committed!\",\n             COALESCE(\n               (SELECT MIN(computed_at) FROM workspace_storage_usage WHERE workspace_id = $1) < now() - interval '10 minutes',\n               true) as \"stale!\",\n             (SELECT COALESCE(SUM(GREATEST(inflight_bytes - target_existing_size, 0)), 0)\n                FROM workspace_multipart_inflight\n                WHERE workspace_id = $1 AND created_at > now() - ($2::text)::interval)::bigint as \"reserved!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "committed!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "stale!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "reserved!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "3d4b21ca3f6dce2141b0a943d3b1bdb31f26e82fb0dc97bef7114d85959b6129"
+}
diff --git a/backend/.sqlx/query-3db1c61295c284725eef9e74a8aa2bc7822d263605a445f1f4a76e58e76a3e79.json b/backend/.sqlx/query-3db1c61295c284725eef9e74a8aa2bc7822d263605a445f1f4a76e58e76a3e79.json
new file mode 100644
index 0000000000..8d9c34ed2b
--- /dev/null
+++ b/backend/.sqlx/query-3db1c61295c284725eef9e74a8aa2bc7822d263605a445f1f4a76e58e76a3e79.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)::BIGINT AS \"count!\" FROM script WHERE archived = false AND deleted = false AND auto_kind = 'wac'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "3db1c61295c284725eef9e74a8aa2bc7822d263605a445f1f4a76e58e76a3e79"
+}
diff --git a/backend/.sqlx/query-3e0c2268afa4ce21ae6da69d2a496e034c48d960930a2c0c340b28b5c44fe87f.json b/backend/.sqlx/query-3e0c2268afa4ce21ae6da69d2a496e034c48d960930a2c0c340b28b5c44fe87f.json
new file mode 100644
index 0000000000..667907e290
--- /dev/null
+++ b/backend/.sqlx/query-3e0c2268afa4ce21ae6da69d2a496e034c48d960930a2c0c340b28b5c44fe87f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO macro_definition (workspace_id, name, provider_path, params, body, is_table_macro)\n         SELECT $2, name, provider_path, params, body, is_table_macro\n         FROM macro_definition WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3e0c2268afa4ce21ae6da69d2a496e034c48d960930a2c0c340b28b5c44fe87f"
+}
diff --git a/backend/.sqlx/query-3ea82f16050318a0b3b87c12beb66b49254036ca93f7a6415ceb4e316ed64eed.json b/backend/.sqlx/query-3ea82f16050318a0b3b87c12beb66b49254036ca93f7a6415ceb4e316ed64eed.json
new file mode 100644
index 0000000000..60dbee76ab
--- /dev/null
+++ b/backend/.sqlx/query-3ea82f16050318a0b3b87c12beb66b49254036ca93f7a6415ceb4e316ed64eed.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT p.path AS \"path!\",\n               (SELECT c.completed_at\n                  FROM v2_job j\n                  JOIN v2_job_completed c ON c.id = j.id\n                 WHERE j.workspace_id = $1\n                   AND j.runnable_path = p.path\n                   AND j.parent_job IS NULL\n                   -- No 'singlestepflow': flows may share a script's path, and\n                   -- a same-path flow run must not read as the script being\n                   -- fresh (false-fresh). Script retries land as native\n                   -- 'script' jobs; only the rare flow-wrapper fallback is\n                   -- missed, which errs stale. Kept in lockstep with the\n                   -- freshness watchdog's queries (freshness_watchdog_ee).\n                   AND j.kind IN ('script', 'preview')\n                   AND c.status = 'success'\n                 ORDER BY j.created_at DESC\n                 LIMIT 1) AS last_success_at\n          FROM unnest($2::text[]) AS p(path)\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "last_success_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "3ea82f16050318a0b3b87c12beb66b49254036ca93f7a6415ceb4e316ed64eed"
+}
diff --git a/backend/.sqlx/query-3eeecc4bb26163cf6c2c19bc7c2950a1563bd516e730aaa9d0f1501ea8cea7f9.json b/backend/.sqlx/query-3eeecc4bb26163cf6c2c19bc7c2950a1563bd516e730aaa9d0f1501ea8cea7f9.json
new file mode 100644
index 0000000000..4599073796
--- /dev/null
+++ b/backend/.sqlx/query-3eeecc4bb26163cf6c2c19bc7c2950a1563bd516e730aaa9d0f1501ea8cea7f9.json
@@ -0,0 +1,58 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT ducklake_name AS \"ducklake_name!\", metadata_schema AS \"metadata_schema!\",\n                  catalog AS \"catalog!\", storage AS \"storage!\",\n                  storage_ref AS \"storage_ref!\", data_path AS \"data_path!\",\n                  schema_dropped AS \"schema_dropped!\"\n             FROM fork_ducklake_namespace WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "ducklake_name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "metadata_schema!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "catalog!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "storage!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "storage_ref!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 5,
+        "name": "data_path!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "schema_dropped!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "3eeecc4bb26163cf6c2c19bc7c2950a1563bd516e730aaa9d0f1501ea8cea7f9"
+}
diff --git a/backend/.sqlx/query-e947340c7d40f6b9536e7a24fa84bee393e24f6f39f67e0b9e20e9cb8f04244c.json b/backend/.sqlx/query-41ce08f45b09532cbab6fb039703f08d6476d00d85a02ea3b19aa559b9ec1056.json
similarity index 57%
rename from backend/.sqlx/query-e947340c7d40f6b9536e7a24fa84bee393e24f6f39f67e0b9e20e9cb8f04244c.json
rename to backend/.sqlx/query-41ce08f45b09532cbab6fb039703f08d6476d00d85a02ea3b19aa559b9ec1056.json
index 4fe298370b..c12e0cdac4 100644
--- a/backend/.sqlx/query-e947340c7d40f6b9536e7a24fa84bee393e24f6f39f67e0b9e20e9cb8f04244c.json
+++ b/backend/.sqlx/query-41ce08f45b09532cbab6fb039703f08d6476d00d85a02ea3b19aa559b9ec1056.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO workspace\n            (id, name, owner, parent_workspace_id)\n            VALUES ($1, $2, $3, $4)",
+  "query": "INSERT INTO workspace\n            (id, name, owner, parent_workspace_id, is_dev_workspace)\n            VALUES ($1, $2, $3, $4, $5)",
   "describe": {
     "columns": [],
     "parameters": {
@@ -8,10 +8,11 @@
         "Varchar",
         "Varchar",
         "Varchar",
-        "Varchar"
+        "Varchar",
+        "Bool"
       ]
     },
     "nullable": []
   },
-  "hash": "e947340c7d40f6b9536e7a24fa84bee393e24f6f39f67e0b9e20e9cb8f04244c"
+  "hash": "41ce08f45b09532cbab6fb039703f08d6476d00d85a02ea3b19aa559b9ec1056"
 }
diff --git a/backend/.sqlx/query-42322020ff9cc7dd7ebafc1cb4122ba3d670cc36bdbc6451f29b8f22f8cff688.json b/backend/.sqlx/query-42322020ff9cc7dd7ebafc1cb4122ba3d670cc36bdbc6451f29b8f22f8cff688.json
new file mode 100644
index 0000000000..a6ab79cd7c
--- /dev/null
+++ b/backend/.sqlx/query-42322020ff9cc7dd7ebafc1cb4122ba3d670cc36bdbc6451f29b8f22f8cff688.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT p.id AS \"id!\", p.deleted AS \"deleted!\"\n         FROM workspace f\n         JOIN workspace p ON p.id = f.parent_workspace_id\n         WHERE f.id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "deleted!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "42322020ff9cc7dd7ebafc1cb4122ba3d670cc36bdbc6451f29b8f22f8cff688"
+}
diff --git a/backend/.sqlx/query-1a9f2ed5045016a3953db335957b26f41efc8a3cad7af7bc8fe97df6a5bf5078.json b/backend/.sqlx/query-42a0ba479ff164cc190c350927e13902ed94816142faf15446b4b9f19c3097d7.json
similarity index 76%
rename from backend/.sqlx/query-1a9f2ed5045016a3953db335957b26f41efc8a3cad7af7bc8fe97df6a5bf5078.json
rename to backend/.sqlx/query-42a0ba479ff164cc190c350927e13902ed94816142faf15446b4b9f19c3097d7.json
index 0265d7d2b5..76eab1d117 100644
--- a/backend/.sqlx/query-1a9f2ed5045016a3953db335957b26f41efc8a3cad7af7bc8fe97df6a5bf5078.json
+++ b/backend/.sqlx/query-42a0ba479ff164cc190c350927e13902ed94816142faf15446b4b9f19c3097d7.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO usr\n           (workspace_id, email, username, is_admin)\n           SELECT $1, email, username, is_admin FROM usr\n         WHERE workspace_id = $3 AND email = $2\n        ",
+  "query": "INSERT INTO usr\n           (workspace_id, email, username, is_admin)\n           SELECT $1, email, username, is_admin FROM usr\n         WHERE workspace_id = $3 AND email = $2\n         ON CONFLICT DO NOTHING\n        ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "1a9f2ed5045016a3953db335957b26f41efc8a3cad7af7bc8fe97df6a5bf5078"
+  "hash": "42a0ba479ff164cc190c350927e13902ed94816142faf15446b4b9f19c3097d7"
 }
diff --git a/backend/.sqlx/query-431a5eb2eb5a0b57e096cc78f68eb5a0665c90c4926f1afb689d6cd16bd5b722.json b/backend/.sqlx/query-431a5eb2eb5a0b57e096cc78f68eb5a0665c90c4926f1afb689d6cd16bd5b722.json
new file mode 100644
index 0000000000..b554ef8b55
--- /dev/null
+++ b/backend/.sqlx/query-431a5eb2eb5a0b57e096cc78f68eb5a0665c90c4926f1afb689d6cd16bd5b722.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT DISTINCT ON (path) path, content\n                 FROM script\n                WHERE workspace_id = $1 AND path = ANY($2)\n                  AND archived = false AND deleted = false\n                ORDER BY path, created_at DESC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "content",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "431a5eb2eb5a0b57e096cc78f68eb5a0665c90c4926f1afb689d6cd16bd5b722"
+}
diff --git a/backend/.sqlx/query-447dd940e6ee86be8eab6982c22a7fd0fe229643573509bd1705a691ff7c4ba2.json b/backend/.sqlx/query-447dd940e6ee86be8eab6982c22a7fd0fe229643573509bd1705a691ff7c4ba2.json
new file mode 100644
index 0000000000..1146134a34
--- /dev/null
+++ b/backend/.sqlx/query-447dd940e6ee86be8eab6982c22a7fd0fe229643573509bd1705a691ff7c4ba2.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO macro_definition (workspace_id, name, provider_path, params, body, is_table_macro) VALUES ($1, $2, $3, $4, $5, $6)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "447dd940e6ee86be8eab6982c22a7fd0fe229643573509bd1705a691ff7c4ba2"
+}
diff --git a/backend/.sqlx/query-44c4e9848bc97b66a49d5454d30d40dfe1ffe51839884f3e9e9360d9e17b5afd.json b/backend/.sqlx/query-44c4e9848bc97b66a49d5454d30d40dfe1ffe51839884f3e9e9360d9e17b5afd.json
new file mode 100644
index 0000000000..1e1c5f20c3
--- /dev/null
+++ b/backend/.sqlx/query-44c4e9848bc97b66a49d5454d30d40dfe1ffe51839884f3e9e9360d9e17b5afd.json
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name, code_up, code_down FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "code_up",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "code_down",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "44c4e9848bc97b66a49d5454d30d40dfe1ffe51839884f3e9e9360d9e17b5afd"
+}
diff --git a/backend/.sqlx/query-453c8dc05f4946a30fbbc517b5beaaee42e954e0b4ed0bd5ba6a5b308894d6ba.json b/backend/.sqlx/query-453c8dc05f4946a30fbbc517b5beaaee42e954e0b4ed0bd5ba6a5b308894d6ba.json
new file mode 100644
index 0000000000..cb6bb20397
--- /dev/null
+++ b/backend/.sqlx/query-453c8dc05f4946a30fbbc517b5beaaee42e954e0b4ed0bd5ba6a5b308894d6ba.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH RECURSIVE tree AS (\n                SELECT id, deleted, 0 AS depth FROM workspace WHERE id = $1\n                UNION ALL\n                SELECT w.id, w.deleted, tree.depth + 1 FROM workspace w\n                JOIN tree ON w.parent_workspace_id = tree.id\n                WHERE tree.depth < 20\n            )\n            SELECT COUNT(DISTINCT id) AS \"count!\" FROM tree WHERE id != $1 AND NOT deleted\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "453c8dc05f4946a30fbbc517b5beaaee42e954e0b4ed0bd5ba6a5b308894d6ba"
+}
diff --git a/backend/.sqlx/query-454a611a5a162b2ace137c139bd5383bc7fe142c515dac3edd47991839485e51.json b/backend/.sqlx/query-454a611a5a162b2ace137c139bd5383bc7fe142c515dac3edd47991839485e51.json
deleted file mode 100644
index 2f62420f87..0000000000
--- a/backend/.sqlx/query-454a611a5a162b2ace137c139bd5383bc7fe142c515dac3edd47991839485e51.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM job_result_stream_v2\n         WHERE job_id NOT IN (SELECT id FROM v2_job_queue)\n           AND job_id NOT IN (\n               SELECT id FROM v2_job_completed\n               WHERE completed_at > NOW() - INTERVAL '60 seconds'\n           )\n         RETURNING job_id",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "job_id",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "454a611a5a162b2ace137c139bd5383bc7fe142c515dac3edd47991839485e51"
-}
diff --git a/backend/.sqlx/query-4556f04f9da4adffb296b9c45bd97c9af65dd72a682d9d704a2dafb563001f83.json b/backend/.sqlx/query-4556f04f9da4adffb296b9c45bd97c9af65dd72a682d9d704a2dafb563001f83.json
new file mode 100644
index 0000000000..e70052886f
--- /dev/null
+++ b/backend/.sqlx/query-4556f04f9da4adffb296b9c45bd97c9af65dd72a682d9d704a2dafb563001f83.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n            COUNT(*) FILTER (WHERE worker LIKE $1) as \"live_workers!\",\n            COUNT(DISTINCT worker_instance) FILTER (WHERE worker LIKE $1) as \"live_instances!\",\n            COUNT(*) FILTER (WHERE worker LIKE $2) as \"live_agent_workers!\"\n        FROM worker_ping\n        WHERE ping_at > now() - interval '30 seconds'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "live_workers!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "live_instances!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "live_agent_workers!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "4556f04f9da4adffb296b9c45bd97c9af65dd72a682d9d704a2dafb563001f83"
+}
diff --git a/backend/.sqlx/query-45997fcb4d9d62c7f7011966bf59bdb86e12ce1d0c8e925e738d2645121a5c1f.json b/backend/.sqlx/query-45997fcb4d9d62c7f7011966bf59bdb86e12ce1d0c8e925e738d2645121a5c1f.json
deleted file mode 100644
index f63afbc986..0000000000
--- a/backend/.sqlx/query-45997fcb4d9d62c7f7011966bf59bdb86e12ce1d0c8e925e738d2645121a5c1f.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM v2_job_completed\n         WHERE id IN (\n             SELECT jc.id FROM v2_job_completed jc\n             LEFT JOIN v2_job j ON j.id = jc.id\n             WHERE jc.completed_at <= now() - ($1::bigint::text || ' s')::interval\n               AND COALESCE(j.root_job, j.flow_innermost_root_job, jc.id) != ALL($3)\n             ORDER BY jc.completed_at ASC\n             LIMIT $2\n             FOR UPDATE OF jc SKIP LOCKED\n         )\n         RETURNING id",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8",
-        "UuidArray"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "45997fcb4d9d62c7f7011966bf59bdb86e12ce1d0c8e925e738d2645121a5c1f"
-}
diff --git a/backend/.sqlx/query-45a539e61a3c35098fb6d59c3d5de8b6fcebe83002c74647666e3a6f5b8490dd.json b/backend/.sqlx/query-45a539e61a3c35098fb6d59c3d5de8b6fcebe83002c74647666e3a6f5b8490dd.json
new file mode 100644
index 0000000000..5b3e70acbf
--- /dev/null
+++ b/backend/.sqlx/query-45a539e61a3c35098fb6d59c3d5de8b6fcebe83002c74647666e3a6f5b8490dd.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT EXISTS(\n            SELECT 1 FROM v2_job_queue q\n            JOIN v2_job j ON j.id = q.id\n            WHERE q.workspace_id = $1\n              AND j.runnable_path = $2\n              AND j.parent_job IS NULL\n              AND j.kind IN ('script', 'preview')\n              AND (q.running = true OR q.scheduled_for <= now())\n        ) AS \"in_flight!\"\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "in_flight!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "45a539e61a3c35098fb6d59c3d5de8b6fcebe83002c74647666e3a6f5b8490dd"
+}
diff --git a/backend/.sqlx/query-45c73bd8742601753ad947c88b65ff3ae182ff7c0631d4fa44b67b11a133498f.json b/backend/.sqlx/query-45c73bd8742601753ad947c88b65ff3ae182ff7c0631d4fa44b67b11a133498f.json
new file mode 100644
index 0000000000..6dc5fdb9a6
--- /dev/null
+++ b/backend/.sqlx/query-45c73bd8742601753ad947c88b65ff3ae182ff7c0631d4fa44b67b11a133498f.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE pipeline_freshness_state\n        SET attempts = attempts + 1,\n            last_push_at = now(),\n            next_attempt_at = now()\n                + (LEAST($3::bigint, $4::bigint * (1::bigint << LEAST(attempts + 1, 20)))::text\n                   || ' seconds')::interval\n        WHERE workspace_id = $1 AND script_path = $2 AND next_attempt_at <= now()\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "45c73bd8742601753ad947c88b65ff3ae182ff7c0631d4fa44b67b11a133498f"
+}
diff --git a/backend/.sqlx/query-45de6be332f4ec89482782e3b1640649ed1a6f6d4f1e1b636c71bdd36c31b618.json b/backend/.sqlx/query-45de6be332f4ec89482782e3b1640649ed1a6f6d4f1e1b636c71bdd36c31b618.json
deleted file mode 100644
index 3995bffd64..0000000000
--- a/backend/.sqlx/query-45de6be332f4ec89482782e3b1640649ed1a6f6d4f1e1b636c71bdd36c31b618.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO debounce_key (job_id, key)\n            VALUES ($1, $2)\n            ON CONFLICT (key)\n            DO UPDATE SET\n                previous_job_id = debounce_key.job_id,\n                job_id = EXCLUDED.job_id,\n                debounced_times = debounce_key.debounced_times + 1\n            RETURNING\n                debounced_times,\n                first_started_at,\n                previous_job_id AS job_id_to_debounce\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "debounced_times",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "first_started_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 2,
-        "name": "job_id_to_debounce",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Varchar"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "45de6be332f4ec89482782e3b1640649ed1a6f6d4f1e1b636c71bdd36c31b618"
-}
diff --git a/backend/.sqlx/query-462d2b2822b185a6f51fafcfa957cb3b31ee6b69abae79a214dddba0dee4425c.json b/backend/.sqlx/query-462d2b2822b185a6f51fafcfa957cb3b31ee6b69abae79a214dddba0dee4425c.json
new file mode 100644
index 0000000000..0c4d90b073
--- /dev/null
+++ b/backend/.sqlx/query-462d2b2822b185a6f51fafcfa957cb3b31ee6b69abae79a214dddba0dee4425c.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM flow_conversation_message m\n         USING flow_conversation c\n         WHERE m.conversation_id = c.id AND c.workspace_id = $1 AND m.job_id = ANY($2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "UuidArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "462d2b2822b185a6f51fafcfa957cb3b31ee6b69abae79a214dddba0dee4425c"
+}
diff --git a/backend/.sqlx/query-46f00a75b2e7e4ac70758a9687070f68bc0421f1aa228f80157adda63191d33b.json b/backend/.sqlx/query-46f00a75b2e7e4ac70758a9687070f68bc0421f1aa228f80157adda63191d33b.json
index b90ba150d9..c269f7f340 100644
--- a/backend/.sqlx/query-46f00a75b2e7e4ac70758a9687070f68bc0421f1aa228f80157adda63191d33b.json
+++ b/backend/.sqlx/query-46f00a75b2e7e4ac70758a9687070f68bc0421f1aa228f80157adda63191d33b.json
@@ -41,7 +41,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-472d351f0bba2dc3404d83aec131cd50b297f80e5392715f54f32fab4bf346fc.json b/backend/.sqlx/query-472d351f0bba2dc3404d83aec131cd50b297f80e5392715f54f32fab4bf346fc.json
new file mode 100644
index 0000000000..18af751ca0
--- /dev/null
+++ b/backend/.sqlx/query-472d351f0bba2dc3404d83aec131cd50b297f80e5392715f54f32fab4bf346fc.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_advisory_xact_lock(hashtext('workspace_multipart_inflight'), hashtext($1))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "pg_advisory_xact_lock",
+        "type_info": "Void"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "472d351f0bba2dc3404d83aec131cd50b297f80e5392715f54f32fab4bf346fc"
+}
diff --git a/backend/.sqlx/query-4865e22673a7886ff84cfe5ee1114d66b1678bfe3028df89dff4e343e2f4ab44.json b/backend/.sqlx/query-4865e22673a7886ff84cfe5ee1114d66b1678bfe3028df89dff4e343e2f4ab44.json
new file mode 100644
index 0000000000..5f114c0156
--- /dev/null
+++ b/backend/.sqlx/query-4865e22673a7886ff84cfe5ee1114d66b1678bfe3028df89dff4e343e2f4ab44.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH potential AS (\n            SELECT email, operator FROM usr WHERE is_service_account IS false\n            UNION\n            SELECT email, operator FROM workspace_invite\n        ),\n        per_user AS (\n            SELECT email, bool_and(operator) AS only_operator FROM potential GROUP BY email\n        )\n        SELECT\n            COUNT(*) FILTER (WHERE NOT only_operator) AS \"authors!\",\n            COUNT(*) FILTER (WHERE only_operator) AS \"operators!\"\n        FROM per_user\n        WHERE email NOT IN (SELECT email FROM password WHERE disabled IS true)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "authors!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "operators!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "4865e22673a7886ff84cfe5ee1114d66b1678bfe3028df89dff4e343e2f4ab44"
+}
diff --git a/backend/.sqlx/query-48a5df355a2bca557a3a541cf66c8e75790b7c3dd7845359019ff645a1f7c8bf.json b/backend/.sqlx/query-48a5df355a2bca557a3a541cf66c8e75790b7c3dd7845359019ff645a1f7c8bf.json
new file mode 100644
index 0000000000..43f527b3aa
--- /dev/null
+++ b/backend/.sqlx/query-48a5df355a2bca557a3a541cf66c8e75790b7c3dd7845359019ff645a1f7c8bf.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_database_size(current_database())::BIGINT AS \"v!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "v!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "48a5df355a2bca557a3a541cf66c8e75790b7c3dd7845359019ff645a1f7c8bf"
+}
diff --git a/backend/.sqlx/query-49e1f5663eed128ed956c9a50bc73a85256c0a3e5a701cc13c944e66f6402617.json b/backend/.sqlx/query-49e1f5663eed128ed956c9a50bc73a85256c0a3e5a701cc13c944e66f6402617.json
new file mode 100644
index 0000000000..e99432f11f
--- /dev/null
+++ b/backend/.sqlx/query-49e1f5663eed128ed956c9a50bc73a85256c0a3e5a701cc13c944e66f6402617.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT current_setting('max_connections')::INT AS \"v!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "v!",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "49e1f5663eed128ed956c9a50bc73a85256c0a3e5a701cc13c944e66f6402617"
+}
diff --git a/backend/.sqlx/query-4a43d4df6c5b2e8dda4308dcb88c23caf312ec377dd91e5307f00d3fb8ec325d.json b/backend/.sqlx/query-4a43d4df6c5b2e8dda4308dcb88c23caf312ec377dd91e5307f00d3fb8ec325d.json
index 7d950f6d8f..7474818bf3 100644
--- a/backend/.sqlx/query-4a43d4df6c5b2e8dda4308dcb88c23caf312ec377dd91e5307f00d3fb8ec325d.json
+++ b/backend/.sqlx/query-4a43d4df6c5b2e8dda4308dcb88c23caf312ec377dd91e5307f00d3fb8ec325d.json
@@ -80,7 +80,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-4add520575717d449a3758326777fee03012a3fa0fb943239e004cc4a7067501.json b/backend/.sqlx/query-4add520575717d449a3758326777fee03012a3fa0fb943239e004cc4a7067501.json
new file mode 100644
index 0000000000..64330e91cf
--- /dev/null
+++ b/backend/.sqlx/query-4add520575717d449a3758326777fee03012a3fa0fb943239e004cc4a7067501.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT DISTINCT ON (path) path AS \"path!\", content AS \"content!\"\n        FROM script\n        WHERE workspace_id = $1\n          AND auto_kind = 'pipeline'\n          AND archived = false\n          AND deleted = false\n          AND (content LIKE '%' || $2 || '%' OR path = ANY($3))\n        ORDER BY path, created_at DESC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "content!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "4add520575717d449a3758326777fee03012a3fa0fb943239e004cc4a7067501"
+}
diff --git a/backend/.sqlx/query-4b03b55595bbc02e63fc920cbaf4a1503df8811d2d212f1a97ffd00599aeb4c7.json b/backend/.sqlx/query-4b03b55595bbc02e63fc920cbaf4a1503df8811d2d212f1a97ffd00599aeb4c7.json
new file mode 100644
index 0000000000..06b8754d5f
--- /dev/null
+++ b/backend/.sqlx/query-4b03b55595bbc02e63fc920cbaf4a1503df8811d2d212f1a97ffd00599aeb4c7.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO notify_event (channel, payload) VALUES ('notify_macro_registry_change', $1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4b03b55595bbc02e63fc920cbaf4a1503df8811d2d212f1a97ffd00599aeb4c7"
+}
diff --git a/backend/.sqlx/query-4c93380abebe4682f280bc3cc0add2878746496a25db7ea50d857658c49a931f.json b/backend/.sqlx/query-4c93380abebe4682f280bc3cc0add2878746496a25db7ea50d857658c49a931f.json
new file mode 100644
index 0000000000..c2c041e131
--- /dev/null
+++ b/backend/.sqlx/query-4c93380abebe4682f280bc3cc0add2878746496a25db7ea50d857658c49a931f.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_advisory_xact_lock(hashtext($1))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "pg_advisory_xact_lock",
+        "type_info": "Void"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "4c93380abebe4682f280bc3cc0add2878746496a25db7ea50d857658c49a931f"
+}
diff --git a/backend/.sqlx/query-4cdc0932987ff69892f332229a1def48e0678c337884c3ef801278d8feb41301.json b/backend/.sqlx/query-4cdc0932987ff69892f332229a1def48e0678c337884c3ef801278d8feb41301.json
new file mode 100644
index 0000000000..07d1753aa0
--- /dev/null
+++ b/backend/.sqlx/query-4cdc0932987ff69892f332229a1def48e0678c337884c3ef801278d8feb41301.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM native_retry_attempt WHERE job_id = ANY($1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "UuidArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4cdc0932987ff69892f332229a1def48e0678c337884c3ef801278d8feb41301"
+}
diff --git a/backend/.sqlx/query-4e4efea2b8d3b0bd2717b27d1895b00e8dba07aa817ee9bfbe2271d41c9b411a.json b/backend/.sqlx/query-4e4efea2b8d3b0bd2717b27d1895b00e8dba07aa817ee9bfbe2271d41c9b411a.json
new file mode 100644
index 0000000000..8e9e6a8713
--- /dev/null
+++ b/backend/.sqlx/query-4e4efea2b8d3b0bd2717b27d1895b00e8dba07aa817ee9bfbe2271d41c9b411a.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace SET is_dev_workspace = false WHERE id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4e4efea2b8d3b0bd2717b27d1895b00e8dba07aa817ee9bfbe2271d41c9b411a"
+}
diff --git a/backend/.sqlx/query-6fbd5826ae1fafd7bbb218324e3e2d85231b889743de637eb35e756da29ad47b.json b/backend/.sqlx/query-4efaa4c3c14987fe95a508cc0cbac91ee793ad6f5ceed5b3eda9b48617c5434d.json
similarity index 63%
rename from backend/.sqlx/query-6fbd5826ae1fafd7bbb218324e3e2d85231b889743de637eb35e756da29ad47b.json
rename to backend/.sqlx/query-4efaa4c3c14987fe95a508cc0cbac91ee793ad6f5ceed5b3eda9b48617c5434d.json
index 4bb89660ec..bdb39d134f 100644
--- a/backend/.sqlx/query-6fbd5826ae1fafd7bbb218324e3e2d85231b889743de637eb35e756da29ad47b.json
+++ b/backend/.sqlx/query-4efaa4c3c14987fe95a508cc0cbac91ee793ad6f5ceed5b3eda9b48617c5434d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END) as \"username?\",\n                  d.created_at as \"draft_saved_at!\"\n           FROM draft d\n           LEFT JOIN usr u\n                  ON u.workspace_id = d.workspace_id\n                 AND u.email = d.email\n           WHERE d.workspace_id = $1\n             AND d.path = $2\n             AND d.typ = $3\n             AND (d.email IS NULL OR d.email <> $4)\n           ORDER BY d.email NULLS LAST",
+  "query": "SELECT COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END) as \"username?\",\n                  d.created_at as \"draft_saved_at!\"\n           FROM draft d\n           LEFT JOIN usr u\n                  ON u.workspace_id = d.workspace_id\n                 AND u.email = d.email\n           LEFT JOIN password p\n                  ON p.email = d.email\n                 AND p.super_admin = true\n           WHERE d.workspace_id = $1\n             AND d.path = $2\n             AND d.typ = $3\n             AND (d.email IS NULL OR d.email <> $4)\n           ORDER BY d.email NULLS LAST",
   "describe": {
     "columns": [
       {
@@ -46,7 +46,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
@@ -59,5 +60,5 @@
       false
     ]
   },
-  "hash": "6fbd5826ae1fafd7bbb218324e3e2d85231b889743de637eb35e756da29ad47b"
+  "hash": "4efaa4c3c14987fe95a508cc0cbac91ee793ad6f5ceed5b3eda9b48617c5434d"
 }
diff --git a/backend/.sqlx/query-50490ff42fb1f2d78864d7b374d299bf8290c3b969b576cb185c8b5b0abb0265.json b/backend/.sqlx/query-50490ff42fb1f2d78864d7b374d299bf8290c3b969b576cb185c8b5b0abb0265.json
new file mode 100644
index 0000000000..5bd3cf80a7
--- /dev/null
+++ b/backend/.sqlx/query-50490ff42fb1f2d78864d7b374d299bf8290c3b969b576cb185c8b5b0abb0265.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)::BIGINT AS \"count!\" FROM flow WHERE archived = false",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "50490ff42fb1f2d78864d7b374d299bf8290c3b969b576cb185c8b5b0abb0265"
+}
diff --git a/backend/.sqlx/query-530a797e67ff352471f1b34f260dd530a653081619e6d3132bf07996520b1e25.json b/backend/.sqlx/query-530a797e67ff352471f1b34f260dd530a653081619e6d3132bf07996520b1e25.json
new file mode 100644
index 0000000000..465ee41633
--- /dev/null
+++ b/backend/.sqlx/query-530a797e67ff352471f1b34f260dd530a653081619e6d3132bf07996520b1e25.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace\n            (id, name, owner, parent_workspace_id, is_dev_workspace, dev_workspace_label)\n            VALUES ($1, $2, $3, $4, $5, $6)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Bool",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "530a797e67ff352471f1b34f260dd530a653081619e6d3132bf07996520b1e25"
+}
diff --git a/backend/.sqlx/query-9c85ba8d41bedbcb5466f44a7d4cf6b4946e1fd337f00d243f518283783833c9.json b/backend/.sqlx/query-5312b8db714139a94d7ff1c0794af063c36ac17e9d331cd9980b91b28d713c72.json
similarity index 57%
rename from backend/.sqlx/query-9c85ba8d41bedbcb5466f44a7d4cf6b4946e1fd337f00d243f518283783833c9.json
rename to backend/.sqlx/query-5312b8db714139a94d7ff1c0794af063c36ac17e9d331cd9980b91b28d713c72.json
index fce125c6d5..35b70a239c 100644
--- a/backend/.sqlx/query-9c85ba8d41bedbcb5466f44a7d4cf6b4946e1fd337f00d243f518283783833c9.json
+++ b/backend/.sqlx/query-5312b8db714139a94d7ff1c0794af063c36ac17e9d331cd9980b91b28d713c72.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT bool_and(operator) FROM (\n            SELECT operator FROM usr WHERE email = $1\n            UNION ALL\n            SELECT operator FROM workspace_invite WHERE email = $1\n        ) t",
+  "query": "SELECT bool_and(operator) FROM (\n            SELECT operator FROM usr WHERE email = $1 AND is_service_account IS false\n            UNION ALL\n            SELECT operator FROM workspace_invite WHERE email = $1\n        ) t",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       null
     ]
   },
-  "hash": "9c85ba8d41bedbcb5466f44a7d4cf6b4946e1fd337f00d243f518283783833c9"
+  "hash": "5312b8db714139a94d7ff1c0794af063c36ac17e9d331cd9980b91b28d713c72"
 }
diff --git a/backend/.sqlx/query-5323858a017814206179d35fdb708c547742851975163550ec4f3823057e91fe.json b/backend/.sqlx/query-5323858a017814206179d35fdb708c547742851975163550ec4f3823057e91fe.json
new file mode 100644
index 0000000000..a8facb9d1b
--- /dev/null
+++ b/backend/.sqlx/query-5323858a017814206179d35fdb708c547742851975163550ec4f3823057e91fe.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO schedule (\n                workspace_id, path, schedule, timezone, edited_by, script_path,\n                is_flow, enabled, email, permissioned_as, summary, tag, cron_version\n            ) VALUES ($1, $2, $3, 'Etc/UTC', $4, $2, false, true, $5, $6, $7, 'duckdb', 'v2')\n            ON CONFLICT (workspace_id, path) DO UPDATE SET\n                schedule = EXCLUDED.schedule,\n                timezone = EXCLUDED.timezone,\n                edited_by = EXCLUDED.edited_by,\n                edited_at = now(),\n                script_path = EXCLUDED.script_path,\n                is_flow = false,\n                enabled = true,\n                email = EXCLUDED.email,\n                permissioned_as = EXCLUDED.permissioned_as,\n                summary = EXCLUDED.summary,\n                tag = EXCLUDED.tag,\n                cron_version = EXCLUDED.cron_version,\n                error = NULL",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5323858a017814206179d35fdb708c547742851975163550ec4f3823057e91fe"
+}
diff --git a/backend/.sqlx/query-53a1ec83aedcec2cdf6495637464e6219434de4d2f9ae5e484ed8ce5da426109.json b/backend/.sqlx/query-53a1ec83aedcec2cdf6495637464e6219434de4d2f9ae5e484ed8ce5da426109.json
new file mode 100644
index 0000000000..8bce508e75
--- /dev/null
+++ b/backend/.sqlx/query-53a1ec83aedcec2cdf6495637464e6219434de4d2f9ae5e484ed8ce5da426109.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM schedule WHERE workspace_id = $1 AND path = ANY($2) AND path != ALL($3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "53a1ec83aedcec2cdf6495637464e6219434de4d2f9ae5e484ed8ce5da426109"
+}
diff --git a/backend/.sqlx/query-54ad5cc89563fdbbacdd6bfde9be6ecfcdec3d505d28cc65b5920dcf87c0014f.json b/backend/.sqlx/query-54ad5cc89563fdbbacdd6bfde9be6ecfcdec3d505d28cc65b5920dcf87c0014f.json
index 2e189af5e8..d81d6ebd94 100644
--- a/backend/.sqlx/query-54ad5cc89563fdbbacdd6bfde9be6ecfcdec3d505d28cc65b5920dcf87c0014f.json
+++ b/backend/.sqlx/query-54ad5cc89563fdbbacdd6bfde9be6ecfcdec3d505d28cc65b5920dcf87c0014f.json
@@ -35,7 +35,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-54ef5bde9d0e93d301673a5656bf40570cadd2771d94f5c19a7911554efe4d5c.json b/backend/.sqlx/query-54ef5bde9d0e93d301673a5656bf40570cadd2771d94f5c19a7911554efe4d5c.json
new file mode 100644
index 0000000000..8c46b8250c
--- /dev/null
+++ b/backend/.sqlx/query-54ef5bde9d0e93d301673a5656bf40570cadd2771d94f5c19a7911554efe4d5c.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT attempt FROM native_retry_attempt WHERE job_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "attempt",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "54ef5bde9d0e93d301673a5656bf40570cadd2771d94f5c19a7911554efe4d5c"
+}
diff --git a/backend/.sqlx/query-560539adbad0ecfa57fa477c3b82d82c350857166fc27fe9eecc88bcc4b229bc.json b/backend/.sqlx/query-560539adbad0ecfa57fa477c3b82d82c350857166fc27fe9eecc88bcc4b229bc.json
index 0191cf8bfd..91c941593f 100644
--- a/backend/.sqlx/query-560539adbad0ecfa57fa477c3b82d82c350857166fc27fe9eecc88bcc4b229bc.json
+++ b/backend/.sqlx/query-560539adbad0ecfa57fa477c3b82d82c350857166fc27fe9eecc88bcc4b229bc.json
@@ -42,7 +42,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-564f4bdf43135c603518ef35a3e95bde7f479877018980cffe1c1e9d34aad59e.json b/backend/.sqlx/query-564f4bdf43135c603518ef35a3e95bde7f479877018980cffe1c1e9d34aad59e.json
new file mode 100644
index 0000000000..20ac675432
--- /dev/null
+++ b/backend/.sqlx/query-564f4bdf43135c603518ef35a3e95bde7f479877018980cffe1c1e9d34aad59e.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 RETURNING timestamp, name",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "564f4bdf43135c603518ef35a3e95bde7f479877018980cffe1c1e9d34aad59e"
+}
diff --git a/backend/.sqlx/query-56a98a07a2f6af4d694db05d57acbe0b55cc39d64f73a3c90c250ea670f9cdee.json b/backend/.sqlx/query-56a98a07a2f6af4d694db05d57acbe0b55cc39d64f73a3c90c250ea670f9cdee.json
new file mode 100644
index 0000000000..711970ff32
--- /dev/null
+++ b/backend/.sqlx/query-56a98a07a2f6af4d694db05d57acbe0b55cc39d64f73a3c90c250ea670f9cdee.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT current_setting('server_version_num')::INT AS \"v!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "v!",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "56a98a07a2f6af4d694db05d57acbe0b55cc39d64f73a3c90c250ea670f9cdee"
+}
diff --git a/backend/.sqlx/query-572b80f7b16fd5d1a05f8fe9bbb07667fc1b5e802dc2465ffd13178a042e4f89.json b/backend/.sqlx/query-572b80f7b16fd5d1a05f8fe9bbb07667fc1b5e802dc2465ffd13178a042e4f89.json
new file mode 100644
index 0000000000..580666f07d
--- /dev/null
+++ b/backend/.sqlx/query-572b80f7b16fd5d1a05f8fe9bbb07667fc1b5e802dc2465ffd13178a042e4f89.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT EXISTS(\n            SELECT 1 FROM v2_job j\n            JOIN v2_job_completed c ON c.id = j.id\n            WHERE j.workspace_id = $1\n              AND j.runnable_path = $2\n              AND j.parent_job IS NULL\n              AND j.kind IN ('script', 'preview')\n              AND c.status = 'success'\n              AND c.completed_at > now() - ($3::bigint::text || ' seconds')::interval\n        ) AS \"fresh!\"\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "fresh!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "572b80f7b16fd5d1a05f8fe9bbb07667fc1b5e802dc2465ffd13178a042e4f89"
+}
diff --git a/backend/.sqlx/query-5884ce1906015f6b96231f311226e490d5dfcdd7a94dcbe5d05c9e5af37ac4a4.json b/backend/.sqlx/query-5884ce1906015f6b96231f311226e490d5dfcdd7a94dcbe5d05c9e5af37ac4a4.json
index bb326fab87..0c445c1ae5 100644
--- a/backend/.sqlx/query-5884ce1906015f6b96231f311226e490d5dfcdd7a94dcbe5d05c9e5af37ac4a4.json
+++ b/backend/.sqlx/query-5884ce1906015f6b96231f311226e490d5dfcdd7a94dcbe5d05c9e5af37ac4a4.json
@@ -35,7 +35,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-59c1137f718d442c4e99fc07365ebbe13e6298749b19570f9f8c4a0c7958b0ce.json b/backend/.sqlx/query-59c1137f718d442c4e99fc07365ebbe13e6298749b19570f9f8c4a0c7958b0ce.json
new file mode 100644
index 0000000000..cd2dd23319
--- /dev/null
+++ b/backend/.sqlx/query-59c1137f718d442c4e99fc07365ebbe13e6298749b19570f9f8c4a0c7958b0ce.json
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n             (SELECT COALESCE(SUM(bytes), 0) FROM workspace_storage_usage WHERE workspace_id = $1)::bigint as \"committed!\",\n             COALESCE(\n               (SELECT MIN(computed_at) FROM workspace_storage_usage WHERE workspace_id = $1) < now() - interval '10 minutes',\n               true) as \"stale!\",\n             (SELECT COALESCE(SUM(GREATEST(inflight_bytes - target_existing_size, 0)), 0)\n                FROM workspace_multipart_inflight\n                WHERE workspace_id = $1 AND created_at > now() - ($2::text)::interval\n                  AND ($3::text IS NULL OR upload_id <> $3))::bigint as \"reserved!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "committed!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "stale!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "reserved!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "59c1137f718d442c4e99fc07365ebbe13e6298749b19570f9f8c4a0c7958b0ce"
+}
diff --git a/backend/.sqlx/query-5a0d50d322f2ab58eb36da16407d31a8319db563b8761194b237ea166ada42a5.json b/backend/.sqlx/query-5a0d50d322f2ab58eb36da16407d31a8319db563b8761194b237ea166ada42a5.json
new file mode 100644
index 0000000000..0535031aac
--- /dev/null
+++ b/backend/.sqlx/query-5a0d50d322f2ab58eb36da16407d31a8319db563b8761194b237ea166ada42a5.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM dispatch_event WHERE workspace_id = $1 AND producer_job_id = ANY($2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "UuidArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5a0d50d322f2ab58eb36da16407d31a8319db563b8761194b237ea166ada42a5"
+}
diff --git a/backend/.sqlx/query-5b0847d2b95a128a5b648dd4847af44ed0992ced76286a08a33134140a454391.json b/backend/.sqlx/query-5b0847d2b95a128a5b648dd4847af44ed0992ced76286a08a33134140a454391.json
new file mode 100644
index 0000000000..28c09ca528
--- /dev/null
+++ b/backend/.sqlx/query-5b0847d2b95a128a5b648dd4847af44ed0992ced76286a08a33134140a454391.json
@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT (status = 'success' OR EXISTS (\n                        SELECT 1 FROM native_retry_attempt nra\n                        JOIN v2_job jc ON jc.id = nra.job_id\n                        JOIN v2_job_completed cc ON cc.id = nra.job_id\n                        WHERE jc.parent_job = j.id AND cc.status = 'success'\n                    )) AS \"success!\",\n                    result AS \"result: Json<Box<RawValue>>\",\n                    started_at AS \"started_at!\"FROM v2_job j JOIN v2_job_completed USING (id)\n                WHERE j.workspace_id = $1 AND trigger_kind = 'schedule' AND trigger = $2\n                    AND parent_job IS NULL\n                    AND runnable_path = $3\n                    AND j.id != $4\n                ORDER BY created_at DESC\n                LIMIT $5",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "success!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "result: Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 2,
+        "name": "started_at!",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Uuid",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null,
+      true,
+      true
+    ]
+  },
+  "hash": "5b0847d2b95a128a5b648dd4847af44ed0992ced76286a08a33134140a454391"
+}
diff --git a/backend/.sqlx/query-5b67c3af6477d7029d118ac259a7535d4d962c328a060f33c07191ac3e033e82.json b/backend/.sqlx/query-5b67c3af6477d7029d118ac259a7535d4d962c328a060f33c07191ac3e033e82.json
new file mode 100644
index 0000000000..12628305cc
--- /dev/null
+++ b/backend/.sqlx/query-5b67c3af6477d7029d118ac259a7535d4d962c328a060f33c07191ac3e033e82.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5b67c3af6477d7029d118ac259a7535d4d962c328a060f33c07191ac3e033e82"
+}
diff --git a/backend/.sqlx/query-5cca3509374b1ddd8707c930bc382734e4ca6cad2d849f75a8f8a249f83df83f.json b/backend/.sqlx/query-5cca3509374b1ddd8707c930bc382734e4ca6cad2d849f75a8f8a249f83df83f.json
new file mode 100644
index 0000000000..14b085db2e
--- /dev/null
+++ b/backend/.sqlx/query-5cca3509374b1ddd8707c930bc382734e4ca6cad2d849f75a8f8a249f83df83f.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT ws.datatable->'datatables'->$2 FROM workspace_settings ws WHERE ws.workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "5cca3509374b1ddd8707c930bc382734e4ca6cad2d849f75a8f8a249f83df83f"
+}
diff --git a/backend/.sqlx/query-5cd47ddc6a0181c8e23998adae103ff9c96d613fb2d9b698361f4ede8031e5d2.json b/backend/.sqlx/query-5cd47ddc6a0181c8e23998adae103ff9c96d613fb2d9b698361f4ede8031e5d2.json
new file mode 100644
index 0000000000..be54b4a25d
--- /dev/null
+++ b/backend/.sqlx/query-5cd47ddc6a0181c8e23998adae103ff9c96d613fb2d9b698361f4ede8031e5d2.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM workspace_multipart_inflight WHERE workspace_id = $1 AND upload_id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5cd47ddc6a0181c8e23998adae103ff9c96d613fb2d9b698361f4ede8031e5d2"
+}
diff --git a/backend/.sqlx/query-5e0569092c559a1b19f636fae68f6d740a1720f7746c01f9ea693c70271ff55c.json b/backend/.sqlx/query-5e0569092c559a1b19f636fae68f6d740a1720f7746c01f9ea693c70271ff55c.json
new file mode 100644
index 0000000000..18e0936d3a
--- /dev/null
+++ b/backend/.sqlx/query-5e0569092c559a1b19f636fae68f6d740a1720f7746c01f9ea693c70271ff55c.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO pipeline_freshness_state\n                (workspace_id, script_path, attempts, last_push_at, next_attempt_at)\n            VALUES ($1, $2, 1, now(),\n                    now() + (LEAST($3::bigint, $4::bigint * 2)::text || ' seconds')::interval)\n            ON CONFLICT (workspace_id, script_path) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5e0569092c559a1b19f636fae68f6d740a1720f7746c01f9ea693c70271ff55c"
+}
diff --git a/backend/.sqlx/query-60dc0f1fa17bd2946ba7ddf0c41fe58b8a53d071cdc83eca3092194b4a9c9174.json b/backend/.sqlx/query-60dc0f1fa17bd2946ba7ddf0c41fe58b8a53d071cdc83eca3092194b4a9c9174.json
new file mode 100644
index 0000000000..20c5c58c40
--- /dev/null
+++ b/backend/.sqlx/query-60dc0f1fa17bd2946ba7ddf0c41fe58b8a53d071cdc83eca3092194b4a9c9174.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            COUNT(*) FILTER (WHERE av.raw_app = false)::BIGINT AS \"low_code!\",\n            COUNT(*) FILTER (WHERE av.raw_app = true)::BIGINT AS \"raw!\"\n        FROM app a\n        JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "low_code!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "raw!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "60dc0f1fa17bd2946ba7ddf0c41fe58b8a53d071cdc83eca3092194b4a9c9174"
+}
diff --git a/backend/.sqlx/query-63b0f39e3ea2b8d01d4c055258b6fc3dc4e9e1f237ba7c86cbdd70140bc55541.json b/backend/.sqlx/query-63b0f39e3ea2b8d01d4c055258b6fc3dc4e9e1f237ba7c86cbdd70140bc55541.json
new file mode 100644
index 0000000000..1bcb7e6e53
--- /dev/null
+++ b/backend/.sqlx/query-63b0f39e3ea2b8d01d4c055258b6fc3dc4e9e1f237ba7c86cbdd70140bc55541.json
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH ancestor AS (\n            SELECT wid, ord FROM unnest($1::text[]) WITH ORDINALITY AS a(wid, ord)\n        ), anc_mat AS (\n            -- Per table, the nearest ancestor (lowest ord) that materialized it.\n            SELECT DISTINCT ON (mp.asset_path) mp.asset_path, a.wid, a.ord\n            FROM materialized_partition mp\n            JOIN ancestor a ON a.wid = mp.workspace_id\n            WHERE mp.asset_kind = 'ducklake' AND mp.status = 'materialized'\n              AND split_part(mp.asset_path, '/', 1) = $3 AND mp.asset_path LIKE '%/%'\n            ORDER BY mp.asset_path, a.ord\n        ), fork_mat AS (\n            -- Fork-OWNED assets: anything whose physical table exists in the fork\n            -- namespace, not just clean materializations. A committed write whose data\n            -- tests failed afterwards records status='failed' WITH a snapshot — its table\n            -- is real, and a defer view emitted over it would silently yield to it\n            -- (CREATE VIEW IF NOT EXISTS) while claiming the read defers to the parent.\n            SELECT DISTINCT asset_path FROM materialized_partition\n            WHERE workspace_id = $2 AND asset_kind = 'ducklake'\n              AND (status = 'materialized' OR snapshot_id IS NOT NULL)\n        ), latest_schema AS (\n            SELECT DISTINCT ON (workspace_id, asset_path) workspace_id, asset_path, columns\n            FROM materialized_asset_schema\n            WHERE workspace_id = ANY($1) AND asset_kind = 'ducklake'\n            ORDER BY workspace_id, asset_path, version DESC\n        )\n        SELECT am.asset_path AS \"asset_path!\",\n               am.ord AS \"ord!\",\n               COALESCE(EXISTS (\n                   SELECT 1 FROM jsonb_array_elements(ls.columns) e\n                   WHERE e->>'name' = 'is_current'\n               ), false) AS \"has_current!\"\n        FROM anc_mat am\n        LEFT JOIN latest_schema ls\n               ON ls.asset_path = am.asset_path AND ls.workspace_id = am.wid\n        WHERE am.asset_path NOT IN (SELECT asset_path FROM fork_mat)\n        ORDER BY am.asset_path\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "asset_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "ord!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "has_current!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      null
+    ]
+  },
+  "hash": "63b0f39e3ea2b8d01d4c055258b6fc3dc4e9e1f237ba7c86cbdd70140bc55541"
+}
diff --git a/backend/.sqlx/query-c095a9658c542efc9f0255a1b536d2fd8a25fe4cd57c223db7d744493f8470c6.json b/backend/.sqlx/query-63d323be5cacb7a02283d7d82c79bc408b9a33a228b80e88ec3f6432944a7c19.json
similarity index 63%
rename from backend/.sqlx/query-c095a9658c542efc9f0255a1b536d2fd8a25fe4cd57c223db7d744493f8470c6.json
rename to backend/.sqlx/query-63d323be5cacb7a02283d7d82c79bc408b9a33a228b80e88ec3f6432944a7c19.json
index bb80e8d19a..a9cdc35dce 100644
--- a/backend/.sqlx/query-c095a9658c542efc9f0255a1b536d2fd8a25fe4cd57c223db7d744493f8470c6.json
+++ b/backend/.sqlx/query-63d323be5cacb7a02283d7d82c79bc408b9a33a228b80e88ec3f6432944a7c19.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT workspace.id, workspace.name, usr.username, workspace_settings.color, workspace.parent_workspace_id,\n                CASE WHEN usr.operator THEN workspace_settings.operator_settings ELSE NULL END as operator_settings,\n                usr.disabled\n         FROM workspace\n         JOIN usr ON usr.workspace_id = workspace.id\n         JOIN workspace_settings ON workspace_settings.workspace_id = workspace.id\n         WHERE usr.email = $1 AND workspace.deleted = false",
+  "query": "SELECT workspace.id, workspace.name, usr.username, workspace_settings.color, workspace.parent_workspace_id,\n                workspace.is_dev_workspace,\n                CASE WHEN usr.operator THEN workspace_settings.operator_settings ELSE NULL END as operator_settings,\n                usr.disabled\n         FROM workspace\n         JOIN usr ON usr.workspace_id = workspace.id\n         JOIN workspace_settings ON workspace_settings.workspace_id = workspace.id\n         WHERE usr.email = $1 AND workspace.deleted = false",
   "describe": {
     "columns": [
       {
@@ -30,11 +30,16 @@
       },
       {
         "ordinal": 5,
+        "name": "is_dev_workspace",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 6,
         "name": "operator_settings",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 6,
+        "ordinal": 7,
         "name": "disabled",
         "type_info": "Bool"
       }
@@ -50,9 +55,10 @@
       false,
       true,
       true,
+      false,
       null,
       false
     ]
   },
-  "hash": "c095a9658c542efc9f0255a1b536d2fd8a25fe4cd57c223db7d744493f8470c6"
+  "hash": "63d323be5cacb7a02283d7d82c79bc408b9a33a228b80e88ec3f6432944a7c19"
 }
diff --git a/backend/.sqlx/query-63d6d968905cf82fb3bb0577d41a29a8f88010891fcf3eaf4761a57461f97703.json b/backend/.sqlx/query-63d6d968905cf82fb3bb0577d41a29a8f88010891fcf3eaf4761a57461f97703.json
new file mode 100644
index 0000000000..3959f4e8cc
--- /dev/null
+++ b/backend/.sqlx/query-63d6d968905cf82fb3bb0577d41a29a8f88010891fcf3eaf4761a57461f97703.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace SET dev_workspace_label = $1 WHERE id = $2 AND is_dev_workspace RETURNING id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "63d6d968905cf82fb3bb0577d41a29a8f88010891fcf3eaf4761a57461f97703"
+}
diff --git a/backend/.sqlx/query-651fc12e1b971d4fd57c98a7a7efbd503d8dea799545e9cb96574d5c6020b90b.json b/backend/.sqlx/query-651fc12e1b971d4fd57c98a7a7efbd503d8dea799545e9cb96574d5c6020b90b.json
deleted file mode 100644
index cb20ec2ffb..0000000000
--- a/backend/.sqlx/query-651fc12e1b971d4fd57c98a7a7efbd503d8dea799545e9cb96574d5c6020b90b.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job\n                 SET args = CASE\n                              WHEN args ? 'partition'\n                              THEN $1 || jsonb_build_object('partition', args -> 'partition')\n                              ELSE $1\n                            END,\n                     preprocessed = TRUE\n                 WHERE id = $2",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Jsonb",
-        "Uuid"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "651fc12e1b971d4fd57c98a7a7efbd503d8dea799545e9cb96574d5c6020b90b"
-}
diff --git a/backend/.sqlx/query-67e25a7c19ea0ffaf7ea5303fcd04af5a7eb488c76f783e690af0c2153b1d6a8.json b/backend/.sqlx/query-67e25a7c19ea0ffaf7ea5303fcd04af5a7eb488c76f783e690af0c2153b1d6a8.json
index 08ebe6bba5..fcc16e9a7c 100644
--- a/backend/.sqlx/query-67e25a7c19ea0ffaf7ea5303fcd04af5a7eb488c76f783e690af0c2153b1d6a8.json
+++ b/backend/.sqlx/query-67e25a7c19ea0ffaf7ea5303fcd04af5a7eb488c76f783e690af0c2153b1d6a8.json
@@ -161,7 +161,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-689c85d30f898f237c8a3a1e883440276ea6faee8589ff0febedf6917977a40e.json b/backend/.sqlx/query-689c85d30f898f237c8a3a1e883440276ea6faee8589ff0febedf6917977a40e.json
new file mode 100644
index 0000000000..83e2711cf5
--- /dev/null
+++ b/backend/.sqlx/query-689c85d30f898f237c8a3a1e883440276ea6faee8589ff0febedf6917977a40e.json
@@ -0,0 +1,40 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name AS \"name!\", provider_path AS \"provider_path!\",\n                  params AS \"params!\", is_table_macro AS \"is_table_macro!\"\n           FROM macro_definition\n           WHERE workspace_id = $1\n           ORDER BY provider_path, name",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "provider_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "params!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_table_macro!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "689c85d30f898f237c8a3a1e883440276ea6faee8589ff0febedf6917977a40e"
+}
diff --git a/backend/.sqlx/query-6939fbbaaacd5d5a34016ed9eb295ba3ef329059366632dd94262f2e1bdfed97.json b/backend/.sqlx/query-6939fbbaaacd5d5a34016ed9eb295ba3ef329059366632dd94262f2e1bdfed97.json
new file mode 100644
index 0000000000..4dfdcaab97
--- /dev/null
+++ b/backend/.sqlx/query-6939fbbaaacd5d5a34016ed9eb295ba3ef329059366632dd94262f2e1bdfed97.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name FROM macro_definition WHERE workspace_id = $1 AND provider_path != $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "6939fbbaaacd5d5a34016ed9eb295ba3ef329059366632dd94262f2e1bdfed97"
+}
diff --git a/backend/.sqlx/query-6ac00d65b3b7707cba9456171d4332c696e12b52066a5ae2ab10fe3b5bd0f3d0.json b/backend/.sqlx/query-6ac00d65b3b7707cba9456171d4332c696e12b52066a5ae2ab10fe3b5bd0f3d0.json
new file mode 100644
index 0000000000..3a1dc9da28
--- /dev/null
+++ b/backend/.sqlx/query-6ac00d65b3b7707cba9456171d4332c696e12b52066a5ae2ab10fe3b5bd0f3d0.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name, code_down FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "code_down",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "6ac00d65b3b7707cba9456171d4332c696e12b52066a5ae2ab10fe3b5bd0f3d0"
+}
diff --git a/backend/.sqlx/query-6ca5cbe50df89e6eead890758e34a6ae5091c37ec901975c3d564fd817a405b7.json b/backend/.sqlx/query-6ca5cbe50df89e6eead890758e34a6ae5091c37ec901975c3d564fd817a405b7.json
new file mode 100644
index 0000000000..9a0bbf46ef
--- /dev/null
+++ b/backend/.sqlx/query-6ca5cbe50df89e6eead890758e34a6ae5091c37ec901975c3d564fd817a405b7.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace_settings\n               SET ducklake = jsonb_set(ducklake, ARRAY['ducklakes', $2, 'fork_behavior'], '\"shared\"')\n               WHERE workspace_id = $1 AND ducklake->'ducklakes' ? $2\n               RETURNING 1 AS \"one!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "one!",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "6ca5cbe50df89e6eead890758e34a6ae5091c37ec901975c3d564fd817a405b7"
+}
diff --git a/backend/.sqlx/query-6d81570849980f316b08487a03f6017386cf2767c953e0d152e7983a00218c6f.json b/backend/.sqlx/query-6d81570849980f316b08487a03f6017386cf2767c953e0d152e7983a00218c6f.json
new file mode 100644
index 0000000000..4e8c7acee2
--- /dev/null
+++ b/backend/.sqlx/query-6d81570849980f316b08487a03f6017386cf2767c953e0d152e7983a00218c6f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE pipeline_freshness_state SET next_attempt_at = now() - interval '1 second'\n         WHERE workspace_id = $1 AND script_path = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "6d81570849980f316b08487a03f6017386cf2767c953e0d152e7983a00218c6f"
+}
diff --git a/backend/.sqlx/query-71ee328f016bac75a9050dc3c13dc898c0b40fe6f1c4e5c631b6f784f7e73a3d.json b/backend/.sqlx/query-71ee328f016bac75a9050dc3c13dc898c0b40fe6f1c4e5c631b6f784f7e73a3d.json
new file mode 100644
index 0000000000..acfa08d0bf
--- /dev/null
+++ b/backend/.sqlx/query-71ee328f016bac75a9050dc3c13dc898c0b40fe6f1c4e5c631b6f784f7e73a3d.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH RECURSIVE tree AS (\n                SELECT id, 0 AS depth FROM workspace WHERE id = $1\n                UNION ALL\n                SELECT w.id, tree.depth + 1 FROM workspace w\n                JOIN tree ON w.parent_workspace_id = tree.id\n                WHERE tree.depth < 20\n            )\n            SELECT id AS \"id!\" FROM tree WHERE id != $1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "71ee328f016bac75a9050dc3c13dc898c0b40fe6f1c4e5c631b6f784f7e73a3d"
+}
diff --git a/backend/.sqlx/query-734781e8e55e95c55f72e094e96297aa852e20a0f0d20db4b993947792f6b0a8.json b/backend/.sqlx/query-734781e8e55e95c55f72e094e96297aa852e20a0f0d20db4b993947792f6b0a8.json
new file mode 100644
index 0000000000..d55722ed24
--- /dev/null
+++ b/backend/.sqlx/query-734781e8e55e95c55f72e094e96297aa852e20a0f0d20db4b993947792f6b0a8.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO ai_skill (workspace_id, name, description, instructions, edited_at, edited_by)\n               VALUES ($1, $2, $3, $4, now(), $5)\n               ON CONFLICT (workspace_id, name) DO UPDATE\n               SET description = EXCLUDED.description,\n                   instructions = EXCLUDED.instructions,\n                   edited_at = now(),\n                   edited_by = EXCLUDED.edited_by",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "734781e8e55e95c55f72e094e96297aa852e20a0f0d20db4b993947792f6b0a8"
+}
diff --git a/backend/.sqlx/query-754b98335e8776565d63267b395013649adacf348e3a815e991b4463b1711afc.json b/backend/.sqlx/query-754b98335e8776565d63267b395013649adacf348e3a815e991b4463b1711afc.json
deleted file mode 100644
index c5266c66b5..0000000000
--- a/backend/.sqlx/query-754b98335e8776565d63267b395013649adacf348e3a815e991b4463b1711afc.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT runnable_path AS \"runnable_path!\", kind::text AS \"kind!\"\n             FROM v2_job\n             WHERE workspace_id = $1 AND trigger_kind = 'asset'\n             ORDER BY runnable_path",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "runnable_path!",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "kind!",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      true,
-      null
-    ]
-  },
-  "hash": "754b98335e8776565d63267b395013649adacf348e3a815e991b4463b1711afc"
-}
diff --git a/backend/.sqlx/query-760908f44cafb500e4ba2515d1b030390d9510e73e9b7df347b697d6dc7aefe6.json b/backend/.sqlx/query-760908f44cafb500e4ba2515d1b030390d9510e73e9b7df347b697d6dc7aefe6.json
new file mode 100644
index 0000000000..384686eb35
--- /dev/null
+++ b/backend/.sqlx/query-760908f44cafb500e4ba2515d1b030390d9510e73e9b7df347b697d6dc7aefe6.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down) VALUES ($1, $2, $3, $4, $5, $6)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "760908f44cafb500e4ba2515d1b030390d9510e73e9b7df347b697d6dc7aefe6"
+}
diff --git a/backend/.sqlx/query-76774e6f72c8c8b7473487e4176dc17b17372b7292e39d3888a93ff4fe49e4f5.json b/backend/.sqlx/query-76774e6f72c8c8b7473487e4176dc17b17372b7292e39d3888a93ff4fe49e4f5.json
new file mode 100644
index 0000000000..694ed1887f
--- /dev/null
+++ b/backend/.sqlx/query-76774e6f72c8c8b7473487e4176dc17b17372b7292e39d3888a93ff4fe49e4f5.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM debounce_key WHERE key = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "76774e6f72c8c8b7473487e4176dc17b17372b7292e39d3888a93ff4fe49e4f5"
+}
diff --git a/backend/.sqlx/query-76af9b978fccef61f50a5eab335d4e427342fb78c66980984aefa7b8c7592ecb.json b/backend/.sqlx/query-76af9b978fccef61f50a5eab335d4e427342fb78c66980984aefa7b8c7592ecb.json
new file mode 100644
index 0000000000..b6b0f06be5
--- /dev/null
+++ b/backend/.sqlx/query-76af9b978fccef61f50a5eab335d4e427342fb78c66980984aefa7b8c7592ecb.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT ducklake->'ducklakes' FROM workspace_settings WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "76af9b978fccef61f50a5eab335d4e427342fb78c66980984aefa7b8c7592ecb"
+}
diff --git a/backend/.sqlx/query-7853a596a01884070455e68bbf8ab2afa79a5b5b8521f68ab19f0470f0265c7c.json b/backend/.sqlx/query-7853a596a01884070455e68bbf8ab2afa79a5b5b8521f68ab19f0470f0265c7c.json
new file mode 100644
index 0000000000..f425d1eebd
--- /dev/null
+++ b/backend/.sqlx/query-7853a596a01884070455e68bbf8ab2afa79a5b5b8521f68ab19f0470f0265c7c.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT (parent_workspace_id IS NOT NULL) AS \"has_parent!\" FROM workspace WHERE id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "has_parent!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "7853a596a01884070455e68bbf8ab2afa79a5b5b8521f68ab19f0470f0265c7c"
+}
diff --git a/backend/.sqlx/query-78bb75578a880715fb482445883e0e762f289b7695f29bfd44fa23323c7e8523.json b/backend/.sqlx/query-78bb75578a880715fb482445883e0e762f289b7695f29bfd44fa23323c7e8523.json
deleted file mode 100644
index f7d3361d99..0000000000
--- a/backend/.sqlx/query-78bb75578a880715fb482445883e0e762f289b7695f29bfd44fa23323c7e8523.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM asset WHERE workspace_id = $1 AND usage_kind = 'script' AND usage_path = (SELECT path FROM script WHERE hash = $2 AND workspace_id = $1)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "78bb75578a880715fb482445883e0e762f289b7695f29bfd44fa23323c7e8523"
-}
diff --git a/backend/.sqlx/query-798dc8ce1c80b5ebd8120f55b6c9f909bf4babb29910514753cb822dde4e7ca9.json b/backend/.sqlx/query-798dc8ce1c80b5ebd8120f55b6c9f909bf4babb29910514753cb822dde4e7ca9.json
new file mode 100644
index 0000000000..f7ff5d527a
--- /dev/null
+++ b/backend/.sqlx/query-798dc8ce1c80b5ebd8120f55b6c9f909bf4babb29910514753cb822dde4e7ca9.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT (ws.datatable->'datatables'->$2->>'migrations_enabled')::boolean FROM workspace_settings ws WHERE ws.workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "bool",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "798dc8ce1c80b5ebd8120f55b6c9f909bf4babb29910514753cb822dde4e7ca9"
+}
diff --git a/backend/.sqlx/query-7b6fa8b999a0160ca349e70e1cd41b344a1710715fb230ac97aca875a9ef38a5.json b/backend/.sqlx/query-7b6fa8b999a0160ca349e70e1cd41b344a1710715fb230ac97aca875a9ef38a5.json
new file mode 100644
index 0000000000..f909a33b4c
--- /dev/null
+++ b/backend/.sqlx/query-7b6fa8b999a0160ca349e70e1cd41b344a1710715fb230ac97aca875a9ef38a5.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT audit_logs_s3_oldest_inflight_ts() AS \"x\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "x",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "7b6fa8b999a0160ca349e70e1cd41b344a1710715fb230ac97aca875a9ef38a5"
+}
diff --git a/backend/.sqlx/query-7b950d49cb1cc7f9bf8032c9e7655c49027337a9eca1f1ded13dbae6475e3376.json b/backend/.sqlx/query-7b950d49cb1cc7f9bf8032c9e7655c49027337a9eca1f1ded13dbae6475e3376.json
new file mode 100644
index 0000000000..e1cf9bc17f
--- /dev/null
+++ b/backend/.sqlx/query-7b950d49cb1cc7f9bf8032c9e7655c49027337a9eca1f1ded13dbae6475e3376.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT parent_workspace_id FROM workspace WHERE id = $1 AND is_dev_workspace",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "parent_workspace_id",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "7b950d49cb1cc7f9bf8032c9e7655c49027337a9eca1f1ded13dbae6475e3376"
+}
diff --git a/backend/.sqlx/query-7cd0b27f4b4a20b05ac876861b934128c3a6ade024d6662379857905a7447a2a.json b/backend/.sqlx/query-7cd0b27f4b4a20b05ac876861b934128c3a6ade024d6662379857905a7447a2a.json
new file mode 100644
index 0000000000..5c8ab6fb5b
--- /dev/null
+++ b/backend/.sqlx/query-7cd0b27f4b4a20b05ac876861b934128c3a6ade024d6662379857905a7447a2a.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT DISTINCT ON (workspace_id, path)\n               workspace_id AS \"workspace_id!\", path AS \"path!\", content AS \"content!\"\n        FROM script\n        WHERE auto_kind = 'pipeline'\n          AND archived = false\n          AND deleted = false\n          AND content ILIKE '%freshness%'\n          -- Workspace archival stops all execution but leaves script rows\n          -- intact for unarchival; without this the watchdog would keep\n          -- resurrecting runs in a workspace the admin shut down.\n          AND EXISTS (SELECT 1 FROM workspace w\n                      WHERE w.id = script.workspace_id AND w.deleted = false)\n        ORDER BY workspace_id, path, created_at DESC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "workspace_id!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "content!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "7cd0b27f4b4a20b05ac876861b934128c3a6ade024d6662379857905a7447a2a"
+}
diff --git a/backend/.sqlx/query-7e3d7f7516167c320c688c2406076aeebb9081dd36b45f609823dfbb4d3b8e9d.json b/backend/.sqlx/query-7e3d7f7516167c320c688c2406076aeebb9081dd36b45f609823dfbb4d3b8e9d.json
new file mode 100644
index 0000000000..f5fec50340
--- /dev/null
+++ b/backend/.sqlx/query-7e3d7f7516167c320c688c2406076aeebb9081dd36b45f609823dfbb4d3b8e9d.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE macro_usage SET workspace_id = $1 WHERE workspace_id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "7e3d7f7516167c320c688c2406076aeebb9081dd36b45f609823dfbb4d3b8e9d"
+}
diff --git a/backend/.sqlx/query-7fa8b53615a7cb678f9d5caedbc44cfa928469ce3c1a53ec273ecc997f6e61f8.json b/backend/.sqlx/query-7fa8b53615a7cb678f9d5caedbc44cfa928469ce3c1a53ec273ecc997f6e61f8.json
new file mode 100644
index 0000000000..e171d44af5
--- /dev/null
+++ b/backend/.sqlx/query-7fa8b53615a7cb678f9d5caedbc44cfa928469ce3c1a53ec273ecc997f6e61f8.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT hash FROM script WHERE path = $1 AND workspace_id = $2 AND archived = false ORDER BY created_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hash",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "7fa8b53615a7cb678f9d5caedbc44cfa928469ce3c1a53ec273ecc997f6e61f8"
+}
diff --git a/backend/.sqlx/query-40bcbfdcae9842c7919eb6dcfe44d844508304700b292059b24c3f74454a7cca.json b/backend/.sqlx/query-80618456d483c3e7607cd0587684c46f66ed686feb8e2bc846a02b8b43bb6684.json
similarity index 53%
rename from backend/.sqlx/query-40bcbfdcae9842c7919eb6dcfe44d844508304700b292059b24c3f74454a7cca.json
rename to backend/.sqlx/query-80618456d483c3e7607cd0587684c46f66ed686feb8e2bc846a02b8b43bb6684.json
index 31c0ab4982..82dcf60cc1 100644
--- a/backend/.sqlx/query-40bcbfdcae9842c7919eb6dcfe44d844508304700b292059b24c3f74454a7cca.json
+++ b/backend/.sqlx/query-80618456d483c3e7607cd0587684c46f66ed686feb8e2bc846a02b8b43bb6684.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (\n                    SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1\n                )",
+  "query": "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (\n                SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1\n            )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "40bcbfdcae9842c7919eb6dcfe44d844508304700b292059b24c3f74454a7cca"
+  "hash": "80618456d483c3e7607cd0587684c46f66ed686feb8e2bc846a02b8b43bb6684"
 }
diff --git a/backend/.sqlx/query-80e233d7db456ec7030486b009b6cfbf0fa45c2463b861c824fb9f1c0c46192f.json b/backend/.sqlx/query-80e233d7db456ec7030486b009b6cfbf0fa45c2463b861c824fb9f1c0c46192f.json
new file mode 100644
index 0000000000..bdba1e899a
--- /dev/null
+++ b/backend/.sqlx/query-80e233d7db456ec7030486b009b6cfbf0fa45c2463b861c824fb9f1c0c46192f.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT setting::bigint as \"v!\" FROM pg_settings WHERE name = 'superuser_reserved_connections'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "v!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "80e233d7db456ec7030486b009b6cfbf0fa45c2463b861c824fb9f1c0c46192f"
+}
diff --git a/backend/.sqlx/query-80f526a401d5f26021b5eb424e7481e28c360367f144f172b746cd11abfa67a2.json b/backend/.sqlx/query-80f526a401d5f26021b5eb424e7481e28c360367f144f172b746cd11abfa67a2.json
new file mode 100644
index 0000000000..384ea81940
--- /dev/null
+++ b/backend/.sqlx/query-80f526a401d5f26021b5eb424e7481e28c360367f144f172b746cd11abfa67a2.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, summary, created_by)\n         VALUES ('test-workspace', 'restricted', 'restricted', ARRAY['u/test-user']::varchar[], '{\"u/test-user\": true}'::jsonb, '', 'test-user')",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "80f526a401d5f26021b5eb424e7481e28c360367f144f172b746cd11abfa67a2"
+}
diff --git a/backend/.sqlx/query-8192986cd6106ed060b3d68dbc21e5bb34f5e68a5c6ac455a9d423188af77b23.json b/backend/.sqlx/query-8192986cd6106ed060b3d68dbc21e5bb34f5e68a5c6ac455a9d423188af77b23.json
deleted file mode 100644
index 7a0c5578b0..0000000000
--- a/backend/.sqlx/query-8192986cd6106ed060b3d68dbc21e5bb34f5e68a5c6ac455a9d423188af77b23.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO background_task_state (name, value)\n             SELECT $1, jsonb_build_object(\n                        'last_xmin', txid_snapshot_xmin(txid_current_snapshot())::bigint,\n                        'last_ts', '1970-01-01T00:00:00+00:00')\n             WHERE NOT EXISTS (SELECT 1 FROM global_settings WHERE name = $2)\n             ON CONFLICT (name) DO NOTHING",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "8192986cd6106ed060b3d68dbc21e5bb34f5e68a5c6ac455a9d423188af77b23"
-}
diff --git a/backend/.sqlx/query-81d1c56c369c5328d947f1ad21da995a8a555e4a9c2d1387dd8cee9c81efd40b.json b/backend/.sqlx/query-81d1c56c369c5328d947f1ad21da995a8a555e4a9c2d1387dd8cee9c81efd40b.json
new file mode 100644
index 0000000000..3f6a4a8136
--- /dev/null
+++ b/backend/.sqlx/query-81d1c56c369c5328d947f1ad21da995a8a555e4a9c2d1387dd8cee9c81efd40b.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        DELETE FROM pipeline_freshness_state s\n        WHERE NOT EXISTS (\n            SELECT 1 FROM unnest($1::text[], $2::text[]) AS w(workspace_id, script_path)\n            WHERE w.workspace_id = s.workspace_id AND w.script_path = s.script_path\n        )\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "81d1c56c369c5328d947f1ad21da995a8a555e4a9c2d1387dd8cee9c81efd40b"
+}
diff --git a/backend/.sqlx/query-82185eb02e03e3dd1a4b5a3f22c3b60169989703ee33d14ab348301885c9d745.json b/backend/.sqlx/query-82185eb02e03e3dd1a4b5a3f22c3b60169989703ee33d14ab348301885c9d745.json
deleted file mode 100644
index c0573a8fab..0000000000
--- a/backend/.sqlx/query-82185eb02e03e3dd1a4b5a3f22c3b60169989703ee33d14ab348301885c9d745.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO workspace SELECT $1, $2, owner, false, premium FROM workspace WHERE id = $3",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "82185eb02e03e3dd1a4b5a3f22c3b60169989703ee33d14ab348301885c9d745"
-}
diff --git a/backend/.sqlx/query-8288b3916022adcbb28da2a0e4329cba84759b8a590546aea8f0ddab4f861c38.json b/backend/.sqlx/query-8288b3916022adcbb28da2a0e4329cba84759b8a590546aea8f0ddab4f861c38.json
new file mode 100644
index 0000000000..673becc2ff
--- /dev/null
+++ b/backend/.sqlx/query-8288b3916022adcbb28da2a0e4329cba84759b8a590546aea8f0ddab4f861c38.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT parent_workspace_id, deleted FROM workspace WHERE id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "parent_workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "deleted",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      false
+    ]
+  },
+  "hash": "8288b3916022adcbb28da2a0e4329cba84759b8a590546aea8f0ddab4f861c38"
+}
diff --git a/backend/.sqlx/query-82dcaf94ffe43da1c8c7de2a3478b4919c4f1dbf1972d04664a730cefc0594e2.json b/backend/.sqlx/query-82dcaf94ffe43da1c8c7de2a3478b4919c4f1dbf1972d04664a730cefc0594e2.json
deleted file mode 100644
index 96587ed1d0..0000000000
--- a/backend/.sqlx/query-82dcaf94ffe43da1c8c7de2a3478b4919c4f1dbf1972d04664a730cefc0594e2.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT q.runnable_settings_handle\n                 FROM v2_job j JOIN v2_job_queue q ON q.id = j.id\n                 WHERE j.workspace_id = $1 AND j.runnable_path = $2\n                   AND j.trigger_kind = 'asset'",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "runnable_settings_handle",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "82dcaf94ffe43da1c8c7de2a3478b4919c4f1dbf1972d04664a730cefc0594e2"
-}
diff --git a/backend/.sqlx/query-ebbbd069e0f33be9609604025d159fe1ecbefc2e9c11f7c4900b7121d4367e01.json b/backend/.sqlx/query-82e2bdf46cb463a3bc0cba32d8a066b02c2793a58dde6e3804aa2151903fe496.json
similarity index 56%
rename from backend/.sqlx/query-ebbbd069e0f33be9609604025d159fe1ecbefc2e9c11f7c4900b7121d4367e01.json
rename to backend/.sqlx/query-82e2bdf46cb463a3bc0cba32d8a066b02c2793a58dde6e3804aa2151903fe496.json
index 146c7f05b3..79b43245ef 100644
--- a/backend/.sqlx/query-ebbbd069e0f33be9609604025d159fe1ecbefc2e9c11f7c4900b7121d4367e01.json
+++ b/backend/.sqlx/query-82e2bdf46cb463a3bc0cba32d8a066b02c2793a58dde6e3804aa2151903fe496.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT concurrency_settings, debouncing_settings FROM runnable_settings WHERE hash = $1",
+  "query": "SELECT concurrency_settings, debouncing_settings, retry_settings FROM runnable_settings WHERE hash = $1",
   "describe": {
     "columns": [
       {
@@ -12,6 +12,11 @@
         "ordinal": 1,
         "name": "debouncing_settings",
         "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "retry_settings",
+        "type_info": "Int8"
       }
     ],
     "parameters": {
@@ -20,9 +25,10 @@
       ]
     },
     "nullable": [
+      true,
       true,
       true
     ]
   },
-  "hash": "ebbbd069e0f33be9609604025d159fe1ecbefc2e9c11f7c4900b7121d4367e01"
+  "hash": "82e2bdf46cb463a3bc0cba32d8a066b02c2793a58dde6e3804aa2151903fe496"
 }
diff --git a/backend/.sqlx/query-84cbf9623a989dc16be1f8681c95eed9ae3e8d9c1552f396b6773767087bcfec.json b/backend/.sqlx/query-84cbf9623a989dc16be1f8681c95eed9ae3e8d9c1552f396b6773767087bcfec.json
new file mode 100644
index 0000000000..0859d3e071
--- /dev/null
+++ b/backend/.sqlx/query-84cbf9623a989dc16be1f8681c95eed9ae3e8d9c1552f396b6773767087bcfec.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace SET parent_workspace_id = $1, is_dev_workspace = true WHERE id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "84cbf9623a989dc16be1f8681c95eed9ae3e8d9c1552f396b6773767087bcfec"
+}
diff --git a/backend/.sqlx/query-851fa1993bbe8a3e1f7653d9dba21ad1e81107598064689e51d13123bf8116ab.json b/backend/.sqlx/query-851fa1993bbe8a3e1f7653d9dba21ad1e81107598064689e51d13123bf8116ab.json
new file mode 100644
index 0000000000..03fc734037
--- /dev/null
+++ b/backend/.sqlx/query-851fa1993bbe8a3e1f7653d9dba21ad1e81107598064689e51d13123bf8116ab.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM dispatch_event WHERE producer_job_id = ANY($1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "UuidArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "851fa1993bbe8a3e1f7653d9dba21ad1e81107598064689e51d13123bf8116ab"
+}
diff --git a/backend/.sqlx/query-853230da671371fd8bbeeb4c87f8c20a9e310092ae787efe4b0657399c799424.json b/backend/.sqlx/query-853230da671371fd8bbeeb4c87f8c20a9e310092ae787efe4b0657399c799424.json
new file mode 100644
index 0000000000..5aacf1a295
--- /dev/null
+++ b/backend/.sqlx/query-853230da671371fd8bbeeb4c87f8c20a9e310092ae787efe4b0657399c799424.json
@@ -0,0 +1,47 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO materialized_partition\n           (workspace_id, asset_kind, asset_path, partition, status,\n            snapshot_id, row_count, job_id, materialized_at, error)\n         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, now(), $9)\n         ON CONFLICT (workspace_id, asset_kind, asset_path, partition)\n         DO UPDATE SET status = EXCLUDED.status,\n                       -- A failed run records no snapshot, but must not erase the last\n                       -- committed one: a physical table from an earlier commit (or from a\n                       -- committed write whose data tests then failed) still exists, and\n                       -- fork defer/graph state keys on that evidence.\n                       snapshot_id = COALESCE(EXCLUDED.snapshot_id, materialized_partition.snapshot_id),\n                       row_count = EXCLUDED.row_count,\n                       job_id = EXCLUDED.job_id,\n                       materialized_at = now(),\n                       error = EXCLUDED.error",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        },
+        "Varchar",
+        "Text",
+        {
+          "Custom": {
+            "name": "materialization_status",
+            "kind": {
+              "Enum": [
+                "running",
+                "materialized",
+                "failed"
+              ]
+            }
+          }
+        },
+        "Int8",
+        "Int8",
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "853230da671371fd8bbeeb4c87f8c20a9e310092ae787efe4b0657399c799424"
+}
diff --git a/backend/.sqlx/query-854c2e57362df2b6907082c660f01d9c16a9d4b5b422159fc239ff5502a7b71f.json b/backend/.sqlx/query-854c2e57362df2b6907082c660f01d9c16a9d4b5b422159fc239ff5502a7b71f.json
new file mode 100644
index 0000000000..7250aff598
--- /dev/null
+++ b/backend/.sqlx/query-854c2e57362df2b6907082c660f01d9c16a9d4b5b422159fc239ff5502a7b71f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM workspace_multipart_inflight\n         WHERE workspace_id = $1 AND created_at < now() - ($2::text)::interval",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "854c2e57362df2b6907082c660f01d9c16a9d4b5b422159fc239ff5502a7b71f"
+}
diff --git a/backend/.sqlx/query-8657c21ace89a9bafe4d184b30e3fc104a2c83f698f7dd657d6e6c95c4ff1f3b.json b/backend/.sqlx/query-8657c21ace89a9bafe4d184b30e3fc104a2c83f698f7dd657d6e6c95c4ff1f3b.json
deleted file mode 100644
index 96e3439612..0000000000
--- a/backend/.sqlx/query-8657c21ace89a9bafe4d184b30e3fc104a2c83f698f7dd657d6e6c95c4ff1f3b.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH dk AS (\n                INSERT INTO debounce_key (job_id, key)\n                VALUES ($1, $2)\n                ON CONFLICT (key)\n                DO UPDATE SET\n                    previous_job_id = debounce_key.job_id,\n                    job_id = EXCLUDED.job_id,\n                    debounced_times = debounce_key.debounced_times + 1\n                RETURNING\n                    debounced_times,\n                    first_started_at,\n                    previous_job_id AS job_id_to_debounce\n            ), _batch AS (\n                INSERT INTO v2_job_debounce_batch (id, debounce_batch)\n                SELECT\n                    $1,\n                    COALESCE(\n                        (SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = dk.job_id_to_debounce LIMIT 1),\n                        nextval('debounce_batch_seq')\n                    )\n                FROM dk\n            )\n            SELECT debounced_times, first_started_at, job_id_to_debounce FROM dk\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "debounced_times",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "first_started_at",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 2,
-        "name": "job_id_to_debounce",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Varchar"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "8657c21ace89a9bafe4d184b30e3fc104a2c83f698f7dd657d6e6c95c4ff1f3b"
-}
diff --git a/backend/.sqlx/query-868985685d95197efc534bb2f3e0c956bea94dffb46b3b838c096f04b66d6c52.json b/backend/.sqlx/query-868985685d95197efc534bb2f3e0c956bea94dffb46b3b838c096f04b66d6c52.json
new file mode 100644
index 0000000000..34d99a7e61
--- /dev/null
+++ b/backend/.sqlx/query-868985685d95197efc534bb2f3e0c956bea94dffb46b3b838c096f04b66d6c52.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id, name, dev_workspace_label FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "dev_workspace_label",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "868985685d95197efc534bb2f3e0c956bea94dffb46b3b838c096f04b66d6c52"
+}
diff --git a/backend/.sqlx/query-8756a8100d6fd6ecb64ef73d6f2c8453d53c973dce61cc8ace7d278773c7506f.json b/backend/.sqlx/query-8756a8100d6fd6ecb64ef73d6f2c8453d53c973dce61cc8ace7d278773c7506f.json
new file mode 100644
index 0000000000..5741a1aa5b
--- /dev/null
+++ b/backend/.sqlx/query-8756a8100d6fd6ecb64ef73d6f2c8453d53c973dce61cc8ace7d278773c7506f.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n            schedule.path, t.jobs FROM schedule,\n            LATERAL(SELECT ARRAY(\n                SELECT json_build_object('id', id, 'success', status = 'success', 'duration_ms', duration_ms)\n                FROM v2_job_completed c JOIN v2_job j USING (id)\n                WHERE trigger_kind = 'schedule'\n                    AND trigger = schedule.path\n                    AND c.workspace_id = $1\n                    AND j.workspace_id = $1\n                    AND parent_job IS NULL AND runnable_path = schedule.script_path\n                    AND status <> 'skipped'\n                ORDER BY completed_at DESC\n                LIMIT 20\n            ) AS jobs) t\n        WHERE workspace_id = $1 AND schedule.path NOT LIKE $4\n        ORDER BY edited_at DESC\n        LIMIT $2 OFFSET $3",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "jobs",
+        "type_info": "JsonArray"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8",
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "8756a8100d6fd6ecb64ef73d6f2c8453d53c973dce61cc8ace7d278773c7506f"
+}
diff --git a/backend/.sqlx/query-87ca1f2a34f54dade76f5a2cde5ecdac6806e1a306dca880943d97bb6d6a889d.json b/backend/.sqlx/query-87ca1f2a34f54dade76f5a2cde5ecdac6806e1a306dca880943d97bb6d6a889d.json
new file mode 100644
index 0000000000..ffce4491e3
--- /dev/null
+++ b/backend/.sqlx/query-87ca1f2a34f54dade76f5a2cde5ecdac6806e1a306dca880943d97bb6d6a889d.json
@@ -0,0 +1,67 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT DISTINCT ON (path) path AS \"path!\", content AS \"content!\",\n               language AS \"language!: windmill_common::scripts::ScriptLang\"\n        FROM script\n        WHERE workspace_id = $1\n          AND auto_kind = 'pipeline'\n          AND archived = false\n          AND deleted = false\n          AND ($2::text IS NULL OR path LIKE $2)\n        ORDER BY path, created_at DESC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "content!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "language!: windmill_common::scripts::ScriptLang",
+        "type_info": {
+          "Custom": {
+            "name": "script_lang",
+            "kind": {
+              "Enum": [
+                "python3",
+                "deno",
+                "go",
+                "bash",
+                "postgresql",
+                "nativets",
+                "bun",
+                "mysql",
+                "bigquery",
+                "snowflake",
+                "graphql",
+                "powershell",
+                "mssql",
+                "php",
+                "bunnative",
+                "rust",
+                "ansible",
+                "csharp",
+                "oracledb",
+                "nu",
+                "java",
+                "duckdb",
+                "ruby",
+                "rlang"
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "87ca1f2a34f54dade76f5a2cde5ecdac6806e1a306dca880943d97bb6d6a889d"
+}
diff --git a/backend/.sqlx/query-8711bb7861cb3c453519a620057e1530039c09b824065027387bbb667a49fe8d.json b/backend/.sqlx/query-881d996af5aaa1ec01693e473519b64b33c722afde7457912e8abd5743de8829.json
similarity index 68%
rename from backend/.sqlx/query-8711bb7861cb3c453519a620057e1530039c09b824065027387bbb667a49fe8d.json
rename to backend/.sqlx/query-881d996af5aaa1ec01693e473519b64b33c722afde7457912e8abd5743de8829.json
index 56b887e8b9..f8f8511709 100644
--- a/backend/.sqlx/query-8711bb7861cb3c453519a620057e1530039c09b824065027387bbb667a49fe8d.json
+++ b/backend/.sqlx/query-881d996af5aaa1ec01693e473519b64b33c722afde7457912e8abd5743de8829.json
@@ -1,16 +1,17 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO background_task_state\n                 (name, value, running, owner, started_at, finished_at, updated_at)\n             VALUES ($1, $2, false, $3, now(), now(), now())\n             ON CONFLICT (name) DO UPDATE SET\n                 value = $2, running = false, owner = $3,\n                 finished_at = now(), updated_at = now()",
+  "query": "INSERT INTO background_task_state\n                 (name, value, running, owner, started_at, finished_at, updated_at)\n             VALUES ($1, $2, false, $3, now(), now(), now())\n             ON CONFLICT (name) DO UPDATE SET\n                 value = $2, running = false, owner = $3,\n                 finished_at = now(), updated_at = now()\n             WHERE (background_task_state.value->>'last_xmin')::bigint <= $4",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Text",
         "Jsonb",
-        "Text"
+        "Text",
+        "Int8"
       ]
     },
     "nullable": []
   },
-  "hash": "8711bb7861cb3c453519a620057e1530039c09b824065027387bbb667a49fe8d"
+  "hash": "881d996af5aaa1ec01693e473519b64b33c722afde7457912e8abd5743de8829"
 }
diff --git a/backend/.sqlx/query-8837a126698d924eb9014cfee0e6afc85a8350706fe694935b25ef46a847409e.json b/backend/.sqlx/query-8837a126698d924eb9014cfee0e6afc85a8350706fe694935b25ef46a847409e.json
new file mode 100644
index 0000000000..829083e0ec
--- /dev/null
+++ b/backend/.sqlx/query-8837a126698d924eb9014cfee0e6afc85a8350706fe694935b25ef46a847409e.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT ws.ducklake->'ducklakes' AS ducklake_name\n            FROM workspace_settings ws\n            WHERE ws.workspace_id = $1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "ducklake_name",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "8837a126698d924eb9014cfee0e6afc85a8350706fe694935b25ef46a847409e"
+}
diff --git a/backend/.sqlx/query-8a1e2e59c05b0f67e32c517a0c46e1a9307335b0e7a27613cd690e99812a99f3.json b/backend/.sqlx/query-8a1e2e59c05b0f67e32c517a0c46e1a9307335b0e7a27613cd690e99812a99f3.json
new file mode 100644
index 0000000000..9fc8cf1336
--- /dev/null
+++ b/backend/.sqlx/query-8a1e2e59c05b0f67e32c517a0c46e1a9307335b0e7a27613cd690e99812a99f3.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT path FROM schedule WHERE workspace_id = $1 AND starts_with(path, $2)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "8a1e2e59c05b0f67e32c517a0c46e1a9307335b0e7a27613cd690e99812a99f3"
+}
diff --git a/backend/.sqlx/query-8dec884a4c3b2d105afe22d1d7a01fcab837629fd3c1a09cf82b21641a890444.json b/backend/.sqlx/query-8dec884a4c3b2d105afe22d1d7a01fcab837629fd3c1a09cf82b21641a890444.json
new file mode 100644
index 0000000000..efd12114f3
--- /dev/null
+++ b/backend/.sqlx/query-8dec884a4c3b2d105afe22d1d7a01fcab837629fd3c1a09cf82b21641a890444.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                    -- Fork rows also count when a snapshot ever committed (a failed run\n                    -- preserves it): the physical table exists, so reads hit the FORK's\n                    -- data — showing 'deferred' would misstate what a query returns.\n                    -- Ancestor rows still require a clean materialization.\n                    SELECT DISTINCT asset_path AS \"asset_path!\", workspace_id AS \"workspace_id!\"\n                    FROM materialized_partition\n                    WHERE (workspace_id = $1 OR workspace_id = ANY($2))\n                      AND asset_kind = 'ducklake'\n                      AND (status = 'materialized'\n                           OR (workspace_id = $1 AND snapshot_id IS NOT NULL))\n                    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "asset_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "workspace_id!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "8dec884a4c3b2d105afe22d1d7a01fcab837629fd3c1a09cf82b21641a890444"
+}
diff --git a/backend/.sqlx/query-8e829a7358ea47100c99e78067266eb7a83e312b88f0244d1c517b03a9bcdea0.json b/backend/.sqlx/query-8e829a7358ea47100c99e78067266eb7a83e312b88f0244d1c517b03a9bcdea0.json
new file mode 100644
index 0000000000..eac4547361
--- /dev/null
+++ b/backend/.sqlx/query-8e829a7358ea47100c99e78067266eb7a83e312b88f0244d1c517b03a9bcdea0.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO materialized_asset_schema\n           (workspace_id, asset_kind, asset_path, version, columns,\n            snapshot_id, job_id, captured_at)\n         VALUES ($1, $2, $3, $4, $5, $6, $7, now())",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        },
+        "Varchar",
+        "Int8",
+        "Jsonb",
+        "Int8",
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8e829a7358ea47100c99e78067266eb7a83e312b88f0244d1c517b03a9bcdea0"
+}
diff --git a/backend/.sqlx/query-8ed229e88dc49b0ba7328d48f991493fcdbab4ae91cae271ea911f5b14ecf0d4.json b/backend/.sqlx/query-8ed229e88dc49b0ba7328d48f991493fcdbab4ae91cae271ea911f5b14ecf0d4.json
new file mode 100644
index 0000000000..3f8deb8835
--- /dev/null
+++ b/backend/.sqlx/query-8ed229e88dc49b0ba7328d48f991493fcdbab4ae91cae271ea911f5b14ecf0d4.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace (id, name, owner, deleted, premium, parent_workspace_id, is_dev_workspace, dev_workspace_label)\n         SELECT $1, $2, owner, false, premium,\n                CASE WHEN $4 THEN parent_workspace_id ELSE NULL END, $5,\n                CASE WHEN $5 THEN dev_workspace_label ELSE NULL END\n         FROM workspace WHERE id = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Bool",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8ed229e88dc49b0ba7328d48f991493fcdbab4ae91cae271ea911f5b14ecf0d4"
+}
diff --git a/backend/.sqlx/query-8f163ee5adf4caaaa12a5698e68c749524f1db10a51f3de6cadd4826e6c1d422.json b/backend/.sqlx/query-8f163ee5adf4caaaa12a5698e68c749524f1db10a51f3de6cadd4826e6c1d422.json
index 13402c8387..90031c14d6 100644
--- a/backend/.sqlx/query-8f163ee5adf4caaaa12a5698e68c749524f1db10a51f3de6cadd4826e6c1d422.json
+++ b/backend/.sqlx/query-8f163ee5adf4caaaa12a5698e68c749524f1db10a51f3de6cadd4826e6c1d422.json
@@ -35,7 +35,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-8fef781ecef8bb7e4f5172adbab1d1eefa5cf05ff6521ee605af7ac2b90fa60b.json b/backend/.sqlx/query-8fef781ecef8bb7e4f5172adbab1d1eefa5cf05ff6521ee605af7ac2b90fa60b.json
deleted file mode 100644
index f65ea6d2d4..0000000000
--- a/backend/.sqlx/query-8fef781ecef8bb7e4f5172adbab1d1eefa5cf05ff6521ee605af7ac2b90fa60b.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT created_at FROM script WHERE workspace_id = $1 AND hash = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "created_at",
-        "type_info": "Timestamptz"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "8fef781ecef8bb7e4f5172adbab1d1eefa5cf05ff6521ee605af7ac2b90fa60b"
-}
diff --git a/backend/.sqlx/query-90d21ee2276b41a4dd3dd8ed12f36e00b8d4fc27a2d72b74dff2dace900db75c.json b/backend/.sqlx/query-90d21ee2276b41a4dd3dd8ed12f36e00b8d4fc27a2d72b74dff2dace900db75c.json
new file mode 100644
index 0000000000..3f159707b6
--- /dev/null
+++ b/backend/.sqlx/query-90d21ee2276b41a4dd3dd8ed12f36e00b8d4fc27a2d72b74dff2dace900db75c.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO ws_specific (workspace_id, item_kind, path)\n                 SELECT $1::varchar, 'variable', $2::varchar\n                 WHERE EXISTS (SELECT 1 FROM variable WHERE workspace_id = $1::varchar AND path = $2::varchar)\n                 ON CONFLICT DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "90d21ee2276b41a4dd3dd8ed12f36e00b8d4fc27a2d72b74dff2dace900db75c"
+}
diff --git a/backend/.sqlx/query-910b9b8afb3df5e437e43ff4adc97d0a03f6c26f0b14fc92900f7600e70a7a8b.json b/backend/.sqlx/query-910b9b8afb3df5e437e43ff4adc97d0a03f6c26f0b14fc92900f7600e70a7a8b.json
deleted file mode 100644
index 569a5122ba..0000000000
--- a/backend/.sqlx/query-910b9b8afb3df5e437e43ff4adc97d0a03f6c26f0b14fc92900f7600e70a7a8b.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT status = 'success' AS \"success!\"\n                    FROM v2_job j JOIN v2_job_completed USING (id)\n                    WHERE j.workspace_id = $1 AND trigger_kind = 'schedule' AND trigger = $2\n                        AND parent_job IS NULL\n                        AND runnable_path = $3\n                        AND j.id != $4\n                    ORDER BY created_at DESC\n                    LIMIT $5",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "success!",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text",
-        "Uuid",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "910b9b8afb3df5e437e43ff4adc97d0a03f6c26f0b14fc92900f7600e70a7a8b"
-}
diff --git a/backend/.sqlx/query-9170a350e1da0b33a421a119d4a5b86575c1be761de158ad664670e981524cbf.json b/backend/.sqlx/query-9170a350e1da0b33a421a119d4a5b86575c1be761de158ad664670e981524cbf.json
new file mode 100644
index 0000000000..0f75ec3883
--- /dev/null
+++ b/backend/.sqlx/query-9170a350e1da0b33a421a119d4a5b86575c1be761de158ad664670e981524cbf.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)::BIGINT AS \"count!\" FROM workspace WHERE deleted = false AND id NOT LIKE 'wm-fork%'",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9170a350e1da0b33a421a119d4a5b86575c1be761de158ad664670e981524cbf"
+}
diff --git a/backend/.sqlx/query-919bee5afcaba361f23760b5f64ce48f63e4d6d3e2d4fa9247b50963112f47ad.json b/backend/.sqlx/query-919bee5afcaba361f23760b5f64ce48f63e4d6d3e2d4fa9247b50963112f47ad.json
new file mode 100644
index 0000000000..34c18e2633
--- /dev/null
+++ b/backend/.sqlx/query-919bee5afcaba361f23760b5f64ce48f63e4d6d3e2d4fa9247b50963112f47ad.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT tag FROM flow WHERE workspace_id = $1 AND path = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "tag",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "919bee5afcaba361f23760b5f64ce48f63e4d6d3e2d4fa9247b50963112f47ad"
+}
diff --git a/backend/.sqlx/query-92b011eda2a652af714b08137b447753bc03ec35f6daa8ca245b1c8ed34c405f.json b/backend/.sqlx/query-92b011eda2a652af714b08137b447753bc03ec35f6daa8ca245b1c8ed34c405f.json
new file mode 100644
index 0000000000..794f62e49d
--- /dev/null
+++ b/backend/.sqlx/query-92b011eda2a652af714b08137b447753bc03ec35f6daa8ca245b1c8ed34c405f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM zombie_job_counter WHERE job_id IN (SELECT id FROM v2_job WHERE workspace_id = $1 AND id = ANY($2))",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "UuidArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "92b011eda2a652af714b08137b447753bc03ec35f6daa8ca245b1c8ed34c405f"
+}
diff --git a/backend/.sqlx/query-93d95d25c6b2398faa416646f5daaff40a634fc5530e202f65fad6a241f2671a.json b/backend/.sqlx/query-93d95d25c6b2398faa416646f5daaff40a634fc5530e202f65fad6a241f2671a.json
new file mode 100644
index 0000000000..c0207b6bc7
--- /dev/null
+++ b/backend/.sqlx/query-93d95d25c6b2398faa416646f5daaff40a634fc5530e202f65fad6a241f2671a.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace_multipart_inflight\n           (workspace_id, upload_id, part_id, storage, part_bytes, target_existing_size)\n         VALUES ($1, $2, $3, $4, $5, $6)\n         ON CONFLICT (workspace_id, upload_id, part_id)\n         DO UPDATE SET part_bytes = $5",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "93d95d25c6b2398faa416646f5daaff40a634fc5530e202f65fad6a241f2671a"
+}
diff --git a/backend/.sqlx/query-954ead4f28726b31e2cafbe04d3ed3e9625f54cd89cfd595665e4473c5f3ea6c.json b/backend/.sqlx/query-954ead4f28726b31e2cafbe04d3ed3e9625f54cd89cfd595665e4473c5f3ea6c.json
new file mode 100644
index 0000000000..253fe79753
--- /dev/null
+++ b/backend/.sqlx/query-954ead4f28726b31e2cafbe04d3ed3e9625f54cd89cfd595665e4473c5f3ea6c.json
@@ -0,0 +1,37 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n             (SELECT COALESCE(SUM(bytes), 0) FROM workspace_storage_usage WHERE workspace_id = $1)::bigint as \"committed!\",\n             -- reservation of every OTHER in-flight upload\n             (SELECT COALESCE(SUM(GREATEST(t.total - t.existing, 0)), 0)\n                FROM (SELECT SUM(part_bytes) as total, MAX(target_existing_size) as existing\n                        FROM workspace_multipart_inflight\n                        WHERE workspace_id = $1 AND upload_id <> $2\n                          AND created_at > now() - ($4::text)::interval\n                        GROUP BY upload_id) t)::bigint as \"other_reserved!\",\n             -- this upload's already-recorded parts, excluding the part being (re)uploaded\n             (SELECT COALESCE(SUM(part_bytes), 0)\n                FROM workspace_multipart_inflight\n                WHERE workspace_id = $1 AND upload_id = $2 AND part_id <> $3)::bigint as \"this_other_parts!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "committed!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "other_reserved!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "this_other_parts!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "954ead4f28726b31e2cafbe04d3ed3e9625f54cd89cfd595665e4473c5f3ea6c"
+}
diff --git a/backend/.sqlx/query-95e370a82ef46d9310f77a99b437a20a5773113e290d69a016363543067baf14.json b/backend/.sqlx/query-95e370a82ef46d9310f77a99b437a20a5773113e290d69a016363543067baf14.json
new file mode 100644
index 0000000000..eb94fe6ab5
--- /dev/null
+++ b/backend/.sqlx/query-95e370a82ef46d9310f77a99b437a20a5773113e290d69a016363543067baf14.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT MAX(timestamp) FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "max",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "95e370a82ef46d9310f77a99b437a20a5773113e290d69a016363543067baf14"
+}
diff --git a/backend/.sqlx/query-9b781d92eba2f6eabe16f99cf908f566e4b42b1f9fa445f2719ac79ad535277d.json b/backend/.sqlx/query-9b781d92eba2f6eabe16f99cf908f566e4b42b1f9fa445f2719ac79ad535277d.json
new file mode 100644
index 0000000000..e2132d7737
--- /dev/null
+++ b/backend/.sqlx/query-9b781d92eba2f6eabe16f99cf908f566e4b42b1f9fa445f2719ac79ad535277d.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH del AS (\n                DELETE FROM v2_job_debounce_batch\n                WHERE consumed_at IS NOT NULL\n                  AND consumed_at < now() - interval '10 minutes'\n                  AND id NOT IN (SELECT id FROM v2_job_queue)\n                RETURNING 1\n            ) SELECT count(*) as \"c!\" FROM del",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "c!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9b781d92eba2f6eabe16f99cf908f566e4b42b1f9fa445f2719ac79ad535277d"
+}
diff --git a/backend/.sqlx/query-9cfebb5bfee0d7d78f4e71c106a6aa1cb9aae18a6c3a1e5d6b36697ed063b50c.json b/backend/.sqlx/query-9cfebb5bfee0d7d78f4e71c106a6aa1cb9aae18a6c3a1e5d6b36697ed063b50c.json
new file mode 100644
index 0000000000..07a14677e4
--- /dev/null
+++ b/backend/.sqlx/query-9cfebb5bfee0d7d78f4e71c106a6aa1cb9aae18a6c3a1e5d6b36697ed063b50c.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_definition WHERE workspace_id = $1 AND provider_path = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9cfebb5bfee0d7d78f4e71c106a6aa1cb9aae18a6c3a1e5d6b36697ed063b50c"
+}
diff --git a/backend/.sqlx/query-9d505f1d388f6160ccbe569204bf6cfb90400d864e409d615b0d756217727d96.json b/backend/.sqlx/query-9d505f1d388f6160ccbe569204bf6cfb90400d864e409d615b0d756217727d96.json
new file mode 100644
index 0000000000..58630c5356
--- /dev/null
+++ b/backend/.sqlx/query-9d505f1d388f6160ccbe569204bf6cfb90400d864e409d615b0d756217727d96.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM v2_job_debounce_batch WHERE consumed_at IS NOT NULL",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "9d505f1d388f6160ccbe569204bf6cfb90400d864e409d615b0d756217727d96"
+}
diff --git a/backend/.sqlx/query-9ecb404e46a4eac55f977f05a3afbafe5dc3cdecc17a3d5a7476b160c1b6e7e1.json b/backend/.sqlx/query-9ecb404e46a4eac55f977f05a3afbafe5dc3cdecc17a3d5a7476b160c1b6e7e1.json
index ad9e57801e..ab01730c02 100644
--- a/backend/.sqlx/query-9ecb404e46a4eac55f977f05a3afbafe5dc3cdecc17a3d5a7476b160c1b6e7e1.json
+++ b/backend/.sqlx/query-9ecb404e46a4eac55f977f05a3afbafe5dc3cdecc17a3d5a7476b160c1b6e7e1.json
@@ -35,7 +35,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-9ee6263223bd415d7ac21328a8ebc731d43e7331b9fd83282a87f8e2fd8fa770.json b/backend/.sqlx/query-9ee6263223bd415d7ac21328a8ebc731d43e7331b9fd83282a87f8e2fd8fa770.json
new file mode 100644
index 0000000000..64dfe64198
--- /dev/null
+++ b/backend/.sqlx/query-9ee6263223bd415d7ac21328a8ebc731d43e7331b9fd83282a87f8e2fd8fa770.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM password WHERE username IS NOT NULL)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9ee6263223bd415d7ac21328a8ebc731d43e7331b9fd83282a87f8e2fd8fa770"
+}
diff --git a/backend/.sqlx/query-9eea74f68a0c99d5ce6601fd854c1d18df0ab30f528ef4ce7910c43dd44f4cfb.json b/backend/.sqlx/query-9eea74f68a0c99d5ce6601fd854c1d18df0ab30f528ef4ce7910c43dd44f4cfb.json
new file mode 100644
index 0000000000..5ac3174af6
--- /dev/null
+++ b/backend/.sqlx/query-9eea74f68a0c99d5ce6601fd854c1d18df0ab30f528ef4ce7910c43dd44f4cfb.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace_settings SET datatable = jsonb_set(datatable, ARRAY['datatables', $2::text, 'migrations_enabled'], 'false'::jsonb) WHERE workspace_id = $1 AND jsonb_exists(datatable->'datatables', $2) RETURNING 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9eea74f68a0c99d5ce6601fd854c1d18df0ab30f528ef4ce7910c43dd44f4cfb"
+}
diff --git a/backend/.sqlx/query-9f28b636e96aa3461d84de37815a04628af9dcfb6baa2c25fb7b32152227dc77.json b/backend/.sqlx/query-9f28b636e96aa3461d84de37815a04628af9dcfb6baa2c25fb7b32152227dc77.json
new file mode 100644
index 0000000000..6a39c40970
--- /dev/null
+++ b/backend/.sqlx/query-9f28b636e96aa3461d84de37815a04628af9dcfb6baa2c25fb7b32152227dc77.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH del AS (\n            DELETE FROM v2_job_debounce_batch\n            WHERE consumed_at IS NOT NULL\n              AND consumed_at < now() - interval '10 minutes'\n              AND id NOT IN (SELECT id FROM v2_job_queue)\n            RETURNING 1\n        ) SELECT count(*) FROM del",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9f28b636e96aa3461d84de37815a04628af9dcfb6baa2c25fb7b32152227dc77"
+}
diff --git a/backend/.sqlx/query-9f567f04f67ce3b197eaa641eaf2d0bbe1f5aff27187505778b6abe2c87a5d01.json b/backend/.sqlx/query-9f567f04f67ce3b197eaa641eaf2d0bbe1f5aff27187505778b6abe2c87a5d01.json
new file mode 100644
index 0000000000..a29b5f0924
--- /dev/null
+++ b/backend/.sqlx/query-9f567f04f67ce3b197eaa641eaf2d0bbe1f5aff27187505778b6abe2c87a5d01.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace SET parent_workspace_id = $1, is_dev_workspace = true, dev_workspace_label = $3 WHERE id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9f567f04f67ce3b197eaa641eaf2d0bbe1f5aff27187505778b6abe2c87a5d01"
+}
diff --git a/backend/.sqlx/query-a08e1e22ec6cc25bb8939e488a1c7cf162f2fa7c5f67f8a9e0071e5b7f238dcb.json b/backend/.sqlx/query-a08e1e22ec6cc25bb8939e488a1c7cf162f2fa7c5f67f8a9e0071e5b7f238dcb.json
new file mode 100644
index 0000000000..9ddc929622
--- /dev/null
+++ b/backend/.sqlx/query-a08e1e22ec6cc25bb8939e488a1c7cf162f2fa7c5f67f8a9e0071e5b7f238dcb.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name, provider_path FROM macro_definition WHERE workspace_id = $1 AND name = ANY($2) LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "provider_path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "a08e1e22ec6cc25bb8939e488a1c7cf162f2fa7c5f67f8a9e0071e5b7f238dcb"
+}
diff --git a/backend/.sqlx/query-a0faa5b042bac00bcd09b925bcf548e2783c2de7e92ba0ff7e6f4637419fcf7d.json b/backend/.sqlx/query-a0faa5b042bac00bcd09b925bcf548e2783c2de7e92ba0ff7e6f4637419fcf7d.json
new file mode 100644
index 0000000000..e3e8e3f2ad
--- /dev/null
+++ b/backend/.sqlx/query-a0faa5b042bac00bcd09b925bcf548e2783c2de7e92ba0ff7e6f4637419fcf7d.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM schedule WHERE workspace_id = $1 AND path LIKE $2 AND path != ALL($3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a0faa5b042bac00bcd09b925bcf548e2783c2de7e92ba0ff7e6f4637419fcf7d"
+}
diff --git a/backend/.sqlx/query-a22611ed3b7a6caa76a218454494c96e1371956bb303eb8d3e3268139cd8fce0.json b/backend/.sqlx/query-a22611ed3b7a6caa76a218454494c96e1371956bb303eb8d3e3268139cd8fce0.json
new file mode 100644
index 0000000000..2b9b0619a1
--- /dev/null
+++ b/backend/.sqlx/query-a22611ed3b7a6caa76a218454494c96e1371956bb303eb8d3e3268139cd8fce0.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "a22611ed3b7a6caa76a218454494c96e1371956bb303eb8d3e3268139cd8fce0"
+}
diff --git a/backend/.sqlx/query-a2d4a8aedb15e9faf0a2512fa4241a9e9f2d5a56e12a9d6805ca58ff40f61614.json b/backend/.sqlx/query-a2d4a8aedb15e9faf0a2512fa4241a9e9f2d5a56e12a9d6805ca58ff40f61614.json
new file mode 100644
index 0000000000..24e387a783
--- /dev/null
+++ b/backend/.sqlx/query-a2d4a8aedb15e9faf0a2512fa4241a9e9f2d5a56e12a9d6805ca58ff40f61614.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM v2_job_completed\n             WHERE id IN (\n                 SELECT id FROM v2_job_completed\n                 WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval\n                   AND ($3::timestamptz IS NULL OR completed_at >= $3)\n                 ORDER BY completed_at ASC\n                 LIMIT $2\n                 FOR UPDATE SKIP LOCKED\n             )\n             RETURNING id, completed_at",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "completed_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Timestamptz"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "a2d4a8aedb15e9faf0a2512fa4241a9e9f2d5a56e12a9d6805ca58ff40f61614"
+}
diff --git a/backend/.sqlx/query-a488e5a6492562bbc5fa86ab348b610b028e88d5d2dbbea44377bf9dc416cd03.json b/backend/.sqlx/query-a488e5a6492562bbc5fa86ab348b610b028e88d5d2dbbea44377bf9dc416cd03.json
new file mode 100644
index 0000000000..0c3fdb8d0a
--- /dev/null
+++ b/backend/.sqlx/query-a488e5a6492562bbc5fa86ab348b610b028e88d5d2dbbea44377bf9dc416cd03.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_try_advisory_xact_lock(hashtext('workspace_storage_usage'), hashtext($1))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "pg_try_advisory_xact_lock",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "a488e5a6492562bbc5fa86ab348b610b028e88d5d2dbbea44377bf9dc416cd03"
+}
diff --git a/backend/.sqlx/query-a4b6371d33206010b2f3ffd2b09e33244fe8ab9a803248fc23f334034d24aad4.json b/backend/.sqlx/query-a4b6371d33206010b2f3ffd2b09e33244fe8ab9a803248fc23f334034d24aad4.json
index 9a21f228ea..405904604a 100644
--- a/backend/.sqlx/query-a4b6371d33206010b2f3ffd2b09e33244fe8ab9a803248fc23f334034d24aad4.json
+++ b/backend/.sqlx/query-a4b6371d33206010b2f3ffd2b09e33244fe8ab9a803248fc23f334034d24aad4.json
@@ -191,7 +191,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-a565b2d34b3ca1d513d3fed2e23e8687718879f7e746a78675f121eb9511f6be.json b/backend/.sqlx/query-a565b2d34b3ca1d513d3fed2e23e8687718879f7e746a78675f121eb9511f6be.json
new file mode 100644
index 0000000000..a8dc380f40
--- /dev/null
+++ b/backend/.sqlx/query-a565b2d34b3ca1d513d3fed2e23e8687718879f7e746a78675f121eb9511f6be.json
@@ -0,0 +1,40 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH mine AS (\n                        SELECT debounce_batch, consumed_by FROM v2_job_debounce_batch WHERE id = $1\n                    ), claimed AS (\n                        -- Claim the whole batch in ONE update so concurrent same-batch\n                        -- survivors lock rows in identical scan order (no lock-ordering\n                        -- deadlock); each re-evaluates `consumed_at IS NULL` under EvalPlanQual\n                        -- and skips rows the other already took. A claim therefore consumes\n                        -- every still-unclaimed row of the batch atomically.\n                        UPDATE v2_job_debounce_batch SET consumed_at = now(), consumed_by = $1\n                        WHERE debounce_batch = (SELECT debounce_batch FROM mine)\n                          AND consumed_at IS NULL\n                        RETURNING id\n                    )\n                    SELECT\n                        EXISTS (SELECT 1 FROM mine) AS \"had_row!\",\n                        (SELECT consumed_by FROM mine) AS prev_consumed_by,\n                        ARRAY(SELECT id FROM claimed) AS \"claimed_ids!\",\n                        EXISTS (SELECT 1 FROM claimed WHERE id = $1) AS \"claimed_self!\"\n                    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "had_row!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "prev_consumed_by",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 2,
+        "name": "claimed_ids!",
+        "type_info": "UuidArray"
+      },
+      {
+        "ordinal": 3,
+        "name": "claimed_self!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "a565b2d34b3ca1d513d3fed2e23e8687718879f7e746a78675f121eb9511f6be"
+}
diff --git a/backend/.sqlx/query-a6d54bb1e2ad153e0c89a4c71ade07eab23e2b35e58f812c69ba29de2d8e2fa5.json b/backend/.sqlx/query-a6d54bb1e2ad153e0c89a4c71ade07eab23e2b35e58f812c69ba29de2d8e2fa5.json
new file mode 100644
index 0000000000..986638f649
--- /dev/null
+++ b/backend/.sqlx/query-a6d54bb1e2ad153e0c89a4c71ade07eab23e2b35e58f812c69ba29de2d8e2fa5.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_usage WHERE workspace_id = $1 AND (consumer_path = $2 OR consumer_path = $3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a6d54bb1e2ad153e0c89a4c71ade07eab23e2b35e58f812c69ba29de2d8e2fa5"
+}
diff --git a/backend/.sqlx/query-a7017ba623279e614ef31a3026c5274749d7a436a753813da098758514a7493d.json b/backend/.sqlx/query-a7017ba623279e614ef31a3026c5274749d7a436a753813da098758514a7493d.json
new file mode 100644
index 0000000000..691016a610
--- /dev/null
+++ b/backend/.sqlx/query-a7017ba623279e614ef31a3026c5274749d7a436a753813da098758514a7493d.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT jsonb_object_keys(large_file_storage->'secondary_storage') as \"key!\"\n               FROM workspace_settings WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "key!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "a7017ba623279e614ef31a3026c5274749d7a436a753813da098758514a7493d"
+}
diff --git a/backend/.sqlx/query-a7f0ed0081e98a9861ea4b081b8a14576509147e51a86a95a2cc786bee3199d9.json b/backend/.sqlx/query-a7f0ed0081e98a9861ea4b081b8a14576509147e51a86a95a2cc786bee3199d9.json
new file mode 100644
index 0000000000..21e0f4613b
--- /dev/null
+++ b/backend/.sqlx/query-a7f0ed0081e98a9861ea4b081b8a14576509147e51a86a95a2cc786bee3199d9.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM schedule WHERE workspace_id = $1 AND starts_with(path, $2) AND path != ALL($3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a7f0ed0081e98a9861ea4b081b8a14576509147e51a86a95a2cc786bee3199d9"
+}
diff --git a/backend/.sqlx/query-a7fe8a504f418f10e4d8e84879353e007344c7be4bb040e4b50265cd497f853b.json b/backend/.sqlx/query-a7fe8a504f418f10e4d8e84879353e007344c7be4bb040e4b50265cd497f853b.json
new file mode 100644
index 0000000000..c3cee83397
--- /dev/null
+++ b/backend/.sqlx/query-a7fe8a504f418f10e4d8e84879353e007344c7be4bb040e4b50265cd497f853b.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a7fe8a504f418f10e4d8e84879353e007344c7be4bb040e4b50265cd497f853b"
+}
diff --git a/backend/.sqlx/query-a8019c47b15baa9497ae44935456fea272ac289fc17ea9fc5aa237f77778b58f.json b/backend/.sqlx/query-a8019c47b15baa9497ae44935456fea272ac289fc17ea9fc5aa237f77778b58f.json
new file mode 100644
index 0000000000..0f1bcc2271
--- /dev/null
+++ b/backend/.sqlx/query-a8019c47b15baa9497ae44935456fea272ac289fc17ea9fc5aa237f77778b58f.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT inflight_bytes, target_existing_size FROM workspace_multipart_inflight\n         WHERE workspace_id = $1 AND upload_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "inflight_bytes",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "target_existing_size",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "a8019c47b15baa9497ae44935456fea272ac289fc17ea9fc5aa237f77778b58f"
+}
diff --git a/backend/.sqlx/query-a8cec061756c7be61af829f4a5207ba6333ad5feb4557a9341427e9e68608025.json b/backend/.sqlx/query-a8cec061756c7be61af829f4a5207ba6333ad5feb4557a9341427e9e68608025.json
new file mode 100644
index 0000000000..c262f3d1f6
--- /dev/null
+++ b/backend/.sqlx/query-a8cec061756c7be61af829f4a5207ba6333ad5feb4557a9341427e9e68608025.json
@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT datatable, timestamp, name, code_up, code_down FROM datatable_migrations WHERE workspace_id = $1 ORDER BY datatable, timestamp ASC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "datatable",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "code_up",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "code_down",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "a8cec061756c7be61af829f4a5207ba6333ad5feb4557a9341427e9e68608025"
+}
diff --git a/backend/.sqlx/query-a90e3a1d7c7c0dfb422f44b0ed599f681f5630c024ae9a437a301f149636b0db.json b/backend/.sqlx/query-a90e3a1d7c7c0dfb422f44b0ed599f681f5630c024ae9a437a301f149636b0db.json
new file mode 100644
index 0000000000..a604c85831
--- /dev/null
+++ b/backend/.sqlx/query-a90e3a1d7c7c0dfb422f44b0ed599f681f5630c024ae9a437a301f149636b0db.json
@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            EXISTS(SELECT 1 FROM pg_proc WHERE proname = 'aurora_version') AS \"aurora!\",\n            EXISTS(SELECT 1 FROM pg_roles WHERE rolname = 'rds_superuser') AS \"rds!\",\n            EXISTS(SELECT 1 FROM pg_roles WHERE rolname = 'cloudsqlsuperuser') AS \"cloudsql!\",\n            EXISTS(SELECT 1 FROM pg_roles WHERE rolname IN ('azure_pg_admin', 'azuresu')) AS \"azure!\"\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "aurora!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "rds!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "cloudsql!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 3,
+        "name": "azure!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "a90e3a1d7c7c0dfb422f44b0ed599f681f5630c024ae9a437a301f149636b0db"
+}
diff --git a/backend/.sqlx/query-a981f9b6424969e5fd72fb18c20e2910a138a848f3f6674dec58053572682077.json b/backend/.sqlx/query-a981f9b6424969e5fd72fb18c20e2910a138a848f3f6674dec58053572682077.json
new file mode 100644
index 0000000000..5d20f83f9d
--- /dev/null
+++ b/backend/.sqlx/query-a981f9b6424969e5fd72fb18c20e2910a138a848f3f6674dec58053572682077.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT id FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "a981f9b6424969e5fd72fb18c20e2910a138a848f3f6674dec58053572682077"
+}
diff --git a/backend/.sqlx/query-a999a5cf7b481d852222311a34959f38114926063718668907587d1b80dfc75e.json b/backend/.sqlx/query-a999a5cf7b481d852222311a34959f38114926063718668907587d1b80dfc75e.json
new file mode 100644
index 0000000000..b022524bbb
--- /dev/null
+++ b/backend/.sqlx/query-a999a5cf7b481d852222311a34959f38114926063718668907587d1b80dfc75e.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO resource\n                (workspace_id, path, value, description, resource_type, created_by, edited_at, labels)\n                VALUES ($1, $2, $3, $4, $5, $6, now(), $7) ON CONFLICT (workspace_id, path) DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Jsonb",
+        "Text",
+        "Varchar",
+        "Varchar",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a999a5cf7b481d852222311a34959f38114926063718668907587d1b80dfc75e"
+}
diff --git a/backend/.sqlx/query-a9a99880d870266f474878dd6ef541df988da527d30f663ef6f764f0c3d70d4b.json b/backend/.sqlx/query-a9a99880d870266f474878dd6ef541df988da527d30f663ef6f764f0c3d70d4b.json
deleted file mode 100644
index d12d305b92..0000000000
--- a/backend/.sqlx/query-a9a99880d870266f474878dd6ef541df988da527d30f663ef6f764f0c3d70d4b.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT path AS \"path!\"\n        FROM script\n        WHERE workspace_id = $1\n          AND auto_kind = 'pipeline'\n          AND archived = false\n          AND deleted = false\n          AND ($2::text IS NULL OR path LIKE $2)\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "path!",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "a9a99880d870266f474878dd6ef541df988da527d30f663ef6f764f0c3d70d4b"
-}
diff --git a/backend/.sqlx/query-ab0dca3f021243d71222643165548af40192832c07c1c7049def3a80057bb683.json b/backend/.sqlx/query-ab0dca3f021243d71222643165548af40192832c07c1c7049def3a80057bb683.json
new file mode 100644
index 0000000000..1148679230
--- /dev/null
+++ b/backend/.sqlx/query-ab0dca3f021243d71222643165548af40192832c07c1c7049def3a80057bb683.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COALESCE(SUM(bytes), 0)::bigint as \"total!\",\n                  COALESCE(MIN(computed_at) < now() - interval '10 minutes', true) as \"stale!\"\n           FROM workspace_storage_usage WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "total!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "stale!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "ab0dca3f021243d71222643165548af40192832c07c1c7049def3a80057bb683"
+}
diff --git a/backend/.sqlx/query-ad07e40790b947d1e8da17dd4ae30365210bba4bff0b7e32d06c53ed13572360.json b/backend/.sqlx/query-ad07e40790b947d1e8da17dd4ae30365210bba4bff0b7e32d06c53ed13572360.json
new file mode 100644
index 0000000000..e543db2a30
--- /dev/null
+++ b/backend/.sqlx/query-ad07e40790b947d1e8da17dd4ae30365210bba4bff0b7e32d06c53ed13572360.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT 1 FROM flow WHERE workspace_id = $1 AND path = $2 LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "ad07e40790b947d1e8da17dd4ae30365210bba4bff0b7e32d06c53ed13572360"
+}
diff --git a/backend/.sqlx/query-ae2293c7d9d2b5dad61b27db3b29d5f87fc6b8d53fe6a073eef488533cbd3ed3.json b/backend/.sqlx/query-ae2293c7d9d2b5dad61b27db3b29d5f87fc6b8d53fe6a073eef488533cbd3ed3.json
new file mode 100644
index 0000000000..1b4082b18a
--- /dev/null
+++ b/backend/.sqlx/query-ae2293c7d9d2b5dad61b27db3b29d5f87fc6b8d53fe6a073eef488533cbd3ed3.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COALESCE(\n            (SELECT email FROM usr WHERE workspace_id = $1 AND username = $2),\n            (SELECT email FROM password WHERE (username = $2 OR email = $2) AND super_admin = true)\n        )",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "coalesce",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "ae2293c7d9d2b5dad61b27db3b29d5f87fc6b8d53fe6a073eef488533cbd3ed3"
+}
diff --git a/backend/.sqlx/query-ae8c0d0397609cf275bcffb92a5014665d47fe95b9eee0e1785441b0b4497a3c.json b/backend/.sqlx/query-ae8c0d0397609cf275bcffb92a5014665d47fe95b9eee0e1785441b0b4497a3c.json
new file mode 100644
index 0000000000..3413ddc87f
--- /dev/null
+++ b/backend/.sqlx/query-ae8c0d0397609cf275bcffb92a5014665d47fe95b9eee0e1785441b0b4497a3c.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM v2_job_debounce_batch WHERE id = $1) as \"e!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "e!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "ae8c0d0397609cf275bcffb92a5014665d47fe95b9eee0e1785441b0b4497a3c"
+}
diff --git a/backend/.sqlx/query-aef927110ef4cff51d3faabb0c389730dd215f4e90d105f0e86025f0ac42f020.json b/backend/.sqlx/query-aef927110ef4cff51d3faabb0c389730dd215f4e90d105f0e86025f0ac42f020.json
new file mode 100644
index 0000000000..2a90d12ad0
--- /dev/null
+++ b/backend/.sqlx/query-aef927110ef4cff51d3faabb0c389730dd215f4e90d105f0e86025f0ac42f020.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down)\n         SELECT $2, datatable, timestamp, name, code_up, code_down\n         FROM datatable_migrations WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "aef927110ef4cff51d3faabb0c389730dd215f4e90d105f0e86025f0ac42f020"
+}
diff --git a/backend/.sqlx/query-af19b9e3deb4f5c9e6ba77963a5da5c60aa6878b2c77f6028a68d64f797c3322.json b/backend/.sqlx/query-af19b9e3deb4f5c9e6ba77963a5da5c60aa6878b2c77f6028a68d64f797c3322.json
new file mode 100644
index 0000000000..c21a21163e
--- /dev/null
+++ b/backend/.sqlx/query-af19b9e3deb4f5c9e6ba77963a5da5c60aa6878b2c77f6028a68d64f797c3322.json
@@ -0,0 +1,70 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT workspace.id, workspace.name, usr.username, workspace_settings.color, workspace.parent_workspace_id,\n                workspace.is_dev_workspace, workspace.dev_workspace_label,\n                CASE WHEN usr.operator THEN workspace_settings.operator_settings ELSE NULL END as operator_settings,\n                usr.disabled\n         FROM workspace\n         JOIN usr ON usr.workspace_id = workspace.id\n         JOIN workspace_settings ON workspace_settings.workspace_id = workspace.id\n         WHERE usr.email = $1 AND workspace.deleted = false",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "username",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "color",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 4,
+        "name": "parent_workspace_id",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "is_dev_workspace",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 6,
+        "name": "dev_workspace_label",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "operator_settings",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 8,
+        "name": "disabled",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      null,
+      false
+    ]
+  },
+  "hash": "af19b9e3deb4f5c9e6ba77963a5da5c60aa6878b2c77f6028a68d64f797c3322"
+}
diff --git a/backend/.sqlx/query-451d9cde90d14071e21ffb5f615052b7ba7fc315fc301ed5c0ff50d9a3ab0d4a.json b/backend/.sqlx/query-afc1d827992477ce921afe6cbbf847d387b44c3fafc93e9619bb4710f9645e42.json
similarity index 50%
rename from backend/.sqlx/query-451d9cde90d14071e21ffb5f615052b7ba7fc315fc301ed5c0ff50d9a3ab0d4a.json
rename to backend/.sqlx/query-afc1d827992477ce921afe6cbbf847d387b44c3fafc93e9619bb4710f9645e42.json
index 9e7ffed082..406cbdb176 100644
--- a/backend/.sqlx/query-451d9cde90d14071e21ffb5f615052b7ba7fc315fc301ed5c0ff50d9a3ab0d4a.json
+++ b/backend/.sqlx/query-afc1d827992477ce921afe6cbbf847d387b44c3fafc93e9619bb4710f9645e42.json
@@ -1,10 +1,11 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO runnable_settings (hash, debouncing_settings, concurrency_settings)\n                VALUES ($1, $2, $3)\n                ON CONFLICT (hash)\n                DO NOTHING",
+  "query": "INSERT INTO runnable_settings (hash, debouncing_settings, concurrency_settings, retry_settings)\n                VALUES ($1, $2, $3, $4)\n                ON CONFLICT (hash)\n                DO NOTHING",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
+        "Int8",
         "Int8",
         "Int8",
         "Int8"
@@ -12,5 +13,5 @@
     },
     "nullable": []
   },
-  "hash": "451d9cde90d14071e21ffb5f615052b7ba7fc315fc301ed5c0ff50d9a3ab0d4a"
+  "hash": "afc1d827992477ce921afe6cbbf847d387b44c3fafc93e9619bb4710f9645e42"
 }
diff --git a/backend/.sqlx/query-b10e21ec9edf2d22ff956fdcd085bd601b7dcabdf70e85543455cb4fc3986d74.json b/backend/.sqlx/query-b10e21ec9edf2d22ff956fdcd085bd601b7dcabdf70e85543455cb4fc3986d74.json
new file mode 100644
index 0000000000..d5b10b13b9
--- /dev/null
+++ b/backend/.sqlx/query-b10e21ec9edf2d22ff956fdcd085bd601b7dcabdf70e85543455cb4fc3986d74.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT attempts FROM pipeline_freshness_state WHERE workspace_id = $1 AND script_path = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "attempts",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "b10e21ec9edf2d22ff956fdcd085bd601b7dcabdf70e85543455cb4fc3986d74"
+}
diff --git a/backend/.sqlx/query-b3200181380df2f645bfce270dc1cf520939fa4fa4b65371d11db7416ba0b14c.json b/backend/.sqlx/query-b3200181380df2f645bfce270dc1cf520939fa4fa4b65371d11db7416ba0b14c.json
new file mode 100644
index 0000000000..f3cc23c5b8
--- /dev/null
+++ b/backend/.sqlx/query-b3200181380df2f645bfce270dc1cf520939fa4fa4b65371d11db7416ba0b14c.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_advisory_xact_lock(hashtext($1), hashtext($2))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "pg_advisory_xact_lock",
+        "type_info": "Void"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b3200181380df2f645bfce270dc1cf520939fa4fa4b65371d11db7416ba0b14c"
+}
diff --git a/backend/.sqlx/query-b3771b690c5966272b1f42c9965bb6a8f961c119516e4c33dc928cd3b4f4edbc.json b/backend/.sqlx/query-b3771b690c5966272b1f42c9965bb6a8f961c119516e4c33dc928cd3b4f4edbc.json
index 3efa843923..092d15e592 100644
--- a/backend/.sqlx/query-b3771b690c5966272b1f42c9965bb6a8f961c119516e4c33dc928cd3b4f4edbc.json
+++ b/backend/.sqlx/query-b3771b690c5966272b1f42c9965bb6a8f961c119516e4c33dc928cd3b4f4edbc.json
@@ -166,7 +166,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-b3a9ef177aecfbcb31abba9f25e1292668a687ca01ae1c14c0ed3b5cf10fcb03.json b/backend/.sqlx/query-b3a9ef177aecfbcb31abba9f25e1292668a687ca01ae1c14c0ed3b5cf10fcb03.json
new file mode 100644
index 0000000000..545a9c161b
--- /dev/null
+++ b/backend/.sqlx/query-b3a9ef177aecfbcb31abba9f25e1292668a687ca01ae1c14c0ed3b5cf10fcb03.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_definition WHERE workspace_id = $1 AND (provider_path = $2 OR provider_path = $3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b3a9ef177aecfbcb31abba9f25e1292668a687ca01ae1c14c0ed3b5cf10fcb03"
+}
diff --git a/backend/.sqlx/query-b4c8f7ee9b1d065e1ab34ffe0dcfb76daed7d908be80f664a8a30e9896ab1f7e.json b/backend/.sqlx/query-b4c8f7ee9b1d065e1ab34ffe0dcfb76daed7d908be80f664a8a30e9896ab1f7e.json
new file mode 100644
index 0000000000..dc82db7591
--- /dev/null
+++ b/backend/.sqlx/query-b4c8f7ee9b1d065e1ab34ffe0dcfb76daed7d908be80f664a8a30e9896ab1f7e.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT audit_logs_s3_oldest_inflight_ts() AS \"cutoff?\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "cutoff?",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b4c8f7ee9b1d065e1ab34ffe0dcfb76daed7d908be80f664a8a30e9896ab1f7e"
+}
diff --git a/backend/.sqlx/query-b55b0f11b8d73ff9fd19da3bc5555e8365dbd4766f273ef3f68e734972a96cd6.json b/backend/.sqlx/query-b55b0f11b8d73ff9fd19da3bc5555e8365dbd4766f273ef3f68e734972a96cd6.json
new file mode 100644
index 0000000000..c6022d3013
--- /dev/null
+++ b/backend/.sqlx/query-b55b0f11b8d73ff9fd19da3bc5555e8365dbd4766f273ef3f68e734972a96cd6.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace_diff\n         (source_workspace_id, fork_workspace_id, path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork)\n         VALUES\n         ('test-workspace', 'wm-fork-test-workspace', 'f/rt/ghost', 'http_trigger', 1, 0, true, false, true),\n         ('test-workspace', 'wm-fork-test-workspace', 'f/rt/ghost_behind', 'http_trigger', 0, 1, true, true, false)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "b55b0f11b8d73ff9fd19da3bc5555e8365dbd4766f273ef3f68e734972a96cd6"
+}
diff --git a/backend/.sqlx/query-b6cfb752675a3f36975e6cc6c454267d67f58f9cbff0d164b4df45de885b0e9d.json b/backend/.sqlx/query-b6cfb752675a3f36975e6cc6c454267d67f58f9cbff0d164b4df45de885b0e9d.json
index 52e1ced19a..da7e3d5787 100644
--- a/backend/.sqlx/query-b6cfb752675a3f36975e6cc6c454267d67f58f9cbff0d164b4df45de885b0e9d.json
+++ b/backend/.sqlx/query-b6cfb752675a3f36975e6cc6c454267d67f58f9cbff0d164b4df45de885b0e9d.json
@@ -46,7 +46,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-b876b16b660bd1c3799abadc2c16d0f58f49a45647525658acb909a494877238.json b/backend/.sqlx/query-b876b16b660bd1c3799abadc2c16d0f58f49a45647525658acb909a494877238.json
new file mode 100644
index 0000000000..5b0f0b319c
--- /dev/null
+++ b/backend/.sqlx/query-b876b16b660bd1c3799abadc2c16d0f58f49a45647525658acb909a494877238.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_advisory_xact_lock(hashtextextended($1, 0::int8))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "pg_advisory_xact_lock",
+        "type_info": "Void"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b876b16b660bd1c3799abadc2c16d0f58f49a45647525658acb909a494877238"
+}
diff --git a/backend/.sqlx/query-b96c1a720654ae8ae52e8098cc18d887920beaec97696a17da020a2adfb052f0.json b/backend/.sqlx/query-b96c1a720654ae8ae52e8098cc18d887920beaec97696a17da020a2adfb052f0.json
new file mode 100644
index 0000000000..b3861c0111
--- /dev/null
+++ b/backend/.sqlx/query-b96c1a720654ae8ae52e8098cc18d887920beaec97696a17da020a2adfb052f0.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down) VALUES ($1, $2, $3, 'initial', $4, NULL)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b96c1a720654ae8ae52e8098cc18d887920beaec97696a17da020a2adfb052f0"
+}
diff --git a/backend/.sqlx/query-b98844926ff127c528ed3e7bc63bf1ebed0192be267983e8fbd18f79997e6142.json b/backend/.sqlx/query-b98844926ff127c528ed3e7bc63bf1ebed0192be267983e8fbd18f79997e6142.json
new file mode 100644
index 0000000000..94cf77ebc5
--- /dev/null
+++ b/backend/.sqlx/query-b98844926ff127c528ed3e7bc63bf1ebed0192be267983e8fbd18f79997e6142.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO usr (workspace_id, username, email, is_admin, created_at, operator, disabled, role, is_service_account, added_via)\n         SELECT $1, username, email, is_admin, created_at, operator, disabled, role, is_service_account, added_via\n         FROM usr WHERE workspace_id = $2\n         ON CONFLICT DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b98844926ff127c528ed3e7bc63bf1ebed0192be267983e8fbd18f79997e6142"
+}
diff --git a/backend/.sqlx/query-b9ce07cda12e2540f428d4c8e5bbfa8763c03dfe3f0c74edf958667035fb5135.json b/backend/.sqlx/query-b9ce07cda12e2540f428d4c8e5bbfa8763c03dfe3f0c74edf958667035fb5135.json
new file mode 100644
index 0000000000..fc002b7074
--- /dev/null
+++ b/backend/.sqlx/query-b9ce07cda12e2540f428d4c8e5bbfa8763c03dfe3f0c74edf958667035fb5135.json
@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        WITH target AS (\n            SELECT id FROM v2_job_queue WHERE id = $1 AND NOT running FOR UPDATE\n        ), completed AS (\n            INSERT INTO v2_job_completed\n                (workspace_id, id, started_at, duration_ms, result,\n                 flow_status, workflow_as_code_status, status, worker)\n            SELECT\n                q.workspace_id, q.id, q.started_at,\n                (EXTRACT('epoch' FROM now()) - EXTRACT('epoch' FROM COALESCE(q.started_at, now()))) * 1000,\n                $3::text::jsonb,\n                s.flow_status,\n                s.workflow_as_code_status,\n                'skipped'::job_status,\n                q.worker\n            FROM v2_job_queue q\n            LEFT JOIN v2_job_status s ON s.id = q.id\n            WHERE q.id IN (SELECT id FROM target)\n            ON CONFLICT (id) DO UPDATE SET status = EXCLUDED.status, result = EXCLUDED.result\n            RETURNING 1 AS x\n        ), _deleted AS (\n            DELETE FROM v2_job_queue WHERE id IN (SELECT id FROM target)\n        ), _logged AS (\n            INSERT INTO job_logs (logs, job_id, workspace_id)\n            SELECT $4, $1, $2 WHERE EXISTS (SELECT 1 FROM target)\n            ON CONFLICT (job_id) DO UPDATE SET logs = concat(job_logs.logs, EXCLUDED.logs)\n        )\n        SELECT x FROM completed\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "x",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b9ce07cda12e2540f428d4c8e5bbfa8763c03dfe3f0c74edf958667035fb5135"
+}
diff --git a/backend/.sqlx/query-bb8318ddc8e2235dce5c832ff2b0ebf972bcc7f821fbf1e0171266efd8d46616.json b/backend/.sqlx/query-bb8318ddc8e2235dce5c832ff2b0ebf972bcc7f821fbf1e0171266efd8d46616.json
new file mode 100644
index 0000000000..96608e1bc2
--- /dev/null
+++ b/backend/.sqlx/query-bb8318ddc8e2235dce5c832ff2b0ebf972bcc7f821fbf1e0171266efd8d46616.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace_storage_usage (workspace_id, storage, bytes, computed_at)\n         VALUES ($1, $2, GREATEST($3::bigint, 0), to_timestamp(0))\n         ON CONFLICT (workspace_id, storage)\n         DO UPDATE SET bytes = GREATEST(workspace_storage_usage.bytes + $3::bigint, 0)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bb8318ddc8e2235dce5c832ff2b0ebf972bcc7f821fbf1e0171266efd8d46616"
+}
diff --git a/backend/.sqlx/query-bc6f566bc958923045dc3e1ff1639a26f649c960a4ee8d0a584884a236129d43.json b/backend/.sqlx/query-bc6f566bc958923045dc3e1ff1639a26f649c960a4ee8d0a584884a236129d43.json
new file mode 100644
index 0000000000..ce77275faf
--- /dev/null
+++ b/backend/.sqlx/query-bc6f566bc958923045dc3e1ff1639a26f649c960a4ee8d0a584884a236129d43.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO pipeline_freshness_state (workspace_id, script_path, attempts) VALUES ($1, $2, 3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bc6f566bc958923045dc3e1ff1639a26f649c960a4ee8d0a584884a236129d43"
+}
diff --git a/backend/.sqlx/query-bcb36b5d38a07dbdfed71983aec1af05c5a6882f988ba5e0ec1f63828353987b.json b/backend/.sqlx/query-bcb36b5d38a07dbdfed71983aec1af05c5a6882f988ba5e0ec1f63828353987b.json
new file mode 100644
index 0000000000..514024eb8d
--- /dev/null
+++ b/backend/.sqlx/query-bcb36b5d38a07dbdfed71983aec1af05c5a6882f988ba5e0ec1f63828353987b.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH RECURSIVE chain AS (\n                SELECT id, parent_workspace_id, 0 AS depth\n                FROM workspace WHERE id = $1\n                UNION ALL\n                SELECT w.id, w.parent_workspace_id, chain.depth + 1\n                FROM workspace w\n                JOIN chain ON w.id = chain.parent_workspace_id\n                WHERE chain.depth < 20\n            )\n            SELECT id AS \"id!\" FROM chain WHERE parent_workspace_id IS NULL LIMIT 1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "bcb36b5d38a07dbdfed71983aec1af05c5a6882f988ba5e0ec1f63828353987b"
+}
diff --git a/backend/.sqlx/query-bcfa34cf80abea05f0c24883b9e77429c51e6166c414bcc5ce2e97fac25bcd77.json b/backend/.sqlx/query-bcfa34cf80abea05f0c24883b9e77429c51e6166c414bcc5ce2e97fac25bcd77.json
index f6ff25a4bf..419ab26383 100644
--- a/backend/.sqlx/query-bcfa34cf80abea05f0c24883b9e77429c51e6166c414bcc5ce2e97fac25bcd77.json
+++ b/backend/.sqlx/query-bcfa34cf80abea05f0c24883b9e77429c51e6166c414bcc5ce2e97fac25bcd77.json
@@ -80,7 +80,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-be6d2c92a62b7b284651c45af809746147aa9b8d0a81642a7b7cb4738a0cad66.json b/backend/.sqlx/query-be6d2c92a62b7b284651c45af809746147aa9b8d0a81642a7b7cb4738a0cad66.json
index 8dc66064dc..b9d33a6b5f 100644
--- a/backend/.sqlx/query-be6d2c92a62b7b284651c45af809746147aa9b8d0a81642a7b7cb4738a0cad66.json
+++ b/backend/.sqlx/query-be6d2c92a62b7b284651c45af809746147aa9b8d0a81642a7b7cb4738a0cad66.json
@@ -111,7 +111,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-bf5db4bba06a2af085577f36446bcb900ac113c14584fa933d2a94318e47a354.json b/backend/.sqlx/query-bf5db4bba06a2af085577f36446bcb900ac113c14584fa933d2a94318e47a354.json
new file mode 100644
index 0000000000..22618ad999
--- /dev/null
+++ b/backend/.sqlx/query-bf5db4bba06a2af085577f36446bcb900ac113c14584fa933d2a94318e47a354.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO v2_job_debounce_batch (id, debounce_batch)\n             SELECT $1, debounce_batch FROM v2_job_debounce_batch WHERE id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bf5db4bba06a2af085577f36446bcb900ac113c14584fa933d2a94318e47a354"
+}
diff --git a/backend/.sqlx/query-bf6e1abbab6bdf0e67eefa5f807a26b06d24a7b3e292ae4be97fbbb197d468db.json b/backend/.sqlx/query-bf6e1abbab6bdf0e67eefa5f807a26b06d24a7b3e292ae4be97fbbb197d468db.json
new file mode 100644
index 0000000000..35d3ace40e
--- /dev/null
+++ b/backend/.sqlx/query-bf6e1abbab6bdf0e67eefa5f807a26b06d24a7b3e292ae4be97fbbb197d468db.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace_diff SET has_changes = NULL\n             WHERE path = $2 AND kind = $3\n               AND ($1 IN (source_workspace_id, fork_workspace_id))",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bf6e1abbab6bdf0e67eefa5f807a26b06d24a7b3e292ae4be97fbbb197d468db"
+}
diff --git a/backend/.sqlx/query-bfa4fb5998dec9baf89a2d950186e2dc9c0aecf7831ce66082a40f17cc5ac0de.json b/backend/.sqlx/query-bfa4fb5998dec9baf89a2d950186e2dc9c0aecf7831ce66082a40f17cc5ac0de.json
new file mode 100644
index 0000000000..a1f7783645
--- /dev/null
+++ b/backend/.sqlx/query-bfa4fb5998dec9baf89a2d950186e2dc9c0aecf7831ce66082a40f17cc5ac0de.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(\n            SELECT 1 FROM workspace\n            WHERE id = $1 AND parent_workspace_id = $2 AND is_dev_workspace\n        )",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "bfa4fb5998dec9baf89a2d950186e2dc9c0aecf7831ce66082a40f17cc5ac0de"
+}
diff --git a/backend/.sqlx/query-bfdd60b42e32bd81e2d20b327462893147b4e5ff078531de36147d908132d636.json b/backend/.sqlx/query-bfdd60b42e32bd81e2d20b327462893147b4e5ff078531de36147d908132d636.json
new file mode 100644
index 0000000000..f9fbc7a58b
--- /dev/null
+++ b/backend/.sqlx/query-bfdd60b42e32bd81e2d20b327462893147b4e5ff078531de36147d908132d636.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM flow_conversation_message WHERE job_id = ANY($1)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "UuidArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bfdd60b42e32bd81e2d20b327462893147b4e5ff078531de36147d908132d636"
+}
diff --git a/backend/.sqlx/query-c033a690fde04da79745e850b72fa7cfd861f1dcad88c7ea75a0a8b014ec1f75.json b/backend/.sqlx/query-c033a690fde04da79745e850b72fa7cfd861f1dcad88c7ea75a0a8b014ec1f75.json
new file mode 100644
index 0000000000..b2e218e511
--- /dev/null
+++ b/backend/.sqlx/query-c033a690fde04da79745e850b72fa7cfd861f1dcad88c7ea75a0a8b014ec1f75.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM v2_job_completed\n             WHERE id IN (\n                 SELECT jc.id FROM v2_job_completed jc\n                 LEFT JOIN v2_job j ON j.id = jc.id\n                 WHERE jc.completed_at <= now() - ($1::bigint::text || ' s')::interval\n                   AND ($4::timestamptz IS NULL OR jc.completed_at >= $4)\n                   AND COALESCE(j.root_job, j.flow_innermost_root_job, jc.id) NOT IN (\n                       SELECT u FROM unnest($3::uuid[]) AS u WHERE u IS NOT NULL\n                   )\n                 ORDER BY jc.completed_at ASC\n                 LIMIT $2\n                 FOR UPDATE OF jc SKIP LOCKED\n             )\n             RETURNING id, completed_at",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 1,
+        "name": "completed_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "UuidArray",
+        "Timestamptz"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "c033a690fde04da79745e850b72fa7cfd861f1dcad88c7ea75a0a8b014ec1f75"
+}
diff --git a/backend/.sqlx/query-c167db39eeed526449dc064eaeb26e648aa9455cb81bab86fd106f76537701ba.json b/backend/.sqlx/query-c167db39eeed526449dc064eaeb26e648aa9455cb81bab86fd106f76537701ba.json
new file mode 100644
index 0000000000..2d1e21019e
--- /dev/null
+++ b/backend/.sqlx/query-c167db39eeed526449dc064eaeb26e648aa9455cb81bab86fd106f76537701ba.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT runnable_path FROM v2_job WHERE id = $1 AND workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "runnable_path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "c167db39eeed526449dc064eaeb26e648aa9455cb81bab86fd106f76537701ba"
+}
diff --git a/backend/.sqlx/query-c28e066bf24263f9e3b48a2ecabdf037178ba246092dbc1d2b3816e7a9269dc3.json b/backend/.sqlx/query-c28e066bf24263f9e3b48a2ecabdf037178ba246092dbc1d2b3816e7a9269dc3.json
new file mode 100644
index 0000000000..7981dbc983
--- /dev/null
+++ b/backend/.sqlx/query-c28e066bf24263f9e3b48a2ecabdf037178ba246092dbc1d2b3816e7a9269dc3.json
@@ -0,0 +1,111 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT asset_kind AS \"asset_kind: AssetKind\", asset_path, partition,\n                  status AS \"status: MaterializationStatus\", snapshot_id,\n                  row_count, job_id, materialized_at, error\n             FROM materialized_partition\n            WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3\n            ORDER BY partition DESC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "asset_kind: AssetKind",
+        "type_info": {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "asset_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "partition",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "status: MaterializationStatus",
+        "type_info": {
+          "Custom": {
+            "name": "materialization_status",
+            "kind": {
+              "Enum": [
+                "running",
+                "materialized",
+                "failed"
+              ]
+            }
+          }
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "snapshot_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 5,
+        "name": "row_count",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 6,
+        "name": "job_id",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 7,
+        "name": "materialized_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 8,
+        "name": "error",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        {
+          "Custom": {
+            "name": "asset_kind",
+            "kind": {
+              "Enum": [
+                "s3object",
+                "resource",
+                "variable",
+                "ducklake",
+                "datatable",
+                "volume"
+              ]
+            }
+          }
+        },
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      true
+    ]
+  },
+  "hash": "c28e066bf24263f9e3b48a2ecabdf037178ba246092dbc1d2b3816e7a9269dc3"
+}
diff --git a/backend/.sqlx/query-c3e4ee8cb8d5f7065d4415a57e67bb20d36921599e2bf97c0193f5853df58f59.json b/backend/.sqlx/query-c3e4ee8cb8d5f7065d4415a57e67bb20d36921599e2bf97c0193f5853df58f59.json
new file mode 100644
index 0000000000..876465fb8d
--- /dev/null
+++ b/backend/.sqlx/query-c3e4ee8cb8d5f7065d4415a57e67bb20d36921599e2bf97c0193f5853df58f59.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT j.runnable_path AS \"runnable_path!\", j.kind::text AS \"kind!\",\n                  q.runnable_settings_handle\n             FROM v2_job j JOIN v2_job_queue q ON q.id = j.id\n             WHERE j.workspace_id = $1 AND j.trigger_kind = 'asset'\n             ORDER BY j.runnable_path",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "runnable_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "kind!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "runnable_settings_handle",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      null,
+      true
+    ]
+  },
+  "hash": "c3e4ee8cb8d5f7065d4415a57e67bb20d36921599e2bf97c0193f5853df58f59"
+}
diff --git a/backend/.sqlx/query-c5639d48c92d6863f16f97de91eae590d0ed2f4b7831956bb429a47c478f7c1f.json b/backend/.sqlx/query-c5639d48c92d6863f16f97de91eae590d0ed2f4b7831956bb429a47c478f7c1f.json
new file mode 100644
index 0000000000..fa1396235f
--- /dev/null
+++ b/backend/.sqlx/query-c5639d48c92d6863f16f97de91eae590d0ed2f4b7831956bb429a47c478f7c1f.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (workspace_id, datatable, timestamp) DO UPDATE SET name = EXCLUDED.name, code_up = EXCLUDED.code_up, code_down = EXCLUDED.code_down",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int8",
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c5639d48c92d6863f16f97de91eae590d0ed2f4b7831956bb429a47c478f7c1f"
+}
diff --git a/backend/.sqlx/query-c6c186eb3a108e1f695bf5730c23ef4ab1ccfdc4ed33904e83e5130ac0bf5896.json b/backend/.sqlx/query-c6c186eb3a108e1f695bf5730c23ef4ab1ccfdc4ed33904e83e5130ac0bf5896.json
new file mode 100644
index 0000000000..7cfc1f109f
--- /dev/null
+++ b/backend/.sqlx/query-c6c186eb3a108e1f695bf5730c23ef4ab1ccfdc4ed33904e83e5130ac0bf5896.json
@@ -0,0 +1,41 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT DISTINCT ON (asset_path)\n                  asset_path, version, columns AS \"columns: Json<Vec<SchemaColumn>>\", captured_at\n             FROM materialized_asset_schema\n            WHERE workspace_id = $1 AND asset_kind = 'ducklake' AND asset_path = ANY($2)\n            ORDER BY asset_path, version DESC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "asset_path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "version",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "columns: Json<Vec<SchemaColumn>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 3,
+        "name": "captured_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "c6c186eb3a108e1f695bf5730c23ef4ab1ccfdc4ed33904e83e5130ac0bf5896"
+}
diff --git a/backend/.sqlx/query-c825fa5c6e287068aeaad994c0b42b8ad59b9129f032c6b918c27426ab304f2b.json b/backend/.sqlx/query-c825fa5c6e287068aeaad994c0b42b8ad59b9129f032c6b918c27426ab304f2b.json
deleted file mode 100644
index a68387f905..0000000000
--- a/backend/.sqlx/query-c825fa5c6e287068aeaad994c0b42b8ad59b9129f032c6b918c27426ab304f2b.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "DELETE FROM job_perms\nWHERE job_id NOT IN (SELECT id FROM v2_job_queue)\nRETURNING job_id",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "job_id",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "c825fa5c6e287068aeaad994c0b42b8ad59b9129f032c6b918c27426ab304f2b"
-}
diff --git a/backend/.sqlx/query-c832ebc7ff0be446bf36628f6e06f59d0fbe8df62e0bd0be636d7cf70dcf95f0.json b/backend/.sqlx/query-c832ebc7ff0be446bf36628f6e06f59d0fbe8df62e0bd0be636d7cf70dcf95f0.json
new file mode 100644
index 0000000000..d316c16fff
--- /dev/null
+++ b/backend/.sqlx/query-c832ebc7ff0be446bf36628f6e06f59d0fbe8df62e0bd0be636d7cf70dcf95f0.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO schedule (\n            workspace_id, path, edited_by, edited_at, schedule, enabled, script_path,\n            args, extra_perms, is_flow, email, error, timezone, on_failure,\n            on_recovery, on_failure_times, on_failure_exact, on_failure_extra_args,\n            on_recovery_times, on_recovery_extra_args, ws_error_handler_muted, retry,\n            summary, no_flow_overlap, tag, paused_until, on_success, on_success_extra_args,\n            cron_version, description, dynamic_skip, permissioned_as, labels\n        )\n        SELECT\n            $1, path, edited_by, edited_at, schedule, FALSE, script_path,\n            args, extra_perms, is_flow, email, error, timezone, on_failure,\n            on_recovery, on_failure_times, on_failure_exact, on_failure_extra_args,\n            on_recovery_times, on_recovery_extra_args, ws_error_handler_muted, retry,\n            summary, no_flow_overlap, tag, paused_until, on_success, on_success_extra_args,\n            cron_version, description, dynamic_skip, permissioned_as, labels\n        FROM schedule WHERE workspace_id = $2 AND NOT starts_with(path, $3)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c832ebc7ff0be446bf36628f6e06f59d0fbe8df62e0bd0be636d7cf70dcf95f0"
+}
diff --git a/backend/.sqlx/query-c84087a0669d0b71829b0765c7274ca0a03fb823a781fb46d2b2b6cfc535a16b.json b/backend/.sqlx/query-c84087a0669d0b71829b0765c7274ca0a03fb823a781fb46d2b2b6cfc535a16b.json
new file mode 100644
index 0000000000..ca39442f59
--- /dev/null
+++ b/backend/.sqlx/query-c84087a0669d0b71829b0765c7274ca0a03fb823a781fb46d2b2b6cfc535a16b.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name, description FROM ai_skill WHERE workspace_id = $1 ORDER BY name",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "description",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "c84087a0669d0b71829b0765c7274ca0a03fb823a781fb46d2b2b6cfc535a16b"
+}
diff --git a/backend/.sqlx/query-c8fb2a1491f90951a6d2e4e9c56d288eb60f6c6644a73cdf949de0159215a7f7.json b/backend/.sqlx/query-c8fb2a1491f90951a6d2e4e9c56d288eb60f6c6644a73cdf949de0159215a7f7.json
index 4629a9bd0a..161b9d36f9 100644
--- a/backend/.sqlx/query-c8fb2a1491f90951a6d2e4e9c56d288eb60f6c6644a73cdf949de0159215a7f7.json
+++ b/backend/.sqlx/query-c8fb2a1491f90951a6d2e4e9c56d288eb60f6c6644a73cdf949de0159215a7f7.json
@@ -42,7 +42,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-c961131f349c68b91b0aea9805fd592276fa08da3f13f9c74aeedb666a55df05.json b/backend/.sqlx/query-c961131f349c68b91b0aea9805fd592276fa08da3f13f9c74aeedb666a55df05.json
new file mode 100644
index 0000000000..c1e5495204
--- /dev/null
+++ b/backend/.sqlx/query-c961131f349c68b91b0aea9805fd592276fa08da3f13f9c74aeedb666a55df05.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_usage WHERE workspace_id = $1 AND macro_name = ANY($2) AND consumer_path != $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c961131f349c68b91b0aea9805fd592276fa08da3f13f9c74aeedb666a55df05"
+}
diff --git a/backend/.sqlx/query-c9d9c08505e69790154876f50f90d503a92e44e291a76a53ef09ded619edfacb.json b/backend/.sqlx/query-c9d9c08505e69790154876f50f90d503a92e44e291a76a53ef09ded619edfacb.json
new file mode 100644
index 0000000000..b089e466cf
--- /dev/null
+++ b/backend/.sqlx/query-c9d9c08505e69790154876f50f90d503a92e44e291a76a53ef09ded619edfacb.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT ws.datatable->'datatables' FROM workspace_settings ws WHERE ws.workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "c9d9c08505e69790154876f50f90d503a92e44e291a76a53ef09ded619edfacb"
+}
diff --git a/backend/.sqlx/query-cb04b72b25b7bd1163316be6a4e25e934a5a7677a9fdc7ea62f9dadbace15ec3.json b/backend/.sqlx/query-cb04b72b25b7bd1163316be6a4e25e934a5a7677a9fdc7ea62f9dadbace15ec3.json
new file mode 100644
index 0000000000..8f0841180b
--- /dev/null
+++ b/backend/.sqlx/query-cb04b72b25b7bd1163316be6a4e25e934a5a7677a9fdc7ea62f9dadbace15ec3.json
@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT m.name AS \"name!\", m.params AS \"params!\", m.body AS \"body!\",\n                  m.is_table_macro AS \"is_table_macro!\", m.provider_path AS \"provider_path!\"\n           FROM macro_definition m\n           WHERE m.workspace_id = $1\n             AND EXISTS (\n                SELECT 1 FROM script s\n                WHERE s.workspace_id = m.workspace_id\n                  AND s.path = m.provider_path\n                  AND s.archived = false\n                  AND s.deleted = false\n             )\n           ORDER BY m.provider_path, m.name",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "params!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "body!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_table_macro!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 4,
+        "name": "provider_path!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "cb04b72b25b7bd1163316be6a4e25e934a5a7677a9fdc7ea62f9dadbace15ec3"
+}
diff --git a/backend/.sqlx/query-cb1b8adfe43c193d8b97afc3b04b6ebebd50e943263d6884bcdd322faeaa8345.json b/backend/.sqlx/query-cb1b8adfe43c193d8b97afc3b04b6ebebd50e943263d6884bcdd322faeaa8345.json
new file mode 100644
index 0000000000..1419a1a20c
--- /dev/null
+++ b/backend/.sqlx/query-cb1b8adfe43c193d8b97afc3b04b6ebebd50e943263d6884bcdd322faeaa8345.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE macro_definition SET workspace_id = $1 WHERE workspace_id = $2",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cb1b8adfe43c193d8b97afc3b04b6ebebd50e943263d6884bcdd322faeaa8345"
+}
diff --git a/backend/.sqlx/query-cbbc6a894b6421d2cd49e59b7ed650fb861aa19a009d6dfe9937304057f2b91f.json b/backend/.sqlx/query-cbbc6a894b6421d2cd49e59b7ed650fb861aa19a009d6dfe9937304057f2b91f.json
new file mode 100644
index 0000000000..0fac858572
--- /dev/null
+++ b/backend/.sqlx/query-cbbc6a894b6421d2cd49e59b7ed650fb861aa19a009d6dfe9937304057f2b91f.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH RECURSIVE chain AS (\n                SELECT id, parent_workspace_id, 0 AS depth\n                FROM workspace WHERE id = $1\n                UNION ALL\n                SELECT w.id, w.parent_workspace_id, chain.depth + 1\n                FROM workspace w\n                JOIN chain ON w.id = chain.parent_workspace_id\n                WHERE chain.depth < 20\n            )\n            SELECT id AS \"id!\" FROM chain WHERE depth > 0 ORDER BY depth\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "cbbc6a894b6421d2cd49e59b7ed650fb861aa19a009d6dfe9937304057f2b91f"
+}
diff --git a/backend/.sqlx/query-ccff2c556f1171bd10b09b1aa1d2d8ced2d4a75eef905cb40cb5be6eb8bd5e2b.json b/backend/.sqlx/query-ccff2c556f1171bd10b09b1aa1d2d8ced2d4a75eef905cb40cb5be6eb8bd5e2b.json
new file mode 100644
index 0000000000..abb128f463
--- /dev/null
+++ b/backend/.sqlx/query-ccff2c556f1171bd10b09b1aa1d2d8ced2d4a75eef905cb40cb5be6eb8bd5e2b.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT storage, bytes, computed_at FROM workspace_storage_usage\n           WHERE workspace_id = $1 ORDER BY storage",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "storage",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "bytes",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "computed_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "ccff2c556f1171bd10b09b1aa1d2d8ced2d4a75eef905cb40cb5be6eb8bd5e2b"
+}
diff --git a/backend/.sqlx/query-cd492743a27a158c9f5ff1fdb50a48ebfed85ad8800e293945eadc874d7e42f3.json b/backend/.sqlx/query-cd492743a27a158c9f5ff1fdb50a48ebfed85ad8800e293945eadc874d7e42f3.json
new file mode 100644
index 0000000000..83f7394250
--- /dev/null
+++ b/backend/.sqlx/query-cd492743a27a158c9f5ff1fdb50a48ebfed85ad8800e293945eadc874d7e42f3.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE fork_ducklake_namespace SET schema_dropped = true\n                 WHERE workspace_id = $1 AND ducklake_name = $2 AND catalog = $3\n                   AND storage = $4 AND storage_ref = $5 AND data_path = $6",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cd492743a27a158c9f5ff1fdb50a48ebfed85ad8800e293945eadc874d7e42f3"
+}
diff --git a/backend/.sqlx/query-cd7c651f33629af0eb74362525395eadc68642592e3c56d4bf0b89b6440869b1.json b/backend/.sqlx/query-cd7c651f33629af0eb74362525395eadc68642592e3c56d4bf0b89b6440869b1.json
new file mode 100644
index 0000000000..2c775af0b1
--- /dev/null
+++ b/backend/.sqlx/query-cd7c651f33629af0eb74362525395eadc68642592e3c56d4bf0b89b6440869b1.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO background_task_state (name, value)\n             SELECT $1, jsonb_build_object(\n                        'last_xmin', txid_snapshot_xmin(txid_current_snapshot())::bigint,\n                        'last_ts', now(),\n                        'last_oldest_inflight_ts',\n                            COALESCE(audit_logs_s3_oldest_inflight_ts(), now() - interval '7 days'))\n             WHERE NOT EXISTS (SELECT 1 FROM global_settings WHERE name = $2)\n             ON CONFLICT (name) DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cd7c651f33629af0eb74362525395eadc68642592e3c56d4bf0b89b6440869b1"
+}
diff --git a/backend/.sqlx/query-cf2e74dcd0992f22eb3b62995fd0099ee5f46dafba8f323cf002e329ac69d1ac.json b/backend/.sqlx/query-cf2e74dcd0992f22eb3b62995fd0099ee5f46dafba8f323cf002e329ac69d1ac.json
new file mode 100644
index 0000000000..83c306f4d8
--- /dev/null
+++ b/backend/.sqlx/query-cf2e74dcd0992f22eb3b62995fd0099ee5f46dafba8f323cf002e329ac69d1ac.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT datatable, timestamp FROM datatable_migrations WHERE workspace_id = $1 AND datatable = ANY($2) AND timestamp = ANY($3)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "datatable",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray",
+        "Int8Array"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "cf2e74dcd0992f22eb3b62995fd0099ee5f46dafba8f323cf002e329ac69d1ac"
+}
diff --git a/backend/.sqlx/query-d059b8a3771e4ac4cd07990ecca84daaed616dc1ac609a6ca81bcd446e4dc230.json b/backend/.sqlx/query-d059b8a3771e4ac4cd07990ecca84daaed616dc1ac609a6ca81bcd446e4dc230.json
new file mode 100644
index 0000000000..4364da5dd0
--- /dev/null
+++ b/backend/.sqlx/query-d059b8a3771e4ac4cd07990ecca84daaed616dc1ac609a6ca81bcd446e4dc230.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM job_result_stream_v2\n             WHERE ctid IN (\n                 SELECT jrs.ctid FROM job_result_stream_v2 jrs\n                 WHERE NOT EXISTS (SELECT 1 FROM v2_job_queue q WHERE q.id = jrs.job_id)\n                   AND NOT EXISTS (\n                       SELECT 1 FROM v2_job_completed c\n                       WHERE c.id = jrs.job_id\n                         AND c.completed_at > NOW() - INTERVAL '60 seconds'\n                   )\n                 LIMIT 100000\n             )",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "d059b8a3771e4ac4cd07990ecca84daaed616dc1ac609a6ca81bcd446e4dc230"
+}
diff --git a/backend/.sqlx/query-d0e826043e5a129ae6768c274c67b6254ff6c5fd450ecdab886a3183a894d266.json b/backend/.sqlx/query-d0e826043e5a129ae6768c274c67b6254ff6c5fd450ecdab886a3183a894d266.json
deleted file mode 100644
index e900b0f9e0..0000000000
--- a/backend/.sqlx/query-d0e826043e5a129ae6768c274c67b6254ff6c5fd450ecdab886a3183a894d266.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "WITH ids AS (\n                        SELECT id as job_id FROM v2_job_debounce_batch WHERE debounce_batch = (\n                            SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1\n                        )\n                    ) SELECT args->>$2 FROM ids LEFT JOIN v2_job ON v2_job.id = ids.job_id\n                    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "?column?",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "d0e826043e5a129ae6768c274c67b6254ff6c5fd450ecdab886a3183a894d266"
-}
diff --git a/backend/.sqlx/query-d1142126245cdaf5d01dc67ab2488958b335f6a24d1e93641eab6aaac86301f7.json b/backend/.sqlx/query-d1142126245cdaf5d01dc67ab2488958b335f6a24d1e93641eab6aaac86301f7.json
new file mode 100644
index 0000000000..f705dbc337
--- /dev/null
+++ b/backend/.sqlx/query-d1142126245cdaf5d01dc67ab2488958b335f6a24d1e93641eab6aaac86301f7.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace_settings\n           SET ducklake = jsonb_set(ducklake, '{ducklakes}', (\n               SELECT COALESCE(jsonb_object_agg(key, value - 'fork_behavior'), '{}'::jsonb)\n               FROM jsonb_each(ducklake->'ducklakes')\n           ))\n           WHERE workspace_id = $1 AND jsonb_typeof(ducklake->'ducklakes') = 'object'",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d1142126245cdaf5d01dc67ab2488958b335f6a24d1e93641eab6aaac86301f7"
+}
diff --git a/backend/.sqlx/query-d1a1f64cb6b14c561c53c44910cad8bc7a2d226a9f22418782bcc66e46d0f706.json b/backend/.sqlx/query-d1a1f64cb6b14c561c53c44910cad8bc7a2d226a9f22418782bcc66e46d0f706.json
new file mode 100644
index 0000000000..cbf96dad52
--- /dev/null
+++ b/backend/.sqlx/query-d1a1f64cb6b14c561c53c44910cad8bc7a2d226a9f22418782bcc66e46d0f706.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO pipeline_freshness_state (workspace_id, script_path) VALUES ($1, $2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d1a1f64cb6b14c561c53c44910cad8bc7a2d226a9f22418782bcc66e46d0f706"
+}
diff --git a/backend/.sqlx/query-d3334846d5928e9b260d17e7ca99f6f24e83e019d6cd1590c42b14524c00f4d3.json b/backend/.sqlx/query-d3334846d5928e9b260d17e7ca99f6f24e83e019d6cd1590c42b14524c00f4d3.json
new file mode 100644
index 0000000000..fe92251342
--- /dev/null
+++ b/backend/.sqlx/query-d3334846d5928e9b260d17e7ca99f6f24e83e019d6cd1590c42b14524c00f4d3.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO usr (workspace_id, email, username, is_admin, role)\n         VALUES ('wm-fork-guard-test', 'test2@windmill.dev', 'test-user-2', true, 'Admin')",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "d3334846d5928e9b260d17e7ca99f6f24e83e019d6cd1590c42b14524c00f4d3"
+}
diff --git a/backend/.sqlx/query-d350eb5358c62526e70eba991fdd817a998bef51ac27e83942afc548640fb785.json b/backend/.sqlx/query-d350eb5358c62526e70eba991fdd817a998bef51ac27e83942afc548640fb785.json
new file mode 100644
index 0000000000..deed0f1cdb
--- /dev/null
+++ b/backend/.sqlx/query-d350eb5358c62526e70eba991fdd817a998bef51ac27e83942afc548640fb785.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM macro_usage WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d350eb5358c62526e70eba991fdd817a998bef51ac27e83942afc548640fb785"
+}
diff --git a/backend/.sqlx/query-d38e25120ec7bfcbd210d967ef2406d1773657c62d67e55dac666f9469d50e6a.json b/backend/.sqlx/query-d38e25120ec7bfcbd210d967ef2406d1773657c62d67e55dac666f9469d50e6a.json
new file mode 100644
index 0000000000..1fd1fbaece
--- /dev/null
+++ b/backend/.sqlx/query-d38e25120ec7bfcbd210d967ef2406d1773657c62d67e55dac666f9469d50e6a.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM workspace_storage_usage WHERE workspace_id = $1 AND storage != ALL($2)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d38e25120ec7bfcbd210d967ef2406d1773657c62d67e55dac666f9469d50e6a"
+}
diff --git a/backend/.sqlx/query-d3ce4e7f3dd10548197734a0cf38c644f70be809dcfe7d973147962530c601d5.json b/backend/.sqlx/query-d3ce4e7f3dd10548197734a0cf38c644f70be809dcfe7d973147962530c601d5.json
new file mode 100644
index 0000000000..9f8b86b4e6
--- /dev/null
+++ b/backend/.sqlx/query-d3ce4e7f3dd10548197734a0cf38c644f70be809dcfe7d973147962530c601d5.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM workspace_protection_rule WHERE workspace_id = $1 AND name = $2\n             AND NOT EXISTS (\n                 SELECT 1 FROM workspace\n                 WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false\n             )",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d3ce4e7f3dd10548197734a0cf38c644f70be809dcfe7d973147962530c601d5"
+}
diff --git a/backend/.sqlx/query-d41ea93fd58381b89e151c965eae1ea2fe96a1b94f5a92953fb1c1642d15c016.json b/backend/.sqlx/query-d41ea93fd58381b89e151c965eae1ea2fe96a1b94f5a92953fb1c1642d15c016.json
index d5365ffe94..d97c02d26b 100644
--- a/backend/.sqlx/query-d41ea93fd58381b89e151c965eae1ea2fe96a1b94f5a92953fb1c1642d15c016.json
+++ b/backend/.sqlx/query-d41ea93fd58381b89e151c965eae1ea2fe96a1b94f5a92953fb1c1642d15c016.json
@@ -111,7 +111,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-d4211392e174a0e8f89c7fcebdf120e5b0f629f9f04e08a2982df33ff23ac7a9.json b/backend/.sqlx/query-d4211392e174a0e8f89c7fcebdf120e5b0f629f9f04e08a2982df33ff23ac7a9.json
index 33a5534b42..052d83fcd9 100644
--- a/backend/.sqlx/query-d4211392e174a0e8f89c7fcebdf120e5b0f629f9f04e08a2982df33ff23ac7a9.json
+++ b/backend/.sqlx/query-d4211392e174a0e8f89c7fcebdf120e5b0f629f9f04e08a2982df33ff23ac7a9.json
@@ -251,7 +251,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-d4923137cf9b6bf06e0e21ba907e7c80dd0ef92d78224792bec4c3323e14023c.json b/backend/.sqlx/query-d4923137cf9b6bf06e0e21ba907e7c80dd0ef92d78224792bec4c3323e14023c.json
new file mode 100644
index 0000000000..5609adaad8
--- /dev/null
+++ b/backend/.sqlx/query-d4923137cf9b6bf06e0e21ba907e7c80dd0ef92d78224792bec4c3323e14023c.json
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n             (SELECT COALESCE(SUM(bytes), 0) FROM workspace_storage_usage WHERE workspace_id = $1)::bigint as \"committed!\",\n             COALESCE(\n               (SELECT MIN(computed_at) FROM workspace_storage_usage WHERE workspace_id = $1) < now() - interval '10 minutes',\n               true) as \"stale!\",\n             (SELECT COALESCE(SUM(GREATEST(t.total - t.existing, 0)), 0)\n                FROM (SELECT SUM(part_bytes) as total, MAX(target_existing_size) as existing\n                        FROM workspace_multipart_inflight\n                        WHERE workspace_id = $1 AND created_at > now() - ($2::text)::interval\n                          AND ($3::text IS NULL OR upload_id <> $3)\n                        GROUP BY upload_id) t)::bigint as \"reserved!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "committed!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "stale!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "reserved!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "d4923137cf9b6bf06e0e21ba907e7c80dd0ef92d78224792bec4c3323e14023c"
+}
diff --git a/backend/.sqlx/query-d4e0da9f9653d532770066310f85e59e5edda1faea72f39603814afb6a3cd596.json b/backend/.sqlx/query-d4e0da9f9653d532770066310f85e59e5edda1faea72f39603814afb6a3cd596.json
index 0eed069163..e60f5cc187 100644
--- a/backend/.sqlx/query-d4e0da9f9653d532770066310f85e59e5edda1faea72f39603814afb6a3cd596.json
+++ b/backend/.sqlx/query-d4e0da9f9653d532770066310f85e59e5edda1faea72f39603814afb6a3cd596.json
@@ -47,7 +47,8 @@
                 "trigger_cli",
                 "trigger_nextcloud",
                 "trigger_google",
-                "trigger_github"
+                "trigger_github",
+                "data_pipeline"
               ]
             }
           }
diff --git a/backend/.sqlx/query-d4f047b0a672d5bfe9fd7db60f11563ef05db7cc54a958a72384b08a69eb784e.json b/backend/.sqlx/query-d4f047b0a672d5bfe9fd7db60f11563ef05db7cc54a958a72384b08a69eb784e.json
new file mode 100644
index 0000000000..3a5531b9a6
--- /dev/null
+++ b/backend/.sqlx/query-d4f047b0a672d5bfe9fd7db60f11563ef05db7cc54a958a72384b08a69eb784e.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT DISTINCT usage_path FROM asset\n        WHERE workspace_id = $1\n          AND kind = 'ducklake'\n          AND path = $2\n          AND usage_kind = 'script'\n          AND usage_access_type IN ('w', 'rw')\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "usage_path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "d4f047b0a672d5bfe9fd7db60f11563ef05db7cc54a958a72384b08a69eb784e"
+}
diff --git a/backend/.sqlx/query-d537182f8c8931427f2cf175bd850ce2581a33c8678212de99edb6f823f38994.json b/backend/.sqlx/query-d537182f8c8931427f2cf175bd850ce2581a33c8678212de99edb6f823f38994.json
new file mode 100644
index 0000000000..8c2a7716fd
--- /dev/null
+++ b/backend/.sqlx/query-d537182f8c8931427f2cf175bd850ce2581a33c8678212de99edb6f823f38994.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT (status = 'success' OR EXISTS (\n                            SELECT 1 FROM native_retry_attempt nra\n                            JOIN v2_job jc ON jc.id = nra.job_id\n                            JOIN v2_job_completed cc ON cc.id = nra.job_id\n                            WHERE jc.parent_job = j.id AND cc.status = 'success'\n                        )) AS \"success!\"\n                    FROM v2_job j JOIN v2_job_completed USING (id)\n                    WHERE j.workspace_id = $1 AND trigger_kind = 'schedule' AND trigger = $2\n                        AND parent_job IS NULL\n                        AND runnable_path = $3\n                        AND j.id != $4\n                    ORDER BY created_at DESC\n                    LIMIT $5",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "success!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Uuid",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "d537182f8c8931427f2cf175bd850ce2581a33c8678212de99edb6f823f38994"
+}
diff --git a/backend/.sqlx/query-d74dfaa8cb9fca89c2e21f810cd45ff7b595c7c50f5e6ff2733eded6ef544996.json b/backend/.sqlx/query-d74dfaa8cb9fca89c2e21f810cd45ff7b595c7c50f5e6ff2733eded6ef544996.json
new file mode 100644
index 0000000000..4a511c2d6e
--- /dev/null
+++ b/backend/.sqlx/query-d74dfaa8cb9fca89c2e21f810cd45ff7b595c7c50f5e6ff2733eded6ef544996.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT is_admin FROM usr WHERE workspace_id = $1 AND email = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "is_admin",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "d74dfaa8cb9fca89c2e21f810cd45ff7b595c7c50f5e6ff2733eded6ef544996"
+}
diff --git a/backend/.sqlx/query-d8f234765e2de89f780937a505c236c5be9b36b4df95735fedb44ed944606ac8.json b/backend/.sqlx/query-d8f234765e2de89f780937a505c236c5be9b36b4df95735fedb44ed944606ac8.json
new file mode 100644
index 0000000000..48a5c693ac
--- /dev/null
+++ b/backend/.sqlx/query-d8f234765e2de89f780937a505c236c5be9b36b4df95735fedb44ed944606ac8.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace SET parent_workspace_id = $1 WHERE parent_workspace_id = $2 RETURNING id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "d8f234765e2de89f780937a505c236c5be9b36b4df95735fedb44ed944606ac8"
+}
diff --git a/backend/.sqlx/query-caf4dc1046769f410d1277cdd3747763e0d674e8a1d9f3512629cb5a9e5a3439.json b/backend/.sqlx/query-dc60d43814e2b5220db648677dbb3656e27f1c962c2f0438e0cc06530661fbf8.json
similarity index 53%
rename from backend/.sqlx/query-caf4dc1046769f410d1277cdd3747763e0d674e8a1d9f3512629cb5a9e5a3439.json
rename to backend/.sqlx/query-dc60d43814e2b5220db648677dbb3656e27f1c962c2f0438e0cc06530661fbf8.json
index f2398bf143..0d36677337 100644
--- a/backend/.sqlx/query-caf4dc1046769f410d1277cdd3747763e0d674e8a1d9f3512629cb5a9e5a3439.json
+++ b/backend/.sqlx/query-dc60d43814e2b5220db648677dbb3656e27f1c962c2f0438e0cc06530661fbf8.json
@@ -1,17 +1,16 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT ws.datatable->'datatables'->$2 AS config\n            FROM workspace_settings ws\n            WHERE ws.workspace_id = $1\n        ",
+  "query": "\n            SELECT ws.datatable->'datatables' AS datatables\n            FROM workspace_settings ws\n            WHERE ws.workspace_id = $1\n        ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "config",
+        "name": "datatables",
         "type_info": "Jsonb"
       }
     ],
     "parameters": {
       "Left": [
-        "Text",
         "Text"
       ]
     },
@@ -19,5 +18,5 @@
       null
     ]
   },
-  "hash": "caf4dc1046769f410d1277cdd3747763e0d674e8a1d9f3512629cb5a9e5a3439"
+  "hash": "dc60d43814e2b5220db648677dbb3656e27f1c962c2f0438e0cc06530661fbf8"
 }
diff --git a/backend/.sqlx/query-deac41298e8b0d0870e314fef0813c24dd55d63bda78a0a5f35ed6f22bea6bef.json b/backend/.sqlx/query-deac41298e8b0d0870e314fef0813c24dd55d63bda78a0a5f35ed6f22bea6bef.json
deleted file mode 100644
index 67ce9d8719..0000000000
--- a/backend/.sqlx/query-deac41298e8b0d0870e314fef0813c24dd55d63bda78a0a5f35ed6f22bea6bef.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO resource\n            (workspace_id, path, value, description, resource_type, created_by, edited_at, labels)\n            VALUES ($1, $2, $3, $4, $5, $6, now(), $7) ON CONFLICT (workspace_id, path)\n            DO UPDATE SET value = EXCLUDED.value, description = EXCLUDED.description, resource_type = EXCLUDED.resource_type, edited_at = now(), labels = EXCLUDED.labels",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Text",
-        "Varchar",
-        "Varchar",
-        "TextArray"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "deac41298e8b0d0870e314fef0813c24dd55d63bda78a0a5f35ed6f22bea6bef"
-}
diff --git a/backend/.sqlx/query-e050734d7642b26f8859982c55ec2c8b1fc14a8de665b15a2f2dfd6e0b5b7fdf.json b/backend/.sqlx/query-e050734d7642b26f8859982c55ec2c8b1fc14a8de665b15a2f2dfd6e0b5b7fdf.json
new file mode 100644
index 0000000000..87cd891113
--- /dev/null
+++ b/backend/.sqlx/query-e050734d7642b26f8859982c55ec2c8b1fc14a8de665b15a2f2dfd6e0b5b7fdf.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (\n                        SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1\n                    )",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e050734d7642b26f8859982c55ec2c8b1fc14a8de665b15a2f2dfd6e0b5b7fdf"
+}
diff --git a/backend/.sqlx/query-e0a40d2aba02bd6c502d746471c9c14db8fcaaaf8e3c44fb5ea4ed763a1849dd.json b/backend/.sqlx/query-e0a40d2aba02bd6c502d746471c9c14db8fcaaaf8e3c44fb5ea4ed763a1849dd.json
new file mode 100644
index 0000000000..20ae255eb1
--- /dev/null
+++ b/backend/.sqlx/query-e0a40d2aba02bd6c502d746471c9c14db8fcaaaf8e3c44fb5ea4ed763a1849dd.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT a.policy::text as policy, a.versions[array_upper(a.versions, 1)] as version, av.raw_app as raw_app\n         FROM app a JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]\n         WHERE a.path = $1 AND a.workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "policy",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "version",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "raw_app",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      false
+    ]
+  },
+  "hash": "e0a40d2aba02bd6c502d746471c9c14db8fcaaaf8e3c44fb5ea4ed763a1849dd"
+}
diff --git a/backend/.sqlx/query-e17d7fb386ec45386401a20d97b50d224da5beb74d289fe17ea960887aa50f1a.json b/backend/.sqlx/query-e17d7fb386ec45386401a20d97b50d224da5beb74d289fe17ea960887aa50f1a.json
new file mode 100644
index 0000000000..c3db56398e
--- /dev/null
+++ b/backend/.sqlx/query-e17d7fb386ec45386401a20d97b50d224da5beb74d289fe17ea960887aa50f1a.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT DISTINCT ON (path) path AS \"path!\", content AS \"content!\"\n               FROM script\n               WHERE workspace_id = $1\n                 AND language = 'duckdb'::script_lang\n                 AND archived = false\n                 AND deleted = false\n                 AND path != $2\n               ORDER BY path, created_at DESC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "content!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "e17d7fb386ec45386401a20d97b50d224da5beb74d289fe17ea960887aa50f1a"
+}
diff --git a/backend/.sqlx/query-e1ada31c1625b453c2ff85edbcd7ad51a4cd5cbdc2fa34038530070d6a579455.json b/backend/.sqlx/query-e1ada31c1625b453c2ff85edbcd7ad51a4cd5cbdc2fa34038530070d6a579455.json
deleted file mode 100644
index f38c023cb3..0000000000
--- a/backend/.sqlx/query-e1ada31c1625b453c2ff85edbcd7ad51a4cd5cbdc2fa34038530070d6a579455.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "WITH potential AS (\n            SELECT email, operator FROM usr\n            UNION\n            SELECT email, operator FROM workspace_invite\n        ),\n        per_user AS (\n            SELECT email, bool_and(operator) AS only_operator FROM potential GROUP BY email\n        )\n        SELECT\n            COUNT(*) FILTER (WHERE NOT only_operator) AS \"authors!\",\n            COUNT(*) FILTER (WHERE only_operator) AS \"operators!\"\n        FROM per_user",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "authors!",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "operators!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null,
-      null
-    ]
-  },
-  "hash": "e1ada31c1625b453c2ff85edbcd7ad51a4cd5cbdc2fa34038530070d6a579455"
-}
diff --git a/backend/.sqlx/query-e26401ac6ecefe4e11306f2c714165d9a755102d1df51ffe63abf5900bcdb42c.json b/backend/.sqlx/query-e26401ac6ecefe4e11306f2c714165d9a755102d1df51ffe63abf5900bcdb42c.json
new file mode 100644
index 0000000000..4609e7adf4
--- /dev/null
+++ b/backend/.sqlx/query-e26401ac6ecefe4e11306f2c714165d9a755102d1df51ffe63abf5900bcdb42c.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM macro_definition WHERE workspace_id = $1 AND provider_path = $2) AS \"e!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "e!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "e26401ac6ecefe4e11306f2c714165d9a755102d1df51ffe63abf5900bcdb42c"
+}
diff --git a/backend/.sqlx/query-e27cc16414c181a055bf0666eb0cb16a356cb6be5c48f95b5ba200e7e6ab0efd.json b/backend/.sqlx/query-e27cc16414c181a055bf0666eb0cb16a356cb6be5c48f95b5ba200e7e6ab0efd.json
new file mode 100644
index 0000000000..37bd25eb98
--- /dev/null
+++ b/backend/.sqlx/query-e27cc16414c181a055bf0666eb0cb16a356cb6be5c48f95b5ba200e7e6ab0efd.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO fork_ducklake_namespace\n           (workspace_id, ducklake_name, metadata_schema, catalog, storage, storage_ref, data_path)\n         VALUES ($1, $2, $3, $4, $5, $6, $7)\n         ON CONFLICT (workspace_id, ducklake_name, catalog, storage, storage_ref, data_path)\n         DO UPDATE SET schema_dropped = false",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar",
+        "Text",
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e27cc16414c181a055bf0666eb0cb16a356cb6be5c48f95b5ba200e7e6ab0efd"
+}
diff --git a/backend/.sqlx/query-e4a46d47aee96473a2bd0f1dbdc819520a2ba987fd29859845c2177563ab8cfb.json b/backend/.sqlx/query-e4a46d47aee96473a2bd0f1dbdc819520a2ba987fd29859845c2177563ab8cfb.json
new file mode 100644
index 0000000000..18c75f5722
--- /dev/null
+++ b/backend/.sqlx/query-e4a46d47aee96473a2bd0f1dbdc819520a2ba987fd29859845c2177563ab8cfb.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT path, value FROM variable\n             WHERE workspace_id = $1 AND is_secret = true AND value != ''",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "value",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "e4a46d47aee96473a2bd0f1dbdc819520a2ba987fd29859845c2177563ab8cfb"
+}
diff --git a/backend/.sqlx/query-e4d71278fb80126a7a9da73f1889352d4d1e3cb3a8a08f1c9c03055a1cab1235.json b/backend/.sqlx/query-e4d71278fb80126a7a9da73f1889352d4d1e3cb3a8a08f1c9c03055a1cab1235.json
index 470c651020..a35373a959 100644
--- a/backend/.sqlx/query-e4d71278fb80126a7a9da73f1889352d4d1e3cb3a8a08f1c9c03055a1cab1235.json
+++ b/backend/.sqlx/query-e4d71278fb80126a7a9da73f1889352d4d1e3cb3a8a08f1c9c03055a1cab1235.json
@@ -191,7 +191,8 @@
                 "ci_test",
                 "github",
                 "azure",
-                "asset"
+                "asset",
+                "freshness"
               ]
             }
           }
diff --git a/backend/.sqlx/query-e50afd5156b07e550202fb9b33354dce71b37f89f68d78577b250979daa1a87d.json b/backend/.sqlx/query-e50afd5156b07e550202fb9b33354dce71b37f89f68d78577b250979daa1a87d.json
new file mode 100644
index 0000000000..121d7fe04a
--- /dev/null
+++ b/backend/.sqlx/query-e50afd5156b07e550202fb9b33354dce71b37f89f68d78577b250979daa1a87d.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT name, description, instructions FROM ai_skill WHERE workspace_id = $1 AND name = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "description",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "instructions",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "e50afd5156b07e550202fb9b33354dce71b37f89f68d78577b250979daa1a87d"
+}
diff --git a/backend/.sqlx/query-e50bce4bba01c90171973862bcfa088b5c0c1ad601146ff1c57d4a3ddc30556a.json b/backend/.sqlx/query-e50bce4bba01c90171973862bcfa088b5c0c1ad601146ff1c57d4a3ddc30556a.json
new file mode 100644
index 0000000000..8c80c14ea4
--- /dev/null
+++ b/backend/.sqlx/query-e50bce4bba01c90171973862bcfa088b5c0c1ad601146ff1c57d4a3ddc30556a.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT runnable_path AS \"runnable_path!\", created_by AS \"created_by!\",\n                  args AS \"args: sqlx::types::Json<serde_json::Value>\"\n             FROM v2_job\n             WHERE workspace_id = $1 AND trigger_kind = 'freshness'\n             ORDER BY created_at",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "runnable_path!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "created_by!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "args: sqlx::types::Json<serde_json::Value>",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      false,
+      true
+    ]
+  },
+  "hash": "e50bce4bba01c90171973862bcfa088b5c0c1ad601146ff1c57d4a3ddc30556a"
+}
diff --git a/backend/.sqlx/query-e5d8d46b9431033fa7572a880ee0e74e14afde3c02000a88e696d7b6adcad0d6.json b/backend/.sqlx/query-e5d8d46b9431033fa7572a880ee0e74e14afde3c02000a88e696d7b6adcad0d6.json
new file mode 100644
index 0000000000..d6c6a5c02f
--- /dev/null
+++ b/backend/.sqlx/query-e5d8d46b9431033fa7572a880ee0e74e14afde3c02000a88e696d7b6adcad0d6.json
@@ -0,0 +1,41 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT timestamp, name, code_up, code_down FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 ORDER BY timestamp ASC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "code_up",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "code_down",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "e5d8d46b9431033fa7572a880ee0e74e14afde3c02000a88e696d7b6adcad0d6"
+}
diff --git a/backend/.sqlx/query-e6a8ddfd74ebab55ede5989fd7d09b246b6f84e49c659bc8e2c7b66cfec6d976.json b/backend/.sqlx/query-e6a8ddfd74ebab55ede5989fd7d09b246b6f84e49c659bc8e2c7b66cfec6d976.json
deleted file mode 100644
index a1b52e81fd..0000000000
--- a/backend/.sqlx/query-e6a8ddfd74ebab55ede5989fd7d09b246b6f84e49c659bc8e2c7b66cfec6d976.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT status = 'success' AS \"success!\",\n                    result AS \"result: Json<Box<RawValue>>\",\n                    started_at AS \"started_at!\"FROM v2_job j JOIN v2_job_completed USING (id)\n                WHERE j.workspace_id = $1 AND trigger_kind = 'schedule' AND trigger = $2\n                    AND parent_job IS NULL\n                    AND runnable_path = $3\n                    AND j.id != $4\n                ORDER BY created_at DESC\n                LIMIT $5",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "success!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 1,
-        "name": "result: Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 2,
-        "name": "started_at!",
-        "type_info": "Timestamptz"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Text",
-        "Uuid",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null,
-      true,
-      true
-    ]
-  },
-  "hash": "e6a8ddfd74ebab55ede5989fd7d09b246b6f84e49c659bc8e2c7b66cfec6d976"
-}
diff --git a/backend/.sqlx/query-e82d854f3f8736a9ba7e2604ac505b693965f1bca6fef7418b19f98671c9204c.json b/backend/.sqlx/query-e82d854f3f8736a9ba7e2604ac505b693965f1bca6fef7418b19f98671c9204c.json
new file mode 100644
index 0000000000..4f0731f5e4
--- /dev/null
+++ b/backend/.sqlx/query-e82d854f3f8736a9ba7e2604ac505b693965f1bca6fef7418b19f98671c9204c.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO workspace_storage_usage (workspace_id, storage, bytes, computed_at)\n                     VALUES ($1, $2, $3, now())\n                     ON CONFLICT (workspace_id, storage) DO UPDATE SET bytes = $3, computed_at = now()",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e82d854f3f8736a9ba7e2604ac505b693965f1bca6fef7418b19f98671c9204c"
+}
diff --git a/backend/.sqlx/query-e99fe5cd3283f1701d3a361ef31869da89fd10099b76669b9526201c85f71f61.json b/backend/.sqlx/query-e99fe5cd3283f1701d3a361ef31869da89fd10099b76669b9526201c85f71f61.json
new file mode 100644
index 0000000000..29ce0c6f2c
--- /dev/null
+++ b/backend/.sqlx/query-e99fe5cd3283f1701d3a361ef31869da89fd10099b76669b9526201c85f71f61.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM ai_skill WHERE workspace_id = $1 AND name = $2 RETURNING name",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "e99fe5cd3283f1701d3a361ef31869da89fd10099b76669b9526201c85f71f61"
+}
diff --git a/backend/.sqlx/query-ea277c48e7966ab01d9b18e3c0e357033b999d8f3c23241e4c4053cc573f6ca2.json b/backend/.sqlx/query-ea277c48e7966ab01d9b18e3c0e357033b999d8f3c23241e4c4053cc573f6ca2.json
new file mode 100644
index 0000000000..f236c2aae0
--- /dev/null
+++ b/backend/.sqlx/query-ea277c48e7966ab01d9b18e3c0e357033b999d8f3c23241e4c4053cc573f6ca2.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO v2_job_debounce_batch (id, debounce_batch, consumed_at) VALUES\n                ($1, nextval('debounce_batch_seq'), now() - interval '20 minutes'),\n                ($2, nextval('debounce_batch_seq'), now() - interval '1 minute'),\n                ($3, nextval('debounce_batch_seq'), NULL),\n                ($4, nextval('debounce_batch_seq'), now() - interval '20 minutes')",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Uuid",
+        "Uuid",
+        "Uuid"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "ea277c48e7966ab01d9b18e3c0e357033b999d8f3c23241e4c4053cc573f6ca2"
+}
diff --git a/backend/.sqlx/query-ebce1633afe3d3f8a1a68bc8d26adcdd88b137bb892437a3ca67fd716772512b.json b/backend/.sqlx/query-ebce1633afe3d3f8a1a68bc8d26adcdd88b137bb892437a3ca67fd716772512b.json
new file mode 100644
index 0000000000..1930427b94
--- /dev/null
+++ b/backend/.sqlx/query-ebce1633afe3d3f8a1a68bc8d26adcdd88b137bb892437a3ca67fd716772512b.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n            COUNT(*) FILTER (WHERE NOT operator AND NOT disabled AND NOT is_service_account) AS \"developers!\",\n            COUNT(*) FILTER (WHERE operator AND NOT disabled AND NOT is_service_account) AS \"operators!\"\n        FROM usr WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "developers!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "operators!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "ebce1633afe3d3f8a1a68bc8d26adcdd88b137bb892437a3ca67fd716772512b"
+}
diff --git a/backend/.sqlx/query-ec8e502f9c2926e578e02cd164a7a3e43ef12b97d55353f86a9a368617efccca.json b/backend/.sqlx/query-ec8e502f9c2926e578e02cd164a7a3e43ef12b97d55353f86a9a368617efccca.json
new file mode 100644
index 0000000000..fbcf0743be
--- /dev/null
+++ b/backend/.sqlx/query-ec8e502f9c2926e578e02cd164a7a3e43ef12b97d55353f86a9a368617efccca.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE workspace_settings SET datatable = jsonb_set(datatable, ARRAY['datatables', $2::text, 'migrations_enabled'], 'true'::jsonb) WHERE workspace_id = $1 AND jsonb_exists(datatable->'datatables', $2) RETURNING 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "ec8e502f9c2926e578e02cd164a7a3e43ef12b97d55353f86a9a368617efccca"
+}
diff --git a/backend/.sqlx/query-ef9caf3da759ee6059922632cdf1fdf5c006554a70a322ca8d3449cdba7840db.json b/backend/.sqlx/query-ef9caf3da759ee6059922632cdf1fdf5c006554a70a322ca8d3449cdba7840db.json
new file mode 100644
index 0000000000..dd7f4da810
--- /dev/null
+++ b/backend/.sqlx/query-ef9caf3da759ee6059922632cdf1fdf5c006554a70a322ca8d3449cdba7840db.json
@@ -0,0 +1,41 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT a.path, a.policy::text as policy, a.versions[array_upper(a.versions, 1)] as version, av.raw_app as raw_app\n         FROM app a JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]\n         WHERE a.id = $1 AND a.workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "policy",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "version",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "raw_app",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      null,
+      false
+    ]
+  },
+  "hash": "ef9caf3da759ee6059922632cdf1fdf5c006554a70a322ca8d3449cdba7840db"
+}
diff --git a/backend/.sqlx/query-d2a9e6a31bab0551d32093b1afe4e5d414cf439e4db3325b5bf6bbeb86c5bd2a.json b/backend/.sqlx/query-f0213dffe64fb16ee2d1f6bf5a37dc373175ae0ad54a0a49dca011f7cef4c5c3.json
similarity index 55%
rename from backend/.sqlx/query-d2a9e6a31bab0551d32093b1afe4e5d414cf439e4db3325b5bf6bbeb86c5bd2a.json
rename to backend/.sqlx/query-f0213dffe64fb16ee2d1f6bf5a37dc373175ae0ad54a0a49dca011f7cef4c5c3.json
index 4b96e7005b..84a2320a80 100644
--- a/backend/.sqlx/query-d2a9e6a31bab0551d32093b1afe4e5d414cf439e4db3325b5bf6bbeb86c5bd2a.json
+++ b/backend/.sqlx/query-f0213dffe64fb16ee2d1f6bf5a37dc373175ae0ad54a0a49dca011f7cef4c5c3.json
@@ -1,15 +1,23 @@
 {
   "db_name": "PostgreSQL",
-  "query": "WITH to_delete AS (\n            SELECT id FROM v2_job_queue\n                JOIN v2_job j USING (id)\n            WHERE trigger_kind = 'schedule'\n                AND trigger = $1\n                AND j.workspace_id = $2\n                AND flow_step_id IS NULL\n                AND running = false\n            FOR UPDATE\n        ), deleted AS (\n            DELETE FROM v2_job_queue\n            WHERE id IN (SELECT id FROM to_delete)\n            RETURNING id\n        ) DELETE FROM v2_job WHERE id IN (SELECT id FROM deleted)",
+  "query": "WITH to_delete AS (\n            SELECT id FROM v2_job_queue\n                JOIN v2_job j USING (id)\n            WHERE trigger_kind = 'schedule'\n                AND trigger = $1\n                AND j.workspace_id = $2\n                AND flow_step_id IS NULL\n                AND running = false\n            FOR UPDATE\n        )\n        DELETE FROM v2_job_queue\n        WHERE id IN (SELECT id FROM to_delete)\n        RETURNING id",
   "describe": {
-    "columns": [],
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      }
+    ],
     "parameters": {
       "Left": [
         "Text",
         "Text"
       ]
     },
-    "nullable": []
+    "nullable": [
+      false
+    ]
   },
-  "hash": "d2a9e6a31bab0551d32093b1afe4e5d414cf439e4db3325b5bf6bbeb86c5bd2a"
+  "hash": "f0213dffe64fb16ee2d1f6bf5a37dc373175ae0ad54a0a49dca011f7cef4c5c3"
 }
diff --git a/backend/.sqlx/query-f04f84ac63e98566311245a40a8dd83166a32ae4370a4f1ca622b8535c930ea2.json b/backend/.sqlx/query-f04f84ac63e98566311245a40a8dd83166a32ae4370a4f1ca622b8535c930ea2.json
new file mode 100644
index 0000000000..1039dd3950
--- /dev/null
+++ b/backend/.sqlx/query-f04f84ac63e98566311245a40a8dd83166a32ae4370a4f1ca622b8535c930ea2.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH dk AS (\n                INSERT INTO debounce_key (job_id, key)\n                VALUES ($1, $2)\n                ON CONFLICT (key)\n                DO UPDATE SET\n                    previous_job_id = CASE WHEN EXISTS\n                        (SELECT 1 FROM v2_job_queue q WHERE q.id = debounce_key.job_id AND q.running)\n                        THEN NULL ELSE debounce_key.job_id END,\n                    job_id = EXCLUDED.job_id,\n                    debounced_times = CASE WHEN EXISTS\n                        (SELECT 1 FROM v2_job_queue q WHERE q.id = debounce_key.job_id AND q.running)\n                        THEN 0 ELSE debounce_key.debounced_times + 1 END,\n                    first_started_at = CASE WHEN EXISTS\n                        (SELECT 1 FROM v2_job_queue q WHERE q.id = debounce_key.job_id AND q.running)\n                        THEN now() ELSE debounce_key.first_started_at END\n                RETURNING debounced_times, first_started_at, previous_job_id AS job_id_to_debounce\n            ), _batch AS (\n                INSERT INTO v2_job_debounce_batch (id, debounce_batch)\n                SELECT $1, COALESCE(\n                    (SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = dk.job_id_to_debounce LIMIT 1),\n                    nextval('debounce_batch_seq'))\n                FROM dk\n            )\n            SELECT debounced_times, first_started_at, job_id_to_debounce FROM dk\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "debounced_times",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "first_started_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 2,
+        "name": "job_id_to_debounce",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Varchar"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "f04f84ac63e98566311245a40a8dd83166a32ae4370a4f1ca622b8535c930ea2"
+}
diff --git a/backend/.sqlx/query-f1f79711f131ff4116489153db1b71e528c66fab1508e5c41b63bc5b9077a08c.json b/backend/.sqlx/query-f1f79711f131ff4116489153db1b71e528c66fab1508e5c41b63bc5b9077a08c.json
new file mode 100644
index 0000000000..844dfb3e47
--- /dev/null
+++ b/backend/.sqlx/query-f1f79711f131ff4116489153db1b71e528c66fab1508e5c41b63bc5b9077a08c.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO resource\n                (workspace_id, path, value, description, resource_type, created_by, edited_at, labels)\n                VALUES ($1, $2, $3, $4, $5, $6, now(), $7) ON CONFLICT (workspace_id, path)\n                DO UPDATE SET value = EXCLUDED.value, description = EXCLUDED.description, resource_type = EXCLUDED.resource_type, edited_at = now(), labels = EXCLUDED.labels",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Jsonb",
+        "Text",
+        "Varchar",
+        "Varchar",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f1f79711f131ff4116489153db1b71e528c66fab1508e5c41b63bc5b9077a08c"
+}
diff --git a/backend/.sqlx/query-f26cde14890cc754e04341264c4dba01f2f3a02bb36a8d7c20e1990dc81e0472.json b/backend/.sqlx/query-f26cde14890cc754e04341264c4dba01f2f3a02bb36a8d7c20e1990dc81e0472.json
new file mode 100644
index 0000000000..8257722c5c
--- /dev/null
+++ b/backend/.sqlx/query-f26cde14890cc754e04341264c4dba01f2f3a02bb36a8d7c20e1990dc81e0472.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) AS \"count!\" FROM pipeline_freshness_state WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "f26cde14890cc754e04341264c4dba01f2f3a02bb36a8d7c20e1990dc81e0472"
+}
diff --git a/backend/.sqlx/query-a72e7fb55d7268fe1ea40015a4a84b12dd961ba732772d8f6c59d18fe05f285d.json b/backend/.sqlx/query-f2760b688a907e7679106aaa2c2063385785f7c2e97364bc04392df11cf364d7.json
similarity index 64%
rename from backend/.sqlx/query-a72e7fb55d7268fe1ea40015a4a84b12dd961ba732772d8f6c59d18fe05f285d.json
rename to backend/.sqlx/query-f2760b688a907e7679106aaa2c2063385785f7c2e97364bc04392df11cf364d7.json
index af4ada67f2..84eb4caba9 100644
--- a/backend/.sqlx/query-a72e7fb55d7268fe1ea40015a4a84b12dd961ba732772d8f6c59d18fe05f285d.json
+++ b/backend/.sqlx/query-f2760b688a907e7679106aaa2c2063385785f7c2e97364bc04392df11cf364d7.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT EXISTS (\n                SELECT 1 FROM v2_job_completed c JOIN v2_job j USING (id)\n                WHERE j.workspace_id = $2\n                    AND (j.kind = 'appscript' OR j.kind = 'preview')\n                    AND j.created_by = 'anonymous'\n                    AND c.started_at > now() - interval '3 hours'\n                    AND j.runnable_path LIKE $3 || '/%'\n                    AND c.result @> ('{\"s3\":\"' || $1 ||  '\"}')::jsonb\n            )",
+  "query": "SELECT EXISTS (\n                SELECT 1 FROM v2_job_completed c JOIN v2_job j USING (id)\n                WHERE j.workspace_id = $2\n                    AND (j.kind = 'appscript' OR j.kind = 'preview')\n                    AND j.created_by = $4\n                    AND c.started_at > now() - interval '3 hours'\n                    AND j.runnable_path LIKE $3 || '/%'\n                    AND c.result @> ('{\"s3\":\"' || $1 ||  '\"}')::jsonb\n            )",
   "describe": {
     "columns": [
       {
@@ -11,6 +11,7 @@
     ],
     "parameters": {
       "Left": [
+        "Text",
         "Text",
         "Text",
         "Text"
@@ -20,5 +21,5 @@
       null
     ]
   },
-  "hash": "a72e7fb55d7268fe1ea40015a4a84b12dd961ba732772d8f6c59d18fe05f285d"
+  "hash": "f2760b688a907e7679106aaa2c2063385785f7c2e97364bc04392df11cf364d7"
 }
diff --git a/backend/.sqlx/query-f3fef6964a211872b01c984b19192da8ee231c772f88dd9145f01d7cf3b8f8c1.json b/backend/.sqlx/query-f3fef6964a211872b01c984b19192da8ee231c772f88dd9145f01d7cf3b8f8c1.json
new file mode 100644
index 0000000000..7049fafe37
--- /dev/null
+++ b/backend/.sqlx/query-f3fef6964a211872b01c984b19192da8ee231c772f88dd9145f01d7cf3b8f8c1.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO asset (workspace_id, path, kind, usage_access_type, usage_path, usage_kind, columns)\n         SELECT $2, path, kind, usage_access_type, usage_path, usage_kind, columns\n         FROM asset WHERE workspace_id = $1 AND usage_kind IN ('script', 'flow')",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f3fef6964a211872b01c984b19192da8ee231c772f88dd9145f01d7cf3b8f8c1"
+}
diff --git a/backend/.sqlx/query-f44595adab2d127c83f9829b74429dcb7e5f2513bc59c2bdf7dd0be1864cd2c5.json b/backend/.sqlx/query-f44595adab2d127c83f9829b74429dcb7e5f2513bc59c2bdf7dd0be1864cd2c5.json
new file mode 100644
index 0000000000..81b34464f4
--- /dev/null
+++ b/backend/.sqlx/query-f44595adab2d127c83f9829b74429dcb7e5f2513bc59c2bdf7dd0be1864cd2c5.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO debounce_key (job_id, key)\n            VALUES ($1, $2)\n            ON CONFLICT (key)\n            DO UPDATE SET\n                previous_job_id = CASE WHEN EXISTS\n                    (SELECT 1 FROM v2_job_queue q WHERE q.id = debounce_key.job_id AND q.running)\n                    THEN NULL ELSE debounce_key.job_id END,\n                job_id = EXCLUDED.job_id,\n                debounced_times = CASE WHEN EXISTS\n                    (SELECT 1 FROM v2_job_queue q WHERE q.id = debounce_key.job_id AND q.running)\n                    THEN 0 ELSE debounce_key.debounced_times + 1 END,\n                first_started_at = CASE WHEN EXISTS\n                    (SELECT 1 FROM v2_job_queue q WHERE q.id = debounce_key.job_id AND q.running)\n                    THEN now() ELSE debounce_key.first_started_at END\n            RETURNING debounced_times, first_started_at, previous_job_id AS job_id_to_debounce\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "debounced_times",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "first_started_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 2,
+        "name": "job_id_to_debounce",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Varchar"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "f44595adab2d127c83f9829b74429dcb7e5f2513bc59c2bdf7dd0be1864cd2c5"
+}
diff --git a/backend/.sqlx/query-f629c27daf692d7055fa299edaae110a5d6dcdc65aa293b1a15d67dee5308ddc.json b/backend/.sqlx/query-f629c27daf692d7055fa299edaae110a5d6dcdc65aa293b1a15d67dee5308ddc.json
new file mode 100644
index 0000000000..9e32600de9
--- /dev/null
+++ b/backend/.sqlx/query-f629c27daf692d7055fa299edaae110a5d6dcdc65aa293b1a15d67dee5308ddc.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO macro_usage (workspace_id, consumer_path, macro_name) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f629c27daf692d7055fa299edaae110a5d6dcdc65aa293b1a15d67dee5308ddc"
+}
diff --git a/backend/.sqlx/query-f68466d64684bf4f6542a345b9cff8553575fe3c17a060e271b381b40b4fb645.json b/backend/.sqlx/query-f68466d64684bf4f6542a345b9cff8553575fe3c17a060e271b381b40b4fb645.json
new file mode 100644
index 0000000000..132d1da5a1
--- /dev/null
+++ b/backend/.sqlx/query-f68466d64684bf4f6542a345b9cff8553575fe3c17a060e271b381b40b4fb645.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH ids AS (SELECT id FROM v2_job WHERE workspace_id = $1),\n              _de AS (DELETE FROM dispatch_event WHERE workspace_id = $1),\n              _fc AS (DELETE FROM flow_conversation_message WHERE job_id IN (SELECT id FROM ids))\n         DELETE FROM zombie_job_counter WHERE job_id IN (SELECT id FROM ids)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f68466d64684bf4f6542a345b9cff8553575fe3c17a060e271b381b40b4fb645"
+}
diff --git a/backend/.sqlx/query-f89b024949f29eb5142744635914b94fd84c1bb64e9659f798df2888848894bd.json b/backend/.sqlx/query-f89b024949f29eb5142744635914b94fd84c1bb64e9659f798df2888848894bd.json
new file mode 100644
index 0000000000..8a6d989157
--- /dev/null
+++ b/backend/.sqlx/query-f89b024949f29eb5142744635914b94fd84c1bb64e9659f798df2888848894bd.json
@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT datatable, timestamp, name, code_up, code_down FROM datatable_migrations WHERE workspace_id = $1 ORDER BY datatable, timestamp",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "datatable",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "code_up",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "code_down",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "f89b024949f29eb5142744635914b94fd84c1bb64e9659f798df2888848894bd"
+}
diff --git a/backend/.sqlx/query-fa04b3660f1f90c39c3d12f39c51df8f25a3bdae60aeaed313612cb858040c8d.json b/backend/.sqlx/query-fa04b3660f1f90c39c3d12f39c51df8f25a3bdae60aeaed313612cb858040c8d.json
new file mode 100644
index 0000000000..7f967b60a5
--- /dev/null
+++ b/backend/.sqlx/query-fa04b3660f1f90c39c3d12f39c51df8f25a3bdae60aeaed313612cb858040c8d.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM ws_specific WHERE workspace_id = $1 AND item_kind = $2 AND path = $3",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fa04b3660f1f90c39c3d12f39c51df8f25a3bdae60aeaed313612cb858040c8d"
+}
diff --git a/backend/.sqlx/query-fbd1b02b9bbf86e17d6ee0da3e9b134780e55a521a5cee8eb657b67bbd4b2588.json b/backend/.sqlx/query-fbd1b02b9bbf86e17d6ee0da3e9b134780e55a521a5cee8eb657b67bbd4b2588.json
new file mode 100644
index 0000000000..ad17a60330
--- /dev/null
+++ b/backend/.sqlx/query-fbd1b02b9bbf86e17d6ee0da3e9b134780e55a521a5cee8eb657b67bbd4b2588.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "DELETE FROM fork_ducklake_namespace\n             WHERE workspace_id = $1 AND ducklake_name = $2 AND catalog = $3\n               AND storage = $4 AND storage_ref = $5 AND data_path = $6",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fbd1b02b9bbf86e17d6ee0da3e9b134780e55a521a5cee8eb657b67bbd4b2588"
+}
diff --git a/backend/.sqlx/query-fc1663ecda7167dc12c0fd5a206cbddf85e55f6c7ef226cdd66e025c002bac98.json b/backend/.sqlx/query-fc1663ecda7167dc12c0fd5a206cbddf85e55f6c7ef226cdd66e025c002bac98.json
new file mode 100644
index 0000000000..626c541556
--- /dev/null
+++ b/backend/.sqlx/query-fc1663ecda7167dc12c0fd5a206cbddf85e55f6c7ef226cdd66e025c002bac98.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) FROM workspace WHERE id != 'admins' AND deleted = true",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "fc1663ecda7167dc12c0fd5a206cbddf85e55f6c7ef226cdd66e025c002bac98"
+}
diff --git a/backend/.sqlx/query-fc4583d1570f3a2a428bb28390ca72e61719fae68aa4b42730f9076f3bd97441.json b/backend/.sqlx/query-fc4583d1570f3a2a428bb28390ca72e61719fae68aa4b42730f9076f3bd97441.json
new file mode 100644
index 0000000000..484dd23e2a
--- /dev/null
+++ b/backend/.sqlx/query-fc4583d1570f3a2a428bb28390ca72e61719fae68aa4b42730f9076f3bd97441.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT req.id AS \"id!\",\n                (CASE\n                    WHEN usr.email IS NULL THEN 'deleted'\n                    WHEN workspace.deleted THEN 'archived'\n                    ELSE 'active'\n                END) AS \"status!\"\n         FROM unnest($1::text[]) AS req(id)\n         LEFT JOIN workspace ON workspace.id = req.id\n         LEFT JOIN usr ON usr.workspace_id = workspace.id AND usr.email = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "status!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null,
+      null
+    ]
+  },
+  "hash": "fc4583d1570f3a2a428bb28390ca72e61719fae68aa4b42730f9076f3bd97441"
+}
diff --git a/backend/.sqlx/query-fc59d9b911529de75c466593252358581f5716b3b58dc2e6b9b9282c50b1b66b.json b/backend/.sqlx/query-fc59d9b911529de75c466593252358581f5716b3b58dc2e6b9b9282c50b1b66b.json
new file mode 100644
index 0000000000..1efaaa32e8
--- /dev/null
+++ b/backend/.sqlx/query-fc59d9b911529de75c466593252358581f5716b3b58dc2e6b9b9282c50b1b66b.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job SET labels = (\n                SELECT array_agg(DISTINCT l)\n                FROM unnest(coalesce(labels, ARRAY[]::TEXT[]) || $2) l\n            ) WHERE id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "TextArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fc59d9b911529de75c466593252358581f5716b3b58dc2e6b9b9282c50b1b66b"
+}
diff --git a/backend/.sqlx/query-fcb0cf55f5c9047066a6fdd62bf6f85238cbf189ccf18191493d6357e269d12d.json b/backend/.sqlx/query-fcb0cf55f5c9047066a6fdd62bf6f85238cbf189ccf18191493d6357e269d12d.json
new file mode 100644
index 0000000000..c630f5dd05
--- /dev/null
+++ b/backend/.sqlx/query-fcb0cf55f5c9047066a6fdd62bf6f85238cbf189ccf18191493d6357e269d12d.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT timestamp, name, code_up FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 ORDER BY timestamp ASC",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "code_up",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "fcb0cf55f5c9047066a6fdd62bf6f85238cbf189ccf18191493d6357e269d12d"
+}
diff --git a/backend/.sqlx/query-fd023a9365388f1f74423416bd8790770c32716ef953a2ea4af17d122d0a3b3c.json b/backend/.sqlx/query-fd023a9365388f1f74423416bd8790770c32716ef953a2ea4af17d122d0a3b3c.json
new file mode 100644
index 0000000000..5ac11c6a5e
--- /dev/null
+++ b/backend/.sqlx/query-fd023a9365388f1f74423416bd8790770c32716ef953a2ea4af17d122d0a3b3c.json
@@ -0,0 +1,44 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT to_char(timestamp AT TIME ZONE 'UTC', 'YYYY-MM-DD') AS \"day!\",\n                      id AS \"id!\",\n                      timestamp AS \"ts!\",\n                      row_to_json(r)::text AS \"line!\"\n               FROM (\n                   SELECT workspace_id, id, timestamp, username, operation,\n                          action_kind::text AS action_kind, resource, parameters, email, span\n                   FROM audit_partitioned\n                   WHERE timestamp >= $1 AND timestamp < $2\n                     AND (timestamp, id) > ($3, $4)\n                   ORDER BY timestamp, id\n                   LIMIT $5\n               ) r\n               ORDER BY timestamp, id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "day!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "id!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "ts!",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 3,
+        "name": "line!",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Timestamptz",
+        "Timestamptz",
+        "Timestamptz",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null,
+      false,
+      false,
+      null
+    ]
+  },
+  "hash": "fd023a9365388f1f74423416bd8790770c32716ef953a2ea4af17d122d0a3b3c"
+}
diff --git a/backend/CLAUDE.md b/backend/CLAUDE.md
index 9ff2c0be90..24cf2cb837 100644
--- a/backend/CLAUDE.md
+++ b/backend/CLAUDE.md
@@ -6,3 +6,57 @@
 - **DB schema**: `backend/summarized_schema.txt`
 - **API routes entry point**: `windmill-api/src/lib.rs`
 - **OpenAPI spec**: `windmill-api/openapi.yaml`
+- **DuckDB local jobs**: build the dynamic FFI library before running DuckDB scripts locally:
+  ```bash
+  cd backend/windmill-duckdb-ffi-internal && ./build_dev.sh
+  ```
+  Re-run after clean builds or when `target/debug/libwindmill_duckdb_ffi_internal.*` is missing.
+  The bundled DuckDB compile (~2min) is cached in a per-user dir shared across
+  worktrees (keyed by the crate's `Cargo.lock`), so a fresh worktree reuses it and
+  the build is near-instant — you don't pay the full compile per worktree. Editing
+  the FFI crate's own source falls back to an isolated per-worktree `./target`.
+- **Running data pipelines (DuckLake) from source**: see the section below — a plain build
+  advertises the `duckdb` tag but cannot execute DuckDB scripts and has no working S3 proxy.
+
+## Running data pipelines (DuckLake) from source
+
+DuckLake pipelines need **both** the right cargo features **and** the prebuilt DuckDB FFI. A
+plain `cargo run` (or `cargo run --features quickjs`) does **not** suffice, and the failure modes
+are silent-ish, so agents lose time. Verify feature names against `backend/Cargo.toml` `[features]`.
+
+**Feature sets** (run from `backend/`):
+
+| Goal | Command |
+|---|---|
+| CE DuckLake (DuckDB scripts + S3 proxy) | `cargo run --features quickjs,duckdb,parquet,private` |
+| + Python scripts | add `,python` |
+| EE features (WAP, partitioning, forks, …) | add `,enterprise,license` |
+
+`enterprise` already pulls in `license`, but list both when you want the license-gated paths.
+`quickjs` is for JS eval, not DuckLake per se — keep it if your baseline build had it.
+
+**Before running any DuckDB script**, build the FFI (see the bullet above):
+`cd backend/windmill-duckdb-ffi-internal && ./build_dev.sh`.
+
+**Two gotchas that a wrong feature set produces:**
+
+1. **`duckdb` tag advertised, feature missing.** The `duckdb` worker tag is in the *unconditional*
+   default tag list (`windmill-common/src/worker.rs`, `DEFAULT_TAGS`), so a worker advertises it even
+   without the `duckdb` feature. Jobs then dispatch but fail at execution with
+   `"Duck DB requires the duckdb feature to be enabled"` (`windmill-worker/src/worker.rs`). Fix:
+   compile with `--features duckdb`.
+2. **DuckLake writes 404 (no S3 proxy).** The workspace S3 proxy (`/w/{ws}/s3_proxy/*`) that
+   DuckLake uses for reads/writes only mounts the real service under
+   `#[cfg(all(feature = "private", feature = "parquet"))]` (`windmill-api/src/s3_proxy_oss.rs`);
+   otherwise it's an empty router and every proxied request 404s. Fix: compile with **both**
+   `private` and `parquet`.
+
+## Cloud vs self-hosted gating
+
+The `cloud` cargo feature is compiled into **all** EE builds, so `#[cfg(feature = "cloud")]` is **not** a "cloud-only" runtime gate — it only means the code is present. The real gate for behavior specific to the managed cloud (app.windmill.dev) is the runtime flag `*CLOUD_HOSTED` (`windmill_common::worker::CLOUD_HOSTED`, from the `CLOUD_HOSTED` env var; note it's loaded from `.env` via `dotenv`, so it won't show in `/proc/<pid>/environ` — check the running behavior, not the exec env).
+
+Cloud-only logic must be behind `if *CLOUD_HOSTED { ... }`: feature-gate the helper so it compiles, then **runtime-gate the call**. `#[cfg(feature = "cloud")]` on its own is only sufficient for:
+- pure helper/struct definitions (they only run when a gated caller invokes them),
+- code already inside an `if *CLOUD_HOSTED { ... }` block,
+- handlers that early-return on `!*CLOUD_HOSTED`,
+- idempotent no-ops that are harmless off-cloud (e.g. cache invalidation).
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 367c17e912..8a6ff9ad53 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -180,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "ar_archive_writer"
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.9.1"
+version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
+checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
 dependencies = [
  "rustversion",
 ]
@@ -237,9 +237,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 
 [[package]]
 name = "arrow"
@@ -517,7 +517,7 @@ dependencies = [
  "futures-core",
  "libc",
  "portable-atomic",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "tokio",
  "tokio-stream",
  "xattr",
@@ -775,9 +775,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.17.0"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00"
+checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -785,14 +785,15 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4"
+checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
 dependencies = [
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
+ "pkg-config",
 ]
 
 [[package]]
@@ -1530,7 +1531,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "shlex 1.3.0",
  "syn 2.0.118",
 ]
@@ -1550,7 +1551,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "shlex 1.3.0",
  "syn 2.0.118",
 ]
@@ -1826,13 +1827,13 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
 dependencies = [
  "memchr",
  "regex-automata",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1855,9 +1856,9 @@ dependencies = [
 
 [[package]]
 name = "byte-unit"
-version = "5.2.3"
+version = "5.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bcaa4a0975bed4a760af3efe4368825098ce5f9d37a30c5a021d635dc63d8f"
+checksum = "4a813de7f2bbedb7dce265b64f1cf5908ebe4d56281ece8d847e98113788b9b0"
 dependencies = [
  "rust_decimal",
  "schemars 1.2.1",
@@ -1915,9 +1916,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 dependencies = [
  "serde",
 ]
@@ -2056,9 +2057,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.64"
+version = "1.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
+checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -2101,9 +2102,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chacha20"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.3.0",
@@ -2445,9 +2446,9 @@ dependencies = [
 
 [[package]]
 name = "crc-any"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62ec9ff5f7965e4d7280bd5482acd20aadb50d632cf6c1d74493856b011fa73"
+checksum = "46db9f663dfb869b80fcf59e32d7a80fc6c464a4f6328f3f06a00f5e36d05f8c"
 dependencies = [
  "debug-helper",
 ]
@@ -2490,18 +2491,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -2509,27 +2510,27 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "crossterm_winapi"
@@ -2601,9 +2602,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.89+curl-8.20.0"
+version = "0.4.90+curl-8.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d680779285438f2d0927485973ab45b212ea990bddb80de8a55a1e3c1d9ba22"
+checksum = "97799a0d220bfb3361e0fe4936966ff8c4b24d65c3f06dfc70d7b680b44e7897"
 dependencies = [
  "cc",
  "libc",
@@ -3412,9 +3413,9 @@ checksum = "c286de4e81ea2590afc24d754e0f83810c566f50a1388fa75ebd57928c0d9745"
 
 [[package]]
 name = "debug-helper"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
+checksum = "80a4af69c60438a1a82af89d362f4729fd38db7b73f305a237636fad31ceb2bf"
 
 [[package]]
 name = "debugid"
@@ -4211,7 +4212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf592ae6a864437e98ef9c6ae7936b822077e9d038a3a48ee081ab92313afad4"
 dependencies = [
  "num-bigint",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
@@ -4371,18 +4372,18 @@ dependencies = [
 
 [[package]]
 name = "enum-ordinalize"
-version = "4.3.2"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0"
+checksum = "07f808d588c10e464ea6f7d3eaed500049eff30aaac103460f61828c2d65b3eb"
 dependencies = [
  "enum-ordinalize-derive",
 ]
 
 [[package]]
 name = "enum-ordinalize-derive"
-version = "4.3.2"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
+checksum = "42e528e2d34ba8a67a1a650b86beae8ef69fc5fdb638016f386b973226590432"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5071,9 +5072,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -5233,9 +5236,9 @@ dependencies = [
 
 [[package]]
 name = "gosyn"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c99c1502d84229dc7ddb6af755f40ebe80e7e932fa78ecef979cedcf9999ba93"
+checksum = "fed1657682b1c3f63ece1fe5b60fc6c5f5923612a20d19f6af38ce79eaf361e3"
 dependencies = [
  "anyhow",
  "strum",
@@ -5552,7 +5555,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "new_debug_unreachable",
  "once_cell",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "triomphe",
 ]
 
@@ -5660,9 +5663,9 @@ dependencies = [
 
 [[package]]
 name = "humantime"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15"
 
 [[package]]
 name = "hyper"
@@ -5712,9 +5715,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-http-proxy"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad4b0a1e37510028bc4ba81d0e38d239c39671b0f0ce9e02dfa93a8133f7c08"
+checksum = "8021e0ae20c08eadc94d0bdafdeda66d4f0858541c146ae6e46b219bfe58497e"
 dependencies = [
  "bytes",
  "futures-util",
@@ -5726,7 +5729,6 @@ dependencies = [
  "hyper-util",
  "native-tls",
  "pin-project-lite",
- "rustls-native-certs 0.7.3",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.26.4",
@@ -6086,9 +6088,9 @@ dependencies = [
 
 [[package]]
 name = "io-uring"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d09b98f7eace8982db770e4408e7470b028ce513ac28fecdc6bf4c30fe92b62"
+checksum = "9080b15e63775b9a2ac7dca720f7050a8b955e092ea0f6020a4a80f69998cdc0"
 dependencies = [
  "bitflags 2.13.0",
  "cfg-if",
@@ -6235,11 +6237,11 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "libc",
 ]
 
@@ -6627,14 +6629,14 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
  "bitflags 2.13.0",
  "libc",
  "plain",
- "redox_syscall 0.8.1",
+ "redox_syscall 0.9.0",
 ]
 
 [[package]]
@@ -6715,9 +6717,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "loom"
@@ -7040,15 +7042,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "memmap2"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
 dependencies = [
  "libc",
  "stable_deref_trait",
@@ -7246,7 +7248,7 @@ dependencies = [
  "native-tls",
  "pem 3.0.6",
  "percent-encoding",
- "rand 0.10.1",
+ "rand 0.10.2",
  "serde",
  "socket2 0.6.4",
  "thiserror 2.0.18",
@@ -7563,9 +7565,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -7626,11 +7628,10 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -8361,9 +8362,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.6"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
+checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9"
 dependencies = [
  "memchr",
  "ucd-trie",
@@ -8371,9 +8372,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.8.6"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77"
+checksum = "4b4254325ecad416ab689e27ba51da03ba01a9632bc6e108f5fe7c3c4ad29d58"
 dependencies = [
  "pest",
  "pest_generator",
@@ -8381,9 +8382,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.6"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f"
+checksum = "6c4c0e91ead7a8f7acecbca6f003fc2e8282b1dbe2dd9c9d2f16aba42995e0a7"
 dependencies = [
  "pest",
  "pest_meta",
@@ -8394,12 +8395,11 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.8.6"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220"
+checksum = "f9744bc48116fee06334924bb5f2bad41eed5e89bd26e29b0b799f9a3f82c210"
 dependencies = [
  "pest",
- "sha2 0.10.9",
 ]
 
 [[package]]
@@ -8914,9 +8914,9 @@ dependencies = [
 
 [[package]]
 name = "pulp"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e205bb30d5b916c55e584c22201771bcf2bad9aabd5d4127f38387140c38632"
+checksum = "046aa45b989642ec2e4717c8e72d677b13edd831a4d3b6cf37d9a3e54912496a"
 dependencies = [
  "bytemuck",
  "cfg-if",
@@ -8931,9 +8931,9 @@ dependencies = [
 
 [[package]]
 name = "pulp-wasm-simd-flag"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40e24eee682d89fb193496edf918a7f407d30175b2e785fe057e4392dfd182e0"
+checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740"
 
 [[package]]
 name = "pure-rust-locales"
@@ -8963,28 +8963,28 @@ dependencies = [
 
 [[package]]
 name = "quick_cache"
-version = "0.6.23"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3db184a8b66cfe87f0263a1de147a6b554c864d1767c6f7fa4eb0e5497b565"
+checksum = "403c1a912fec895cafb223201e368234842acb9220aaf08ab042ae89ba5f135c"
 dependencies = [
- "ahash 0.8.12",
  "equivalent",
- "hashbrown 0.16.1",
+ "foldhash 0.2.0",
+ "hashbrown 0.17.1",
  "parking_lot",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.9"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8"
 dependencies = [
  "bytes",
  "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "rustls 0.23.35",
  "socket2 0.6.4",
  "thiserror 2.0.18",
@@ -8995,17 +8995,18 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.14"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
 dependencies = [
  "aws-lc-rs",
  "bytes",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "lru-slab",
- "rand 0.9.0",
+ "rand 0.10.2",
+ "rand_pcg",
  "ring 0.17.14",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "rustls 0.23.35",
  "rustls-pki-types",
  "slab",
@@ -9017,23 +9018,23 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
  "socket2 0.6.4",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -9093,9 +9094,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
 dependencies = [
  "chacha20",
  "getrandom 0.4.3",
@@ -9184,6 +9185,15 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
+dependencies = [
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "raw-cpuid"
 version = "11.6.0"
@@ -9309,9 +9319,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
+checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
 dependencies = [
  "bitflags 2.13.0",
 ]
@@ -9559,7 +9569,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc05fbf560421a0357a750cbe78c7ca19d4923918490daabba313d5dbc871e47"
 dependencies = [
- "rand 0.10.1",
+ "rand 0.10.2",
 ]
 
 [[package]]
@@ -9831,9 +9841,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
 
 [[package]]
 name = "rustc-hash"
@@ -9843,9 +9853,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
 [[package]]
 name = "rustc_version"
@@ -9999,9 +10009,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
 dependencies = [
  "web-time",
  "zeroize",
@@ -10138,9 +10148,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "ryu"
@@ -10889,7 +10899,7 @@ dependencies = [
  "data-encoding",
  "debugid",
  "if_chain",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "serde_json",
  "unicode-id-start",
@@ -11180,9 +11190,9 @@ dependencies = [
 
 [[package]]
 name = "sse-stream"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3962b63f038885f15bce2c6e02c0e7925c072f1ac86bb60fd44c5c6b762fb72"
+checksum = "39f24a9b78c40b90817bbcd1821c74ddfd74916aadd29403d001532a9195532d"
 dependencies = [
  "bytes",
  "futures-util",
@@ -11322,7 +11332,7 @@ dependencies = [
  "allocator-api2",
  "bumpalo",
  "hashbrown 0.14.5",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
 ]
 
 [[package]]
@@ -11351,7 +11361,7 @@ dependencies = [
  "new_debug_unreachable",
  "num-bigint",
  "once_cell",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "siphasher 0.3.11",
  "swc_atoms",
@@ -11400,7 +11410,7 @@ dependencies = [
  "num-bigint",
  "once_cell",
  "phf 0.11.3",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "string_enum",
  "swc_atoms",
@@ -11421,7 +11431,7 @@ dependencies = [
  "num-bigint",
  "once_cell",
  "regex",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "ryu-js",
  "serde",
  "swc_allocator",
@@ -11455,7 +11465,7 @@ dependencies = [
  "either",
  "num-bigint",
  "phf 0.11.3",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "seq-macro",
  "serde",
  "smallvec",
@@ -11475,7 +11485,7 @@ checksum = "c675d14700c92f12585049b22b02356f1e142f4b0c32a4d0eb4b7a968a4c0c1e"
 dependencies = [
  "anyhow",
  "pathdiff",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "swc_atoms",
  "swc_common",
@@ -11509,7 +11519,7 @@ dependencies = [
  "once_cell",
  "par-core",
  "phf 0.11.3",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "swc_atoms",
  "swc_common",
@@ -11552,7 +11562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39b3b34f6a28348416174912009d09994ab71c867682ec78d641a9feb3a96b4e"
 dependencies = [
  "either",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "swc_atoms",
  "swc_common",
@@ -11573,7 +11583,7 @@ dependencies = [
  "bytes-str",
  "indexmap 2.14.0",
  "once_cell",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "sha1",
  "string_enum",
@@ -11594,7 +11604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3872c006ccfdcc19f1cf5c01c15915a69964ba7982c9f581cdb7e727e77b9a2c"
 dependencies = [
  "bytes-str",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "swc_atoms",
  "swc_common",
@@ -11615,7 +11625,7 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "par-core",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "ryu-js",
  "swc_atoms",
  "swc_common",
@@ -11673,7 +11683,7 @@ dependencies = [
  "data-encoding",
  "debugid",
  "if_chain",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "serde_json",
  "unicode-id-start",
@@ -11870,7 +11880,7 @@ dependencies = [
  "rayon",
  "regex",
  "rust-stemmers",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
  "serde",
  "serde_json",
  "sketches-ddsketch",
@@ -12189,9 +12199,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.49"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
 dependencies = [
  "deranged",
  "num-conv",
@@ -12209,9 +12219,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.29"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
 dependencies = [
  "num-conv",
  "time-core",
@@ -12923,9 +12933,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
+checksum = "b40688ea6389c8171614b25491f71d4a27946e0c7ce2da1c6de27e25abf1a0ae"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -13322,9 +13332,9 @@ checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
 
 [[package]]
 name = "utf8-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1292c0d970b54115d14f2492fe0170adf21d68a1de108eebc51c1df4f346a091"
+checksum = "159a7cadce548703edd50d24069bc294c5415ecab0a480e0cd1ca06d112dc94a"
 
 [[package]]
 name = "utf8_iter"
@@ -13340,9 +13350,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.23.3"
+version = "1.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
+checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
 dependencies = [
  "getrandom 0.4.3",
  "js-sys",
@@ -13735,7 +13745,7 @@ dependencies = [
 
 [[package]]
 name = "windmill"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-nats",
@@ -13817,7 +13827,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-ai"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -13850,7 +13860,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-alerting"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -13863,7 +13873,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -14001,7 +14011,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-agent-workers"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14024,20 +14034,22 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-assets"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
  "serde",
  "serde_json",
  "sqlx",
+ "tracing",
  "windmill-api-auth",
  "windmill-common",
+ "windmill-parser-sql-asset",
 ]
 
 [[package]]
 name = "windmill-api-auth"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "axum 0.8.9",
@@ -14063,7 +14075,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "reqwest 0.12.28",
  "serde",
@@ -14073,7 +14085,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-configs"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14090,7 +14102,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-debug"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "base64 0.22.1",
@@ -14112,7 +14124,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-embeddings"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "axum 0.8.9",
@@ -14135,7 +14147,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-flow-conversations"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14151,7 +14163,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-flows"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14172,7 +14184,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-groups"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14193,7 +14205,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-inputs"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14207,7 +14219,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-integration-tests"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-nats",
@@ -14242,7 +14254,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-jobs"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "axum 0.8.9",
@@ -14267,7 +14279,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-npm-proxy"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "flate2",
@@ -14285,7 +14297,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-openapi"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "axum 0.8.9",
@@ -14307,7 +14319,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-schedule"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14327,7 +14339,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-scripts"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14354,6 +14366,7 @@ dependencies = [
  "windmill-parser",
  "windmill-parser-py",
  "windmill-parser-py-asset",
+ "windmill-parser-sql",
  "windmill-parser-sql-asset",
  "windmill-parser-ts",
  "windmill-parser-ts-asset",
@@ -14363,7 +14376,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-settings"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "axum 0.8.9",
@@ -14391,7 +14404,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-sse"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "lazy_static",
  "serde",
@@ -14403,7 +14416,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-users"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "argon2",
  "axum 0.8.9",
@@ -14428,7 +14441,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-workers"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
@@ -14442,10 +14455,11 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-workspaces"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "axum 0.8.9",
  "chrono",
+ "futures",
  "hex",
  "http 1.4.2",
  "hyper 1.10.1",
@@ -14458,6 +14472,7 @@ dependencies = [
  "sqlx",
  "strum",
  "tokio",
+ "tokio-postgres",
  "tracing",
  "uuid",
  "windmill-api-auth",
@@ -14475,7 +14490,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "chrono",
  "lazy_static",
@@ -14489,7 +14504,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "axum 0.8.9",
@@ -14508,7 +14523,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "aes-gcm",
  "aho-corasick",
@@ -14610,7 +14625,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-dep-map"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "chrono",
  "itertools 0.14.0",
@@ -14629,7 +14644,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "regex",
  "serde",
@@ -14644,7 +14659,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "astral-tokio-tar",
@@ -14668,7 +14683,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-jseval"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "futures",
@@ -14685,7 +14700,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "itertools 0.14.0",
  "lazy_static",
@@ -14701,7 +14716,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-mcp"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -14722,7 +14737,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-native-triggers"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -14753,7 +14768,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-oauth"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -14778,7 +14793,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-object-store"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -14812,7 +14827,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-operator"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "futures",
@@ -14830,7 +14845,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -14839,7 +14854,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14851,7 +14866,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14863,7 +14878,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -14875,7 +14890,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14887,7 +14902,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14899,7 +14914,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -14910,7 +14925,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -14921,7 +14936,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -14933,7 +14948,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-asset"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "rustpython-ast",
@@ -14944,7 +14959,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -14966,7 +14981,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-r"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14978,7 +14993,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ruby"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14992,7 +15007,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -15009,7 +15024,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15022,7 +15037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql-asset"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -15034,7 +15049,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15052,7 +15067,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts-asset"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde-wasm-bindgen",
@@ -15068,7 +15083,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wac"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "rustpython-ast",
@@ -15084,7 +15099,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -15095,7 +15110,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15129,11 +15144,12 @@ dependencies = [
  "uuid",
  "windmill-audit",
  "windmill-common",
+ "windmill-jseval",
 ]
 
 [[package]]
 name = "windmill-runtime-nativets"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "const_format",
@@ -15172,7 +15188,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "getrandom 0.3.4",
  "wasm-bindgen",
@@ -15183,17 +15199,19 @@ dependencies = [
 
 [[package]]
 name = "windmill-store"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-recursion",
  "axum 0.8.9",
+ "base64 0.22.1",
  "chrono",
  "futures",
  "hex",
  "http 1.4.2",
  "hyper 1.10.1",
  "lazy_static",
+ "magic-crypt",
  "quick_cache",
  "reqwest 0.13.1",
  "serde",
@@ -15215,7 +15233,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-test-utils"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15239,7 +15257,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15272,7 +15290,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-azure"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15305,7 +15323,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-email"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15325,7 +15343,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-gcp"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15359,7 +15377,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-http"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15395,7 +15413,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-kafka"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15418,7 +15436,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-mqtt"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15442,7 +15460,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-nats"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-nats",
@@ -15466,7 +15484,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-postgres"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15501,7 +15519,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-sqs"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15529,7 +15547,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-trigger-websocket"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -15554,7 +15572,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-types"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "bitflags 2.13.0",
@@ -15573,7 +15591,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-once-cell",
@@ -15683,7 +15701,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker-volumes"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "bytes",
  "futures",
@@ -16409,18 +16427,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.52"
+version = "0.8.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
+checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.52"
+version = "0.8.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
+checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -16501,9 +16519,9 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"
+checksum = "5431d5661c32445236631278f27946e444ddafe4684cac70b185272d4f9c52d5"
 
 [[package]]
 name = "zmij"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 5dd2d8f76d..12ec704c32 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.733.1"
+version = "1.753.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -87,7 +87,7 @@ members = [
 exclude = ["./windmill-duckdb-ffi-internal", "./parsers/windmill-parser-wasm"]
 
 [workspace.package]
-version = "1.733.1"
+version = "1.753.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -112,7 +112,7 @@ strip = "none"
 default = []
 private = ["windmill-api/private", "windmill-api-agent-workers?/private", "windmill-autoscaling/private", "windmill-common/private", "windmill-dep-map/private", "windmill-object-store/private", "windmill-git-sync/private", "windmill-indexer/private", "windmill-operator?/private", "windmill-queue/private", "windmill-worker/private", "windmill-test-utils/private"]
 agent_worker_server = ["windmill-api/agent_worker_server", "dep:windmill-api-agent-workers", "windmill-test-utils/agent_worker_server"]
-enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "windmill-api-agent-workers?/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise", "windmill-object-store/enterprise"]
+enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "windmill-api-agent-workers?/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise", "windmill-object-store/enterprise", "license"]
 local_reports = ["windmill-common/local_reports"]
 enterprise_saml = ["windmill-api/enterprise_saml", "oauth2"]
 stripe = ["windmill-api/stripe"]
@@ -121,6 +121,7 @@ embedding = ["windmill-api/embedding"]
 parquet = ["windmill-api/parquet", "windmill-common/parquet", "windmill-object-store/parquet", "windmill-worker/parquet"]
 prometheus = ["windmill-common/prometheus", "windmill-api/prometheus", "windmill-worker/prometheus", "windmill-queue/prometheus", "dep:prometheus"]
 flow_testing = ["windmill-worker/flow_testing"]
+failpoints = ["windmill-worker/failpoints", "windmill-queue/failpoints"]
 quickjs = ["windmill-worker/quickjs", "windmill-api/quickjs"]
 openidconnect = ["windmill-api/openidconnect", "windmill-common/openidconnect", "windmill-object-store/openidconnect"]
 cloud = ["windmill-queue/cloud", "windmill-worker/cloud", "windmill-common/cloud", "windmill-api/cloud"]
diff --git a/backend/THREAT_MODEL.md b/backend/THREAT_MODEL.md
index dc98a5a625..9501b5bf0d 100644
--- a/backend/THREAT_MODEL.md
+++ b/backend/THREAT_MODEL.md
@@ -88,7 +88,7 @@ published advisory history (73 GHSA advisories, several rated 9.9 critical).
 | EP12 Stored-content rendering | App builder HTML component, markdown, S3 download response headers | stored user content → admin browser (same origin) | Admin session, account takeover |
 | EP13 Log/file reading & export endpoints | `service_logs`, `jobs_u/getupdate` log file read (symlinks), workspace/tarball export | authed/unauth request → arbitrary file or admin-only config | Arbitrary files, global settings |
 | EP14 Secret-value & resource-value caches | In-memory caches in `windmill-store` keyed (historically un-keyed) by path | cache lookup crossing identity/folder boundary | Secret variables, resource creds |
-| EP15 Deployment & runtime config | docker-compose defaults: dind, debugger (`REQUIRE_SIGNED_DEBUG_REQUESTS=false`), CORS `Any`, default admin/`changeme`, exposed Postgres, `SUPERADMIN_SECRET`, `ENABLE_NSJAIL=false`, privileged containers | operator/infra default → full instance | All assets |
+| EP15 Deployment & runtime config | docker-compose defaults: dind, debugger (`REQUIRE_SIGNED_DEBUG_REQUESTS` now defaults to `true`; can still be overridden to `false`), CORS `Any`, default admin/`changeme`, exposed Postgres, `SUPERADMIN_SECRET`, `ENABLE_NSJAIL=false`, privileged containers | operator/infra default → full instance | All assets |
 | EP16 Supply chain | Cached hub scripts, GitHub workflow actions, vendored deps, Docker base image | build/update-time input → host & build integrity | Worker host, build integrity |
 | EP17 Token lifecycle | Token create/rescope/refresh, script-issued JWTs | scoped caller → broader privilege | Tokens, accounts, isolation |
 
@@ -103,7 +103,7 @@ published advisory history (73 GHSA advisories, several rated 9.9 critical).
 | T5 | Worker compromise & cross-tenant access via weak-by-default isolation (nsjail off by default → user code runs with only PID-ns `unshare`); sandbox escape where nsjail/dind/podman is enabled | remote_auth | EP9, EP15 | Worker host, isolation, downstream | critical | likely | unmitigated | nsjail off by default everywhere (`DISABLE_NSJAIL=true`); shipped compose gives PID-ns `unshare` only (`FAVOR_UNSHARE_PID=true`), bare installs get no isolation. Where nsjail enabled: read-only remounts, jail-tmp refusal, podman socket gating | GHSA-6qr8-xhg4-453q, GHSA-3vpp-vf62-wqp6, f8467f38c8, df5aec0f5d, f1b6746e0e |
 | T6 | Disclosure of secrets, resource credentials, and workspace encryption keys across the authorization boundary (AI proxy, MCP, caches, export); database read additionally yields plaintext instance-level `global_settings` secrets | remote_auth | EP6, EP14, EP13 | Secret variables, encryption keys, resource creds, global settings | critical | likely | partially_mitigated | RLS on `$var:`, cache scoping by caller, admin checks on export; per-workspace secret *variables* encrypted at rest, but `global_settings` is plaintext under the default DB secret backend | GHSA-jwg4-v3cj-rvfm, GHSA-8m2p-2crh-9h3w, GHSA-6635-6fch-v8px, GHSA-437f-725p-7w84, GHSA-f27g-j463-q85w (CVE-2026-26964), GHSA-j679-v6vj-jfxc, GHSA-6vrr-fq33-qpfp, 0ba128afe7, 7836a4e733, ff8e39c69b |
 | T7 | Full instance compromise from insecure deployment defaults (dind control, default admin/`changeme`, exposed Postgres, publicly readable SUPERADMIN_SECRET) | remote_unauth | EP15 | All assets | critical | likely | partially_mitigated | first-time-setup warning on default admin; docs recommend hardening | GHSA-3vpp-vf62-wqp6, GHSA-24fr-44f8-fqwg (CVE-2026-29059), GHSA-6q36-5p3h-766j |
-| T8 | Unauthenticated RCE via the Debugger WebSocket in the default `windmill_extra` configuration | remote_unauth | EP15 | Worker host, all assets | critical | possible | unmitigated | `REQUIRE_SIGNED_DEBUG_REQUESTS` exists but defaults to false | GHSA-725h-99vx-9xr4 |
+| T8 | Unauthenticated RCE via the Debugger WebSocket: `/ws_debug/*` exposed by the gateway/ingress with the debugger service as the auth boundary; signature gate was bypassable via `program`-mode launches (read+exec an arbitrary server-side file path, never signed) even with signing on, and the WS handshake had no Origin check (CSWSH) | remote_unauth | EP15 | Worker host, all assets | critical | possible | partially_mitigated | `program`-mode launches now rejected when `REQUIRE_SIGNED_DEBUG_REQUESTS` is on (signing covers every launch, not just inline `code`); shipped `docker-compose` now defaults `REQUIRE_SIGNED_DEBUG_REQUESTS=true`; opt-in `DEBUG_ALLOWED_ORIGINS` allowlist rejects cross-origin handshakes. Residual: code default is secure but operators can still set `=false`; origin allowlist is opt-in | GHSA-725h-99vx-9xr4 |
 | T9 | Supply-chain compromise via cached hub scripts, GitHub workflow command injection, or vulnerable base-image deps | supply_chain | EP16 | Worker host, build integrity | critical | possible | partially_mitigated | hub-script re-pin to patched versions; HUB_BASE_URL override | GHSA-w2m9-q5f7-3gpq, edf340c4d4, GHSA-8rq7-w7g6-8wvr, GHSA-vch9-39v5-4wg7 (CVE-2024-37371) |
 | T10 | Unauthenticated disclosure of job results, args, logs, and admin config via missing-authz public endpoints | remote_unauth | EP2, EP13 | Job results/args/logs, global settings, scripts | high | likely | partially_mitigated | anonymous-job checks, log-endpoint authz hardening | GHSA-qfg7-x243-5hg4, GHSA-v448-fmm4-52fp, 108a88a180, bb90f4ce83 |
 | T11 | Stored XSS leading to admin/account takeover via app HTML component, markdown, or S3 download content-type | remote_auth | EP12 | Admin session, accounts | high | likely | partially_mitigated | DOMPurify markdown sanitization, `X-Content-Type-Options: nosniff` + CSP sandbox on downloads | GHSA-9c5c-hh3c-r9mc, GHSA-qxj7-hpx3-r892, GHSA-cf2x-rg8c-v63v, bb78b1c06d, 625b67dff0 |
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index fc292591e6..3975aa3922 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-b2712bc1411b29ec1c95466831bf4c7982447fd8
\ No newline at end of file
+a61da8ad2de819f6675314efa59371105ad974cb
\ No newline at end of file
diff --git a/backend/migrations/20260617081932_datatable_migrations.down.sql b/backend/migrations/20260617081932_datatable_migrations.down.sql
new file mode 100644
index 0000000000..26efc2bdcc
--- /dev/null
+++ b/backend/migrations/20260617081932_datatable_migrations.down.sql
@@ -0,0 +1 @@
+DROP TABLE datatable_migrations;
diff --git a/backend/migrations/20260617081932_datatable_migrations.up.sql b/backend/migrations/20260617081932_datatable_migrations.up.sql
new file mode 100644
index 0000000000..72c7dc5ec6
--- /dev/null
+++ b/backend/migrations/20260617081932_datatable_migrations.up.sql
@@ -0,0 +1,21 @@
+-- SQL migrations defined per data table within a workspace.
+-- `datatable` is the target data table name, `name` is the migration name
+-- (e.g. add_index_to_customers), and `timestamp` is the migration version
+-- (YYYYMMDDHHMMSS), recorded as `version` in the data table's `_wm_migrations`
+-- table once applied.
+CREATE TABLE datatable_migrations (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace(id) ON DELETE CASCADE,
+    datatable VARCHAR(255) NOT NULL,
+    timestamp BIGINT NOT NULL,
+    name VARCHAR(255) NOT NULL,
+    code_up TEXT NOT NULL,
+    code_down TEXT,
+    PRIMARY KEY (workspace_id, datatable, timestamp)
+);
+
+-- No standalone index: the (workspace_id, datatable, timestamp) primary-key btree
+-- already serves both `WHERE workspace_id = $1` and `WHERE workspace_id = $1 AND
+-- datatable = $2` lookups via its leading columns.
+
+GRANT ALL ON datatable_migrations TO windmill_user;
+GRANT ALL ON datatable_migrations TO windmill_admin;
diff --git a/backend/migrations/20260617144417_add_ai_skill.down.sql b/backend/migrations/20260617144417_add_ai_skill.down.sql
new file mode 100644
index 0000000000..8fd6e1606d
--- /dev/null
+++ b/backend/migrations/20260617144417_add_ai_skill.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS ai_skill;
diff --git a/backend/migrations/20260617144417_add_ai_skill.up.sql b/backend/migrations/20260617144417_add_ai_skill.up.sql
new file mode 100644
index 0000000000..b9a5003572
--- /dev/null
+++ b/backend/migrations/20260617144417_add_ai_skill.up.sql
@@ -0,0 +1,15 @@
+-- Workspace-scoped AI chat skills (Claude/Codex-style SKILL.md instructions).
+-- `name` is the skill folder slug; `description` is advertised in the AI chat
+-- system prompt, `instructions` is the SKILL.md body fetched on demand.
+CREATE TABLE ai_skill (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace(id) ON DELETE CASCADE,
+    name VARCHAR(255) NOT NULL,
+    description TEXT NOT NULL,
+    instructions TEXT NOT NULL,
+    edited_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    edited_by VARCHAR(255) NOT NULL DEFAULT '',
+    PRIMARY KEY (workspace_id, name)
+);
+
+GRANT ALL ON ai_skill TO windmill_user;
+GRANT ALL ON ai_skill TO windmill_admin;
diff --git a/backend/migrations/20260619150718_native_retry_settings.down.sql b/backend/migrations/20260619150718_native_retry_settings.down.sql
new file mode 100644
index 0000000000..459ebe4eaf
--- /dev/null
+++ b/backend/migrations/20260619150718_native_retry_settings.down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE runnable_settings
+DROP COLUMN IF EXISTS retry_settings;
+
+DROP TABLE IF EXISTS retry_settings;
diff --git a/backend/migrations/20260619150718_native_retry_settings.up.sql b/backend/migrations/20260619150718_native_retry_settings.up.sql
new file mode 100644
index 0000000000..e03192c710
--- /dev/null
+++ b/backend/migrations/20260619150718_native_retry_settings.up.sql
@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS retry_settings(
+    hash                        BIGINT PRIMARY KEY,
+    constant_attempts           INTEGER,
+    constant_seconds            INTEGER,
+    exponential_attempts        INTEGER,
+    exponential_multiplier      INTEGER,
+    exponential_seconds         INTEGER,
+    exponential_random_factor   INTEGER,
+    retry_if_expr               TEXT
+);
+
+ALTER TABLE runnable_settings
+ADD COLUMN IF NOT EXISTS retry_settings BIGINT DEFAULT NULL;
+
+GRANT ALL ON retry_settings TO windmill_admin;
+GRANT ALL ON retry_settings TO windmill_user;
diff --git a/backend/migrations/20260619170118_add_materialized_partition.down.sql b/backend/migrations/20260619170118_add_materialized_partition.down.sql
new file mode 100644
index 0000000000..4932338956
--- /dev/null
+++ b/backend/migrations/20260619170118_add_materialized_partition.down.sql
@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_materialized_partition_asset_status;
+DROP TABLE IF EXISTS materialized_partition;
+DROP TYPE IF EXISTS MATERIALIZATION_STATUS;
diff --git a/backend/migrations/20260619170118_add_materialized_partition.up.sql b/backend/migrations/20260619170118_add_materialized_partition.up.sql
new file mode 100644
index 0000000000..da5f806e4f
--- /dev/null
+++ b/backend/migrations/20260619170118_add_materialized_partition.up.sql
@@ -0,0 +1,29 @@
+-- Per-partition materialization state for managed `// materialize` assets.
+-- One row per (asset, partition): the latest materialization of that slice.
+-- Drives: the partition-status grid (CE observability), run-stale/gap
+-- detection, and the EE backfill worklist (missing/failed partitions). The
+-- `partition` column uses '' as the sentinel for an unpartitioned (whole-table)
+-- materialization, since partition is part of the primary key and cannot be
+-- NULL.
+CREATE TYPE MATERIALIZATION_STATUS AS ENUM ('running', 'materialized', 'failed');
+
+CREATE TABLE IF NOT EXISTS materialized_partition (
+  workspace_id     VARCHAR(50) NOT NULL REFERENCES workspace(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  asset_kind       ASSET_KIND NOT NULL,
+  asset_path       VARCHAR(255) NOT NULL,
+  partition        TEXT NOT NULL DEFAULT '',
+  status           MATERIALIZATION_STATUS NOT NULL,
+  -- DuckLake snapshot id produced by the write; NULL while running / on
+  -- failure. The pin that makes downstream reads reproducible.
+  snapshot_id      BIGINT,
+  row_count        BIGINT,
+  job_id           UUID,
+  materialized_at  TIMESTAMPTZ NOT NULL DEFAULT now(),
+  error            TEXT,
+  PRIMARY KEY (workspace_id, asset_kind, asset_path, partition)
+);
+
+-- Backfill enumeration / grid "show only gaps": filter an asset's partitions
+-- by status without scanning the whole table.
+CREATE INDEX IF NOT EXISTS idx_materialized_partition_asset_status
+  ON materialized_partition (workspace_id, asset_kind, asset_path, status);
diff --git a/backend/migrations/20260624103600_repair_folder_labels_search_path.down.sql b/backend/migrations/20260624103600_repair_folder_labels_search_path.down.sql
new file mode 100644
index 0000000000..3d532de9cb
--- /dev/null
+++ b/backend/migrations/20260624103600_repair_folder_labels_search_path.down.sql
@@ -0,0 +1,3 @@
+-- No-op: this migration only re-pins the function's search_path. Reverting would
+-- mean restoring the hardcoded `SET search_path = public`, which is the very bug
+-- this repairs, so there is nothing to undo.
diff --git a/backend/migrations/20260624103600_repair_folder_labels_search_path.up.sql b/backend/migrations/20260624103600_repair_folder_labels_search_path.up.sql
new file mode 100644
index 0000000000..f8e448891f
--- /dev/null
+++ b/backend/migrations/20260624103600_repair_folder_labels_search_path.up.sql
@@ -0,0 +1,22 @@
+-- Repair instances that already applied the folder-labels migrations while the
+-- function hardcoded `SET search_path = public`. On a non-public schema (PG_SCHEMA)
+-- the function was pinned to `public`, so at runtime it read the wrong `folder`
+-- table (or a stray public.folder) instead of the workspace's real one.
+--
+-- `FROM CURRENT` snapshots the migration connection's search_path (the actual
+-- Windmill schema) into the function, keeping the SECURITY DEFINER injection
+-- hardening. On public-schema installs this re-pins to `public`, i.e. a no-op.
+-- Idempotent: redefining with the same body is harmless on already-correct installs.
+CREATE OR REPLACE FUNCTION folder_labels(w_id text, item_path text) RETURNS text[]
+LANGUAGE sql STABLE SECURITY DEFINER SET search_path FROM CURRENT AS $$
+    SELECT (
+        SELECT array_agg(l ORDER BY first_ord)
+        FROM (
+            SELECT u.l, min(u.ord) AS first_ord
+            FROM unnest(f.labels) WITH ORDINALITY AS u(l, ord)
+            GROUP BY u.l
+        ) deduped
+    )
+    FROM folder f
+    WHERE f.workspace_id = w_id AND item_path LIKE 'f/%' AND f.name = split_part(item_path, '/', 2)
+$$;
diff --git a/backend/migrations/20260624105229_realign_legacy_raw_app_draft_kind.down.sql b/backend/migrations/20260624105229_realign_legacy_raw_app_draft_kind.down.sql
new file mode 100644
index 0000000000..3c69d46fc8
--- /dev/null
+++ b/backend/migrations/20260624105229_realign_legacy_raw_app_draft_kind.down.sql
@@ -0,0 +1,3 @@
+-- Irreversible data backfill: once a raw app's draft is retyped to 'raw_app' it
+-- is indistinguishable from one saved as 'raw_app' by the per-kind code, so the
+-- original typ='app' state cannot be reconstructed. No-op on revert.
diff --git a/backend/migrations/20260624105229_realign_legacy_raw_app_draft_kind.up.sql b/backend/migrations/20260624105229_realign_legacy_raw_app_draft_kind.up.sql
new file mode 100644
index 0000000000..d4b068a80c
--- /dev/null
+++ b/backend/migrations/20260624105229_realign_legacy_raw_app_draft_kind.up.sql
@@ -0,0 +1,35 @@
+-- The pre-per-user `DRAFT_TYPE` enum had only ('script','flow','app'): a raw
+-- app's draft was therefore stored as typ='app'. The new model splits app vs
+-- raw_app into distinct draft kinds chosen from the deployed app's `raw_app`
+-- flag, so a raw app's pre-migration draft is invisible to the per-kind lookups
+-- (editor overlay, migrate-legacy, get-for-user), which all query typ='raw_app'.
+-- Realign every such draft (any owner, including the legacy NULL-email row) to
+-- 'raw_app' when the deployed app at that path is a raw app.
+
+-- Drop, don't retype, a stale 'app' row when a 'raw_app' draft already exists
+-- for the same owner (the newer 'raw_app' row, saved with the per-kind code, is
+-- authoritative) — retyping would collide on the draft_pkey_with_user /
+-- draft_pkey_legacy partial unique indexes over (workspace_id, path, typ, email).
+DELETE FROM draft d
+USING app a
+JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]
+WHERE d.typ = 'app'
+  AND a.workspace_id = d.workspace_id
+  AND a.path = d.path
+  AND av.raw_app IS TRUE
+  AND EXISTS (
+    SELECT 1 FROM draft d2
+    WHERE d2.workspace_id = d.workspace_id
+      AND d2.path = d.path
+      AND d2.typ = 'raw_app'
+      AND d2.email IS NOT DISTINCT FROM d.email
+  );
+
+UPDATE draft d
+SET typ = 'raw_app'
+FROM app a
+JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]
+WHERE d.typ = 'app'
+  AND a.workspace_id = d.workspace_id
+  AND a.path = d.path
+  AND av.raw_app IS TRUE;
diff --git a/backend/migrations/20260624161218_dev_workspace.down.sql b/backend/migrations/20260624161218_dev_workspace.down.sql
new file mode 100644
index 0000000000..45b8e65f67
--- /dev/null
+++ b/backend/migrations/20260624161218_dev_workspace.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE workspace DROP CONSTRAINT IF EXISTS workspace_dev_requires_parent;
+DROP INDEX IF EXISTS workspace_canonical_dev_idx;
+ALTER TABLE workspace DROP COLUMN is_dev_workspace;
diff --git a/backend/migrations/20260624161218_dev_workspace.up.sql b/backend/migrations/20260624161218_dev_workspace.up.sql
new file mode 100644
index 0000000000..a0a252eb7c
--- /dev/null
+++ b/backend/migrations/20260624161218_dev_workspace.up.sql
@@ -0,0 +1,14 @@
+-- A dev workspace is a fork (parent_workspace_id set) that is the standing editable
+-- environment paired with its parent ("prod"), as opposed to a throwaway fork.
+ALTER TABLE workspace ADD COLUMN is_dev_workspace BOOLEAN NOT NULL DEFAULT false;
+
+-- At most one active canonical dev workspace per parent (one editable source per prod).
+-- Excludes soft-deleted (archived) workspaces so a new dev can replace an archived one.
+CREATE UNIQUE INDEX workspace_canonical_dev_idx ON workspace (parent_workspace_id)
+    WHERE is_dev_workspace AND deleted = false;
+
+-- A dev workspace is a fork, so it must have a parent. Enforce the invariant at the schema level so
+-- no path (or manual write) can persist a "root dev workspace". No backfill needed: the column is
+-- added above with default false, so no existing row can violate this at creation time.
+ALTER TABLE workspace ADD CONSTRAINT workspace_dev_requires_parent
+    CHECK (NOT is_dev_workspace OR parent_workspace_id IS NOT NULL);
diff --git a/backend/migrations/20260624221000_native_retry_attempt_marker.down.sql b/backend/migrations/20260624221000_native_retry_attempt_marker.down.sql
new file mode 100644
index 0000000000..0a09f0f42a
--- /dev/null
+++ b/backend/migrations/20260624221000_native_retry_attempt_marker.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS native_retry_attempt;
diff --git a/backend/migrations/20260624221000_native_retry_attempt_marker.up.sql b/backend/migrations/20260624221000_native_retry_attempt_marker.up.sql
new file mode 100644
index 0000000000..e193fb8b8f
--- /dev/null
+++ b/backend/migrations/20260624221000_native_retry_attempt_marker.up.sql
@@ -0,0 +1,18 @@
+-- Sparse marker: one row per native retry attempt (a re-pushed Script job that
+-- gained a retry). Presence = "this job is a native retry attempt"; `attempt` is
+-- the chain position (1-based). Lets consumers — asset-cascade dispatch, the
+-- per-occurrence schedule-handler counting, and the run-page chain — identify
+-- retries explicitly instead of inferring from incidental fields (parent_job +
+-- runnable + flow_innermost), which collides with schedule handlers and WAC
+-- inline children. Sparse: only failed-and-retried jobs under a retry policy
+-- produce rows. Lifecycle: removed with their job in the retention sweep (no FK,
+-- to keep the bulk job delete cheap).
+CREATE TABLE IF NOT EXISTS native_retry_attempt (
+    job_id UUID PRIMARY KEY,
+    -- `integer` matches the retry policy's i32 attempt count; avoids any narrowing
+    -- on the maybe_enqueue read/write path.
+    attempt INTEGER NOT NULL
+);
+
+GRANT ALL ON native_retry_attempt TO windmill_admin;
+GRANT ALL ON native_retry_attempt TO windmill_user;
diff --git a/backend/migrations/20260625092813_drop_v2_job_side_table_cascades.down.sql b/backend/migrations/20260625092813_drop_v2_job_side_table_cascades.down.sql
new file mode 100644
index 0000000000..9399c18a6b
--- /dev/null
+++ b/backend/migrations/20260625092813_drop_v2_job_side_table_cascades.down.sql
@@ -0,0 +1,16 @@
+-- Re-establish the ON DELETE CASCADE foreign keys. Once the cascades were gone the explicit
+-- delete paths may have left orphan rows (or none were created); purge any orphans first so
+-- the constraints can be validated.
+DELETE FROM dispatch_event WHERE producer_job_id NOT IN (SELECT id FROM v2_job);
+DELETE FROM flow_conversation_message WHERE job_id IS NOT NULL AND job_id NOT IN (SELECT id FROM v2_job);
+DELETE FROM zombie_job_counter WHERE job_id NOT IN (SELECT id FROM v2_job);
+
+ALTER TABLE dispatch_event
+    ADD CONSTRAINT dispatch_event_producer_job_id_fkey
+    FOREIGN KEY (producer_job_id) REFERENCES v2_job(id) ON DELETE CASCADE;
+ALTER TABLE flow_conversation_message
+    ADD CONSTRAINT flow_conversation_message_job_id_fkey
+    FOREIGN KEY (job_id) REFERENCES v2_job(id) ON DELETE CASCADE;
+ALTER TABLE zombie_job_counter
+    ADD CONSTRAINT zombie_job_counter_job_id_fkey
+    FOREIGN KEY (job_id) REFERENCES v2_job(id) ON DELETE CASCADE;
diff --git a/backend/migrations/20260625092813_drop_v2_job_side_table_cascades.up.sql b/backend/migrations/20260625092813_drop_v2_job_side_table_cascades.up.sql
new file mode 100644
index 0000000000..ebaa555b0e
--- /dev/null
+++ b/backend/migrations/20260625092813_drop_v2_job_side_table_cascades.up.sql
@@ -0,0 +1,11 @@
+-- Drop the ON DELETE CASCADE foreign keys from v2_job's sparse side tables.
+-- These cascades made bulk retention deletes (DELETE FROM v2_job WHERE id = ANY(...))
+-- fire a per-row RI trigger for each FK; for flow_conversation_message, whose job_id
+-- column is unindexed, that meant a sequential scan of the whole table per deleted row
+-- (benchmarked at ~14x the base delete time). Deletion of these tables is now handled
+-- explicitly by windmill_common::jobs::delete_jobs and the workspace/export delete paths,
+-- following the existing no-FK precedent of job_logs / job_stats / native_retry_attempt.
+
+ALTER TABLE dispatch_event DROP CONSTRAINT IF EXISTS dispatch_event_producer_job_id_fkey;
+ALTER TABLE flow_conversation_message DROP CONSTRAINT IF EXISTS flow_conversation_message_job_id_fkey;
+ALTER TABLE zombie_job_counter DROP CONSTRAINT IF EXISTS zombie_job_counter_job_id_fkey;
diff --git a/backend/migrations/20260625130855_index_resume_job_flow_fk.down.sql b/backend/migrations/20260625130855_index_resume_job_flow_fk.down.sql
new file mode 100644
index 0000000000..0e90a4b693
--- /dev/null
+++ b/backend/migrations/20260625130855_index_resume_job_flow_fk.down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS ix_resume_job_flow;
diff --git a/backend/migrations/20260625130855_index_resume_job_flow_fk.up.sql b/backend/migrations/20260625130855_index_resume_job_flow_fk.up.sql
new file mode 100644
index 0000000000..7edded95e3
--- /dev/null
+++ b/backend/migrations/20260625130855_index_resume_job_flow_fk.up.sql
@@ -0,0 +1,5 @@
+-- Index resume_job's FK column to v2_job_queue. Without it, every per-job-completion
+-- DELETE FROM v2_job_queue (the system's hottest delete path) cascades into a sequential
+-- scan of resume_job. The table is small (only currently-suspended flows), so the scan is
+-- cheap today, but the index makes the cascade an index probe and removes the footgun.
+CREATE INDEX IF NOT EXISTS ix_resume_job_flow ON resume_job (flow);
diff --git a/backend/migrations/20260625135355_debounce_batch_consumed.down.sql b/backend/migrations/20260625135355_debounce_batch_consumed.down.sql
new file mode 100644
index 0000000000..8ce64f87ac
--- /dev/null
+++ b/backend/migrations/20260625135355_debounce_batch_consumed.down.sql
@@ -0,0 +1,4 @@
+DROP INDEX IF EXISTS idx_v2_job_debounce_batch_consumed_at;
+ALTER TABLE v2_job_debounce_batch
+    DROP COLUMN IF EXISTS consumed_at,
+    DROP COLUMN IF EXISTS consumed_by;
diff --git a/backend/migrations/20260625135355_debounce_batch_consumed.up.sql b/backend/migrations/20260625135355_debounce_batch_consumed.up.sql
new file mode 100644
index 0000000000..2559cbb74e
--- /dev/null
+++ b/backend/migrations/20260625135355_debounce_batch_consumed.up.sql
@@ -0,0 +1,17 @@
+-- Claim-based, exactly-once consumption of debounce batches.
+-- A batch row is "claimed" by the survivor that accumulates its args. Stamping the
+-- row consumed (instead of deleting it) lets a later-pulled survivor of the same
+-- batch tell "my contribution was already processed" (consumed_at set -> no-op)
+-- apart from "I was never batched" (no row at all; CE / legacy -> run my own args).
+-- consumed_at doubles as the GC timestamp. NULL = not yet consumed.
+-- consumed_by records which job claimed the row, so a job that is re-pulled (e.g.
+-- crash recovery) can tell its own prior claim (keep its accumulated args) apart from
+-- a sibling survivor having swept it in (run empty).
+ALTER TABLE v2_job_debounce_batch
+    ADD COLUMN IF NOT EXISTS consumed_at TIMESTAMP WITH TIME ZONE,
+    ADD COLUMN IF NOT EXISTS consumed_by UUID;
+
+-- Keeps the GC sweep (delete consumed rows past a grace period) cheap.
+CREATE INDEX IF NOT EXISTS idx_v2_job_debounce_batch_consumed_at
+    ON v2_job_debounce_batch (consumed_at)
+    WHERE consumed_at IS NOT NULL;
diff --git a/backend/migrations/20260626095840_add_materialized_asset_schema.down.sql b/backend/migrations/20260626095840_add_materialized_asset_schema.down.sql
new file mode 100644
index 0000000000..8a653a9842
--- /dev/null
+++ b/backend/migrations/20260626095840_add_materialized_asset_schema.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS materialized_asset_schema;
diff --git a/backend/migrations/20260626095840_add_materialized_asset_schema.up.sql b/backend/migrations/20260626095840_add_materialized_asset_schema.up.sql
new file mode 100644
index 0000000000..9c548aded7
--- /dev/null
+++ b/backend/migrations/20260626095840_add_materialized_asset_schema.up.sql
@@ -0,0 +1,37 @@
+-- Captured output schema of a managed `// materialize` asset (gap #2a).
+-- After a managed materialize commits, the worker DESCRIBEs the written table
+-- and records its column list here as asset-level metadata. Schema is a
+-- property of the asset/table, not of a partition slice, so it lives in its own
+-- table keyed by (workspace, asset_kind, asset_path) rather than as a column on
+-- materialized_partition (which would duplicate the identical schema across
+-- every partition row). This is the producer-side capture that #2b (save-time
+-- consumer-ref contract enforcement) reads back.
+--
+-- Versioning across re-materializations: a new `version` row is inserted only
+-- when the captured column set differs from the latest stored version for the
+-- asset; an unchanged re-materialize re-affirms the latest row in place. So the
+-- table is a compact schema-evolution history and MAX(version) is the current
+-- contract.
+CREATE TABLE IF NOT EXISTS materialized_asset_schema (
+  workspace_id  VARCHAR(50) NOT NULL REFERENCES workspace(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  asset_kind    ASSET_KIND NOT NULL,
+  asset_path    VARCHAR(255) NOT NULL,
+  -- Monotonic per (workspace, asset_kind, asset_path), starting at 1; only
+  -- bumped when the schema actually changes.
+  version       BIGINT NOT NULL,
+  -- The captured columns, ordered as the table presents them:
+  -- [{"name": "...", "type": "..."}, ...].
+  columns       JSONB NOT NULL,
+  -- DuckLake snapshot the schema was captured from (NULL for non-ducklake /
+  -- substrates without snapshots).
+  snapshot_id   BIGINT,
+  job_id        UUID,
+  captured_at   TIMESTAMPTZ NOT NULL DEFAULT now(),
+  PRIMARY KEY (workspace_id, asset_kind, asset_path, version)
+);
+
+-- Default privileges (migration 20250205131523) only apply to objects created
+-- by the role that set them, so grant explicitly — the API reads/writes this
+-- table as the invoking role (same fix as script_trigger in 20260619112847).
+GRANT ALL ON materialized_asset_schema TO windmill_user;
+GRANT ALL ON materialized_asset_schema TO windmill_admin;
diff --git a/backend/migrations/20260626132251_audit_logs_s3_reanchor_on_enable.down.sql b/backend/migrations/20260626132251_audit_logs_s3_reanchor_on_enable.down.sql
new file mode 100644
index 0000000000..1ce2c852b7
--- /dev/null
+++ b/backend/migrations/20260626132251_audit_logs_s3_reanchor_on_enable.down.sql
@@ -0,0 +1,21 @@
+-- Restore the previous anchor: epoch sentinel + preserve-cursor (DO NOTHING).
+CREATE OR REPLACE FUNCTION audit_logs_s3_anchor_on_enable()
+RETURNS TRIGGER AS $$
+BEGIN
+    IF NEW.value = to_jsonb(true)
+       AND (TG_OP = 'INSERT' OR OLD.value IS DISTINCT FROM NEW.value) THEN
+        INSERT INTO background_task_state (name, value)
+        VALUES (
+            'audit_logs_s3_export',
+            jsonb_build_object(
+                'last_xmin', txid_snapshot_xmin(txid_current_snapshot())::bigint,
+                'last_ts', '1970-01-01T00:00:00+00:00'
+            )
+        )
+        ON CONFLICT (name) DO NOTHING;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP FUNCTION IF EXISTS audit_logs_s3_oldest_inflight_ts();
diff --git a/backend/migrations/20260626132251_audit_logs_s3_reanchor_on_enable.up.sql b/backend/migrations/20260626132251_audit_logs_s3_reanchor_on_enable.up.sql
new file mode 100644
index 0000000000..ff2ed110c6
--- /dev/null
+++ b/backend/migrations/20260626132251_audit_logs_s3_reanchor_on_enable.up.sql
@@ -0,0 +1,86 @@
+-- Anchors the audit→object-store export cursor when the setting is enabled.
+--
+-- `last_ts`/`last_oldest_inflight_ts` must be a *recent* floor, not epoch: the
+-- export's `timestamp >= floor` predicate is the only partition-pruning bound (the
+-- `age(xmin)` cursor is unindexable), so an epoch floor would scan the whole
+-- `audit_partitioned` table on the first run and never finish under a
+-- `statement_timeout`. The floor must be at or below the timestamp of any row whose
+-- xid >= this snapshot xmin; the oldest in-flight `xact_start` is that bound when
+-- stats are visible (no restricted role / prepared 2PC txn), else a bounded 7-day
+-- window.
+--
+-- `ON CONFLICT DO UPDATE ... WHERE last_xmin <` keeps the cursor monotonic: a
+-- re-enable re-anchors it forward (so the export resumes from ~now rather than
+-- rescanning the disabled gap — that gap is the backfill's job), but it never moves
+-- backwards, so it is HA-safe and can't be regressed by a slower concurrent writer.
+--
+-- The task name literal must match
+-- `windmill_common::global_settings::AUDIT_LOGS_S3_EXPORT_TASK`.
+
+-- Oldest in-flight `xact_start` when this role can observe *all* sessions (so the
+-- min is a true cluster-wide bound), else NULL — callers substitute a conservative
+-- window. The stats-visibility check goes through `is_superuser` (a preset GUC, no
+-- catalog read) first, then a best-effort `pg_has_role` probe guarded by EXCEPTION:
+-- `pg_has_role` reads `pg_authid`, which some managed providers (e.g. Cloud SQL)
+-- forbid even to read from an elevated context, raising "Modifying pg_authid or
+-- pg_auth_members is not allowed in elevated context". The EXCEPTION block runs in
+-- its own subtransaction, so a failure there returns NULL (→ conservative fallback)
+-- without aborting the caller — the migration-time UPDATE below, the trigger, or the
+-- export task, none of which must fail just because the optimization is unavailable.
+CREATE OR REPLACE FUNCTION audit_logs_s3_oldest_inflight_ts()
+RETURNS timestamptz AS $$
+DECLARE
+    v_can_read_all_stats boolean := current_setting('is_superuser') = 'on';
+BEGIN
+    IF NOT v_can_read_all_stats THEN
+        BEGIN
+            v_can_read_all_stats := pg_has_role(current_user, 'pg_read_all_stats', 'USAGE');
+        EXCEPTION WHEN OTHERS THEN
+            v_can_read_all_stats := false;
+        END;
+    END IF;
+    IF v_can_read_all_stats AND NOT EXISTS (SELECT 1 FROM pg_prepared_xacts) THEN
+        RETURN (SELECT min(xact_start) FROM pg_stat_activity WHERE xact_start IS NOT NULL);
+    END IF;
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION audit_logs_s3_anchor_on_enable()
+RETURNS TRIGGER AS $$
+BEGIN
+    IF NEW.value = to_jsonb(true)
+       AND (TG_OP = 'INSERT' OR OLD.value IS DISTINCT FROM NEW.value) THEN
+        INSERT INTO background_task_state (name, value)
+        VALUES (
+            'audit_logs_s3_export',
+            jsonb_build_object(
+                'last_xmin', txid_snapshot_xmin(txid_current_snapshot())::bigint,
+                'last_ts', now(),
+                'last_oldest_inflight_ts',
+                    COALESCE(audit_logs_s3_oldest_inflight_ts(), now() - interval '7 days')
+            )
+        )
+        ON CONFLICT (name) DO UPDATE
+            SET value = EXCLUDED.value
+            WHERE (background_task_state.value->>'last_xmin')::bigint
+                  < (EXCLUDED.value->>'last_xmin')::bigint;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Recovery for a legacy epoch-sentinel checkpoint (`last_ts = epoch`, never
+-- drained). It cannot be safely resumed: its un-drained backlog can be arbitrarily
+-- old, so stamping a recent floor over the old xmin would prune the older rows while
+-- the cursor advanced past them (silent loss), and keeping the epoch floor would
+-- reintroduce the full scan. Re-anchor it to now like a fresh enable; the pre-anchor
+-- window is recoverable via the opt-in backfill, not silently dropped.
+UPDATE background_task_state
+SET value = jsonb_build_object(
+        'last_xmin', txid_snapshot_xmin(txid_current_snapshot())::bigint,
+        'last_ts', to_jsonb(now()),
+        'last_oldest_inflight_ts',
+            to_jsonb(COALESCE(audit_logs_s3_oldest_inflight_ts(), now() - interval '7 days')))
+WHERE name = 'audit_logs_s3_export'
+  AND (value->>'last_ts')::timestamptz <= 'epoch'::timestamptz;
diff --git a/backend/migrations/20260701080313_grant_dispatch_event_to_windmill_roles.down.sql b/backend/migrations/20260701080313_grant_dispatch_event_to_windmill_roles.down.sql
new file mode 100644
index 0000000000..2278fbfb2e
--- /dev/null
+++ b/backend/migrations/20260701080313_grant_dispatch_event_to_windmill_roles.down.sql
@@ -0,0 +1,4 @@
+REVOKE ALL ON dispatch_event FROM windmill_user;
+REVOKE ALL ON dispatch_event FROM windmill_admin;
+REVOKE ALL ON SEQUENCE dispatch_event_id_seq FROM windmill_user;
+REVOKE ALL ON SEQUENCE dispatch_event_id_seq FROM windmill_admin;
diff --git a/backend/migrations/20260701080313_grant_dispatch_event_to_windmill_roles.up.sql b/backend/migrations/20260701080313_grant_dispatch_event_to_windmill_roles.up.sql
new file mode 100644
index 0000000000..5d0b4650ce
--- /dev/null
+++ b/backend/migrations/20260701080313_grant_dispatch_event_to_windmill_roles.up.sql
@@ -0,0 +1,15 @@
+-- The dispatch_event table (migration 20260523055641_dispatch_event) was
+-- created relying on ALTER DEFAULT PRIVILEGES to grant access to windmill_user
+-- and windmill_admin. Those default privileges only apply to objects created by
+-- the role that set them (migration 20250205131523), so deployments whose
+-- migration runner is a different role leave dispatch_event ungranted. Direct
+-- writes run as the invoking role -- the dispatcher insert (asset_dispatch.rs)
+-- and the DELETE in delete_jobs (windmill-common/src/jobs.rs), reached whenever
+-- a job's side rows are reaped, e.g. on schedule disable -- and fail with
+-- "permission denied for table dispatch_event". Grant explicitly to guarantee
+-- access regardless of who ran the migrations (same fix as notify_event in
+-- 20260619091631 and script_trigger in 20260619112847).
+GRANT ALL ON dispatch_event TO windmill_user;
+GRANT ALL ON dispatch_event TO windmill_admin;
+GRANT ALL ON SEQUENCE dispatch_event_id_seq TO windmill_user;
+GRANT ALL ON SEQUENCE dispatch_event_id_seq TO windmill_admin;
diff --git a/backend/migrations/20260701083047_grant_user_db_tables_to_windmill_roles.down.sql b/backend/migrations/20260701083047_grant_user_db_tables_to_windmill_roles.down.sql
new file mode 100644
index 0000000000..b73484e053
--- /dev/null
+++ b/backend/migrations/20260701083047_grant_user_db_tables_to_windmill_roles.down.sql
@@ -0,0 +1,6 @@
+REVOKE ALL ON workspace_diff FROM windmill_user;
+REVOKE ALL ON workspace_diff FROM windmill_admin;
+REVOKE ALL ON materialized_partition FROM windmill_user;
+REVOKE ALL ON materialized_partition FROM windmill_admin;
+REVOKE ALL ON debounce_stale_data FROM windmill_user;
+REVOKE ALL ON debounce_stale_data FROM windmill_admin;
diff --git a/backend/migrations/20260701083047_grant_user_db_tables_to_windmill_roles.up.sql b/backend/migrations/20260701083047_grant_user_db_tables_to_windmill_roles.up.sql
new file mode 100644
index 0000000000..9205934600
--- /dev/null
+++ b/backend/migrations/20260701083047_grant_user_db_tables_to_windmill_roles.up.sql
@@ -0,0 +1,22 @@
+-- Same grant gap fixed for notify_event (20260619091631), script_trigger
+-- (20260619112847), and dispatch_event: tables created after the one-time
+-- GRANT ALL in 20250205131523 rely on ALTER DEFAULT PRIVILEGES, which only
+-- applies to objects created by the role that set them. On deployments whose
+-- migration runner is a different role, these tables end up ungranted, and
+-- writes that run under the RLS role (a transaction opened via
+-- user_db.begin(&authed) -> SET LOCAL ROLE windmill_user/windmill_admin) fail
+-- with "permission denied for table <name>".
+--
+-- Each table below has a confirmed write on a user_db transaction:
+--   * workspace_diff        -- UPDATE in set_ws_specific (workspaces.rs)
+--   * materialized_partition -- INSERT via record_materialization (assets API)
+--   * debounce_stale_data   -- DELETE in resume_suspended_trigger_jobs
+--                              (global_handler.rs), the same tx that reaps a
+--                              job's side rows
+-- None has a sequence, so only table grants are needed.
+GRANT ALL ON workspace_diff TO windmill_user;
+GRANT ALL ON workspace_diff TO windmill_admin;
+GRANT ALL ON materialized_partition TO windmill_user;
+GRANT ALL ON materialized_partition TO windmill_admin;
+GRANT ALL ON debounce_stale_data TO windmill_user;
+GRANT ALL ON debounce_stale_data TO windmill_admin;
diff --git a/backend/migrations/20260701123436_realign_superadmin_favorites_to_derived_username.down.sql b/backend/migrations/20260701123436_realign_superadmin_favorites_to_derived_username.down.sql
new file mode 100644
index 0000000000..2e3e434bcc
--- /dev/null
+++ b/backend/migrations/20260701123436_realign_superadmin_favorites_to_derived_username.down.sql
@@ -0,0 +1,3 @@
+-- Irreversible data backfill: once realigned to the derived username, a favorite
+-- is indistinguishable from one legitimately created under that username, so there
+-- is nothing safe to revert. No-op.
diff --git a/backend/migrations/20260701123436_realign_superadmin_favorites_to_derived_username.up.sql b/backend/migrations/20260701123436_realign_superadmin_favorites_to_derived_username.up.sql
new file mode 100644
index 0000000000..b06f63d7af
--- /dev/null
+++ b/backend/migrations/20260701123436_realign_superadmin_favorites_to_derived_username.up.sql
@@ -0,0 +1,19 @@
+-- A superadmin acting in a workspace they are not a member of used to be
+-- identified by their raw email (so favorites were stored with usr = email).
+-- They are now identified by their instance-derived username (password.username),
+-- so realign those pre-existing favorites to keep them visible. Only email-keyed
+-- rows are ever a superadmin's (members always store a non-email username), and
+-- the anti-join skips rows that would collide with an already-derived favorite.
+UPDATE favorite f
+SET usr = p.username
+FROM password p
+WHERE f.usr = p.email
+  AND p.super_admin = true
+  AND p.username IS NOT NULL
+  AND NOT EXISTS (
+    SELECT 1 FROM favorite f2
+    WHERE f2.workspace_id = f.workspace_id
+      AND f2.usr = p.username
+      AND f2.favorite_kind = f.favorite_kind
+      AND f2.path = f.path
+  );
diff --git a/backend/migrations/20260702064737_workspace_storage_usage.down.sql b/backend/migrations/20260702064737_workspace_storage_usage.down.sql
new file mode 100644
index 0000000000..e32480a602
--- /dev/null
+++ b/backend/migrations/20260702064737_workspace_storage_usage.down.sql
@@ -0,0 +1 @@
+DROP TABLE workspace_storage_usage;
diff --git a/backend/migrations/20260702064737_workspace_storage_usage.up.sql b/backend/migrations/20260702064737_workspace_storage_usage.up.sql
new file mode 100644
index 0000000000..d7274e8742
--- /dev/null
+++ b/backend/migrations/20260702064737_workspace_storage_usage.up.sql
@@ -0,0 +1,17 @@
+-- Cached per-(workspace, storage) byte usage of workspace object storage,
+-- refreshed by listing the storage location and adjusted optimistically as
+-- uploads complete. Read on every workspace-storage write in CE builds to
+-- enforce the storage quota, and by the storage_usage endpoint in all builds.
+CREATE TABLE workspace_storage_usage (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
+    storage VARCHAR(255) NOT NULL,
+    bytes BIGINT NOT NULL DEFAULT 0,
+    computed_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (workspace_id, storage)
+);
+
+-- Tables created after the one-time GRANT ALL in 20250205131523 need explicit
+-- grants: ALTER DEFAULT PRIVILEGES only covers objects created by the role
+-- that set them (same gap as workspace_diff, notify_event, script_trigger).
+GRANT ALL ON workspace_storage_usage TO windmill_user;
+GRANT ALL ON workspace_storage_usage TO windmill_admin;
diff --git a/backend/migrations/20260702095830_duckdb_macro_registry.down.sql b/backend/migrations/20260702095830_duckdb_macro_registry.down.sql
new file mode 100644
index 0000000000..6f48e71d0f
--- /dev/null
+++ b/backend/migrations/20260702095830_duckdb_macro_registry.down.sql
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS macro_usage;
+DROP TABLE IF EXISTS macro_definition;
diff --git a/backend/migrations/20260702095830_duckdb_macro_registry.up.sql b/backend/migrations/20260702095830_duckdb_macro_registry.up.sql
new file mode 100644
index 0000000000..ccc4bcc8cc
--- /dev/null
+++ b/backend/migrations/20260702095830_duckdb_macro_registry.up.sql
@@ -0,0 +1,31 @@
+-- Workspace DuckDB macro registry: one row per macro defined by a deployed
+-- `// macros` library script. Names are workspace-unique (macros are injected
+-- unqualified into consumer jobs).
+CREATE TABLE macro_definition (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
+    name VARCHAR(255) NOT NULL,
+    provider_path VARCHAR(510) NOT NULL,
+    params TEXT NOT NULL,
+    body TEXT NOT NULL,
+    is_table_macro BOOLEAN NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (workspace_id, name)
+);
+CREATE INDEX idx_macro_definition_provider ON macro_definition (workspace_id, provider_path);
+
+-- Deploy-recorded consumer→macro edges, for the asset graph only (the worker
+-- re-detects calls live at job time).
+CREATE TABLE macro_usage (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
+    consumer_path VARCHAR(510) NOT NULL,
+    macro_name VARCHAR(255) NOT NULL,
+    PRIMARY KEY (workspace_id, consumer_path, macro_name)
+);
+CREATE INDEX idx_macro_usage_name ON macro_usage (workspace_id, macro_name);
+
+-- Both tables are written on user_db transactions (SET LOCAL ROLE); the
+-- one-time GRANT ALL migration predates them, so explicit grants are required.
+GRANT ALL ON macro_definition TO windmill_user;
+GRANT ALL ON macro_definition TO windmill_admin;
+GRANT ALL ON macro_usage TO windmill_user;
+GRANT ALL ON macro_usage TO windmill_admin;
diff --git a/backend/migrations/20260702213513_workspace_multipart_inflight.down.sql b/backend/migrations/20260702213513_workspace_multipart_inflight.down.sql
new file mode 100644
index 0000000000..e72edd0b12
--- /dev/null
+++ b/backend/migrations/20260702213513_workspace_multipart_inflight.down.sql
@@ -0,0 +1 @@
+DROP TABLE workspace_multipart_inflight;
diff --git a/backend/migrations/20260702213513_workspace_multipart_inflight.up.sql b/backend/migrations/20260702213513_workspace_multipart_inflight.up.sql
new file mode 100644
index 0000000000..9768eaf842
--- /dev/null
+++ b/backend/migrations/20260702213513_workspace_multipart_inflight.up.sql
@@ -0,0 +1,32 @@
+-- Reservation for the parts of in-flight (initiated but not yet completed)
+-- multipart uploads to workspace object storage. Uncommitted parts occupy
+-- object-store capacity but are invisible to the list-based storage recount
+-- until completion, so CE folds this reservation into the remaining quota to
+-- bound abandoned uploads. One row per uploaded part so a re-uploaded part
+-- (same part_id) replaces rather than double-counts; a part is recorded only
+-- after its upstream upload succeeds. Rows are removed on successful complete
+-- and lazily expired after a TTL (abort/abandon rely on the TTL, which matches
+-- when the object store reaps the uncommitted parts).
+--   part_id              - S3 part number or Azure block id (string)
+--   part_bytes           - size of that part
+--   target_existing_size - size of the object the upload will overwrite (0 if new),
+--                          credited so an overwrite only reserves the net growth
+CREATE TABLE workspace_multipart_inflight (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
+    upload_id VARCHAR(512) NOT NULL,
+    part_id VARCHAR(256) NOT NULL,
+    storage VARCHAR(255) NOT NULL,
+    part_bytes BIGINT NOT NULL DEFAULT 0,
+    target_existing_size BIGINT NOT NULL DEFAULT 0,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (workspace_id, upload_id, part_id)
+);
+
+CREATE INDEX idx_workspace_multipart_inflight_created_at
+    ON workspace_multipart_inflight (created_at);
+
+-- Tables created after the one-time GRANT ALL in 20250205131523 need explicit
+-- grants: ALTER DEFAULT PRIVILEGES only covers objects created by the role that
+-- set them (same gap as workspace_storage_usage, notify_event, script_trigger).
+GRANT ALL ON workspace_multipart_inflight TO windmill_user;
+GRANT ALL ON workspace_multipart_inflight TO windmill_admin;
diff --git a/backend/migrations/20260703165613_pipeline_freshness_watchdog.down.sql b/backend/migrations/20260703165613_pipeline_freshness_watchdog.down.sql
new file mode 100644
index 0000000000..aed2f9d32a
--- /dev/null
+++ b/backend/migrations/20260703165613_pipeline_freshness_watchdog.down.sql
@@ -0,0 +1,5 @@
+-- Postgres has no ALTER TYPE ... DROP VALUE for enums. The 'freshness' value
+-- stays even on rollback, consistent with prior job_trigger_kind additions
+-- (see 20260510174213_asset_trigger_dispatch).
+DROP INDEX IF EXISTS idx_script_pipeline_freshness_scan;
+DROP TABLE IF EXISTS pipeline_freshness_state;
diff --git a/backend/migrations/20260703165613_pipeline_freshness_watchdog.up.sql b/backend/migrations/20260703165613_pipeline_freshness_watchdog.up.sql
new file mode 100644
index 0000000000..acf9545c96
--- /dev/null
+++ b/backend/migrations/20260703165613_pipeline_freshness_watchdog.up.sql
@@ -0,0 +1,35 @@
+-- Attribution for runs pushed by the pipeline freshness watchdog (the EE
+-- background loop that re-runs a `// freshness`-annotated producer whose
+-- output aged past its window).
+ALTER TYPE job_trigger_kind ADD VALUE IF NOT EXISTS 'freshness';
+
+-- Per-(workspace, script) watchdog state: exponential-backoff bookkeeping so
+-- a persistently failing producer isn't re-pushed on every scan tick, and an
+-- atomic claim so concurrent servers can't double-push in the same tick
+-- (claim = the UPDATE/INSERT that advances next_attempt_at; only the winner
+-- pushes). Rows exist only while a script is stale — observing it fresh (or
+-- its annotation gone) deletes the row, resetting the backoff.
+CREATE TABLE pipeline_freshness_state (
+    workspace_id VARCHAR(50) NOT NULL REFERENCES workspace (id) ON DELETE CASCADE,
+    script_path VARCHAR(510) NOT NULL,
+    attempts INTEGER NOT NULL DEFAULT 1,
+    last_push_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    next_attempt_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    PRIMARY KEY (workspace_id, script_path)
+);
+
+-- Written only by the server monitor loop on the raw (non-RLS) pool, but
+-- granted like every other app table so a future user-transaction reader
+-- doesn't hit the recurring missing-GRANT class of bug.
+GRANT ALL ON pipeline_freshness_state TO windmill_user;
+GRANT ALL ON pipeline_freshness_state TO windmill_admin;
+
+-- The watchdog's ~60s candidate scan (latest deployed pipeline members)
+-- filters on this exact predicate and orders by (workspace_id, path,
+-- created_at DESC); without a matching partial index it seq-scans the whole
+-- script-version heap on every tick, on instances that mostly have zero
+-- pipeline scripts. (idx_script_pipeline_path is text_pattern_ops for
+-- prefix LIKE — it can't serve this ordering.)
+CREATE INDEX idx_script_pipeline_freshness_scan
+    ON script (workspace_id, path, created_at DESC)
+    WHERE auto_kind = 'pipeline' AND archived = false AND deleted = false;
diff --git a/backend/migrations/20260703170745_fork_ducklake_namespace.down.sql b/backend/migrations/20260703170745_fork_ducklake_namespace.down.sql
new file mode 100644
index 0000000000..fd722bf414
--- /dev/null
+++ b/backend/migrations/20260703170745_fork_ducklake_namespace.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS fork_ducklake_namespace;
diff --git a/backend/migrations/20260703170745_fork_ducklake_namespace.up.sql b/backend/migrations/20260703170745_fork_ducklake_namespace.up.sql
new file mode 100644
index 0000000000..7762304199
--- /dev/null
+++ b/backend/migrations/20260703170745_fork_ducklake_namespace.up.sql
@@ -0,0 +1,51 @@
+-- Registry of ducklake namespaces provisioned for fork/dev workspaces. One row per
+-- (fork workspace, lake name): records the exact catalog metadata schema and data
+-- sub-path the fork's jobs attach to, so fork deletion can drop the pg schema and
+-- delete the S3 prefix deterministically (the row is written on first resolution,
+-- before any physical state exists).
+--
+-- Deliberately NO foreign key to workspace(id): rows are the durable cleanup ledger and
+-- must OUTLIVE the workspace row when physical cleanup fails after the delete commits
+-- (unreachable catalog, storage outage) — a CASCADE would erase the only record of the
+-- orphaned namespace, letting a recreated same-id fork silently reattach stale tables.
+-- Rows are deleted explicitly after each successful cleanup; leftover rows for a reused
+-- id are retried at fork creation, which refuses to proceed while they cannot be cleaned.
+CREATE TABLE fork_ducklake_namespace (
+    workspace_id VARCHAR(50) NOT NULL,
+    ducklake_name VARCHAR(255) NOT NULL,
+    metadata_schema VARCHAR(63) NOT NULL,
+    -- Canonical identity of the catalog database the metadata schema lives in
+    -- (`<resource_type>:<resource_path>`, e.g. `instance:wm_ducklake` or
+    -- `postgres:u/admin/pg`). Cleanup connects to THIS catalog, not whatever the fork's
+    -- settings point at by then — a drifted catalog resource must not make cleanup drop a
+    -- schema in the wrong database and orphan the real one.
+    catalog TEXT NOT NULL,
+    -- Named workspace storage holding the fork's data files; '' = the default storage
+    -- (part of the PK, which cannot hold NULL).
+    storage TEXT NOT NULL DEFAULT '',
+    -- The storage's RESOLVED identity at registration time (`<lfs type>:<resource path or
+    -- root path>`, e.g. `s3:u/admin/minio` or `filesystem:/data/lfs`; '' = unknown). Cleanup
+    -- deletes the fork prefix from THIS storage, not whatever the logical name points at by
+    -- then — repointing a storage after attach must not orphan the original fork data (or
+    -- delete a colliding prefix from the new one).
+    storage_ref TEXT NOT NULL DEFAULT '',
+    -- The fork namespace's data path within that storage (a bucket-root
+    -- `__wm_forks/<fork wid>/…` prefix).
+    data_path TEXT NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    -- Cleanup phase state: true once the metadata schema has been dropped but data files (or
+    -- the row delete) still failed. Later retries then skip the schema phase entirely — they
+    -- need NO catalog credentials, which may be gone for good with the deleted fork's
+    -- resources. Reset to false whenever a live fork re-registers the row (re-attaching
+    -- recreates the schema).
+    schema_dropped BOOLEAN NOT NULL DEFAULT false,
+    -- One row per physical location EVER attached: if the fork's lake settings drift
+    -- (catalog/storage/path change), later attaches add rows rather than replace them, so
+    -- cleanup covers every location the fork wrote, not just the first.
+    PRIMARY KEY (workspace_id, ducklake_name, catalog, storage, storage_ref, data_path)
+);
+
+-- Resolution runs under user_db transactions (SET LOCAL ROLE) in API contexts, so the
+-- windmill roles need explicit grants (default privileges don't apply to app-created tables).
+GRANT ALL ON fork_ducklake_namespace TO windmill_user;
+GRANT ALL ON fork_ducklake_namespace TO windmill_admin;
diff --git a/backend/migrations/20260706094033_add_dev_workspace_label.down.sql b/backend/migrations/20260706094033_add_dev_workspace_label.down.sql
new file mode 100644
index 0000000000..0b9b81636a
--- /dev/null
+++ b/backend/migrations/20260706094033_add_dev_workspace_label.down.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace DROP COLUMN dev_workspace_label;
diff --git a/backend/migrations/20260706094033_add_dev_workspace_label.up.sql b/backend/migrations/20260706094033_add_dev_workspace_label.up.sql
new file mode 100644
index 0000000000..951f1ec3c9
--- /dev/null
+++ b/backend/migrations/20260706094033_add_dev_workspace_label.up.sql
@@ -0,0 +1,4 @@
+-- Cosmetic display label for a dev workspace: NULL/'dev' render as "dev", 'staging' renders as "stg".
+-- Only meaningful when is_dev_workspace = true; changes nothing about behavior (locking, promote and
+-- compare all key off is_dev_workspace / parent_workspace_id). The value is validated in the handler.
+ALTER TABLE workspace ADD COLUMN dev_workspace_label VARCHAR;
diff --git a/backend/parsers/windmill-parser-py-asset/src/lib.rs b/backend/parsers/windmill-parser-py-asset/src/lib.rs
index e8a0a1cc40..8d2e87a53e 100644
--- a/backend/parsers/windmill-parser-py-asset/src/lib.rs
+++ b/backend/parsers/windmill-parser-py-asset/src/lib.rs
@@ -262,6 +262,14 @@ impl AssetsFinder {
         };
 
         match arg_val {
+            // S3 helpers take an `S3Object` (constructor or dict literal) or an
+            // `s3://bucket/key` string. Other helpers take a bare resource-path
+            // string literal.
+            Some(arg) if matches!(kind, AssetKind::S3Object) => {
+                let path = s3_object_arg_path(arg).ok_or(())?;
+                self.assets
+                    .push(ParseAssetsResult { kind, path, access_type, columns: None });
+            }
             Some(Expr::Constant(ExprConstant { value: Constant::Str(value), .. })) => {
                 let path = parse_asset_syntax(&value, false)
                     .map(|(_, p)| p)
@@ -282,6 +290,81 @@ impl AssetsFinder {
 // Positional arguments in python can also be used by their name
 struct Arg(usize, &'static str);
 
+/// Extract a string-literal keyword argument, e.g. `s3="value"` in a call.
+fn keyword_str_value(keywords: &[rustpython_ast::Keyword], name: &str) -> Option<String> {
+    keywords
+        .iter()
+        .find(|kw| kw.arg.as_deref() == Some(name))
+        .and_then(|kw| match &kw.value {
+            Expr::Constant(ExprConstant { value: Constant::Str(s), .. }) => Some(s.clone()),
+            _ => None,
+        })
+}
+
+/// Extract a string-literal value from a dict literal, e.g. `{"s3": "value"}`.
+fn dict_str_value(dict: &rustpython_ast::ExprDict, name: &str) -> Option<String> {
+    dict.keys
+        .iter()
+        .zip(dict.values.iter())
+        .find_map(|(key, value)| match (key.as_ref()?, value) {
+            (
+                Expr::Constant(ExprConstant { value: Constant::Str(k), .. }),
+                Expr::Constant(ExprConstant { value: Constant::Str(v), .. }),
+            ) if k.as_str() == name => Some(v.clone()),
+            _ => None,
+        })
+}
+
+/// Resolve the SDK `S3Object` argument of `load_s3_file`/`load_s3_file_reader`/
+/// `write_s3_file` to a canonical asset path, mirroring `windmill-parser-ts-asset`:
+/// `S3Object(s3="<key>", storage="<bucket>"?)` — or the equivalent dict literal —
+/// maps to the URI `s3://<bucket>/<key>` (empty bucket for default storage, i.e.
+/// `s3:///<key>`), and a `"s3://bucket/key"` URI string is passed through.
+/// String args mirror the runtime `parse_s3_object` contract exactly: only a
+/// `s3://<storage>/<key>` URI with a non-empty key is valid — any other
+/// string (bare key, `s3://x`, empty key) raises at run time, so recording an
+/// edge for it would be a phantom node for a call that can only error.
+/// The resulting URI is fed through `parse_asset_syntax` so the stored path
+/// matches the TS object form and the `# on s3:///…` trigger form exactly.
+fn s3_object_arg_path(expr: &Expr) -> Option<String> {
+    let uri = match expr {
+        Expr::Constant(ExprConstant { value: Constant::Str(s), .. }) => {
+            match s
+                .strip_prefix("s3://")
+                .and_then(|rest| rest.split_once('/'))
+            {
+                Some((_, key)) if !key.is_empty() => s.clone(),
+                _ => return None,
+            }
+        }
+        Expr::Call(call) => {
+            // `S3Object(...)` imported directly or as `wmill.S3Object(...)`
+            let func_name = call
+                .func
+                .as_name_expr()
+                .map(|n| n.id.as_str())
+                .or_else(|| call.func.as_attribute_expr().map(|a| a.attr.as_str()))?;
+            if func_name != "S3Object" {
+                return None;
+            }
+            let key = keyword_str_value(&call.keywords, "s3")?;
+            let storage = keyword_str_value(&call.keywords, "storage").unwrap_or_default();
+            format!("s3://{storage}/{key}")
+        }
+        Expr::Dict(dict) => {
+            let key = dict_str_value(dict, "s3")?;
+            let storage = dict_str_value(dict, "storage").unwrap_or_default();
+            format!("s3://{storage}/{key}")
+        }
+        _ => return None,
+    };
+    Some(
+        parse_asset_syntax(&uri, false)
+            .map(|(_, p)| p.to_string())
+            .unwrap_or(uri),
+    )
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::BTreeMap;
@@ -300,13 +383,227 @@ def main():
             s.map_err(|e| e.to_string()),
             Ok(vec![ParseAssetsResult {
                 kind: AssetKind::S3Object,
-                path: "/test.csv".to_string(),
+                path: "test.csv".to_string(),
                 access_type: Some(R),
                 columns: None,
             },])
         );
     }
 
+    #[test]
+    fn test_py_asset_parser_bare_string_no_asset() {
+        // A plain (non-`s3://`) string is rejected by the runtime
+        // `parse_s3_object`, so the parser must not record a phantom asset
+        // for a call that can only error.
+        let input = r#"
+import wmill
+def main():
+    wmill.write_s3_file("pipelines/etl/out.jsonl", b"")
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(s.map_err(|e| e.to_string()), Ok(vec![]));
+    }
+
+    #[test]
+    fn test_py_asset_parser_invalid_uri_no_write_edge() {
+        // `s3://x` (no key part) and `s3://bucket/` (empty key) are rejected
+        // by the runtime `parse_s3_object` — same rule for the SDK-arg path:
+        // no R/W edge. The generic URI-literal scan may still record them as
+        // ambiguous (`access_type: None`) assets, like any `s3://…` string
+        // constant anywhere in a script.
+        let input = r#"
+import wmill
+def main():
+    wmill.write_s3_file("s3://broken", b"")
+    wmill.write_s3_file("s3://bucket/", b"")
+"#;
+        let assets = parse_assets(input).expect("parse").assets;
+        assert!(
+            assets.iter().all(|a| a.access_type.is_none()),
+            "invalid URIs must not produce R/W edges: {assets:?}"
+        );
+    }
+
+    #[test]
+    fn test_py_asset_parser_write_s3_object_constructor() {
+        // The SDK signature is `write_s3_file(s3object: S3Object | str, ...)` and
+        // its docstring recommends the constructor form with a bare key. It must
+        // resolve to the same canonical path as the TS object form and a
+        // `# on s3:///<key>` trigger.
+        let input = r#"
+import wmill
+from wmill import S3Object
+def main():
+    wmill.write_s3_file(S3Object(s3="analytics/x.csv"), b"content")
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "analytics/x.csv".to_string(),
+                access_type: Some(W),
+                columns: None,
+            },])
+        );
+    }
+
+    #[test]
+    fn test_py_write_key_matches_duckdb_read_key() {
+        // Cross-language lineage: this write records `exports/x`, the same path a
+        // DuckDB `read_csv('s3://exports/x')` resolves to (see
+        // windmill-parser-sql-asset `test_duckdb_read_key_matches_sdk_write_key`),
+        // so the producer and consumer connect in the pipeline graph.
+        let input = r#"
+import wmill
+from wmill import S3Object
+def main():
+    wmill.write_s3_file(S3Object(s3="exports/x"), b"content")
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "exports/x".to_string(),
+                access_type: Some(W),
+                columns: None,
+            },])
+        );
+    }
+
+    #[test]
+    fn test_py_asset_parser_s3_object_with_storage() {
+        // `S3Object(s3=..., storage=...)` maps to `s3://<storage>/<key>`,
+        // matching the `s3://bucket/key` string form and the TS object form.
+        let input = r#"
+import wmill
+from wmill import S3Object
+def main():
+    wmill.load_s3_file(S3Object(s3="dir/in.csv", storage="mybucket"))
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "mybucket/dir/in.csv".to_string(),
+                access_type: Some(R),
+                columns: None,
+            },])
+        );
+    }
+
+    #[test]
+    fn test_py_asset_parser_s3_object_reader_and_keyword_arg() {
+        // load_s3_file_reader + passing the S3Object via the `s3object` keyword
+        // and via the `wmill.S3Object` attribute form.
+        let input = r#"
+import wmill
+def main():
+    wmill.load_s3_file_reader(s3object=wmill.S3Object(s3="dir/in.csv"))
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "dir/in.csv".to_string(),
+                access_type: Some(R),
+                columns: None,
+            },])
+        );
+    }
+
+    #[test]
+    fn test_py_asset_parser_s3_object_dict_literal() {
+        // `S3Object` subclasses dict, so the SDK also accepts a plain dict
+        // literal — same resolution as the constructor form.
+        let input = r#"
+import wmill
+def main():
+    wmill.write_s3_file({"s3": "out.json"}, b"{}")
+    wmill.load_s3_file({"s3": "dir/in.csv", "storage": "mybucket"})
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "mybucket/dir/in.csv".to_string(),
+                    access_type: Some(R),
+                    columns: None,
+                },
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "out.json".to_string(),
+                    access_type: Some(W),
+                    columns: None,
+                },
+            ])
+        );
+    }
+
+    #[test]
+    fn test_py_asset_parser_multiple_s3_object_writes() {
+        // Several direct constructor-form writes in main() — all outputs must
+        // be detected (merge_assets returns a deterministic path-sorted order).
+        let input = r#"
+import wmill
+from wmill import S3Object
+def main():
+    wmill.write_s3_file(S3Object(s3="pipelines/km_real/raw_events.json"), b"[]")
+    wmill.write_s3_file(S3Object(s3="pipelines/km_real/enriched.json"), b"[]")
+    wmill.write_s3_file(S3Object(s3="pipelines/km_real/summary.json"), b"[]")
+    wmill.write_s3_file(S3Object(s3="pipelines/km_real/report.json"), b"{}")
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "pipelines/km_real/enriched.json".to_string(),
+                    access_type: Some(W),
+                    columns: None,
+                },
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "pipelines/km_real/raw_events.json".to_string(),
+                    access_type: Some(W),
+                    columns: None,
+                },
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "pipelines/km_real/report.json".to_string(),
+                    access_type: Some(W),
+                    columns: None,
+                },
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "pipelines/km_real/summary.json".to_string(),
+                    access_type: Some(W),
+                    columns: None,
+                },
+            ])
+        );
+    }
+
+    #[test]
+    fn test_py_asset_parser_s3_object_dynamic_key_no_false_positive() {
+        // A computed key can't be resolved statically — must yield nothing
+        // rather than a bogus path.
+        let input = r#"
+import wmill
+from wmill import S3Object
+def main(name: str):
+    wmill.write_s3_file(S3Object(s3=f"pipelines/{name}.json"), b"{}")
+"#;
+        let s = parse_assets(input).map(|o| o.assets);
+        assert_eq!(s.map_err(|e| e.to_string()), Ok(vec![]));
+    }
+
     #[test]
     fn test_py_asset_parser_unused_sql() {
         let input = r#"
diff --git a/backend/parsers/windmill-parser-sql-asset/src/asset_parser.rs b/backend/parsers/windmill-parser-sql-asset/src/asset_parser.rs
index 812bfa785d..d2ab5b51a7 100644
--- a/backend/parsers/windmill-parser-sql-asset/src/asset_parser.rs
+++ b/backend/parsers/windmill-parser-sql-asset/src/asset_parser.rs
@@ -9,8 +9,9 @@ use sqlparser::{
     parser::Parser,
 };
 use windmill_parser::asset_parser::{
-    asset_was_used, merge_assets, parse_asset_syntax, parse_pipeline_annotations, AssetKind,
-    AssetUsageAccessType, ParseAssetsOutput, ParseAssetsResult,
+    asset_was_used, merge_assets, merge_column_lineage, parse_asset_syntax,
+    parse_pipeline_annotations, AssetKind, AssetUsageAccessType, ColumnLineage, ColumnRef,
+    ParseAssetsOutput, ParseAssetsResult,
 };
 use AssetUsageAccessType::*;
 
@@ -33,19 +34,105 @@ pub fn parse_assets(input: &str) -> anyhow::Result<ParseAssetsOutput> {
         }
     }
 
-    let pipeline = parse_pipeline_annotations(input);
-    Ok(ParseAssetsOutput::new(
-        merge_assets(collector.assets),
-        Vec::new(),
-        pipeline,
-    ))
+    let mut pipeline = parse_pipeline_annotations(input);
+    // Scope inferred lineage to a single output asset so columns from an
+    // auxiliary CTAS aren't attributed to the materialized one (the flat list
+    // has no per-entry output on the wire). The `// materialize` target, when
+    // declared, IS the output: keep entries tagged with it plus untagged
+    // top-level-SELECT entries (which describe that target). Without a declared
+    // target, keep inference only when every tagged entry shares one output
+    // asset — otherwise it's ambiguous which asset the flat list describes, so
+    // drop it rather than show false dependencies.
+    let target = pipeline
+        .materialize
+        .as_ref()
+        .map(|m| (m.target_kind, m.target_path.clone()));
+    let inferred: Vec<ColumnLineage> = match &target {
+        Some(t) => collector
+            .column_lineage
+            .into_iter()
+            .filter(|(out, _)| out.as_ref().map_or(true, |o| o == t))
+            .map(|(_, cl)| cl)
+            .collect(),
+        None => {
+            let mut first: Option<&(AssetKind, String)> = None;
+            let mut ambiguous = false;
+            for (out, _) in &collector.column_lineage {
+                if let Some(o) = out {
+                    match first {
+                        None => first = Some(o),
+                        Some(f) if f != o => {
+                            ambiguous = true;
+                            break;
+                        }
+                        _ => {}
+                    }
+                }
+            }
+            if ambiguous {
+                Vec::new()
+            } else {
+                collector
+                    .column_lineage
+                    .into_iter()
+                    .map(|(_, cl)| cl)
+                    .collect()
+            }
+        }
+    };
+    // Body-inferred column lineage, with `// column` annotations taking
+    // precedence per output column (explicit declaration overrides inference).
+    pipeline.column_lineage = merge_column_lineage(inferred, pipeline.column_lineage);
+    // A bare string literal in query position is only weak read evidence: a
+    // summary `SELECT 's3:///out.csv' AS target` after `COPY … TO
+    // 's3:///out.csv'` must not turn the write into rw (which draws a
+    // spurious read edge and an asset⇄script cycle in the pipeline graph).
+    // Surface weak reads only for assets with no other recorded usage, so a
+    // path that is *merely* mentioned still shows up linked to the script.
+    let mut assets = merge_assets(collector.assets);
+    for weak in merge_assets(collector.weak_string_reads) {
+        if !assets
+            .iter()
+            .any(|a| a.kind == weak.kind && a.path == weak.path)
+        {
+            assets.push(weak);
+        }
+    }
+    assets.sort_by(|a, b| a.path.cmp(&b.path));
+    Ok(ParseAssetsOutput::new(assets, Vec::new(), pipeline))
+}
+
+/// Provenance of the innermost access context. The access type alone can't
+/// tell a definitive read apart from a mere mention: a bare string literal in
+/// generic query position (`QueryRead`) is only *weak* read evidence — e.g. a
+/// summary `SELECT 's3:///out.csv' AS target` echoing a path — while the same
+/// literal as a read-function argument or a `COPY` target is definitive.
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum AccessCtx {
+    QueryRead,
+    ReadFn,
+    CopyWrite,
+}
+
+impl AccessCtx {
+    fn access_type(self) -> AssetUsageAccessType {
+        match self {
+            AccessCtx::QueryRead | AccessCtx::ReadFn => R,
+            AccessCtx::CopyWrite => W,
+        }
+    }
 }
 
 /// Visitor that collects S3 asset literals from SQL statements
 struct AssetCollector {
     assets: Vec<ParseAssetsResult>,
-    // e.g set to Read when we are inside a SELECT ... FROM ... statement
-    current_access_type_stack: Vec<AssetUsageAccessType>,
+    // Bare string literals seen in generic query position — weak read
+    // evidence, surfaced by `parse_assets` only when the script has no other
+    // recorded usage of the same asset (a real write must not gain a spurious
+    // read edge from a mention).
+    weak_string_reads: Vec<ParseAssetsResult>,
+    // e.g set to QueryRead when we are inside a SELECT ... FROM ... statement
+    current_access_type_stack: Vec<AccessCtx>,
     // e.g ATTACH 'ducklake://a' AS dl; => { "dl": (Ducklake, "a") }
     var_identifiers: BTreeMap<String, (AssetKind, String)>,
     // e.g USE dl;
@@ -54,26 +141,46 @@ struct AssetCollector {
     cte_name_stack: Vec<HashSet<String>>,
     // Locally created tables (not attached to an asset)
     local_table_names: HashSet<String>,
+    // Inferred column-level lineage: one entry per output column of an
+    // output-producing query, mapping it to the upstream source columns its
+    // expression reads. Each is tagged with the *output asset* it belongs to —
+    // `Some((kind, path))` for a CTAS / CREATE VIEW into a real asset, `None`
+    // for a top-level managed-materialize SELECT (its output is the `//
+    // materialize` target, known only in `parse_assets`). `parse_assets` uses
+    // the tag to scope the flat list to a single output asset so columns from an
+    // auxiliary output don't get attributed to the materialized one. Best-effort:
+    // dynamic/raw SQL, INSERT…SELECT, and wildcards are left to annotations.
+    column_lineage: Vec<(Option<(AssetKind, String)>, ColumnLineage)>,
 }
 
 impl AssetCollector {
     fn new() -> Self {
         Self {
             assets: Vec::new(),
+            weak_string_reads: Vec::new(),
             current_access_type_stack: Vec::with_capacity(8),
             var_identifiers: BTreeMap::new(),
             currently_used_asset: None,
             cte_name_stack: Vec::new(),
             local_table_names: HashSet::new(),
+            column_lineage: Vec::new(),
         }
     }
 
-    /// If the name resolves to an attached asset, record it. Otherwise, register it as a local
-    /// table/view so that subsequent references are not mistakenly attributed to the active asset.
-    fn track_table_definition(&mut self, name: &ObjectName) {
-        if let Some(asset) = self.get_associated_asset_from_obj_name(name, Some(W)) {
-            self.assets.push(asset);
-        } else if let Some(simple_name) = get_trivial_obj_name(name) {
+    /// Record a `CREATE TABLE`/`VIEW` target. A *temporary* table/view is always
+    /// local — even a one-part name under an active `USE dl`, which would
+    /// otherwise resolve to an asset (`ducklake://…/tmp`) and then leak as a
+    /// column source for later references. A non-temp name that resolves to an
+    /// attached asset is recorded as that asset; anything else is registered
+    /// local so subsequent references aren't attributed to the active asset.
+    fn track_table_definition(&mut self, name: &ObjectName, is_temporary: bool) {
+        if !is_temporary {
+            if let Some(asset) = self.get_associated_asset_from_obj_name(name, Some(W)) {
+                self.assets.push(asset);
+                return;
+            }
+        }
+        if let Some(simple_name) = get_trivial_obj_name(name) {
             self.local_table_names.insert(simple_name.to_lowercase());
         }
     }
@@ -94,7 +201,11 @@ impl AssetCollector {
         name: &ObjectName,
         access_type: Option<AssetUsageAccessType>,
     ) -> Option<ParseAssetsResult> {
-        let access_type = access_type.or_else(|| self.current_access_type_stack.last().copied());
+        let access_type = access_type.or_else(|| {
+            self.current_access_type_stack
+                .last()
+                .map(|c| c.access_type())
+        });
         if let Some((kind, path)) = &self.currently_used_asset {
             // We don't want to infer that any simple identifier refers to an asset if
             // we are not in a known R/W context
@@ -233,12 +344,18 @@ impl AssetCollector {
         // Check if the string matches our asset syntax patterns
         if let Some((kind, path)) = parse_asset_syntax(s, false) {
             if kind == AssetKind::S3Object {
-                self.assets.push(ParseAssetsResult {
+                let ctx = self.current_access_type_stack.last().copied();
+                let result = ParseAssetsResult {
                     kind,
                     path: path.to_string(),
-                    access_type: self.current_access_type_stack.last().copied(),
+                    access_type: ctx.map(AccessCtx::access_type),
                     columns: None,
-                });
+                };
+                if ctx == Some(AccessCtx::QueryRead) {
+                    self.weak_string_reads.push(result);
+                } else {
+                    self.assets.push(result);
+                }
             }
         }
     }
@@ -246,7 +363,7 @@ impl AssetCollector {
     fn handle_obj_name_pre(&mut self, name: &ObjectName) {
         if let Some(fname) = get_trivial_obj_name(name) {
             if is_read_fn(fname) {
-                self.current_access_type_stack.push(R);
+                self.current_access_type_stack.push(AccessCtx::ReadFn);
             }
         }
         if let Some(str_lit) = get_str_lit_from_obj_name(name) {
@@ -280,6 +397,22 @@ impl AssetCollector {
         }
     }
 
+    // Infer the output-column lineage of a query that produces an asset, tagging
+    // each entry with its `output` asset. Called only for an output-producing
+    // query — a top-level managed-materialize SELECT (`output: None`, resolved
+    // to the `// materialize` target later) or a CTAS / CREATE VIEW into a real
+    // asset (`output: Some`). A CTAS into a local/temp staging table is never
+    // an output, so it's simply not passed here.
+    fn infer_query_output(
+        &mut self,
+        query: &sqlparser::ast::Query,
+        output: Option<(AssetKind, String)>,
+    ) {
+        if let Some(select) = query.body.as_select() {
+            self.infer_column_lineage(&select.projection, &select.from, output);
+        }
+    }
+
     fn handle_table_with_joins(
         &mut self,
         table_with_joins: &sqlparser::ast::TableWithJoins,
@@ -302,17 +435,57 @@ impl AssetCollector {
         }
     }
 
-    // Extract columns from SELECT items and create individual asset results for each column
-    // Only processes columns that reference known assets to avoid false positives
-    fn extract_column_assets(
-        &mut self,
-        projection: &[SelectItem],
+    // The alias-map entry (key → asset) for one FROM/JOIN table factor, or
+    // `None` if it isn't an asset-backed table. The key is its alias, else the
+    // bare table name; S3 table-functions and string-literal tables are only
+    // keyed when aliased (an unaliased one is ambiguous). Returns the asset with
+    // a single matched relation so the caller can attribute qualified columns.
+    fn table_alias_entry(&self, relation: &TableFactor) -> Option<(String, ParseAssetsResult)> {
+        let TableFactor::Table { name, alias, args, .. } = relation else {
+            return None;
+        };
+        let has_args = args.as_ref().map_or(false, |a| !a.args.is_empty());
+        if has_args {
+            let alias = alias.as_ref()?;
+            let asset = self.get_s3_asset_from_table_function(relation)?;
+            return Some((alias.name.value.clone(), asset));
+        }
+        let asset = self
+            .get_associated_asset_from_obj_name(name, Some(R))
+            .or_else(|| self.get_s3_asset_from_str_literal_table(relation))?;
+        if get_str_lit_from_obj_name(name).is_some() {
+            // String-literal S3 table: only unambiguous when aliased.
+            let alias = alias.as_ref()?;
+            return Some((alias.name.value.clone(), asset));
+        }
+        let key = match alias {
+            Some(a) => a.name.value.clone(),
+            None => name
+                .0
+                .last()
+                .and_then(|id| id.as_ident())
+                .map(|id| id.value.clone())
+                .unwrap_or_default(),
+        };
+        Some((key, asset))
+    }
+
+    // Resolve a query's FROM clause into (single-table asset, alias→asset map).
+    // `single_table` is `Some` only for an unambiguous one-table FROM with no
+    // joins (so bare column refs can be attributed); `table_to_asset` keys by
+    // alias/table name for qualified refs and includes every JOINed table.
+    // Shared by `extract_column_assets` (read columns) and `infer_column_lineage`
+    // (output→input edges) so both resolve identically.
+    fn build_from_maps(
+        &self,
         from_tables: &[sqlparser::ast::TableWithJoins],
+    ) -> (
+        Option<ParseAssetsResult>,
+        BTreeMap<String, ParseAssetsResult>,
     ) {
-        // Check if this is a single-table SELECT (to avoid ambiguity).
-        // For S3 table functions (read_parquet/read_csv/read_json), detect the asset even
-        // though args are present, since we know the file path from the string literal arg.
-        let single_table = if from_tables.len() == 1 {
+        // Single unambiguous table only when there's exactly one FROM entry AND
+        // it has no joins — otherwise a bare column could belong to any side.
+        let single_table = if from_tables.len() == 1 && from_tables[0].joins.is_empty() {
             let relation = &from_tables[0].relation;
             if let TableFactor::Table { name, args, .. } = relation {
                 let has_args = args.as_ref().map_or(false, |a| !a.args.is_empty());
@@ -329,51 +502,30 @@ impl AssetCollector {
             None
         };
 
-        // Build a map of table aliases/names to assets for multi-table queries.
-        // For S3 table functions, only aliased references are unambiguous
-        // (e.g. SELECT t.col1 FROM read_parquet('s3://...') AS t).
+        // Alias → asset for qualified column refs, across every FROM entry AND
+        // its JOINed tables (so `c.col` in `FROM a JOIN c` resolves).
         let mut table_to_asset: BTreeMap<String, ParseAssetsResult> = BTreeMap::new();
         for table_with_joins in from_tables {
-            if let TableFactor::Table { name, alias, args, .. } = &table_with_joins.relation {
-                let has_args = args.as_ref().map_or(false, |a| !a.args.is_empty());
-                if has_args {
-                    // For table functions, only add to the alias map when an alias is present
-                    if let Some(alias) = alias {
-                        if let Some(asset) =
-                            self.get_s3_asset_from_table_function(&table_with_joins.relation)
-                        {
-                            table_to_asset.insert(alias.name.value.clone(), asset);
-                        }
-                    }
-                } else if let Some(asset) = self
-                    .get_associated_asset_from_obj_name(name, Some(R))
-                    .or_else(|| {
-                        self.get_s3_asset_from_str_literal_table(&table_with_joins.relation)
-                    })
-                {
-                    // For string literal S3 tables (e.g. FROM 's3:///file.parquet'), only add to
-                    // the alias map when an alias is present (to avoid false positives).
-                    // For regular named tables, use alias or table name as key.
-                    let is_str_literal = get_str_lit_from_obj_name(name).is_some();
-                    if is_str_literal {
-                        if let Some(alias) = alias {
-                            table_to_asset.insert(alias.name.value.clone(), asset);
-                        }
-                    } else {
-                        let table_key = if let Some(alias) = alias {
-                            alias.name.value.clone()
-                        } else {
-                            name.0
-                                .last()
-                                .and_then(|id| id.as_ident())
-                                .map(|id| id.value.clone())
-                                .unwrap_or_default()
-                        };
-                        table_to_asset.insert(table_key, asset);
-                    }
+            if let Some((k, a)) = self.table_alias_entry(&table_with_joins.relation) {
+                table_to_asset.insert(k, a);
+            }
+            for join in &table_with_joins.joins {
+                if let Some((k, a)) = self.table_alias_entry(&join.relation) {
+                    table_to_asset.insert(k, a);
                 }
             }
         }
+        (single_table, table_to_asset)
+    }
+
+    // Extract columns from SELECT items and create individual asset results for each column
+    // Only processes columns that reference known assets to avoid false positives
+    fn extract_column_assets(
+        &mut self,
+        projection: &[SelectItem],
+        from_tables: &[sqlparser::ast::TableWithJoins],
+    ) {
+        let (single_table, table_to_asset) = self.build_from_maps(from_tables);
 
         // Process each SELECT item
         for item in projection {
@@ -446,6 +598,136 @@ impl AssetCollector {
             }
         }
     }
+
+    // Infer column-level lineage for an output-producing query's projection:
+    // each *named* output column → the upstream source columns its expression
+    // reads. Covers passthroughs (`amount`) and computed columns
+    // (`amount + tax AS total`) alike. Skipped: wildcards and unaliased
+    // expressions (no stable output name), and inputs that don't resolve to a
+    // known asset. A column with no resolved inputs is dropped.
+    //
+    // Best-effort and intentionally flat: results from every output query in the
+    // script accumulate into one list (the graph hangs them off the materialize
+    // write-edge), with no per-output-table association. This is exact for the
+    // common single-output member (a managed-materialize SELECT, or one CTAS),
+    // but a multi-statement script that stages through a TEMP table reports the
+    // *intermediate* column names (the final SELECT reads the temp table, whose
+    // columns don't resolve to an asset, so they drop out). A `// column`
+    // annotation overrides any output column where inference is wrong or coarse.
+    fn infer_column_lineage(
+        &mut self,
+        projection: &[SelectItem],
+        from_tables: &[sqlparser::ast::TableWithJoins],
+        output: Option<(AssetKind, String)>,
+    ) {
+        let (single_table, table_to_asset) = self.build_from_maps(from_tables);
+        for item in projection {
+            let (out_col, expr) = match item {
+                SelectItem::ExprWithAlias { expr, alias } => (alias.value.clone(), expr),
+                SelectItem::UnnamedExpr(expr @ Expr::Identifier(id)) => (id.value.clone(), expr),
+                SelectItem::UnnamedExpr(expr @ Expr::CompoundIdentifier(parts)) => {
+                    match parts.last() {
+                        Some(last) => (last.value.clone(), expr),
+                        None => continue,
+                    }
+                }
+                _ => continue,
+            };
+            let mut collector = ColumnIdentCollector { refs: Vec::new(), query_depth: 0 };
+            let _ = expr.visit(&mut collector);
+            let mut inputs: Vec<ColumnRef> = Vec::new();
+            for parts in &collector.refs {
+                if let Some(cr) = self.resolve_column_ref(parts, &single_table, &table_to_asset) {
+                    if !inputs.contains(&cr) {
+                        inputs.push(cr);
+                    }
+                }
+            }
+            if !inputs.is_empty() {
+                self.column_lineage
+                    .push((output.clone(), ColumnLineage { column: out_col, inputs }));
+            }
+        }
+    }
+
+    // Resolve identifier `parts` (e.g. `["t","amount"]` or `["amount"]`) to the
+    // source asset column it reads, mirroring `extract_column_assets`'
+    // resolution: a bare ident needs an unambiguous single-table FROM; a
+    // qualified ident resolves its prefix via the alias map, or (≥3 parts) as a
+    // db/schema-qualified object name.
+    fn resolve_column_ref(
+        &self,
+        parts: &[String],
+        single_table: &Option<ParseAssetsResult>,
+        table_to_asset: &BTreeMap<String, ParseAssetsResult>,
+    ) -> Option<ColumnRef> {
+        let asset_to_ref = |asset: &ParseAssetsResult, col: &str| ColumnRef {
+            from_kind: asset.kind,
+            from_path: asset.path.clone(),
+            from_column: col.to_string(),
+        };
+        match parts {
+            [col] => single_table.as_ref().map(|a| asset_to_ref(a, col)),
+            [.., col] => {
+                let prefix = parts.first()?;
+                if let Some(asset) = table_to_asset.get(prefix) {
+                    Some(asset_to_ref(asset, col))
+                } else if parts.len() >= 3 {
+                    let obj_parts: Vec<ObjectNamePart> = parts[..parts.len() - 1]
+                        .iter()
+                        .map(|p| ObjectNamePart::Identifier(sqlparser::ast::Ident::new(p.clone())))
+                        .collect();
+                    let asset =
+                        self.get_associated_asset_from_obj_name(&ObjectName(obj_parts), Some(R))?;
+                    Some(asset_to_ref(&asset, col))
+                } else {
+                    None
+                }
+            }
+            [] => None,
+        }
+    }
+}
+
+// Collects the identifier paths an expression reads, for column-lineage
+// inference: `Expr::Identifier(a)` → `["a"]`, `Expr::CompoundIdentifier(t.a)` →
+// `["t","a"]`. The derived `Visit` walk recurses through operators, functions,
+// casts and CASE, so every leaf identifier of the outer expression is captured.
+struct ColumnIdentCollector {
+    refs: Vec<Vec<String>>,
+    // Depth of nested (sub)queries inside the expression. Identifiers are only
+    // captured at depth 0: a scalar/correlated subquery's columns belong to ITS
+    // own FROM, not the outer projection's, so descending would misattribute
+    // (e.g. `(SELECT x FROM other) AS c FROM orders` must NOT bind `c` to
+    // `orders.x`). Subquery-derived columns are simply left to annotations.
+    query_depth: usize,
+}
+
+impl Visitor for ColumnIdentCollector {
+    type Break = ();
+
+    fn pre_visit_query(&mut self, _query: &sqlparser::ast::Query) -> std::ops::ControlFlow<()> {
+        self.query_depth += 1;
+        std::ops::ControlFlow::Continue(())
+    }
+
+    fn post_visit_query(&mut self, _query: &sqlparser::ast::Query) -> std::ops::ControlFlow<()> {
+        self.query_depth = self.query_depth.saturating_sub(1);
+        std::ops::ControlFlow::Continue(())
+    }
+
+    fn pre_visit_expr(&mut self, expr: &Expr) -> std::ops::ControlFlow<Self::Break> {
+        if self.query_depth == 0 {
+            match expr {
+                Expr::Identifier(id) => self.refs.push(vec![id.value.clone()]),
+                Expr::CompoundIdentifier(parts) => self
+                    .refs
+                    .push(parts.iter().map(|id| id.value.clone()).collect()),
+                _ => {}
+            }
+        }
+        std::ops::ControlFlow::Continue(())
+    }
 }
 
 impl Visitor for AssetCollector {
@@ -458,9 +740,20 @@ impl Visitor for AssetCollector {
         match table_factor {
             TableFactor::Table { name, args, .. } => {
                 if args.is_none() {
-                    // Avoid Table Functions
-                    self.handle_obj_name_pre(name);
+                    // FROM 's3:///…' is a definitive read — record it directly
+                    // so it isn't demoted to a weak in-query mention.
+                    if let Some(asset) = self.get_s3_asset_from_str_literal_table(table_factor) {
+                        self.assets.push(asset);
+                    }
                 }
+                // For a read-function table factor this pushes ReadFn, making
+                // every literal inside its arguments a definitive read — the
+                // direct form (read_csv('s3:///…')) but also list and named
+                // arguments (read_parquet(['s3:///…'])). Must run for BOTH the
+                // plain-table and table-function branches: post_visit_table_factor
+                // pops via handle_obj_name_post unconditionally, so skipping the
+                // push here would unbalance the stack.
+                self.handle_obj_name_pre(name);
             }
             _ => {}
         }
@@ -486,6 +779,13 @@ impl Visitor for AssetCollector {
             Expr::Value(ValueWithSpan { value: Value::DoubleQuotedString(s), .. }) => {
                 self.handle_string_literal(s);
             }
+            // Read-function call in expression position: its argument literals
+            // are definitive reads. Balances the pop in `post_visit_expr`.
+            Expr::Function(func) => {
+                if get_trivial_obj_name(&func.name).is_some_and(is_read_fn) {
+                    self.current_access_type_stack.push(AccessCtx::ReadFn);
+                }
+            }
             _ => {}
         }
         std::ops::ControlFlow::Continue(())
@@ -505,7 +805,11 @@ impl Visitor for AssetCollector {
     ) -> std::ops::ControlFlow<Self::Break> {
         match statement {
             sqlparser::ast::Statement::Query(q) => {
+                // A top-level SELECT is the managed-materialize output, so its
+                // columns ARE the materialized asset's columns (output resolved
+                // to the `// materialize` target in `parse_assets`).
                 self.handle_query_reads(q);
+                self.infer_query_output(q, None);
             }
 
             sqlparser::ast::Statement::Insert(insert) => {
@@ -658,18 +962,32 @@ impl Visitor for AssetCollector {
             }
 
             sqlparser::ast::Statement::CreateTable(create_table) => {
-                self.track_table_definition(&create_table.name);
+                self.track_table_definition(&create_table.name, create_table.temporary);
                 // `CREATE TABLE x AS SELECT … FROM y` reads y. The AS-query
                 // isn't a `Statement::Query`, so its FROM tables are only
-                // caught here.
+                // caught here. Only infer output lineage when `x` is a real
+                // asset — a CTAS into a local/temp staging table is not the
+                // materialized output (its columns aren't the asset's).
                 if let Some(query) = &create_table.query {
                     self.handle_query_reads(query);
+                    // Infer only when `x` is a real asset (its output columns
+                    // ARE that asset's), tagged with it so `parse_assets` can
+                    // scope lineage per output. A local/temp staging table is
+                    // not an asset → not inferred.
+                    if let Some(asset) =
+                        self.get_associated_asset_from_obj_name(&create_table.name, Some(W))
+                    {
+                        self.infer_query_output(query, Some((asset.kind, asset.path)));
+                    }
                 }
             }
 
-            sqlparser::ast::Statement::CreateView { name, query, .. } => {
-                self.track_table_definition(name);
+            sqlparser::ast::Statement::CreateView { name, query, temporary, .. } => {
+                self.track_table_definition(name, *temporary);
                 self.handle_query_reads(query);
+                if let Some(asset) = self.get_associated_asset_from_obj_name(name, Some(W)) {
+                    self.infer_query_output(query, Some((asset.kind, asset.path)));
+                }
             }
 
             // DROP TABLE/VIEW is a write to the dropped object — the
@@ -687,13 +1005,15 @@ impl Visitor for AssetCollector {
                         | sqlparser::ast::ObjectType::MaterializedView
                 ) {
                     for name in names {
-                        self.track_table_definition(name);
+                        // DROP is a write to the named object; resolve it as an
+                        // asset if it is one (not a temp-creation context).
+                        self.track_table_definition(name, false);
                     }
                 }
             }
 
             sqlparser::ast::Statement::Copy { target: CopyTarget::File { filename }, .. } => {
-                self.current_access_type_stack.push(W);
+                self.current_access_type_stack.push(AccessCtx::CopyWrite);
                 self.handle_string_literal(filename);
                 self.current_access_type_stack.pop();
             }
@@ -760,7 +1080,7 @@ impl Visitor for AssetCollector {
         &mut self,
         query: &sqlparser::ast::Query,
     ) -> std::ops::ControlFlow<Self::Break> {
-        self.current_access_type_stack.push(R);
+        self.current_access_type_stack.push(AccessCtx::QueryRead);
         self.cte_name_stack.push(collect_cte_names(query));
         std::ops::ControlFlow::Continue(())
     }
@@ -825,13 +1145,13 @@ mod tests {
             Ok(vec![
                 ParseAssetsResult {
                     kind: AssetKind::S3Object,
-                    path: "/a.parquet".to_string(),
+                    path: "a.parquet".to_string(),
                     access_type: Some(R),
                     columns: None
                 },
                 ParseAssetsResult {
                     kind: AssetKind::S3Object,
-                    path: "/c.parquet".to_string(),
+                    path: "c.parquet".to_string(),
                     access_type: Some(W),
                     columns: None
                 },
@@ -845,6 +1165,151 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_duckdb_read_key_matches_sdk_write_key() {
+        // Cross-language lineage: a TS `writeS3File({ s3: "exports/x" })` or
+        // Python `write_s3_file(S3Object(s3="exports/x"))` records the asset path
+        // `exports/x` (default storage). A DuckDB reader of the same object must
+        // resolve to the identical path so the graph connects the producer and
+        // consumer — both the bare `s3://exports/x` and the triple-slash
+        // `s3:///exports/x` default-storage form must yield `exports/x`.
+        for uri in ["s3://exports/x", "s3:///exports/x"] {
+            let input = format!("SELECT * FROM read_csv('{uri}');");
+            let assets = parse_assets(&input).expect("parse").assets;
+            assert_eq!(
+                assets,
+                vec![ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "exports/x".to_string(),
+                    access_type: Some(R),
+                    columns: None
+                }],
+                "DuckDB read of {uri} must resolve to the SDK write key"
+            );
+        }
+    }
+
+    #[test]
+    fn test_copy_target_echoed_in_select_stays_write_only() {
+        // The trailing summary SELECT merely mentions the COPY target — it
+        // must not add a read (rw would draw an asset⇄script cycle).
+        let input = r#"
+            COPY (SELECT 1 AS x) TO 's3:///out.csv';
+            SELECT 's3:///out.csv' AS target, 42 AS rows_written;
+        "#;
+        let s = parse_assets(input).map(|s| s.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "out.csv".to_string(),
+                access_type: Some(W),
+                columns: None
+            }])
+        );
+    }
+
+    #[test]
+    fn test_bare_string_mention_without_other_usage_is_a_read() {
+        let input = r#"
+            SELECT 's3:///referenced.csv' AS path;
+        "#;
+        let s = parse_assets(input).map(|s| s.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "referenced.csv".to_string(),
+                access_type: Some(R),
+                columns: None
+            }])
+        );
+    }
+
+    #[test]
+    fn test_self_refresh_read_fn_plus_copy_stays_rw() {
+        // A definitive read (read_csv) of the same file the script rewrites
+        // is a real rw — only *bare-literal* mentions are demoted.
+        let input = r#"
+            CREATE TABLE tmp AS SELECT * FROM read_csv('s3:///data.csv');
+            COPY (SELECT * FROM tmp) TO 's3:///data.csv';
+        "#;
+        let s = parse_assets(input).map(|s| s.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "data.csv".to_string(),
+                access_type: Some(RW),
+                columns: None
+            }])
+        );
+    }
+
+    #[test]
+    fn test_read_fn_list_arg_plus_copy_stays_rw() {
+        // read_parquet's list form is as definitive as the direct literal —
+        // it must not be demoted to a weak mention when the file is rewritten.
+        let input = r#"
+            CREATE TABLE tmp AS SELECT * FROM read_parquet(['s3:///data.parquet']);
+            COPY (SELECT * FROM tmp) TO 's3:///data.parquet';
+        "#;
+        let s = parse_assets(input).map(|s| s.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "data.parquet".to_string(),
+                access_type: Some(RW),
+                columns: None
+            }])
+        );
+    }
+
+    #[test]
+    fn test_read_fn_list_arg_multiple_files_are_reads() {
+        let input = r#"
+            SELECT * FROM read_parquet(['s3:///a.parquet', 's3:///b.parquet']);
+        "#;
+        let s = parse_assets(input).map(|s| s.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "a.parquet".to_string(),
+                    access_type: Some(R),
+                    columns: None
+                },
+                ParseAssetsResult {
+                    kind: AssetKind::S3Object,
+                    path: "b.parquet".to_string(),
+                    access_type: Some(R),
+                    columns: None
+                }
+            ])
+        );
+    }
+
+    #[test]
+    fn test_from_string_literal_of_written_file_stays_rw() {
+        // FROM-position string literal is likewise a definitive read.
+        let input = r#"
+            CREATE TABLE tmp AS SELECT * FROM 's3:///data.parquet';
+            COPY (SELECT * FROM tmp) TO 's3:///data.parquet';
+        "#;
+        let s = parse_assets(input).map(|s| s.assets);
+        assert_eq!(
+            s.map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "data.parquet".to_string(),
+                access_type: Some(RW),
+                columns: None
+            }])
+        );
+    }
+
     #[test]
     fn test_sql_asset_parser_attach_no_usage_is_registered_as_unknown() {
         let input = r#"
@@ -1520,7 +1985,7 @@ mod tests {
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].kind, AssetKind::S3Object);
-        assert_eq!(result[0].path, "/example_file.parquet");
+        assert_eq!(result[0].path, "example_file.parquet");
         assert_eq!(result[0].access_type, Some(R));
 
         let columns = result[0].columns.as_ref().expect("Should have columns");
@@ -1551,7 +2016,7 @@ mod tests {
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].kind, AssetKind::S3Object);
-        assert_eq!(result[0].path, "/example_file.parquet");
+        assert_eq!(result[0].path, "example_file.parquet");
         assert!(result[0].columns.is_none());
     }
 
@@ -1564,7 +2029,7 @@ mod tests {
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].kind, AssetKind::S3Object);
-        assert_eq!(result[0].path, "/example_file.parquet");
+        assert_eq!(result[0].path, "example_file.parquet");
 
         let columns = result[0].columns.as_ref().expect("Should have columns");
         assert_eq!(columns.get("col1"), Some(&R));
@@ -1583,7 +2048,7 @@ mod tests {
         assert_eq!(result.len(), 2);
 
         assert!(result.iter().any(|a| {
-            a.path == "/file1.parquet"
+            a.path == "file1.parquet"
                 && a.columns.as_ref().map_or(false, |c| c.contains_key("col1"))
         }));
         assert!(result.iter().any(|a| {
@@ -1616,7 +2081,7 @@ mod tests {
 
         assert_eq!(result.len(), 1);
         assert_eq!(result[0].kind, AssetKind::S3Object);
-        assert_eq!(result[0].path, "/test.parquet");
+        assert_eq!(result[0].path, "test.parquet");
         assert_eq!(result[0].access_type, Some(R));
 
         let columns = result[0].columns.as_ref().expect("Should have columns");
@@ -1920,8 +2385,9 @@ mod ctas_read_tests {
             assets
         );
         assert!(
-            assets.iter().any(|a| a.path == "main/exciting_809"
-                && a.access_type == Some(W)),
+            assets
+                .iter()
+                .any(|a| a.path == "main/exciting_809" && a.access_type == Some(W)),
             "expected write of main/exciting_809, got {:?}",
             assets
         );
@@ -1935,9 +2401,292 @@ mod ctas_read_tests {
         "#;
         let assets = parse_assets(input).unwrap().assets;
         assert!(
-            assets.iter().any(|a| a.path == "main/fx_rates" && a.access_type == Some(R)),
+            assets
+                .iter()
+                .any(|a| a.path == "main/fx_rates" && a.access_type == Some(R)),
             "expected read of main/fx_rates, got {:?}",
             assets
         );
     }
+
+    fn lineage(input: &str) -> Vec<ColumnLineage> {
+        parse_assets(input).unwrap().column_lineage
+    }
+
+    #[test]
+    fn test_infer_lineage_computed_and_passthrough() {
+        // CTAS with a computed column (amount + tax) and a passthrough (id).
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.orders_daily AS
+            SELECT dl.orders.id, dl.orders.amount + dl.orders.tax AS order_total
+            FROM dl.orders;
+        "#;
+        let got = lineage(input);
+        assert_eq!(
+            got,
+            vec![
+                ColumnLineage {
+                    column: "id".to_string(),
+                    inputs: vec![ColumnRef {
+                        from_kind: AssetKind::Ducklake,
+                        from_path: "warehouse/orders".to_string(),
+                        from_column: "id".to_string(),
+                    }],
+                },
+                ColumnLineage {
+                    column: "order_total".to_string(),
+                    inputs: vec![
+                        ColumnRef {
+                            from_kind: AssetKind::Ducklake,
+                            from_path: "warehouse/orders".to_string(),
+                            from_column: "amount".to_string(),
+                        },
+                        ColumnRef {
+                            from_kind: AssetKind::Ducklake,
+                            from_path: "warehouse/orders".to_string(),
+                            from_column: "tax".to_string(),
+                        },
+                    ],
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_bare_column_single_table() {
+        // Managed-materialize form: a plain top-level SELECT, bare columns
+        // attributed to the single FROM table.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            USE dl;
+            SELECT amount AS revenue FROM orders;
+        "#;
+        let got = lineage(input);
+        assert_eq!(
+            got,
+            vec![ColumnLineage {
+                column: "revenue".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "warehouse/orders".to_string(),
+                    from_column: "amount".to_string(),
+                }],
+            }]
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_annotation_overrides() {
+        // The `// column` annotation for `order_total` wins; `id` stays inferred.
+        let input = r#"
+            -- column order_total <- datatable://prod/manual.grand_total
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.orders_daily AS
+            SELECT dl.orders.id, dl.orders.amount + dl.orders.tax AS order_total
+            FROM dl.orders;
+        "#;
+        let got = lineage(input);
+        // Annotation entry is authoritative and listed first.
+        assert_eq!(got[0].column, "order_total");
+        assert_eq!(got[0].inputs[0].from_path, "prod/manual");
+        assert_eq!(got[0].inputs[0].from_column, "grand_total");
+        // Inferred `id` survives; inferred `order_total` dropped (no dup).
+        assert!(got.iter().any(|c| c.column == "id"));
+        assert_eq!(got.iter().filter(|c| c.column == "order_total").count(), 1);
+    }
+
+    #[test]
+    fn test_infer_lineage_skips_local_staging_ctas() {
+        // A CTAS into a TEMP/local table is NOT the materialized output, so its
+        // columns must not be reported (they'd be anchored to the script's
+        // `// materialize` target as if they were the final asset's columns).
+        // The final SELECT reads the local staging table → unresolved → empty.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TEMP TABLE tmp AS SELECT dl.orders.amount AS amt FROM dl.orders;
+            SELECT amt AS total FROM tmp;
+        "#;
+        assert!(
+            lineage(input).is_empty(),
+            "staging columns must not be reported as final output; got {:?}",
+            lineage(input)
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_ctas_into_asset_still_inferred() {
+        // A CTAS whose target IS an asset is the output, so it's still inferred.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.orders_daily AS SELECT dl.orders.amount AS amt FROM dl.orders;
+        "#;
+        assert_eq!(
+            lineage(input),
+            vec![ColumnLineage {
+                column: "amt".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "warehouse/orders".to_string(),
+                    from_column: "amount".to_string(),
+                }],
+            }]
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_temp_table_under_use_is_local() {
+        // A one-part TEMP table name under an active `USE dl` must NOT resolve to
+        // an asset (`warehouse/tmp`); it's local, so the final SELECT reading it
+        // can't invent `warehouse/tmp.amt` as a column source for the output.
+        let input = r#"
+            -- materialize ducklake://warehouse/final
+            ATTACH 'ducklake://warehouse' AS dl;
+            USE dl;
+            CREATE TEMP TABLE tmp AS SELECT amount AS amt FROM orders;
+            SELECT amt AS total FROM tmp;
+        "#;
+        let got = lineage(input);
+        assert!(
+            got.is_empty(),
+            "temp staging under USE must not leak warehouse/tmp as a source; got {:?}",
+            got
+        );
+        // And no phantom `warehouse/tmp` asset is recorded.
+        let assets = parse_assets(input).unwrap().assets;
+        assert!(
+            !assets.iter().any(|a| a.path == "warehouse/tmp"),
+            "temp table must not be recorded as an asset; got {:?}",
+            assets
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_scopes_to_materialize_target() {
+        // A script with a `// materialize` target plus an AUXILIARY CTAS into a
+        // different asset: only the materialized target's columns are reported;
+        // the auxiliary output's columns must not be attributed to it.
+        let input = r#"
+            -- materialize ducklake://warehouse/final
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.audit AS SELECT dl.orders.id AS aid FROM dl.orders;
+            SELECT dl.orders.amount AS total FROM dl.orders;
+        "#;
+        assert_eq!(
+            lineage(input),
+            vec![ColumnLineage {
+                column: "total".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "warehouse/orders".to_string(),
+                    from_column: "amount".to_string(),
+                }],
+            }],
+            "auxiliary `audit` columns must not appear on the materialized target"
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_drops_ambiguous_multi_output() {
+        // No `// materialize` target and two real CTAS outputs: which asset the
+        // flat lineage describes is ambiguous, so inference is dropped rather
+        // than attributed to an arbitrary one.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.a AS SELECT dl.orders.id AS x FROM dl.orders;
+            CREATE TABLE dl.b AS SELECT dl.orders.amount AS y FROM dl.orders;
+        "#;
+        assert!(
+            lineage(input).is_empty(),
+            "ambiguous multi-output must drop inference"
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_wildcard_yields_nothing() {
+        // `SELECT *` has no enumerable output columns → no inferred lineage.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.orders_daily AS SELECT * FROM dl.orders;
+        "#;
+        assert!(lineage(input).is_empty());
+    }
+
+    #[test]
+    fn test_infer_lineage_resolves_joined_inputs() {
+        // Columns from BOTH sides of an explicit JOIN must resolve, incl. a
+        // computed column mixing the two. A bare column is dropped (ambiguous
+        // across the join) rather than misattributed to the first table.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.orders_daily AS
+            SELECT o.id, c.region AS cust_region, o.amount + c.discount AS net
+            FROM dl.orders o
+            JOIN dl.customers c ON c.id = o.customer_id;
+        "#;
+        let got = lineage(input);
+        assert_eq!(
+            got,
+            vec![
+                ColumnLineage {
+                    column: "id".to_string(),
+                    inputs: vec![ColumnRef {
+                        from_kind: AssetKind::Ducklake,
+                        from_path: "warehouse/orders".to_string(),
+                        from_column: "id".to_string(),
+                    }],
+                },
+                ColumnLineage {
+                    column: "cust_region".to_string(),
+                    inputs: vec![ColumnRef {
+                        from_kind: AssetKind::Ducklake,
+                        from_path: "warehouse/customers".to_string(),
+                        from_column: "region".to_string(),
+                    }],
+                },
+                ColumnLineage {
+                    column: "net".to_string(),
+                    inputs: vec![
+                        ColumnRef {
+                            from_kind: AssetKind::Ducklake,
+                            from_path: "warehouse/orders".to_string(),
+                            from_column: "amount".to_string(),
+                        },
+                        ColumnRef {
+                            from_kind: AssetKind::Ducklake,
+                            from_path: "warehouse/customers".to_string(),
+                            from_column: "discount".to_string(),
+                        },
+                    ],
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn test_infer_lineage_does_not_descend_into_subqueries() {
+        // A scalar subquery's bare column (`amount`) belongs to the subquery's
+        // own FROM, NOT the outer `dl.orders` — it must not be attributed to the
+        // outer table. The subquery column is left to annotations; the
+        // passthrough `id` still resolves.
+        let input = r#"
+            ATTACH 'ducklake://warehouse' AS dl;
+            CREATE TABLE dl.orders_daily AS
+            SELECT dl.orders.id, (SELECT amount FROM dl.other LIMIT 1) AS c
+            FROM dl.orders;
+        "#;
+        let got = lineage(input);
+        assert_eq!(
+            got,
+            vec![ColumnLineage {
+                column: "id".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "warehouse/orders".to_string(),
+                    from_column: "id".to_string(),
+                }],
+            }],
+            "subquery column `c` must be dropped, not misattributed to orders"
+        );
+    }
 }
diff --git a/backend/parsers/windmill-parser-sql/src/lib.rs b/backend/parsers/windmill-parser-sql/src/lib.rs
index 931f470d3c..dc094a0a7b 100644
--- a/backend/parsers/windmill-parser-sql/src/lib.rs
+++ b/backend/parsers/windmill-parser-sql/src/lib.rs
@@ -826,6 +826,29 @@ fn parse_duckdb_file(code: &str) -> anyhow::Result<Option<Vec<Arg>>> {
     }
 
     args.append(&mut parse_sql_sanitized_interpolation(code));
+
+    // A `// partitioned` script receives its resolved partition as a job arg
+    // named `partition` (windmill_common::partition::PARTITION_ARG), and duckdb
+    // binds named parameters only when they appear in the parsed signature —
+    // so auto-declare it (as `-- $partition (text)` would) to make `$partition`
+    // usable without a manual declaration. An explicit declaration wins.
+    // `has_default` keeps the field optional: the platform resolves the value
+    // at run start when it is not passed explicitly.
+    if !args.iter().any(|arg| arg.name == "partition")
+        && windmill_parser::asset_parser::parse_pipeline_annotations(code)
+            .partition
+            .is_some()
+    {
+        args.push(Arg {
+            name: "partition".to_string(),
+            typ: Typ::Str(None),
+            default: None,
+            otyp: Some("text".to_string()),
+            has_default: true,
+            oidx: None,
+            otyp_inferred: false,
+        });
+    }
     Ok(Some(args))
 }
 
@@ -1985,4 +2008,63 @@ SELECT x
 
         Ok(())
     }
+
+    #[test]
+    fn test_parse_duckdb_partitioned_auto_declares_partition() -> anyhow::Result<()> {
+        let code = r#"// partitioned daily
+// materialize ducklake://main/sales_daily
+SELECT $partition AS day, count(*) AS n FROM sales WHERE day = $partition
+"#;
+        let args = parse_duckdb_sig(code)?.args;
+        assert_eq!(
+            args,
+            vec![Arg {
+                otyp: Some("text".to_string()),
+                name: "partition".to_string(),
+                typ: Typ::Str(None),
+                default: None,
+                has_default: true,
+                oidx: None,
+                otyp_inferred: false,
+            }]
+        );
+
+        // `--`-style annotation headers auto-declare too.
+        let dash_code = "-- partitioned hourly\nSELECT $partition AS h\n";
+        assert_eq!(parse_duckdb_sig(dash_code)?.args, args);
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_parse_duckdb_partitioned_explicit_declaration_wins() -> anyhow::Result<()> {
+        let code = r#"// partitioned daily
+-- $partition (text)
+-- $limit (int) = 10
+SELECT * FROM sales WHERE day = $partition LIMIT $limit
+"#;
+        let args = parse_duckdb_sig(code)?.args;
+        // No duplicate: the explicit (required) declaration is kept as-is.
+        assert_eq!(args.iter().filter(|a| a.name == "partition").count(), 1);
+        assert_eq!(
+            args[0],
+            Arg {
+                otyp: Some("text".to_string()),
+                name: "partition".to_string(),
+                typ: Typ::Str(None),
+                default: None,
+                has_default: false,
+                oidx: None,
+                otyp_inferred: false,
+            }
+        );
+        Ok(())
+    }
+
+    #[test]
+    fn test_parse_duckdb_unpartitioned_does_not_declare_partition() -> anyhow::Result<()> {
+        let code = "SELECT 1 AS partition_count\n";
+        assert_eq!(parse_duckdb_sig(code)?.args, vec![]);
+        Ok(())
+    }
 }
diff --git a/backend/parsers/windmill-parser-ts-asset/src/lib.rs b/backend/parsers/windmill-parser-ts-asset/src/lib.rs
index b7fe0fea5c..f273db5cbe 100644
--- a/backend/parsers/windmill-parser-ts-asset/src/lib.rs
+++ b/backend/parsers/windmill-parser-ts-asset/src/lib.rs
@@ -341,12 +341,25 @@ fn object_str_prop(obj: &ObjectLit, name: &str) -> Option<String> {
 /// `writeS3File` to a canonical asset path, mirroring the runtime
 /// `parseS3Object`: an object `{ s3: "<key>", storage?: "<bucket>" }` maps to
 /// the URI `s3://<bucket>/<key>` (empty bucket for default storage, i.e.
-/// `s3:///<key>`), and a bare `"s3://bucket/key"` string is passed through.
+/// `s3:///<key>`), and a `"s3://bucket/key"` URI string is passed through.
+/// String args mirror the runtime `parseS3Object` contract exactly: only a
+/// `s3://<storage>/<key>` URI with a non-empty key is valid — any other
+/// string (bare key, `s3://x`, empty key) throws at run time, so recording an
+/// edge for it would be a phantom node for a call that can only error.
 /// The resulting URI is fed through `parse_asset_syntax` so the stored path
 /// matches the `// on s3:///…` trigger form exactly.
 fn s3_object_arg_path(arg: &Expr) -> Option<String> {
     let uri = match arg {
-        Expr::Lit(Lit::Str(s)) => s.value.to_string(),
+        Expr::Lit(Lit::Str(s)) => {
+            let v = s.value.to_string();
+            match v
+                .strip_prefix("s3://")
+                .and_then(|rest| rest.split_once('/'))
+            {
+                Some((_, key)) if !key.is_empty() => v,
+                _ => return None,
+            }
+        }
         Expr::Object(obj) => {
             let key = object_str_prop(obj, "s3")?;
             let storage = object_str_prop(obj, "storage").unwrap_or_default();
@@ -420,7 +433,7 @@ mod tests {
             s.map(|r| r.assets).map_err(|e| e.to_string()),
             Ok(vec![ParseAssetsResult {
                 kind: AssetKind::S3Object,
-                path: "/test.csv".to_string(),
+                path: "test.csv".to_string(),
                 access_type: Some(R),
                 columns: None,
             },])
@@ -448,7 +461,31 @@ mod tests {
             s.map(|r| r.assets).map_err(|e| e.to_string()),
             Ok(vec![ParseAssetsResult {
                 kind: AssetKind::S3Object,
-                path: "/pipelines/km_real/raw_events.json".to_string(),
+                path: "pipelines/km_real/raw_events.json".to_string(),
+                access_type: Some(W),
+                columns: None,
+            },])
+        );
+    }
+
+    #[test]
+    fn test_ts_write_key_matches_duckdb_read_key() {
+        // Cross-language lineage: this write records `exports/x`, the same path a
+        // DuckDB `read_csv('s3://exports/x')` resolves to (see
+        // windmill-parser-sql-asset `test_duckdb_read_key_matches_sdk_write_key`),
+        // so the producer and consumer connect in the pipeline graph.
+        let input = r#"
+            import * as wmill from "windmill-client"
+            export async function main() {
+                await wmill.writeS3File({ s3: "exports/x" }, "[]")
+            }
+        "#;
+        let s = parse_assets(input);
+        assert_eq!(
+            s.map(|r| r.assets).map_err(|e| e.to_string()),
+            Ok(vec![ParseAssetsResult {
+                kind: AssetKind::S3Object,
+                path: "exports/x".to_string(),
                 access_type: Some(W),
                 columns: None,
             },])
@@ -477,6 +514,42 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_ts_asset_parser_bare_string_no_asset() {
+        // A plain (non-`s3://`) string is rejected by the runtime
+        // `parseS3Object`, so the parser must not record a phantom asset for
+        // a call that can only error.
+        let input = r#"
+            import * as wmill from "windmill-client"
+            export async function main() {
+                await wmill.writeS3File("pipelines/etl/out.jsonl", "[]")
+            }
+        "#;
+        let s = parse_assets(input);
+        assert_eq!(s.map(|r| r.assets).map_err(|e| e.to_string()), Ok(vec![]));
+    }
+
+    #[test]
+    fn test_ts_asset_parser_invalid_uri_no_write_edge() {
+        // `s3://x` (no key part) and `s3://bucket/` (empty key) are rejected
+        // by the runtime `parseS3Object` — same rule for the SDK-arg path:
+        // no R/W edge. The generic URI-literal scan may still record them as
+        // ambiguous (`access_type: None`) assets, like any `s3://…` string
+        // constant anywhere in a script.
+        let input = r#"
+            import * as wmill from "windmill-client"
+            export async function main() {
+                await wmill.writeS3File("s3://broken", "[]")
+                await wmill.writeS3File("s3://bucket/", "[]")
+            }
+        "#;
+        let assets = parse_assets(input).expect("parse").assets;
+        assert!(
+            assets.iter().all(|a| a.access_type.is_none()),
+            "invalid URIs must not produce R/W edges: {assets:?}"
+        );
+    }
+
     #[test]
     fn test_ts_asset_parser_multiple_s3_object_writes() {
         // Mirrors the f/km/r_seed shape: several direct object-form writes in
@@ -497,25 +570,25 @@ mod tests {
             Ok(vec![
                 ParseAssetsResult {
                     kind: AssetKind::S3Object,
-                    path: "/pipelines/km_real/enriched.json".to_string(),
+                    path: "pipelines/km_real/enriched.json".to_string(),
                     access_type: Some(W),
                     columns: None,
                 },
                 ParseAssetsResult {
                     kind: AssetKind::S3Object,
-                    path: "/pipelines/km_real/raw_events.json".to_string(),
+                    path: "pipelines/km_real/raw_events.json".to_string(),
                     access_type: Some(W),
                     columns: None,
                 },
                 ParseAssetsResult {
                     kind: AssetKind::S3Object,
-                    path: "/pipelines/km_real/report.json".to_string(),
+                    path: "pipelines/km_real/report.json".to_string(),
                     access_type: Some(W),
                     columns: None,
                 },
                 ParseAssetsResult {
                     kind: AssetKind::S3Object,
-                    path: "/pipelines/km_real/summary.json".to_string(),
+                    path: "pipelines/km_real/summary.json".to_string(),
                     access_type: Some(W),
                     columns: None,
                 },
@@ -536,7 +609,7 @@ mod tests {
             s.map(|r| r.assets).map_err(|e| e.to_string()),
             Ok(vec![ParseAssetsResult {
                 kind: AssetKind::S3Object,
-                path: "/out.json".to_string(),
+                path: "out.json".to_string(),
                 access_type: Some(W),
                 columns: None,
             },])
diff --git a/backend/parsers/windmill-parser-wasm/Cargo.lock b/backend/parsers/windmill-parser-wasm/Cargo.lock
index 6c00419131..4961d0907a 100644
--- a/backend/parsers/windmill-parser-wasm/Cargo.lock
+++ b/backend/parsers/windmill-parser-wasm/Cargo.lock
@@ -6191,7 +6191,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill-common"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -6272,7 +6272,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6284,7 +6284,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "convert_case",
  "serde",
@@ -6293,7 +6293,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6305,7 +6305,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -6317,7 +6317,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -6329,7 +6329,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6341,7 +6341,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -6353,7 +6353,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -6364,7 +6364,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -6375,7 +6375,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -6387,7 +6387,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-asset"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "rustpython-ast",
@@ -6398,7 +6398,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -6420,7 +6420,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-r"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -6432,7 +6432,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ruby"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6446,7 +6446,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "convert_case",
@@ -6463,7 +6463,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6476,7 +6476,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql-asset"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -6488,7 +6488,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6506,7 +6506,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts-asset"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde-wasm-bindgen",
@@ -6522,7 +6522,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wac"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "rustpython-ast",
@@ -6538,7 +6538,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.17",
@@ -6570,7 +6570,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -6581,7 +6581,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-types"
-version = "1.733.1"
+version = "1.753.0"
 dependencies = [
  "anyhow",
  "bitflags",
diff --git a/backend/parsers/windmill-parser-wasm/Cargo.toml b/backend/parsers/windmill-parser-wasm/Cargo.toml
index 4ab52f15a5..5763177b0b 100644
--- a/backend/parsers/windmill-parser-wasm/Cargo.toml
+++ b/backend/parsers/windmill-parser-wasm/Cargo.toml
@@ -12,7 +12,7 @@ resolver = "2"
 members = ["."]
 
 [workspace.package]
-version = "1.733.1"
+version = "1.753.0"
 edition = "2021"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 
diff --git a/backend/parsers/windmill-parser-yaml/src/lib.rs b/backend/parsers/windmill-parser-yaml/src/lib.rs
index 5d9945cadd..f2a1a2b824 100644
--- a/backend/parsers/windmill-parser-yaml/src/lib.rs
+++ b/backend/parsers/windmill-parser-yaml/src/lib.rs
@@ -269,6 +269,12 @@ pub struct DelegateToGitRepoDetails {
     pub commit: Option<String>,
     pub inventories_location: Option<String>,
     pub vars_location: Option<String>,
+    /// Path (relative to the cloned repo root) of an `ansible.cfg` to use as the
+    /// effective config for the run. When set, Windmill points `ANSIBLE_CONFIG` at
+    /// it so the repo's own settings (roles paths, inventory plugins, callbacks…)
+    /// apply, and only injects the settings that depend on runtime state it alone
+    /// controls (temp/home dirs, vault password) on top.
+    pub ansible_cfg: Option<String>,
     #[serde(default, skip_serializing_if = "std::ops::Not::not")]
     pub install_requirements: bool,
 }
@@ -629,6 +635,10 @@ fn extract_delegate_to_git_repo_details(value: &Yaml) -> Option<DelegateToGitRep
                 .get(&Yaml::String("vars_location".to_string()))
                 .and_then(|s| s.as_str())
                 .map(|s| s.to_string());
+            let ansible_cfg = v
+                .get(&Yaml::String("ansible_cfg".to_string()))
+                .and_then(|s| s.as_str())
+                .map(|s| s.to_string());
             let install_requirements = v
                 .get(&Yaml::String("install_requirements".to_string()))
                 .and_then(|s| s.as_bool())
@@ -640,6 +650,7 @@ fn extract_delegate_to_git_repo_details(value: &Yaml) -> Option<DelegateToGitRep
                 commit,
                 inventories_location,
                 vars_location,
+                ansible_cfg,
                 install_requirements,
             });
         }
@@ -1049,6 +1060,39 @@ delegate_to_git_repo:
         assert_eq!(d.playbook.as_deref(), Some("site.yml"));
     }
 
+    #[test]
+    fn test_parse_delegate_ansible_cfg() {
+        let p = r#"
+---
+delegate_to_git_repo:
+  resource: u/admin/repo
+  playbook: site.yml
+  ansible_cfg: config/ansible.cfg
+---
+- name: Test
+  hosts: all
+"#;
+        let (_, reqs, _) = parse_ansible_reqs(p).unwrap();
+        let d = reqs.unwrap().delegate_to_git_repo.unwrap();
+        assert_eq!(d.ansible_cfg.as_deref(), Some("config/ansible.cfg"));
+    }
+
+    #[test]
+    fn test_parse_delegate_ansible_cfg_absent() {
+        let p = r#"
+---
+delegate_to_git_repo:
+  resource: u/admin/repo
+  playbook: site.yml
+---
+- name: Test
+  hosts: all
+"#;
+        let (_, reqs, _) = parse_ansible_reqs(p).unwrap();
+        let d = reqs.unwrap().delegate_to_git_repo.unwrap();
+        assert_eq!(d.ansible_cfg, None);
+    }
+
     #[test]
     fn test_parse_install_requirements_true() {
         let p = r#"
diff --git a/backend/parsers/windmill-parser/src/asset_parser.rs b/backend/parsers/windmill-parser/src/asset_parser.rs
index ce0be81f00..bdce9ec764 100644
--- a/backend/parsers/windmill-parser/src/asset_parser.rs
+++ b/backend/parsers/windmill-parser/src/asset_parser.rs
@@ -77,10 +77,12 @@ pub struct ParseAssetsOutput {
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub partition: Option<PartitionSpec>,
     // `// freshness <duration>` — SLA stating outputs must be at most
-    // `duration` old. Active backstop: when no other trigger has fired the
-    // script within the window, a watchdog re-runs it. Distinct from
-    // schedule (which is producer cadence); freshness is consumer SLA and
-    // applies regardless of which trigger last fired.
+    // `duration` old. Drives passive monitoring in CE (the asset graph
+    // colors the node's badge fresh/stale against its last successful run)
+    // and the enterprise watchdog (windmill-queue `freshness_watchdog`),
+    // which re-runs a stale unpartitioned producer. Distinct from schedule
+    // (which is producer cadence); freshness is consumer SLA and applies
+    // regardless of which trigger last fired.
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub freshness: Option<FreshnessSpec>,
     // `// trigger all` → AND join barrier; default (`any`) = OR (current
@@ -107,6 +109,32 @@ pub struct ParseAssetsOutput {
     // The delay is a raw duration string parsed at deploy (parser-light).
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub retry: Option<RetrySpec>,
+    // `// materialize [manual] <asset> [append] [key=<col>]` —
+    // managed-materialization target + its strategy. At most one per script.
+    // Drives the worker's write-strategy + snapshot capture.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub materialize: Option<MaterializeSpec>,
+    // `// data_test <kind> …` — data-quality assertions run against the
+    // materialized asset after the write commits. Accumulating (multiple
+    // lines allowed). Drives the worker's post-materialize verifier probes.
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub data_tests: Vec<DataTest>,
+    // `// column <out> <- <src>.<col>[, …]` — declared column-level lineage,
+    // one entry per output column. Accumulating. Pure metadata: drives the
+    // column-lineage graph view, executes nothing.
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub column_lineage: Vec<ColumnLineage>,
+    // Bare `// macros` (must be alone on the line, like `// pipeline`) —
+    // marks this DuckDB script as a workspace *macro library*: its body is
+    // CREATE [OR REPLACE] MACRO statements (plus plain setup) registered at
+    // deploy and injected as TEMP macros into consumer jobs at run time.
+    #[serde(skip_serializing_if = "std::ops::Not::not", default)]
+    pub macros: bool,
+    // `// use <lib_script_path>` — force-inject the whole named macro
+    // library (definitions + its setup statements) into this script's jobs,
+    // for dynamic SQL that call-detection can't see. Accumulating.
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub use_libs: Vec<String>,
 }
 
 #[derive(Serialize, Debug, PartialEq, Clone)]
@@ -190,6 +218,40 @@ pub struct PartitionSpec {
     pub start: Option<String>,
 }
 
+impl PartitionKind {
+    /// The `strftime`/chrono format that renders a time grain's identity
+    /// string. SINGLE SOURCE OF TRUTH: the partition resolver stamps the stored
+    /// identity with this, and the `wm_partition` materialize macro filters
+    /// against it — the two must never drift, so both read it from here.
+    /// `Dynamic` has no wall-clock identity; it falls back to a plain date only
+    /// where some format is unconditionally required (never for bucketing).
+    pub fn default_time_format(&self) -> &'static str {
+        match self {
+            PartitionKind::Hourly => "%Y-%m-%dT%H",
+            PartitionKind::Weekly => "%G-W%V",
+            PartitionKind::Monthly => "%Y-%m",
+            _ => "%Y-%m-%d",
+        }
+    }
+}
+
+impl PartitionSpec {
+    /// Effective identity format for a TIME partition: the explicit `format=`
+    /// override, else the per-grain default. `None` for `dynamic` — its
+    /// identity is a caller-supplied key, not a formatted instant, so there is
+    /// no `strftime` bucketing expression (and hence no `wm_partition` macro).
+    pub fn time_strftime_format(&self) -> Option<&str> {
+        match self.kind {
+            PartitionKind::Dynamic { .. } => None,
+            _ => Some(
+                self.format
+                    .as_deref()
+                    .unwrap_or_else(|| self.kind.default_time_format()),
+            ),
+        }
+    }
+}
+
 // Freshness SLA. The duration is kept as a raw string ("1h", "30m", "2d")
 // and validated downstream — the parser deliberately doesn't bind to a
 // specific duration crate so the annotation grammar stays parser-light.
@@ -209,6 +271,228 @@ pub struct RetrySpec {
     pub delay: Option<String>,
 }
 
+// `// materialize [manual] <asset> [append] [key=<col>] [history] [track=<c1,c2>]`
+// — declares that this script produces a *managed* materialization of `<asset>`
+// (a `ducklake://` table). By default the runtime generates the write DDL around
+// the script's single trailing `SELECT` and owns idempotency, partition-state
+// and snapshot capture. `manual` is the escape hatch: the script writes its own
+// DDL and the runtime only records state (track-only). The reconciliation
+// strategy options apply to managed mode: none → DELETE-by-partition + INSERT
+// (replace); `key=<col>` → MERGE (dedup within slice, SCD type 1); `append` →
+// INSERT-only. `append` wins if both are given (deploy-time warning).
+// `key=<col> history` upgrades the merge to SCD type 2: the SELECT is the current
+// snapshot (one row per key), and a change to any tracked column (`track=`,
+// default all non-key) closes the prior version and opens a new one, keeping full
+// history (`valid_from`/`valid_to`/`is_current`). The leading keyword `scd2` is a
+// recognized alias for `history`. `deletes=close` (scd2 only) also closes a key
+// that disappears from the snapshot; default leaves absent keys current.
+// `on_schema_change=ignore` suppresses downstream schema-contract warnings for
+// the produced asset (save-time metadata only; default `warn`).
+#[derive(Serialize, Debug, PartialEq, Clone)]
+pub struct MaterializeSpec {
+    pub target_kind: AssetKind,
+    pub target_path: String,
+    #[serde(skip_serializing_if = "std::ops::Not::not", default)]
+    pub manual: bool,
+    #[serde(skip_serializing_if = "std::ops::Not::not", default)]
+    pub append: bool,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub unique_key: Option<String>,
+    // `scd2` managed history mode: the SELECT is the current snapshot (one row
+    // per `unique_key`), and the runtime maintains a Slowly-Changing-Dimension
+    // type-2 history (`valid_from`/`valid_to`/`is_current`). `unique_key` (the
+    // `key=` opt) is the natural key; `track` lists the columns whose change
+    // opens a new version (empty ⇒ all non-key columns). Managed mode only.
+    #[serde(skip_serializing_if = "std::ops::Not::not", default)]
+    pub scd2: bool,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub track: Vec<String>,
+    // scd2 only: `deletes=close` opts into hard-delete-close — a key that
+    // disappears from the snapshot has its current version closed (dbt's
+    // `hard_deletes=close`). Default (false) leaves absent keys current.
+    #[serde(skip_serializing_if = "std::ops::Not::not", default)]
+    pub close_deleted: bool,
+    // `on_schema_change=warn|ignore|fail|sync` governs two orthogonal things:
+    //   • Save-time contract warnings (gap #2b): consumers referencing columns
+    //     the captured schema no longer has warn by default; only `ignore`
+    //     suppresses those warnings (`warn`/`fail`/`sync` all keep them).
+    //   • Run-time write guardrails for the persist-and-mutate strategies
+    //     (partitioned replace, merge, append), where the table schema is fixed
+    //     at first CREATE and the write is positional — a renamed/added/removed
+    //     SELECT column silently lands in the wrong column. `warn` logs the
+    //     drift and proceeds positionally; `fail` aborts before mutating; `sync`
+    //     ALTERs the table to match and writes by name. Whole-table replace and
+    //     scd2 are unaffected. See `sql_materialize.rs`.
+    #[serde(skip_serializing_if = "OnSchemaChange::is_warn", default)]
+    pub on_schema_change: OnSchemaChange,
+}
+
+impl MaterializeSpec {
+    /// The `<target>_current` SCD2 companion view this managed materialize also
+    /// produces, or `None` when it isn't a managed scd2 target. Managed scd2
+    /// creates the base table *and* a `<dim>_current` "latest row per key" view
+    /// each run (see `sql_materialize.rs`); `manual` mode owns its own DDL and
+    /// short-circuits before that codegen, so it produces no companion.
+    pub fn scd2_current_target(&self) -> Option<(AssetKind, String)> {
+        (self.scd2 && !self.manual)
+            .then(|| (self.target_kind, format!("{}_current", self.target_path)))
+    }
+
+    /// Every asset this managed materialize produces: the base table, plus — for
+    /// managed scd2 — the `<target>_current` companion view. The producer's
+    /// trailing `SELECT` doesn't express these writes (the runtime generates the
+    /// DDL), so this is the single source of truth every graph surface (deploy
+    /// asset rows, the CLI `--local` graph, and the frontend live graph) uses to
+    /// link reads of the base *and* the `_current` view back to this producer.
+    pub fn write_targets(&self) -> Vec<(AssetKind, String)> {
+        let mut targets = vec![(self.target_kind, self.target_path.clone())];
+        targets.extend(self.scd2_current_target());
+        targets
+    }
+}
+
+// dbt's `on_schema_change`, covering both the save-time contract check and the
+// run-time write guardrail for the positional persist-and-mutate strategies:
+//   • `warn` (default): surface consumer contract warnings; at write time, log
+//     the drift loudly and proceed with the positional write against the fixed
+//     table schema.
+//   • `ignore`: suppress consumer contract warnings; at write time, no guard
+//     (the pre-guardrail behaviour).
+//   • `fail`: keep contract warnings; at write time, abort the run before
+//     mutating when the SELECT's column *set* diverges from the table's.
+//   • `sync`: keep contract warnings; at write time, ALTER the table to match
+//     the SELECT (add/drop columns) and INSERT BY NAME.
+// `warn`/`fail` drift detection is name-set based (added/removed columns), which
+// is what the positional persist-and-mutate INSERT can misalign on. It does NOT
+// flag a pure *reorder* of same-named columns: `SELECT b, a` into a `(a, b)`
+// table has an identical column set, so `fail` does not abort and the positional
+// INSERT swaps the values. Reorder-safety is exactly what `sync` provides
+// (INSERT BY NAME maps by name), so a SELECT whose column order is not pinned to
+// the table's should use `sync`, not `fail`. (An ordered-list comparison would
+// close this, but a false positive there would abort a correctly-aligned write,
+// so the guard stays on the set difference.)
+// `fail`/`sync` only affect partitioned replace, merge and append; whole-table
+// replace already rebuilds each run, and scd2 has no positional write — for an
+// scd2 target `sync` degrades to `warn` (no write-time effect; deploy-time
+// rejection is out of scope here).
+#[derive(Serialize, Debug, PartialEq, Eq, Clone, Copy, Default)]
+#[serde(rename_all = "lowercase")]
+pub enum OnSchemaChange {
+    #[default]
+    Warn,
+    Ignore,
+    Fail,
+    Sync,
+}
+
+impl OnSchemaChange {
+    pub fn is_warn(&self) -> bool {
+        matches!(self, OnSchemaChange::Warn)
+    }
+}
+
+impl MaterializeSpec {
+    /// Deploy-time validation of the option combination against the script's
+    /// partitioning, returning a human-facing error for combinations the
+    /// runtime cannot honor. Called at save (`create_script_internal`) so a
+    /// misconfigured script is rejected up front, and again in the DuckDB
+    /// executor as a safety net for preview/test runs that never deploy. Both
+    /// checks are SCD2-specific and inert for `manual` mode (which owns its DDL
+    /// and ignores the reconciliation strategy). `partitioned` is whether the
+    /// script declares `// partitioned`.
+    pub fn validate(&self, partitioned: bool) -> Result<(), String> {
+        if self.manual || !self.scd2 {
+            return Ok(());
+        }
+        // SCD2 needs a natural key to identify an entity across versions.
+        if self.unique_key.as_deref().map_or(true, str::is_empty) {
+            return Err(
+                "materialize scd2: requires a natural key — add `key=<col>` (e.g. \
+                 `// materialize ducklake://<name>/<table> key=id history`)"
+                    .to_string(),
+            );
+        }
+        // SCD2's diff/close/open shape has no partition-scoped form in v1.
+        if partitioned {
+            return Err(
+                "materialize scd2: `// partitioned` is not supported with scd2 in v1 — remove \
+                 `// partitioned`, or drop `history`/`scd2` to materialize the partition without \
+                 history"
+                    .to_string(),
+            );
+        }
+        Ok(())
+    }
+}
+
+// `// data_test <kind> …` — a data-quality assertion run against the
+// freshly-materialized asset (post DELETE+INSERT), failing the run on
+// violation. The first extensible annotation family: the parser turns a
+// `data_test` line into one of a known *vocabulary* of checks, and the
+// runtime turns each check into a SQL "verifier" probe. A sibling annotation
+// family (e.g. column-lineage) follows the same shape — a keyword head
+// selecting a variant, the rest parsed per-variant — rather than growing a
+// new closed list. See `docs/ducklake-materialization.md` §"Extensible
+// annotations". Multiple `// data_test` lines accumulate (unlike the
+// single-value annotations above, which are first-write-wins).
+//
+// Built-ins mirror dbt's generic data tests; `Custom` is the escape hatch
+// (dbt's singular test): a DuckDB script path whose SELECT returns the
+// violating rows. The keyword is `data_test` — NOT `test` — to stay clear
+// of the unrelated `// test:` CI-test annotation (see
+// `windmill_common::schema::parse_ci_test_annotation`), matching dbt 1.8's
+// own `tests:` → `data_tests:` rename.
+#[derive(Serialize, Debug, PartialEq, Clone)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum DataTest {
+    // `// data_test unique <col>` — no two non-NULL rows share `column`.
+    Unique { column: String },
+    // `// data_test not_null <col>` — `column` is never NULL.
+    NotNull { column: String },
+    // `// data_test accepted_values <col> = a,b,c` — every non-NULL value of
+    // `column` is one of `values` (comma-separated; surrounding quotes stripped).
+    AcceptedValues { column: String, values: Vec<String> },
+    // `// data_test relationships <col> -> <asset>.<refcol>` — referential
+    // integrity: every non-NULL `column` value exists in `to_path`'s `to_column`.
+    Relationships { column: String, to_kind: AssetKind, to_path: String, to_column: String },
+    // `// data_test <script_path>` — escape hatch: a deployed DuckDB script
+    // whose trailing SELECT returns the violating rows (non-empty ⇒ fail).
+    Custom { path: String },
+}
+
+// `// column <out_col> <- <asset-uri>.<col>[, …]` — declared column-level
+// lineage: one output column of this script's produced asset and the upstream
+// source columns it derives from. A sibling of `DataTest` in the extensible
+// annotation family (`docs/pipelines-vs-dbt.md` §3): same parse shape — a head
+// token (the output column) then a per-variant tail — but accumulating, one
+// line per output column. Unlike `data_test` these are pure metadata: they
+// drive the column-lineage graph view, never a runtime probe.
+//
+// dbt derives column lineage from SQL-AST parsing; Windmill is polyglot
+// (Python/TS/Bash/SQL in one DAG), so a uniform AST is not available. The
+// annotation is the explicit, language-agnostic declaration — the same
+// "annotations are real comments parsed strictly" stance as the rest of the
+// pipeline grammar. Body-inferred per-asset column *sets* (`columns` on
+// `ParseAssetsResult`) complement it but cannot express column→column edges.
+#[derive(Serialize, Debug, PartialEq, Clone)]
+pub struct ColumnLineage {
+    // The produced asset's output column this line describes.
+    pub column: String,
+    // Upstream source columns it derives from (≥1; malformed refs dropped).
+    pub inputs: Vec<ColumnRef>,
+}
+
+// One `<asset-uri>.<col>` upstream reference inside a `// column` line. The
+// asset URI accepts the default-syntax shorthands (like `// materialize` /
+// `// data_test relationships`); the column is the segment after the final
+// `.` (so a schema-qualified `warehouse/main.orders.amount` keeps `amount`).
+#[derive(Serialize, Debug, PartialEq, Clone)]
+pub struct ColumnRef {
+    pub from_kind: AssetKind,
+    pub from_path: String,
+    pub from_column: String,
+}
+
 // `// trigger any` (default) vs `// trigger all`. `Any` = OR: any trigger
 // firing runs the script (current behaviour). `All` = AND: the script
 // runs only once every partition-bearing input has materialized at the
@@ -239,6 +523,21 @@ pub struct PipelineAnnotations {
     pub debounce_default: Option<String>,
     pub tag: Option<String>,
     pub retry: Option<RetrySpec>,
+    pub materialize: Option<MaterializeSpec>,
+    pub data_tests: Vec<DataTest>,
+    pub column_lineage: Vec<ColumnLineage>,
+    pub macros: bool,
+    pub use_libs: Vec<String>,
+    // `// mute <asset>` — suppress the auto-derived cascade edge for a read
+    // that would otherwise trigger this script (a lookup / slowly-changing
+    // dimension you read every run but don't want to re-run on). Only Asset
+    // specs are stored; native trigger kinds are never auto-derived, so
+    // muting them is meaningless.
+    pub mute: Vec<TriggerSpec>,
+    // `// mute all` — opt out of auto-derivation entirely for this script.
+    // Falls back to explicit-`// on`-only semantics. Explicit `// on` edges
+    // are unaffected.
+    pub mute_all: bool,
 }
 
 impl ParseAssetsOutput {
@@ -262,10 +561,37 @@ impl ParseAssetsOutput {
             debounce_default: pipeline.debounce_default,
             tag: pipeline.tag,
             retry: pipeline.retry,
+            materialize: pipeline.materialize,
+            data_tests: pipeline.data_tests,
+            column_lineage: pipeline.column_lineage,
+            macros: pipeline.macros,
+            use_libs: pipeline.use_libs,
         }
     }
 }
 
+// Combine column lineage inferred from the body (SQL AST) with lineage declared
+// via `// column` annotations. The annotation is the *override*: where both
+// describe the same output column, the explicit declaration wins and the
+// inferred entry is dropped. Inferred entries are also deduped by output column
+// among themselves (first wins). Used by the language asset-parsers so a
+// `// column` line can correct a mis-inferred edge without disabling inference
+// for the rest of the columns.
+pub fn merge_column_lineage(
+    inferred: Vec<ColumnLineage>,
+    annotated: Vec<ColumnLineage>,
+) -> Vec<ColumnLineage> {
+    let mut seen: std::collections::HashSet<String> =
+        annotated.iter().map(|c| c.column.clone()).collect();
+    let mut out = annotated;
+    for c in inferred {
+        if seen.insert(c.column.clone()) {
+            out.push(c);
+        }
+    }
+    out
+}
+
 #[derive(Debug, Clone, Serialize)]
 pub struct DelegateToGitRepoDetails {
     pub resource: String,
@@ -355,6 +681,24 @@ pub fn parse_asset_syntax(s: &str, enable_default_syntax: bool) -> Option<(Asset
     for (prefix, kind) in ASSET_KINDS.iter() {
         if s.starts_with(prefix) {
             let path = &s[prefix.len()..];
+            // Canonicalize S3 keys to a single asset identity. The SDK object
+            // form (`{ s3: "key" }` / `S3Object(s3="key")`, default storage)
+            // resolves to `s3:///key`, whose path is `/key`, while DuckDB
+            // `s3://key` and `// on s3://key` yield the bare `key`. Strip every
+            // leading slash so the triple-slash default-storage form and the
+            // `s3://storage/key` form share one path — otherwise a TS/Python
+            // writer and a DuckDB reader of the same object become disconnected
+            // nodes in the pipeline graph. Stripping ALL leading slashes (not
+            // just one) keeps the identity stable through URI reconstruction:
+            // `trigger_spec_to_row` rebuilds `s3://<path>`, so a canonical path
+            // must never itself start with `/` or the rebuilt ref would parse
+            // back to a different key. Only leading slashes are touched, so
+            // Hive-partition keys (`s3://b/y=2024/f.parquet`) are untouched.
+            let path = if matches!(kind, AssetKind::S3Object) {
+                path.trim_start_matches('/')
+            } else {
+                path
+            };
             return Some((*kind, path));
         }
     }
@@ -459,14 +803,18 @@ fn parse_kv_opts(s: &str) -> BTreeMap<String, String> {
     out
 }
 
-// Scan raw source for pipeline annotations. Language-agnostic: any line
-// whose first non-whitespace tokens are a comment prefix (`//`, `#`, or
-// `--`) followed by one of the recognized keywords:
+// Scan the leading comment header for pipeline annotations. Only the
+// contiguous block of comment lines at the top of the file is considered
+// (blank lines tolerated, scan stops at the first line of actual code) so
+// that ordinary comments in the body can't false-positive as annotations.
+// Language-agnostic: any header line whose first non-whitespace tokens are
+// a comment prefix (`//`, `#`, or `--`) followed by one of the recognized
+// keywords:
 //   - `pipeline`                 → opt-in marker (must be alone on the line)
 //   - `on <trigger-spec>`        → asset / native trigger edge (including
 //                                  the marker-only `on schedule` form)
 //   - `partitioned <kind> [opts]` → partition declaration
-//   - `freshness <duration>`     → SLA / active backstop
+//   - `freshness <duration>`     → SLA window (badge + EE watchdog)
 //   - `tag <name>`               → worker-tag override (annotation wins
 //                                  over UI-set value at deploy)
 //   - `retry <count> [<delay>]`  → cascade-only retry policy
@@ -499,6 +847,9 @@ pub fn parse_pipeline_annotations(code: &str) -> PipelineAnnotations {
 
     for raw_line in code.lines() {
         let line = raw_line.trim_start();
+        if line.is_empty() {
+            continue;
+        }
         let rest = if let Some(r) = line.strip_prefix("//") {
             r
         } else if let Some(r) = line.strip_prefix("--") {
@@ -506,7 +857,11 @@ pub fn parse_pipeline_annotations(code: &str) -> PipelineAnnotations {
         } else if let Some(r) = line.strip_prefix('#') {
             r
         } else {
-            continue;
+            // Annotations live in the leading comment header. Stop at the first
+            // line of actual code so comments inside the body (e.g. a regular
+            // `# tag ...` prose comment) can't false-positive as annotations.
+            // Mirrors BashAnnotations::sandbox_image / ssh_target.
+            break;
         };
         let rest = rest.trim_start();
 
@@ -519,6 +874,30 @@ pub fn parse_pipeline_annotations(code: &str) -> PipelineAnnotations {
             continue;
         }
 
+        if let Some(after_kw) = consume_keyword(rest, "macros") {
+            // Strict like `pipeline`: keyword alone on the line, so prose
+            // such as `// macros are defined below` never false-positives.
+            if after_kw.trim().is_empty() {
+                out.macros = true;
+            }
+            continue;
+        }
+
+        // `// use <lib_script_path>` — accumulating. The argument must be a
+        // single whitespace-free token containing `/` (all script paths do),
+        // so prose like `// use this script to …` is dropped fail-safe.
+        if let Some(after_kw) = consume_keyword(rest, "use") {
+            let path = after_kw.trim();
+            if !path.is_empty()
+                && !path.contains(char::is_whitespace)
+                && path.contains('/')
+                && !out.use_libs.iter().any(|p| p == path)
+            {
+                out.use_libs.push(path.to_string());
+            }
+            continue;
+        }
+
         if let Some(after_kw) = consume_keyword(rest, "partitioned") {
             if out.partition.is_none() {
                 if let Some(spec) = parse_partitioned_spec(after_kw.trim()) {
@@ -556,7 +935,14 @@ pub fn parse_pipeline_annotations(code: &str) -> PipelineAnnotations {
 
         if let Some(after_kw) = consume_keyword(rest, "tag") {
             let name = after_kw.trim();
-            if !name.is_empty() && out.tag.is_none() {
+            // Worker tags are single-word identifiers (e.g. `heavy`, `gpu`).
+            // A value with whitespace or beyond the `script.tag` column width
+            // is almost certainly a regular comment starting with "# tag ...".
+            if !name.is_empty()
+                && !name.contains(char::is_whitespace)
+                && name.len() <= 50
+                && out.tag.is_none()
+            {
                 out.tag = Some(name.to_string());
             }
             continue;
@@ -571,6 +957,55 @@ pub fn parse_pipeline_annotations(code: &str) -> PipelineAnnotations {
             continue;
         }
 
+        if let Some(after_kw) = consume_keyword(rest, "materialize") {
+            if out.materialize.is_none() {
+                if let Some(spec) = parse_materialize_spec(after_kw.trim()) {
+                    out.materialize = Some(spec);
+                }
+            }
+            continue;
+        }
+
+        // `// mute all` opts out of auto-derived cascade edges entirely;
+        // `// mute <asset>` suppresses the one edge. Only asset refs are
+        // muteable — native trigger kinds are never auto-derived. Checked
+        // before the generic `on`/asset shorthand (a complete word, so
+        // prose like `// muted for now` never matches).
+        if let Some(after_kw) = consume_keyword(rest, "mute") {
+            let arg = after_kw.trim();
+            if arg == "all" {
+                out.mute_all = true;
+            } else if let Some(spec @ TriggerSpec::Asset { .. }) = parse_trigger_spec(arg) {
+                if !out.mute.contains(&spec) {
+                    out.mute.push(spec);
+                }
+            }
+            continue;
+        }
+
+        // `data_test` is checked before `on`/asset shorthands and is a complete
+        // word (so it never collides with the `// test:` CI annotation, which
+        // has no whitespace after `test`). Accumulates — every well-formed line
+        // adds a check; malformed lines are dropped (fail-safe, the missing
+        // check is then simply absent from the graph + run).
+        if let Some(after_kw) = consume_keyword(rest, "data_test") {
+            if let Some(spec) = parse_data_test_spec(after_kw.trim()) {
+                out.data_tests.push(spec);
+            }
+            continue;
+        }
+
+        // `// column <out> <- <src>.<col>[, …]` — accumulating column lineage.
+        // A complete word, so it never swallows a body comment that happens to
+        // start with `column` followed by non-lineage prose (that has no `<-`
+        // and is dropped fail-safe). Checked before `on`/asset shorthands.
+        if let Some(after_kw) = consume_keyword(rest, "column") {
+            if let Some(spec) = parse_column_lineage_spec(after_kw.trim()) {
+                out.column_lineage.push(spec);
+            }
+            continue;
+        }
+
         if let Some(after_kw) = consume_keyword(rest, "on") {
             let spec_text = after_kw.trim();
             if spec_text.is_empty() {
@@ -598,6 +1033,39 @@ pub fn parse_pipeline_annotations(code: &str) -> PipelineAnnotations {
     out
 }
 
+// Count `// data_test <…>` lines in the leading comment header whose right-hand
+// side fails to parse into a check. `parse_pipeline_annotations` drops these
+// fail-safe (a malformed line just yields no check), which is the wrong default
+// for a data-quality assertion: a typo silently disables the test. The deploy
+// path uses this count to warn. Same leading-block boundary as the parser (stop
+// at the first non-comment line) so a body comment can't be miscounted, and the
+// same `parse_data_test_spec` grammar so "malformed" means exactly what the
+// parser rejects — no second grammar to drift.
+pub fn count_malformed_data_tests(code: &str) -> usize {
+    let mut malformed = 0;
+    for raw_line in code.lines() {
+        let line = raw_line.trim_start();
+        if line.is_empty() {
+            continue;
+        }
+        let rest = if let Some(r) = line.strip_prefix("//") {
+            r
+        } else if let Some(r) = line.strip_prefix("--") {
+            r
+        } else if let Some(r) = line.strip_prefix('#') {
+            r
+        } else {
+            break;
+        };
+        if let Some(after_kw) = consume_keyword(rest.trim_start(), "data_test") {
+            if parse_data_test_spec(after_kw.trim()).is_none() {
+                malformed += 1;
+            }
+        }
+    }
+    malformed
+}
+
 // Parse a `// retry <count> [<delay>]` right-hand side. `<count>` is a
 // non-negative decimal; `<delay>` is an optional raw duration string left
 // for `parse_duration_secs` to validate at deploy. A bare zero count (or
@@ -618,6 +1086,201 @@ fn parse_retry_spec(s: &str) -> Option<RetrySpec> {
     Some(RetrySpec { count, delay })
 }
 
+// Parse a `// materialize [manual] <asset> [append] [key=<col>] [history]
+// [track=<c1,c2>]` right-hand side. An optional leading `manual` token opts out
+// of managed mode (track-only); a leading `scd2` token is an alias for the
+// `history` flag. The next whitespace token is the target asset URI
+// (default-syntax shorthands enabled, so `ducklake` → `ducklake://main`); the
+// remainder are strategy options — bare `append`, bare `history` (SCD type-2 on
+// a keyed merge), `key=<col>` (merge/scd2 key), `track=<c1,c2,…>` (scd2 tracked
+// columns), and `deletes=close` (scd2 hard-delete-close) — which apply to managed
+// mode only. A missing/empty target yields `None` (the annotation is dropped,
+// fail-safe).
+fn parse_materialize_spec(s: &str) -> Option<MaterializeSpec> {
+    // One optional leading mode keyword: `manual` (escape hatch, track-only) or
+    // `scd2` (alias for the `history` flag below). A missing keyword is the
+    // default managed mode.
+    fn strip_mode<'a>(s: &'a str, kw: &str) -> Option<&'a str> {
+        s.strip_prefix(kw)
+            .filter(|after| after.is_empty() || after.starts_with(char::is_whitespace))
+            .map(|after| after.trim_start())
+    }
+    let (manual, scd2_kw, rest) = if let Some(after) = strip_mode(s, "manual") {
+        (true, false, after)
+    } else if let Some(after) = strip_mode(s, "scd2") {
+        (false, true, after)
+    } else {
+        (false, false, s)
+    };
+    let mut it = rest.trim().splitn(2, char::is_whitespace);
+    let asset_tok = it.next()?;
+    let opts_str = it.next().unwrap_or("");
+    let (target_kind, path) = parse_asset_syntax(asset_tok.trim(), true)?;
+    if path.is_empty() {
+        return None;
+    }
+    let append = opts_str.split_whitespace().any(|t| t == "append");
+    // SCD type-2 history mode. The primary spelling is the bare `history` flag on
+    // a keyed merge (`key=<col> history`) — it reads as "a keyed upsert that keeps
+    // history"; the leading `scd2` keyword is a recognized alias for the same.
+    let scd2 = scd2_kw || opts_str.split_whitespace().any(|t| t == "history");
+    let opts = parse_kv_opts(opts_str);
+    let unique_key = opts.get("key").filter(|k| !k.is_empty()).cloned();
+    // `track=<c1,c2,…>` (scd2 only): comma-separated columns whose change opens a
+    // new version. Empty entries dropped; an empty list ⇒ track all non-key cols.
+    // Like every `=`-option here the value is whitespace-terminated, so the list
+    // must contain no spaces (`track=a,b`, not `track=a, b` — the rest is dropped).
+    let track = opts
+        .get("track")
+        .map(|v| {
+            v.split(',')
+                .map(|c| c.trim().to_string())
+                .filter(|c| !c.is_empty())
+                .collect::<Vec<_>>()
+        })
+        .unwrap_or_default();
+    // `deletes=close` (scd2 only) opts into hard-delete-close; any other value
+    // (or absence) keeps the soft-delete default.
+    let close_deleted = opts.get("deletes").map(|v| v == "close").unwrap_or(false);
+    // `on_schema_change=ignore|fail|sync`; any other value (or absence) keeps
+    // the `warn` default, fail-safe like `deletes=` above (a typo must never
+    // silently disable the guardrail).
+    let on_schema_change = match opts.get("on_schema_change").map(String::as_str) {
+        Some("ignore") => OnSchemaChange::Ignore,
+        Some("fail") => OnSchemaChange::Fail,
+        Some("sync") => OnSchemaChange::Sync,
+        _ => OnSchemaChange::Warn,
+    };
+    Some(MaterializeSpec {
+        target_kind,
+        target_path: path.to_string(),
+        manual,
+        append,
+        unique_key,
+        scd2,
+        track,
+        close_deleted,
+        on_schema_change,
+    })
+}
+
+// Parse a `// data_test <kind> …` right-hand side into one `DataTest`. The
+// leading token selects the variant; the remainder is parsed per-variant.
+// Anything not matching a built-in keyword is the `Custom` escape hatch — a
+// single script-path token. Returns `None` for malformed input so a typo
+// fails safe (the check is dropped, never silently mis-parsed).
+//
+// This is the extension seam: a new built-in is one match arm + its parser;
+// a sibling annotation family (column-lineage) reuses the same head-keyword
+// dispatch shape rather than adding a parallel closed list.
+fn parse_data_test_spec(s: &str) -> Option<DataTest> {
+    let s = s.trim();
+    if s.is_empty() {
+        return None;
+    }
+    let mut it = s.splitn(2, char::is_whitespace);
+    let head = it.next()?;
+    let rest = it.next().unwrap_or("").trim();
+    match head {
+        "unique" => Some(DataTest::Unique { column: single_ident(rest)? }),
+        "not_null" => Some(DataTest::NotNull { column: single_ident(rest)? }),
+        "accepted_values" => parse_accepted_values(rest),
+        "relationships" => parse_relationships(rest),
+        // Custom escape hatch: the whole right-hand side must be one path token
+        // (`head` with no trailing content). Trailing content after a
+        // non-built-in head is a malformed built-in (e.g. `uniq order_id`) and
+        // is rejected rather than misread as a path.
+        _ if rest.is_empty() => Some(DataTest::Custom { path: head.to_string() }),
+        _ => None,
+    }
+}
+
+// A single bare identifier token (column name). Rejects empty / multi-token
+// input. The identifier is double-quoted + escaped at codegen, so any
+// character is safe here; we only enforce "exactly one token".
+fn single_ident(s: &str) -> Option<String> {
+    let s = s.trim();
+    if s.is_empty() || s.split_whitespace().count() != 1 {
+        return None;
+    }
+    Some(s.to_string())
+}
+
+// Strip one layer of matching surrounding single or double quotes.
+fn unquote(s: &str) -> &str {
+    let b = s.as_bytes();
+    if b.len() >= 2 && (b[0] == b'"' || b[0] == b'\'') && b[b.len() - 1] == b[0] {
+        &s[1..s.len() - 1]
+    } else {
+        s
+    }
+}
+
+// `<col> = a,b,c` — column, then `=`, then a comma-separated value list.
+// Surrounding quotes are stripped per value; empty values are dropped; a
+// value may not itself contain a comma (v1 limitation).
+fn parse_accepted_values(s: &str) -> Option<DataTest> {
+    let (col, vals) = s.split_once('=')?;
+    let column = single_ident(col)?;
+    let values: Vec<String> = vals
+        .split(',')
+        .map(|v| unquote(v.trim()).to_string())
+        .filter(|v| !v.is_empty())
+        .collect();
+    if values.is_empty() {
+        return None;
+    }
+    Some(DataTest::AcceptedValues { column, values })
+}
+
+// `<col> -> <asset-uri>.<refcol>` — referential integrity. The referenced
+// column is the segment after the final `.`; everything before it is the
+// asset URI (default-syntax shorthands enabled, like `// materialize`).
+fn parse_relationships(s: &str) -> Option<DataTest> {
+    let (col, target) = s.split_once("->")?;
+    let column = single_ident(col)?;
+    let target = target.trim();
+    let (asset_uri, ref_col) = target.rsplit_once('.')?;
+    let to_column = single_ident(ref_col)?;
+    let (to_kind, to_path) = parse_asset_syntax(asset_uri.trim(), true)?;
+    if to_path.is_empty() {
+        return None;
+    }
+    Some(DataTest::Relationships { column, to_kind, to_path: to_path.to_string(), to_column })
+}
+
+// Parse a `// column <out_col> <- <ref>[, <ref> …]` right-hand side. The head
+// (before `<-`) is the output column; the tail is a comma-separated list of
+// `<asset-uri>.<col>` upstream references. Mirrors `parse_accepted_values`'
+// "drop empties, require ≥1" stance: individually malformed refs are dropped
+// and the line is kept iff at least one ref parses; a missing `<-`, a non-ident
+// output column, or zero valid refs drops the whole line (fail-safe).
+fn parse_column_lineage_spec(s: &str) -> Option<ColumnLineage> {
+    let (out_col, refs) = s.split_once("<-")?;
+    let column = single_ident(out_col)?;
+    let inputs: Vec<ColumnRef> = refs
+        .split(',')
+        .filter_map(|r| parse_column_ref(r.trim()))
+        .collect();
+    if inputs.is_empty() {
+        return None;
+    }
+    Some(ColumnLineage { column, inputs })
+}
+
+// `<asset-uri>.<col>` — the referenced column is the segment after the final
+// `.`; everything before it is the asset URI (default-syntax shorthands
+// enabled, like `// materialize`). Same shape as `parse_relationships`' target.
+fn parse_column_ref(s: &str) -> Option<ColumnRef> {
+    let (asset_uri, ref_col) = s.rsplit_once('.')?;
+    let from_column = single_ident(ref_col)?;
+    let (from_kind, from_path) = parse_asset_syntax(asset_uri.trim(), true)?;
+    if from_path.is_empty() {
+        return None;
+    }
+    Some(ColumnRef { from_kind, from_path: from_path.to_string(), from_column })
+}
+
 // Parse a `// partitioned <kind> [opts]` right-hand side. Recognized kinds:
 // `daily`, `hourly`, `weekly`, `monthly` (with optional tz/format/start),
 // and `dynamic key="<jsonpath>"` (plus optional format).
@@ -697,6 +1360,83 @@ fn parse_trigger_spec(s: &str) -> Option<TriggerSpec> {
 mod pipeline_annotation_tests {
     use super::*;
 
+    #[test]
+    fn s3_key_normalization_unifies_uri_forms() {
+        // A TS/Python SDK write of `{ s3: "exports/x" }` (default storage)
+        // resolves to the URI `s3:///exports/x`, while a DuckDB read of
+        // `s3://exports/x` and the `// on s3://exports/x` trigger form yield the
+        // bare `exports/x`. All three must canonicalize to one asset key so
+        // the writer and reader connect in the pipeline graph.
+        let sdk_write = parse_asset_syntax("s3:///exports/x", false);
+        let duckdb_read = parse_asset_syntax("s3://exports/x", false);
+        assert_eq!(sdk_write, Some((AssetKind::S3Object, "exports/x")));
+        assert_eq!(duckdb_read, Some((AssetKind::S3Object, "exports/x")));
+        assert_eq!(sdk_write, duckdb_read);
+
+        // The `// on` trigger annotation goes through the same function.
+        assert_eq!(
+            parse_asset_syntax("s3:///exports/x", true),
+            parse_asset_syntax("s3://exports/x", true)
+        );
+
+        // Explicit-storage form is unaffected (no leading slash to strip).
+        assert_eq!(
+            parse_asset_syntax("s3://mybucket/exports/x", false),
+            Some((AssetKind::S3Object, "mybucket/exports/x"))
+        );
+
+        // Hive-partition keys and nested paths under default storage are
+        // preserved verbatim (only leading slashes are stripped).
+        assert_eq!(
+            parse_asset_syntax("s3:///t/year=2024/month=01/f.parquet", false),
+            Some((AssetKind::S3Object, "t/year=2024/month=01/f.parquet"))
+        );
+
+        // Every leading slash is stripped so a canonical S3 path never starts
+        // with `/`. `S3Object(s3="/x")` resolves to the quad-slash URI
+        // `s3:////x`; the identity must be the bare `x` (not `/x`) so the ref
+        // that `trigger_spec_to_row` rebuilds round-trips back to it.
+        assert_eq!(
+            parse_asset_syntax("s3:////x", false),
+            Some((AssetKind::S3Object, "x"))
+        );
+        assert_eq!(
+            parse_asset_syntax("s3://///deep///", false),
+            Some((AssetKind::S3Object, "deep///"))
+        );
+
+        // Non-S3 kinds keep their leading slash (their paths are workspace-
+        // relative and the slash is significant).
+        assert_eq!(
+            parse_asset_syntax("res://f/foo", false),
+            Some((AssetKind::Resource, "f/foo"))
+        );
+        assert_eq!(
+            parse_asset_syntax("ducklake://analytics/orders", false),
+            Some((AssetKind::Ducklake, "analytics/orders"))
+        );
+    }
+
+    #[test]
+    fn s3_explicit_storage_aliases_default_storage_nested_key() {
+        // Accepted tradeoff of one canonical key: the explicit-storage form
+        // `s3://storage/key` and the default-storage nested-key form
+        // `s3:///storage/key` collapse to the same node `storage/key`, even
+        // though they name different objects. This is a best-effort lineage
+        // graph that does not split the first segment as a storage name; the
+        // collision only happens when a storage config is named to match a
+        // default-storage prefix. Pinned so the aliasing is intentional, not a
+        // latent surprise.
+        assert_eq!(
+            parse_asset_syntax("s3://mybucket/x", false),
+            parse_asset_syntax("s3:///mybucket/x", false)
+        );
+        assert_eq!(
+            parse_asset_syntax("s3://mybucket/x", false),
+            Some((AssetKind::S3Object, "mybucket/x"))
+        );
+    }
+
     #[test]
     fn bare_pipeline_marker() {
         let out = parse_pipeline_annotations("// pipeline\nconsole.log('hi')");
@@ -723,6 +1463,33 @@ mod pipeline_annotation_tests {
         assert!(!out.in_pipeline);
     }
 
+    #[test]
+    fn macros_marker_strict_like_pipeline() {
+        assert!(parse_pipeline_annotations("// macros\nCREATE MACRO m(a) AS a;").macros);
+        assert!(parse_pipeline_annotations("-- macros   \nSELECT 1;").macros);
+        // Trailing prose / keyword variants disqualify the line.
+        assert!(!parse_pipeline_annotations("// macros are defined below\n").macros);
+        assert!(!parse_pipeline_annotations("// macros_v2\n").macros);
+    }
+
+    #[test]
+    fn use_accumulates_dedups_and_rejects_prose() {
+        let out = parse_pipeline_annotations(
+            "// use f/lib/stats\n// use f/lib/dates\n// use f/lib/stats\nSELECT 1;",
+        );
+        assert_eq!(out.use_libs, vec!["f/lib/stats", "f/lib/dates"]);
+
+        // Prose, slashless tokens, and multi-token lines are dropped fail-safe.
+        let out = parse_pipeline_annotations(
+            "// use this script to compute\n// use standalone\n// use f/lib/ok extra\n",
+        );
+        assert!(out.use_libs.is_empty());
+
+        // Only the leading comment header is scanned.
+        let out = parse_pipeline_annotations("SELECT 1;\n-- use f/lib/late\n");
+        assert!(out.use_libs.is_empty());
+    }
+
     #[test]
     fn on_schedule_marker() {
         // `// on schedule` is marker-only — the binding is the schedule row's
@@ -1008,6 +1775,56 @@ mod pipeline_annotation_tests {
         assert!(out.tag.is_none());
     }
 
+    #[test]
+    fn tag_with_whitespace_is_skipped() {
+        // A regular English comment starting with "# tag " must not be
+        // mistaken for a worker-tag annotation (worker tags are single words).
+        let out =
+            parse_pipeline_annotations("# tag this function so we remember to refactor it later");
+        assert!(out.tag.is_none());
+    }
+
+    #[test]
+    fn tag_too_long_is_skipped() {
+        let long = "x".repeat(51);
+        let out = parse_pipeline_annotations(&format!("// tag {long}"));
+        assert!(out.tag.is_none());
+    }
+
+    #[test]
+    fn annotations_in_body_are_ignored() {
+        // Only the leading comment header is scanned. A regular `# tag ...`
+        // prose comment buried in the body — the WIN-2090 false-positive that
+        // crashed the `script.tag` INSERT — must not be treated as an
+        // annotation once real code has started.
+        let code = concat!(
+            "import pandas as pd\n",
+            "\n",
+            "def main():\n",
+            "    # tag each row with its source so downstream steps can filter\n",
+            "    # on s3://should/not/parse\n",
+            "    return pd.DataFrame()\n",
+        );
+        let out = parse_pipeline_annotations(code);
+        assert!(out.tag.is_none());
+        assert!(out.triggers.is_empty());
+    }
+
+    #[test]
+    fn header_allows_blank_lines_before_code() {
+        // Blank lines (e.g. after a shebang) don't end the header; the first
+        // line of real code does.
+        let code = concat!(
+            "#!/usr/bin/env python\n",
+            "\n",
+            "# tag heavy\n",
+            "import os\n",
+            "# tag light\n",
+        );
+        let out = parse_pipeline_annotations(code);
+        assert_eq!(out.tag.as_deref(), Some("heavy"));
+    }
+
     #[test]
     fn retry_count_only() {
         let out = parse_pipeline_annotations("// retry 3");
@@ -1044,6 +1861,257 @@ mod pipeline_annotation_tests {
         assert!(out.retry.is_none());
     }
 
+    #[test]
+    fn materialize_managed_default() {
+        let out = parse_pipeline_annotations("// materialize ducklake://analytics/orders_daily");
+        let m = out.materialize.expect("materialize");
+        assert_eq!(m.target_kind, AssetKind::Ducklake);
+        assert_eq!(m.target_path, "analytics/orders_daily");
+        // managed by default; replace strategy (no append / key)
+        assert!(!m.manual);
+        assert!(!m.append);
+        assert_eq!(m.unique_key, None);
+    }
+
+    #[test]
+    fn materialize_manual_escape_hatch() {
+        let out =
+            parse_pipeline_annotations("// materialize manual ducklake://analytics/orders_daily");
+        let m = out.materialize.expect("materialize");
+        assert!(m.manual);
+        assert_eq!(m.target_path, "analytics/orders_daily");
+    }
+
+    #[test]
+    fn materialize_merge_and_append_options() {
+        let out =
+            parse_pipeline_annotations("// materialize ducklake://a/orders_daily key=order_id");
+        let m = out.materialize.expect("materialize");
+        assert_eq!(m.unique_key.as_deref(), Some("order_id"));
+        assert!(!m.append);
+
+        let out = parse_pipeline_annotations("// materialize ducklake://a/events append");
+        let m = out.materialize.expect("materialize");
+        assert!(m.append);
+        assert_eq!(m.unique_key, None);
+    }
+
+    #[test]
+    fn materialize_scd2_history_flag_with_key_and_track() {
+        // Primary spelling: `key=<col> history` on a merge.
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://a/dim key=id history track=name,tier",
+        );
+        let m = out.materialize.expect("materialize");
+        assert!(m.scd2);
+        assert!(!m.manual);
+        assert_eq!(m.unique_key.as_deref(), Some("id"));
+        assert_eq!(m.track, vec!["name".to_string(), "tier".to_string()]);
+    }
+
+    #[test]
+    fn materialize_scd2_keyword_is_alias_for_history() {
+        let out = parse_pipeline_annotations("// materialize scd2 ducklake://a/dim key=id");
+        let m = out.materialize.expect("materialize");
+        assert!(m.scd2);
+        assert_eq!(m.unique_key.as_deref(), Some("id"));
+        assert!(m.track.is_empty());
+        // soft-delete default
+        assert!(!m.close_deleted);
+    }
+
+    #[test]
+    fn materialize_scd2_write_targets_include_current_view() {
+        // A managed scd2 materialize produces the base table AND the
+        // `<dim>_current` companion view, so the producer must be recorded as
+        // writing both (reads of the view otherwise resolve to an orphan asset).
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://main/dim_customers key=id history",
+        );
+        let m = out.materialize.expect("materialize");
+        assert_eq!(
+            m.write_targets(),
+            vec![
+                (AssetKind::Ducklake, "main/dim_customers".to_string()),
+                (
+                    AssetKind::Ducklake,
+                    "main/dim_customers_current".to_string()
+                ),
+            ]
+        );
+        assert_eq!(
+            m.scd2_current_target(),
+            Some((
+                AssetKind::Ducklake,
+                "main/dim_customers_current".to_string()
+            ))
+        );
+    }
+
+    #[test]
+    fn materialize_non_scd2_write_targets_are_base_only() {
+        // A plain merge (no `history`) creates no companion view — only the base.
+        let out = parse_pipeline_annotations("// materialize ducklake://main/dim_customers key=id");
+        let m = out.materialize.expect("materialize");
+        assert_eq!(
+            m.write_targets(),
+            vec![(AssetKind::Ducklake, "main/dim_customers".to_string())]
+        );
+        assert_eq!(m.scd2_current_target(), None);
+    }
+
+    #[test]
+    fn materialize_manual_scd2_has_no_companion_view() {
+        // `manual` mode owns its own DDL and never creates the `_current` view,
+        // so registering it would be a false producer edge.
+        let out = parse_pipeline_annotations(
+            "// materialize manual ducklake://main/dim_customers key=id history",
+        );
+        let m = out.materialize.expect("materialize");
+        assert!(m.manual && m.scd2);
+        assert_eq!(m.scd2_current_target(), None);
+        assert_eq!(
+            m.write_targets(),
+            vec![(AssetKind::Ducklake, "main/dim_customers".to_string())]
+        );
+    }
+
+    #[test]
+    fn materialize_scd2_deletes_close_opt() {
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://a/dim key=id history deletes=close",
+        );
+        let m = out.materialize.expect("materialize");
+        assert!(m.scd2);
+        assert!(m.close_deleted);
+        // any other value keeps the soft-delete default
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://a/dim key=id history deletes=ignore",
+        );
+        assert!(!out.materialize.expect("materialize").close_deleted);
+    }
+
+    #[test]
+    fn materialize_validate_scd2_requires_key() {
+        // scd2 without `key=` is rejected at deploy (was a run-time error).
+        let m = parse_pipeline_annotations("// materialize ducklake://a/dim history")
+            .materialize
+            .expect("materialize");
+        assert!(m.scd2 && m.unique_key.is_none());
+        let err = m.validate(false).expect_err("scd2 without key must fail");
+        assert!(err.contains("requires a natural key"));
+        // with a key it validates
+        let m = parse_pipeline_annotations("// materialize ducklake://a/dim key=id history")
+            .materialize
+            .expect("materialize");
+        assert!(m.validate(false).is_ok());
+    }
+
+    #[test]
+    fn materialize_validate_scd2_rejects_partitioned() {
+        // scd2 + `// partitioned` has no v1 form — rejected at deploy.
+        let m = parse_pipeline_annotations("// materialize ducklake://a/dim key=id history")
+            .materialize
+            .expect("materialize");
+        let err = m.validate(true).expect_err("scd2 + partitioned must fail");
+        assert!(err.contains("`// partitioned` is not supported with scd2"));
+        // unpartitioned scd2 is fine
+        assert!(m.validate(false).is_ok());
+    }
+
+    #[test]
+    fn materialize_validate_non_scd2_and_manual_are_inert() {
+        // Non-scd2 strategies are unconstrained by these checks, partitioned or not.
+        let m = parse_pipeline_annotations("// materialize ducklake://a/orders key=id")
+            .materialize
+            .expect("materialize");
+        assert!(m.validate(true).is_ok());
+        assert!(m.validate(false).is_ok());
+        // `manual` owns its DDL and ignores the strategy — never rejected here,
+        // even with a partitioned scd2-looking combo.
+        let m = parse_pipeline_annotations("// materialize manual ducklake://a/dim history")
+            .materialize
+            .expect("materialize");
+        assert!(m.manual && m.scd2);
+        assert!(m.validate(true).is_ok());
+    }
+
+    #[test]
+    fn materialize_on_schema_change_opt() {
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://a/orders on_schema_change=ignore",
+        );
+        let m = out.materialize.expect("materialize");
+        assert_eq!(m.on_schema_change, OnSchemaChange::Ignore);
+        // default is warn
+        let out = parse_pipeline_annotations("// materialize ducklake://a/orders");
+        assert_eq!(
+            out.materialize.expect("materialize").on_schema_change,
+            OnSchemaChange::Warn
+        );
+        // fail + sync parse to their own variants
+        let out =
+            parse_pipeline_annotations("// materialize ducklake://a/orders on_schema_change=fail");
+        assert_eq!(
+            out.materialize.expect("materialize").on_schema_change,
+            OnSchemaChange::Fail
+        );
+        let out =
+            parse_pipeline_annotations("// materialize ducklake://a/orders on_schema_change=sync");
+        assert_eq!(
+            out.materialize.expect("materialize").on_schema_change,
+            OnSchemaChange::Sync
+        );
+        // unknown/junk value keeps the warn default (fail-safe, like `deletes=`)
+        let out =
+            parse_pipeline_annotations("// materialize ducklake://a/orders on_schema_change=bogus");
+        assert_eq!(
+            out.materialize.expect("materialize").on_schema_change,
+            OnSchemaChange::Warn
+        );
+        // composes with other opts
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://a/dim key=id history on_schema_change=ignore",
+        );
+        let m = out.materialize.expect("materialize");
+        assert!(m.scd2);
+        assert_eq!(m.on_schema_change, OnSchemaChange::Ignore);
+    }
+
+    #[test]
+    fn materialize_key_without_history_is_plain_merge() {
+        let out = parse_pipeline_annotations("// materialize ducklake://a/dim key=id");
+        let m = out.materialize.expect("materialize");
+        assert!(!m.scd2, "no history flag ⇒ SCD1 merge, not scd2");
+        assert_eq!(m.unique_key.as_deref(), Some("id"));
+    }
+
+    #[test]
+    fn materialize_default_syntax_shorthand() {
+        let out = parse_pipeline_annotations("// materialize ducklake");
+        let m = out.materialize.expect("materialize");
+        assert_eq!(m.target_kind, AssetKind::Ducklake);
+        assert_eq!(m.target_path, "main");
+        assert!(!m.manual);
+    }
+
+    #[test]
+    fn materialize_manual_only_is_dropped() {
+        // `manual` with no target is not a valid materialization.
+        let out = parse_pipeline_annotations("// materialize manual");
+        assert!(out.materialize.is_none());
+    }
+
+    #[test]
+    fn materialize_first_wins() {
+        let out = parse_pipeline_annotations(
+            "// materialize ducklake://a/x\n# materialize manual ducklake://b/y",
+        );
+        let m = out.materialize.expect("materialize");
+        assert_eq!(m.target_path, "a/x");
+        assert!(!m.manual);
+    }
+
     #[test]
     fn combined() {
         let code = concat!(
@@ -1053,7 +2121,8 @@ mod pipeline_annotation_tests {
             "// partitioned daily tz=\"UTC\"\n",
             "// freshness 2h\n",
             "// tag heavy\n",
-            "// retry 3 5s\n"
+            "// retry 3 5s\n",
+            "// materialize ducklake://analytics/orders_daily key=order_id\n"
         );
         let out = parse_pipeline_annotations(code);
         assert!(out.in_pipeline);
@@ -1064,6 +2133,10 @@ mod pipeline_annotation_tests {
         let r = out.retry.expect("retry");
         assert_eq!(r.count, 3);
         assert_eq!(r.delay.as_deref(), Some("5s"));
+        let m = out.materialize.expect("materialize");
+        assert!(!m.manual);
+        assert_eq!(m.target_path, "analytics/orders_daily");
+        assert_eq!(m.unique_key.as_deref(), Some("order_id"));
     }
 
     #[test]
@@ -1108,4 +2181,249 @@ mod pipeline_annotation_tests {
         assert_eq!(m.get("b").unwrap(), "fine");
         assert!(m.get("garbage").is_none());
     }
+
+    #[test]
+    fn data_test_builtins() {
+        let code = concat!(
+            "// data_test unique order_id\n",
+            "// data_test not_null user_id\n",
+            "// data_test accepted_values status = paid,pending,refunded\n",
+            "// data_test relationships user_id -> datatable://prod/users.id\n",
+        );
+        let out = parse_pipeline_annotations(code);
+        assert_eq!(
+            out.data_tests,
+            vec![
+                DataTest::Unique { column: "order_id".to_string() },
+                DataTest::NotNull { column: "user_id".to_string() },
+                DataTest::AcceptedValues {
+                    column: "status".to_string(),
+                    values: vec![
+                        "paid".to_string(),
+                        "pending".to_string(),
+                        "refunded".to_string()
+                    ],
+                },
+                DataTest::Relationships {
+                    column: "user_id".to_string(),
+                    to_kind: AssetKind::DataTable,
+                    to_path: "prod/users".to_string(),
+                    to_column: "id".to_string(),
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn data_test_accepts_quotes_and_spacing() {
+        let out = parse_pipeline_annotations("// data_test accepted_values kind = \"a b\", 'c' ,d");
+        assert_eq!(
+            out.data_tests,
+            vec![DataTest::AcceptedValues {
+                column: "kind".to_string(),
+                values: vec!["a b".to_string(), "c".to_string(), "d".to_string()],
+            }]
+        );
+    }
+
+    #[test]
+    fn data_test_custom_escape_hatch() {
+        // A non-built-in single token is a custom script path; default-syntax
+        // asset shorthands are NOT triggered here (a path is just a path).
+        let out = parse_pipeline_annotations("// data_test f/tests/orders_amount_sane");
+        assert_eq!(
+            out.data_tests,
+            vec![DataTest::Custom { path: "f/tests/orders_amount_sane".to_string() }]
+        );
+    }
+
+    #[test]
+    fn data_test_relationships_ducklake_shorthand() {
+        let out = parse_pipeline_annotations(
+            "// data_test relationships sku -> ducklake://warehouse/dim_products.sku",
+        );
+        assert_eq!(
+            out.data_tests,
+            vec![DataTest::Relationships {
+                column: "sku".to_string(),
+                to_kind: AssetKind::Ducklake,
+                to_path: "warehouse/dim_products".to_string(),
+                to_column: "sku".to_string(),
+            }]
+        );
+    }
+
+    #[test]
+    fn data_test_malformed_dropped_fail_safe() {
+        // A misspelled built-in with trailing content is not a valid path token
+        // → dropped, not misread as a custom test. An empty value list, a
+        // missing arrow target, and a bare keyword are all dropped too.
+        let out = parse_pipeline_annotations(concat!(
+            "// data_test uniq order_id\n",        // typo'd built-in + arg
+            "// data_test accepted_values s =\n",  // no values
+            "// data_test relationships a -> b\n", // no `.refcol`
+            "// data_test unique\n",               // missing column
+            "// data_test\n",                      // bare keyword
+        ));
+        assert!(out.data_tests.is_empty());
+    }
+
+    #[test]
+    fn data_test_not_confused_with_ci_test_annotation() {
+        // `// test:` is the unrelated CI-test annotation — it must NOT be
+        // parsed as a data test (no whitespace after `test`, and the keyword
+        // is `data_test` anyway).
+        let out = parse_pipeline_annotations("// test: f/foo/bar\n// data_test unique id");
+        assert_eq!(
+            out.data_tests,
+            vec![DataTest::Unique { column: "id".to_string() }]
+        );
+    }
+
+    #[test]
+    fn column_lineage_basic() {
+        let code = concat!(
+            "// column order_total <- ducklake://warehouse/orders.amount, ducklake://warehouse/orders.tax\n",
+            "// column user_name <- datatable://prod/users.name\n",
+        );
+        let out = parse_pipeline_annotations(code);
+        assert_eq!(
+            out.column_lineage,
+            vec![
+                ColumnLineage {
+                    column: "order_total".to_string(),
+                    inputs: vec![
+                        ColumnRef {
+                            from_kind: AssetKind::Ducklake,
+                            from_path: "warehouse/orders".to_string(),
+                            from_column: "amount".to_string(),
+                        },
+                        ColumnRef {
+                            from_kind: AssetKind::Ducklake,
+                            from_path: "warehouse/orders".to_string(),
+                            from_column: "tax".to_string(),
+                        },
+                    ],
+                },
+                ColumnLineage {
+                    column: "user_name".to_string(),
+                    inputs: vec![ColumnRef {
+                        from_kind: AssetKind::DataTable,
+                        from_path: "prod/users".to_string(),
+                        from_column: "name".to_string(),
+                    }],
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn column_lineage_schema_qualified_keeps_last_dot_as_column() {
+        // The column is the segment after the FINAL dot, so a schema-qualified
+        // ducklake table (`main.dim_products`) survives intact.
+        let out = parse_pipeline_annotations(
+            "// column sku <- ducklake://warehouse/main.dim_products.sku",
+        );
+        assert_eq!(
+            out.column_lineage,
+            vec![ColumnLineage {
+                column: "sku".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "warehouse/main.dim_products".to_string(),
+                    from_column: "sku".to_string(),
+                }],
+            }]
+        );
+    }
+
+    #[test]
+    fn column_lineage_drops_malformed_refs_keeps_valid() {
+        // `bad_no_dot` has no `.col` and is dropped; the line survives on its
+        // one valid ref. Mirrors accepted_values' drop-empties-keep-≥1 stance.
+        let out = parse_pipeline_annotations(
+            "// column total <- bad_no_dot, datatable://prod/orders.amount",
+        );
+        assert_eq!(
+            out.column_lineage,
+            vec![ColumnLineage {
+                column: "total".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::DataTable,
+                    from_path: "prod/orders".to_string(),
+                    from_column: "amount".to_string(),
+                }],
+            }]
+        );
+    }
+
+    #[test]
+    fn merge_column_lineage_annotation_overrides_inferred() {
+        let inferred = vec![
+            ColumnLineage {
+                column: "total".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "w/o".to_string(),
+                    from_column: "amount".to_string(),
+                }],
+            },
+            ColumnLineage {
+                column: "qty".to_string(),
+                inputs: vec![ColumnRef {
+                    from_kind: AssetKind::Ducklake,
+                    from_path: "w/o".to_string(),
+                    from_column: "qty".to_string(),
+                }],
+            },
+        ];
+        // Annotation redefines `total` (wins) and leaves `qty` to inference.
+        let annotated = vec![ColumnLineage {
+            column: "total".to_string(),
+            inputs: vec![ColumnRef {
+                from_kind: AssetKind::DataTable,
+                from_path: "prod/x".to_string(),
+                from_column: "grand_total".to_string(),
+            }],
+        }];
+        let merged = merge_column_lineage(inferred, annotated);
+        assert_eq!(merged.len(), 2);
+        // Annotation entry kept first and authoritative.
+        assert_eq!(merged[0].column, "total");
+        assert_eq!(merged[0].inputs[0].from_column, "grand_total");
+        // Inferred `qty` survives (no annotation for it); inferred `total` dropped.
+        assert_eq!(merged[1].column, "qty");
+    }
+
+    #[test]
+    fn column_lineage_malformed_lines_dropped_fail_safe() {
+        // No arrow, a multi-token output column, and a line whose every ref is
+        // malformed are all dropped entirely.
+        let out = parse_pipeline_annotations(concat!(
+            "// column no_arrow datatable://prod/x.y\n", // missing `<-`
+            "// column a b <- datatable://prod/x.y\n",   // output not a single ident
+            "// column total <- bad_no_dot\n",           // no valid ref
+            "// column\n",                               // bare keyword
+        ));
+        assert!(out.column_lineage.is_empty());
+    }
+
+    #[test]
+    fn count_malformed_data_tests_counts_only_broken_header_lines() {
+        let n = count_malformed_data_tests(concat!(
+            "-- data_test not_null id\n",                 // valid
+            "-- data_test unique id\n",                   // valid
+            "-- data_test accepted_values status paid\n", // malformed: missing `=`
+            "-- data_test relationships cust ducklake\n", // malformed: no `->`
+            "-- data_test\n",                             // malformed: bare keyword
+            "-- data_test f/tests/custom\n",              // valid: custom script path
+            "SELECT 1 -- data_test not_a_test\n",         // body line: not counted
+        ));
+        assert_eq!(n, 3);
+        // A clean header has zero.
+        assert_eq!(
+            count_malformed_data_tests("-- data_test unique id\nSELECT 1"),
+            0
+        );
+    }
 }
diff --git a/backend/parsers/windmill-parser/src/duckdb_builtins.rs b/backend/parsers/windmill-parser/src/duckdb_builtins.rs
new file mode 100644
index 0000000000..d324fa4c30
--- /dev/null
+++ b/backend/parsers/windmill-parser/src/duckdb_builtins.rs
@@ -0,0 +1,936 @@
+// DuckDB built-in function names (scalar, aggregate, table, macro), used to
+// reject workspace macros that would silently shadow a built-in (DuckDB
+// allows the shadowing without error — verified on 1.5.4). Only
+// identifier-shaped names are listed: workspace macro names are validated
+// to `[a-z_][a-z0-9_]*` before this check, so operator names can't collide.
+//
+// Regenerate on DuckDB upgrades (sort in codepoint order — binary search):
+//   python3 -c "import duckdb,re; print('\\n'.join(sorted(set(r[0] for r in
+//     duckdb.connect().execute(\"SELECT DISTINCT lower(function_name) FROM
+//     duckdb_functions()\").fetchall() if re.fullmatch(r'[a-z_][a-z0-9_]*', r[0])))))"
+
+pub fn is_duckdb_builtin(name: &str) -> bool {
+    DUCKDB_BUILTIN_FUNCTIONS
+        .binary_search(&name.to_ascii_lowercase().as_str())
+        .is_ok()
+}
+
+const DUCKDB_BUILTIN_FUNCTIONS: &[&str] = &[
+    "__internal_compress_integral_ubigint",
+    "__internal_compress_integral_uinteger",
+    "__internal_compress_integral_usmallint",
+    "__internal_compress_integral_utinyint",
+    "__internal_compress_string_hugeint",
+    "__internal_compress_string_ubigint",
+    "__internal_compress_string_uhugeint",
+    "__internal_compress_string_uinteger",
+    "__internal_compress_string_usmallint",
+    "__internal_compress_string_utinyint",
+    "__internal_decompress_integral_bigint",
+    "__internal_decompress_integral_hugeint",
+    "__internal_decompress_integral_integer",
+    "__internal_decompress_integral_smallint",
+    "__internal_decompress_integral_ubigint",
+    "__internal_decompress_integral_uhugeint",
+    "__internal_decompress_integral_uinteger",
+    "__internal_decompress_integral_usmallint",
+    "__internal_decompress_string",
+    "abs",
+    "acos",
+    "acosh",
+    "add",
+    "add_parquet_key",
+    "age",
+    "aggregate",
+    "ago",
+    "alias",
+    "all_profiling_output",
+    "any_value",
+    "apply",
+    "approx_count_distinct",
+    "approx_quantile",
+    "approx_top_k",
+    "arbitrary",
+    "arg_max",
+    "arg_max_null",
+    "arg_max_nulls_last",
+    "arg_min",
+    "arg_min_null",
+    "arg_min_nulls_last",
+    "argmax",
+    "argmin",
+    "array_agg",
+    "array_aggr",
+    "array_aggregate",
+    "array_append",
+    "array_apply",
+    "array_cat",
+    "array_concat",
+    "array_contains",
+    "array_cosine_distance",
+    "array_cosine_similarity",
+    "array_cross_product",
+    "array_distance",
+    "array_distinct",
+    "array_dot_product",
+    "array_extract",
+    "array_filter",
+    "array_grade_up",
+    "array_has",
+    "array_has_all",
+    "array_has_any",
+    "array_indexof",
+    "array_inner_product",
+    "array_intersect",
+    "array_length",
+    "array_negative_dot_product",
+    "array_negative_inner_product",
+    "array_pop_back",
+    "array_pop_front",
+    "array_position",
+    "array_prepend",
+    "array_push_back",
+    "array_push_front",
+    "array_reduce",
+    "array_resize",
+    "array_reverse",
+    "array_reverse_sort",
+    "array_select",
+    "array_slice",
+    "array_sort",
+    "array_to_json",
+    "array_to_string",
+    "array_to_string_comma_default",
+    "array_transform",
+    "array_unique",
+    "array_value",
+    "array_where",
+    "array_zip",
+    "arrow_scan",
+    "arrow_scan_dumb",
+    "ascii",
+    "asin",
+    "asinh",
+    "atan",
+    "atan2",
+    "atanh",
+    "avg",
+    "bar",
+    "base64",
+    "bin",
+    "bit_and",
+    "bit_count",
+    "bit_length",
+    "bit_or",
+    "bit_position",
+    "bit_xor",
+    "bitstring",
+    "bitstring_agg",
+    "bool_and",
+    "bool_or",
+    "can_cast_implicitly",
+    "cardinality",
+    "cast_to_type",
+    "cbrt",
+    "ceil",
+    "ceiling",
+    "century",
+    "char_length",
+    "character_length",
+    "checkpoint",
+    "chr",
+    "col_description",
+    "collations",
+    "combine",
+    "concat",
+    "concat_ws",
+    "constant_or_null",
+    "contains",
+    "copy_database",
+    "corr",
+    "cos",
+    "cosh",
+    "cot",
+    "count",
+    "count_if",
+    "count_star",
+    "countif",
+    "covar_pop",
+    "covar_samp",
+    "create_sort_key",
+    "cume_dist",
+    "current_catalog",
+    "current_connection_id",
+    "current_database",
+    "current_date",
+    "current_localtime",
+    "current_localtimestamp",
+    "current_query",
+    "current_query_id",
+    "current_role",
+    "current_schema",
+    "current_schemas",
+    "current_setting",
+    "current_transaction_id",
+    "current_user",
+    "currval",
+    "damerau_levenshtein",
+    "database_list",
+    "database_size",
+    "date_add",
+    "date_diff",
+    "date_part",
+    "date_sub",
+    "date_trunc",
+    "datediff",
+    "datepart",
+    "datesub",
+    "datetrunc",
+    "day",
+    "dayname",
+    "dayofmonth",
+    "dayofweek",
+    "dayofyear",
+    "days_in_month",
+    "decade",
+    "decode",
+    "degrees",
+    "dense_rank",
+    "disable_checkpoint_on_shutdown",
+    "disable_logging",
+    "disable_object_cache",
+    "disable_optimizer",
+    "disable_print_progress_bar",
+    "disable_profile",
+    "disable_profiling",
+    "disable_progress_bar",
+    "disable_verification",
+    "disable_verify_external",
+    "disable_verify_fetch_row",
+    "disable_verify_parallelism",
+    "disable_verify_serializer",
+    "divide",
+    "duckdb_approx_database_count",
+    "duckdb_columns",
+    "duckdb_connection_count",
+    "duckdb_constraints",
+    "duckdb_coordinate_systems",
+    "duckdb_databases",
+    "duckdb_dependencies",
+    "duckdb_extensions",
+    "duckdb_external_file_cache",
+    "duckdb_functions",
+    "duckdb_indexes",
+    "duckdb_keywords",
+    "duckdb_log_contexts",
+    "duckdb_logs",
+    "duckdb_logs_parsed",
+    "duckdb_memory",
+    "duckdb_optimizers",
+    "duckdb_prepared_statements",
+    "duckdb_profiling_settings",
+    "duckdb_schemas",
+    "duckdb_secret_types",
+    "duckdb_secrets",
+    "duckdb_sequences",
+    "duckdb_settings",
+    "duckdb_table_sample",
+    "duckdb_tables",
+    "duckdb_temporary_files",
+    "duckdb_types",
+    "duckdb_variables",
+    "duckdb_views",
+    "editdist3",
+    "element_at",
+    "enable_checkpoint_on_shutdown",
+    "enable_logging",
+    "enable_object_cache",
+    "enable_optimizer",
+    "enable_print_progress_bar",
+    "enable_profile",
+    "enable_profiling",
+    "enable_progress_bar",
+    "enable_verification",
+    "encode",
+    "ends_with",
+    "entropy",
+    "enum_code",
+    "enum_first",
+    "enum_last",
+    "enum_range",
+    "enum_range_boundary",
+    "epoch",
+    "epoch_ms",
+    "epoch_ns",
+    "epoch_us",
+    "equi_width_bins",
+    "era",
+    "error",
+    "even",
+    "exp",
+    "extension_versions",
+    "factorial",
+    "favg",
+    "fdiv",
+    "fill",
+    "filter",
+    "finalize",
+    "first",
+    "first_value",
+    "flatten",
+    "floor",
+    "fmod",
+    "force_checkpoint",
+    "format",
+    "format_bytes",
+    "format_pg_type",
+    "format_type",
+    "formatreadabledecimalsize",
+    "formatreadablesize",
+    "from_base64",
+    "from_binary",
+    "from_hex",
+    "from_json",
+    "from_json_strict",
+    "fsum",
+    "functions",
+    "gamma",
+    "gcd",
+    "gen_random_uuid",
+    "generate_series",
+    "generate_subscripts",
+    "geomean",
+    "geometric_mean",
+    "get_bit",
+    "get_block_size",
+    "get_current_time",
+    "get_current_timestamp",
+    "get_type",
+    "getvariable",
+    "glob",
+    "grade_up",
+    "greatest",
+    "greatest_common_divisor",
+    "group_concat",
+    "hamming",
+    "has_any_column_privilege",
+    "has_column_privilege",
+    "has_database_privilege",
+    "has_foreign_data_wrapper_privilege",
+    "has_function_privilege",
+    "has_language_privilege",
+    "has_schema_privilege",
+    "has_sequence_privilege",
+    "has_server_privilege",
+    "has_table_privilege",
+    "has_tablespace_privilege",
+    "hash",
+    "hex",
+    "histogram",
+    "histogram_exact",
+    "histogram_values",
+    "hour",
+    "icu_calendar_names",
+    "icu_collate_af",
+    "icu_collate_am",
+    "icu_collate_ar",
+    "icu_collate_ar_sa",
+    "icu_collate_as",
+    "icu_collate_az",
+    "icu_collate_be",
+    "icu_collate_bg",
+    "icu_collate_bn",
+    "icu_collate_bo",
+    "icu_collate_br",
+    "icu_collate_bs",
+    "icu_collate_ca",
+    "icu_collate_ceb",
+    "icu_collate_chr",
+    "icu_collate_cs",
+    "icu_collate_cy",
+    "icu_collate_da",
+    "icu_collate_de",
+    "icu_collate_de_at",
+    "icu_collate_dsb",
+    "icu_collate_dz",
+    "icu_collate_ee",
+    "icu_collate_el",
+    "icu_collate_en",
+    "icu_collate_en_us",
+    "icu_collate_eo",
+    "icu_collate_es",
+    "icu_collate_et",
+    "icu_collate_fa",
+    "icu_collate_fa_af",
+    "icu_collate_ff",
+    "icu_collate_fi",
+    "icu_collate_fil",
+    "icu_collate_fo",
+    "icu_collate_fr",
+    "icu_collate_fr_ca",
+    "icu_collate_fy",
+    "icu_collate_ga",
+    "icu_collate_gl",
+    "icu_collate_gu",
+    "icu_collate_ha",
+    "icu_collate_haw",
+    "icu_collate_he",
+    "icu_collate_he_il",
+    "icu_collate_hi",
+    "icu_collate_hr",
+    "icu_collate_hsb",
+    "icu_collate_hu",
+    "icu_collate_hy",
+    "icu_collate_id",
+    "icu_collate_id_id",
+    "icu_collate_ig",
+    "icu_collate_is",
+    "icu_collate_it",
+    "icu_collate_ja",
+    "icu_collate_ka",
+    "icu_collate_kk",
+    "icu_collate_kl",
+    "icu_collate_km",
+    "icu_collate_kn",
+    "icu_collate_ko",
+    "icu_collate_kok",
+    "icu_collate_ku",
+    "icu_collate_ky",
+    "icu_collate_lb",
+    "icu_collate_lij",
+    "icu_collate_lkt",
+    "icu_collate_ln",
+    "icu_collate_lo",
+    "icu_collate_lt",
+    "icu_collate_lv",
+    "icu_collate_mk",
+    "icu_collate_ml",
+    "icu_collate_mn",
+    "icu_collate_mr",
+    "icu_collate_ms",
+    "icu_collate_mt",
+    "icu_collate_my",
+    "icu_collate_nb",
+    "icu_collate_nb_no",
+    "icu_collate_ne",
+    "icu_collate_nl",
+    "icu_collate_nn",
+    "icu_collate_noaccent",
+    "icu_collate_nso",
+    "icu_collate_om",
+    "icu_collate_or",
+    "icu_collate_pa",
+    "icu_collate_pa_in",
+    "icu_collate_pl",
+    "icu_collate_ps",
+    "icu_collate_pt",
+    "icu_collate_ro",
+    "icu_collate_ru",
+    "icu_collate_sa",
+    "icu_collate_se",
+    "icu_collate_si",
+    "icu_collate_sk",
+    "icu_collate_sl",
+    "icu_collate_smn",
+    "icu_collate_sq",
+    "icu_collate_sr",
+    "icu_collate_sr_ba",
+    "icu_collate_sr_me",
+    "icu_collate_sr_rs",
+    "icu_collate_st",
+    "icu_collate_sv",
+    "icu_collate_sw",
+    "icu_collate_ta",
+    "icu_collate_te",
+    "icu_collate_th",
+    "icu_collate_tk",
+    "icu_collate_tn",
+    "icu_collate_to",
+    "icu_collate_tr",
+    "icu_collate_ug",
+    "icu_collate_uk",
+    "icu_collate_ur",
+    "icu_collate_uz",
+    "icu_collate_vi",
+    "icu_collate_wae",
+    "icu_collate_wo",
+    "icu_collate_xh",
+    "icu_collate_yi",
+    "icu_collate_yo",
+    "icu_collate_yue",
+    "icu_collate_yue_cn",
+    "icu_collate_zh",
+    "icu_collate_zh_cn",
+    "icu_collate_zh_hk",
+    "icu_collate_zh_mo",
+    "icu_collate_zh_sg",
+    "icu_collate_zh_tw",
+    "icu_collate_zu",
+    "icu_sort_key",
+    "ilike_escape",
+    "import_database",
+    "in_search_path",
+    "inet_client_addr",
+    "inet_client_port",
+    "inet_server_addr",
+    "inet_server_port",
+    "instr",
+    "is_histogram_other_bin",
+    "isfinite",
+    "isinf",
+    "isnan",
+    "isodow",
+    "isoyear",
+    "jaccard",
+    "jaro_similarity",
+    "jaro_winkler_similarity",
+    "json",
+    "json_array",
+    "json_array_length",
+    "json_contains",
+    "json_deserialize_sql",
+    "json_each",
+    "json_execute_serialized_sql",
+    "json_exists",
+    "json_extract",
+    "json_extract_path",
+    "json_extract_path_text",
+    "json_extract_string",
+    "json_group_array",
+    "json_group_object",
+    "json_group_structure",
+    "json_keys",
+    "json_merge_patch",
+    "json_object",
+    "json_pretty",
+    "json_quote",
+    "json_serialize_plan",
+    "json_serialize_sql",
+    "json_structure",
+    "json_transform",
+    "json_transform_strict",
+    "json_tree",
+    "json_type",
+    "json_valid",
+    "json_value",
+    "julian",
+    "kahan_sum",
+    "kurtosis",
+    "kurtosis_pop",
+    "lag",
+    "last",
+    "last_day",
+    "last_value",
+    "lcase",
+    "lcm",
+    "lead",
+    "least",
+    "least_common_multiple",
+    "left",
+    "left_grapheme",
+    "len",
+    "length",
+    "length_grapheme",
+    "levenshtein",
+    "lgamma",
+    "like_escape",
+    "list",
+    "list_aggr",
+    "list_aggregate",
+    "list_any_value",
+    "list_append",
+    "list_apply",
+    "list_approx_count_distinct",
+    "list_avg",
+    "list_bit_and",
+    "list_bit_or",
+    "list_bit_xor",
+    "list_bool_and",
+    "list_bool_or",
+    "list_cat",
+    "list_concat",
+    "list_contains",
+    "list_cosine_distance",
+    "list_cosine_similarity",
+    "list_count",
+    "list_distance",
+    "list_distinct",
+    "list_dot_product",
+    "list_element",
+    "list_entropy",
+    "list_extract",
+    "list_filter",
+    "list_first",
+    "list_grade_up",
+    "list_has",
+    "list_has_all",
+    "list_has_any",
+    "list_histogram",
+    "list_indexof",
+    "list_inner_product",
+    "list_intersect",
+    "list_kurtosis",
+    "list_kurtosis_pop",
+    "list_last",
+    "list_mad",
+    "list_max",
+    "list_median",
+    "list_min",
+    "list_mode",
+    "list_negative_dot_product",
+    "list_negative_inner_product",
+    "list_pack",
+    "list_position",
+    "list_prepend",
+    "list_product",
+    "list_reduce",
+    "list_resize",
+    "list_reverse",
+    "list_reverse_sort",
+    "list_select",
+    "list_sem",
+    "list_skewness",
+    "list_slice",
+    "list_sort",
+    "list_stddev_pop",
+    "list_stddev_samp",
+    "list_string_agg",
+    "list_sum",
+    "list_transform",
+    "list_unique",
+    "list_value",
+    "list_var_pop",
+    "list_var_samp",
+    "list_where",
+    "list_zip",
+    "listagg",
+    "ln",
+    "log",
+    "log10",
+    "log2",
+    "lower",
+    "lpad",
+    "ltrim",
+    "mad",
+    "make_date",
+    "make_time",
+    "make_timestamp",
+    "make_timestamp_ms",
+    "make_timestamp_ns",
+    "make_timestamptz",
+    "make_type",
+    "map",
+    "map_concat",
+    "map_contains",
+    "map_contains_entry",
+    "map_contains_value",
+    "map_entries",
+    "map_extract",
+    "map_extract_value",
+    "map_from_entries",
+    "map_keys",
+    "map_to_pg_oid",
+    "map_values",
+    "max",
+    "max_by",
+    "md5",
+    "md5_number",
+    "md5_number_lower",
+    "md5_number_upper",
+    "mean",
+    "median",
+    "metadata_info",
+    "microsecond",
+    "millennium",
+    "millisecond",
+    "min",
+    "min_by",
+    "minute",
+    "mismatches",
+    "mod",
+    "mode",
+    "month",
+    "monthname",
+    "multiply",
+    "nanosecond",
+    "nextafter",
+    "nextval",
+    "nfc_normalize",
+    "normalized_interval",
+    "not_ilike_escape",
+    "not_like_escape",
+    "now",
+    "nth_value",
+    "ntile",
+    "nullif",
+    "obj_description",
+    "octet_length",
+    "ord",
+    "pandas_scan",
+    "parquet_bloom_probe",
+    "parquet_file_metadata",
+    "parquet_full_metadata",
+    "parquet_kv_metadata",
+    "parquet_metadata",
+    "parquet_scan",
+    "parquet_schema",
+    "parse_dirname",
+    "parse_dirpath",
+    "parse_duckdb_log_message",
+    "parse_filename",
+    "parse_formatted_bytes",
+    "parse_path",
+    "percent_rank",
+    "pg_collation_is_visible",
+    "pg_conf_load_time",
+    "pg_conversion_is_visible",
+    "pg_function_is_visible",
+    "pg_get_constraintdef",
+    "pg_get_expr",
+    "pg_get_viewdef",
+    "pg_has_role",
+    "pg_is_other_temp_schema",
+    "pg_my_temp_schema",
+    "pg_opclass_is_visible",
+    "pg_operator_is_visible",
+    "pg_opfamily_is_visible",
+    "pg_postmaster_start_time",
+    "pg_size_pretty",
+    "pg_sleep",
+    "pg_table_is_visible",
+    "pg_timezone_names",
+    "pg_ts_config_is_visible",
+    "pg_ts_dict_is_visible",
+    "pg_ts_parser_is_visible",
+    "pg_ts_template_is_visible",
+    "pg_type_is_visible",
+    "pg_typeof",
+    "pi",
+    "platform",
+    "position",
+    "pow",
+    "power",
+    "pragma_collations",
+    "pragma_database_size",
+    "pragma_metadata_info",
+    "pragma_platform",
+    "pragma_show",
+    "pragma_storage_info",
+    "pragma_table_info",
+    "pragma_user_agent",
+    "pragma_version",
+    "prefix",
+    "printf",
+    "product",
+    "python_map_function",
+    "quantile",
+    "quantile_cont",
+    "quantile_disc",
+    "quarter",
+    "query",
+    "query_table",
+    "radians",
+    "random",
+    "range",
+    "rank",
+    "rank_dense",
+    "read_blob",
+    "read_csv",
+    "read_csv_auto",
+    "read_duckdb",
+    "read_json",
+    "read_json_auto",
+    "read_json_objects",
+    "read_json_objects_auto",
+    "read_ndjson",
+    "read_ndjson_auto",
+    "read_ndjson_objects",
+    "read_parquet",
+    "read_text",
+    "reduce",
+    "regexp_escape",
+    "regexp_extract",
+    "regexp_extract_all",
+    "regexp_full_match",
+    "regexp_matches",
+    "regexp_replace",
+    "regexp_split_to_array",
+    "regexp_split_to_table",
+    "regr_avgx",
+    "regr_avgy",
+    "regr_count",
+    "regr_intercept",
+    "regr_r2",
+    "regr_slope",
+    "regr_sxx",
+    "regr_sxy",
+    "regr_syy",
+    "remap_struct",
+    "repeat",
+    "repeat_row",
+    "replace",
+    "replace_type",
+    "reservoir_quantile",
+    "reverse",
+    "right",
+    "right_grapheme",
+    "round",
+    "round_even",
+    "roundbankers",
+    "row",
+    "row_number",
+    "row_to_json",
+    "rpad",
+    "rtrim",
+    "second",
+    "sem",
+    "seq_scan",
+    "session_user",
+    "set_bit",
+    "setseed",
+    "sha1",
+    "sha256",
+    "shobj_description",
+    "show",
+    "show_databases",
+    "show_tables",
+    "show_tables_expanded",
+    "sign",
+    "signbit",
+    "sin",
+    "sinh",
+    "skewness",
+    "sleep_ms",
+    "sniff_csv",
+    "split",
+    "split_part",
+    "sqrt",
+    "st_asbinary",
+    "st_astext",
+    "st_aswkb",
+    "st_aswkt",
+    "st_crs",
+    "st_geomfromwkb",
+    "st_intersects_extent",
+    "st_setcrs",
+    "starts_with",
+    "stats",
+    "stddev",
+    "stddev_pop",
+    "stddev_samp",
+    "storage_info",
+    "str_split",
+    "str_split_regex",
+    "strftime",
+    "string_agg",
+    "string_split",
+    "string_split_regex",
+    "string_to_array",
+    "strip_accents",
+    "strlen",
+    "strpos",
+    "strptime",
+    "struct_concat",
+    "struct_contains",
+    "struct_extract",
+    "struct_extract_at",
+    "struct_has",
+    "struct_indexof",
+    "struct_insert",
+    "struct_keys",
+    "struct_pack",
+    "struct_position",
+    "struct_update",
+    "struct_values",
+    "substr",
+    "substring",
+    "substring_grapheme",
+    "subtract",
+    "suffix",
+    "sum",
+    "sum_no_overflow",
+    "sumkahan",
+    "summary",
+    "switch",
+    "table_info",
+    "tan",
+    "tanh",
+    "test_all_types",
+    "test_vector_types",
+    "time_bucket",
+    "timetz_byte_comparable",
+    "timezone",
+    "timezone_hour",
+    "timezone_minute",
+    "to_base",
+    "to_base64",
+    "to_binary",
+    "to_centuries",
+    "to_days",
+    "to_decades",
+    "to_hex",
+    "to_hours",
+    "to_json",
+    "to_microseconds",
+    "to_millennia",
+    "to_milliseconds",
+    "to_minutes",
+    "to_months",
+    "to_quarters",
+    "to_seconds",
+    "to_timestamp",
+    "to_weeks",
+    "to_years",
+    "today",
+    "transaction_timestamp",
+    "translate",
+    "trim",
+    "trunc",
+    "truncate_duckdb_logs",
+    "try_strptime",
+    "txid_current",
+    "typeof",
+    "ucase",
+    "unbin",
+    "unhex",
+    "unicode",
+    "union_extract",
+    "union_tag",
+    "union_value",
+    "unnest",
+    "unpivot_list",
+    "upper",
+    "url_decode",
+    "url_encode",
+    "user",
+    "user_agent",
+    "uuid",
+    "uuid_extract_timestamp",
+    "uuid_extract_version",
+    "uuidv4",
+    "uuidv7",
+    "var_pop",
+    "var_samp",
+    "variance",
+    "variant_bytes_to_variant",
+    "variant_extract",
+    "variant_normalize",
+    "variant_to_parquet_variant",
+    "variant_typeof",
+    "vector_type",
+    "verify_external",
+    "verify_fetch_row",
+    "verify_parallelism",
+    "verify_serializer",
+    "version",
+    "wavg",
+    "week",
+    "weekday",
+    "weekofyear",
+    "weighted_avg",
+    "which_secret",
+    "write_log",
+    "xor",
+    "year",
+    "yearweek",
+];
diff --git a/backend/parsers/windmill-parser/src/duckdb_macros.rs b/backend/parsers/windmill-parser/src/duckdb_macros.rs
new file mode 100644
index 0000000000..20438d23d1
--- /dev/null
+++ b/backend/parsers/windmill-parser/src/duckdb_macros.rs
@@ -0,0 +1,591 @@
+//! Workspace DuckDB macro libraries (`// macros` annotation).
+//!
+//! A macro-library script's body is `CREATE [OR REPLACE] [TEMP] MACRO`
+//! statements plus plain setup (ATTACH/INSTALL/LOAD/SET/PRAGMA). At deploy the
+//! macros are parsed into the `macro_definition` registry; at job time the
+//! worker injects the (transitively) called ones into consumer scripts as
+//! `CREATE OR REPLACE TEMP MACRO` blocks. Everything is stored and re-emitted
+//! **verbatim** (params, body) — no AST round-trip — so any expression DuckDB
+//! accepts survives unchanged.
+//!
+//! DuckDB bind-checks macro bodies at CREATE time (macro→macro and table
+//! references alike), so injected definitions must be emitted in dependency
+//! order — hence `topo_order_macros` — and after the consumer's ATTACHes.
+
+use std::collections::{BTreeMap, BTreeSet, HashSet};
+
+use crate::sql_materialize::{classify_block, split_statements, BlockClass};
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct ParsedMacro {
+    /// Lowercased bare identifier (DuckDB identifiers are case-insensitive
+    /// unquoted; qualified / quoted names are rejected at parse).
+    pub name: String,
+    /// Verbatim text inside the parameter parens (may be empty).
+    pub params: String,
+    /// Verbatim text after `AS [TABLE]`, without the trailing `;`.
+    pub body: String,
+    pub is_table: bool,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum LibStatement {
+    Macro(ParsedMacro),
+    /// A non-macro statement allowed in a library: setup-class only
+    /// (ATTACH/INSTALL/LOAD/SET/PRAGMA/USE/CREATE TEMP …). Re-emitted verbatim
+    /// ahead of the macro definitions when the lib is injected via `// use`.
+    Setup(String),
+}
+
+/// Statement text for injecting one macro into a consumer job. Always
+/// TEMP (session-scoped — no catalog writes) and OR REPLACE (idempotent).
+pub fn macro_create_statement(name: &str, params: &str, is_table: bool, body: &str) -> String {
+    format!(
+        "CREATE OR REPLACE TEMP MACRO {}({}) AS {}{};",
+        name,
+        params,
+        if is_table { "TABLE " } else { "" },
+        body
+    )
+}
+
+fn is_ident(s: &str) -> bool {
+    let mut chars = s.chars();
+    matches!(chars.next(), Some(c) if c.is_ascii_alphabetic() || c == '_')
+        && chars.all(|c| c.is_ascii_alphanumeric() || c == '_')
+}
+
+// Case-insensitive whole-word prefix strip (whitespace-bounded), returning the
+// remainder with leading whitespace trimmed. `get` (not slicing) so a
+// multi-byte char straddling the boundary yields None instead of panicking.
+fn strip_kw<'a>(s: &'a str, kw: &str) -> Option<&'a str> {
+    let prefix = s.get(..kw.len())?;
+    if prefix.eq_ignore_ascii_case(kw) {
+        let after = &s[kw.len()..];
+        if after.is_empty() || after.starts_with(|c: char| c.is_whitespace()) {
+            return Some(after.trim_start());
+        }
+    }
+    None
+}
+
+/// Parse one (comment-free, `;`-less) statement as a CREATE MACRO. Returns
+/// `Ok(None)` when the statement is not macro-shaped at all (caller decides
+/// whether it is acceptable setup), `Err` when it is macro-shaped but invalid.
+fn parse_create_macro(stmt: &str) -> Result<Option<ParsedMacro>, String> {
+    let Some(mut rest) = strip_kw(stmt.trim(), "create") else {
+        return Ok(None);
+    };
+    if let Some(r) = strip_kw(rest, "or") {
+        rest = strip_kw(r, "replace").ok_or("expected REPLACE after CREATE OR")?;
+    }
+    if let Some(r) = strip_kw(rest, "temp").or_else(|| strip_kw(rest, "temporary")) {
+        rest = r;
+    }
+    // `FUNCTION` is DuckDB's alias for `MACRO`.
+    let Some(rest) = strip_kw(rest, "macro").or_else(|| strip_kw(rest, "function")) else {
+        return Ok(None);
+    };
+
+    let name_end = rest
+        .find(|c: char| c.is_whitespace() || c == '(')
+        .unwrap_or(rest.len());
+    let raw_name = &rest[..name_end];
+    if raw_name.is_empty() {
+        return Err("CREATE MACRO: missing macro name".to_string());
+    }
+    if raw_name.contains('.') || raw_name.contains('"') || !is_ident(raw_name) {
+        return Err(format!(
+            "macro name `{}` must be a plain unqualified identifier ([A-Za-z_][A-Za-z0-9_]*) in v1",
+            raw_name
+        ));
+    }
+    let name = raw_name.to_ascii_lowercase();
+
+    let rest = rest[name_end..].trim_start();
+    if !rest.starts_with('(') {
+        return Err(format!(
+            "macro `{}`: expected a parenthesized parameter list after the name",
+            name
+        ));
+    }
+    // Balanced-paren scan for the verbatim param list. The statement comes
+    // from `split_statements` so comments are gone, but strings may contain
+    // parens (e.g. a default value) — skip quoted spans.
+    let bytes = rest.as_bytes();
+    let mut depth = 0usize;
+    let mut i = 0usize;
+    let mut close = None;
+    while i < bytes.len() {
+        match bytes[i] {
+            b'(' => depth += 1,
+            b')' => {
+                depth -= 1;
+                if depth == 0 {
+                    close = Some(i);
+                    break;
+                }
+            }
+            q @ (b'\'' | b'"') => {
+                i += 1;
+                while i < bytes.len() && bytes[i] != q {
+                    i += 1;
+                }
+            }
+            _ => {}
+        }
+        i += 1;
+    }
+    let Some(close) = close else {
+        return Err(format!(
+            "macro `{}`: unbalanced parameter parentheses",
+            name
+        ));
+    };
+    let params = rest[1..close].trim().to_string();
+
+    let after_params = rest[close + 1..].trim_start();
+    let Some(mut body) = strip_kw(after_params, "as") else {
+        return Err(format!(
+            "macro `{}`: expected AS after the parameter list",
+            name
+        ));
+    };
+    let is_table = match strip_kw(body, "table") {
+        Some(r) => {
+            body = r;
+            true
+        }
+        None => false,
+    };
+    let body = body.trim().trim_end_matches(';').trim_end().to_string();
+    if body.is_empty() {
+        return Err(format!("macro `{}`: empty body", name));
+    }
+    Ok(Some(ParsedMacro { name, params, body, is_table }))
+}
+
+fn stmt_head(stmt: &str) -> String {
+    stmt.split_whitespace()
+        .take(4)
+        .collect::<Vec<_>>()
+        .join(" ")
+}
+
+/// Managed ATTACH forms (`ducklake://…`, `datatable://…`, resource URIs) are
+/// rewritten by the worker's transform pass — which `// use`-injected lib
+/// setup bypasses — so a library may only use plain, self-contained ATTACHes.
+pub fn is_managed_attach(stmt: &str) -> bool {
+    let s = stmt.trim();
+    if strip_kw(s, "attach").is_none() {
+        return false;
+    }
+    let lower = s.to_ascii_lowercase();
+    [
+        "'ducklake:",
+        "'datatable:",
+        "'windmill:",
+        "'$res:",
+        "\"ducklake:",
+        "\"datatable:",
+        "\"windmill:",
+        "\"$res:",
+    ]
+    .iter()
+    .any(|p| lower.contains(p))
+}
+
+/// Parse a `// macros` library body. Statements are either macro definitions
+/// or setup; anything else is an error (user-facing message).
+pub fn parse_macro_library(sql: &str) -> Result<Vec<LibStatement>, String> {
+    let mut out = Vec::new();
+    for stmt in split_statements(sql) {
+        match parse_create_macro(&stmt)? {
+            Some(m) => out.push(LibStatement::Macro(m)),
+            None => match classify_block(&stmt) {
+                BlockClass::Setup => {
+                    if is_managed_attach(&stmt) {
+                        return Err(format!(
+                            "a `// macros` library cannot use managed ATTACH forms \
+                             (ducklake://, datatable://, resource URIs) in v1 — its setup is \
+                             injected verbatim into consumers, bypassing the ATTACH rewrite: `{}`",
+                            stmt_head(&stmt)
+                        ));
+                    }
+                    out.push(LibStatement::Setup(stmt))
+                }
+                _ => {
+                    return Err(format!(
+                        "a `// macros` library may only contain CREATE [OR REPLACE] MACRO \
+                         statements plus setup (ATTACH/INSTALL/LOAD/SET/PRAGMA); found: `{}`",
+                        stmt_head(&stmt)
+                    ))
+                }
+            },
+        }
+    }
+    Ok(out)
+}
+
+/// Whether the statement is macro-definition-shaped (`CREATE [OR REPLACE]
+/// [TEMP] MACRO|FUNCTION …`), regardless of whether the rest of the header
+/// parses. Used by the worker's injection splice to keep injected blocks
+/// *after* a script's own leading definitions (an injected body may only call
+/// a local macro once the local CREATE has run — DuckDB binds at CREATE).
+pub fn is_macro_definition(stmt: &str) -> bool {
+    let Some(mut rest) = strip_kw(stmt.trim(), "create") else {
+        return false;
+    };
+    if let Some(r) = strip_kw(rest, "or") {
+        let Some(r2) = strip_kw(r, "replace") else {
+            return false;
+        };
+        rest = r2;
+    }
+    if let Some(r) = strip_kw(rest, "temp").or_else(|| strip_kw(rest, "temporary")) {
+        rest = r;
+    }
+    strip_kw(rest, "macro")
+        .or_else(|| strip_kw(rest, "function"))
+        .is_some()
+}
+
+/// Parse a single macro-definition statement (`CREATE [OR REPLACE] [TEMP]
+/// MACRO …`). `None` when the statement isn't macro-shaped or its header is
+/// malformed — callers using definitions as placement anchors skip those
+/// (they fail at execution regardless).
+pub fn parse_macro_definition(stmt: &str) -> Option<ParsedMacro> {
+    parse_create_macro(stmt).ok().flatten()
+}
+
+/// Names of macros the given statements define themselves (`CREATE [OR
+/// REPLACE] [TEMP] MACRO …`). A consumer's own definition is authoritative
+/// over a same-named workspace macro — the worker subtracts these before
+/// planning injection, so deploying a library can never silently replace a
+/// script's local macro. Malformed macro-shaped statements are skipped (they
+/// fail at execution regardless).
+pub fn locally_defined_macro_names(statements: &[String]) -> HashSet<String> {
+    statements
+        .iter()
+        .filter_map(|s| parse_create_macro(s).ok().flatten().map(|m| m.name))
+        .collect()
+}
+
+/// Names from `names` that `sql` calls: an identifier token immediately
+/// followed by `(` (after optional whitespace), not `.`-qualified. Scans the
+/// comment-stripped statements; string-literal contents are skipped. Matching
+/// is deliberately lexical — over-matching only injects an unused TEMP macro.
+pub fn detect_macro_calls(sql: &str, names: &HashSet<String>) -> HashSet<String> {
+    let mut found = HashSet::new();
+    if names.is_empty() {
+        return found;
+    }
+    for stmt in split_statements(sql) {
+        let bytes = stmt.as_bytes();
+        let n = bytes.len();
+        let mut i = 0usize;
+        let mut prev: Option<u8> = None;
+        while i < n {
+            let c = bytes[i];
+            // skip quoted spans ('' escape for single quotes is handled by
+            // the fact that the reopened quote just starts another skip)
+            if c == b'\'' || c == b'"' {
+                let q = c;
+                i += 1;
+                while i < n && bytes[i] != q {
+                    i += 1;
+                }
+                i += 1;
+                prev = Some(q);
+                continue;
+            }
+            let is_ident_start = c.is_ascii_alphabetic() || c == b'_';
+            let prev_blocks =
+                matches!(prev, Some(p) if p == b'.' || p.is_ascii_alphanumeric() || p == b'_');
+            if is_ident_start && !prev_blocks {
+                let start = i;
+                while i < n && (bytes[i].is_ascii_alphanumeric() || bytes[i] == b'_') {
+                    i += 1;
+                }
+                let word = stmt[start..i].to_ascii_lowercase();
+                let mut j = i;
+                while j < n && (bytes[j] as char).is_whitespace() {
+                    j += 1;
+                }
+                if j < n && bytes[j] == b'(' && names.contains(&word) {
+                    found.insert(word);
+                }
+                prev = Some(bytes[i - 1]);
+                continue;
+            }
+            prev = Some(c);
+            i += 1;
+        }
+    }
+    found
+}
+
+/// Order `selected` macro names so every macro comes after the macros its
+/// body calls (Kahn's algorithm, name-sorted ties for determinism). `defs`
+/// maps each selected name to its body. Errors on a dependency cycle (only
+/// reachable via cross-library deploy interleaving — DuckDB itself could
+/// never have bound a cycle).
+pub fn topo_order_macros(
+    selected: &HashSet<String>,
+    defs: &BTreeMap<String, String>,
+) -> Result<Vec<String>, String> {
+    let all: HashSet<String> = selected.clone();
+    // deps[m] = selected macros m's body calls; rev[d] = macros depending on d
+    let mut deps: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
+    let mut rev: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
+    for name in selected {
+        let body = defs
+            .get(name)
+            .ok_or_else(|| format!("macro `{}` has no definition", name))?;
+        let mut called = detect_macro_calls(body, &all);
+        called.remove(name); // ignore self-recursion (DuckDB rejects it at CREATE anyway)
+        for d in &called {
+            rev.entry(d.clone()).or_default().insert(name.clone());
+        }
+        deps.insert(name.clone(), called.into_iter().collect());
+    }
+    let mut ready: BTreeSet<String> = deps
+        .iter()
+        .filter(|(_, d)| d.is_empty())
+        .map(|(n, _)| n.clone())
+        .collect();
+    let mut out = Vec::with_capacity(selected.len());
+    while let Some(name) = ready.iter().next().cloned() {
+        ready.remove(&name);
+        out.push(name.clone());
+        if let Some(dependents) = rev.get(&name) {
+            for dep in dependents.clone() {
+                let d = deps.get_mut(&dep).unwrap();
+                d.remove(&name);
+                if d.is_empty() {
+                    ready.insert(dep);
+                }
+            }
+        }
+        deps.remove(&name);
+    }
+    if !deps.is_empty() {
+        let cycle: Vec<String> = deps.keys().cloned().collect();
+        return Err(format!(
+            "macro dependency cycle involving: {}",
+            cycle.join(", ")
+        ));
+    }
+    Ok(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn names(list: &[&str]) -> HashSet<String> {
+        list.iter().map(|s| s.to_string()).collect()
+    }
+
+    #[test]
+    fn parses_scalar_macro() {
+        let lib =
+            parse_macro_library("CREATE MACRO surrogate_key(a, b) AS md5(concat_ws('||', a, b));")
+                .unwrap();
+        assert_eq!(
+            lib,
+            vec![LibStatement::Macro(ParsedMacro {
+                name: "surrogate_key".into(),
+                params: "a, b".into(),
+                body: "md5(concat_ws('||', a, b))".into(),
+                is_table: false,
+            })]
+        );
+    }
+
+    #[test]
+    fn parses_table_macro_or_replace_temp_and_function_alias() {
+        let lib = parse_macro_library(
+            "CREATE OR REPLACE TEMP MACRO top_n(t_max) AS TABLE SELECT * FROM t WHERE x <= t_max;\n\
+             create function dbl(a) as a * 2;",
+        )
+        .unwrap();
+        match &lib[0] {
+            LibStatement::Macro(m) => {
+                assert_eq!(m.name, "top_n");
+                assert!(m.is_table);
+                assert_eq!(m.body, "SELECT * FROM t WHERE x <= t_max");
+            }
+            other => panic!("expected macro, got {:?}", other),
+        }
+        match &lib[1] {
+            LibStatement::Macro(m) => {
+                assert_eq!(m.name, "dbl");
+                assert!(!m.is_table);
+            }
+            other => panic!("expected macro, got {:?}", other),
+        }
+    }
+
+    #[test]
+    fn parses_default_params_and_nested_parens() {
+        let lib = parse_macro_library(
+            "CREATE MACRO safe_div(a, b, fallback := (0)) AS CASE WHEN b = 0 THEN fallback ELSE a / b END;",
+        )
+        .unwrap();
+        match &lib[0] {
+            LibStatement::Macro(m) => {
+                assert_eq!(m.params, "a, b, fallback := (0)");
+                assert!(m.body.starts_with("CASE WHEN"));
+            }
+            other => panic!("expected macro, got {:?}", other),
+        }
+    }
+
+    #[test]
+    fn params_with_string_containing_paren() {
+        let lib = parse_macro_library("CREATE MACRO f(sep := '(') AS concat(sep, 'x');").unwrap();
+        match &lib[0] {
+            LibStatement::Macro(m) => assert_eq!(m.params, "sep := '('"),
+            other => panic!("expected macro, got {:?}", other),
+        }
+    }
+
+    #[test]
+    fn setup_statements_allowed_and_kept_in_order() {
+        let lib =
+            parse_macro_library("-- a comment\nATTACH 'x.duckdb' AS ext;\nCREATE MACRO m() AS 1;")
+                .unwrap();
+        assert_eq!(lib.len(), 2);
+        assert!(matches!(&lib[0], LibStatement::Setup(s) if s.starts_with("ATTACH")));
+        assert!(matches!(&lib[1], LibStatement::Macro(_)));
+    }
+
+    #[test]
+    fn rejects_non_setup_statements() {
+        let err = parse_macro_library("CREATE MACRO m() AS 1; SELECT 1;").unwrap_err();
+        assert!(err.contains("may only contain"), "{err}");
+        let err = parse_macro_library("CREATE TABLE t(x int);").unwrap_err();
+        assert!(err.contains("may only contain"), "{err}");
+    }
+
+    #[test]
+    fn rejects_managed_attach_setup() {
+        let err =
+            parse_macro_library("ATTACH 'ducklake://analytics' AS lake;\nCREATE MACRO m() AS 1;")
+                .unwrap_err();
+        assert!(err.contains("managed ATTACH"), "{err}");
+    }
+
+    #[test]
+    fn rejects_qualified_and_quoted_names() {
+        assert!(parse_macro_library("CREATE MACRO lake.m(a) AS a;")
+            .unwrap_err()
+            .contains("unqualified"));
+        assert!(parse_macro_library("CREATE MACRO \"weird name\"(a) AS a;").is_err());
+    }
+
+    #[test]
+    fn rejects_missing_params_or_body() {
+        assert!(parse_macro_library("CREATE MACRO m AS 1;").is_err());
+        assert!(parse_macro_library("CREATE MACRO m(a);").is_err());
+        assert!(parse_macro_library("CREATE MACRO m(a) AS ;").is_err());
+    }
+
+    #[test]
+    fn detect_basic_and_word_boundaries() {
+        let ns = names(&["dbl", "avg_x"]);
+        let found = detect_macro_calls("SELECT dbl(1), my_dbl(2), avg_x (3) FROM t", &ns);
+        assert!(found.contains("dbl"));
+        assert!(found.contains("avg_x")); // whitespace before paren ok
+        assert_eq!(found.len(), 2);
+    }
+
+    #[test]
+    fn detect_skips_qualified_strings_and_comments() {
+        let ns = names(&["dbl"]);
+        assert!(detect_macro_calls("SELECT lake.dbl(1)", &ns).is_empty());
+        assert!(detect_macro_calls("SELECT 'dbl(1)'", &ns).is_empty());
+        assert!(detect_macro_calls("-- dbl(1)\nSELECT 1", &ns).is_empty());
+        assert!(detect_macro_calls("SELECT dbl FROM t", &ns).is_empty()); // no call parens
+    }
+
+    #[test]
+    fn detect_case_insensitive_and_table_macro_position() {
+        let ns = names(&["top_n"]);
+        assert!(!detect_macro_calls("SELECT * FROM TOP_N(3)", &ns).is_empty());
+    }
+
+    #[test]
+    fn topo_chain_and_diamond() {
+        let mut defs = BTreeMap::new();
+        defs.insert("a".to_string(), "b(1) + c(2)".to_string());
+        defs.insert("b".to_string(), "d(1)".to_string());
+        defs.insert("c".to_string(), "d(2)".to_string());
+        defs.insert("d".to_string(), "1".to_string());
+        let sel = names(&["a", "b", "c", "d"]);
+        let order = topo_order_macros(&sel, &defs).unwrap();
+        let pos = |n: &str| order.iter().position(|x| x == n).unwrap();
+        assert!(pos("d") < pos("b"));
+        assert!(pos("d") < pos("c"));
+        assert!(pos("b") < pos("a"));
+        assert!(pos("c") < pos("a"));
+    }
+
+    #[test]
+    fn topo_cycle_errors() {
+        let mut defs = BTreeMap::new();
+        defs.insert("a".to_string(), "b(1)".to_string());
+        defs.insert("b".to_string(), "a(1)".to_string());
+        let err = topo_order_macros(&names(&["a", "b"]), &defs).unwrap_err();
+        assert!(err.contains("cycle"), "{err}");
+    }
+
+    #[test]
+    fn non_ascii_body_survives_verbatim() {
+        // Regression: the statement splitter must not Latin-1-mojibake
+        // multi-byte text — macro bodies are persisted and re-executed.
+        let lib = parse_macro_library("CREATE MACRO greet(a) AS a || ' café ☕';").unwrap();
+        match &lib[0] {
+            LibStatement::Macro(m) => assert_eq!(m.body, "a || ' café ☕'"),
+            other => panic!("expected macro, got {:?}", other),
+        }
+    }
+
+    #[test]
+    fn non_ascii_garbage_errors_instead_of_panicking() {
+        // Regression: keyword matching must not byte-slice across a char
+        // boundary (panicked on inputs like this before).
+        assert!(parse_macro_library("abcé foo;").is_err());
+        assert!(parse_macro_library("créate macro m(a) AS a;").is_err());
+    }
+
+    #[test]
+    fn locally_defined_names_extracted() {
+        let blocks = vec![
+            "ATTACH 'x' AS a;".to_string(),
+            "CREATE TEMP MACRO dbl(a) AS a * 2;".to_string(),
+            "SELECT dbl(2);".to_string(),
+        ];
+        let local = locally_defined_macro_names(&blocks);
+        assert!(local.contains("dbl"));
+        assert_eq!(local.len(), 1);
+    }
+
+    #[test]
+    fn create_statement_roundtrip() {
+        assert_eq!(
+            macro_create_statement("m", "a, b := 1", true, "SELECT a + b"),
+            "CREATE OR REPLACE TEMP MACRO m(a, b := 1) AS TABLE SELECT a + b;"
+        );
+    }
+
+    #[test]
+    fn builtin_lookup() {
+        use crate::duckdb_builtins::is_duckdb_builtin;
+        assert!(is_duckdb_builtin("concat"));
+        assert!(is_duckdb_builtin("CONCAT"));
+        assert!(is_duckdb_builtin("read_csv"));
+        assert!(!is_duckdb_builtin("surrogate_key"));
+    }
+}
diff --git a/backend/parsers/windmill-parser/src/lib.rs b/backend/parsers/windmill-parser/src/lib.rs
index 5a7e90bf7e..4270edcc79 100644
--- a/backend/parsers/windmill-parser/src/lib.rs
+++ b/backend/parsers/windmill-parser/src/lib.rs
@@ -13,6 +13,9 @@ use serde::Serialize;
 use serde_json::Value;
 
 pub mod asset_parser;
+pub mod duckdb_builtins;
+pub mod duckdb_macros;
+pub mod sql_materialize;
 
 /// S3 output format for SQL queries (moved here to avoid pulling sqlx into WASM via windmill-types)
 #[derive(Clone, Copy, Debug)]
diff --git a/backend/parsers/windmill-parser/src/sql_materialize.rs b/backend/parsers/windmill-parser/src/sql_materialize.rs
new file mode 100644
index 0000000000..0e6e6656eb
--- /dev/null
+++ b/backend/parsers/windmill-parser/src/sql_materialize.rs
@@ -0,0 +1,2618 @@
+//! Eligibility classifier + materialization SQL codegen for managed `// materialize`.
+//!
+//! Managed `// materialize` (the default) promises the script is "setup
+//! statements, then one trailing SELECT" — Windmill generates the write DDL
+//! around that SELECT (the `// materialize manual` escape hatch opts out and
+//! writes its own DDL). This module is the single source of truth for *which
+//! block is that SELECT* and *what DDL gets generated*, so save-time validation
+//! (deploy path) and run-time codegen (DuckDB executor) can never disagree.
+//!
+//! Everything here is pure and string-level: no SQL is executed, no type
+//! inference is done. The classifier is leading-keyword based and deliberately
+//! conservative — anything it can't positively recognize as a read-only output
+//! or a known-safe setup statement is rejected, so a script is only accepted
+//! for managed mode when its shape is unambiguous.
+
+/// One top-level statement's role in a wrap-mode script.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum BlockClass {
+    /// Read-only relation the wrap writes from: `SELECT` / `WITH …SELECT` /
+    /// `FROM` (DuckDB from-first) / `VALUES` / `TABLE x` / `(UN)PIVOT`.
+    Output,
+    /// Known-safe preamble: `ATTACH` / `INSTALL` / `LOAD` / `SET` / `PRAGMA` /
+    /// `USE` / `CREATE TEMP …`. Runs verbatim before the generated write.
+    Setup,
+    /// Anything that writes or whose effect we can't vouch for: non-temp
+    /// `CREATE` / `INSERT` / `UPDATE` / `DELETE` / `MERGE` / `DROP` / `COPY` /
+    /// `ALTER` / `TRUNCATE`, or an unrecognized leading keyword. Disqualifies
+    /// managed mode (the user should use `// materialize manual`).
+    Disallowed,
+}
+
+/// A script accepted for wrapping: zero+ setup blocks then one terminal SELECT.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct WrapPlan {
+    /// Setup statements in source order, verbatim, **without** trailing `;`.
+    pub setup: Vec<String>,
+    /// The single terminal output statement, verbatim, **without** trailing `;`.
+    pub output: String,
+}
+
+/// Why a script is not eligible for managed `// materialize`. Carries enough to
+/// render the targeted save-time messages.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum WrapError {
+    /// No statements at all (empty / comments only).
+    Empty,
+    /// No terminal SELECT — nothing to wrap.
+    NoOutput,
+    /// More than one top-level SELECT. `count` is how many were found.
+    MultipleOutputs { count: usize },
+    /// A SELECT exists but isn't the last statement (something runs after it).
+    OutputNotLast,
+    /// A write/unknown statement appears among the setup blocks. `snippet` is a
+    /// short prefix of the offending statement for the error message.
+    DisallowedBlock { snippet: String },
+}
+
+impl WrapError {
+    /// Human-facing, actionable message (matches the spec's rejection text).
+    pub fn message(&self) -> String {
+        let base =
+            "managed `// materialize` requires the script to be setup statements then a single trailing SELECT";
+        let manual = "use `// materialize manual` to write the DDL yourself";
+        match self {
+            WrapError::Empty => format!("{base}: the script is empty."),
+            WrapError::NoOutput => format!("{base}: found no SELECT — {manual}."),
+            WrapError::MultipleOutputs { count } => format!(
+                "{base}: found {count} SELECT statements; combine them with a CTE, or {manual}."
+            ),
+            WrapError::OutputNotLast => format!(
+                "{base}: found statements after the SELECT — move them above it, or {manual}."
+            ),
+            WrapError::DisallowedBlock { snippet } => {
+                format!("{base}: `{snippet}` writes or is unrecognized — {manual}.")
+            }
+        }
+    }
+}
+
+/// Split SQL into top-level, `;`-separated statements, skipping line comments
+/// (`-- …`), block comments (`/* … */`), single-quoted strings (`'…'` with
+/// `''` escape) and double-quoted identifiers (`"…"`). Semicolons inside any of
+/// those are not separators. Returns each statement trimmed, comments stripped,
+/// empties dropped. Self-contained so the parser crate stays dependency-free;
+/// it must stay behaviourally aligned with the executor's block splitter (both
+/// route wrap through `classify_wrap`, so the split they see is this one).
+pub fn split_statements(sql: &str) -> Vec<String> {
+    let mut out = Vec::new();
+    let mut cur = String::new();
+    // Char-wise, not byte-wise: the emitted strings are re-executed
+    // (materialize codegen) and persisted (macro registry), so a Latin-1
+    // `bytes[i] as char` decode would corrupt any multi-byte text inside
+    // statements. All delimiters are ASCII — split positions are unaffected.
+    let chars: Vec<char> = sql.chars().collect();
+    let mut i = 0;
+    let n = chars.len();
+    while i < n {
+        let c = chars[i];
+        // line comment — `--` (SQL) or `//`. The `//` form is not SQL, but it
+        // is how Windmill pipeline annotations (`// materialize`, `// pipeline`,
+        // …) are written, and they sit above the SQL in the same script; strip
+        // them so they don't pollute the first statement block's classification
+        // or the generated setup SQL.
+        if (c == '-' && i + 1 < n && chars[i + 1] == '-')
+            || (c == '/' && i + 1 < n && chars[i + 1] == '/')
+        {
+            while i < n && chars[i] != '\n' {
+                i += 1;
+            }
+            continue;
+        }
+        // block comment
+        if c == '/' && i + 1 < n && chars[i + 1] == '*' {
+            i += 2;
+            while i + 1 < n && !(chars[i] == '*' && chars[i + 1] == '/') {
+                i += 1;
+            }
+            i += 2;
+            continue;
+        }
+        // single-quoted string
+        if c == '\'' {
+            cur.push(c);
+            i += 1;
+            while i < n {
+                cur.push(chars[i]);
+                if chars[i] == '\'' {
+                    // doubled '' is an escaped quote, stay in string
+                    if i + 1 < n && chars[i + 1] == '\'' {
+                        cur.push('\'');
+                        i += 2;
+                        continue;
+                    }
+                    i += 1;
+                    break;
+                }
+                i += 1;
+            }
+            continue;
+        }
+        // double-quoted identifier
+        if c == '"' {
+            cur.push(c);
+            i += 1;
+            while i < n {
+                cur.push(chars[i]);
+                if chars[i] == '"' {
+                    i += 1;
+                    break;
+                }
+                i += 1;
+            }
+            continue;
+        }
+        if c == ';' {
+            let t = cur.trim();
+            if !t.is_empty() {
+                out.push(t.to_string());
+            }
+            cur.clear();
+            i += 1;
+            continue;
+        }
+        cur.push(c);
+        i += 1;
+    }
+    let t = cur.trim();
+    if !t.is_empty() {
+        out.push(t.to_string());
+    }
+    out
+}
+
+/// Lowercased top-level keyword tokens of a single statement (parens collapsed
+/// away: tokens *inside* balanced `(...)` are skipped, so a CTE body's verbs
+/// don't leak up). Strings/identifiers are already gone from the split, but we
+/// re-guard quotes defensively. Used to disambiguate `WITH …` and `CREATE …`.
+fn top_level_keywords(stmt: &str) -> Vec<String> {
+    let mut toks = Vec::new();
+    let mut cur = String::new();
+    let mut depth: i32 = 0;
+    let bytes = stmt.as_bytes();
+    let mut i = 0;
+    let n = bytes.len();
+    let flush = |cur: &mut String, toks: &mut Vec<String>| {
+        if !cur.is_empty() {
+            toks.push(cur.to_lowercase());
+            cur.clear();
+        }
+    };
+    while i < n {
+        let c = bytes[i] as char;
+        if c == '\'' || c == '"' {
+            let q = bytes[i];
+            i += 1;
+            while i < n && bytes[i] != q {
+                i += 1;
+            }
+            i += 1;
+            continue;
+        }
+        if c == '(' {
+            flush(&mut cur, &mut toks);
+            depth += 1;
+            i += 1;
+            continue;
+        }
+        if c == ')' {
+            if depth > 0 {
+                depth -= 1;
+            }
+            i += 1;
+            continue;
+        }
+        if depth > 0 {
+            i += 1;
+            continue;
+        }
+        if c.is_alphanumeric() || c == '_' {
+            cur.push(c);
+        } else {
+            flush(&mut cur, &mut toks);
+        }
+        i += 1;
+    }
+    flush(&mut cur, &mut toks);
+    toks
+}
+
+const OUTPUT_KW: &[&str] = &["select", "from", "values", "table", "pivot", "unpivot"];
+const SETUP_KW: &[&str] = &["attach", "install", "load", "set", "pragma", "use"];
+const WRITE_VERBS: &[&str] = &["insert", "update", "delete", "merge"];
+
+/// Classify a single statement by its leading keyword (with `WITH`/`CREATE`
+/// disambiguation). See [`BlockClass`].
+pub fn classify_block(stmt: &str) -> BlockClass {
+    let kws = top_level_keywords(stmt);
+    let Some(first) = kws.first().map(String::as_str) else {
+        return BlockClass::Disallowed;
+    };
+
+    // CREATE TEMP … is setup (staging); any other CREATE is a write.
+    if first == "create" {
+        let temp = kws
+            .iter()
+            .skip(1)
+            .take(3)
+            .any(|k| k == "temp" || k == "temporary");
+        return if temp {
+            BlockClass::Setup
+        } else {
+            BlockClass::Disallowed
+        };
+    }
+
+    // WITH … : the main statement's verb decides. CTE bodies are parenthesized,
+    // so their verbs are not in `kws`; the first top-level write verb or SELECT
+    // after the CTE list is the real one.
+    if first == "with" {
+        for k in kws.iter().skip(1) {
+            if k == "select" {
+                return BlockClass::Output;
+            }
+            if WRITE_VERBS.contains(&k.as_str()) {
+                return BlockClass::Disallowed;
+            }
+        }
+        // `WITH x AS (...) SELECT` where SELECT got collapsed is impossible
+        // (SELECT here is top-level), so a WITH with no top-level verb is a
+        // malformed/unknown statement — reject conservatively.
+        return BlockClass::Disallowed;
+    }
+
+    if OUTPUT_KW.contains(&first) {
+        return BlockClass::Output;
+    }
+    if SETUP_KW.contains(&first) {
+        return BlockClass::Setup;
+    }
+    BlockClass::Disallowed
+}
+
+/// Validate a script for managed `// materialize` and, on success, return the
+/// setup/output split. Enforces the four conditions from the spec:
+/// 1. exactly one Output block, 2. it is last, 3. all preceding blocks are
+/// Setup, 4. nothing after it.
+pub fn classify_wrap(sql: &str) -> Result<WrapPlan, WrapError> {
+    let stmts = split_statements(sql);
+    if stmts.is_empty() {
+        return Err(WrapError::Empty);
+    }
+    let classes: Vec<BlockClass> = stmts.iter().map(|s| classify_block(s)).collect();
+
+    let output_idxs: Vec<usize> = classes
+        .iter()
+        .enumerate()
+        .filter(|(_, c)| **c == BlockClass::Output)
+        .map(|(i, _)| i)
+        .collect();
+
+    match output_idxs.len() {
+        0 => return Err(WrapError::NoOutput),
+        1 => {}
+        count => return Err(WrapError::MultipleOutputs { count }),
+    }
+    let out_idx = output_idxs[0];
+    if out_idx != stmts.len() - 1 {
+        return Err(WrapError::OutputNotLast);
+    }
+    // Everything before the output must be Setup (no Disallowed preamble).
+    for (i, c) in classes.iter().enumerate().take(out_idx) {
+        if *c != BlockClass::Setup {
+            return Err(WrapError::DisallowedBlock { snippet: snippet(&stmts[i]) });
+        }
+    }
+    Ok(WrapPlan { setup: stmts[..out_idx].to_vec(), output: stmts[out_idx].clone() })
+}
+
+fn snippet(stmt: &str) -> String {
+    let one_line: String = stmt.split_whitespace().collect::<Vec<_>>().join(" ");
+    if one_line.chars().count() > 40 {
+        let truncated: String = one_line.chars().take(40).collect();
+        format!("{truncated}…")
+    } else {
+        one_line
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Codegen
+// ---------------------------------------------------------------------------
+
+/// How a (partition of a) materialized table is reconciled on each run.
+/// Derived at deploy from the annotation: `key=<col> history` (or the `scd2`
+/// alias) → `Scd2`, else `append` → `Append`, else `unique_key` → `Merge`, else
+/// `Replace`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum MaterializeStrategy {
+    /// DELETE the current partition, then INSERT — partition becomes exactly
+    /// what the SELECT returned. Full-refresh of the slice.
+    Replace,
+    /// Upsert within the slice on `unique_key` (delete-by-key + insert); rows
+    /// absent from the SELECT are left in place. This is SCD type 1: a changed
+    /// row overwrites the prior value, keeping no history.
+    Merge { unique_key: String },
+    /// INSERT only — immutable event-log semantics.
+    Append,
+    /// Slowly Changing Dimension type 2: the SELECT is the *current* snapshot
+    /// (one row per `key`); a change to any tracked column closes the prior
+    /// version (`valid_to`/`is_current=false`) and opens a new one, so the full
+    /// history is preserved. `track` empty ⇒ every non-key column is tracked.
+    /// `close_deleted` (opt-in `deletes=close`) also closes the current version
+    /// of a key that disappears from the snapshot (dbt's `hard_deletes=close`);
+    /// default (false) leaves absent keys current (soft delete).
+    /// Unpartitioned only (the worker rejects `// partitioned` + scd2).
+    Scd2 { key: String, track: Vec<String>, close_deleted: bool },
+}
+
+/// SCD2 metadata columns appended to the managed history table. Fixed names so
+/// the generated diff/close/open SQL and any `// data_test` on them agree.
+const SCD2_VALID_FROM: &str = "valid_from";
+const SCD2_VALID_TO: &str = "valid_to";
+const SCD2_IS_CURRENT: &str = "is_current";
+/// Connection-local temp table holding the keys whose version must be rotated
+/// this run (changed + new). Captured before the write so the close and the
+/// open see the same set. `_wm_` prefix so it never collides with user tables.
+const SCD2_CHANGED_KEYS: &str = "_wm_scd2_changed";
+/// Connection-local temp table holding the keys that disappeared from the
+/// snapshot this run (present-and-current in the table, absent from the SELECT).
+/// Only used when `close_deleted` (`deletes=close`) is set.
+const SCD2_DELETED_KEYS: &str = "_wm_scd2_deleted";
+
+/// Inputs to materialization codegen, all resolved at run time by the worker.
+/// Pure: produces SQL text; executes nothing.
+#[derive(Debug, Clone)]
+pub struct MaterializeCodegen<'a> {
+    /// Fully-qualified target, e.g. `_wm_target.orders_daily`. Always qualified
+    /// so a user `USE …;` in setup can't redirect the write.
+    pub target_qualified: &'a str,
+    /// The user's output SELECT (verbatim, no trailing `;`) — embedded as a
+    /// subquery so its own shape is irrelevant to the generated wrapper.
+    pub select_sql: &'a str,
+    /// Physical partition column added to the managed table.
+    pub partition_col: &'a str,
+    /// SQL expression for the current partition value — a literal like
+    /// `'2026-06-19'` or a bind placeholder. The caller is responsible for
+    /// safe quoting/binding.
+    pub partition_value_sql: &'a str,
+    /// Whether `// partitioned` applies. When false the table is unpartitioned
+    /// and the partition column / `SET PARTITIONED BY` are omitted.
+    pub partitioned: bool,
+    pub strategy: MaterializeStrategy,
+    /// Write-time guardrail for a drifted SELECT vs the fixed table schema.
+    /// Only the persist-and-mutate strategies (partitioned replace, merge,
+    /// append) act on it: `Fail` emits an in-txn guard that raises on drift,
+    /// `Sync` writes BY NAME and expects the executor to inject `ALTER TABLE`
+    /// DDL at the [`SYNC_ALTER_SENTINEL`] slot, `Warn`/`Ignore` write
+    /// positionally (drift surfaced by the summary in `Warn`, silent in
+    /// `Ignore`). See [`MaterializeCodegen::is_persist_and_mutate`].
+    pub on_schema_change: OnSchemaChange,
+}
+
+/// The exact statement the `sync` codegen emits right after `BEGIN
+/// TRANSACTION;` as the injection slot for `ALTER TABLE … ADD/DROP COLUMN`
+/// DDL. The executor computes the drift with a pre-pass probe and replaces this
+/// literal in the assembled query text (with the DDL, or removes it when there
+/// is no drift). Classified `Write` so the EE write-audit-publish reassembly
+/// keeps it inside the transaction with the mutations; a plain no-op SELECT so
+/// that if it is somehow left un-replaced the run still succeeds unchanged.
+pub const SYNC_ALTER_SENTINEL: &str = "SELECT '__wm_sync_alter_sentinel__' AS _wm_sync;";
+
+impl<'a> MaterializeCodegen<'a> {
+    /// Whether this (strategy, partitioned) uses the positional persist-and-
+    /// mutate write whose table schema is fixed at first CREATE — the only case
+    /// the `on_schema_change` write-time guardrail applies to. Whole-table
+    /// replace (`CREATE OR REPLACE`) and scd2 self-heal / are name-mapped, so
+    /// they are excluded.
+    pub fn is_persist_and_mutate(&self) -> bool {
+        match self.strategy {
+            MaterializeStrategy::Scd2 { .. } => false,
+            MaterializeStrategy::Replace => self.partitioned,
+            MaterializeStrategy::Append | MaterializeStrategy::Merge { .. } => true,
+        }
+    }
+
+    /// The ordered statements that perform the materialization, to be run after
+    /// the setup blocks and inside the caller's execution. The first-run
+    /// bootstrap is idempotent (`IF NOT EXISTS`), so this is safe to run every
+    /// time. The DELETE/INSERT body is wrapped in one transaction so a partial
+    /// failure leaves the prior snapshot intact. Every strategy reduces to
+    /// DELETE+INSERT (no `MERGE INTO`) — see the `Merge` arm for why.
+    pub fn statements(&self) -> Vec<String> {
+        let t = self.target_qualified;
+        let sel = self.select_sql;
+        let pcol = self.partition_col;
+        let pval = self.partition_value_sql;
+        let mut out = Vec::new();
+
+        // SCD2 has a shape unlike the DELETE/INSERT strategies (diff → close old
+        // → open new) and does not support partitioning (rejected at the worker),
+        // so it is generated up front by its own helper.
+        if let MaterializeStrategy::Scd2 { key, track, close_deleted } = &self.strategy {
+            return self.scd2_statements(key, track, *close_deleted);
+        }
+
+        // Whole-table replace: rebuild the table to match the SELECT's *current*
+        // schema each run with one atomic `CREATE OR REPLACE` (which DuckLake
+        // still snapshots). This is the only path that survives a changed SELECT
+        // or a pre-existing table with a different schema — the persist-and-
+        // mutate paths below fix the schema at first create.
+        if !self.partitioned && matches!(self.strategy, MaterializeStrategy::Replace) {
+            out.push(format!(
+                "CREATE OR REPLACE TABLE {t} AS SELECT * FROM ({sel});"
+            ));
+            return out;
+        }
+
+        // Persist-and-mutate (partitioned, or merge/append): bootstrap the table
+        // if absent, then write into it. The schema is fixed at first create —
+        // a later SELECT-schema change needs a manual rebuild (schema evolution
+        // is a follow-up).
+        if self.partitioned {
+            out.push(format!(
+                "CREATE TABLE IF NOT EXISTS {t} AS \
+                 SELECT *, CAST(NULL AS VARCHAR) AS {pcol} FROM ({sel}) WHERE false;"
+            ));
+            out.push(format!("ALTER TABLE {t} SET PARTITIONED BY ({pcol});"));
+        } else {
+            out.push(format!(
+                "CREATE TABLE IF NOT EXISTS {t} AS SELECT * FROM ({sel}) WHERE false;"
+            ));
+        }
+        out.push("BEGIN TRANSACTION;".to_string());
+        // Write-time schema guardrail, emitted right after BEGIN so it runs
+        // before any mutation (a failing guard aborts before touching data; the
+        // sync ALTERs run before the INSERT so the sets match). Reached only on
+        // the persist-and-mutate path here (whole-table replace and scd2 return
+        // above), so no extra strategy gate is needed.
+        match self.on_schema_change {
+            OnSchemaChange::Fail => out.push(schema_drift_guard_sql(sel, t, pcol)),
+            OnSchemaChange::Sync => out.push(SYNC_ALTER_SENTINEL.to_string()),
+            OnSchemaChange::Warn | OnSchemaChange::Ignore => {}
+        }
+        // The rows to write, with the partition column appended when partitioned.
+        let source = if self.partitioned {
+            format!("SELECT *, {pval} AS {pcol} FROM ({sel})")
+        } else {
+            format!("SELECT * FROM ({sel})")
+        };
+        // `sync` maps columns by name (positional would cross-wire: an ALTERed
+        // ADD COLUMN appends at the end, so a positional INSERT of the SELECT
+        // would fill it from the wrong source column).
+        let by_name = if self.on_schema_change == OnSchemaChange::Sync {
+            " BY NAME"
+        } else {
+            ""
+        };
+        match &self.strategy {
+            MaterializeStrategy::Replace => {
+                // Only reached when partitioned (whole-table replace returned above).
+                out.push(format!("DELETE FROM {t} WHERE {pcol} = {pval};"));
+                out.push(format!("INSERT INTO {t}{by_name} {source};"));
+            }
+            MaterializeStrategy::Append => {
+                out.push(format!("INSERT INTO {t}{by_name} {source};"));
+            }
+            MaterializeStrategy::Merge { unique_key } => {
+                // Upsert within the slice via delete-by-key + insert (dbt's
+                // `delete+insert`): rows whose key is in the incoming SELECT are
+                // replaced, others are left in place. This deliberately avoids
+                // `MERGE INTO` — DuckLake's MERGE fails writing the first rows of
+                // a fresh partition (HTTP 404 on the new parquet), and a failed
+                // write leaves the table needing a DROP. DELETE+INSERT is the
+                // same write shape as `replace`, which is reliable. The DELETE is
+                // scoped to the current partition when partitioned so it stays
+                // slice-local (a key present in another partition is untouched).
+                //
+                // Guard first: the DELETE+INSERT does not dedup the source, so
+                // two incoming rows sharing a key would both persist under it.
+                // Raise instead of silently double-writing (see the helper).
+                out.push(duplicate_source_key_guard_sql(sel, unique_key));
+                let scope = if self.partitioned {
+                    format!("{pcol} = {pval} AND ")
+                } else {
+                    String::new()
+                };
+                out.push(format!(
+                    "DELETE FROM {t} WHERE {scope}{unique_key} IN (SELECT {unique_key} FROM ({sel}));"
+                ));
+                out.push(format!("INSERT INTO {t}{by_name} {source};"));
+            }
+            // Handled by the early return above (scd2 has no partitioned form).
+            MaterializeStrategy::Scd2 { .. } => unreachable!("scd2 handled before this match"),
+        }
+        out.push("COMMIT;".to_string());
+        out
+    }
+
+    /// SCD2 codegen: the incoming SELECT is the *current desired snapshot* (one
+    /// row per `key`); we diff it against the live current rows, close the prior
+    /// version of every changed/new key, and open a fresh one — so history is
+    /// kept. `track` empty ⇒ every non-key column is tracked for change
+    /// detection.
+    ///
+    /// Shape (all one transaction for the mutation, mirroring the other
+    /// strategies so a partial failure leaves the prior snapshot intact):
+    ///  1. bootstrap the table (business columns + `valid_from/valid_to/
+    ///     is_current`), idempotent;
+    ///  2. capture changed+new keys into a connection-local temp table *before*
+    ///     the write — the close below flips `is_current`, so recomputing the
+    ///     diff after it would see a different set;
+    ///  3. close the prior open version of those keys (`UPDATE` — not `MERGE`:
+    ///     DuckLake's MERGE is the unreliable path, plain UPDATE works);
+    ///  3b. when `close_deleted`, also capture the keys that vanished from the
+    ///     snapshot and close their current version (no reopen) — dbt's
+    ///     `hard_deletes=close`;
+    ///  4. open a new current version from the snapshot;
+    ///  5. create the `<dim>_current` convenience view once (`IF NOT EXISTS`),
+    ///     inside the same transaction so it doesn't advance the DuckLake snapshot
+    ///     past the data write the summary records (and so an unchanged rerun,
+    ///     whose UPDATE/INSERT touch no rows, stays a true no-op).
+    ///
+    /// Close/open match keys with `IS NOT DISTINCT FROM` (via a correlated
+    /// `EXISTS`), not `key IN (…)`: SQL `IN` never matches `NULL`, so a `NULL`
+    /// natural key would be flagged as changed yet silently skipped by both the
+    /// close and the open, dropping the row. Null-safe matching materializes it
+    /// instead (a `NULL` key is still ill-formed for a dimension — guard it with
+    /// `// data_test not_null <key>` — but it must not vanish).
+    ///
+    /// Without `close_deleted`, keys present in the table but absent from the
+    /// SELECT are left current (soft delete — dbt's `hard_deletes=ignore` default;
+    /// with `close_deleted` they are closed instead — see step 3b). The effective
+    /// timestamp is `now()`, which DuckDB fixes to
+    /// the transaction start, so `valid_from`/`valid_to` are consistent within a
+    /// run without a nondeterministic per-statement clock.
+    ///
+    /// Reserved columns: `valid_from`/`valid_to`/`is_current` are appended to the
+    /// user's SELECT with these fixed names (kept clean so consumers write
+    /// `WHERE is_current` / `ASOF JOIN … >= valid_from`). A SELECT that already
+    /// projects one of them is a v1 constraint violation — the bootstrap then
+    /// produces a duplicate output column and the run fails at execution
+    /// (documented; not statically checkable here since the SELECT's columns
+    /// aren't known at codegen time).
+    fn scd2_statements(&self, key: &str, track: &[String], close_deleted: bool) -> Vec<String> {
+        let t = self.target_qualified;
+        let sel = self.select_sql;
+        let k = quote_ident(key);
+        let vf = SCD2_VALID_FROM;
+        let vt = SCD2_VALID_TO;
+        let ic = SCD2_IS_CURRENT;
+        let changed = SCD2_CHANGED_KEYS;
+        let deleted = SCD2_DELETED_KEYS;
+        // Transaction-stable effective timestamp (see doc above). Cast to plain
+        // TIMESTAMP so it matches the bootstrapped column type (now() is TZ-aware).
+        let ts = "CAST(now() AS TIMESTAMP)";
+
+        // Projection compared to detect change. Empty `track` ⇒ all business
+        // columns via `* EXCLUDE (<scd cols>)` on the table side (which carries
+        // the extra metadata columns) and `*` on the snapshot side. An explicit
+        // `track` ⇒ key + those columns on both sides. `EXCEPT` treats NULLs as
+        // equal, so an unchanged NULL is not read as a change.
+        let (src_proj, tgt_proj) = if track.is_empty() {
+            (
+                format!("SELECT * FROM ({sel})"),
+                format!("SELECT * EXCLUDE ({vf}, {vt}, {ic}) FROM {t} WHERE {ic}"),
+            )
+        } else {
+            let cols = std::iter::once(key)
+                .chain(track.iter().map(String::as_str))
+                .map(quote_ident)
+                .collect::<Vec<_>>()
+                .join(", ");
+            (
+                format!("SELECT {cols} FROM ({sel})"),
+                format!("SELECT {cols} FROM {t} WHERE {ic}"),
+            )
+        };
+
+        let mut out = vec![
+            format!(
+                "CREATE TABLE IF NOT EXISTS {t} AS SELECT *, \
+                 CAST(NULL AS TIMESTAMP) AS {vf}, \
+                 CAST(NULL AS TIMESTAMP) AS {vt}, \
+                 CAST(NULL AS BOOLEAN) AS {ic} FROM ({sel}) WHERE false;"
+            ),
+            format!(
+                "CREATE OR REPLACE TEMP TABLE {changed} AS \
+                 SELECT {k} FROM ({src_proj} EXCEPT {tgt_proj});"
+            ),
+        ];
+        // Hard-delete-close (`deletes=close`): the keys that vanished from the
+        // snapshot — present-and-current in the table, absent from the SELECT.
+        // Captured before the close (like `changed`) and disjoint from it (a
+        // key is either in the snapshot or not), so the two closes never overlap.
+        if close_deleted {
+            out.push(format!(
+                "CREATE OR REPLACE TEMP TABLE {deleted} AS \
+                 SELECT {k} FROM (SELECT {k} FROM {t} WHERE {ic} EXCEPT SELECT {k} FROM ({sel}));"
+            ));
+        }
+        out.push("BEGIN TRANSACTION;".to_string());
+        out.push(format!(
+            "UPDATE {t} SET {vt} = {ts}, {ic} = false \
+             WHERE {ic} AND EXISTS (SELECT 1 FROM {changed} \
+             WHERE {changed}.{k} IS NOT DISTINCT FROM {t}.{k});"
+        ));
+        // Close vanished keys — no matching INSERT below, so they close without
+        // reopening. A key that later reappears isn't in `WHERE is_current`, so the
+        // `changed` diff treats it as new and opens a fresh version (a validity gap
+        // between the delete and the reactivation — correct SCD2).
+        if close_deleted {
+            out.push(format!(
+                "UPDATE {t} SET {vt} = {ts}, {ic} = false \
+                 WHERE {ic} AND EXISTS (SELECT 1 FROM {deleted} \
+                 WHERE {deleted}.{k} IS NOT DISTINCT FROM {t}.{k});"
+            ));
+        }
+        out.push(format!(
+            "INSERT INTO {t} SELECT s.*, {ts} AS {vf}, CAST(NULL AS TIMESTAMP) AS {vt}, \
+             true AS {ic} FROM ({sel}) s WHERE EXISTS (SELECT 1 FROM {changed} c \
+             WHERE c.{k} IS NOT DISTINCT FROM s.{k});"
+        ));
+        out.push(
+            // Consumer convenience: a `<dim>_current` view (the live slice) so the
+            // common "just the latest version" read needs no `WHERE is_current`,
+            // and downstream scripts can `// on` / read it directly. For the
+            // effective-dated payoff, consumers `ASOF JOIN <dim> ON fact.key =
+            // dim.<key> AND fact.ts >= dim.valid_from`.
+            //
+            // `CREATE VIEW IF NOT EXISTS` (not `OR REPLACE`), created inside the
+            // write transaction, on purpose: the view definition never changes
+            // (`SELECT * WHERE is_current` always reflects live data), and a
+            // catalog write advances the DuckLake snapshot — so `OR REPLACE` on
+            // every run would (a) advance the snapshot on an otherwise no-op
+            // unchanged run and (b) make the summary's `max(snapshot_id)` record
+            // the view DDL instead of the data write. `IF NOT EXISTS` creates it
+            // once (folded into the first data-write snapshot) and is a true no-op
+            // afterwards. The `<dim>_current` name is reserved: if a real table by
+            // that name already exists, `IF NOT EXISTS` skips silently (no view,
+            // no error) — documented as a reserved suffix.
+            format!("CREATE VIEW IF NOT EXISTS {t}_current AS SELECT * FROM {t} WHERE {ic};"),
+        );
+        out.push("COMMIT;".to_string());
+        out
+    }
+}
+
+// ---------------------------------------------------------------------------
+// on_schema_change drift detection (write-time guardrail)
+// ---------------------------------------------------------------------------
+//
+// Drift is computed entirely in SQL against the live DuckDB session: the
+// SELECT's output columns come from `DESCRIBE`, the table's from `DESCRIBE` of
+// the target (the managed `_wm_partition` column is excluded so it is compared
+// as the producer's logical output, matching schema capture). `added` = SELECT
+// columns absent from the table, `removed` = table columns absent from the
+// SELECT. When the table was just created this run (first materialize) the two
+// DESCRIBEs agree, so both lists are empty and no guard fires.
+
+/// A `DESCRIBE`-derived set of column names of `rel_sql` (any SELECT-able
+/// relation, already parenthesized/qualified by the caller), optionally
+/// dropping the managed partition column.
+fn describe_col_names(rel_sql: &str, exclude_col: Option<&str>) -> String {
+    let filter = match exclude_col {
+        Some(c) => format!(" WHERE column_name <> {}", quote_lit(c)),
+        None => String::new(),
+    };
+    format!("SELECT column_name FROM (DESCRIBE SELECT * FROM {rel_sql}){filter}")
+}
+
+/// Scalar subqueries `(added, removed)` — the list of column names in the
+/// SELECT but not the table, and vice versa. Each is a `list(...)` over an
+/// `EXCEPT`; empty ⇒ `list()` yields an empty list (`len` 0). The partition
+/// column is excluded on the table side only.
+///
+/// Set difference, not ordered: this catches the add/remove/rename that a
+/// positional INSERT misaligns on, but by design NOT a pure reorder of
+/// same-named columns (identical sets ⇒ empty added/removed). See the
+/// `OnSchemaChange` doc in asset_parser.rs — reorder-safety is `sync`'s job
+/// (INSERT BY NAME); the set difference is deliberately kept over an ordered
+/// comparison so the `fail` guard cannot false-positive on a correctly-aligned
+/// write.
+fn drift_lists(sel_sql: &str, target_qualified: &str, partition_col: &str) -> (String, String) {
+    let sel = describe_col_names(&format!("({sel_sql})"), None);
+    let tbl = describe_col_names(target_qualified, Some(partition_col));
+    let added = format!("(SELECT list(column_name) FROM (({sel}) EXCEPT ({tbl})))");
+    let removed = format!("(SELECT list(column_name) FROM (({tbl}) EXCEPT ({sel})))");
+    (added, removed)
+}
+
+/// The `fail`-mode guard: a single statement that raises via DuckDB `error(...)`
+/// when the SELECT's columns diverge from the table's, naming the added/removed
+/// columns and the target. Both `CASE` branches are cast to VARCHAR so the
+/// planner cannot constant-fold the `error(...)` away, and the condition depends
+/// on the runtime drift subqueries so it is never folded to a constant.
+fn schema_drift_guard_sql(sel_sql: &str, target_qualified: &str, partition_col: &str) -> String {
+    let (added, removed) = drift_lists(sel_sql, target_qualified, partition_col);
+    // `target_qualified` is safe in table-reference position (quoted identifiers)
+    // but here it lands inside a SQL string literal, so single-quotes must be
+    // doubled (same as `quote_lit`).
+    let tq = target_qualified.replace('\'', "''");
+    format!(
+        "SELECT CASE WHEN coalesce(len(_wm_added), 0) + coalesce(len(_wm_removed), 0) > 0 \
+         THEN CAST(error('managed materialize: on_schema_change=fail blocked a schema-drifted \
+         write to {tq} — added column(s): [' || coalesce(array_to_string(_wm_added, ', '), '') || \
+         '], removed column(s): [' || coalesce(array_to_string(_wm_removed, ', '), '') || \
+         ']. The table schema is fixed at first create; set on_schema_change=sync to auto-migrate, \
+         or align the SELECT with the table.') AS VARCHAR) ELSE 'ok' END \
+         FROM (SELECT {added} AS _wm_added, {removed} AS _wm_removed);",
+        tq = tq,
+    )
+}
+
+/// In-transaction guard for the keyed `merge` strategy: raises via DuckDB
+/// `error(...)` when the source SELECT holds more than one row for the same
+/// non-NULL `unique_key`. A keyed merge is delete-by-key + insert-all (it does
+/// NOT deduplicate the source), so duplicate source keys would land every
+/// duplicate row under one key — the exact silent double-write this guards
+/// against. Erroring keeps the semantics explicit: the author must deduplicate
+/// in the SELECT (or use `append`). NULL keys are excluded to match the delete's
+/// `key IN (...)` scope, which never matches NULL. `unique_key` is embedded raw
+/// in identifier position (matching the merge's own DELETE/IN) and doubled-quote
+/// escaped where it lands inside the error string literal.
+fn duplicate_source_key_guard_sql(sel_sql: &str, unique_key: &str) -> String {
+    let key_lit = unique_key.replace('\'', "''");
+    format!(
+        "SELECT CASE WHEN _wm_dup_keys > 0 THEN CAST(error('managed materialize: keyed merge on \
+         `{key_lit}` blocked — the source has ' || _wm_dup_keys || ' key value(s) with more than \
+         one row. A keyed merge keeps one row per key and does not deduplicate; deduplicate in the \
+         SELECT (e.g. QUALIFY row_number() OVER (PARTITION BY {key_lit} ORDER BY …) = 1) or use \
+         `append`.') AS VARCHAR) ELSE 'ok' END FROM (SELECT count(*) AS _wm_dup_keys FROM (SELECT \
+         {unique_key} FROM ({sel_sql}) WHERE {unique_key} IS NOT NULL GROUP BY {unique_key} HAVING \
+         count(*) > 1));"
+    )
+}
+
+/// The `warn`-mode summary column: a `schema_drift` struct `{added, removed}`
+/// when the SELECT drifted from the table, else NULL. Appended to the
+/// materialize summary row so the executor can log it and fold it into the job
+/// result without an extra round-trip.
+fn schema_drift_summary_field(
+    sel_sql: &str,
+    target_qualified: &str,
+    partition_col: &str,
+) -> String {
+    let (added, removed) = drift_lists(sel_sql, target_qualified, partition_col);
+    format!(
+        "(SELECT CASE WHEN coalesce(len(_wm_added), 0) + coalesce(len(_wm_removed), 0) > 0 \
+         THEN {{'added': _wm_added, 'removed': _wm_removed}} END \
+         FROM (SELECT {added} AS _wm_added, {removed} AS _wm_removed)) AS schema_drift"
+    )
+}
+
+/// The read that captures the DuckLake snapshot id produced by the write, for
+/// the given attach alias (e.g. `_wm_target`). The worker runs this last and
+/// records the result into `materialized_partition`.
+pub fn snapshot_capture_sql(alias: &str) -> String {
+    format!("SELECT max(snapshot_id) AS snapshot_id FROM ducklake_snapshots('{alias}');")
+}
+
+/// Reserved attach alias for the materialization target, fully-qualified in all
+/// generated SQL so a user `USE …;` in the setup blocks can't redirect the
+/// write. The worker resolves the real `ATTACH 'ducklake:…' AS _wm_target (…)`
+/// from the target ducklake's config and passes it in as `target_attach`.
+pub const TARGET_ALIAS: &str = "_wm_target";
+
+/// Structural role of one statement in a [`MaterializePlan`]. The public build
+/// executes the plan verbatim, so the kinds are pure metadata there; they exist
+/// so a downstream assembler (`pipeline_advanced::finalize_materialize_query`)
+/// can reason about the plan without parsing SQL.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum MaterializeStmtKind {
+    /// Pre-write statement: user setup, the target ATTACH, referenced-asset
+    /// ATTACHes.
+    Setup,
+    /// Write work against the target: bootstrap DDL, SCD2 temp-table captures,
+    /// the mutation itself, the `_current` view.
+    Write,
+    /// The `BEGIN TRANSACTION;` marker emitted by the strategy codegen.
+    TxnBegin,
+    /// The `COMMIT;` marker emitted by the strategy codegen.
+    TxnCommit,
+    /// The trailing one-row summary read (asset / rows / snapshot_id /
+    /// data_tests breakdown).
+    Summary,
+}
+
+/// One planned statement: its structural role and the SQL text.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct MaterializeStmt {
+    pub kind: MaterializeStmtKind,
+    pub sql: String,
+}
+
+/// The full ordered materialization plan [`build_wrap_blocks`] produces:
+/// statements in execution order plus the compiled data-test checks (also
+/// embedded in the summary statement's breakdown). Assembled into the final
+/// statement list by `pipeline_advanced::finalize_materialize_query`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct MaterializePlan {
+    pub stmts: Vec<MaterializeStmt>,
+    pub checks: Vec<DataTestCheck>,
+}
+
+/// Assemble the full ordered statement list the DuckDB executor runs for a
+/// managed `// materialize` script. This is the single entry point the worker
+/// calls; it composes the already-tested pieces (classifier split → target
+/// ATTACH → strategy codegen → snapshot capture) so their ordering lives in one
+/// tested place rather than inline in the executor.
+///
+/// `target_attach` is the real `ATTACH 'ducklake:…' AS _wm_target (…);` string
+/// the worker built from config (it depends on resolved credentials, so it
+/// can't be generated here). `target_table` is the table within that catalog
+/// (e.g. `orders_daily`), referenced as `_wm_target.<table>`. `asset_path` is
+/// the full `<name>/<table>` for the result summary. The trailing statement is
+/// a one-row summary read (asset / rows / snapshot_id) that is both the job's
+/// result (a useful preview) and what the worker records.
+///
+/// Returns a [`MaterializePlan`] — the statements plus their structural role
+/// and the compiled data-test checks — rather than raw SQL: the executor hands
+/// the plan to `windmill_common::pipeline_advanced::finalize_materialize_query`
+/// (which this crate cannot depend on), whose public-build implementation
+/// assembles the statements verbatim. Everything this function produces runs
+/// as-is on the public build; the plan's structure is metadata about it, not a
+/// second mode.
+pub fn build_wrap_blocks(
+    plan: &WrapPlan,
+    target_attach: &str,
+    target_table: &str,
+    asset_path: &str,
+    partition_col: &str,
+    partition_value_sql: &str,
+    partitioned: bool,
+    strategy: MaterializeStrategy,
+    on_schema_change: OnSchemaChange,
+    tests: &[DataTestResolved],
+) -> Result<MaterializePlan, String> {
+    let target_qualified = format!("{TARGET_ALIAS}.{target_table}");
+    let scd2 = matches!(strategy, MaterializeStrategy::Scd2 { .. });
+    let ctx = DataTestCtx {
+        target_qualified: &target_qualified,
+        asset_path,
+        partition_col,
+        partition_value_sql,
+        partitioned,
+        scd2,
+    };
+    let test_sql = build_data_test_checks(tests, &ctx)?;
+    let cg = MaterializeCodegen {
+        target_qualified: &target_qualified,
+        select_sql: &plan.output,
+        partition_col,
+        partition_value_sql,
+        partitioned,
+        strategy,
+        on_schema_change,
+    };
+    // `warn` folds the post-write drift into the summary row (executor logs it +
+    // returns it) — only for the positional persist-and-mutate path, and only in
+    // `warn`: `fail`/`sync` guard the write itself, `ignore` is silent.
+    let drift_summary_select =
+        if on_schema_change == OnSchemaChange::Warn && cg.is_persist_and_mutate() {
+            Some(plan.output.as_str())
+        } else {
+            None
+        };
+    let mut stmts: Vec<MaterializeStmt> = Vec::new();
+    let setup = |sql: String| MaterializeStmt { kind: MaterializeStmtKind::Setup, sql };
+    // Setup blocks come from the splitter with their `;` stripped — re-terminate
+    // each so that when the executor re-joins and re-splits the assembled query,
+    // adjacent statements (e.g. the user ATTACH and the synthetic target ATTACH)
+    // don't merge into one malformed statement.
+    stmts.extend(plan.setup.iter().map(|s| setup(terminate(s))));
+    stmts.push(setup(target_attach.to_string()));
+    // Referenced-asset ATTACHes (relationships tests) — read-only, before the
+    // write and the summary that probes them.
+    stmts.extend(test_sql.attaches.into_iter().map(setup));
+    // Classify the codegen statements by matching the exact transaction-marker
+    // literals this module emits (`BEGIN TRANSACTION;` / `COMMIT;`); everything
+    // else the codegen produces is write work.
+    stmts.extend(cg.statements().into_iter().map(|sql| {
+        let kind = match sql.as_str() {
+            "BEGIN TRANSACTION;" => MaterializeStmtKind::TxnBegin,
+            "COMMIT;" => MaterializeStmtKind::TxnCommit,
+            _ => MaterializeStmtKind::Write,
+        };
+        MaterializeStmt { kind, sql }
+    }));
+    // The summary read carries the per-test breakdown (when any tests apply).
+    stmts.push(MaterializeStmt {
+        kind: MaterializeStmtKind::Summary,
+        sql: materialize_result_sql(
+            &target_qualified,
+            asset_path,
+            partition_col,
+            partition_value_sql,
+            partitioned,
+            &test_sql.checks,
+            drift_summary_select,
+        ),
+    });
+    Ok(MaterializePlan { stmts, checks: test_sql.checks })
+}
+
+/// The trailing one-row summary the materialize run returns: the asset it
+/// produced, the row count of the materialized slice (the partition when
+/// partitioned, else the whole table), and the DuckLake snapshot it created.
+/// This is both a useful preview result and the row the worker records.
+pub fn materialize_result_sql(
+    target_qualified: &str,
+    asset_path: &str,
+    partition_col: &str,
+    partition_value_sql: &str,
+    partitioned: bool,
+    checks: &[DataTestCheck],
+    // `on_schema_change=warn` on a persist-and-mutate strategy: the SELECT to
+    // diff against the (post-write) table for the `schema_drift` summary column.
+    // `None` ⇒ no drift column (every other mode / strategy).
+    drift_summary_select: Option<&str>,
+) -> String {
+    let (count_expr, partition_sel) = if partitioned {
+        // Row count is the slice this run wrote (the partition); `partition`
+        // lets the UI label the count and scope the preview to it.
+        (
+            format!(
+                "(SELECT count(*) FROM {target_qualified} WHERE {partition_col} = {partition_value_sql})"
+            ),
+            format!("{partition_value_sql} AS partition, "),
+        )
+    } else {
+        (
+            format!("(SELECT count(*) FROM {target_qualified})"),
+            String::new(),
+        )
+    };
+    // Capture the materialized output schema (gap #2a) in the same summary row —
+    // no extra round-trip. `DESCRIBE SELECT * FROM <target>` yields one row per
+    // column (`column_name`, `column_type`); fold them into a list-of-struct the
+    // worker reads back and persists as asset metadata. The write just
+    // committed, so the latest snapshot (no `AT (VERSION)` needed) is exactly the
+    // slice recorded in `snapshot_id`.
+    //
+    // Two correctness details:
+    // - `_wm_ord` (a `row_number()` over the DESCRIBE) is captured so the
+    //   list-of-struct is ordered *explicitly* (`list(... ORDER BY _wm_ord)`).
+    //   DESCRIBE returns columns in physical order; without the explicit ORDER
+    //   the `list()` aggregate could reorder them and spuriously bump the schema
+    //   version on a re-materialize.
+    // - For a `// partitioned` asset the physical table carries the synthetic
+    //   `_wm_partition` column; it must be filtered out so the recorded schema is
+    //   the producer's logical output, not Windmill's storage detail (this is the
+    //   grain #2b contract enforcement reads back).
+    let partition_filter = if partitioned {
+        format!(
+            " WHERE column_name <> '{}'",
+            partition_col.replace('\'', "''")
+        )
+    } else {
+        String::new()
+    };
+    let schema_capture = format!(
+        "(SELECT list({{'name': column_name, 'type': column_type}} ORDER BY _wm_ord) \
+         FROM (SELECT column_name, column_type, row_number() OVER () AS _wm_ord \
+               FROM (DESCRIBE SELECT * FROM {target_qualified}){partition_filter})) AS output_schema"
+    );
+    // `on_schema_change=warn`: fold the drift `{added, removed}` (or NULL) into
+    // the same row so the executor logs it + returns it with no extra probe.
+    let drift_col = match drift_summary_select {
+        Some(sel) => format!(
+            ", {}",
+            schema_drift_summary_field(sel, target_qualified, partition_col)
+        ),
+        None => String::new(),
+    };
+    let base_cols = format!(
+        "'ducklake://{asset_path}' AS materialized, \
+         {partition_sel}{count_expr} AS rows, \
+         (SELECT max(snapshot_id) FROM ducklake_snapshots('{TARGET_ALIAS}')) AS snapshot_id, \
+         {schema_capture}{drift_col}"
+    );
+    if checks.is_empty() {
+        return format!("SELECT {base_cols};");
+    }
+    // Per-test breakdown. Each check's one-row probe `(v, s)` becomes a CTE
+    // (`_wm_t0`, `_wm_t1`, …); `_wm_tr` cross-joins them (all one-row, so the
+    // join stays one row) and the `data_tests` list-of-struct references the
+    // flattened columns — DuckDB rejects scalar subqueries *inside* a
+    // struct/list literal, hence the CTE lift. Names are single-quote-escaped.
+    // The result row carries the whole breakdown so the worker runs every
+    // test (no abort-on-first) and decides pass/fail itself.
+    let probe_ctes = checks
+        .iter()
+        .enumerate()
+        .map(|(i, c)| format!("_wm_t{i} AS ({})", c.probe))
+        .collect::<Vec<_>>()
+        .join(", ");
+    let tr_cols = checks
+        .iter()
+        .enumerate()
+        .map(|(i, _)| format!("_wm_t{i}.v AS c{i}, _wm_t{i}.s AS s{i}"))
+        .collect::<Vec<_>>()
+        .join(", ");
+    let tr_from = checks
+        .iter()
+        .enumerate()
+        .map(|(i, _)| format!("_wm_t{i}"))
+        .collect::<Vec<_>>()
+        .join(", ");
+    let list_items = checks
+        .iter()
+        .enumerate()
+        .map(|(i, c)| {
+            let name = c.name.replace('\'', "''");
+            format!("{{'test': '{name}', 'violating': c{i}, 'sample': s{i}}}")
+        })
+        .collect::<Vec<_>>()
+        .join(", ");
+    format!(
+        "WITH {probe_ctes}, _wm_tr AS (SELECT {tr_cols} FROM {tr_from}) \
+         SELECT {base_cols}, [{list_items}] AS data_tests FROM _wm_tr;"
+    )
+}
+
+// Ensure a statement ends with a single `;`.
+/// Convenience macro injected as the first setup statement of a partitioned
+/// materialize: `wm_partition(ts)` renders a timestamp with the SAME identity
+/// format the resolver used for `{partition}` (from
+/// [`PartitionSpec::time_strftime_format`]). It lets a partitioned SELECT
+/// filter to the active slice with a single grain-agnostic line —
+/// `WHERE wm_partition(<ts_col>) = {partition}` — so users never hand-write a
+/// `strftime` format that can drift, nor reach for `= TIMESTAMP {partition}`
+/// (which only parses for daily). `None` for `dynamic` (no wall-clock bucket).
+///
+/// Timezone-agnostic by construction: it formats `ts` as given, matching the
+/// prior documented `strftime(ts, fmt)` idiom. When a non-UTC `tz=` is set the
+/// caller is responsible for expressing `ts` in that zone (same caveat the raw
+/// idiom carried), so this doesn't silently reinterpret a column's instant.
+pub fn wm_partition_macro(spec: &crate::asset_parser::PartitionSpec) -> Option<String> {
+    let fmt = spec.time_strftime_format()?;
+    // fmt is a trusted per-grain constant or the author's `format=`; escape
+    // single quotes defensively so the emitted literal can't break out.
+    Some(format!(
+        "CREATE OR REPLACE TEMP MACRO wm_partition(ts) AS strftime(ts, '{}')",
+        fmt.replace('\'', "''")
+    ))
+}
+
+fn terminate(stmt: &str) -> String {
+    let t = stmt.trim_end();
+    if t.ends_with(';') {
+        t.to_string()
+    } else {
+        format!("{t};")
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Data tests (`// data_test`)
+// ---------------------------------------------------------------------------
+//
+// A data test is the FIRST extensible annotation: the parser yields a
+// `DataTest` from a known vocabulary, and this module turns each into a
+// *check* — a `(name, probe)` pair whose probe counts and samples the
+// violating rows — that runs against the freshly-materialized target after
+// the write commits. The materialize summary query embeds every check's
+// outcome in one `data_tests` column, so all tests run in a single pass (no
+// abort-on-first) and the worker, not the SQL, decides pass/fail and reports
+// the full per-test breakdown.
+//
+// The pattern is deliberately open: a verifier is just `(name, violating-rows
+// query)` handed to `push_check`. Built-ins differ only in their rows query;
+// the `Custom` escape hatch supplies its own (a user SELECT returning the
+// violating rows). A sibling annotation family (column-lineage) can emit its
+// own checks through the same `push_check` shape rather than bolting on a
+// parallel mechanism. See `docs/ducklake-materialization.md`.
+
+use crate::asset_parser::{AssetKind, DataTest, OnSchemaChange};
+
+/// Target context a data-test probe runs against — the materialized table and
+/// the partition slice (when partitioned, tests are scoped to the slice just
+/// written, so a rerun/backfill is independent of other partitions' data).
+#[derive(Debug, Clone)]
+pub struct DataTestCtx<'a> {
+    /// Fully-qualified materialized target, e.g. `_wm_target.orders`.
+    pub target_qualified: &'a str,
+    /// `<name>/<table>` of the target, for human-readable probe messages.
+    pub asset_path: &'a str,
+    /// Physical partition column on the managed table.
+    pub partition_col: &'a str,
+    /// SQL literal/expression for the current partition value (already escaped).
+    pub partition_value_sql: &'a str,
+    /// Whether the target is partitioned (scopes probes to the slice).
+    pub partitioned: bool,
+    /// Whether the target is an SCD2 history table. Built-in probes then assert
+    /// the *current snapshot* (`is_current` rows): the history legitimately
+    /// repeats the natural key across closed versions, so an unscoped
+    /// `unique(<key>)` would fail on the second change of any key.
+    pub scd2: bool,
+}
+
+/// A data test resolved enough to generate SQL. Built-ins carry only their
+/// parsed `DataTest`; `Custom` additionally carries the fetched script body
+/// (the parser crate can't fetch it — the worker does and passes it in).
+#[derive(Debug, Clone)]
+pub enum DataTestResolved {
+    BuiltIn(DataTest),
+    Custom { path: String, body: String },
+}
+
+/// One compiled data-test check: a human-readable `name` and a one-row probe
+/// query yielding `(v, s)` — the violating-row count (0 = pass) and a bounded
+/// `to_json` sample of the violating rows as a VARCHAR (NULL when there are
+/// none, or when the serialized sample exceeds the size cap). The materialize
+/// summary query embeds every check's outcome so the worker gets the whole
+/// breakdown in one result — all tests run (no abort-on-first) and the
+/// worker, not the SQL, decides pass/fail. The sample is decoration only:
+/// enforcement reads `v`, never `s`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct DataTestCheck {
+    pub name: String,
+    /// One-row subquery `SELECT … AS v, … AS s FROM (…)` counting and
+    /// sampling the check's violating rows in a single scan.
+    pub probe: String,
+}
+
+/// Row cap on a data-test sample. Bounded so the sample stays a debugging aid
+/// (the full count is still reported); no ORDER BY on the violating rows, so
+/// which rows land in the sample is nondeterministic.
+const SAMPLE_MAX_ROWS: usize = 20;
+/// Byte cap on one serialized sample. Oversized samples are dropped entirely
+/// (NULL), never truncated — truncated JSON would fail parsing downstream
+/// after paying the bytes anyway.
+const SAMPLE_MAX_BYTES: usize = 51_200;
+
+/// The SQL a set of data tests compiles to: referenced-asset `ATTACH`
+/// statements (resolved by the executor's ATTACH-transform pass) and the
+/// per-test checks, both in declaration order.
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
+pub struct DataTestChecks {
+    pub attaches: Vec<String>,
+    pub checks: Vec<DataTestCheck>,
+}
+
+/// Alias prefix for a relationships test's referenced asset, attached
+/// read-only alongside the target. `_wm_ref_<n>` so it never collides with the
+/// user's aliases or the reserved `_wm_target`.
+const REF_ALIAS_PREFIX: &str = "_wm_ref_";
+
+// Double-quote a SQL identifier, escaping embedded quotes — so an arbitrary
+// column name from an annotation can't break out of the identifier.
+fn quote_ident(id: &str) -> String {
+    format!("\"{}\"", id.replace('"', "\"\""))
+}
+
+// Quote a possibly schema-qualified table reference (`schema.table`) by quoting
+// each dotted segment independently: `main.dim_products` → `"main"."dim_products"`.
+// Quoting the whole thing would make DuckDB read it as one table name containing
+// a literal dot, querying the wrong table.
+fn quote_qualified(name: &str) -> String {
+    name.split('.')
+        .map(quote_ident)
+        .collect::<Vec<_>>()
+        .join(".")
+}
+
+// Single-quote a SQL string literal, escaping embedded quotes.
+fn quote_lit(s: &str) -> String {
+    format!("'{}'", s.replace('\'', "''"))
+}
+
+// The `WHERE`/`AND` fragment scoping a probe to the current partition and/or
+// the SCD2 current snapshot, or empty when neither applies. `prefix` is
+// `WHERE ` or `AND ` per call site; further conditions chain with `AND`.
+// (`partitioned` and `scd2` are mutually exclusive today — the combo is
+// rejected at codegen — but the chaining keeps this correct if that changes.)
+fn partition_scope(ctx: &DataTestCtx, prefix: &str, table_alias: Option<&str>) -> String {
+    let qualify = |col: String| match table_alias {
+        Some(a) => format!("{a}.{col}"),
+        None => col,
+    };
+    let mut conds: Vec<String> = Vec::new();
+    if ctx.partitioned {
+        conds.push(format!(
+            "{} = {}",
+            qualify(quote_ident(ctx.partition_col)),
+            ctx.partition_value_sql
+        ));
+    }
+    if ctx.scd2 {
+        conds.push(qualify(SCD2_IS_CURRENT.to_string()));
+    }
+    if conds.is_empty() {
+        return String::new();
+    }
+    format!("{prefix}{}", conds.join(" AND "))
+}
+
+// Record one check: its display `name` plus `rows_query`, the SELECT of its
+// violating rows. The probe counts and samples those rows in one scan:
+// `_wm_v` (the subquery alias) referenced as a column is the whole row as a
+// struct; `to_json(...)::VARCHAR` keeps the sample a JSON *string* through
+// the FFI — expanded rows would be visible to the executor's key-recursive
+// `extract_i64(result, "rows"/"snapshot_id")` scans, which a user column of
+// the same name could corrupt. `list()` over zero rows and an over-cap
+// sample both degrade to NULL (`s` is optional by contract).
+fn push_check(out: &mut DataTestChecks, name: String, rows_query: String) {
+    // `strlen` counts bytes (unlike `length`, characters) — the cap bounds
+    // payload size on the wire, so bytes are the right unit.
+    let probe = format!(
+        "SELECT v, CASE WHEN strlen(s_raw) <= {SAMPLE_MAX_BYTES} THEN s_raw END AS s \
+         FROM (SELECT count(*) AS v, \
+         to_json(list(_wm_v ORDER BY _wm_rn) FILTER (WHERE _wm_rn <= {SAMPLE_MAX_ROWS}))::VARCHAR AS s_raw \
+         FROM (SELECT _wm_v, row_number() OVER () AS _wm_rn FROM ({rows_query}) _wm_v))"
+    );
+    out.checks.push(DataTestCheck { name, probe });
+}
+
+// `SELECT *` for a sample rows-query, excluding the synthetic physical
+// partition column on partitioned targets — it's Windmill's storage detail,
+// not part of the producer's logical output (same rule as schema capture).
+// `qualifier` scopes the star when the query aliases the target (`_wm_src`).
+fn sample_star(ctx: &DataTestCtx, qualifier: Option<&str>) -> String {
+    let star = match qualifier {
+        Some(q) => format!("{q}.*"),
+        None => "*".to_string(),
+    };
+    if ctx.partitioned {
+        format!("{star} EXCLUDE ({})", quote_ident(ctx.partition_col))
+    } else {
+        star
+    }
+}
+
+// Self-teaching tail appended to every malformed-custom-test error. It states
+// the two rules that aren't documented or scaffolded anywhere else — the body
+// is a single SELECT, and it reads the freshly-materialized target through the
+// internal `_wm_target.<table>` alias — and doubles that alias into a copyable
+// one-line example. `target_qualified` is already `_wm_target.<table>`.
+fn custom_test_hint(target_qualified: &str) -> String {
+    format!(
+        "Write a single SELECT against `{target_qualified}` returning the offending rows, e.g. \
+         `SELECT * FROM {target_qualified} WHERE <condition>` — an empty result means the test \
+         passes."
+    )
+}
+
+// Whether a custom-test statement reads the materialized target through the
+// reserved `_wm_target` alias (the only handle the runtime attaches it under).
+// SQL identifiers are case-insensitive, so match case-insensitively;
+// `split_statements` has already stripped comments, so a match here is a real
+// reference, not one buried in a comment. `TARGET_ALIAS` is lowercase.
+fn references_target(stmt: &str) -> bool {
+    stmt.to_lowercase().contains(TARGET_ALIAS)
+}
+
+/// Compile resolved data tests into ATTACH statements + per-test checks for
+/// `ctx`'s target. Pure: returns SQL text, executes nothing. Errors carry an
+/// actionable message (e.g. a relationships target that isn't an attachable
+/// table).
+pub fn build_data_test_checks(
+    tests: &[DataTestResolved],
+    ctx: &DataTestCtx,
+) -> Result<DataTestChecks, String> {
+    let t = ctx.target_qualified;
+    let mut out = DataTestChecks::default();
+    // Dedup ref attaches by (kind, name): a database can't be attached twice,
+    // so multiple relationships into the same db share one alias.
+    let mut ref_aliases: Vec<(AssetKind, String, String)> = Vec::new();
+
+    for resolved in tests {
+        match resolved {
+            DataTestResolved::BuiltIn(DataTest::Unique { column }) => {
+                let c = quote_ident(column);
+                let scope = partition_scope(ctx, " AND ", None);
+                // The rows are the GROUP BY result — one `{value, count}` per
+                // duplicated key — so the count (number of duplicated values,
+                // not of rows) and the sample share one grain and can't
+                // contradict each other in the UI.
+                let q = format!(
+                    "SELECT {c} AS \"value\", count(*) AS \"count\" FROM {t} \
+                     WHERE {c} IS NOT NULL{scope} GROUP BY {c} HAVING count(*) > 1"
+                );
+                push_check(&mut out, format!("unique({column})"), q);
+            }
+            DataTestResolved::BuiltIn(DataTest::NotNull { column }) => {
+                let c = quote_ident(column);
+                let scope = partition_scope(ctx, " AND ", None);
+                let star = sample_star(ctx, None);
+                let q = format!("SELECT {star} FROM {t} WHERE {c} IS NULL{scope}");
+                push_check(&mut out, format!("not_null({column})"), q);
+            }
+            DataTestResolved::BuiltIn(DataTest::AcceptedValues { column, values }) => {
+                let c = quote_ident(column);
+                let scope = partition_scope(ctx, " AND ", None);
+                let star = sample_star(ctx, None);
+                let list = values
+                    .iter()
+                    .map(|v| quote_lit(v))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                let q = format!(
+                    "SELECT {star} FROM {t} WHERE {c} IS NOT NULL AND {c} NOT IN ({list}){scope}"
+                );
+                push_check(&mut out, format!("accepted_values({column})"), q);
+            }
+            DataTestResolved::BuiltIn(DataTest::Relationships {
+                column,
+                to_kind,
+                to_path,
+                to_column,
+            }) => {
+                let (ref_name, ref_table) = to_path.split_once('/').ok_or_else(|| {
+                    format!("data_test relationships: target `{to_path}` must be `<name>/<table>`")
+                })?;
+                if ref_table.is_empty() {
+                    return Err(format!(
+                        "data_test relationships: target `{to_path}` has no table"
+                    ));
+                }
+                let scheme = match to_kind {
+                    AssetKind::Ducklake => "ducklake",
+                    AssetKind::DataTable => "datatable",
+                    other => {
+                        return Err(format!(
+                            "data_test relationships: target kind {other:?} is not an attachable \
+                             table (use ducklake:// or datatable://)"
+                        ))
+                    }
+                };
+                // The materialize target's ducklake is already attached as
+                // `_wm_target`; a reference into that same lake must reuse it
+                // rather than ATTACH the same database again under a fresh alias
+                // (DuckDB forbids attaching one database twice). `asset_path` is
+                // the target's `<lake>/<table>`, so its lake is the part before
+                // the first `/`.
+                let target_lake = ctx.asset_path.split('/').next().unwrap_or("");
+                let alias = if *to_kind == AssetKind::Ducklake && ref_name == target_lake {
+                    TARGET_ALIAS.to_string()
+                } else {
+                    // Reuse an existing alias for the same (kind, name), else mint one.
+                    match ref_aliases
+                        .iter()
+                        .find(|(k, n, _)| k == to_kind && n == ref_name)
+                    {
+                        Some((_, _, a)) => a.clone(),
+                        None => {
+                            let a = format!("{REF_ALIAS_PREFIX}{}", ref_aliases.len());
+                            // Escape the name — it is interpolated into a
+                            // single-quoted DuckDB literal (defense-in-depth: the
+                            // name is deploy-time annotation content, but the parser
+                            // places no character restriction on asset paths).
+                            let esc_name = ref_name.replace('\'', "''");
+                            out.attaches
+                                .push(format!("ATTACH '{scheme}://{esc_name}' AS {a};"));
+                            ref_aliases.push((*to_kind, ref_name.to_string(), a.clone()));
+                            a
+                        }
+                    }
+                };
+                let c = quote_ident(column);
+                let rc = quote_ident(to_column);
+                // `ref_table` may be schema-qualified (`schema.table`); quote each
+                // segment so the dot stays a schema separator, not a literal.
+                let rt = quote_qualified(ref_table);
+                let scope = partition_scope(ctx, " AND ", Some("_wm_src"));
+                let star = sample_star(ctx, Some("_wm_src"));
+                let q = format!(
+                    "SELECT {star} FROM {t} _wm_src \
+                     WHERE _wm_src.{c} IS NOT NULL{scope} \
+                     AND NOT EXISTS (SELECT 1 FROM {alias}.{rt} _wm_ref \
+                     WHERE _wm_ref.{rc} = _wm_src.{c})"
+                );
+                push_check(
+                    &mut out,
+                    format!("relationships({column} -> {to_path}.{to_column})"),
+                    q,
+                );
+            }
+            // A parsed Custom must be resolved (body fetched) before codegen.
+            DataTestResolved::BuiltIn(DataTest::Custom { path }) => {
+                return Err(format!(
+                    "data_test custom `{path}`: body not resolved before codegen (internal)"
+                ));
+            }
+            DataTestResolved::Custom { path, body } => {
+                // dbt singular-test convention: the body is a *single* SELECT
+                // (or CTE) returning the violating rows, reading the
+                // freshly-materialized target through the internal `_wm_target`
+                // schema. It is embedded as a subquery (`FROM (<body>)`), so a
+                // multi-statement or non-SELECT body would produce invalid SQL.
+                // Neither rule is documented or scaffolded elsewhere, so the
+                // errors are self-teaching: they name the exact violation and
+                // append a correct one-line example. It runs in the target's
+                // connection (can read `_wm_target` + the user's attaches);
+                // partition substitution is already applied by the worker.
+                let hint = custom_test_hint(t);
+                let stmts = split_statements(body);
+                if stmts.is_empty() {
+                    return Err(format!(
+                        "data_test custom `{path}`: empty test body. {hint}"
+                    ));
+                }
+                if stmts.len() > 1 {
+                    return Err(format!(
+                        "data_test custom `{path}`: a custom data test must be a single SELECT, \
+                         but found {} statements. {hint}",
+                        stmts.len()
+                    ));
+                }
+                let stmt = &stmts[0];
+                if classify_block(stmt) != BlockClass::Output {
+                    return Err(format!(
+                        "data_test custom `{path}`: a custom data test must be a single SELECT, \
+                         not a write or DDL statement. {hint}"
+                    ));
+                }
+                if !references_target(stmt) {
+                    return Err(format!(
+                        "data_test custom `{path}`: the test never reads the freshly-materialized \
+                         target — reference it through the internal `{TARGET_ALIAS}` schema (as \
+                         `{t}`), not the table name on its own. {hint}"
+                    ));
+                }
+                push_check(&mut out, format!("custom({path})"), stmt.to_string());
+            }
+        }
+    }
+    Ok(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn ok(sql: &str) -> WrapPlan {
+        classify_wrap(sql).expect("expected wrap-eligible")
+    }
+    fn err(sql: &str) -> WrapError {
+        classify_wrap(sql).expect_err("expected wrap-ineligible")
+    }
+
+    use crate::asset_parser::{PartitionKind, PartitionSpec};
+
+    fn pspec(kind: PartitionKind, format: Option<&str>) -> PartitionSpec {
+        PartitionSpec { kind, tz: None, format: format.map(String::from), start: None }
+    }
+
+    #[test]
+    fn wm_partition_macro_uses_grain_identity_format() {
+        // Every time grain's macro must strftime with the exact format the
+        // resolver stamps the identity with — otherwise the equality filter
+        // silently returns no rows. This is the whole point of the shared source.
+        let cases = [
+            (PartitionKind::Daily, "%Y-%m-%d"),
+            (PartitionKind::Hourly, "%Y-%m-%dT%H"),
+            (PartitionKind::Weekly, "%G-W%V"),
+            (PartitionKind::Monthly, "%Y-%m"),
+        ];
+        for (kind, fmt) in cases {
+            assert_eq!(
+                wm_partition_macro(&pspec(kind.clone(), None)).as_deref(),
+                Some(
+                    format!(
+                        "CREATE OR REPLACE TEMP MACRO wm_partition(ts) AS strftime(ts, '{fmt}')"
+                    )
+                    .as_str()
+                ),
+                "wrong macro format for {kind:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn wm_partition_macro_honors_format_override_and_skips_dynamic() {
+        // Explicit `format=` wins over the grain default.
+        assert!(
+            wm_partition_macro(&pspec(PartitionKind::Hourly, Some("%Y/%m/%d %H")))
+                .unwrap()
+                .contains("strftime(ts, '%Y/%m/%d %H')")
+        );
+        // Dynamic has no wall-clock bucket → no macro (user filters on their key).
+        assert_eq!(
+            wm_partition_macro(&pspec(
+                PartitionKind::Dynamic { key: "$.tenant".into() },
+                None
+            )),
+            None
+        );
+    }
+
+    #[test]
+    fn split_respects_strings_comments_idents() {
+        let sql = "SET x=1; -- a; comment\nSELECT ';' AS a, \"weird;col\" /* ; */ FROM t;";
+        let s = split_statements(sql);
+        assert_eq!(s.len(), 2);
+        assert_eq!(s[0], "SET x=1");
+        assert!(s[1].starts_with("SELECT"));
+        assert!(s[1].contains("\"weird;col\""));
+    }
+
+    #[test]
+    fn split_handles_escaped_quote() {
+        let s = split_statements("SELECT 'it''s; fine' AS a;");
+        assert_eq!(s.len(), 1);
+        assert!(s[0].contains("it''s; fine"));
+    }
+
+    #[test]
+    fn pipeline_annotations_are_stripped() {
+        // The real shape: `//` annotation lines above the SQL must not pollute
+        // the first block's classification (regression — they were being read
+        // as a leading `pipeline` keyword and rejected).
+        let p = ok("// pipeline\n// materialize ducklake://main/t\n// partitioned daily\nATTACH 'ducklake://main' AS dl;\nSELECT 1 AS id");
+        assert_eq!(p.setup.len(), 1);
+        // The annotation lines are gone — the setup block starts at the real
+        // SQL (the `//` inside `ducklake://main` is legitimately retained).
+        assert!(p.setup[0].starts_with("ATTACH"));
+        assert!(p.output.starts_with("SELECT"));
+    }
+
+    #[test]
+    fn bare_select_is_eligible() {
+        let p = ok("SELECT a, b FROM t WHERE c = '{partition}'");
+        assert!(p.setup.is_empty());
+        assert!(p.output.starts_with("SELECT"));
+    }
+
+    #[test]
+    fn setup_then_select_is_eligible() {
+        let p = ok(
+            "ATTACH 'ducklake://main' AS dl;\n SET memory_limit='4GB';\n SELECT * FROM dl.orders",
+        );
+        assert_eq!(p.setup.len(), 2);
+        assert!(p.output.starts_with("SELECT"));
+    }
+
+    #[test]
+    fn create_temp_staging_is_setup() {
+        let p = ok("CREATE TEMP TABLE s AS SELECT 1; SELECT * FROM s");
+        assert_eq!(p.setup.len(), 1);
+        assert_eq!(
+            classify_block("CREATE TEMP TABLE s AS SELECT 1"),
+            BlockClass::Setup
+        );
+        assert_eq!(
+            classify_block("CREATE OR REPLACE TEMPORARY VIEW v AS SELECT 1"),
+            BlockClass::Setup
+        );
+    }
+
+    #[test]
+    fn with_cte_select_is_output_write_is_disallowed() {
+        assert_eq!(
+            classify_block("WITH x AS (SELECT 1) SELECT * FROM x"),
+            BlockClass::Output
+        );
+        // CTE whose main statement inserts is a write, even though it starts WITH.
+        assert_eq!(
+            classify_block("WITH x AS (SELECT 1) INSERT INTO t SELECT * FROM x"),
+            BlockClass::Disallowed
+        );
+    }
+
+    #[test]
+    fn from_first_and_values_are_output() {
+        assert_eq!(classify_block("FROM t SELECT a"), BlockClass::Output);
+        assert_eq!(classify_block("VALUES (1),(2)"), BlockClass::Output);
+        assert_eq!(classify_block("TABLE t"), BlockClass::Output);
+    }
+
+    #[test]
+    fn trailing_write_rejected() {
+        assert_eq!(
+            err("SELECT * FROM t; INSERT INTO u VALUES (1)"),
+            WrapError::OutputNotLast
+        );
+    }
+
+    #[test]
+    fn write_in_preamble_rejected() {
+        match err("INSERT INTO t VALUES (1); SELECT * FROM t") {
+            WrapError::DisallowedBlock { snippet } => assert!(snippet.starts_with("INSERT")),
+            e => panic!("wrong error: {e:?}"),
+        }
+    }
+
+    #[test]
+    fn multiple_selects_rejected() {
+        assert_eq!(
+            err("SELECT 1; SELECT 2"),
+            WrapError::MultipleOutputs { count: 2 }
+        );
+    }
+
+    #[test]
+    fn no_select_and_empty_rejected() {
+        assert_eq!(err("CREATE TABLE t (a INT)"), WrapError::NoOutput);
+        assert_eq!(err("   -- just a comment\n"), WrapError::Empty);
+    }
+
+    #[test]
+    fn use_cannot_redirect_is_classified_setup() {
+        // `USE` is allowed setup; generated SQL is fully qualified regardless.
+        assert_eq!(classify_block("USE dl"), BlockClass::Setup);
+    }
+
+    #[test]
+    fn codegen_replace_partitioned() {
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.orders_daily",
+            select_sql: "SELECT a FROM dl.orders",
+            partition_col: "_wm_partition",
+            partition_value_sql: "'2026-06-19'",
+            partitioned: true,
+            strategy: MaterializeStrategy::Replace,
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        assert!(st[0].contains("CREATE TABLE IF NOT EXISTS _wm_target.orders_daily"));
+        assert!(st[0].contains("CAST(NULL AS VARCHAR) AS _wm_partition"));
+        assert!(st.iter().any(
+            |s| s == "ALTER TABLE _wm_target.orders_daily SET PARTITIONED BY (_wm_partition);"
+        ));
+        assert!(st.iter().any(|s| s.starts_with(
+            "DELETE FROM _wm_target.orders_daily WHERE _wm_partition = '2026-06-19'"
+        )));
+        assert!(st.iter().any(|s| s.contains(
+            "INSERT INTO _wm_target.orders_daily SELECT *, '2026-06-19' AS _wm_partition"
+        )));
+        assert_eq!(st.first().map(|_| &st[st.len() - 1]).unwrap(), "COMMIT;");
+    }
+
+    #[test]
+    fn codegen_merge_is_delete_by_key_plus_insert() {
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.orders_daily",
+            select_sql: "SELECT order_id, amount FROM dl.orders",
+            partition_col: "_wm_partition",
+            partition_value_sql: "'2026-06-19'",
+            partitioned: true,
+            strategy: MaterializeStrategy::Merge { unique_key: "order_id".to_string() },
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        // upsert = delete-by-key (partition-scoped) + insert — NO `MERGE INTO`
+        // (DuckLake's MERGE fails on fresh partitions).
+        assert!(!st.iter().any(|s| s.contains("MERGE INTO")));
+        let del = st
+            .iter()
+            .find(|s| s.starts_with("DELETE FROM"))
+            .expect("delete stmt");
+        assert!(del.contains(
+            "WHERE _wm_partition = '2026-06-19' AND order_id IN (SELECT order_id FROM (SELECT order_id, amount FROM dl.orders))"
+        ));
+        assert!(st
+            .iter()
+            .any(|s| s.starts_with("INSERT INTO _wm_target.orders_daily SELECT *, '2026-06-19'")));
+    }
+
+    #[test]
+    fn codegen_merge_emits_duplicate_source_key_guard() {
+        // A keyed merge does not dedup its source, so codegen must emit a guard
+        // that fails the write when the SELECT has >1 row per key — otherwise
+        // duplicate source keys silently double-write.
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.orders_daily",
+            select_sql: "SELECT order_id, amount FROM dl.orders",
+            partition_col: "_wm_partition",
+            partition_value_sql: "'2026-06-19'",
+            partitioned: false,
+            strategy: MaterializeStrategy::Merge { unique_key: "order_id".to_string() },
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        let guard = st
+            .iter()
+            .find(|s| s.contains("_wm_dup_keys"))
+            .expect("duplicate-key guard stmt");
+        // raises via error(), counts non-NULL keys appearing more than once
+        assert!(guard.contains("error('managed materialize: keyed merge on `order_id` blocked"));
+        assert!(guard.contains("GROUP BY order_id HAVING count(*) > 1"));
+        assert!(guard.contains("WHERE order_id IS NOT NULL"));
+        // must run before the mutations so a violation aborts before any write
+        let guard_pos = st.iter().position(|s| s.contains("_wm_dup_keys")).unwrap();
+        let del_pos = st
+            .iter()
+            .position(|s| s.starts_with("DELETE FROM"))
+            .unwrap();
+        let ins_pos = st
+            .iter()
+            .position(|s| s.starts_with("INSERT INTO"))
+            .unwrap();
+        assert!(guard_pos < del_pos && guard_pos < ins_pos);
+    }
+
+    #[test]
+    fn codegen_append_inserts_only() {
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.events",
+            select_sql: "SELECT * FROM dl.raw",
+            partition_col: "_wm_partition",
+            partition_value_sql: "'2026-06-19'",
+            partitioned: true,
+            strategy: MaterializeStrategy::Append,
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        assert!(st
+            .iter()
+            .any(|s| s.starts_with("INSERT INTO _wm_target.events")));
+        assert!(!st.iter().any(|s| s.starts_with("DELETE")));
+        assert!(!st.iter().any(|s| s.starts_with("MERGE")));
+    }
+
+    #[test]
+    fn codegen_whole_table_replace_is_create_or_replace() {
+        // Unpartitioned replace must use CREATE OR REPLACE so a changed SELECT
+        // schema (or a pre-existing table with a different schema) doesn't break
+        // — and nothing else (no bootstrap / DELETE / INSERT / txn).
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.customer_dim",
+            select_sql: "SELECT a, b, c FROM dl.src",
+            partition_col: "_wm_partition",
+            partition_value_sql: "''",
+            partitioned: false,
+            strategy: MaterializeStrategy::Replace,
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        assert_eq!(
+            st,
+            vec![
+                "CREATE OR REPLACE TABLE _wm_target.customer_dim AS SELECT * FROM (SELECT a, b, c FROM dl.src);"
+                    .to_string()
+            ]
+        );
+    }
+
+    #[test]
+    fn codegen_scd2_default_track_closes_old_opens_new() {
+        // Empty `track` ⇒ diff on all business columns via `* EXCLUDE (scd cols)`.
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.dim_scd2",
+            select_sql: "SELECT id, name FROM dl.src",
+            partition_col: "_wm_partition",
+            partition_value_sql: "''",
+            partitioned: false,
+            strategy: MaterializeStrategy::Scd2 {
+                key: "id".to_string(),
+                track: vec![],
+                close_deleted: false,
+            },
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        // bootstrap adds the three SCD metadata columns
+        assert!(st[0].starts_with("CREATE TABLE IF NOT EXISTS _wm_target.dim_scd2 AS SELECT *,"));
+        assert!(st[0].contains("AS valid_from"));
+        assert!(st[0].contains("AS valid_to"));
+        assert!(st[0].contains("AS is_current"));
+        // changed-key set captured before the transaction, all cols compared
+        assert!(
+            st[1].contains("CREATE OR REPLACE TEMP TABLE _wm_scd2_changed AS SELECT \"id\" FROM")
+        );
+        assert!(st[1].contains("SELECT * FROM (SELECT id, name FROM dl.src) EXCEPT"));
+        assert!(st[1].contains("SELECT * EXCLUDE (valid_from, valid_to, is_current) FROM _wm_target.dim_scd2 WHERE is_current"));
+        assert_eq!(st[2], "BEGIN TRANSACTION;");
+        // close: UPDATE (not MERGE) the prior open version of changed keys, with
+        // null-safe key matching (IS NOT DISTINCT FROM, not IN — IN drops NULLs)
+        assert!(st[3].starts_with("UPDATE _wm_target.dim_scd2 SET valid_to = CAST(now() AS TIMESTAMP), is_current = false"));
+        assert!(st[3].contains(
+            "WHERE is_current AND EXISTS (SELECT 1 FROM _wm_scd2_changed \
+             WHERE _wm_scd2_changed.\"id\" IS NOT DISTINCT FROM _wm_target.dim_scd2.\"id\");"
+        ));
+        // open: INSERT the new current version, null-safe key matching
+        assert!(st[4].starts_with(
+            "INSERT INTO _wm_target.dim_scd2 SELECT s.*, CAST(now() AS TIMESTAMP) AS valid_from"
+        ));
+        assert!(st[4].contains(
+            "true AS is_current FROM (SELECT id, name FROM dl.src) s WHERE EXISTS \
+             (SELECT 1 FROM _wm_scd2_changed c WHERE c.\"id\" IS NOT DISTINCT FROM s.\"id\");"
+        ));
+        // consumer-convenience `<dim>_current` view: `IF NOT EXISTS` (created once,
+        // no-op on unchanged reruns) and INSIDE the txn (folded into the write snapshot)
+        assert_eq!(
+            st[5],
+            "CREATE VIEW IF NOT EXISTS _wm_target.dim_scd2_current AS SELECT * FROM _wm_target.dim_scd2 WHERE is_current;"
+        );
+        assert_eq!(st[6], "COMMIT;");
+        // no fragile constructs: no MERGE INTO, and no NULL-dropping `IN (SELECT`
+        assert!(!st.iter().any(|s| s.contains("MERGE INTO")));
+        assert!(!st.iter().any(|s| s.contains("IN (SELECT")));
+        // soft-delete default: no deleted-key set, no second close
+        assert!(!st.iter().any(|s| s.contains("_wm_scd2_deleted")));
+    }
+
+    #[test]
+    fn codegen_scd2_explicit_track_projects_key_and_tracked_cols() {
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.dim",
+            select_sql: "SELECT id, name, addr FROM dl.src",
+            partition_col: "_wm_partition",
+            partition_value_sql: "''",
+            partitioned: false,
+            strategy: MaterializeStrategy::Scd2 {
+                key: "id".to_string(),
+                track: vec!["name".to_string()],
+                close_deleted: false,
+            },
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        // only key + tracked cols are compared (addr changes don't rotate a version)
+        assert!(st[1].contains("SELECT \"id\", \"name\" FROM (SELECT id, name, addr FROM dl.src) EXCEPT SELECT \"id\", \"name\" FROM _wm_target.dim WHERE is_current"));
+    }
+
+    #[test]
+    fn codegen_scd2_close_deleted_adds_deleted_set_and_second_close() {
+        let cg = MaterializeCodegen {
+            target_qualified: "_wm_target.dim",
+            select_sql: "SELECT id, name FROM dl.src",
+            partition_col: "_wm_partition",
+            partition_value_sql: "''",
+            partitioned: false,
+            strategy: MaterializeStrategy::Scd2 {
+                key: "id".to_string(),
+                track: vec![],
+                close_deleted: true,
+            },
+            on_schema_change: OnSchemaChange::Warn,
+        };
+        let st = cg.statements();
+        // the deleted-key set: current keys absent from the snapshot, captured
+        // before the transaction (like `changed`)
+        assert!(st.iter().any(|s| s.contains(
+            "CREATE OR REPLACE TEMP TABLE _wm_scd2_deleted AS SELECT \"id\" FROM \
+             (SELECT \"id\" FROM _wm_target.dim WHERE is_current EXCEPT SELECT \"id\" FROM (SELECT id, name FROM dl.src));"
+        )));
+        // a second close UPDATE against the deleted set (null-safe), and NO INSERT
+        // that reopens deleted keys (the only INSERT filters on `_wm_scd2_changed`)
+        assert!(st
+            .iter()
+            .any(|s| s.starts_with("UPDATE _wm_target.dim SET valid_to")
+                && s.contains(
+                    "EXISTS (SELECT 1 FROM _wm_scd2_deleted \
+                WHERE _wm_scd2_deleted.\"id\" IS NOT DISTINCT FROM _wm_target.dim.\"id\");"
+                )));
+        assert_eq!(
+            st.iter().filter(|s| s.starts_with("INSERT INTO")).count(),
+            1
+        );
+        assert!(st
+            .iter()
+            .find(|s| s.starts_with("INSERT INTO"))
+            .unwrap()
+            .contains("_wm_scd2_changed"));
+        // the deleted close is inside the transaction (between BEGIN and COMMIT)
+        let begin = st.iter().position(|s| s == "BEGIN TRANSACTION;").unwrap();
+        let commit = st.iter().position(|s| s == "COMMIT;").unwrap();
+        let del_close = st
+            .iter()
+            .position(|s| s.starts_with("UPDATE") && s.contains("_wm_scd2_deleted"))
+            .unwrap();
+        assert!(begin < del_close && del_close < commit);
+    }
+
+    fn persist_cg(strategy: MaterializeStrategy, osc: OnSchemaChange) -> Vec<String> {
+        MaterializeCodegen {
+            target_qualified: "_wm_target.t",
+            select_sql: "SELECT a, c FROM dl.src",
+            partition_col: "_wm_partition",
+            partition_value_sql: "''",
+            partitioned: false,
+            strategy,
+            on_schema_change: osc,
+        }
+        .statements()
+    }
+
+    #[test]
+    fn codegen_fail_emits_drift_guard_inside_txn_before_write() {
+        let st = persist_cg(
+            MaterializeStrategy::Merge { unique_key: "a".into() },
+            OnSchemaChange::Fail,
+        );
+        let begin = st.iter().position(|s| s == "BEGIN TRANSACTION;").unwrap();
+        let guard = st
+            .iter()
+            .position(|s| s.contains("error(") && s.contains("on_schema_change=fail"))
+            .expect("fail emits a guard");
+        let del = st
+            .iter()
+            .position(|s| s.starts_with("DELETE FROM"))
+            .unwrap();
+        let insert = st
+            .iter()
+            .position(|s| s.starts_with("INSERT INTO"))
+            .unwrap();
+        let commit = st.iter().position(|s| s == "COMMIT;").unwrap();
+        // guard runs right after BEGIN and before any mutation, inside the txn
+        assert!(begin < guard && guard < del && del < insert && insert < commit);
+        // both CASE branches are VARCHAR so the planner can't fold error() away
+        assert!(st[guard].contains("CAST(error("));
+        assert!(st[guard].contains("ELSE 'ok' END"));
+        // fail is positional (no BY NAME) and emits no sync sentinel
+        assert!(st[insert].starts_with("INSERT INTO _wm_target.t SELECT"));
+        assert!(!st.iter().any(|s| s == SYNC_ALTER_SENTINEL));
+    }
+
+    #[test]
+    fn fail_guard_drift_is_name_set_based_not_ordered() {
+        // Documents a deliberate boundary: the fail guard fires on the column
+        // SET difference (EXCEPT over column_name), so a pure reorder of
+        // same-named columns is NOT caught here — that is `sync`'s job (BY NAME).
+        // Keeping this name-set (not an ordered comparison) is what prevents the
+        // guard from false-positive-aborting a correctly-aligned write. If this
+        // ever moves to an ordered comparison, update the OnSchemaChange doc.
+        let guard =
+            schema_drift_guard_sql("SELECT b, a FROM dl.src", "_wm_target.t", "_wm_partition");
+        assert!(guard.contains("column_name"));
+        assert!(guard.contains("EXCEPT"));
+        // No positional/ordinal comparison in the guard condition.
+        assert!(!guard.to_lowercase().contains("ordinal"));
+        assert!(!guard.to_lowercase().contains("row_number"));
+    }
+
+    #[test]
+    fn codegen_sync_uses_by_name_and_sentinel() {
+        let st = persist_cg(MaterializeStrategy::Append, OnSchemaChange::Sync);
+        let begin = st.iter().position(|s| s == "BEGIN TRANSACTION;").unwrap();
+        let sentinel = st.iter().position(|s| s == SYNC_ALTER_SENTINEL).unwrap();
+        let insert = st
+            .iter()
+            .position(|s| s.starts_with("INSERT INTO"))
+            .unwrap();
+        // the ALTER-injection slot is right after BEGIN, before the write
+        assert!(begin < sentinel && sentinel < insert);
+        // name-mapped insert (a positional insert would cross-wire ALTERed cols)
+        assert!(st[insert].starts_with("INSERT INTO _wm_target.t BY NAME SELECT"));
+        assert!(!st.iter().any(|s| s.contains("error(")));
+    }
+
+    #[test]
+    fn codegen_ignore_and_warn_write_positionally_no_guard() {
+        for osc in [OnSchemaChange::Ignore, OnSchemaChange::Warn] {
+            let st = persist_cg(MaterializeStrategy::Append, osc);
+            assert!(!st.iter().any(|s| s.contains("error(")), "{osc:?}");
+            assert!(!st.iter().any(|s| s == SYNC_ALTER_SENTINEL), "{osc:?}");
+            let insert = st.iter().find(|s| s.starts_with("INSERT INTO")).unwrap();
+            assert!(
+                insert.starts_with("INSERT INTO _wm_target.t SELECT"),
+                "{osc:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn codegen_whole_table_replace_and_scd2_ignore_guardrail() {
+        // Whole-table replace (unpartitioned) and scd2 are not persist-and-mutate:
+        // fail/sync must not add a guard/sentinel/BY NAME there.
+        let repl = MaterializeCodegen {
+            target_qualified: "_wm_target.t",
+            select_sql: "SELECT a FROM dl.src",
+            partition_col: "_wm_partition",
+            partition_value_sql: "''",
+            partitioned: false,
+            strategy: MaterializeStrategy::Replace,
+            on_schema_change: OnSchemaChange::Fail,
+        };
+        assert!(!repl.is_persist_and_mutate());
+        let st = repl.statements();
+        assert!(!st
+            .iter()
+            .any(|s| s.contains("error(") || s == SYNC_ALTER_SENTINEL));
+
+        let scd2 = MaterializeCodegen {
+            strategy: MaterializeStrategy::Scd2 {
+                key: "a".into(),
+                track: vec![],
+                close_deleted: false,
+            },
+            on_schema_change: OnSchemaChange::Sync,
+            ..repl
+        };
+        assert!(!scd2.is_persist_and_mutate());
+        let st = scd2.statements();
+        assert!(!st.iter().any(|s| s == SYNC_ALTER_SENTINEL));
+        assert!(!st.iter().any(|s| s.contains(" BY NAME ")));
+    }
+
+    #[test]
+    fn summary_schema_drift_field_only_for_warn_persist_and_mutate() {
+        // warn + persist-and-mutate ⇒ summary carries the drift column
+        let warn = plan_for_osc(MaterializeStrategy::Append, false, OnSchemaChange::Warn);
+        assert!(warn.stmts.last().unwrap().sql.contains("AS schema_drift"));
+        // ignore / fail / sync ⇒ no summary drift column (they guard the write)
+        for osc in [
+            OnSchemaChange::Ignore,
+            OnSchemaChange::Fail,
+            OnSchemaChange::Sync,
+        ] {
+            let p = plan_for_osc(MaterializeStrategy::Append, false, osc);
+            assert!(
+                !p.stmts.last().unwrap().sql.contains("schema_drift"),
+                "{osc:?} must not emit the summary drift column"
+            );
+        }
+        // whole-table replace + warn ⇒ not persist-and-mutate ⇒ no drift column
+        let repl = plan_for_osc(MaterializeStrategy::Replace, false, OnSchemaChange::Warn);
+        assert!(!repl.stmts.last().unwrap().sql.contains("schema_drift"));
+    }
+
+    #[test]
+    fn fail_guard_is_write_kind_between_txn_markers() {
+        use MaterializeStmtKind::*;
+        let plan = plan_for_osc(
+            MaterializeStrategy::Merge { unique_key: "a".into() },
+            false,
+            OnSchemaChange::Fail,
+        );
+        let begin = kidx(&plan, |s| s.kind == TxnBegin);
+        let commit = kidx(&plan, |s| s.kind == TxnCommit);
+        let guard = kidx(&plan, |s| {
+            s.sql.contains("error(") && s.sql.contains("on_schema_change=fail")
+        });
+        assert_eq!(plan.stmts[guard].kind, Write);
+        assert!(begin < guard && guard < commit);
+    }
+
+    #[test]
+    fn snapshot_capture_targets_alias() {
+        assert_eq!(
+            snapshot_capture_sql("_wm_target"),
+            "SELECT max(snapshot_id) AS snapshot_id FROM ducklake_snapshots('_wm_target');"
+        );
+    }
+
+    #[test]
+    fn build_wrap_blocks_orders_setup_attach_codegen_snapshot() {
+        let plan = ok("ATTACH 'ducklake://main' AS dl;\n SELECT a FROM dl.orders WHERE d = '{p}'");
+        let blocks: Vec<String> = build_wrap_blocks(
+            &plan,
+            "ATTACH 'ducklake:postgres:…' AS _wm_target (DATA_PATH 's3://b/p');",
+            "orders_daily",
+            "main/orders_daily",
+            "_wm_partition",
+            "'2026-06-19'",
+            true,
+            MaterializeStrategy::Replace,
+            OnSchemaChange::Warn,
+            &[],
+        )
+        .unwrap()
+        .stmts
+        .into_iter()
+        .map(|s| s.sql)
+        .collect();
+        // setup block first, then the target ATTACH, then codegen, then result.
+        assert!(blocks[0].starts_with("ATTACH 'ducklake://main' AS dl"));
+        // every setup block must be `;`-terminated so re-splitting can't merge it
+        // with the synthetic target ATTACH that follows.
+        assert!(blocks[0].ends_with(';'));
+        assert_eq!(
+            blocks[1],
+            "ATTACH 'ducklake:postgres:…' AS _wm_target (DATA_PATH 's3://b/p');"
+        );
+        assert!(blocks.iter().any(|b| b.contains("_wm_target.orders_daily")));
+        assert!(blocks.iter().any(|b| b.starts_with(
+            "DELETE FROM _wm_target.orders_daily WHERE _wm_partition = '2026-06-19'"
+        )));
+        // the trailing block is the one-row summary (asset / rows / snapshot_id),
+        // partition-scoped for the row count
+        let last = blocks.last().unwrap();
+        assert!(last.contains("'ducklake://main/orders_daily' AS materialized"));
+        assert!(last.contains("'2026-06-19' AS partition"));
+        assert!(last.contains("WHERE _wm_partition = '2026-06-19') AS rows"));
+        assert!(last.contains("ducklake_snapshots('_wm_target')"));
+    }
+
+    // -- materialize plan structure ------------------------------------------
+
+    fn plan_for(strategy: MaterializeStrategy, partitioned: bool) -> MaterializePlan {
+        plan_for_osc(strategy, partitioned, OnSchemaChange::Warn)
+    }
+
+    fn plan_for_osc(
+        strategy: MaterializeStrategy,
+        partitioned: bool,
+        on_schema_change: OnSchemaChange,
+    ) -> MaterializePlan {
+        let plan = ok("SELECT a, b FROM src");
+        build_wrap_blocks(
+            &plan,
+            "ATTACH 'ducklake:…' AS _wm_target;",
+            "orders",
+            "main/orders",
+            "_wm_partition",
+            "'2026-06-19'",
+            partitioned,
+            strategy,
+            on_schema_change,
+            &[
+                DataTestResolved::BuiltIn(DataTest::NotNull { column: "a".into() }),
+                DataTestResolved::BuiltIn(DataTest::Unique { column: "b".into() }),
+            ],
+        )
+        .unwrap()
+    }
+
+    fn kidx(plan: &MaterializePlan, pred: impl Fn(&MaterializeStmt) -> bool) -> usize {
+        plan.stmts
+            .iter()
+            .position(|s| pred(s))
+            .expect("stmt present")
+    }
+
+    #[test]
+    fn plan_tags_structure_and_carries_checks() {
+        use MaterializeStmtKind::*;
+        let plan = plan_for(MaterializeStrategy::Replace, true);
+        // leading statements are Setup, ending with the target ATTACH
+        assert!(plan.stmts[0].kind == Setup);
+        assert!(plan
+            .stmts
+            .iter()
+            .take_while(|s| s.kind == Setup)
+            .any(|s| s.sql.contains("_wm_target")));
+        // txn markers are tagged, everything between them is Write
+        let begin = kidx(&plan, |s| s.kind == TxnBegin);
+        let commit = kidx(&plan, |s| s.kind == TxnCommit);
+        assert!(begin < commit);
+        assert!(plan.stmts[begin + 1..commit]
+            .iter()
+            .all(|s| s.kind == Write));
+        // bootstrap DDL is Write work (it targets the table, not the session)
+        let bootstrap = kidx(&plan, |s| s.sql.starts_with("CREATE TABLE IF NOT EXISTS"));
+        assert_eq!(plan.stmts[bootstrap].kind, Write);
+        // summary is last and carries the breakdown; checks ride along
+        let last = plan.stmts.last().unwrap();
+        assert_eq!(last.kind, Summary);
+        assert!(last.sql.contains("AS data_tests"));
+        assert_eq!(plan.checks.len(), 2);
+        assert!(plan.checks[0].name.contains("not_null(a)"));
+    }
+
+    #[test]
+    fn plan_whole_table_replace_has_no_txn_markers() {
+        use MaterializeStmtKind::*;
+        let plan = plan_for(MaterializeStrategy::Replace, false);
+        assert!(!plan.stmts.iter().any(|s| s.kind == TxnBegin));
+        assert!(!plan.stmts.iter().any(|s| s.kind == TxnCommit));
+        assert_eq!(
+            plan.stmts.iter().filter(|s| s.kind == Write).count(),
+            1,
+            "single atomic CREATE OR REPLACE"
+        );
+    }
+
+    #[test]
+    fn plan_scd2_captures_are_write_kind() {
+        use MaterializeStmtKind::*;
+        let plan = plan_for(
+            MaterializeStrategy::Scd2 { key: "a".into(), track: vec![], close_deleted: false },
+            false,
+        );
+        let capture = kidx(&plan, |s| s.sql.contains("TEMP TABLE _wm_scd2_changed"));
+        assert_eq!(plan.stmts[capture].kind, Write);
+        // no test declared ⇒ empty checks
+        let plain = ok("SELECT a FROM src");
+        let no_tests = build_wrap_blocks(
+            &plain,
+            "ATTACH 'ducklake:…' AS _wm_target;",
+            "orders",
+            "main/orders",
+            "_wm_partition",
+            "''",
+            false,
+            MaterializeStrategy::Append,
+            OnSchemaChange::Warn,
+            &[],
+        )
+        .unwrap();
+        assert!(no_tests.checks.is_empty());
+    }
+
+    // -- data tests ---------------------------------------------------------
+
+    fn ctx_partitioned() -> DataTestCtx<'static> {
+        DataTestCtx {
+            target_qualified: "_wm_target.orders",
+            asset_path: "analytics/orders",
+            partition_col: "_wm_partition",
+            partition_value_sql: "'2026-06-19'",
+            partitioned: true,
+            scd2: false,
+        }
+    }
+    fn ctx_unpartitioned() -> DataTestCtx<'static> {
+        DataTestCtx { partitioned: false, ..ctx_partitioned() }
+    }
+    fn ctx_scd2() -> DataTestCtx<'static> {
+        DataTestCtx { partitioned: false, scd2: true, ..ctx_partitioned() }
+    }
+
+    #[test]
+    fn data_test_unique_and_not_null_partition_scoped() {
+        let tests = vec![
+            DataTestResolved::BuiltIn(DataTest::Unique { column: "order_id".into() }),
+            DataTestResolved::BuiltIn(DataTest::NotNull { column: "user_id".into() }),
+        ];
+        let sql = build_data_test_checks(&tests, &ctx_partitioned()).unwrap();
+        assert!(sql.attaches.is_empty());
+        assert_eq!(sql.checks.len(), 2);
+        // short, asset-free names (the asset is shown once by the breakdown).
+        assert_eq!(sql.checks[0].name, "unique(order_id)");
+        assert_eq!(sql.checks[1].name, "not_null(user_id)");
+        // each probe counts and samples the violating rows in one scan, with
+        // the size guard on the serialized sample.
+        for c in &sql.checks {
+            assert!(c
+                .probe
+                .starts_with("SELECT v, CASE WHEN strlen(s_raw) <= 51200 THEN s_raw END AS s"));
+            assert!(c.probe.contains("count(*) AS v"));
+            assert!(c.probe.contains("FILTER (WHERE _wm_rn <= 20)"));
+        }
+        // unique: groups non-null keys within the slice, having count>1; the
+        // sample is `{value, count}` pairs at the same grain as the count.
+        assert!(sql.checks[0]
+            .probe
+            .contains("GROUP BY \"order_id\" HAVING count(*) > 1"));
+        assert!(sql.checks[0]
+            .probe
+            .contains("SELECT \"order_id\" AS \"value\", count(*) AS \"count\""));
+        assert!(sql.checks[0]
+            .probe
+            .contains("\"order_id\" IS NOT NULL AND \"_wm_partition\" = '2026-06-19'"));
+        // not_null: null rows in the slice; the sample excludes the synthetic
+        // partition column (storage detail, not producer output).
+        assert!(sql.checks[1]
+            .probe
+            .contains("WHERE \"user_id\" IS NULL AND \"_wm_partition\" = '2026-06-19'"));
+        assert!(sql.checks[1]
+            .probe
+            .contains("SELECT * EXCLUDE (\"_wm_partition\") FROM"));
+    }
+
+    #[test]
+    fn data_test_unpartitioned_has_no_partition_scope() {
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::NotNull {
+            column: "id".into(),
+        })];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        assert!(sql.checks[0].probe.contains("WHERE \"id\" IS NULL"));
+        assert!(!sql.checks[0].probe.contains("_wm_partition"));
+        assert!(!sql.checks[0].probe.contains("EXCLUDE"));
+    }
+
+    #[test]
+    fn data_test_scd2_scopes_builtins_to_current_rows() {
+        // On an SCD2 history table the natural key repeats across closed
+        // versions, so built-in probes must assert the current snapshot only.
+        let tests = vec![
+            DataTestResolved::BuiltIn(DataTest::Unique { column: "customer_id".into() }),
+            DataTestResolved::BuiltIn(DataTest::NotNull { column: "tier".into() }),
+            DataTestResolved::BuiltIn(DataTest::AcceptedValues {
+                column: "region".into(),
+                values: vec!["emea".into()],
+            }),
+        ];
+        let sql = build_data_test_checks(&tests, &ctx_scd2()).unwrap();
+        assert!(sql.checks[0]
+            .probe
+            .contains("WHERE \"customer_id\" IS NOT NULL AND is_current"));
+        assert!(sql.checks[1]
+            .probe
+            .contains("WHERE \"tier\" IS NULL AND is_current"));
+        assert!(sql.checks[2].probe.contains("AND is_current"));
+        // no partition scope leaks in (scd2 is unpartitioned in v1)
+        assert!(!sql.checks[0].probe.contains("_wm_partition"));
+    }
+
+    #[test]
+    fn data_test_accepted_values_escapes_literals() {
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::AcceptedValues {
+            column: "status".into(),
+            values: vec!["paid".into(), "o'brien".into()],
+        })];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        assert!(sql.checks[0].probe.contains("NOT IN ('paid', 'o''brien')"));
+        assert!(sql.checks[0].probe.contains("\"status\" IS NOT NULL"));
+    }
+
+    #[test]
+    fn data_test_relationships_attaches_ref_and_dedups() {
+        let tests = vec![
+            DataTestResolved::BuiltIn(DataTest::Relationships {
+                column: "user_id".into(),
+                to_kind: AssetKind::DataTable,
+                to_path: "prod/users".into(),
+                to_column: "id".into(),
+            }),
+            // second relationship into the SAME db reuses the alias (no 2nd attach)
+            DataTestResolved::BuiltIn(DataTest::Relationships {
+                column: "buyer_id".into(),
+                to_kind: AssetKind::DataTable,
+                to_path: "prod/buyers".into(),
+                to_column: "id".into(),
+            }),
+        ];
+        let sql = build_data_test_checks(&tests, &ctx_partitioned()).unwrap();
+        assert_eq!(sql.attaches.len(), 1, "same db attached once");
+        assert_eq!(sql.attaches[0], "ATTACH 'datatable://prod' AS _wm_ref_0;");
+        assert!(sql.checks[0]
+            .probe
+            .contains("NOT EXISTS (SELECT 1 FROM _wm_ref_0.\"users\""));
+        assert!(sql.checks[1]
+            .probe
+            .contains("NOT EXISTS (SELECT 1 FROM _wm_ref_0.\"buyers\""));
+        assert!(sql.checks[0]
+            .probe
+            .contains("_wm_src.\"_wm_partition\" = '2026-06-19'"));
+        // sample rows come from the aliased target and drop the synthetic
+        // partition column.
+        assert!(sql.checks[0]
+            .probe
+            .contains("SELECT _wm_src.* EXCLUDE (\"_wm_partition\") FROM"));
+        assert_eq!(
+            sql.checks[0].name,
+            "relationships(user_id -> prod/users.id)"
+        );
+    }
+
+    #[test]
+    fn data_test_relationships_escapes_ref_name_in_attach() {
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::Relationships {
+            column: "k".into(),
+            to_kind: AssetKind::DataTable,
+            to_path: "ev'il/users".into(),
+            to_column: "id".into(),
+        })];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        // single quote in the name is doubled so it can't break out of the literal
+        assert_eq!(sql.attaches[0], "ATTACH 'datatable://ev''il' AS _wm_ref_0;");
+    }
+
+    #[test]
+    fn data_test_relationships_same_lake_reuses_target() {
+        // A relationship into the SAME ducklake as the materialize target
+        // (asset_path = "analytics/orders") must NOT re-ATTACH it — _wm_target
+        // already holds that catalog; reuse it.
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::Relationships {
+            column: "user_id".into(),
+            to_kind: AssetKind::Ducklake,
+            to_path: "analytics/users".into(),
+            to_column: "id".into(),
+        })];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        assert!(
+            sql.attaches.is_empty(),
+            "same-lake ref must not ATTACH again"
+        );
+        assert!(sql.checks[0]
+            .probe
+            .contains("NOT EXISTS (SELECT 1 FROM _wm_target.\"users\""));
+    }
+
+    #[test]
+    fn data_test_relationships_schema_qualified_target() {
+        // `<lake>/<schema>.<table>` — the schema-qualified table must quote each
+        // segment so the dot stays a separator, not part of one identifier.
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::Relationships {
+            column: "sku".into(),
+            to_kind: AssetKind::Ducklake,
+            to_path: "warehouse/main.dim_products".into(),
+            to_column: "sku".into(),
+        })];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        assert_eq!(
+            sql.attaches[0],
+            "ATTACH 'ducklake://warehouse' AS _wm_ref_0;"
+        );
+        assert!(
+            sql.checks[0]
+                .probe
+                .contains("FROM _wm_ref_0.\"main\".\"dim_products\""),
+            "schema-qualified target should be quoted per segment: {}",
+            sql.checks[0].probe
+        );
+    }
+
+    #[test]
+    fn data_test_relationships_rejects_non_attachable_kind() {
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::Relationships {
+            column: "k".into(),
+            to_kind: AssetKind::S3Object,
+            to_path: "bucket/file".into(),
+            to_column: "c".into(),
+        })];
+        assert!(build_data_test_checks(&tests, &ctx_unpartitioned()).is_err());
+    }
+
+    #[test]
+    fn data_test_custom_wraps_body() {
+        let tests = vec![DataTestResolved::Custom {
+            path: "f/tests/amount".into(),
+            body: "SELECT * FROM _wm_target.orders WHERE amount < 0;".into(),
+        }];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        // trailing ; stripped, body embedded as the probe's rows query
+        assert!(sql.checks[0]
+            .probe
+            .contains("FROM (SELECT * FROM _wm_target.orders WHERE amount < 0) _wm_v"));
+        assert!(sql.checks[0].probe.contains("count(*) AS v"));
+        assert_eq!(sql.checks[0].name, "custom(f/tests/amount)");
+    }
+
+    #[test]
+    fn data_test_custom_rejects_multi_statement_body() {
+        // The body is embedded as a subquery, so a setup-then-SELECT body would
+        // produce invalid SQL — reject it up front with a self-teaching error
+        // that names the violation and shows the correct single-SELECT shape.
+        let tests = vec![DataTestResolved::Custom {
+            path: "f/tests/amount".into(),
+            body: "SET threads = 1; SELECT * FROM _wm_target.orders WHERE amount < 0".into(),
+        }];
+        let err = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap_err();
+        assert!(err.contains("single SELECT"), "unexpected error: {err}");
+        assert!(
+            err.contains("found 2 statements"),
+            "unexpected error: {err}"
+        );
+        // the copyable example points at the internal target alias.
+        assert!(
+            err.contains("SELECT * FROM _wm_target.orders WHERE <condition>"),
+            "unexpected error: {err}"
+        );
+    }
+
+    #[test]
+    fn data_test_custom_rejects_non_select_body() {
+        // A write/DDL body can't be embedded as `FROM (<body>)`; the error must
+        // say so and teach the single-SELECT convention.
+        let tests = vec![DataTestResolved::Custom {
+            path: "f/tests/amount".into(),
+            body: "DELETE FROM _wm_target.orders WHERE amount < 0".into(),
+        }];
+        let err = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap_err();
+        assert!(err.contains("single SELECT"), "unexpected error: {err}");
+        assert!(
+            err.contains("SELECT * FROM _wm_target.orders WHERE <condition>"),
+            "unexpected error: {err}"
+        );
+    }
+
+    #[test]
+    fn data_test_custom_rejects_wrong_target_alias() {
+        // Referencing the target by its bare table name (not `_wm_target.<table>`)
+        // is the most common custom-test mistake — the runtime only attaches the
+        // freshly-materialized target under `_wm_target`, so the query would fail
+        // at runtime. Catch it at codegen with a self-teaching error.
+        let tests = vec![DataTestResolved::Custom {
+            path: "f/tests/amount".into(),
+            body: "SELECT * FROM orders WHERE amount < 0".into(),
+        }];
+        let err = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap_err();
+        assert!(err.contains("_wm_target"), "unexpected error: {err}");
+        assert!(
+            err.contains("SELECT * FROM _wm_target.orders WHERE <condition>"),
+            "unexpected error: {err}"
+        );
+    }
+
+    #[test]
+    fn data_test_custom_accepts_from_first_and_uppercased_alias() {
+        // DuckDB's FROM-first syntax is a valid Output, and the alias match is
+        // case-insensitive (SQL identifiers are), so this passes.
+        let tests = vec![DataTestResolved::Custom {
+            path: "f/tests/amount".into(),
+            body: "FROM _WM_TARGET.orders WHERE amount < 0".into(),
+        }];
+        let sql = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap();
+        assert!(sql.checks[0]
+            .probe
+            .contains("FROM (FROM _WM_TARGET.orders WHERE amount < 0) _wm_v"));
+    }
+
+    #[test]
+    fn data_test_custom_empty_body_teaches_shape() {
+        let tests = vec![DataTestResolved::Custom {
+            path: "f/tests/amount".into(),
+            body: "   \n-- just a comment\n".into(),
+        }];
+        let err = build_data_test_checks(&tests, &ctx_unpartitioned()).unwrap_err();
+        assert!(err.contains("empty test body"), "unexpected error: {err}");
+        assert!(
+            err.contains("SELECT * FROM _wm_target.orders WHERE <condition>"),
+            "unexpected error: {err}"
+        );
+    }
+
+    #[test]
+    fn data_test_unresolved_custom_is_internal_error() {
+        let tests = vec![DataTestResolved::BuiltIn(DataTest::Custom {
+            path: "f/x".into(),
+        })];
+        assert!(build_data_test_checks(&tests, &ctx_unpartitioned()).is_err());
+    }
+
+    #[test]
+    fn materialize_result_sql_embeds_data_tests_breakdown() {
+        let checks = vec![
+            DataTestCheck { name: "unique(order_id)".into(), probe: "SELECT v, s FROM q0".into() },
+            DataTestCheck { name: "custom(f/t)".into(), probe: "SELECT v, s FROM q1".into() },
+        ];
+        let sql = materialize_result_sql(
+            "_wm_target.orders",
+            "analytics/orders",
+            "_wm_partition",
+            "'2026-06-19'",
+            false,
+            &checks,
+            None,
+        );
+        // each probe runs once as a one-row CTE; _wm_tr cross-joins them and
+        // the list-of-struct references the flattened count/sample columns.
+        assert!(sql.starts_with(
+            "WITH _wm_t0 AS (SELECT v, s FROM q0), _wm_t1 AS (SELECT v, s FROM q1), \
+             _wm_tr AS (SELECT _wm_t0.v AS c0, _wm_t0.s AS s0, _wm_t1.v AS c1, _wm_t1.s AS s1 \
+             FROM _wm_t0, _wm_t1)"
+        ));
+        assert!(sql.contains("[{'test': 'unique(order_id)', 'violating': c0, 'sample': s0}, "));
+        assert!(
+            sql.contains("{'test': 'custom(f/t)', 'violating': c1, 'sample': s1}] AS data_tests")
+        );
+        assert!(sql.contains("FROM _wm_tr;"));
+        // no tests -> plain summary, no CTE / data_tests column.
+        let plain = materialize_result_sql(
+            "_wm_target.orders",
+            "analytics/orders",
+            "_wm_partition",
+            "'x'",
+            false,
+            &[],
+            None,
+        );
+        assert!(plain.starts_with("SELECT 'ducklake://analytics/orders' AS materialized"));
+        assert!(!plain.contains("data_tests"));
+        // Schema capture (gap #2a) is in every summary, tests or not. Unpartitioned
+        // → explicit ordering, no partition-column filter.
+        for s in [&sql, &plain] {
+            assert!(s.contains(
+                "(SELECT list({'name': column_name, 'type': column_type} ORDER BY _wm_ord) \
+                 FROM (SELECT column_name, column_type, row_number() OVER () AS _wm_ord \
+                 FROM (DESCRIBE SELECT * FROM _wm_target.orders))) AS output_schema"
+            ));
+            assert!(!s.contains("WHERE column_name <>"));
+        }
+    }
+
+    #[test]
+    fn materialize_result_sql_schema_excludes_partition_column() {
+        // Partitioned → the synthetic `_wm_partition` column is filtered out so
+        // the captured schema is the producer's logical output only.
+        let sql = materialize_result_sql(
+            "_wm_target.orders_daily",
+            "analytics/orders_daily",
+            "_wm_partition",
+            "'2026-06-19'",
+            true,
+            &[],
+            None,
+        );
+        assert!(sql.contains(
+            "FROM (DESCRIBE SELECT * FROM _wm_target.orders_daily) \
+             WHERE column_name <> '_wm_partition')) AS output_schema"
+        ));
+    }
+}
diff --git a/backend/parsers/windmill-parser/tests/fixtures/pipeline_annotations.json b/backend/parsers/windmill-parser/tests/fixtures/pipeline_annotations.json
index 158246022c..226f32914c 100644
--- a/backend/parsers/windmill-parser/tests/fixtures/pipeline_annotations.json
+++ b/backend/parsers/windmill-parser/tests/fixtures/pipeline_annotations.json
@@ -48,7 +48,11 @@
 		"expected": {
 			"in_pipeline": true,
 			"asset_triggers": [],
-			"native_triggers": ["kafka", "schedule", "data_upload"],
+			"native_triggers": [
+				"kafka",
+				"schedule",
+				"data_upload"
+			],
 			"partition": null,
 			"freshness": null,
 			"tag": null,
@@ -154,7 +158,10 @@
 			"partition": null,
 			"freshness": null,
 			"tag": null,
-			"retry": { "count": 3, "delay": "5s" }
+			"retry": {
+				"count": 3,
+				"delay": "5s"
+			}
 		}
 	},
 	{
@@ -167,7 +174,10 @@
 			"partition": null,
 			"freshness": null,
 			"tag": null,
-			"retry": { "count": 2, "delay": null }
+			"retry": {
+				"count": 2,
+				"delay": null
+			}
 		}
 	},
 	{
@@ -201,7 +211,9 @@
 		"code": "// pipeline\n// on s3://bucket/daily/{partition}/data.parquet\nexport function main() {}",
 		"expected": {
 			"in_pipeline": true,
-			"asset_triggers": ["s3object:bucket/daily/{partition}/data.parquet"],
+			"asset_triggers": [
+				"s3object:bucket/daily/{partition}/data.parquet"
+			],
 			"native_triggers": [],
 			"partition": null,
 			"freshness": null,
@@ -214,7 +226,9 @@
 		"code": "   -- pipeline\n\t-- on datatable://main/x\nSELECT 1;",
 		"expected": {
 			"in_pipeline": true,
-			"asset_triggers": ["datatable:main/x"],
+			"asset_triggers": [
+				"datatable:main/x"
+			],
 			"native_triggers": [],
 			"partition": null,
 			"freshness": null,
@@ -234,5 +248,630 @@
 			"tag": null,
 			"retry": null
 		}
+	},
+	{
+		"name": "materialize managed (default) with merge key",
+		"code": "// pipeline\n// materialize ducklake://analytics/orders_daily key=order_id\nSELECT 1;",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/orders_daily",
+				"unique_key": "order_id"
+			}
+		}
+	},
+	{
+		"name": "materialize scd2 via history flag with key, track and deletes=close",
+		"code": "// pipeline\n// materialize ducklake://analytics/dim_customer key=id history track=name,tier deletes=close\nSELECT 1;",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/dim_customer",
+				"unique_key": "id",
+				"scd2": true,
+				"track": [
+					"name",
+					"tier"
+				],
+				"close_deleted": true
+			}
+		}
+	},
+	{
+		"name": "materialize scd2 keyword alias with key only (track all non-key cols)",
+		"code": "// materialize scd2 ducklake://analytics/dim key=id\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/dim",
+				"unique_key": "id",
+				"scd2": true
+			}
+		}
+	},
+	{
+		"name": "materialize on_schema_change=ignore opt",
+		"code": "// pipeline\n// materialize ducklake://analytics/orders on_schema_change=ignore\nSELECT 1;",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/orders",
+				"on_schema_change": "ignore"
+			}
+		}
+	},
+	{
+		"name": "materialize on_schema_change unknown value keeps warn default (fail-safe)",
+		"code": "// materialize ducklake://analytics/orders key=id on_schema_change=bogus\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/orders",
+				"unique_key": "id",
+				"on_schema_change": "warn"
+			}
+		}
+	},
+	{
+		"name": "materialize key without history is plain merge (SCD1, not scd2)",
+		"code": "// materialize ducklake://analytics/dim key=id\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/dim",
+				"unique_key": "id"
+			}
+		}
+	},
+	{
+		"name": "materialize manual escape hatch, first value wins",
+		"code": "// materialize manual ducklake://analytics/orders_daily\n// materialize ducklake://other/x\nexport function main() {}",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/orders_daily",
+				"manual": true
+			}
+		}
+	},
+	{
+		"name": "materialize default-syntax shorthand with append",
+		"code": "// materialize ducklake append\nexport function main() {}",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "main",
+				"append": true
+			}
+		}
+	},
+	{
+		"name": "materialize manual with no target is dropped",
+		"code": "// materialize manual\nexport function main() {}",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "data_test built-ins accumulate in order",
+		"code": "-- pipeline\n-- materialize ducklake://analytics/orders key=order_id\n-- data_test unique order_id\n-- data_test not_null user_id\n-- data_test accepted_values status = paid,pending,refunded\n-- data_test relationships user_id -> datatable://prod/users.id\nSELECT 1;",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"materialize": {
+				"target_kind": "ducklake",
+				"target_path": "analytics/orders",
+				"unique_key": "order_id"
+			},
+			"data_tests": [
+				{
+					"type": "unique",
+					"column": "order_id"
+				},
+				{
+					"type": "not_null",
+					"column": "user_id"
+				},
+				{
+					"type": "accepted_values",
+					"column": "status",
+					"values": [
+						"paid",
+						"pending",
+						"refunded"
+					]
+				},
+				{
+					"type": "relationships",
+					"column": "user_id",
+					"to_kind": "datatable",
+					"to_path": "prod/users",
+					"to_column": "id"
+				}
+			]
+		}
+	},
+	{
+		"name": "data_test accepted_values strips quotes and spacing",
+		"code": "# data_test accepted_values kind = \"a b\", 'c' ,d\nprint(1)",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"data_tests": [
+				{
+					"type": "accepted_values",
+					"column": "kind",
+					"values": [
+						"a b",
+						"c",
+						"d"
+					]
+				}
+			]
+		}
+	},
+	{
+		"name": "data_test custom escape hatch is a script path",
+		"code": "// data_test f/tests/orders_amount_sane\nexport function main() {}",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"data_tests": [
+				{
+					"type": "custom",
+					"path": "f/tests/orders_amount_sane"
+				}
+			]
+		}
+	},
+	{
+		"name": "data_test relationships with ducklake shorthand target",
+		"code": "// data_test relationships sku -> ducklake://warehouse/dim_products.sku\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"data_tests": [
+				{
+					"type": "relationships",
+					"column": "sku",
+					"to_kind": "ducklake",
+					"to_path": "warehouse/dim_products",
+					"to_column": "sku"
+				}
+			]
+		}
+	},
+	{
+		"name": "malformed data_test lines are dropped fail-safe",
+		"code": "// data_test uniq order_id\n// data_test accepted_values s =\n// data_test relationships a -> b\n// data_test unique\n// data_test\n// data_test unique id\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"data_tests": [
+				{
+					"type": "unique",
+					"column": "id"
+				}
+			]
+		}
+	},
+	{
+		"name": "ci test annotation is not a data test",
+		"code": "// test: f/foo/bar\n// data_test unique id\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"data_tests": [
+				{
+					"type": "unique",
+					"column": "id"
+				}
+			]
+		}
+	},
+	{
+		"name": "column lineage maps output columns to upstream sources",
+		"code": "// column order_total <- ducklake://warehouse/orders.amount, ducklake://warehouse/orders.tax\n// column user_name <- datatable://prod/users.name\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"column_lineage": [
+				{
+					"column": "order_total",
+					"inputs": [
+						{
+							"from_kind": "ducklake",
+							"from_path": "warehouse/orders",
+							"from_column": "amount"
+						},
+						{
+							"from_kind": "ducklake",
+							"from_path": "warehouse/orders",
+							"from_column": "tax"
+						}
+					]
+				},
+				{
+					"column": "user_name",
+					"inputs": [
+						{
+							"from_kind": "datatable",
+							"from_path": "prod/users",
+							"from_column": "name"
+						}
+					]
+				}
+			]
+		}
+	},
+	{
+		"name": "column lineage keeps duplicate input refs (dedup is a view concern)",
+		"code": "// column total <- ducklake://warehouse/orders.amount, ducklake://warehouse/orders.amount\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"column_lineage": [
+				{
+					"column": "total",
+					"inputs": [
+						{
+							"from_kind": "ducklake",
+							"from_path": "warehouse/orders",
+							"from_column": "amount"
+						},
+						{
+							"from_kind": "ducklake",
+							"from_path": "warehouse/orders",
+							"from_column": "amount"
+						}
+					]
+				}
+			]
+		}
+	},
+	{
+		"name": "column lineage keeps schema-qualified table, drops malformed refs",
+		"code": "// column sku <- ducklake://warehouse/main.dim_products.sku, bad_no_dot\n// column no_arrow datatable://prod/x.y\n// column total <- bad_no_dot\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"column_lineage": [
+				{
+					"column": "sku",
+					"inputs": [
+						{
+							"from_kind": "ducklake",
+							"from_path": "warehouse/main.dim_products",
+							"from_column": "sku"
+						}
+					]
+				}
+			]
+		}
+	},
+	{
+		"name": "bare macros marker",
+		"code": "// macros\nCREATE MACRO dbl(a) AS a * 2;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"macros": true
+		}
+	},
+	{
+		"name": "macros with trailing prose is not a marker",
+		"code": "// macros are defined below\nCREATE MACRO dbl(a) AS a * 2;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "macros marker with sql comment prefix",
+		"code": "-- macros\n-- pipeline\nCREATE MACRO dbl(a) AS a * 2;",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"macros": true
+		}
+	},
+	{
+		"name": "use accumulates in order and dedups",
+		"code": "// use f/lib/stats\n// use f/lib/dates\n// use f/lib/stats\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"use_libs": [
+				"f/lib/stats",
+				"f/lib/dates"
+			]
+		}
+	},
+	{
+		"name": "use requires a slashed single token",
+		"code": "// use this script to compute stuff\n// use standalone\n// use f/lib/ok extra\nSELECT 1;",
+		"expected": {
+			"in_pipeline": false,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "use stops at first code line",
+		"code": "// pipeline\nSELECT 1;\n-- use f/lib/late\n",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "s3 triple-slash default-storage trigger canonicalizes to bare key",
+		"code": "// pipeline\n// on s3:///exports/x\nexport function main() {}",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [
+				"s3object:exports/x"
+			],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "s3 quad-slash trigger strips all leading slashes to the bare key",
+		"code": "// pipeline\n// on s3:////x\nexport function main() {}",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [
+				"s3object:x"
+			],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "mute suppresses a single ducklake read edge",
+		"code": "// pipeline\n// mute ducklake://main.orders\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"mute": [
+				"ducklake:main.orders"
+			]
+		}
+	},
+	{
+		"name": "mute all opts out of all auto-derivation",
+		"code": "// pipeline\n// mute all\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"mute_all": true
+		}
+	},
+	{
+		"name": "mute accumulates in order and dedups",
+		"code": "// pipeline\n// mute ducklake://main.a\n// mute s3://raw/b\n// mute ducklake://main.a\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"mute": [
+				"ducklake:main.a",
+				"s3object:raw/b"
+			]
+		}
+	},
+	{
+		"name": "mute of a native trigger kind is dropped (only assets are muteable)",
+		"code": "// pipeline\n// mute kafka\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "mute prose without an asset ref never false-positives",
+		"code": "// pipeline\n// muted for now\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
+	},
+	{
+		"name": "mute all coexists with explicit on edges",
+		"code": "// pipeline\n// mute all\n// on ducklake://main.orders\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [
+				"ducklake:main.orders"
+			],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null,
+			"mute_all": true
+		}
+	},
+	{
+		"name": "on asset ref strips trailing key=value opts",
+		"code": "// pipeline\n// on ducklake://main.orders debounce=60s\nselect 1",
+		"expected": {
+			"in_pipeline": true,
+			"asset_triggers": [
+				"ducklake:main.orders"
+			],
+			"native_triggers": [],
+			"partition": null,
+			"freshness": null,
+			"tag": null,
+			"retry": null
+		}
 	}
 ]
diff --git a/backend/parsers/windmill-parser/tests/pipeline_annotations_parity.rs b/backend/parsers/windmill-parser/tests/pipeline_annotations_parity.rs
index 3efc9f0c9d..fff818edb2 100644
--- a/backend/parsers/windmill-parser/tests/pipeline_annotations_parity.rs
+++ b/backend/parsers/windmill-parser/tests/pipeline_annotations_parity.rs
@@ -34,6 +34,57 @@ struct Expected {
     freshness: Option<String>,
     tag: Option<String>,
     retry: Option<ExpectedRetry>,
+    // Default-on-absent so the pre-existing fixtures (which omit it) keep
+    // deserializing; only fixtures exercising materialization set it.
+    #[serde(default)]
+    materialize: Option<ExpectedMaterialize>,
+    // Snake_case `DataTest` serde shape (e.g. {"type":"unique","column":"x"}),
+    // compared against `serde_json::to_value(got.data_tests)`. Absent === [].
+    #[serde(default)]
+    data_tests: Vec<serde_json::Value>,
+    // Snake_case `ColumnLineage` serde shape (e.g. {"column":"x","inputs":
+    // [{"from_kind":"datatable","from_path":"p","from_column":"c"}]}), compared
+    // against `to_value(got.column_lineage)`. Absent === [].
+    #[serde(default)]
+    column_lineage: Vec<serde_json::Value>,
+    // `// macros` marker (strict, alone on the line). Absent === false.
+    #[serde(default)]
+    macros: bool,
+    // `// use <lib_path>` accumulation, declaration order, deduped. Absent === [].
+    #[serde(default)]
+    use_libs: Vec<String>,
+    // `// mute <asset>` accumulation as `kind:path`, declaration order, deduped.
+    // Absent === [].
+    #[serde(default)]
+    mute: Vec<String>,
+    // `// mute all` marker. Absent === false.
+    #[serde(default)]
+    mute_all: bool,
+}
+
+#[derive(Deserialize)]
+struct ExpectedMaterialize {
+    target_kind: String,
+    target_path: String,
+    #[serde(default)]
+    manual: bool,
+    #[serde(default)]
+    append: bool,
+    #[serde(default)]
+    unique_key: Option<String>,
+    #[serde(default)]
+    scd2: bool,
+    #[serde(default)]
+    track: Vec<String>,
+    #[serde(default)]
+    close_deleted: bool,
+    // "warn" | "ignore"; absent === "warn" (the default).
+    #[serde(default = "default_on_schema_change")]
+    on_schema_change: String,
+}
+
+fn default_on_schema_change() -> String {
+    "warn".to_string()
 }
 
 #[derive(Deserialize)]
@@ -153,5 +204,72 @@ fn pipeline_annotation_fixtures_match() {
                 want.is_some()
             ),
         }
+
+        match (&got.materialize, &f.expected.materialize) {
+            (None, None) => {}
+            (Some(m), Some(e)) => {
+                assert_eq!(
+                    kind_str(m.target_kind),
+                    e.target_kind,
+                    "{ctx}: materialize kind"
+                );
+                assert_eq!(m.target_path, e.target_path, "{ctx}: materialize path");
+                assert_eq!(m.manual, e.manual, "{ctx}: materialize manual");
+                assert_eq!(m.append, e.append, "{ctx}: materialize append");
+                assert_eq!(m.unique_key, e.unique_key, "{ctx}: materialize key");
+                assert_eq!(m.scd2, e.scd2, "{ctx}: materialize scd2");
+                assert_eq!(m.track, e.track, "{ctx}: materialize track");
+                assert_eq!(
+                    m.close_deleted, e.close_deleted,
+                    "{ctx}: materialize close_deleted"
+                );
+                let osc = match m.on_schema_change {
+                    windmill_parser::asset_parser::OnSchemaChange::Warn => "warn",
+                    windmill_parser::asset_parser::OnSchemaChange::Ignore => "ignore",
+                    windmill_parser::asset_parser::OnSchemaChange::Fail => "fail",
+                    windmill_parser::asset_parser::OnSchemaChange::Sync => "sync",
+                };
+                assert_eq!(
+                    osc, e.on_schema_change,
+                    "{ctx}: materialize on_schema_change"
+                );
+            }
+            (got, want) => panic!(
+                "{ctx}: materialize mismatch — got {:?}, want present={}",
+                got,
+                want.is_some()
+            ),
+        }
+
+        let got_tests = serde_json::to_value(&got.data_tests).expect("data_tests serialize");
+        assert_eq!(
+            got_tests,
+            serde_json::Value::Array(f.expected.data_tests.clone()),
+            "{ctx}: data tests"
+        );
+
+        let got_lineage =
+            serde_json::to_value(&got.column_lineage).expect("column_lineage serialize");
+        assert_eq!(
+            got_lineage,
+            serde_json::Value::Array(f.expected.column_lineage.clone()),
+            "{ctx}: column lineage"
+        );
+
+        assert_eq!(got.macros, f.expected.macros, "{ctx}: macros");
+        assert_eq!(got.use_libs, f.expected.use_libs, "{ctx}: use_libs");
+
+        let mute: Vec<String> = got
+            .mute
+            .iter()
+            .filter_map(|t| match t {
+                TriggerSpec::Asset { asset_kind, path, .. } => {
+                    Some(format!("{}:{}", kind_str(*asset_kind), path))
+                }
+                _ => None,
+            })
+            .collect();
+        assert_eq!(mute, f.expected.mute, "{ctx}: mute");
+        assert_eq!(got.mute_all, f.expected.mute_all, "{ctx}: mute_all");
     }
 }
diff --git a/backend/src/db_connect.rs b/backend/src/db_connect.rs
index deda032058..d4dee19f82 100644
--- a/backend/src/db_connect.rs
+++ b/backend/src/db_connect.rs
@@ -3,9 +3,11 @@ use windmill_common::{
     get_database_url, DatabaseUrl,
 };
 
-pub const DEFAULT_MAX_CONNECTIONS_SERVER: u32 = 50;
-pub const DEFAULT_MAX_CONNECTIONS_WORKER: u32 = 5;
-pub const DEFAULT_MAX_CONNECTIONS_INDEXER: u32 = 5;
+// Single source of truth in windmill_common so the DB-health sizing guidance
+// (windmill-api/src/db_health.rs) and the actual pool sizing here can't drift.
+pub use windmill_common::{
+    DEFAULT_MAX_CONNECTIONS_INDEXER, DEFAULT_MAX_CONNECTIONS_SERVER, DEFAULT_MAX_CONNECTIONS_WORKER,
+};
 #[cfg(feature = "operator")]
 pub const DEFAULT_MAX_CONNECTIONS_OPERATOR: u32 = 2;
 
diff --git a/backend/src/main.rs b/backend/src/main.rs
index 57cc02598a..4115e2a12b 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -578,6 +578,7 @@ fn print_help() {
     println!("  JSON_FMT = false                       Output logs in JSON instead of logfmt");
     println!("  METRICS_ADDR = None                    (EE only) Prometheus metrics addr at /metrics; set \"true\" to use :8001");
     println!("  SUPERADMIN_SECRET = None               Virtual superadmin token (server)");
+    println!("  NO_AUTH = false                        Bypass all auth; every request acts as the admin@windmill.dev superadmin (only behind a trusted gateway; ignored when CLOUD_HOSTED)");
     println!("  LICENSE_KEY = None                     (EE only) Enterprise license key (workers require valid key)");
     println!("  RUN_UPDATE_CA_CERTIFICATE_AT_START = false  Run system CA update at startup");
     println!("  RUN_UPDATE_CA_CERTIFICATE_PATH = /usr/sbin/update-ca-certificates  Path to CA update tool");
@@ -641,6 +642,15 @@ async fn windmill_main() -> anyhow::Result<()> {
         println!("Running in MCP mode");
     }
 
+    if *windmill_common::worker::NO_AUTH {
+        println!("############################################################");
+        println!("# NO_AUTH mode is ENABLED: authentication is fully         #");
+        println!("# bypassed and every request is treated as the             #");
+        println!("# admin@windmill.dev superadmin. Only run this behind a     #");
+        println!("# trusted authenticating gateway on a private network.      #");
+        println!("############################################################");
+    }
+
     #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
     println!("jemalloc enabled");
 
@@ -1446,19 +1456,45 @@ Windmill Community Edition {GIT_VERSION}
                                     } else {
                                         None
                                     };
-                                    monitor_db(
-                                        &conn,
-                                        &base_internal_url,
-                                        server_mode,
-                                        worker_mode,
-                                        false,
-                                        tx.clone(),
-                                        Some(MonitorIteration {
-                                            rd_shift,
-                                            iter: monitor_iteration,
-                                        }),
+                                    // Hard cap on a single monitor pass. monitor_db runs all its
+                                    // periodic tasks under one join!, so a single task stuck on a
+                                    // non-DB await (statement_timeout only bounds DB statements)
+                                    // would otherwise freeze the whole loop indefinitely — silently
+                                    // stopping critical maintenance like audit-partition creation.
+                                    // Larger than statement_timeout (5min) so a slow-but-progressing
+                                    // statement is never killed prematurely.
+                                    const MONITOR_DB_TIMEOUT: Duration = Duration::from_secs(600);
+                                    let monitor_timed_out = tokio::time::timeout(
+                                        MONITOR_DB_TIMEOUT,
+                                        monitor_db(
+                                            &conn,
+                                            &base_internal_url,
+                                            server_mode,
+                                            worker_mode,
+                                            false,
+                                            tx.clone(),
+                                            Some(MonitorIteration {
+                                                rd_shift,
+                                                iter: monitor_iteration,
+                                            }),
+                                        ),
                                     )
-                                    .await;
+                                    .await
+                                    .is_err();
+                                    if monitor_timed_out {
+                                        windmill_common::utils::report_critical_error(
+                                            format!(
+                                                "monitor task did not finish within {}s and was aborted; \
+                                                 a background maintenance task is likely stuck. \
+                                                 Continuing to the next iteration.",
+                                                MONITOR_DB_TIMEOUT.as_secs()
+                                            ),
+                                            db.clone(),
+                                            None,
+                                            None,
+                                        )
+                                        .await;
+                                    }
                                     monitor_iteration += 1;
                                     if let Some(handle) = warn_handle {
                                         handle.abort();
@@ -1653,6 +1689,13 @@ async fn process_notify_event(
             );
             windmill_queue::asset_dispatch::ASSET_PRODUCER_WRITES_CACHE.remove(payload);
         }
+        "notify_macro_registry_change" => {
+            tracing::debug!(
+                "Macro registry change for workspace {}, invalidating macro registry cache",
+                payload
+            );
+            windmill_common::assets::MACRO_REGISTRY_CACHE.remove(payload);
+        }
         "notify_workspace_key_change" => {
             tracing::info!(
                 "Workspace key change detected, invalidating workspace key cache: {}",
@@ -1682,6 +1725,10 @@ async fn process_notify_event(
                     match *source_type {
                         "script" => {
                             windmill_common::DEPLOYED_SCRIPT_HASH_CACHE.remove(&key);
+                            // Bundle-cache key resolution for imported scripts; evicted
+                            // together with the content-side caches below so key and
+                            // inlined content flip to the new version in the same window.
+                            windmill_common::IMPORTED_SCRIPT_HASH_CACHE.remove(&key);
                             // Evict the relative-import latest-hash cache so a redeployed
                             // imported script flips the content cache to its new version
                             // across all replicas within a poll interval (see #6769). Keyed
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index be54edf468..60b4024c0a 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -75,6 +75,7 @@ use windmill_common::{
         WORKSPACE_FAIRNESS_MAX_PERCENT_SETTING, WORKSPACE_FAIRNESS_MIN_TOTAL_SETTING,
     },
     indexer::load_indexer_config,
+    jobs::delete_jobs,
     jwt::JWT_SECRET,
     oauth2::REQUIRE_PREEXISTING_USER_FOR_OAUTH,
     server::load_smtp_config,
@@ -177,6 +178,14 @@ lazy_static::lazy_static! {
     .and_then(|x| x.parse::<bool>().ok())
     .unwrap_or(false);
 
+    // Ops kill switch for the pipeline freshness watchdog (a background
+    // pusher — being able to stop it without a redeploy matters more than
+    // for read-only monitors).
+    pub static ref DISABLE_FRESHNESS_WATCHDOG: bool = std::env::var("DISABLE_FRESHNESS_WATCHDOG")
+    .ok()
+    .and_then(|x| x.parse::<bool>().ok())
+    .unwrap_or(false);
+
     pub static ref WORKERS_NAMES: Arc<RwLock<Vec<String>>> = Arc::new(RwLock::new(Vec::new()));
 
     static ref QUEUE_COUNT_TAGS: Arc<RwLock<Vec<String>>> = Arc::new(RwLock::new(Vec::new()));
@@ -1275,6 +1284,19 @@ pub async fn delete_expired_items(db: &DB) -> () {
         tracing::error!("Error deleting autoscaling event on CE: {:?}", e);
     }
 
+    // native_retry_attempt has no FK to v2_job (kept off the hot bulk delete).
+    // Retention sweeps markers alongside the jobs it deletes, but direct job
+    // deletions (workspace/job/schedule clearing) leave markers orphaned — reap
+    // any whose job is gone. The table is sparse, so this anti-join is cheap.
+    if let Err(e) = sqlx::query!(
+        "DELETE FROM native_retry_attempt nra WHERE NOT EXISTS (SELECT 1 FROM v2_job WHERE id = nra.job_id)"
+    )
+    .execute(db)
+    .await
+    {
+        tracing::error!("Error reaping orphaned native retry markers: {:?}", e);
+    }
+
     if let Err(e) = windmill_queue::cascade::reap_stale_join_slots(db).await {
         tracing::error!("Error reaping stale join_pending_inputs slots: {:?}", e);
     }
@@ -1324,6 +1346,9 @@ pub async fn delete_expired_items(db: &DB) -> () {
         let cleanup_start = Instant::now();
         let mut total_deleted = 0u64;
         let mut batch_num = 0i32;
+        // Watermark carried across batches so each one resumes after the rows the previous batch
+        // already processed instead of re-scanning the (potentially undeletable) oldest prefix.
+        let mut completed_at_floor: Option<DateTime<Utc>> = None;
 
         // Process batches until no more expired jobs or max batches reached
         loop {
@@ -1336,14 +1361,17 @@ pub async fn delete_expired_items(db: &DB) -> () {
             }
 
             // Each batch runs in its own transaction to avoid long-running locks
-            let batch_result = delete_expired_jobs_batch(db, job_retention_secs, batch_size).await;
+            let batch_result =
+                delete_expired_jobs_batch(db, job_retention_secs, batch_size, completed_at_floor)
+                    .await;
 
             match batch_result {
-                Ok(deleted_count) => {
+                Ok((deleted_count, max_completed_at)) => {
                     if deleted_count == 0 {
                         // No more expired jobs to delete
                         break;
                     }
+                    completed_at_floor = max_completed_at.or(completed_at_floor);
                     total_deleted += deleted_count as u64;
                     batch_num += 1;
                 }
@@ -1510,12 +1538,20 @@ pub async fn check_expiring_tokens(db: &DB) {
 
 /// Delete a batch of expired jobs with LIMIT and SKIP LOCKED for high-scale environments.
 /// Uses a single transaction per batch to minimize lock duration.
-/// Returns the number of jobs deleted in this batch.
+///
+/// `completed_at_floor` is the watermark from the previous batch in the same cleanup run (the
+/// max `completed_at` it deleted); pass `None` for the first batch. It is re-applied as
+/// `completed_at >= floor` so the scan resumes past the rows already processed instead of
+/// re-walking them (see the inline comment on the DELETE for why this matters).
+///
+/// Returns `(jobs deleted in this batch, max completed_at deleted)`. The caller feeds the
+/// returned watermark back in as `completed_at_floor` for the next batch.
 async fn delete_expired_jobs_batch(
     db: &DB,
     job_retention_secs: i64,
     batch_size: i64,
-) -> error::Result<usize> {
+    completed_at_floor: Option<DateTime<Utc>>,
+) -> error::Result<(usize, Option<DateTime<Utc>>)> {
     let mut tx = db.begin().await?;
 
     // Fetch active ROOT job IDs that started before the retention period. We only care about
@@ -1531,26 +1567,70 @@ async fn delete_expired_jobs_batch(
     .fetch_all(&mut *tx)
     .await?;
 
-    // Use FOR UPDATE SKIP LOCKED to avoid contention between replicas
-    // ORDER BY completed_at ensures we delete oldest jobs first
-    let deleted_jobs: Vec<Uuid> = sqlx::query_scalar!(
-        "DELETE FROM v2_job_completed
-         WHERE id IN (
-             SELECT jc.id FROM v2_job_completed jc
-             LEFT JOIN v2_job j ON j.id = jc.id
-             WHERE jc.completed_at <= now() - ($1::bigint::text || ' s')::interval
-               AND COALESCE(j.root_job, j.flow_innermost_root_job, jc.id) != ALL($3)
-             ORDER BY jc.completed_at ASC
-             LIMIT $2
-             FOR UPDATE OF jc SKIP LOCKED
-         )
-         RETURNING id",
-        job_retention_secs,
-        batch_size,
-        &active_root_job_ids
-    )
-    .fetch_all(&mut *tx)
-    .await?;
+    // `completed_at_floor` is a watermark carried across batches within a cleanup run: it is the
+    // max(completed_at) deleted by the previous batch. Re-applying it as `completed_at >= floor`
+    // lets each batch resume after the rows the previous batch already processed instead of
+    // re-scanning them. This matters when the oldest rows are undeletable (children of a
+    // still-active root flow): without the floor the `ORDER BY completed_at ASC` scan walks that
+    // same protected prefix on every batch, turning a cleanup run quadratic in prefix size.
+    // Floor only ever skips rows the current run already deleted, was protecting, or skip-locked —
+    // all correctly deferred to the next run, identical to the unbounded scan's semantics.
+    //
+    // Use FOR UPDATE SKIP LOCKED to avoid contention between replicas; ORDER BY completed_at
+    // deletes oldest jobs first.
+    let (deleted_jobs, max_completed_at) = if active_root_job_ids.is_empty() {
+        // Common case: no old root flow is still running, so nothing is protected and the
+        // v2_job join (a PK lookup per candidate) is pure overhead — skip it entirely.
+        let rows = sqlx::query!(
+            "DELETE FROM v2_job_completed
+             WHERE id IN (
+                 SELECT id FROM v2_job_completed
+                 WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval
+                   AND ($3::timestamptz IS NULL OR completed_at >= $3)
+                 ORDER BY completed_at ASC
+                 LIMIT $2
+                 FOR UPDATE SKIP LOCKED
+             )
+             RETURNING id, completed_at",
+            job_retention_secs,
+            batch_size,
+            completed_at_floor,
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        let max = rows.iter().map(|r| r.completed_at).max();
+        (rows.into_iter().map(|r| r.id).collect::<Vec<Uuid>>(), max)
+    } else {
+        // Active-root exclusion uses `NOT IN (SELECT ... unnest($3))` rather than `!= ALL($3)`:
+        // the subquery form lets the planner build a one-time hashed SubPlan and apply it as a
+        // filter on the ordered index scan, giving O(1) membership per candidate instead of a
+        // per-row linear array scan (which degrades sharply when many root jobs are active). The
+        // `u IS NOT NULL` guard sidesteps NOT IN's null-trap semantics ($3 holds non-null PK ids).
+        let rows = sqlx::query!(
+            "DELETE FROM v2_job_completed
+             WHERE id IN (
+                 SELECT jc.id FROM v2_job_completed jc
+                 LEFT JOIN v2_job j ON j.id = jc.id
+                 WHERE jc.completed_at <= now() - ($1::bigint::text || ' s')::interval
+                   AND ($4::timestamptz IS NULL OR jc.completed_at >= $4)
+                   AND COALESCE(j.root_job, j.flow_innermost_root_job, jc.id) NOT IN (
+                       SELECT u FROM unnest($3::uuid[]) AS u WHERE u IS NOT NULL
+                   )
+                 ORDER BY jc.completed_at ASC
+                 LIMIT $2
+                 FOR UPDATE OF jc SKIP LOCKED
+             )
+             RETURNING id, completed_at",
+            job_retention_secs,
+            batch_size,
+            &active_root_job_ids,
+            completed_at_floor,
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        let max = rows.iter().map(|r| r.completed_at).max();
+        (rows.into_iter().map(|r| r.id).collect::<Vec<Uuid>>(), max)
+    };
 
     let deleted_count = deleted_jobs.len();
 
@@ -1589,10 +1669,21 @@ async fn delete_expired_jobs_batch(
             Err(e) => tracing::error!("Error deleting job logs: {:?}", e),
         }
 
-        if let Err(e) = sqlx::query!("DELETE FROM v2_job WHERE id = ANY($1)", &deleted_jobs)
-            .execute(&mut *tx)
-            .await
+        // Native retry markers have no FK (to keep this bulk delete cheap) — sweep
+        // them with their jobs here too (the periodic retention path), same as the
+        // other side tables. The table is created by a startup migration, so it
+        // always exists by the time cleanup runs.
+        if let Err(e) = sqlx::query!(
+            "DELETE FROM native_retry_attempt WHERE job_id = ANY($1)",
+            &deleted_jobs
+        )
+        .execute(&mut *tx)
+        .await
         {
+            tracing::error!("Error deleting native retry markers: {:?}", e);
+        }
+
+        if let Err(e) = delete_jobs(&mut *tx, &deleted_jobs).await {
             tracing::error!("Error deleting job: {:?}", e);
         }
 
@@ -1610,7 +1701,7 @@ async fn delete_expired_jobs_batch(
 
     tx.commit().await?;
 
-    Ok(deleted_count)
+    Ok((deleted_count, max_completed_at))
 }
 
 async fn delete_log_files_from_disk_and_store(
@@ -1638,11 +1729,30 @@ async fn delete_log_files_from_disk_and_store(
                     .collect();
                 let stream = futures::stream::iter(s3_paths).boxed();
                 let mut result = os.delete_stream(stream);
+                let mut deleted = 0u64;
+                let mut not_found = 0u64;
+                let mut failed = 0u64;
                 while let Some(r) = result.next().await {
-                    if let Err(e) = r {
-                        tracing::error!("Failed to delete from object store: {e}");
+                    match r {
+                        Ok(_) => deleted += 1,
+                        // Deleting a non-existent object is a successful no-op. S3's
+                        // DeleteObjects ignores missing keys, but GCS returns 404 per
+                        // delete, surfacing as NotFound — count it separately rather
+                        // than logging it as an error.
+                        Err(windmill_object_store::object_store_reexports::ObjectStoreError::NotFound { .. }) => {
+                            not_found += 1;
+                        }
+                        Err(e) => {
+                            failed += 1;
+                            tracing::error!("Failed to delete from object store: {e}");
+                        }
                     }
                 }
+                if deleted + not_found + failed > 0 {
+                    tracing::info!(
+                        "object store log cleanup: {deleted} deleted, {not_found} already absent (404), {failed} failed"
+                    );
+                }
             }
         }
     }
@@ -2614,6 +2724,9 @@ pub async fn monitor_db(
                 if let Err(e) = cleanup_debounce_orphaned_keys(&db).await {
                     tracing::error!("Error cleaning up debounce keys: {:?}", e);
                 }
+                if let Err(e) = cleanup_consumed_debounce_batches(&db).await {
+                    tracing::error!("Error cleaning up consumed debounce batches: {:?}", e);
+                }
             }
         }
     };
@@ -2889,6 +3002,28 @@ pub async fn monitor_db(
         }
     };
 
+    // run every ~60s (2 iterations * 30s). Enterprise feature: the active
+    // `// freshness` backstop lives in windmill-queue's `freshness_watchdog`
+    // (`private`); OSS gets a no-op stub. Runtime-gated on an Enterprise
+    // license like the audit export above. Safe on concurrent servers — the
+    // watchdog claims per-script state rows atomically before pushing.
+    let pipeline_freshness_watchdog_f = async {
+        if server_mode
+            && !*DISABLE_FRESHNESS_WATCHDOG
+            && iteration.is_some()
+            && iteration.as_ref().unwrap().should_run(2)
+        {
+            if let Some(db) = conn.as_sql() {
+                if matches!(
+                    windmill_common::ee_oss::get_license_plan().await,
+                    windmill_common::ee_oss::LicensePlan::Enterprise
+                ) {
+                    windmill_queue::freshness_watchdog::tick(db).await;
+                }
+            }
+        }
+    };
+
     join!(
         expired_items_f,
         zombie_jobs_f,
@@ -2916,6 +3051,7 @@ pub async fn monitor_db(
         manage_audit_partitions_f,
         export_audit_logs_to_object_store_f,
         cleanup_scheduled_job_deletions_f,
+        pipeline_freshness_watchdog_f,
     );
 }
 
@@ -4316,6 +4452,40 @@ RETURNING key,job_id
     Ok(())
 }
 
+/// GC for claim-based debounce batches: once a batch row has been consumed (its
+/// args accumulated into some survivor's run), it only lingers to let a later-pulled
+/// survivor of the same batch tell "already consumed" from "never batched". A generous
+/// grace period (>> any debounce window) makes that decision safe; after it, the rows
+/// are dead weight. A re-pulled survivor whose row was GC'd correctly falls back to its
+/// own (already-accumulated, persisted) args, so the grace period is not correctness-
+/// critical.
+async fn cleanup_consumed_debounce_batches(db: &DB) -> error::Result<()> {
+    // Only reclaim a consumed row once its job has LEFT the queue. A consumed sibling
+    // (its contribution already accumulated by another survivor) can sit queued well
+    // past any time-based grace under a concurrency limit / worker backlog; removing its
+    // row while still queued would make its eventual pull treat it as never-batched and
+    // re-run its item (a duplicate). Keeping the row until the job is no longer queued
+    // guarantees that pull still sees "already consumed" and runs empty. The age floor
+    // is just a safety margin on top.
+    let deleted = sqlx::query_scalar!(
+        "WITH del AS (
+            DELETE FROM v2_job_debounce_batch
+            WHERE consumed_at IS NOT NULL
+              AND consumed_at < now() - interval '10 minutes'
+              AND id NOT IN (SELECT id FROM v2_job_queue)
+            RETURNING 1
+        ) SELECT count(*) FROM del"
+    )
+    .fetch_one(db)
+    .await?
+    .unwrap_or(0);
+
+    if deleted > 0 {
+        tracing::info!("Cleaned up {deleted} consumed debounce batch rows");
+    }
+    Ok(())
+}
+
 async fn cleanup_debounce_keys_for_completed_jobs(db: &DB) -> error::Result<()> {
     // If min version doesn't support runnable settings, clean up debounce keys for completed jobs
     if !windmill_common::min_version::MIN_VERSION_SUPPORTS_RUNNABLE_SETTINGS_V0
@@ -4349,39 +4519,90 @@ RETURNING key,job_id
     Ok(())
 }
 
-async fn cleanup_job_perms_orphaned(db: &DB) -> error::Result<()> {
-    let result = sqlx::query_scalar!(
-        "DELETE FROM job_perms
-WHERE job_id NOT IN (SELECT id FROM v2_job_queue)
-RETURNING job_id"
-    )
-    .fetch_all(db)
-    .await?;
+// Per-statement cap keeps each delete short and lock-light; the per-cycle batch
+// cap bounds total work per monitor iteration so monitor_db stays responsive.
+// A large backlog drains across several iterations rather than one long delete.
+//
+// These sweeps anti-join the whole table to find orphans, so their cost tracks the heap's
+// physical size. job_perms / job_result_stream_v2 are high-churn (one row per job, deleted
+// here), so their bloat — not the query shape — is what makes the sweep slow. These sweeps run
+// every monitor cycle, but the bulk vacuuming_tables() runs only ~hourly, so dead tuples pile
+// up between bulk vacuums; each sweep VACUUMs its own table right after deleting (see below) to
+// keep the heap near the live working set. The outer `ctid IN (SELECT ... LIMIT)` is
+// deliberate: a `job_id IN (...)` rewrite adds a second scan/probe for the delete and
+// benchmarks slower, so don't "simplify" it.
+const ORPHAN_CLEANUP_BATCH_SIZE: u64 = 100_000;
+const ORPHAN_CLEANUP_MAX_BATCHES: usize = 10;
 
-    if !result.is_empty() {
-        tracing::info!("Cleaned up {} orphaned job_perms rows", result.len());
+// Reclaim the dead tuples a sweep just created so the next sweep's anti-join scans a lean heap
+// instead of a bloated one. Plain VACUUM (not FULL) only takes SHARE UPDATE EXCLUSIVE, so
+// concurrent reads/writes (every job create touches job_perms) keep running, and the visibility
+// map lets it skip unchanged pages so repeated runs are cheap. SKIP_LOCKED means HA replicas
+// don't pile up: one vacuums, the rest skip rather than queue behind it.
+async fn vacuum_after_sweep(db: &DB, table: &str) {
+    if let Err(e) = sqlx::query(&format!("VACUUM (SKIP_LOCKED) {table}"))
+        .execute(db)
+        .await
+    {
+        tracing::warn!("Error vacuuming {table} after orphan cleanup: {e:?}");
+    }
+}
+
+async fn cleanup_job_perms_orphaned(db: &DB) -> error::Result<()> {
+    let mut total: u64 = 0;
+    for _ in 0..ORPHAN_CLEANUP_MAX_BATCHES {
+        let count = sqlx::query!(
+            "DELETE FROM job_perms
+             WHERE ctid IN (
+                 SELECT jp.ctid FROM job_perms jp
+                 WHERE NOT EXISTS (SELECT 1 FROM v2_job_queue q WHERE q.id = jp.job_id)
+                 LIMIT 100000
+             )"
+        )
+        .execute(db)
+        .await?
+        .rows_affected();
+        total += count;
+        if count < ORPHAN_CLEANUP_BATCH_SIZE {
+            break;
+        }
+    }
+
+    if total > 0 {
+        tracing::info!("Cleaned up {total} orphaned job_perms rows");
+        vacuum_after_sweep(db, "job_perms").await;
     }
     Ok(())
 }
 
 async fn cleanup_job_result_stream_orphaned_jobs(db: &DB) -> error::Result<()> {
-    let result = sqlx::query!(
-        "DELETE FROM job_result_stream_v2
-         WHERE job_id NOT IN (SELECT id FROM v2_job_queue)
-           AND job_id NOT IN (
-               SELECT id FROM v2_job_completed
-               WHERE completed_at > NOW() - INTERVAL '60 seconds'
-           )
-         RETURNING job_id",
-    )
-    .fetch_all(db)
-    .await?;
+    let mut total: u64 = 0;
+    for _ in 0..ORPHAN_CLEANUP_MAX_BATCHES {
+        let count = sqlx::query!(
+            "DELETE FROM job_result_stream_v2
+             WHERE ctid IN (
+                 SELECT jrs.ctid FROM job_result_stream_v2 jrs
+                 WHERE NOT EXISTS (SELECT 1 FROM v2_job_queue q WHERE q.id = jrs.job_id)
+                   AND NOT EXISTS (
+                       SELECT 1 FROM v2_job_completed c
+                       WHERE c.id = jrs.job_id
+                         AND c.completed_at > NOW() - INTERVAL '60 seconds'
+                   )
+                 LIMIT 100000
+             )",
+        )
+        .execute(db)
+        .await?
+        .rows_affected();
+        total += count;
+        if count < ORPHAN_CLEANUP_BATCH_SIZE {
+            break;
+        }
+    }
 
-    if result.len() > 0 {
-        tracing::info!(
-            "Cleaned up {} orphaned job_result_stream_v2 rows",
-            result.len()
-        );
+    if total > 0 {
+        tracing::info!("Cleaned up {total} orphaned job_result_stream_v2 rows");
+        vacuum_after_sweep(db, "job_result_stream_v2").await;
     }
     Ok(())
 }
@@ -4417,11 +4638,19 @@ async fn audit_log_retention_days() -> i64 {
     }
 }
 
+/// Number of days ahead (including today) for which an audit partition must
+/// always exist. A missing partition in this window means audit inserts fail
+/// once that date is reached — and because some callers (notably login) write
+/// the audit row in the same transaction as their own work, that failure
+/// poisons the whole transaction, so a missing partition is a hard outage, not
+/// just a dropped audit row.
+const AUDIT_PARTITION_LOOKAHEAD_DAYS: i64 = 3;
+
 async fn manage_audit_partitions(db: &DB, retention_days: i64) {
     let today = chrono::Utc::now().date_naive();
 
-    // Create partitions for today and the next 3 days
-    for days_ahead in 0..=3i64 {
+    // Create partitions for today and the next few days
+    for days_ahead in 0..=AUDIT_PARTITION_LOOKAHEAD_DAYS {
         let date = today + chrono::Duration::days(days_ahead);
         let next_date = date + chrono::Duration::days(1);
         let partition_name = format!("audit_{}", date.format("%Y%m%d"));
@@ -4437,9 +4666,6 @@ async fn manage_audit_partitions(db: &DB, retention_days: i64) {
         }
     }
 
-    // Drop expired partitions
-    let cutoff_date = today - chrono::Duration::days(retention_days);
-
     let partitions = sqlx::query_scalar::<_, String>(
         "SELECT c.relname::text \
          FROM pg_inherits i \
@@ -4449,28 +4675,62 @@ async fn manage_audit_partitions(db: &DB, retention_days: i64) {
     .fetch_all(db)
     .await;
 
-    match partitions {
-        Ok(partitions) => {
-            for partition_name in partitions {
-                if let Some(date_str) = partition_name.strip_prefix("audit_") {
-                    if let Ok(date) = chrono::NaiveDate::parse_from_str(date_str, "%Y%m%d") {
-                        if date < cutoff_date {
-                            let quoted_name =
-                                format!("\"{}\"", partition_name.replace('"', "\"\""));
-                            let sql = format!("DROP TABLE IF EXISTS {quoted_name}");
-                            match sqlx::query(&sql).execute(db).await {
-                                Ok(_) => tracing::info!(
-                                    "Dropped expired audit partition {partition_name}"
-                                ),
-                                Err(e) => tracing::error!(
-                                    "Error dropping audit partition {partition_name}: {e:?}"
-                                ),
-                            }
+    let partitions = match partitions {
+        Ok(partitions) => partitions,
+        Err(e) => {
+            tracing::error!("Error listing audit partitions: {e:?}");
+            return;
+        }
+    };
+
+    // Verify the lookahead window is actually covered. If a create above failed
+    // (or this loop has not run for several days), alert loudly instead of
+    // letting it surface days later as failed audit inserts and broken logins.
+    let existing: std::collections::HashSet<&str> = partitions.iter().map(|s| s.as_str()).collect();
+    let missing: Vec<String> = (0..=AUDIT_PARTITION_LOOKAHEAD_DAYS)
+        .map(|days_ahead| {
+            format!(
+                "audit_{}",
+                (today + chrono::Duration::days(days_ahead)).format("%Y%m%d")
+            )
+        })
+        .filter(|name| !existing.contains(name.as_str()))
+        .collect();
+    if !missing.is_empty() {
+        report_critical_error(
+            format!(
+                "Audit log partitions missing after maintenance run: {}. \
+                 Audit inserts will fail once these dates are reached, which also \
+                 breaks logins (the login audit row shares the login transaction). \
+                 Check for earlier 'Error creating audit partition' logs and verify \
+                 the audit-partition maintenance loop is still running.",
+                missing.join(", ")
+            ),
+            db.clone(),
+            None,
+            None,
+        )
+        .await;
+    }
+
+    // Drop expired partitions
+    let cutoff_date = today - chrono::Duration::days(retention_days);
+    for partition_name in &partitions {
+        if let Some(date_str) = partition_name.strip_prefix("audit_") {
+            if let Ok(date) = chrono::NaiveDate::parse_from_str(date_str, "%Y%m%d") {
+                if date < cutoff_date {
+                    let quoted_name = format!("\"{}\"", partition_name.replace('"', "\"\""));
+                    let sql = format!("DROP TABLE IF EXISTS {quoted_name}");
+                    match sqlx::query(&sql).execute(db).await {
+                        Ok(_) => {
+                            tracing::info!("Dropped expired audit partition {partition_name}")
                         }
+                        Err(e) => tracing::error!(
+                            "Error dropping audit partition {partition_name}: {e:?}"
+                        ),
                     }
                 }
             }
         }
-        Err(e) => tracing::error!("Error listing audit partitions: {e:?}"),
     }
 }
diff --git a/backend/summarized_schema.txt b/backend/summarized_schema.txt
index 3c88f16d0c..ccd46a9310 100644
--- a/backend/summarized_schema.txt
+++ b/backend/summarized_schema.txt
@@ -117,6 +117,10 @@ kafka_pending_commits: id(bigint), workspace_id(char), kafka_trigger_path(char),
   FK: (workspace_id, kafka_trigger_path) -> kafka_trigger(workspace_id, path)
 kafka_trigger: path(char), kafka_resource_path(char), topics(char), group_id(char), script_path(char), is_flow(bool), workspace_id(char), edited_by(char), email(char), edited_at(ts), extra_perms(jsonb), server_id(char), last_server_ping(ts), error(text), error_handler_path(char), error_handler_args(jsonb), retry(jsonb), mode(trigger_mode), filters(jsonb[]), auto_commit(bool), labels(text[])
 log_file: hostname(char), log_ts(ts), ok_lines(bigint), err_lines(bigint), mode(log_mode), worker_group(char), file_path(char), json_fmt(bool)
+macro_definition: workspace_id(char), name(char), provider_path(char), params(text), body(text), is_table_macro(bool), created_at(ts)
+  FK: (workspace_id) -> workspace(id)
+macro_usage: workspace_id(char), consumer_path(char), macro_name(char)
+  FK: (workspace_id) -> workspace(id)
 magic_link: email(char), token(char), expiration(ts)
 mcp_oauth_client: mcp_server_url(text), client_id(text), client_secret(text), client_secret_expires_at(ts), token_endpoint(text), created_at(ts)
 mcp_oauth_refresh_token: id(bigint), refresh_token(char), access_token_hash(char), client_id(char), user_email(char), workspace_id(char), scopes(text[]), token_family(uuid), created_at(ts), expires_at(ts), used_at(ts), revoked(bool)
@@ -184,7 +188,7 @@ windmill_migrations: name(text), created_at(ts)
 worker_group_job_stats: hour(bigint), worker_group(text), script_lang(char), workspace_id(char), job_count(int), total_duration_ms(bigint)
   FK: (workspace_id) -> workspace(id)
 worker_ping: worker(char), worker_instance(char), ping_at(ts), started_at(ts), ip(char), jobs_executed(int), custom_tags(text[]), worker_group(char), dedicated_worker(char), wm_version(char), current_job_id(uuid), current_job_workspace_id(char), vcpus(bigint), memory(bigint), occupancy_rate(float), memory_usage(bigint), wm_memory_usage(bigint), occupancy_rate_15s(float), occupancy_rate_5m(float), occupancy_rate_30m(float), job_isolation(text), dedicated_workers(text[])
-workspace: id(char), name(char), owner(char), deleted(bool), premium(bool), parent_workspace_id(char)
+workspace: id(char), name(char), owner(char), deleted(bool), premium(bool), parent_workspace_id(char), is_dev_workspace(bool)
   FK: (parent_workspace_id) -> workspace(id)
 workspace_dependencies: id(bigint), name(char), content(text), language(script_lang), description(text), archived(bool), workspace_id(char), created_at(ts)
 workspace_diff: source_workspace_id(char), fork_workspace_id(char), path(char), kind(char), ahead(int), behind(int), has_changes(bool), exists_in_source(bool), exists_in_fork(bool)
diff --git a/backend/tests/asset_trigger_dispatch.rs b/backend/tests/asset_trigger_dispatch.rs
index e79937f702..7184d4810d 100644
--- a/backend/tests/asset_trigger_dispatch.rs
+++ b/backend/tests/asset_trigger_dispatch.rs
@@ -54,6 +54,14 @@ async fn seed_script(
     .bind(language)
     .execute(db)
     .await?;
+    // These tests use #[sqlx::test] isolated DBs that share one workspace id and
+    // reuse script paths, while the same path is seeded with different content
+    // (hence different hashes) across tests. The process-global deployed-script
+    // caches are keyed by (workspace, path)/(workspace, hash), so a concurrent
+    // test resolves a path to a hash that lives in another test's DB and the
+    // dispatch 404s. Disable them so every resolution reads the test's own DB.
+    windmill_common::DEPLOYED_SCRIPT_CACHE_DISABLED
+        .store(true, std::sync::atomic::Ordering::Relaxed);
     Ok(h)
 }
 
@@ -392,14 +400,44 @@ async fn end_to_end_asset_dispatch(db: Pool<Postgres>) -> anyhow::Result<()> {
         );
     }
 
-    // producer with parent_job (flow step) is ineligible
+    // flow step (carries flow_step_id) is ineligible
     clear_dispatched(&db).await?;
     let id = seed_producer_job(&db, json!({})).await?;
     let mut mini = make_mini(id, PRODUCER);
-    mini.parent_job = Some(Uuid::new_v4());
+    mini.flow_step_id = Some("a".to_string());
     let r = dispatch_asset_triggers(&db, &mini).await;
     assert_eq!(r.dispatched.len(), 0, "flow step producer ineligible");
 
+    // A native retry attempt has a native_retry_attempt marker — it stays eligible,
+    // so a subscriber that recovers on retry still cascades.
+    clear_dispatched(&db).await?;
+    let id = seed_producer_job(&db, json!({})).await?;
+    sqlx::query("INSERT INTO native_retry_attempt (job_id, attempt) VALUES ($1, 1)")
+        .bind(id)
+        .execute(&db)
+        .await?;
+    let mut mini = make_mini(id, PRODUCER);
+    mini.parent_job = Some(Uuid::new_v4());
+    let r = dispatch_asset_triggers(&db, &mini).await;
+    assert_eq!(
+        r.dispatched.len(),
+        2,
+        "native retry attempt (marked) still dispatches"
+    );
+
+    // A parented Script child WITHOUT the marker — a schedule handler or a WAC
+    // inline child (which re-runs the same runnable) — must NOT cascade.
+    clear_dispatched(&db).await?;
+    let id = seed_producer_job(&db, json!({})).await?;
+    let mut mini = make_mini(id, PRODUCER);
+    mini.parent_job = Some(Uuid::new_v4()); // no marker => not a retry
+    let r = dispatch_asset_triggers(&db, &mini).await;
+    assert_eq!(
+        r.dispatched.len(),
+        0,
+        "parented child without the marker (handler/WAC inline) does not cascade"
+    );
+
     // producer with kind=Flow is ineligible
     let id = seed_producer_job(&db, json!({})).await?;
     let mut mini = make_mini(id, PRODUCER);
@@ -640,13 +678,13 @@ async fn debounce_setting_applied_to_dispatched_subscriber(
     Ok(())
 }
 
-/// `// retry <n> [<delay>]` opts the subscriber into the flow-runtime retry
-/// path. Implementation-wise, the dispatcher wraps the script in a one-step
-/// flow (`JobPayload::SingleStepFlow`) so the existing flow retry machinery
-/// handles re-runs. Subscribers without retry continue to be pushed as
-/// `JobKind::Script` (no wrapping).
+/// `// retry <n> [<delay>]` opts the subscriber into native retry: the
+/// dispatcher pushes a real `JobKind::Script` (not a one-step flow) carrying
+/// the policy in its `runnable_settings_handle`, so a failed subscriber re-runs
+/// natively and stays eligible to trigger its own downstream. Subscribers
+/// without retry are pushed as a plain `Script` with no settings handle.
 #[sqlx::test(fixtures("base"))]
-async fn retry_setting_wraps_dispatched_subscriber_as_flow(
+async fn retry_setting_dispatches_subscriber_as_native_script(
     db: Pool<Postgres>,
 ) -> anyhow::Result<()> {
     initialize_tracing().await;
@@ -654,8 +692,8 @@ async fn retry_setting_wraps_dispatched_subscriber_as_flow(
     seed_script(&db, SUB_S3, "echo retrying", "bash").await?;
     seed_script(&db, SUB_RES, "echo plain", "bash").await?;
     seed_asset_write(&db, PRODUCER, "s3object", "f/blob").await?;
-    // Retry policy on the s3 edge; res edge stays vanilla so we also assert
-    // the "no retry" path keeps the cheaper ScriptHash push.
+    // Retry policy on the s3 edge; res edge stays vanilla so we also assert the
+    // "no retry" path carries no settings handle.
     seed_subscription_with_retry(&db, SUB_S3, "s3://f/blob", 3, 5).await?;
     seed_subscription(&db, SUB_RES, "script", "s3://f/blob").await?;
 
@@ -663,37 +701,46 @@ async fn retry_setting_wraps_dispatched_subscriber_as_flow(
     let r = dispatch_asset_triggers(&db, &make_mini(id, PRODUCER)).await;
     assert_eq!(r.dispatched.len(), 2, "both subscribers dispatched");
 
-    let kinds: Vec<(String, String)> = sqlx::query!(
-        r#"SELECT runnable_path AS "runnable_path!", kind::text AS "kind!"
-             FROM v2_job
-             WHERE workspace_id = $1 AND trigger_kind = 'asset'
-             ORDER BY runnable_path"#,
+    let rows: Vec<(String, String, Option<i64>)> = sqlx::query!(
+        r#"SELECT j.runnable_path AS "runnable_path!", j.kind::text AS "kind!",
+                  q.runnable_settings_handle
+             FROM v2_job j JOIN v2_job_queue q ON q.id = j.id
+             WHERE j.workspace_id = $1 AND j.trigger_kind = 'asset'
+             ORDER BY j.runnable_path"#,
         WS,
     )
     .fetch_all(&db)
     .await?
     .into_iter()
-    .map(|r| (r.runnable_path, r.kind))
+    .map(|r| (r.runnable_path, r.kind, r.runnable_settings_handle))
     .collect();
 
-    let s3_kind = kinds
+    let s3 = rows
         .iter()
-        .find(|(p, _)| p == SUB_S3)
-        .map(|(_, k)| k.as_str())
-        .unwrap_or("");
-    let res_kind = kinds
+        .find(|(p, _, _)| p == SUB_S3)
+        .expect("s3 dispatched");
+    let res = rows
         .iter()
-        .find(|(p, _)| p == SUB_RES)
-        .map(|(_, k)| k.as_str())
-        .unwrap_or("");
+        .find(|(p, _, _)| p == SUB_RES)
+        .expect("res dispatched");
 
+    // Native retry: a real Script (not a SingleStepFlow), with the policy in the
+    // runnable_settings_handle.
     assert_eq!(
-        s3_kind, "singlestepflow",
-        "retry-bearing subscriber wraps as SingleStepFlow so flow-runtime retry kicks in"
+        s3.1, "script",
+        "retry subscriber dispatched as a native Script"
+    );
+    assert!(
+        s3.2.is_some(),
+        "retry subscriber carries a runnable_settings_handle (the retry policy)"
     );
     assert_eq!(
-        res_kind, "script",
-        "no-retry subscriber stays as the cheaper ScriptHash push"
+        res.1, "script",
+        "no-retry subscriber stays a plain ScriptHash push"
+    );
+    assert!(
+        res.2.is_none(),
+        "no-retry subscriber carries no settings handle"
     );
 
     Ok(())
@@ -997,3 +1044,132 @@ async fn reaper_clears_only_stale_join_slots(db: Pool<Postgres>) -> anyhow::Resu
 
     Ok(())
 }
+
+/// Seed one `materialized_partition` row (the state a managed `// materialize`
+/// write records) so dispatch has a snapshot to look up.
+async fn seed_materialization(
+    db: &Pool<Postgres>,
+    kind: &str,
+    asset_path: &str,
+    partition: &str,
+    status: &str,
+    snapshot_id: Option<i64>,
+) -> anyhow::Result<()> {
+    sqlx::query(
+        r#"INSERT INTO materialized_partition
+             (workspace_id, asset_kind, asset_path, partition, status, snapshot_id)
+           VALUES ($1, $2::asset_kind, $3, $4, $5::materialization_status, $6)"#,
+    )
+    .bind(WS)
+    .bind(kind)
+    .bind(asset_path)
+    .bind(partition)
+    .bind(status)
+    .bind(snapshot_id)
+    .execute(db)
+    .await?;
+    Ok(())
+}
+
+/// Dispatch records, on the consumer's `trigger` arg, the latest captured
+/// materialization snapshot of each of its direct upstream assets
+/// (`upstream_snapshots`) — the forensic "what did this run see" record.
+/// Covered here:
+///   - latest = highest `snapshot_id` with status `materialized` (a stale
+///     partition and a failed/no-snapshot row are both passed over),
+///   - whole-table (sentinel '') upstreams omit `partition`,
+///   - upstreams with no captured snapshot produce no entry,
+///   - a consumer with no materialized upstream at all gets no
+///     `upstream_snapshots` key.
+#[sqlx::test(fixtures("base"))]
+async fn upstream_snapshots_recorded_on_dispatch(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    seed_script(&db, SUB_S3, "echo lake consumer", "bash").await?;
+    seed_script(&db, SUB_RES, "echo raw consumer", "bash").await?;
+    seed_asset_write(&db, PRODUCER, "ducklake", "analytics/orders").await?;
+    seed_asset_write(&db, PRODUCER, "s3object", "f/raw").await?;
+
+    // SUB_S3's direct upstream set: the firing ducklake asset, a second
+    // materialized ducklake dimension (written by some other producer), and a
+    // plain s3 object that is never materialized.
+    seed_subscription(&db, SUB_S3, "script", "ducklake://analytics/orders").await?;
+    seed_subscription(&db, SUB_S3, "script", "ducklake://analytics/customers").await?;
+    seed_subscription(&db, SUB_S3, "script", "s3://f/raw").await?;
+    // SUB_RES subscribes only to the raw (non-materialized) asset.
+    seed_subscription(&db, SUB_RES, "script", "s3://f/raw").await?;
+
+    // orders: an older partition, the latest one, and a failed slice with no
+    // snapshot — only 2026-06-19 @ 42 must be recorded.
+    seed_materialization(
+        &db,
+        "ducklake",
+        "analytics/orders",
+        "2026-06-18",
+        "materialized",
+        Some(41),
+    )
+    .await?;
+    seed_materialization(
+        &db,
+        "ducklake",
+        "analytics/orders",
+        "2026-06-19",
+        "materialized",
+        Some(42),
+    )
+    .await?;
+    seed_materialization(
+        &db,
+        "ducklake",
+        "analytics/orders",
+        "2026-06-20",
+        "failed",
+        None,
+    )
+    .await?;
+    // customers: unpartitioned (sentinel '') → entry without `partition`.
+    seed_materialization(
+        &db,
+        "ducklake",
+        "analytics/customers",
+        "",
+        "materialized",
+        Some(7),
+    )
+    .await?;
+
+    let id = seed_producer_job(&db, json!({})).await?;
+    let r = dispatch_asset_triggers(&db, &make_mini(id, PRODUCER)).await;
+    assert_eq!(
+        r.dispatched.len(),
+        3,
+        "SUB_S3 fired for both written assets, SUB_RES for the raw one"
+    );
+
+    let expected_snaps = json!([
+        { "asset": "ducklake://analytics/customers", "snapshot_id": 7 },
+        { "asset": "ducklake://analytics/orders", "snapshot_id": 42, "partition": "2026-06-19" },
+    ]);
+    for (path, _, args) in fetch_dispatched(&db).await? {
+        let trigger = args
+            .as_ref()
+            .and_then(|a| a.get("trigger"))
+            .cloned()
+            .expect("dispatched job carries a trigger arg");
+        match path.as_str() {
+            SUB_S3 => assert_eq!(
+                trigger.get("upstream_snapshots"),
+                Some(&expected_snaps),
+                "latest materialized snapshot per upstream, sorted by ref, raw asset absent"
+            ),
+            SUB_RES => assert!(
+                trigger.get("upstream_snapshots").is_none(),
+                "no materialized upstream → no upstream_snapshots key"
+            ),
+            other => panic!("unexpected dispatched path {other}"),
+        }
+    }
+
+    Ok(())
+}
diff --git a/backend/tests/batch_rerun.rs b/backend/tests/batch_rerun.rs
index b750379834..b1708465f9 100644
--- a/backend/tests/batch_rerun.rs
+++ b/backend/tests/batch_rerun.rs
@@ -71,6 +71,7 @@ fn ssf_script_payload(hash: Option<ScriptHash>, retry: Option<Retry>) -> JobPayl
         path: SCRIPT_PATH.to_string(),
         hash,
         flow_version: None,
+        language: None,
         args: Default::default(),
         retry,
         error_handler_path: None,
@@ -92,6 +93,7 @@ fn ssf_flow_payload() -> JobPayload {
         path: FLOW_PATH.to_string(),
         hash: None,
         flow_version: Some(FLOW_VERSION),
+        language: None,
         args: Default::default(),
         retry: None,
         error_handler_path: None,
diff --git a/backend/tests/bun_jobs.rs b/backend/tests/bun_jobs.rs
index d51e51f58b..fc766253bc 100644
--- a/backend/tests/bun_jobs.rs
+++ b/backend/tests/bun_jobs.rs
@@ -1,3 +1,4 @@
+use futures::StreamExt;
 use sqlx::postgres::Postgres;
 use sqlx::Pool;
 use uuid::Uuid;
@@ -818,6 +819,126 @@ export function main() {
     Ok(())
 }
 
+// ============================================================================
+// Bundle cache invalidation on transitive relative-import change
+// ============================================================================
+
+async fn insert_deployed_bun_script(db: &Pool<Postgres>, path: &str, hash: i64, content: &str) {
+    // What gen_bun_lockfile stores for a script with no npm dependencies; a
+    // bare '' lock fails split_lockfile when the script is run directly.
+    const EMPTY_BUN_LOCK: &str = "{\n  \"dependencies\": {}\n}\n//bun.lock\n<empty>";
+    // Runtime query to avoid touching the sqlx offline cache.
+    sqlx::query(
+        "INSERT INTO script (workspace_id, created_by, content, schema, summary, description, path, hash, language, lock)
+         VALUES ('test-workspace', 'test-user', $1, '{\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"properties\":{},\"required\":[],\"type\":\"object\"}', '', '', $2, $3, 'bun', $4)",
+    )
+    .bind(content)
+    .bind(path)
+    .bind(hash)
+    .bind(EMPTY_BUN_LOCK)
+    .execute(db)
+    .await
+    .unwrap();
+}
+
+fn run_main_script_job(hash: i64) -> RunJob {
+    RunJob::from(JobPayload::ScriptHash {
+        path: "f/stale_bundle/main_script".to_string(),
+        hash: windmill_common::scripts::ScriptHash(hash),
+        cache_ttl: None,
+        cache_ignore_s3_path: None,
+        dedicated_worker: None,
+        language: ScriptLang::Bun,
+        priority: None,
+        apply_preprocessor: false,
+        concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default(),
+        debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
+        labels: None,
+    })
+}
+
+/// Editing a script that a runnable imports only TRANSITIVELY (main -> mid ->
+/// leaf) must invalidate the runnable's cached bundle: the leaf's code is
+/// inlined in the bundle, so the cache key has to cover the whole closure, not
+/// just direct imports.
+#[sqlx::test(fixtures("base"))]
+async fn test_bun_transitive_import_change_rebundles(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+
+    // Hashes/paths unique across this test binary: the script/hash caches are
+    // process-global while parallel tests each run in their own DB.
+    const LEAF_V1: i64 = 41230001;
+    const MID: i64 = 41230002;
+    const MAIN: i64 = 41230003;
+    const LEAF_V2: i64 = 41230004;
+
+    insert_deployed_bun_script(
+        &db,
+        "f/stale_bundle/leaf",
+        LEAF_V1,
+        r#"export function leafValue() { return "V1_FROM_LEAF"; }"#,
+    )
+    .await;
+    insert_deployed_bun_script(
+        &db,
+        "f/stale_bundle/mid",
+        MID,
+        r#"import { leafValue } from "./leaf";
+export function midValue() { return `M(${leafValue()})`; }"#,
+    )
+    .await;
+    insert_deployed_bun_script(
+        &db,
+        "f/stale_bundle/main_script",
+        MAIN,
+        r#"import { midValue } from "./mid";
+export function main() { return midValue(); }"#,
+    )
+    .await;
+
+    let mut completed = listen_for_completed_jobs(&db).await;
+    let db2 = db.clone();
+    in_test_worker(
+        &db,
+        async move {
+            let job = run_main_script_job(MAIN).push(&db2).await;
+            completed.next().await;
+            let result = completed_job(job, &db2).await.json_result().unwrap();
+            assert_eq!(result, serde_json::json!("M(V1_FROM_LEAF)"));
+
+            // Deploy a new version of ONLY the leaf; main_script and mid keep
+            // their hash, content, and lock byte-identical.
+            insert_deployed_bun_script(
+                &db2,
+                "f/stale_bundle/leaf",
+                LEAF_V2,
+                r#"export function leafValue() { return "V2_FROM_LEAF"; }"#,
+            )
+            .await;
+
+            // Tests don't run the notify_event poll loop, so replay what its
+            // `notify_runnable_version_change` handler (main.rs) does on deploy:
+            // evict the leaf's latest-hash cache entries.
+            windmill_common::IMPORTED_SCRIPT_HASH_CACHE.remove(&(
+                "test-workspace".to_string(),
+                "f/stale_bundle/leaf".to_string(),
+            ));
+            windmill_api_scripts::scripts::RAW_SCRIPT_LATEST_HASH_CACHE
+                .remove(&format!("test-workspace:f/stale_bundle/leaf"));
+
+            let job = run_main_script_job(MAIN).push(&db2).await;
+            completed.next().await;
+            let result = completed_job(job, &db2).await.json_result().unwrap();
+            assert_eq!(result, serde_json::json!("M(V2_FROM_LEAF)"));
+        },
+        port,
+    )
+    .await;
+    Ok(())
+}
+
 #[sqlx::test(fixtures("base", "bun_edge_cases"))]
 async fn test_bun_shared_imports_both_styles(db: Pool<Postgres>) -> anyhow::Result<()> {
     initialize_tracing().await;
diff --git a/backend/tests/debounce_e2e.rs b/backend/tests/debounce_e2e.rs
new file mode 100644
index 0000000000..9a2351f135
--- /dev/null
+++ b/backend/tests/debounce_e2e.rs
@@ -0,0 +1,112 @@
+// End-to-end debounce test: drives the FULL real path — real `push()` (EE
+// `maybe_debounce` collapsing the batch), real `pull()`, real
+// `maybe_apply_debouncing` (claim + accumulate), and a real worker executing the
+// surviving flow — then asserts the executed result contains every accumulated item.
+// Runs on --features deno_core,enterprise,private (debounce is EE/compile-gated).
+#[cfg(all(feature = "deno_core", feature = "enterprise", feature = "private"))]
+mod debounce_e2e {
+    use serde_json::json;
+    use sqlx::{Pool, Postgres};
+    use uuid::Uuid;
+    use windmill_common::flows::FlowValue;
+    use windmill_common::jobs::JobPayload;
+    use windmill_common::worker::Connection;
+    use windmill_test_utils::*;
+
+    async fn initialize_tracing() {
+        use std::sync::Once;
+        static ONCE: Once = Once::new();
+        ONCE.call_once(|| {
+            let _ = windmill_common::tracing_init::initialize_tracing(
+                "test",
+                &windmill_common::utils::Mode::Standalone,
+                "test",
+            );
+        });
+    }
+
+    /// A one-step flow that debounces on `items` and returns `flow_input.items`,
+    /// so the flow's result is exactly the accumulated batch.
+    fn debounce_flow() -> FlowValue {
+        serde_json::from_value(json!({
+            "modules": [{
+                "id": "a",
+                "value": {
+                    "type": "rawscript",
+                    "language": "deno",
+                    "content": "export async function main(items: any[]) { return items }",
+                    "input_transforms": {
+                        "items": { "type": "javascript", "expr": "flow_input.items" }
+                    }
+                }
+            }],
+            "debounce_delay_s": 1,
+            "debounce_key": "e2e_debounce_key",
+            "debounce_args_to_accumulate": ["items"]
+        }))
+        .expect("valid flow value")
+    }
+
+    /// Fire three same-key messages; only the survivor runs, and it must execute once
+    /// with ALL accumulated items (none dropped, none duplicated).
+    #[sqlx::test(fixtures("base"))]
+    async fn debounce_accumulation_runs_once_with_all_items(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        initialize_tracing().await;
+        let server = ApiServer::start(db.clone()).await?;
+        let port = server.addr.port();
+
+        // Push 3 debounced flow jobs (same key) — each collapses the previous; the last
+        // is the survivor. scheduled_for is ~1s out, so all 3 land before any worker pull.
+        let mut survivor = Uuid::nil();
+        let mut superseded = Vec::new();
+        for n in [1i64, 2, 3] {
+            if survivor != Uuid::nil() {
+                superseded.push(survivor);
+            }
+            survivor = RunJob::from(JobPayload::RawFlow {
+                value: debounce_flow(),
+                path: None,
+                restarted_from: None,
+            })
+            .arg("items", json!([n]))
+            .push(&db)
+            .await;
+        }
+
+        // Run a real worker until the survivor completes.
+        let listener = listen_for_completed_jobs(&db).await;
+        in_test_worker(Connection::Sql(db.clone()), listener.find(&survivor), port).await;
+
+        let cj = completed_job(survivor, &db).await;
+        assert!(cj.success, "survivor flow must succeed");
+        let mut result: Vec<i64> =
+            serde_json::from_value(cj.json_result().expect("result present"))
+                .expect("result is an array of numbers");
+        result.sort();
+        assert_eq!(
+            result,
+            vec![1, 2, 3],
+            "survivor must execute exactly once with ALL accumulated items"
+        );
+
+        // The two superseded messages must have been debounced (skipped), not run.
+        // (use a lightweight status query — skipped jobs have NULL started_at, which the
+        // full CompletedJob row decoder rejects)
+        for s in superseded {
+            let skipped: Option<bool> =
+                sqlx::query_scalar("SELECT status = 'skipped' FROM v2_job_completed WHERE id = $1")
+                    .bind(s)
+                    .fetch_optional(&db)
+                    .await?;
+            assert_eq!(
+                skipped,
+                Some(true),
+                "superseded message {s} must be debounced (skipped), not executed"
+            );
+        }
+
+        Ok(())
+    }
+}
diff --git a/backend/tests/fixtures/jobs_read_auth.sql b/backend/tests/fixtures/jobs_read_auth.sql
index e6b28fba0c..456ac8c801 100644
--- a/backend/tests/fixtures/jobs_read_auth.sql
+++ b/backend/tests/fixtures/jobs_read_auth.sql
@@ -19,6 +19,45 @@ INSERT INTO token(token_hash, token_prefix, token, email, label, super_admin, sc
     ARRAY['jobs:read', 'if_jobs:filter_tags:deno']
 );
 
+-- App embed token for the admin viewer (test-user). Mirrors a minted sandboxed
+-- low-code app token: carries the `app_embed` sentinel plus the embed scope set.
+-- Used to assert the token is confined to jobs the viewer LAUNCHED, not every job
+-- the (admin) viewer could otherwise read.
+INSERT INTO token(token_hash, token_prefix, token, email, label, super_admin, scopes) VALUES (
+    encode(sha256('EMBED_APP_TOKEN'::bytea), 'hex'), 'EMBED_APP_', 'EMBED_APP_TOKEN',
+    'test@windmill.dev', 'app embed token', false,
+    ARRAY['apps:run', 'jobs:read', 'app_embed', 'resources:run', 'users:read', 'folders:read']
+);
+
+-- A completed app-component job LAUNCHED BY the admin viewer (created_by =
+-- test-user), running as the app owner. The embed token must keep reading its own
+-- launched job (the `created_by == viewer` fast path).
+INSERT INTO public.v2_job (
+    id, workspace_id, created_by, created_at, permissioned_as, permissioned_as_email,
+    kind, script_lang, runnable_path, tag, visible_to_owner, args
+) VALUES (
+    '12121212-1212-1212-1212-121212121212', 'test-workspace', 'test-user',
+    '2023-01-01 00:00:00', 'u/test-user-2', 'test2@windmill.dev',
+    'script', 'deno', 'u/test-user-2/app_component', 'deno', false,
+    '{"own": "arg"}'
+);
+INSERT INTO public.v2_job_completed (id, workspace_id, duration_ms, status, result) VALUES
+    ('12121212-1212-1212-1212-121212121212', 'test-workspace', 1000, 'success'::job_status,
+     '{"own": "EMBED_OWN_RESULT"}');
+
+-- A QUEUED job launched by the admin embed viewer (created_by = test-user). The
+-- embed token may cancel its own launched job; it must NOT cancel another user's.
+INSERT INTO public.v2_job (
+    id, workspace_id, created_by, created_at, permissioned_as, permissioned_as_email,
+    kind, script_lang, runnable_path, tag, visible_to_owner
+) VALUES (
+    '13131313-1313-1313-1313-131313131313', 'test-workspace', 'test-user',
+    '2023-01-01 00:00:00', 'u/test-user-2', 'test2@windmill.dev',
+    'script', 'deno', 'u/test-user-2/app_component', 'deno', false
+);
+INSERT INTO public.v2_job_queue (id, workspace_id, scheduled_for, running, tag) VALUES
+    ('13131313-1313-1313-1313-131313131313', 'test-workspace', '2023-01-01 00:00:00', false, 'deno');
+
 -- RUNNING job: queued (no completed row) and owned by test-user-2. Used to check
 -- that `completed/get_result_maybe?get_started=true` authorizes before disclosing
 -- running-state to a non-reader.
diff --git a/backend/tests/freshness_watchdog.rs b/backend/tests/freshness_watchdog.rs
new file mode 100644
index 0000000000..17851d0a1e
--- /dev/null
+++ b/backend/tests/freshness_watchdog.rs
@@ -0,0 +1,294 @@
+//! End-to-end tests for the pipeline freshness watchdog (Enterprise).
+//!
+//! `windmill_queue::freshness_watchdog::tick` is called directly against
+//! seeded `script` / `v2_job(_completed)` rows — no worker or API server is
+//! needed, since the watchdog's job ends at the push (the pushed job sitting
+//! in `v2_job_queue` is itself part of the assertions). Covers: staleness on
+//! never-ran and aged-out members, the fresh short-circuit + state reset,
+//! the in-flight suppression, the backoff claim, and the skip rules
+//! (partitioned, malformed window, non-pipeline scripts).
+
+#![cfg(feature = "private")]
+
+use sqlx::{Pool, Postgres};
+use windmill_queue::freshness_watchdog::tick;
+use windmill_test_utils::initialize_tracing;
+
+const WS: &str = "test-workspace";
+const PATH: &str = "u/test-user/freshness_producer";
+
+/// Seed a deployed pipeline-member script. Mirrors the deploy path's output:
+/// `auto_kind = 'pipeline'`, empty (non-NULL) lock so run-by-path resolution
+/// treats it as deployed, hash derived from path+content for uniqueness.
+async fn seed_pipeline_script(
+    db: &Pool<Postgres>,
+    path: &str,
+    content: &str,
+) -> anyhow::Result<()> {
+    let mut h = 0i64;
+    for b in path.bytes().chain(content.bytes()) {
+        h = h.wrapping_mul(31).wrapping_add(b as i64);
+    }
+    sqlx::query(
+        r#"INSERT INTO script (workspace_id, hash, path, summary, description, content,
+                                created_by, language, tag, lock, auto_kind)
+           VALUES ($1, $2, $3, '', '', $4, 'test-user', 'bash'::script_lang, 'bash', '', 'pipeline')
+           ON CONFLICT DO NOTHING"#,
+    )
+    .bind(WS)
+    .bind(h)
+    .bind(path)
+    .bind(content)
+    .execute(db)
+    .await?;
+    // Process-global deployed-script caches are keyed by (workspace, path) /
+    // (workspace, hash) and would leak between #[sqlx::test] isolated DBs
+    // that reuse both — resolve everything from this test's own DB.
+    windmill_common::DEPLOYED_SCRIPT_CACHE_DISABLED
+        .store(true, std::sync::atomic::Ordering::Relaxed);
+    Ok(())
+}
+
+/// Seed a completed root run of `path` that finished `age_s` seconds ago.
+async fn seed_completed_run(
+    db: &Pool<Postgres>,
+    path: &str,
+    age_s: i64,
+    success: bool,
+) -> anyhow::Result<()> {
+    let id = uuid::Uuid::new_v4();
+    sqlx::query(
+        r#"INSERT INTO v2_job (id, workspace_id, runnable_path, kind, created_at,
+                                created_by, permissioned_as, permissioned_as_email, tag)
+           VALUES ($1, $2, $3, 'script'::job_kind,
+                   now() - ($4::bigint::text || ' seconds')::interval,
+                   'test-user', 'u/test-user', 'test@windmill.dev', 'bash')"#,
+    )
+    .bind(id)
+    .bind(WS)
+    .bind(path)
+    .bind(age_s)
+    .execute(db)
+    .await?;
+    sqlx::query(
+        r#"INSERT INTO v2_job_completed (id, workspace_id, duration_ms, status, started_at, completed_at)
+           VALUES ($1, $2, 0, CASE WHEN $3 THEN 'success'::job_status ELSE 'failure'::job_status END,
+                   now() - ($4::bigint::text || ' seconds')::interval,
+                   now() - ($4::bigint::text || ' seconds')::interval)"#,
+    )
+    .bind(id)
+    .bind(WS)
+    .bind(success)
+    .bind(age_s)
+    .execute(db)
+    .await?;
+    Ok(())
+}
+
+/// Jobs the watchdog pushed: (path, created_by, args) rows attributed to
+/// `trigger_kind = 'freshness'`.
+async fn fetch_pushed(
+    db: &Pool<Postgres>,
+) -> anyhow::Result<Vec<(String, String, Option<serde_json::Value>)>> {
+    let rows = sqlx::query!(
+        r#"SELECT runnable_path AS "runnable_path!", created_by AS "created_by!",
+                  args AS "args: sqlx::types::Json<serde_json::Value>"
+             FROM v2_job
+             WHERE workspace_id = $1 AND trigger_kind = 'freshness'
+             ORDER BY created_at"#,
+        WS,
+    )
+    .fetch_all(db)
+    .await?;
+    Ok(rows
+        .into_iter()
+        .map(|r| (r.runnable_path, r.created_by, r.args.map(|a| a.0)))
+        .collect())
+}
+
+async fn state_row(db: &Pool<Postgres>, path: &str) -> anyhow::Result<Option<i32>> {
+    Ok(sqlx::query_scalar!(
+        "SELECT attempts FROM pipeline_freshness_state WHERE workspace_id = $1 AND script_path = $2",
+        WS,
+        path,
+    )
+    .fetch_optional(db)
+    .await?)
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn never_ran_member_is_pushed_once(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    seed_pipeline_script(&db, PATH, "# pipeline\n# freshness 30s\necho hi\n").await?;
+
+    tick(&db).await;
+
+    let pushed = fetch_pushed(&db).await?;
+    assert_eq!(pushed.len(), 1, "one watchdog push expected");
+    let (path, created_by, args) = &pushed[0];
+    assert_eq!(path, PATH);
+    assert_eq!(created_by, &format!("freshness-{PATH}"));
+    let args = args.as_ref().expect("args recorded");
+    assert_eq!(
+        args.get("_wmill_skip_asset_dispatch"),
+        Some(&serde_json::json!(true)),
+        "watchdog runs must not re-fire the cascade"
+    );
+    assert_eq!(
+        args.pointer("/trigger/kind"),
+        Some(&serde_json::json!("freshness"))
+    );
+    assert_eq!(state_row(&db, PATH).await?, Some(1), "claim row recorded");
+
+    // Second tick: the pushed job is queued-and-due, so the in-flight guard
+    // suppresses a duplicate regardless of backoff.
+    tick(&db).await;
+    assert_eq!(
+        fetch_pushed(&db).await?.len(),
+        1,
+        "no duplicate while queued"
+    );
+
+    // Simulate the queued job vanishing without a completion: the backoff
+    // claim (next_attempt_at in the future) now carries the suppression.
+    sqlx::query!("DELETE FROM v2_job_queue WHERE workspace_id = $1", WS)
+        .execute(&db)
+        .await?;
+    tick(&db).await;
+    assert_eq!(fetch_pushed(&db).await?.len(), 1, "backoff holds the retry");
+
+    // Force the backoff window open: the watchdog retries and escalates.
+    sqlx::query!(
+        "UPDATE pipeline_freshness_state SET next_attempt_at = now() - interval '1 second'
+         WHERE workspace_id = $1 AND script_path = $2",
+        WS,
+        PATH,
+    )
+    .execute(&db)
+    .await?;
+    tick(&db).await;
+    assert_eq!(fetch_pushed(&db).await?.len(), 2, "due retry pushed");
+    assert_eq!(state_row(&db, PATH).await?, Some(2), "attempts escalated");
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn fresh_member_is_skipped_and_state_reset(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    seed_pipeline_script(&db, PATH, "# pipeline\n# freshness 1h\necho hi\n").await?;
+    seed_completed_run(&db, PATH, 10, true).await?;
+    // Leftover backoff row from an earlier staleness episode.
+    sqlx::query!(
+        "INSERT INTO pipeline_freshness_state (workspace_id, script_path, attempts) VALUES ($1, $2, 3)",
+        WS,
+        PATH,
+    )
+    .execute(&db)
+    .await?;
+
+    tick(&db).await;
+
+    assert!(
+        fetch_pushed(&db).await?.is_empty(),
+        "fresh member not pushed"
+    );
+    assert_eq!(state_row(&db, PATH).await?, None, "backoff reset on fresh");
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn aged_out_member_is_pushed(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    seed_pipeline_script(&db, PATH, "# pipeline\n# freshness 1h\necho hi\n").await?;
+    // Old success outside the window + a recent failure: still stale.
+    seed_completed_run(&db, PATH, 7200, true).await?;
+    seed_completed_run(&db, PATH, 60, false).await?;
+
+    tick(&db).await;
+
+    assert_eq!(fetch_pushed(&db).await?.len(), 1, "aged-out member pushed");
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn partitioned_malformed_and_plain_members_are_skipped(
+    db: Pool<Postgres>,
+) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    // Partitioned: freshness means partition-gap detection, out of scope.
+    seed_pipeline_script(
+        &db,
+        "u/test-user/partitioned",
+        "# pipeline\n# partitioned daily\n# freshness 1h\necho hi\n",
+    )
+    .await?;
+    // Malformed window: fails safe to unwatched.
+    seed_pipeline_script(
+        &db,
+        "u/test-user/malformed",
+        "# pipeline\n# freshness soonish\necho hi\n",
+    )
+    .await?;
+    // Freshness only in prose (parser must reject; ILIKE prefilter passes).
+    seed_pipeline_script(
+        &db,
+        "u/test-user/prose",
+        "# pipeline\n# ensure freshness of data below\necho hi\n",
+    )
+    .await?;
+
+    tick(&db).await;
+
+    assert!(fetch_pushed(&db).await?.is_empty(), "no member is watched");
+    let rows = sqlx::query_scalar!(
+        r#"SELECT COUNT(*) AS "count!" FROM pipeline_freshness_state WHERE workspace_id = $1"#,
+        WS,
+    )
+    .fetch_one(&db)
+    .await?;
+    assert_eq!(rows, 0, "no state rows for unwatched members");
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn archived_workspace_is_not_resurrected(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    // Workspace archival stops all execution but keeps script rows for
+    // unarchival — the watchdog must not keep pushing runs there.
+    seed_pipeline_script(&db, PATH, "# pipeline\n# freshness 30s\necho hi\n").await?;
+    sqlx::query!("UPDATE workspace SET deleted = true WHERE id = $1", WS)
+        .execute(&db)
+        .await?;
+
+    tick(&db).await;
+
+    assert!(
+        fetch_pushed(&db).await?.is_empty(),
+        "no pushes into an archived workspace"
+    );
+    assert_eq!(
+        state_row(&db, PATH).await?,
+        None,
+        "no state bookkeeping either"
+    );
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn state_of_unwatched_member_is_cleaned_up(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    // A stale-bookkeeping row whose script no longer declares freshness
+    // (e.g. annotation removed and redeployed) must not survive the sweep.
+    sqlx::query!(
+        "INSERT INTO pipeline_freshness_state (workspace_id, script_path) VALUES ($1, $2)",
+        WS,
+        "u/test-user/gone",
+    )
+    .execute(&db)
+    .await?;
+
+    tick(&db).await;
+
+    assert_eq!(state_row(&db, "u/test-user/gone").await?, None);
+    Ok(())
+}
diff --git a/backend/tests/jobs_read_auth.rs b/backend/tests/jobs_read_auth.rs
index f19daf0f92..1eab0bffee 100644
--- a/backend/tests/jobs_read_auth.rs
+++ b/backend/tests/jobs_read_auth.rs
@@ -38,6 +38,10 @@ const TOP_SECRET_FLOW: &str = "ffffffff-ffff-ffff-ffff-ffffffffffff";
 const DEEP_LEAF_JOB: &str = "88888888-8888-8888-8888-888888888888";
 // A queued/running job (no completed row) owned by test-user-2.
 const RUNNING_JOB: &str = "77777777-7777-7777-7777-777777777777";
+// An app-component job launched BY the admin embed viewer (created_by test-user).
+const EMBED_OWN_JOB: &str = "12121212-1212-1212-1212-121212121212";
+// A QUEUED job launched by the embed viewer (created_by test-user) — cancelable by it.
+const EMBED_OWN_QUEUED: &str = "13131313-1313-1313-1313-131313131313";
 
 // Secrets that must never leak to an unauthorized viewer.
 const RESULT_SECRET: &str = "RESULT_SECRET";
@@ -59,6 +63,19 @@ async fn get(base: &str, path: &str, token: Option<&str>) -> (reqwest::StatusCod
     (status, body)
 }
 
+async fn post(base: &str, path: &str, token: Option<&str>) -> (reqwest::StatusCode, String) {
+    let mut req = client()
+        .post(format!("{base}/{path}"))
+        .json(&serde_json::json!({}));
+    if let Some(token) = token {
+        req = req.header("Authorization", format!("Bearer {token}"));
+    }
+    let resp = req.send().await.expect("request");
+    let status = resp.status();
+    let body = resp.text().await.expect("body");
+    (status, body)
+}
+
 #[sqlx::test(fixtures("base", "jobs_read_auth"))]
 async fn test_single_job_read_authorization(db: Pool<Postgres>) -> anyhow::Result<()> {
     initialize_tracing().await;
@@ -88,6 +105,10 @@ async fn test_single_job_read_authorization(db: Pool<Postgres>) -> anyhow::Resul
             format!("get_completed_logs_tail/{VICTIM}"),
         ),
         ("get_flow_all_logs", format!("get_flow_all_logs/{VICTIM}")),
+        (
+            "get_flow_all_logs_structured",
+            format!("get_flow_all_logs_structured/{VICTIM}"),
+        ),
         (
             "completed/get_timing",
             format!("completed/get_timing/{VICTIM}"),
@@ -281,6 +302,75 @@ async fn test_single_job_read_authorization(db: Pool<Postgres>) -> anyhow::Resul
         "top flow in an unreadable folder must stay denied (got {status}): {body}"
     );
 
+    // ---- APP EMBED TOKEN: confined to jobs the viewer LAUNCHED, not everything
+    //      the (admin) viewer can otherwise read. The token carries the `app_embed`
+    //      sentinel; an admin's normal token reads VICTIM (asserted above), but the
+    //      embed token must stop at the `created_by == viewer` grant so user-authored
+    //      app JS can't reuse it to read unrelated jobs by UUID.
+    // Its own launched component job (created_by == viewer) still reads.
+    let (status, body) = get(
+        &base,
+        &format!("completed/get_result/{EMBED_OWN_JOB}"),
+        Some("EMBED_APP_TOKEN"),
+    )
+    .await;
+    assert!(
+        status.is_success(),
+        "embed token must read a job it launched (got {status}): {body}"
+    );
+    assert!(
+        body.contains("EMBED_OWN_RESULT"),
+        "embed token should get its own launched job result: {body}"
+    );
+    // The VICTIM job — created by another user but readable by this admin viewer's
+    // normal token (asserted above) — is denied to the embed token across result /
+    // logs / live update. NotFound (not 403) so the untrusted app can't even probe
+    // existence, and no secret leaks.
+    for path in [
+        format!("completed/get_result/{VICTIM}"),
+        format!("get_logs/{VICTIM}"),
+        format!("getupdate/{VICTIM}?only_result=true"),
+    ] {
+        let (status, body) = get(&base, &path, Some("EMBED_APP_TOKEN")).await;
+        assert_eq!(
+            status,
+            reqwest::StatusCode::NOT_FOUND,
+            "embed token must not read a job it did not launch ({path}, got {status}): {body}"
+        );
+        for secret in [RESULT_SECRET, ARGS_SECRET, LOGS_SECRET] {
+            assert!(
+                !body.contains(secret),
+                "embed token response for {path} leaked `{secret}`: {body}"
+            );
+        }
+    }
+
+    // ---- APP EMBED TOKEN: cancellation confined to the app's own jobs. The token
+    //      may cancel a job it launched (created_by == viewer), but `cancel_job_api`
+    //      denies (NotFound) a job created by someone else, even though cancel
+    //      otherwise has no per-job ownership check.
+    let (status, body) = post(
+        &base,
+        &format!("queue/cancel/{EMBED_OWN_QUEUED}"),
+        Some("EMBED_APP_TOKEN"),
+    )
+    .await;
+    assert!(
+        status.is_success(),
+        "embed token must cancel a job it launched (got {status}): {body}"
+    );
+    let (status, body) = post(
+        &base,
+        &format!("queue/cancel/{RUNNING_JOB}"),
+        Some("EMBED_APP_TOKEN"),
+    )
+    .await;
+    assert_eq!(
+        status,
+        reqwest::StatusCode::NOT_FOUND,
+        "embed token must not cancel another user's job (got {status}): {body}"
+    );
+
     // ---- UNAUTHENTICATED, unchanged: an anonymous-created job is readable
     //      without a token (public trigger / public app result polling).
     let (status, body) = get(&base, &format!("completed/get_result/{ANON_JOB}"), None).await;
diff --git a/backend/tests/preserve_on_behalf_of.rs b/backend/tests/preserve_on_behalf_of.rs
index 7ed5fc7697..d808348937 100644
--- a/backend/tests/preserve_on_behalf_of.rs
+++ b/backend/tests/preserve_on_behalf_of.rs
@@ -2704,7 +2704,9 @@ async fn test_schedule_permissions_workspace_admin(db: Pool<Postgres>) -> anyhow
     Ok(())
 }
 
-/// Superadmin NOT in workspace creates a schedule — uses email as permissioned_as
+/// Superadmin NOT in workspace creates a schedule — uses their instance-derived
+/// username (`password.username`) as permissioned_as, not the raw email. The
+/// email is still stored directly on the schedule for downstream resolution.
 #[sqlx::test(fixtures("preserve_on_behalf_of"))]
 async fn test_schedule_permissions_superadmin_not_in_workspace(
     db: Pool<Postgres>,
@@ -2758,16 +2760,16 @@ async fn test_schedule_permissions_superadmin_not_in_workspace(
     .fetch_one(&db)
     .await?;
 
-    // Superadmin not in workspace: username_to_permissioned_as uses the email directly
-    // since the authed username for a superadmin not in workspace IS the email
+    // Superadmin not in workspace: the authed username is now their instance-derived
+    // username (`password.username` = 'superadmin-external'), so permissioned_as is
+    // `u/<derived>` rather than the raw email. The email is still stored directly.
     assert_eq!(
         schedule.email, "superadmin-external@windmill.dev",
         "schedule email should be superadmin email"
     );
     assert_eq!(
-        schedule.permissioned_as,
-        schedule.email.clone(),
-        "permissioned_as should match email for superadmin not in workspace"
+        schedule.permissioned_as, "u/superadmin-external",
+        "permissioned_as should use the instance-derived username, not the email"
     );
 
     // Update by the same superadmin
diff --git a/backend/tests/script_rename_clears_assets.rs b/backend/tests/script_rename_clears_assets.rs
new file mode 100644
index 0000000000..315deaf152
--- /dev/null
+++ b/backend/tests/script_rename_clears_assets.rs
@@ -0,0 +1,106 @@
+//! Regression test: renaming a script clears the OLD path's static asset
+//! usage rows.
+//!
+//! A script deploy persists its producer/consumer asset lineage as `asset`
+//! rows keyed by `usage_path = <script path>`, `usage_kind = 'script'`. A
+//! rename is a deploy with a new `path` and a `parent_hash` pointing at the
+//! version being renamed. The new path's rows are (re)written by the deploy,
+//! but the old path's rows must be cleared — otherwise the renamed script
+//! keeps lingering in the asset graph at a path where it no longer exists.
+//!
+//! The clear used to be attempted with the NEW (not-yet-inserted) script hash,
+//! which resolved to no path and cleared nothing.
+
+use serde_json::json;
+use sqlx::{Pool, Postgres};
+use windmill_test_utils::*;
+
+fn client() -> reqwest::Client {
+    reqwest::Client::new()
+}
+
+fn authed(builder: reqwest::RequestBuilder, token: &str) -> reqwest::RequestBuilder {
+    builder.header("Authorization", format!("Bearer {}", token))
+}
+
+fn new_script_with_asset(path: &str, content: &str) -> serde_json::Value {
+    json!({
+        "path": path,
+        "summary": "",
+        "description": "",
+        "content": content,
+        "language": "bash",
+        "assets": [{
+            "path": "u/test-user/my_db",
+            "kind": "resource",
+            "access_type": "rw"
+        }]
+    })
+}
+
+async fn asset_usage_paths(db: &Pool<Postgres>) -> anyhow::Result<Vec<String>> {
+    Ok(sqlx::query_scalar(
+        "SELECT usage_path FROM asset \
+         WHERE usage_kind = 'script' AND path = $1 AND workspace_id = $2 \
+         ORDER BY usage_path",
+    )
+    .bind("u/test-user/my_db")
+    .bind("test-workspace")
+    .fetch_all(db)
+    .await?)
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn test_rename_clears_old_path_asset_usage(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let base = format!("http://localhost:{port}/api/w/test-workspace");
+
+    let original_path = "u/test-user/asset_rename_orig";
+    let renamed_path = "u/test-user/asset_rename_renamed";
+
+    // 1. Deploy a script that produces (rw) a resource asset.
+    let resp = authed(
+        client().post(format!("{base}/scripts/create")),
+        "SECRET_TOKEN",
+    )
+    .json(&new_script_with_asset(original_path, "# v1"))
+    .send()
+    .await?;
+    assert_eq!(resp.status(), 201, "create should succeed");
+    let original_hash: String = resp.text().await?;
+
+    assert_eq!(
+        asset_usage_paths(&db).await?,
+        vec![original_path.to_string()],
+        "asset usage should be recorded at the original path"
+    );
+
+    // 2. Rename: deploy at a new path with parent_hash = v1.
+    let mut rename = new_script_with_asset(renamed_path, "# v2");
+    rename["parent_hash"] = json!(original_hash);
+    let resp = authed(
+        client().post(format!("{base}/scripts/create")),
+        "SECRET_TOKEN",
+    )
+    .json(&rename)
+    .send()
+    .await?;
+    assert_eq!(
+        resp.status(),
+        201,
+        "rename should succeed: {}",
+        resp.text().await?
+    );
+
+    // 3. Only the new path retains the asset usage; the old path is cleared.
+    assert_eq!(
+        asset_usage_paths(&db).await?,
+        vec![renamed_path.to_string()],
+        "after rename the old path's asset usage must be cleared and only the new path kept"
+    );
+
+    Ok(())
+}
diff --git a/backend/tests/suspend_resume.rs b/backend/tests/suspend_resume.rs
index b8468f0cbd..704fa0d256 100644
--- a/backend/tests/suspend_resume.rs
+++ b/backend/tests/suspend_resume.rs
@@ -628,4 +628,53 @@ mod suspend_resume {
         );
         Ok(())
     }
+
+    /// A step that declares a `suspend` but is skipped via `skip_if` never arms
+    /// its approval, so it must not gate the following step. If it did, the flow
+    /// would park forever waiting for a resume event that is never dispatched.
+    #[cfg(feature = "deno_core")]
+    #[sqlx::test(fixtures("base"))]
+    async fn skipped_suspend_step_does_not_block_next_step(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        initialize_tracing().await;
+
+        let server = ApiServer::start(db.clone()).await?;
+
+        let flow: FlowValue = serde_json::from_value(json!({
+            "modules": [
+                {
+                    "id": "a",
+                    "skip_if": { "type": "javascript", "expr": "true" },
+                    "suspend": { "required_events": 1, "timeout": 86400 },
+                    "value": {
+                        "type": "rawscript",
+                        "language": "deno",
+                        "content": "export async function main() { return 1 }",
+                        "input_transforms": {},
+                    },
+                },
+                {
+                    "id": "b",
+                    "value": {
+                        "type": "rawscript",
+                        "language": "deno",
+                        "content": "export async function main() { return 42 }",
+                        "input_transforms": {},
+                    },
+                },
+            ],
+        }))
+        .unwrap();
+
+        let result =
+            RunJob::from(JobPayload::RawFlow { value: flow, path: None, restarted_from: None })
+                .run_until_complete(&db, false, server.addr.port())
+                .await
+                .json_result()
+                .unwrap();
+
+        assert_eq!(result, json!(42));
+        Ok(())
+    }
 }
diff --git a/backend/tests/v2_job_delete_orphans.rs b/backend/tests/v2_job_delete_orphans.rs
new file mode 100644
index 0000000000..95cd1673b6
--- /dev/null
+++ b/backend/tests/v2_job_delete_orphans.rs
@@ -0,0 +1,237 @@
+//! v2_job no longer cascades to its sparse side tables `dispatch_event`,
+//! `flow_conversation_message`, and `zombie_job_counter` — their `ON DELETE CASCADE`
+//! foreign keys were dropped (migration `drop_v2_job_side_table_cascades`) to keep bulk
+//! retention deletes cheap. Every path that deletes a v2_job must therefore clean those
+//! tables explicitly. These tests assert no orphan side rows survive the deletion paths:
+//! direct job deletion (`delete_jobs`), schedule clearing, and workspace deletion — plus a
+//! regression test that the `/jobs/delete` purge endpoint stays workspace-scoped (a workspace
+//! admin must not be able to delete another workspace's side rows by passing foreign job ids).
+//!
+//! Uses runtime `sqlx::query` (not the compile-time macros) so no offline query cache is
+//! needed, matching delete_after_secs.rs.
+
+use sqlx::{Pool, Postgres};
+use uuid::Uuid;
+use windmill_test_utils::*;
+
+const WS: &str = "test-workspace";
+
+/// Insert one row in each side table that used to cascade from `job_id`, in workspace `ws`.
+async fn seed_side_rows(db: &Pool<Postgres>, ws: &str, job_id: Uuid) -> anyhow::Result<()> {
+    sqlx::query(
+        "INSERT INTO dispatch_event
+            (workspace_id, producer_job_id, subscriber_path, asset_kind, asset_path, outcome)
+         VALUES ($1, $2, 'f/sub', 'resource', 'f/res', 'dispatched')",
+    )
+    .bind(ws)
+    .bind(job_id)
+    .execute(db)
+    .await?;
+
+    let conv_id = Uuid::new_v4();
+    sqlx::query(
+        "INSERT INTO flow_conversation (id, workspace_id, flow_path, created_by)
+         VALUES ($1, $2, 'f/flow', 'test-user')",
+    )
+    .bind(conv_id)
+    .bind(ws)
+    .execute(db)
+    .await?;
+    // created_seq is assigned by a trigger; inserting a value is rejected.
+    sqlx::query(
+        "INSERT INTO flow_conversation_message (conversation_id, message_type, content, job_id)
+         VALUES ($1, 'assistant', 'hi', $2)",
+    )
+    .bind(conv_id)
+    .bind(job_id)
+    .execute(db)
+    .await?;
+
+    sqlx::query("INSERT INTO zombie_job_counter (job_id, counter) VALUES ($1, 1)")
+        .bind(job_id)
+        .execute(db)
+        .await?;
+    Ok(())
+}
+
+async fn count(db: &Pool<Postgres>, sql: &str, job_id: Uuid) -> anyhow::Result<i64> {
+    Ok(sqlx::query_scalar::<_, i64>(sql)
+        .bind(job_id)
+        .fetch_one(db)
+        .await?)
+}
+
+/// (dispatch_event, flow_conversation_message, zombie_job_counter, v2_job) row counts for `job_id`.
+async fn counts(db: &Pool<Postgres>, job_id: Uuid) -> anyhow::Result<(i64, i64, i64, i64)> {
+    Ok((
+        count(
+            db,
+            "SELECT count(*) FROM dispatch_event WHERE producer_job_id = $1",
+            job_id,
+        )
+        .await?,
+        count(
+            db,
+            "SELECT count(*) FROM flow_conversation_message WHERE job_id = $1",
+            job_id,
+        )
+        .await?,
+        count(
+            db,
+            "SELECT count(*) FROM zombie_job_counter WHERE job_id = $1",
+            job_id,
+        )
+        .await?,
+        count(db, "SELECT count(*) FROM v2_job WHERE id = $1", job_id).await?,
+    ))
+}
+
+async fn insert_job(db: &Pool<Postgres>, ws: &str, job_id: Uuid) -> anyhow::Result<()> {
+    sqlx::query("INSERT INTO v2_job (id, workspace_id, kind) VALUES ($1, $2, 'script')")
+        .bind(job_id)
+        .bind(ws)
+        .execute(db)
+        .await?;
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn test_delete_jobs_removes_side_rows(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let job_id = Uuid::new_v4();
+    insert_job(&db, WS, job_id).await?;
+    seed_side_rows(&db, WS, job_id).await?;
+    assert_eq!(
+        counts(&db, job_id).await?,
+        (1, 1, 1, 1),
+        "seed should create one row per table"
+    );
+
+    let mut conn = db.acquire().await?;
+    windmill_common::jobs::delete_jobs(&mut conn, &[job_id]).await?;
+    drop(conn);
+
+    let (de, fcm, zombie, job) = counts(&db, job_id).await?;
+    assert_eq!(
+        (de, fcm, zombie, job),
+        (0, 0, 0, 0),
+        "delete_jobs left orphans: dispatch_event={de} flow_conversation_message={fcm} zombie_job_counter={zombie} v2_job={job}"
+    );
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn test_clear_schedule_removes_side_rows(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    // clear_schedule deletes queued, non-running jobs whose v2_job is a schedule trigger.
+    let job_id = Uuid::new_v4();
+    sqlx::query(
+        "INSERT INTO v2_job (id, workspace_id, kind, trigger_kind, trigger)
+         VALUES ($1, $2, 'script', 'schedule', 'f/sched')",
+    )
+    .bind(job_id)
+    .bind(WS)
+    .execute(&db)
+    .await?;
+    sqlx::query(
+        "INSERT INTO v2_job_queue (id, workspace_id, scheduled_for, running)
+         VALUES ($1, $2, now(), false)",
+    )
+    .bind(job_id)
+    .bind(WS)
+    .execute(&db)
+    .await?;
+    seed_side_rows(&db, WS, job_id).await?;
+
+    let mut tx = db.begin().await?;
+    windmill_queue::schedule::clear_schedule(&mut tx, "f/sched", WS).await?;
+    tx.commit().await?;
+
+    let (de, fcm, zombie, job) = counts(&db, job_id).await?;
+    assert_eq!(
+        (de, fcm, zombie, job),
+        (0, 0, 0, 0),
+        "clear_schedule left orphans: dispatch_event={de} flow_conversation_message={fcm} zombie_job_counter={zombie} v2_job={job}"
+    );
+    Ok(())
+}
+
+#[sqlx::test(fixtures("base"))]
+async fn test_workspace_delete_removes_side_rows(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let job_id = Uuid::new_v4();
+    insert_job(&db, WS, job_id).await?;
+    seed_side_rows(&db, WS, job_id).await?;
+
+    // SECRET_TOKEN is the base fixture's instance-superadmin token for test@windmill.dev.
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let resp = reqwest::Client::new()
+        .delete(format!(
+            "http://localhost:{port}/api/workspaces/delete/{WS}"
+        ))
+        .header("Authorization", "Bearer SECRET_TOKEN")
+        .send()
+        .await?;
+    let status = resp.status();
+    assert!(
+        status.is_success(),
+        "delete workspace failed: {status} {}",
+        resp.text().await?
+    );
+
+    let (de, fcm, zombie, job) = counts(&db, job_id).await?;
+    assert_eq!(
+        (de, fcm, zombie, job),
+        (0, 0, 0, 0),
+        "workspace deletion left orphans: dispatch_event={de} flow_conversation_message={fcm} zombie_job_counter={zombie} v2_job={job}"
+    );
+    Ok(())
+}
+
+/// The `/jobs/delete` purge endpoint must scope every side-table delete to the path
+/// workspace. A `test-workspace` admin passing a job id from another workspace must not be
+/// able to delete that workspace's job or side rows (the side tables no longer cascade, so
+/// the scoping has to live in each explicit delete).
+#[sqlx::test(fixtures("base"))]
+async fn test_jobs_export_delete_is_workspace_scoped(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    // A job with side rows living in a *different* workspace.
+    sqlx::query(
+        "INSERT INTO workspace (id, name, owner) VALUES ('ws-other', 'ws-other', 'test-user')",
+    )
+    .execute(&db)
+    .await?;
+    let other_job = Uuid::new_v4();
+    insert_job(&db, "ws-other", other_job).await?;
+    seed_side_rows(&db, "ws-other", other_job).await?;
+
+    // A test-workspace admin calls the purge endpoint with the FOREIGN job id.
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let resp = reqwest::Client::new()
+        .post(format!("http://localhost:{port}/api/w/{WS}/jobs/delete"))
+        .header("Authorization", "Bearer SECRET_TOKEN")
+        .json(&[other_job])
+        .send()
+        .await?;
+    assert!(
+        resp.status().is_success(),
+        "purge request failed: {} {}",
+        resp.status(),
+        resp.text().await?
+    );
+
+    // The other workspace's job and all its side rows must survive untouched.
+    let (de, fcm, zombie, job) = counts(&db, other_job).await?;
+    assert_eq!(
+        (de, fcm, zombie, job),
+        (1, 1, 1, 1),
+        "jobs_export purge crossed workspaces: dispatch_event={de} flow_conversation_message={fcm} zombie_job_counter={zombie} v2_job={job}"
+    );
+    Ok(())
+}
diff --git a/backend/tests/wm_token_superadmin_guard.rs b/backend/tests/wm_token_superadmin_guard.rs
new file mode 100644
index 0000000000..650cf384d4
--- /dev/null
+++ b/backend/tests/wm_token_superadmin_guard.rs
@@ -0,0 +1,206 @@
+//! A WM_TOKEN (job JWT) running as a superadmin must not be able to perform
+//! global user/token management — promotion, password reset, user creation,
+//! token creation/impersonation, offboarding, or exporting the user table.
+//! A non-admin `wm_deployers` member can mint
+//! such a token implicitly via an app/flow `on_behalf_of`, so trusting it would
+//! let them establish *persistent* superadmin. A real superadmin who needs this
+//! from a script must use a dedicated superadmin API token (which only a real
+//! superadmin can create), not `$WM_TOKEN`.
+//!
+//! The fixture provides `test@windmill.dev` (instance superadmin, token
+//! `SECRET_TOKEN`) and `test2@windmill.dev` (non-superadmin, `SECRET_TOKEN_2`).
+
+use serde_json::json;
+use sqlx::{Pool, Postgres};
+use windmill_common::auth::create_jwt_token;
+use windmill_common::db::Authed;
+use windmill_test_utils::*;
+
+fn client() -> reqwest::Client {
+    reqwest::Client::new()
+}
+
+fn authed(builder: reqwest::RequestBuilder, token: &str) -> reqwest::RequestBuilder {
+    builder.header("Authorization", format!("Bearer {}", token))
+}
+
+/// Mint a WM_TOKEN: an internally-signed job JWT (note the `job_id` claim) for
+/// `email`, exactly as a running app/flow job is issued.
+async fn wm_token(email: &str, is_admin: bool) -> String {
+    let authed = Authed {
+        email: email.to_string(),
+        username: "runner".to_string(),
+        is_admin,
+        is_operator: false,
+        groups: vec![],
+        folders: vec![],
+        scopes: None,
+        token_prefix: None,
+    };
+    create_jwt_token(
+        authed,
+        "test-workspace",
+        3600,
+        Some(uuid::Uuid::new_v4()),
+        Some("app".to_string()),
+        None,
+        None,
+    )
+    .await
+    .expect("mint wm_token")
+}
+
+#[sqlx::test(fixtures("preserve_on_behalf_of"))]
+async fn test_wm_token_cannot_manage_superadmin_users(db: Pool<Postgres>) -> anyhow::Result<()> {
+    initialize_tracing().await;
+    // The server decodes WM_TOKENs with the same in-process JWT secret, so
+    // setting it once lets us mint a valid one below.
+    set_jwt_secret().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let base = format!("http://localhost:{port}/api/users");
+
+    // A superadmin-capable WM_TOKEN — the exact thing a deployer obtains via an
+    // app on_behalf_of pointed at a superadmin.
+    let sa_wm = wm_token("test@windmill.dev", true).await;
+
+    // 1. Cannot mint a (superadmin) token.
+    let resp = authed(client().post(format!("{base}/tokens/create")), &sa_wm)
+        .json(&json!({}))
+        .send()
+        .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not create tokens: {}",
+        resp.text().await?
+    );
+
+    // 2. Cannot impersonate (mint a token as another user).
+    let resp = authed(client().post(format!("{base}/tokens/impersonate")), &sa_wm)
+        .json(&json!({ "impersonate_email": "test2@windmill.dev" }))
+        .send()
+        .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not impersonate: {}",
+        resp.text().await?
+    );
+
+    // 3. Cannot promote a user to superadmin.
+    let resp = authed(
+        client().post(format!("{base}/update/test2@windmill.dev")),
+        &sa_wm,
+    )
+    .json(&json!({ "is_super_admin": true }))
+    .send()
+    .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not promote users: {}",
+        resp.text().await?
+    );
+
+    // 4. Cannot reset its own (the superadmin's) password.
+    let resp = authed(client().post(format!("{base}/setpassword")), &sa_wm)
+        .json(&json!({ "password": "hunter2" }))
+        .send()
+        .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not reset passwords: {}",
+        resp.text().await?
+    );
+
+    // 4b. Cannot delete a user.
+    let resp = authed(
+        client().delete(format!("{base}/delete/test2@windmill.dev")),
+        &sa_wm,
+    )
+    .send()
+    .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not delete users: {}",
+        resp.text().await?
+    );
+
+    // 4c. Cannot change a user's login type.
+    let resp = authed(
+        client().post(format!("{base}/set_login_type/test2@windmill.dev")),
+        &sa_wm,
+    )
+    .json(&json!({ "login_type": "password" }))
+    .send()
+    .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not change login type: {}",
+        resp.text().await?
+    );
+
+    // 4d. Cannot offboard a global user (deletes user, tokens, password, invites,
+    //     instance-group membership and reassigns their assets).
+    let resp = authed(
+        client().post(format!("{base}/offboard/test2@windmill.dev")),
+        &sa_wm,
+    )
+    .json(&json!({}))
+    .send()
+    .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not offboard users: {}",
+        resp.text().await?
+    );
+
+    // 4e. Cannot export the global user table (leaks every user's password_hash).
+    let resp = authed(client().get(format!("{base}/export")), &sa_wm)
+        .send()
+        .await?;
+    assert_eq!(
+        resp.status(),
+        401,
+        "superadmin WM_TOKEN must not export global users: {}",
+        resp.text().await?
+    );
+
+    // 5. Escape hatch / no false positive: a real superadmin API token
+    //    (SECRET_TOKEN, no job_id) can still create tokens.
+    let resp = authed(
+        client().post(format!("{base}/tokens/create")),
+        "SECRET_TOKEN",
+    )
+    .json(&json!({ "label": "ci" }))
+    .send()
+    .await?;
+    assert_eq!(
+        resp.status(),
+        201,
+        "a real superadmin token must still create tokens: {}",
+        resp.text().await?
+    );
+
+    // 6. No collateral: a non-superadmin WM_TOKEN can still create its own
+    //    token — the guard only fires for superadmin-capable job tokens.
+    let user_wm = wm_token("test2@windmill.dev", false).await;
+    let resp = authed(client().post(format!("{base}/tokens/create")), &user_wm)
+        .json(&json!({ "label": "from-script" }))
+        .send()
+        .await?;
+    assert_eq!(
+        resp.status(),
+        201,
+        "non-superadmin WM_TOKEN must still create its own token: {}",
+        resp.text().await?
+    );
+
+    Ok(())
+}
diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index 4ed12d3a4a..2349d476b7 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -5601,6 +5601,74 @@ async fn test_stop_after_all_iters_if_bad_expr_parallel_forloop(
     Ok(())
 }
 
+// Regression for the savepoint added around `evaluate_stop_after_all_iters_if`.
+// The failpoint makes the in-evaluation DB read fail with a transaction-aborting
+// error (SELECT 1/0). The caller swallows that error and keeps using the outer
+// status-update transaction (later reads + commit). Without the savepoint the
+// outer transaction would be aborted and the commit would fail, so the flow job
+// would never be marked completed (the worker would error/retry). With the
+// savepoint the read failure is isolated, the iteration is marked failed, and
+// the flow completes — which is what this test asserts.
+#[cfg(all(feature = "failpoints", feature = "quickjs", feature = "python"))]
+#[sqlx::test(fixtures("base"))]
+async fn test_stop_after_all_iters_if_db_error_isolated_by_savepoint(
+    db: Pool<Postgres>,
+) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let port = 123;
+    let flow: FlowValue = serde_json::from_value(serde_json::json!({
+        "modules": [
+            {
+                "id": "a",
+                "value": {
+                    "type": "forloopflow",
+                    "iterator": { "type": "javascript", "expr": "result.items" },
+                    "skip_failures": false,
+                    "parallel": true,
+                    "modules": [{
+                        "value": {
+                            "input_transforms": {
+                                "n": { "type": "javascript", "expr": "flow_input.iter.value" },
+                            },
+                            "type": "rawscript",
+                            "language": "python3",
+                            "content": "def main(n): return n",
+                        },
+                    }],
+                },
+                "stop_after_all_iters_if": {
+                    "expr": "__wm_failpoint_abort_tx__",
+                    "skip_if_stopped": false,
+                },
+            },
+        ],
+    }))
+    .unwrap();
+    let job = JobPayload::RawFlow { value: flow, path: None, restarted_from: None };
+
+    // If the savepoint failed to isolate the aborted read, the status-update
+    // transaction would be poisoned and the job would never complete, so this
+    // call would hang until the worker times out rather than returning.
+    let cjob = RunJob::from(job)
+        .arg("items", json!([1, 2, 3]))
+        .run_until_complete(&db, false, port)
+        .await;
+
+    assert!(
+        !cjob.success,
+        "iteration should be marked failed after the injected read error"
+    );
+    let result = cjob.json_result().unwrap();
+    let error_msg = result["error"]["message"].as_str().unwrap_or("");
+    assert!(
+        error_msg.contains("stop_after_all_iters_if"),
+        "error should mention stop_after_all_iters_if, got: {error_msg}"
+    );
+
+    Ok(())
+}
+
 #[cfg(all(feature = "quickjs", feature = "python"))]
 #[sqlx::test(fixtures("base"))]
 async fn test_results_length_in_input_transform(db: Pool<Postgres>) -> anyhow::Result<()> {
diff --git a/backend/windmill-ai/src/ai_bedrock.rs b/backend/windmill-ai/src/ai_bedrock.rs
index 8aa9addcae..02ab702d31 100644
--- a/backend/windmill-ai/src/ai_bedrock.rs
+++ b/backend/windmill-ai/src/ai_bedrock.rs
@@ -857,22 +857,91 @@ pub fn bedrock_stream_event_is_block_stop(event: &ConverseStreamOutput) -> bool
     matches!(event, ConverseStreamOutput::ContentBlockStop(_))
 }
 
-/// Convert accumulated streaming tool calls to OpenAI format
-pub fn streaming_tool_calls_to_openai(tool_calls: Vec<StreamingToolCall>) -> Vec<OpenAIToolCall> {
+/// Convert accumulated streaming tool calls to OpenAI format.
+///
+/// When thinking is enabled, `reasoning` carries the turn's Claude reasoning
+/// block; it is attached to the first tool call so the next request replays it
+/// before `toolUse` (required by Claude when thinking is enabled — see
+/// [`convert_message`]). When `None` (thinking off), tool calls carry no extra
+/// content, byte-identical to the pre-feature output.
+pub fn streaming_tool_calls_to_openai(
+    tool_calls: Vec<StreamingToolCall>,
+    reasoning: Option<crate::ai_types::BedrockExtraContent>,
+) -> Vec<OpenAIToolCall> {
+    let mut reasoning = reasoning;
     tool_calls
         .into_iter()
-        .map(|tc| OpenAIToolCall {
-            id: tc.id,
-            function: OpenAIFunction { name: tc.name, arguments: tc.arguments },
-            r#type: FUNCTION_TYPE.to_string(),
-            // Worker agent requests never enable thinking, so there is no
-            // reasoning block to round-trip here (the chat proxy path does —
-            // see providers/bedrock.rs).
-            extra_content: None,
+        .map(|tc| {
+            // `take` so only the first tool call carries the reasoning block.
+            let extra_content = reasoning.take().map(|block| crate::ai_types::ExtraContent {
+                bedrock: Some(block),
+                ..Default::default()
+            });
+            OpenAIToolCall {
+                id: tc.id,
+                function: OpenAIFunction { name: tc.name, arguments: tc.arguments },
+                r#type: FUNCTION_TYPE.to_string(),
+                extra_content,
+            }
         })
         .collect()
 }
 
+/// Fold a Bedrock `ReasoningContent` stream delta into an accumulating reasoning
+/// block (text + signature, or redacted bytes). Returns the readable text delta
+/// when the event carried one, so the caller can stream it as reasoning content.
+/// Mirrors the proxy path's accumulation in `providers/bedrock.rs`.
+pub fn bedrock_stream_event_to_reasoning_delta(
+    event: &ConverseStreamOutput,
+    reasoning: &mut Option<crate::ai_types::BedrockExtraContent>,
+) -> Option<String> {
+    let ConverseStreamOutput::ContentBlockDelta(delta_event) = event else {
+        return None;
+    };
+    let aws_sdk_bedrockruntime::types::ContentBlockDelta::ReasoningContent(rc) =
+        delta_event.delta()?
+    else {
+        return None;
+    };
+
+    let entry = reasoning.get_or_insert_with(Default::default);
+    match rc {
+        aws_sdk_bedrockruntime::types::ReasoningContentBlockDelta::Text(text) => {
+            entry
+                .reasoning_text
+                .get_or_insert_with(String::new)
+                .push_str(text);
+            Some(text.clone())
+        }
+        aws_sdk_bedrockruntime::types::ReasoningContentBlockDelta::Signature(signature) => {
+            entry
+                .signature
+                .get_or_insert_with(String::new)
+                .push_str(signature);
+            None
+        }
+        aws_sdk_bedrockruntime::types::ReasoningContentBlockDelta::RedactedContent(blob) => {
+            // Base64 of concatenated fragments != concatenated base64 fragments,
+            // so accumulate raw bytes and re-encode.
+            let mut bytes = entry
+                .redacted_content
+                .as_deref()
+                .and_then(|existing| {
+                    base64::Engine::decode(&base64::engine::general_purpose::STANDARD, existing)
+                        .ok()
+                })
+                .unwrap_or_default();
+            bytes.extend_from_slice(blob.as_ref());
+            entry.redacted_content = Some(base64::Engine::encode(
+                &base64::engine::general_purpose::STANDARD,
+                bytes,
+            ));
+            None
+        }
+        _ => None,
+    }
+}
+
 // ============================================================================
 // Tool Configuration Builder
 // ============================================================================
@@ -1028,6 +1097,101 @@ mod tests {
         assert!(matches!(&content[1], ContentBlock::ToolUse(_)));
     }
 
+    #[test]
+    fn streaming_tool_calls_to_openai_attaches_reasoning_to_first_call_only() {
+        let calls = vec![
+            StreamingToolCall {
+                id: "call_1".to_string(),
+                name: "a".to_string(),
+                arguments: "{}".to_string(),
+            },
+            StreamingToolCall {
+                id: "call_2".to_string(),
+                name: "b".to_string(),
+                arguments: "{}".to_string(),
+            },
+        ];
+        let reasoning = crate::ai_types::BedrockExtraContent {
+            reasoning_text: Some("thinking".to_string()),
+            signature: Some("sig".to_string()),
+            redacted_content: None,
+        };
+
+        let openai = streaming_tool_calls_to_openai(calls, Some(reasoning));
+
+        let with_reasoning = openai
+            .iter()
+            .filter(|tc| {
+                tc.extra_content
+                    .as_ref()
+                    .and_then(|e| e.bedrock.as_ref())
+                    .is_some()
+            })
+            .count();
+        assert_eq!(
+            with_reasoning, 1,
+            "exactly one tool call carries the reasoning block"
+        );
+        let block = openai[0]
+            .extra_content
+            .as_ref()
+            .and_then(|e| e.bedrock.as_ref())
+            .expect("first tool call carries reasoning");
+        assert_eq!(block.reasoning_text.as_deref(), Some("thinking"));
+        assert_eq!(block.signature.as_deref(), Some("sig"));
+    }
+
+    #[test]
+    fn streaming_tool_calls_to_openai_without_reasoning_has_no_extra_content() {
+        let calls = vec![StreamingToolCall {
+            id: "call_1".to_string(),
+            name: "a".to_string(),
+            arguments: "{}".to_string(),
+        }];
+
+        let openai = streaming_tool_calls_to_openai(calls, None);
+
+        assert!(openai[0].extra_content.is_none());
+    }
+
+    #[test]
+    fn bedrock_reasoning_delta_accumulates_text_and_signature() {
+        use aws_sdk_bedrockruntime::types::{
+            ContentBlockDelta, ContentBlockDeltaEvent, ConverseStreamOutput,
+            ReasoningContentBlockDelta,
+        };
+
+        let mut reasoning = None;
+        let text_event = ConverseStreamOutput::ContentBlockDelta(
+            ContentBlockDeltaEvent::builder()
+                .content_block_index(0)
+                .delta(ContentBlockDelta::ReasoningContent(
+                    ReasoningContentBlockDelta::Text("let me ".to_string()),
+                ))
+                .build()
+                .unwrap(),
+        );
+        assert_eq!(
+            bedrock_stream_event_to_reasoning_delta(&text_event, &mut reasoning).as_deref(),
+            Some("let me ")
+        );
+
+        let sig_event = ConverseStreamOutput::ContentBlockDelta(
+            ContentBlockDeltaEvent::builder()
+                .content_block_index(0)
+                .delta(ContentBlockDelta::ReasoningContent(
+                    ReasoningContentBlockDelta::Signature("sig".to_string()),
+                ))
+                .build()
+                .unwrap(),
+        );
+        assert!(bedrock_stream_event_to_reasoning_delta(&sig_event, &mut reasoning).is_none());
+
+        let block = reasoning.expect("reasoning accumulated");
+        assert_eq!(block.reasoning_text.as_deref(), Some("let me "));
+        assert_eq!(block.signature.as_deref(), Some("sig"));
+    }
+
     #[test]
     fn openai_messages_to_bedrock_skips_cache_points_when_disabled() {
         let messages = vec![
diff --git a/backend/windmill-ai/src/ai_google.rs b/backend/windmill-ai/src/ai_google.rs
index 94d3ef65e0..4374cb8628 100644
--- a/backend/windmill-ai/src/ai_google.rs
+++ b/backend/windmill-ai/src/ai_google.rs
@@ -312,7 +312,7 @@ impl GeminiToolCallEvent {
     pub fn to_extra_content(&self) -> Option<ExtraContent> {
         self.thought_signature.as_ref().map(|sig| ExtraContent {
             google: Some(GoogleExtraContent { thought_signature: Some(sig.clone()) }),
-            bedrock: None,
+            ..Default::default()
         })
     }
 }
@@ -1001,10 +1001,8 @@ mod tests {
 
     #[test]
     fn gemini_streaming_without_usage_emits_no_usage_chunk() {
-        let parsed = GeminiParsedEvent {
-            text: Some("the answer".to_string()),
-            ..Default::default()
-        };
+        let parsed =
+            GeminiParsedEvent { text: Some("the answer".to_string()), ..Default::default() };
 
         let mut tool_call_index = 0;
         let chunks = gemini_event_to_openai_sse_chunks(
diff --git a/backend/windmill-ai/src/ai_providers.rs b/backend/windmill-ai/src/ai_providers.rs
index 5d8e763b69..551ba3129b 100644
--- a/backend/windmill-ai/src/ai_providers.rs
+++ b/backend/windmill-ai/src/ai_providers.rs
@@ -49,6 +49,8 @@ pub enum AIProvider {
     OpenAI,
     #[serde(rename = "azure_openai")]
     AzureOpenAI,
+    #[serde(rename = "azure_foundry")]
+    AzureFoundry,
     Anthropic,
     Mistral,
     DeepSeek,
@@ -114,9 +116,12 @@ impl AIProvider {
             AIProvider::TogetherAI => Ok("https://api.together.xyz/v1".to_string()),
             AIProvider::Anthropic => Ok("https://api.anthropic.com/v1".to_string()),
             AIProvider::Mistral => Ok("https://api.mistral.ai/v1".to_string()),
-            p @ (AIProvider::CustomAI | AIProvider::AzureOpenAI) => Err(Error::BadRequest(
-                format!("{:?} provider requires a base URL in the resource", p),
-            )),
+            p @ (AIProvider::CustomAI | AIProvider::AzureOpenAI | AIProvider::AzureFoundry) => {
+                Err(Error::BadRequest(format!(
+                    "{:?} provider requires a base URL in the resource",
+                    p
+                )))
+            }
             AIProvider::AWSBedrock => {
                 // AWS Bedrock uses the SDK directly, not HTTP base URL
                 Err(Error::internal_err(
@@ -131,24 +136,84 @@ impl AIProvider {
         matches!(self, AIProvider::Anthropic)
     }
 
-    /// Check if this provider/URL combination represents Azure OpenAI
-    pub fn is_azure_openai(&self, base_url: &str) -> bool {
+    /// Check whether this provider/URL combination uses Azure conventions
+    /// (the `api-key` auth header and Azure URL building). This covers Azure
+    /// OpenAI, Azure AI Foundry, and the `OpenAI` provider pointed at an Azure
+    /// base path override.
+    pub fn is_azure(&self, base_url: &str) -> bool {
         (matches!(self, AIProvider::OpenAI) && base_url != OPENAI_BASE_URL)
-            || matches!(self, AIProvider::AzureOpenAI)
+            || matches!(self, AIProvider::AzureOpenAI | AIProvider::AzureFoundry)
     }
 
-    /// Build Azure OpenAI URL with deployment model path
+    /// Build an Azure-style OpenAI-compatible URL (Azure OpenAI / Azure AI Foundry)
+    /// for the given path. The resource base URL may be stored as the bare resource
+    /// root (e.g. `https://<res>.services.ai.azure.com`) or with a legacy `/openai`
+    /// or `/openai/v1` suffix (older Foundry resources shipped that way); those forms
+    /// resolve to the canonical `<root>/openai/v1/<path>`. Any other explicit path
+    /// (e.g. an Azure OpenAI `.../openai/deployments/<id>` base) is preserved as-is
+    /// with only `/<path>` appended.
     pub fn build_azure_openai_url(base_url: &str, path: &str) -> String {
         let base_url = base_url.trim_end_matches('/');
-        if base_url.ends_with("/openai") {
+        if base_url.ends_with("/openai/v1") {
+            format!("{}/{}", base_url, path)
+        } else if base_url.ends_with("/openai") {
             format!("{}/v1/{}", base_url, path)
         } else if base_url.ends_with("/deployments") {
             format!("{}/v1/{}", base_url.trim_end_matches("/deployments"), path)
+        } else if Self::is_bare_host(base_url) {
+            // A resource root with no path (Foundry convention, or an Azure OpenAI
+            // resource root) targets the OpenAI-compatible v1 surface.
+            format!("{}/openai/v1/{}", base_url, path)
         } else {
+            // Any other explicit base path (e.g. an Azure OpenAI deployment URL
+            // `.../openai/deployments/<id>`) is kept intact.
             format!("{}/{}", base_url, path)
         }
     }
 
+    /// Whether the URL is a bare scheme+host with no path component, e.g.
+    /// `https://x.services.ai.azure.com` (vs `https://x.openai.azure.com/openai/deployments/y`).
+    fn is_bare_host(url: &str) -> bool {
+        let after_scheme = url.split_once("://").map(|(_, rest)| rest).unwrap_or(url);
+        !after_scheme.contains('/')
+    }
+
+    /// Strip any known Foundry API sub-path from the resource base URL to recover the
+    /// resource root, so the correct per-model-family path can be appended. Handles
+    /// both the current root-URL convention and legacy `/openai/v1`-style values.
+    fn azure_foundry_root(base_url: &str) -> &str {
+        let base_url = base_url.trim_end_matches('/');
+        for suffix in [
+            "/openai/v1",
+            "/anthropic/v1",
+            "/openai",
+            "/anthropic",
+            "/models",
+        ] {
+            if let Some(root) = base_url.strip_suffix(suffix) {
+                return root.trim_end_matches('/');
+            }
+        }
+        base_url
+    }
+
+    /// Build an Azure AI Foundry Anthropic Messages API URL. Claude deployments on
+    /// Foundry are served only through `<root>/anthropic/v1/...`, not the
+    /// OpenAI-compatible `/openai/v1` surface.
+    pub fn build_azure_foundry_anthropic_url(base_url: &str, path: &str) -> String {
+        format!(
+            "{}/anthropic/v1/{}",
+            Self::azure_foundry_root(base_url),
+            path
+        )
+    }
+
+    /// Whether a Foundry deployment name refers to an Anthropic (Claude) model,
+    /// which requires the Anthropic Messages API rather than OpenAI chat completions.
+    pub fn is_anthropic_model(model: &str) -> bool {
+        model.to_lowercase().starts_with("claude")
+    }
+
     /// Extract model from request body (needed for Azure deployments)
     pub fn extract_model_from_body(body: &[u8]) -> Result<String> {
         #[derive(serde::Deserialize)]
@@ -186,3 +251,81 @@ pub struct ProviderModel {
     pub model: String,
     pub provider: AIProvider,
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn azure_openai_url_handles_root_and_legacy_suffixes() {
+        // Current convention: resource stores the bare root.
+        assert_eq!(
+            AIProvider::build_azure_openai_url(
+                "https://wm-test-ai.services.ai.azure.com",
+                "chat/completions"
+            ),
+            "https://wm-test-ai.services.ai.azure.com/openai/v1/chat/completions"
+        );
+        // Legacy resources that already baked in /openai/v1 must still resolve.
+        assert_eq!(
+            AIProvider::build_azure_openai_url(
+                "https://wm-test-ai.services.ai.azure.com/openai/v1/",
+                "chat/completions"
+            ),
+            "https://wm-test-ai.services.ai.azure.com/openai/v1/chat/completions"
+        );
+        // Azure OpenAI resources typically end in /openai.
+        assert_eq!(
+            AIProvider::build_azure_openai_url(
+                "https://example.openai.azure.com/openai",
+                "chat/completions"
+            ),
+            "https://example.openai.azure.com/openai/v1/chat/completions"
+        );
+        assert_eq!(
+            AIProvider::build_azure_openai_url(
+                "https://example.openai.azure.com/openai/deployments",
+                "chat/completions"
+            ),
+            "https://example.openai.azure.com/openai/v1/chat/completions"
+        );
+        // An Azure OpenAI base that pins a specific deployment must be preserved
+        // as-is (not have /openai/v1 appended after the deployment id).
+        assert_eq!(
+            AIProvider::build_azure_openai_url(
+                "https://example.openai.azure.com/openai/deployments/my-deployment",
+                "chat/completions"
+            ),
+            "https://example.openai.azure.com/openai/deployments/my-deployment/chat/completions"
+        );
+    }
+
+    #[test]
+    fn azure_foundry_anthropic_url_from_root_and_legacy() {
+        // Root URL.
+        assert_eq!(
+            AIProvider::build_azure_foundry_anthropic_url(
+                "https://wm-test-ai.services.ai.azure.com",
+                "messages"
+            ),
+            "https://wm-test-ai.services.ai.azure.com/anthropic/v1/messages"
+        );
+        // Legacy /openai/v1 base is normalized back to the root, then routed to
+        // the Anthropic Messages API.
+        assert_eq!(
+            AIProvider::build_azure_foundry_anthropic_url(
+                "https://wm-test-ai.services.ai.azure.com/openai/v1",
+                "messages"
+            ),
+            "https://wm-test-ai.services.ai.azure.com/anthropic/v1/messages"
+        );
+    }
+
+    #[test]
+    fn detects_anthropic_models() {
+        assert!(AIProvider::is_anthropic_model("claude-sonnet-5"));
+        assert!(AIProvider::is_anthropic_model("Claude-Opus-4-8"));
+        assert!(!AIProvider::is_anthropic_model("gpt-4o"));
+        assert!(!AIProvider::is_anthropic_model("DeepSeek-R1"));
+    }
+}
diff --git a/backend/windmill-ai/src/ai_types.rs b/backend/windmill-ai/src/ai_types.rs
index c6f171daf3..b80e237920 100644
--- a/backend/windmill-ai/src/ai_types.rs
+++ b/backend/windmill-ai/src/ai_types.rs
@@ -118,6 +118,22 @@ pub struct BedrockExtraContent {
     pub redacted_content: Option<String>,
 }
 
+/// Native-Anthropic reasoning block emitted in the same assistant turn as a
+/// tool call. Like Bedrock, Anthropic requires the thinking block (text +
+/// unmodified signature, or redacted bytes) to precede `tool_use` on replay when
+/// thinking is enabled, so it is round-tripped through the OpenAI-shaped tool call.
+#[derive(Deserialize, Serialize, Clone, Debug, Default)]
+pub struct AnthropicExtraContent {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub thinking: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub signature: Option<String>,
+    /// Base64 `data` of a redacted (encrypted) thinking block, when the provider
+    /// returned one instead of readable text.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub redacted_thinking: Option<String>,
+}
+
 /// Extra content for provider-specific metadata (e.g., Google thought signatures)
 #[derive(Deserialize, Serialize, Clone, Debug, Default)]
 pub struct ExtraContent {
@@ -125,6 +141,8 @@ pub struct ExtraContent {
     pub google: Option<GoogleExtraContent>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub bedrock: Option<BedrockExtraContent>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub anthropic: Option<AnthropicExtraContent>,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug)]
diff --git a/backend/windmill-ai/src/providers/anthropic.rs b/backend/windmill-ai/src/providers/anthropic.rs
index 05398ce212..d71de2f35f 100644
--- a/backend/windmill-ai/src/providers/anthropic.rs
+++ b/backend/windmill-ai/src/providers/anthropic.rs
@@ -92,6 +92,10 @@ pub enum AnthropicRequestContent {
         #[serde(skip_serializing_if = "Option::is_none")]
         cache_control: Option<CacheControl>,
     },
+    #[serde(rename = "thinking")]
+    Thinking { thinking: String, signature: String },
+    #[serde(rename = "redacted_thinking")]
+    RedactedThinking { data: String },
     #[serde(rename = "image")]
     Image { source: AnthropicBase64Source },
     #[serde(rename = "document")]
@@ -131,6 +135,26 @@ pub struct AnthropicMessage {
     pub content: Vec<AnthropicRequestContent>,
 }
 
+/// Adaptive thinking config for Anthropic native API. `summarized` display
+/// matches the chat proxy path (renders a summarized thinking stream).
+#[derive(Serialize, Debug)]
+pub struct AnthropicThinking {
+    pub r#type: &'static str,
+    pub display: &'static str,
+}
+
+impl AnthropicThinking {
+    fn adaptive() -> Self {
+        Self { r#type: "adaptive", display: "summarized" }
+    }
+}
+
+/// Carries the reasoning effort token alongside adaptive thinking.
+#[derive(Serialize, Debug)]
+pub struct AnthropicOutputConfig {
+    pub effort: String,
+}
+
 /// Anthropic-specific request structure for standard API
 #[derive(Serialize)]
 pub struct AnthropicRequest<'a> {
@@ -145,6 +169,10 @@ pub struct AnthropicRequest<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub temperature: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub thinking: Option<AnthropicThinking>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_config: Option<AnthropicOutputConfig>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_tokens: Option<u32>,
     pub stream: bool,
 }
@@ -166,6 +194,10 @@ pub struct AnthropicVertexRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub temperature: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub thinking: Option<AnthropicThinking>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub output_config: Option<AnthropicOutputConfig>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_tokens: Option<u32>,
     pub stream: bool,
 }
@@ -189,6 +221,25 @@ fn convert_messages_to_anthropic(messages: &[OpenAIMessage]) -> Vec<AnthropicMes
             "assistant" => {
                 let mut content: Vec<AnthropicRequestContent> = Vec::new();
 
+                // Replay the turn's thinking block first: when thinking is enabled,
+                // Claude requires the thinking block (with its unmodified signature)
+                // to precede tool_use in the assistant turn it was emitted in. It is
+                // round-tripped on the tool call's extra_content (see AnthropicExtraContent).
+                if let Some(reasoning) = msg
+                    .tool_calls
+                    .as_ref()
+                    .and_then(|tcs| {
+                        tcs.iter().find_map(|tc| {
+                            tc.extra_content
+                                .as_ref()
+                                .and_then(|ec| ec.anthropic.as_ref())
+                        })
+                    })
+                    .and_then(anthropic_reasoning_block_from_extra)
+                {
+                    content.push(reasoning);
+                }
+
                 // Add text content if present
                 if let Some(ref c) = msg.content {
                     let text = extract_text_content(c);
@@ -246,6 +297,25 @@ fn convert_messages_to_anthropic(messages: &[OpenAIMessage]) -> Vec<AnthropicMes
     result
 }
 
+/// Rebuild an Anthropic thinking content block from the round-tripped
+/// [`AnthropicExtraContent`](crate::ai_types::AnthropicExtraContent). Returns
+/// None when there is no replayable block (thinking text without a signature is
+/// rejected by Anthropic, so it is dropped rather than sent).
+fn anthropic_reasoning_block_from_extra(
+    extra: &crate::ai_types::AnthropicExtraContent,
+) -> Option<AnthropicRequestContent> {
+    if let Some(data) = extra.redacted_thinking.as_deref() {
+        return Some(AnthropicRequestContent::RedactedThinking { data: data.to_string() });
+    }
+    match (extra.thinking.as_deref(), extra.signature.as_deref()) {
+        (Some(thinking), Some(signature)) => Some(AnthropicRequestContent::Thinking {
+            thinking: thinking.to_string(),
+            signature: signature.to_string(),
+        }),
+        _ => None,
+    }
+}
+
 /// Convert OpenAI content to Anthropic content blocks
 fn convert_content_to_anthropic(content: &Option<OpenAIContent>) -> Vec<AnthropicRequestContent> {
     let Some(content) = content else {
@@ -380,6 +450,13 @@ impl AnthropicQueryBuilder {
         self.platform == AIPlatform::GoogleVertexAi
     }
 
+    /// Claude models hosted on Azure AI Foundry: the Anthropic Messages API is
+    /// served under the resource's `/anthropic/v1` path rather than at the
+    /// Anthropic public base URL.
+    fn is_azure_foundry(&self) -> bool {
+        matches!(self.provider_kind, AIProvider::AzureFoundry)
+    }
+
     fn transform_proxy_body_for_vertex(body: &[u8]) -> Result<(String, Vec<u8>), Error> {
         let mut json_body: std::collections::HashMap<String, serde_json::Value> =
             serde_json::from_slice(body).map_err(|e| {
@@ -426,6 +503,15 @@ impl AnthropicQueryBuilder {
                 format!("{}/{}:streamRawPredict", base_url, model),
                 transformed_body,
             )
+        } else if self.is_azure_foundry() {
+            // Claude on Foundry is served under the resource's /anthropic/v1 path,
+            // not the resource's /openai/v1 base. The Anthropic SDK sends the path
+            // as "v1/messages", so drop its leading "v1/" before re-appending.
+            let path = args.path.trim_start_matches("v1/");
+            (
+                AIProvider::build_azure_foundry_anthropic_url(base_url, path),
+                body,
+            )
         } else if is_anthropic_sdk {
             let truncated_base_url = base_url.trim_end_matches("/v1");
             (format!("{}/{}", truncated_base_url, args.path), body)
@@ -575,6 +661,17 @@ impl AnthropicQueryBuilder {
             }
         }
 
+        // Adaptive thinking rejects sampling params, so drop temperature when
+        // reasoning is on (Anthropic returns a hard 400 otherwise).
+        let (thinking, output_config, temperature) = match args.reasoning_effort {
+            Some(effort) => (
+                Some(AnthropicThinking::adaptive()),
+                Some(AnthropicOutputConfig { effort: effort.to_string() }),
+                None,
+            ),
+            None => (None, None, args.temperature),
+        };
+
         // Build request based on platform
         if self.is_vertex() {
             // For Vertex AI: no model field, anthropic_version in body
@@ -584,7 +681,9 @@ impl AnthropicQueryBuilder {
                 messages: anthropic_messages,
                 tools: tools_option,
                 tool_choice,
-                temperature: args.temperature,
+                temperature,
+                thinking,
+                output_config,
                 max_tokens,
                 stream: true,
             };
@@ -598,7 +697,9 @@ impl AnthropicQueryBuilder {
                 messages: anthropic_messages,
                 tools: tools_option,
                 tool_choice,
-                temperature: args.temperature,
+                temperature,
+                thinking,
+                output_config,
                 max_tokens,
                 stream: true,
             };
@@ -688,6 +789,8 @@ impl QueryBuilder for AnthropicQueryBuilder {
                 base_url.trim_end_matches('/'),
                 model
             )
+        } else if self.is_azure_foundry() {
+            AIProvider::build_azure_foundry_anthropic_url(base_url, "messages")
         } else {
             format!("{}/messages", base_url)
         }
@@ -748,8 +851,7 @@ mod tests {
     #[test]
     fn builds_standard_anthropic_proxy_request() {
         let credentials = credentials(AIPlatform::Standard);
-        let builder =
-            AnthropicQueryBuilder::new(AIProvider::Anthropic, AIPlatform::Standard);
+        let builder = AnthropicQueryBuilder::new(AIProvider::Anthropic, AIPlatform::Standard);
         let method = Method::POST;
         let mut headers = HeaderMap::new();
         headers.insert("anthropic-version", HeaderValue::from_static("2023-06-01"));
@@ -786,8 +888,7 @@ mod tests {
         let mut credentials = credentials(AIPlatform::GoogleVertexAi);
         credentials.base_url = "https://us-central1-aiplatform.googleapis.com/v1/projects/p/locations/us-central1/publishers/anthropic/models".to_string();
         credentials.user = Some("user-1".to_string());
-        let builder =
-            AnthropicQueryBuilder::new(AIProvider::Anthropic, AIPlatform::GoogleVertexAi);
+        let builder = AnthropicQueryBuilder::new(AIProvider::Anthropic, AIPlatform::GoogleVertexAi);
         let method = Method::POST;
         let mut headers = HeaderMap::new();
         headers.insert("anthropic-version", HeaderValue::from_static("2023-06-01"));
@@ -827,11 +928,127 @@ mod tests {
         assert!(has_header(&request.headers, "anthropic-beta", "some-beta"));
     }
 
+    #[test]
+    fn convert_messages_replays_thinking_block_before_tool_use() {
+        let tool_call = crate::ai_types::OpenAIToolCall {
+            id: "call_1".to_string(),
+            function: crate::ai_types::OpenAIFunction {
+                name: "lookup".to_string(),
+                arguments: "{}".to_string(),
+            },
+            r#type: "function".to_string(),
+            extra_content: Some(crate::ai_types::ExtraContent {
+                anthropic: Some(crate::ai_types::AnthropicExtraContent {
+                    thinking: Some("let me think".to_string()),
+                    signature: Some("sig-abc".to_string()),
+                    redacted_thinking: None,
+                }),
+                ..Default::default()
+            }),
+        };
+        let assistant = OpenAIMessage {
+            role: "assistant".to_string(),
+            tool_calls: Some(vec![tool_call]),
+            ..Default::default()
+        };
+
+        let messages = convert_messages_to_anthropic(&[assistant]);
+        let content = &messages[0].content;
+        match &content[0] {
+            AnthropicRequestContent::Thinking { thinking, signature } => {
+                assert_eq!(thinking, "let me think");
+                assert_eq!(signature, "sig-abc");
+            }
+            other => panic!("expected thinking block first, got {:?}", other),
+        }
+        assert!(matches!(
+            &content[1],
+            AnthropicRequestContent::ToolUse { .. }
+        ));
+    }
+
+    #[test]
+    fn convert_messages_drops_thinking_without_signature() {
+        let tool_call = crate::ai_types::OpenAIToolCall {
+            id: "call_1".to_string(),
+            function: crate::ai_types::OpenAIFunction {
+                name: "lookup".to_string(),
+                arguments: "{}".to_string(),
+            },
+            r#type: "function".to_string(),
+            extra_content: Some(crate::ai_types::ExtraContent {
+                anthropic: Some(crate::ai_types::AnthropicExtraContent {
+                    thinking: Some("unsigned".to_string()),
+                    signature: None,
+                    redacted_thinking: None,
+                }),
+                ..Default::default()
+            }),
+        };
+        let assistant = OpenAIMessage {
+            role: "assistant".to_string(),
+            tool_calls: Some(vec![tool_call]),
+            ..Default::default()
+        };
+
+        let messages = convert_messages_to_anthropic(&[assistant]);
+        // An unsigned thinking block can't be replayed, so only tool_use remains.
+        assert!(matches!(
+            messages[0].content[0],
+            AnthropicRequestContent::ToolUse { .. }
+        ));
+    }
+
+    #[test]
+    fn anthropic_request_serializes_adaptive_thinking_without_temperature() {
+        let request = AnthropicRequest {
+            model: "claude-opus-4-8",
+            system: None,
+            messages: vec![],
+            tools: None,
+            tool_choice: None,
+            temperature: None,
+            thinking: Some(AnthropicThinking::adaptive()),
+            output_config: Some(AnthropicOutputConfig { effort: "high".to_string() }),
+            max_tokens: Some(64000),
+            stream: true,
+        };
+
+        let body: serde_json::Value =
+            serde_json::from_str(&serde_json::to_string(&request).unwrap()).unwrap();
+        assert_eq!(body["thinking"]["type"], "adaptive");
+        assert_eq!(body["thinking"]["display"], "summarized");
+        assert_eq!(body["output_config"]["effort"], "high");
+        // Sampling params are rejected alongside adaptive thinking.
+        assert!(body.get("temperature").is_none());
+    }
+
+    #[test]
+    fn anthropic_request_omits_thinking_when_reasoning_off() {
+        let request = AnthropicRequest {
+            model: "claude-opus-4-8",
+            system: None,
+            messages: vec![],
+            tools: None,
+            tool_choice: None,
+            temperature: Some(0.5),
+            thinking: None,
+            output_config: None,
+            max_tokens: Some(64000),
+            stream: true,
+        };
+
+        let body: serde_json::Value =
+            serde_json::from_str(&serde_json::to_string(&request).unwrap()).unwrap();
+        assert!(body.get("thinking").is_none());
+        assert!(body.get("output_config").is_none());
+        assert_eq!(body["temperature"], 0.5);
+    }
+
     #[test]
     fn rejects_vertex_proxy_request_without_model() {
         let credentials = credentials(AIPlatform::GoogleVertexAi);
-        let builder =
-            AnthropicQueryBuilder::new(AIProvider::Anthropic, AIPlatform::GoogleVertexAi);
+        let builder = AnthropicQueryBuilder::new(AIProvider::Anthropic, AIPlatform::GoogleVertexAi);
         let method = Method::POST;
         let headers = HeaderMap::new();
 
@@ -847,4 +1064,35 @@ mod tests {
 
         assert!(matches!(err, Error::BadRequest(message) if message.contains("Missing 'model'")));
     }
+
+    #[test]
+    fn builds_azure_foundry_anthropic_proxy_request() {
+        // Foundry resource stored with a legacy /openai/v1 suffix; the Anthropic SDK
+        // sends the path as "v1/messages". Both must resolve to the resource's
+        // /anthropic/v1/messages surface.
+        let mut credentials = credentials(AIPlatform::Standard);
+        credentials.provider = AIProvider::AzureFoundry;
+        credentials.base_url = "https://wm-test-ai.services.ai.azure.com/openai/v1".to_string();
+        let builder = AnthropicQueryBuilder::new(AIProvider::AzureFoundry, AIPlatform::Standard);
+        let method = Method::POST;
+        let mut headers = HeaderMap::new();
+        headers.insert("anthropic-version", HeaderValue::from_static("2023-06-01"));
+        headers.insert("X-Anthropic-SDK", HeaderValue::from_static("true"));
+
+        let request = builder
+            .build_proxy_request(&ProxyBuildArgs {
+                method: &method,
+                path: "v1/messages",
+                headers: &headers,
+                body: br#"{"model":"claude-sonnet-5","messages":[]}"#,
+                credentials: &credentials,
+            })
+            .unwrap();
+
+        assert_eq!(
+            request.url,
+            "https://wm-test-ai.services.ai.azure.com/anthropic/v1/messages"
+        );
+        assert!(has_header(&request.headers, "X-API-Key", "api-key"));
+    }
 }
diff --git a/backend/windmill-ai/src/providers/bedrock.rs b/backend/windmill-ai/src/providers/bedrock.rs
index ddc5f33998..4405a50dcb 100644
--- a/backend/windmill-ai/src/providers/bedrock.rs
+++ b/backend/windmill-ai/src/providers/bedrock.rs
@@ -9,10 +9,10 @@
 use crate::{
     ai_bedrock::{
         bedrock_model_supports_prompt_caching, bedrock_stream_event_is_block_stop,
-        bedrock_stream_event_to_text, bedrock_stream_event_to_tool_delta,
-        bedrock_stream_event_to_tool_delta_with_block_index, bedrock_stream_event_to_tool_start,
-        bedrock_stream_event_to_tool_start_with_block_index, build_tool_config,
-        create_inference_config, format_bedrock_error, json_to_document,
+        bedrock_stream_event_to_reasoning_delta, bedrock_stream_event_to_text,
+        bedrock_stream_event_to_tool_delta, bedrock_stream_event_to_tool_delta_with_block_index,
+        bedrock_stream_event_to_tool_start, bedrock_stream_event_to_tool_start_with_block_index,
+        build_tool_config, create_inference_config, format_bedrock_error, json_to_document,
         openai_messages_to_bedrock, streaming_tool_calls_to_openai, BearerTokenProvider,
         BedrockClient, StreamingToolCall,
     },
@@ -641,57 +641,13 @@ fn bedrock_sse_chunks_for_event(
 
 /// Fold a `ReasoningContent` stream delta into the state's pending reasoning
 /// block. Returns the text delta (for a `reasoning_content` SSE chunk) when the
-/// event carried readable reasoning text.
+/// event carried readable reasoning text. Shares the worker path's folding so
+/// the two never drift.
 fn accumulate_reasoning_delta(
     event: &aws_sdk_bedrockruntime::types::ConverseStreamOutput,
     state: &mut BedrockSseStreamState,
 ) -> Option<String> {
-    let aws_sdk_bedrockruntime::types::ConverseStreamOutput::ContentBlockDelta(delta_event) = event
-    else {
-        return None;
-    };
-    let aws_sdk_bedrockruntime::types::ContentBlockDelta::ReasoningContent(reasoning) =
-        delta_event.delta()?
-    else {
-        return None;
-    };
-
-    let entry = state.reasoning.get_or_insert_with(Default::default);
-    match reasoning {
-        aws_sdk_bedrockruntime::types::ReasoningContentBlockDelta::Text(text) => {
-            entry
-                .reasoning_text
-                .get_or_insert_with(String::new)
-                .push_str(text);
-            Some(text.clone())
-        }
-        aws_sdk_bedrockruntime::types::ReasoningContentBlockDelta::Signature(signature) => {
-            entry
-                .signature
-                .get_or_insert_with(String::new)
-                .push_str(signature);
-            None
-        }
-        aws_sdk_bedrockruntime::types::ReasoningContentBlockDelta::RedactedContent(blob) => {
-            // Base64 of concatenated fragments != concatenated base64 fragments,
-            // so accumulate raw bytes and re-encode.
-            let mut bytes = entry
-                .redacted_content
-                .as_deref()
-                .and_then(|existing| {
-                    base64::Engine::decode(&base64::engine::general_purpose::STANDARD, existing)
-                        .ok()
-                })
-                .unwrap_or_default();
-            bytes.extend_from_slice(blob.as_ref());
-            entry.redacted_content = Some(base64::Engine::encode(
-                &base64::engine::general_purpose::STANDARD,
-                bytes,
-            ));
-            None
-        }
-        _ => None,
-    }
+    bedrock_stream_event_to_reasoning_delta(event, &mut state.reasoning)
 }
 
 async fn handle_bedrock_sdk_non_streaming(
@@ -942,6 +898,7 @@ impl BedrockQueryBuilder {
         tools: Option<&[ToolDef]>,
         model: &str,
         temperature: Option<f32>,
+        reasoning_effort: Option<&str>,
         max_tokens: Option<u32>,
         api_key: &str,
         region: &str,
@@ -977,6 +934,9 @@ impl BedrockQueryBuilder {
         let (bedrock_messages, system_prompts) =
             openai_messages_to_bedrock(&prepared_messages, enable_prompt_caching)?;
 
+        // Adaptive thinking rejects sampling params; drop temperature when reasoning is on.
+        let temperature = reasoning_effort.is_none().then_some(temperature).flatten();
+
         // Build inference configuration using shared helper
         let inference_config = create_inference_config(temperature, max_tokens.map(|t| t as i32));
 
@@ -994,6 +954,7 @@ impl BedrockQueryBuilder {
             system_prompts,
             inference_config,
             tool_config,
+            reasoning_effort,
             stream_event_sink,
         )
         .await
@@ -1008,6 +969,7 @@ impl BedrockQueryBuilder {
         system_prompts: Vec<aws_sdk_bedrockruntime::types::SystemContentBlock>,
         inference_config: Option<aws_sdk_bedrockruntime::types::InferenceConfiguration>,
         tool_config: Option<aws_sdk_bedrockruntime::types::ToolConfiguration>,
+        reasoning_effort: Option<&str>,
         stream_event_sink: Option<Box<dyn StreamEventSink>>,
     ) -> Result<ParsedResponse, Error> {
         tracing::debug!(
@@ -1035,6 +997,11 @@ impl BedrockQueryBuilder {
             request_builder = request_builder.set_tool_config(Some(config));
         }
 
+        if let Some(effort) = reasoning_effort {
+            request_builder =
+                request_builder.additional_model_request_fields(bedrock_thinking_fields(effort));
+        }
+
         let mut stream = request_builder
             .send()
             .await
@@ -1053,11 +1020,32 @@ impl BedrockQueryBuilder {
         let mut accumulated_tool_calls: HashMap<String, StreamingToolCall> = HashMap::new();
         let mut current_tool_use_id: Option<String> = None;
         let mut usage: Option<TokenUsage> = None;
+        // Claude reasoning block for the turn (only populated when thinking is on),
+        // attached to the first tool call for replay before toolUse.
+        let mut reasoning: Option<crate::ai_types::BedrockExtraContent> = None;
 
         // Process stream events using shared parsing functions
         loop {
             match stream.recv().await {
                 Ok(Some(event)) => {
+                    // Fold reasoning deltas into the turn's reasoning block (for
+                    // replay before toolUse, required by Claude when thinking is
+                    // on) and stream the readable summary as a thinking affordance.
+                    if let Some(reasoning_delta) =
+                        bedrock_stream_event_to_reasoning_delta(&event, &mut reasoning)
+                    {
+                        if let Some(processor) = stream_event_sink.as_ref() {
+                            processor
+                                .send(
+                                    StreamingEvent::ReasoningTokenDelta {
+                                        content: reasoning_delta,
+                                    },
+                                    &mut events_str,
+                                )
+                                .await?;
+                        }
+                    }
+
                     // Handle tool use start using shared parser
                     if let Some(tool_call) = bedrock_stream_event_to_tool_start(&event) {
                         current_tool_use_id = Some(tool_call.id.clone());
@@ -1143,8 +1131,10 @@ impl BedrockQueryBuilder {
             Some(accumulated_text)
         };
 
-        let tool_calls =
-            streaming_tool_calls_to_openai(accumulated_tool_calls.into_values().collect());
+        let tool_calls = streaming_tool_calls_to_openai(
+            accumulated_tool_calls.into_values().collect(),
+            reasoning,
+        );
 
         Ok(ParsedResponse::Text {
             content,
diff --git a/backend/windmill-ai/src/providers/google_ai.rs b/backend/windmill-ai/src/providers/google_ai.rs
index 650e11c0c7..21428903fa 100644
--- a/backend/windmill-ai/src/providers/google_ai.rs
+++ b/backend/windmill-ai/src/providers/google_ai.rs
@@ -153,13 +153,18 @@ impl GoogleAIQueryBuilder {
             (None, None)
         };
 
+        // Map the effort token onto Gemini's native thinking controls; without
+        // one, leave provider defaults untouched.
+        let thinking_config = args
+            .reasoning_effort
+            .map(|effort| gemini_thinking_config(args.model, effort));
+
         build_gemini_generation_config(
             args.temperature,
             args.max_tokens,
             response_mime_type,
             response_schema,
-            // Worker AI-agent requests carry no reasoning knob; keep provider defaults.
-            None,
+            thinking_config,
         )
     }
 }
diff --git a/backend/windmill-ai/src/providers/mod.rs b/backend/windmill-ai/src/providers/mod.rs
index 80fbc8fcca..ab4f670b17 100644
--- a/backend/windmill-ai/src/providers/mod.rs
+++ b/backend/windmill-ai/src/providers/mod.rs
@@ -7,7 +7,9 @@ pub mod openrouter;
 pub mod other;
 
 use crate::{
-    ai_providers::AIProvider, credentials::ProviderCredentials, query_builder::QueryBuilder,
+    ai_providers::{AIPlatform, AIProvider},
+    credentials::ProviderCredentials,
+    query_builder::QueryBuilder,
 };
 
 use self::{
@@ -16,7 +18,15 @@ use self::{
 };
 
 /// Factory function to create the appropriate query builder from resolved credentials.
-pub fn create_query_builder(credentials: &ProviderCredentials) -> Box<dyn QueryBuilder> {
+///
+/// `model` is the deployment/model name of the request. It matters only for Azure AI
+/// Foundry, which fronts multiple model families under one resource: Claude
+/// deployments speak the Anthropic Messages API while everything else is
+/// OpenAI-compatible, so the builder is chosen per model rather than per provider.
+pub fn create_query_builder(
+    credentials: &ProviderCredentials,
+    model: &str,
+) -> Box<dyn QueryBuilder> {
     match credentials.provider {
         AIProvider::GoogleAI => Box::new(GoogleAIQueryBuilder::new(credentials.platform.clone())),
         AIProvider::OpenAI => Box::new(OpenAIQueryBuilder::new(credentials.provider.clone())),
@@ -25,6 +35,9 @@ pub fn create_query_builder(credentials: &ProviderCredentials) -> Box<dyn QueryB
             credentials.platform.clone(),
         )),
         AIProvider::OpenRouter => Box::new(OpenRouterQueryBuilder::new()),
+        AIProvider::AzureFoundry if AIProvider::is_anthropic_model(model) => Box::new(
+            AnthropicQueryBuilder::new(AIProvider::AzureFoundry, AIPlatform::Standard),
+        ),
         _ => Box::new(OtherQueryBuilder::new(credentials.provider.clone())),
     }
 }
diff --git a/backend/windmill-ai/src/providers/openai.rs b/backend/windmill-ai/src/providers/openai.rs
index efd7229ebb..bdb882679b 100644
--- a/backend/windmill-ai/src/providers/openai.rs
+++ b/backend/windmill-ai/src/providers/openai.rs
@@ -192,6 +192,15 @@ pub struct ResponsesApiTextFormat {
     pub format: ResponsesApiTextFormatConfig,
 }
 
+/// Reasoning config for the Responses API (`reasoning: { effort }`).
+/// The summary is intentionally not requested, mirroring the copilot chat: OpenAI
+/// gates reasoning summaries behind organization verification, so asking for one
+/// would fail the request for unverified orgs.
+#[derive(Serialize)]
+pub struct ResponsesApiReasoning {
+    pub effort: String,
+}
+
 #[derive(Serialize)]
 pub struct ResponsesApiRequest<'a> {
     pub model: &'a str,
@@ -204,6 +213,8 @@ pub struct ResponsesApiRequest<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub temperature: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning: Option<ResponsesApiReasoning>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_output_tokens: Option<u32>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub text: Option<ResponsesApiTextFormat>,
@@ -409,6 +420,9 @@ impl OpenAIQueryBuilder {
             tools,
             stream: Some(true),
             temperature: args.temperature,
+            reasoning: args
+                .reasoning_effort
+                .map(|effort| ResponsesApiReasoning { effort: effort.to_string() }),
             max_output_tokens: args.max_tokens,
             text,
         };
@@ -464,6 +478,7 @@ impl OpenAIQueryBuilder {
             tools,
             stream: None, // Image generation doesn't use streaming
             temperature: args.temperature,
+            reasoning: None, // Image generation models don't take a reasoning effort
             max_output_tokens: args.max_tokens,
             text: None, // No structured output for image generation
         };
diff --git a/backend/windmill-ai/src/providers/other.rs b/backend/windmill-ai/src/providers/other.rs
index 650ce1c19e..f641daec64 100644
--- a/backend/windmill-ai/src/providers/other.rs
+++ b/backend/windmill-ai/src/providers/other.rs
@@ -35,6 +35,12 @@ pub struct OpenAICompletionRequest<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub temperature: Option<f32>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_effort: Option<&'a str>,
+    /// DeepSeek disables reasoning via a `thinking` object rather than an effort
+    /// token (`reasoning_effort: "none"` is rejected by their API).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub thinking: Option<serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_completion_tokens: Option<u32>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub response_format: Option<ResponseFormat>,
@@ -51,6 +57,32 @@ pub struct BuiltRequests {
     pub without_usage: String,
 }
 
+/// Provider-specific reasoning translation for OpenAI-compatible providers,
+/// mirroring the chat proxy's `applyReasoningToConfig`. Returns the effort token
+/// to send, an optional `thinking` object, and the temperature to keep:
+/// - DeepSeek disables reasoning via `thinking: {type: disabled}` (the effort
+///   token `"none"` is rejected by their API).
+/// - Mistral rejects sampling params when reasoning is on (greedy sampling
+///   requires `top_p == 1`), so temperature is dropped.
+fn provider_reasoning_fields<'a>(
+    provider: &AIProvider,
+    reasoning_effort: Option<&'a str>,
+    temperature: Option<f32>,
+) -> (Option<&'a str>, Option<serde_json::Value>, Option<f32>) {
+    let (effort, thinking) = match provider {
+        AIProvider::DeepSeek if reasoning_effort == Some("none") => {
+            (None, Some(serde_json::json!({ "type": "disabled" })))
+        }
+        _ => (reasoning_effort, None),
+    };
+    let temperature = if *provider == AIProvider::Mistral && reasoning_effort.is_some() {
+        None
+    } else {
+        temperature
+    };
+    (effort, thinking, temperature)
+}
+
 /// Query builder for providers using the OpenAI-compatible completion endpoint
 /// (Mistral, DeepSeek, Groq, TogetherAI, CustomAI, etc.)
 pub struct OtherQueryBuilder {
@@ -109,12 +141,17 @@ impl OtherQueryBuilder {
             None
         };
 
+        let (reasoning_effort, thinking, temperature) =
+            provider_reasoning_fields(&self.provider_kind, args.reasoning_effort, args.temperature);
+
         // Build request with stream_options for usage tracking
         let request_with_usage = OpenAICompletionRequest {
             model: args.model,
             messages: &prepared_messages,
             tools: args.tools,
-            temperature: args.temperature,
+            temperature,
+            reasoning_effort,
+            thinking: thinking.clone(),
             max_completion_tokens: args.max_tokens,
             response_format: response_format.clone(),
             tool_choice: tool_choice.clone(),
@@ -127,7 +164,9 @@ impl OtherQueryBuilder {
             model: args.model,
             messages: &prepared_messages,
             tools: args.tools,
-            temperature: args.temperature,
+            temperature,
+            reasoning_effort,
+            thinking,
             max_completion_tokens: args.max_tokens,
             response_format,
             tool_choice,
@@ -248,7 +287,7 @@ impl QueryBuilder for OtherQueryBuilder {
     }
 
     fn get_endpoint(&self, base_url: &str, _model: &str, _output_type: &OutputType) -> String {
-        if self.provider_kind.is_azure_openai(base_url) {
+        if self.provider_kind.is_azure(base_url) {
             AIProvider::build_azure_openai_url(base_url, "chat/completions")
         } else {
             format!("{}/chat/completions", base_url)
@@ -261,10 +300,57 @@ impl QueryBuilder for OtherQueryBuilder {
         base_url: &str,
         _output_type: &OutputType,
     ) -> Vec<(&'static str, String)> {
-        if self.provider_kind.is_azure_openai(base_url) {
+        if self.provider_kind.is_azure(base_url) {
             vec![("api-key", api_key.to_string())]
         } else {
             vec![("Authorization", format!("Bearer {}", api_key))]
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deepseek_off_translates_to_thinking_disabled() {
+        let (effort, thinking, temperature) =
+            provider_reasoning_fields(&AIProvider::DeepSeek, Some("none"), Some(0.5));
+        // "none" is rejected as an effort token, so it becomes a thinking disable.
+        assert_eq!(effort, None);
+        assert_eq!(thinking, Some(serde_json::json!({ "type": "disabled" })));
+        assert_eq!(temperature, Some(0.5));
+    }
+
+    #[test]
+    fn deepseek_level_passes_effort_through() {
+        let (effort, thinking, _) =
+            provider_reasoning_fields(&AIProvider::DeepSeek, Some("high"), None);
+        assert_eq!(effort, Some("high"));
+        assert!(thinking.is_none());
+    }
+
+    #[test]
+    fn mistral_drops_temperature_when_reasoning_on() {
+        let (effort, thinking, temperature) =
+            provider_reasoning_fields(&AIProvider::Mistral, Some("high"), Some(0.7));
+        assert_eq!(effort, Some("high"));
+        assert!(thinking.is_none());
+        assert_eq!(temperature, None);
+    }
+
+    #[test]
+    fn mistral_keeps_temperature_when_reasoning_off() {
+        let (_, _, temperature) = provider_reasoning_fields(&AIProvider::Mistral, None, Some(0.7));
+        assert_eq!(temperature, Some(0.7));
+    }
+
+    #[test]
+    fn other_providers_pass_reasoning_and_temperature_through() {
+        let (effort, thinking, temperature) =
+            provider_reasoning_fields(&AIProvider::OpenRouter, Some("high"), Some(0.3));
+        assert_eq!(effort, Some("high"));
+        assert!(thinking.is_none());
+        assert_eq!(temperature, Some(0.3));
+    }
+}
diff --git a/backend/windmill-ai/src/proxy.rs b/backend/windmill-ai/src/proxy.rs
index 891fa89486..fe4a0229d4 100644
--- a/backend/windmill-ai/src/proxy.rs
+++ b/backend/windmill-ai/src/proxy.rs
@@ -51,6 +51,7 @@ pub fn supports_openai_compatible_proxy(provider: &AIProvider) -> bool {
         provider,
         AIProvider::OpenAI
             | AIProvider::AzureOpenAI
+            | AIProvider::AzureFoundry
             | AIProvider::Mistral
             | AIProvider::DeepSeek
             | AIProvider::Groq
@@ -64,6 +65,7 @@ pub fn proxy_execution_mode(provider: &AIProvider) -> ProxyExecutionMode {
     match provider {
         AIProvider::OpenAI
         | AIProvider::AzureOpenAI
+        | AIProvider::AzureFoundry
         | AIProvider::Anthropic
         | AIProvider::Mistral
         | AIProvider::DeepSeek
@@ -89,7 +91,7 @@ pub fn build_openai_compatible_proxy_request(args: &ProxyBuildArgs<'_>) -> Resul
     };
 
     let base_url = credentials.base_url.trim_end_matches('/');
-    let is_azure = credentials.provider.is_azure_openai(base_url);
+    let is_azure = credentials.provider.is_azure(base_url);
     let url = if is_azure {
         AIProvider::build_azure_openai_url(base_url, args.path)
     } else {
@@ -201,6 +203,7 @@ mod tests {
         let cases = [
             (AIProvider::OpenAI, ProxyExecutionMode::HttpForward),
             (AIProvider::AzureOpenAI, ProxyExecutionMode::HttpForward),
+            (AIProvider::AzureFoundry, ProxyExecutionMode::HttpForward),
             (AIProvider::Anthropic, ProxyExecutionMode::HttpForward),
             (AIProvider::Mistral, ProxyExecutionMode::HttpForward),
             (AIProvider::DeepSeek, ProxyExecutionMode::HttpForward),
@@ -253,6 +256,35 @@ mod tests {
             .contains(&("api-key".to_string(), "api-key".to_string())));
     }
 
+    #[test]
+    fn builds_azure_foundry_proxy_request() {
+        // Foundry's OpenAI-compatible endpoint uses the same Azure conventions
+        // (api-key header, /openai -> /openai/v1 path) as Azure OpenAI.
+        let credentials = credentials(
+            AIProvider::AzureFoundry,
+            "https://example.services.ai.azure.com/openai",
+        );
+        let method = Method::POST;
+        let headers = HeaderMap::new();
+
+        let request = build_openai_compatible_proxy_request(&ProxyBuildArgs {
+            method: &method,
+            path: "chat/completions",
+            headers: &headers,
+            body: br#"{"model":"gpt-4o","messages":[]}"#,
+            credentials: &credentials,
+        })
+        .unwrap();
+
+        assert_eq!(
+            request.url,
+            "https://example.services.ai.azure.com/openai/v1/chat/completions"
+        );
+        assert!(request
+            .headers
+            .contains(&("api-key".to_string(), "api-key".to_string())));
+    }
+
     #[test]
     fn injects_user_into_proxy_body() {
         let mut credentials = credentials(AIProvider::OpenAI, "https://api.openai.com/v1");
@@ -273,4 +305,31 @@ mod tests {
         assert_eq!(body["user"], "user-1");
         assert_eq!(body["model"], "gpt-4o");
     }
+
+    #[test]
+    fn foundry_routes_claude_to_anthropic_messages_api() {
+        use crate::providers::create_query_builder;
+        use crate::types::OutputType;
+
+        let creds = credentials(
+            AIProvider::AzureFoundry,
+            "https://wm-test-ai.services.ai.azure.com/openai/v1",
+        );
+
+        // Claude deployment -> Anthropic Messages API surface + x-api-key auth.
+        let claude = create_query_builder(&creds, "claude-sonnet-5");
+        assert_eq!(
+            claude.get_endpoint(&creds.base_url, "claude-sonnet-5", &OutputType::Text),
+            "https://wm-test-ai.services.ai.azure.com/anthropic/v1/messages"
+        );
+        let auth = claude.get_auth_headers("api-key", &creds.base_url, &OutputType::Text);
+        assert!(auth.contains(&("x-api-key", "api-key".to_string())));
+
+        // OpenAI-compatible deployment -> chat completions surface.
+        let gpt = create_query_builder(&creds, "gpt-4o");
+        assert_eq!(
+            gpt.get_endpoint(&creds.base_url, "gpt-4o", &OutputType::Text),
+            "https://wm-test-ai.services.ai.azure.com/openai/v1/chat/completions"
+        );
+    }
 }
diff --git a/backend/windmill-ai/src/query_builder.rs b/backend/windmill-ai/src/query_builder.rs
index 9830045f57..79fca4bd7d 100644
--- a/backend/windmill-ai/src/query_builder.rs
+++ b/backend/windmill-ai/src/query_builder.rs
@@ -12,6 +12,9 @@ pub struct BuildRequestArgs<'a> {
     pub tools: Option<&'a [ToolDef]>,
     pub model: &'a str,
     pub temperature: Option<f32>,
+    /// Provider-native reasoning effort token (e.g. `low`, `high`, `none`).
+    /// Each `build_request` maps it onto the provider's thinking config.
+    pub reasoning_effort: Option<&'a str>,
     pub max_tokens: Option<u32>,
     pub output_schema: Option<&'a OpenAPISchema>,
     pub output_type: &'a OutputType,
diff --git a/backend/windmill-ai/src/sse.rs b/backend/windmill-ai/src/sse.rs
index bb1b9d9731..66ff7da9de 100644
--- a/backend/windmill-ai/src/sse.rs
+++ b/backend/windmill-ai/src/sse.rs
@@ -9,7 +9,9 @@ use windmill_common::{error::Error, utils::rd_string};
 use crate::{
     ai_google::{parse_gemini_sse_event, GeminiUsageMetadata},
     ai_types::UrlCitation,
-    ai_types::{ExtraContent, GoogleExtraContent, OpenAIFunction, OpenAIToolCall},
+    ai_types::{
+        AnthropicExtraContent, ExtraContent, GoogleExtraContent, OpenAIFunction, OpenAIToolCall,
+    },
     query_builder::StreamEventSink,
     types::StreamingEvent,
 };
@@ -30,6 +32,10 @@ pub struct OpenAIChoiceDeltaToolCall {
 #[derive(Deserialize)]
 pub struct OpenAIChoiceDelta {
     pub content: Option<String>,
+    /// Reasoning summary streamed by providers that expose it (e.g. DeepSeek's
+    /// `reasoning_content`). Rendered as a "thinking" affordance.
+    #[serde(default)]
+    pub reasoning_content: Option<String>,
     pub tool_calls: Option<Vec<OpenAIChoiceDeltaToolCall>>,
 }
 
@@ -142,6 +148,13 @@ impl SSEParser for OpenAISSEParser {
 
             if let Some(mut choices) = event.choices.filter(|s| !s.is_empty()) {
                 if let Some(delta) = choices.remove(0).delta {
+                    if let Some(reasoning) = delta.reasoning_content.filter(|s| !s.is_empty()) {
+                        let event = StreamingEvent::ReasoningTokenDelta { content: reasoning };
+                        self.stream_event_processor
+                            .send(event, &mut self.events_str)
+                            .await?;
+                    }
+
                     if let Some(content) = delta.content.filter(|s| !s.is_empty()) {
                         self.accumulated_content.push_str(&content);
                         let event = StreamingEvent::TokenDelta { content };
@@ -216,6 +229,16 @@ pub enum AnthropicContentBlockStart {
         id: String,
         name: String,
     },
+    #[serde(rename = "thinking")]
+    Thinking {
+        #[serde(default)]
+        thinking: String,
+    },
+    #[serde(rename = "redacted_thinking")]
+    RedactedThinking {
+        #[serde(default)]
+        data: String,
+    },
     #[serde(other)]
     Unknown,
 }
@@ -240,6 +263,10 @@ pub enum AnthropicDelta {
     InputJsonDelta { partial_json: String },
     #[serde(rename = "citations_delta")]
     CitationsDelta { citation: AnthropicCitationDelta },
+    #[serde(rename = "thinking_delta")]
+    ThinkingDelta { thinking: String },
+    #[serde(rename = "signature_delta")]
+    SignatureDelta { signature: String },
     #[serde(other)]
     Unknown,
 }
@@ -292,6 +319,7 @@ pub enum AnthropicSSEEvent {
 #[allow(dead_code)]
 enum ContentBlockState {
     Text,
+    Thinking,
     ToolUse { id: String, name: String },
     Unknown,
 }
@@ -310,6 +338,11 @@ pub struct AnthropicSSEParser {
     pub used_websearch: bool,
     /// Token usage from message_delta event
     pub usage: Option<AnthropicUsage>,
+    /// Claude thinking block accumulated from `thinking`/`signature` deltas
+    /// (or a redacted block). Attached to the first tool call of the turn so it
+    /// can be replayed before `tool_use` (required by Claude when thinking is on).
+    pending_reasoning: Option<AnthropicExtraContent>,
+    reasoning_attached: bool,
 }
 
 impl AnthropicSSEParser {
@@ -323,6 +356,8 @@ impl AnthropicSSEParser {
             annotations: Vec::new(),
             used_websearch: false,
             usage: None,
+            pending_reasoning: None,
+            reasoning_attached: false,
         }
     }
 }
@@ -363,6 +398,17 @@ impl SSEParser for AnthropicSSEParser {
                             self.stream_event_processor
                                 .send(event, &mut self.events_str)
                                 .await?;
+                            // Attach the turn's thinking block to the first tool call so it
+                            // can be replayed before tool_use on the next request.
+                            let extra_content = if self.reasoning_attached {
+                                None
+                            } else {
+                                self.reasoning_attached = true;
+                                self.pending_reasoning.take().map(|anthropic| ExtraContent {
+                                    anthropic: Some(anthropic),
+                                    ..Default::default()
+                                })
+                            };
                             // Initialize tool call accumulator
                             self.accumulated_tool_calls.insert(
                                 index as i64,
@@ -370,10 +416,35 @@ impl SSEParser for AnthropicSSEParser {
                                     id,
                                     function: OpenAIFunction { name, arguments: String::new() },
                                     r#type: "function".to_string(),
-                                    extra_content: None,
+                                    extra_content,
                                 },
                             );
                         }
+                        AnthropicContentBlockStart::Thinking { thinking } => {
+                            self.content_blocks
+                                .insert(index, ContentBlockState::Thinking);
+                            let entry = self.pending_reasoning.get_or_insert_with(Default::default);
+                            if !thinking.is_empty() {
+                                entry
+                                    .thinking
+                                    .get_or_insert_with(String::new)
+                                    .push_str(&thinking);
+                                self.stream_event_processor
+                                    .send(
+                                        StreamingEvent::ReasoningTokenDelta { content: thinking },
+                                        &mut self.events_str,
+                                    )
+                                    .await?;
+                            }
+                        }
+                        AnthropicContentBlockStart::RedactedThinking { data } => {
+                            // Redacted blocks arrive whole (no deltas).
+                            self.content_blocks
+                                .insert(index, ContentBlockState::Unknown);
+                            self.pending_reasoning
+                                .get_or_insert_with(Default::default)
+                                .redacted_thinking = Some(data);
+                        }
                         AnthropicContentBlockStart::ServerToolUse { name, .. } => {
                             // Detect websearch tool usage
                             if name == "web_search" {
@@ -417,6 +488,34 @@ impl SSEParser for AnthropicSSEParser {
                                 title: citation.title,
                             });
                         }
+                        AnthropicDelta::ThinkingDelta { thinking } => {
+                            if let Some(ContentBlockState::Thinking) =
+                                self.content_blocks.get(&index)
+                            {
+                                self.pending_reasoning
+                                    .get_or_insert_with(Default::default)
+                                    .thinking
+                                    .get_or_insert_with(String::new)
+                                    .push_str(&thinking);
+                                self.stream_event_processor
+                                    .send(
+                                        StreamingEvent::ReasoningTokenDelta { content: thinking },
+                                        &mut self.events_str,
+                                    )
+                                    .await?;
+                            }
+                        }
+                        AnthropicDelta::SignatureDelta { signature } => {
+                            if let Some(ContentBlockState::Thinking) =
+                                self.content_blocks.get(&index)
+                            {
+                                self.pending_reasoning
+                                    .get_or_insert_with(Default::default)
+                                    .signature
+                                    .get_or_insert_with(String::new)
+                                    .push_str(&signature);
+                            }
+                        }
                         AnthropicDelta::Unknown => {}
                     }
                 }
@@ -495,6 +594,15 @@ impl SSEParser for GeminiSSEParser {
             return Ok(());
         };
 
+        if let Some(reasoning) = parsed.reasoning.filter(|s| !s.is_empty()) {
+            self.stream_event_processor
+                .send(
+                    StreamingEvent::ReasoningTokenDelta { content: reasoning },
+                    &mut self.events_str,
+                )
+                .await?;
+        }
+
         if let Some(text) = parsed.text {
             self.accumulated_content.push_str(&text);
             self.stream_event_processor
@@ -522,7 +630,7 @@ impl SSEParser for GeminiSSEParser {
 
             let extra_content = tool_call.thought_signature.map(|sig| ExtraContent {
                 google: Some(GoogleExtraContent { thought_signature: Some(sig) }),
-                bedrock: None,
+                ..Default::default()
             });
 
             self.accumulated_tool_calls.insert(
@@ -805,3 +913,76 @@ impl SSEParser for OpenAIResponsesSSEParser {
         Ok(())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reasoning_token_delta_serializes_with_snake_case_tag() {
+        let event = StreamingEvent::ReasoningTokenDelta { content: "hmm".to_string() };
+        let json: serde_json::Value =
+            serde_json::from_str(&serde_json::to_string(&event).unwrap()).unwrap();
+        assert_eq!(json["type"], "reasoning_token_delta");
+        assert_eq!(json["content"], "hmm");
+    }
+
+    #[test]
+    fn openai_delta_parses_reasoning_content() {
+        // DeepSeek and similar stream reasoning under `reasoning_content`.
+        let delta: OpenAIChoiceDelta =
+            serde_json::from_str(r#"{"reasoning_content":"let me think"}"#).unwrap();
+        assert_eq!(delta.reasoning_content.as_deref(), Some("let me think"));
+    }
+
+    #[test]
+    fn parses_anthropic_thinking_events() {
+        let start: AnthropicSSEEvent = serde_json::from_str(
+            r#"{"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":"x"}}"#,
+        )
+        .unwrap();
+        assert!(matches!(
+            start,
+            AnthropicSSEEvent::ContentBlockStart {
+                content_block: AnthropicContentBlockStart::Thinking { .. },
+                ..
+            }
+        ));
+
+        let thinking_delta: AnthropicSSEEvent = serde_json::from_str(
+            r#"{"type":"content_block_delta","index":0,"delta":{"type":"thinking_delta","thinking":"more"}}"#,
+        )
+        .unwrap();
+        assert!(matches!(
+            thinking_delta,
+            AnthropicSSEEvent::ContentBlockDelta {
+                delta: AnthropicDelta::ThinkingDelta { .. },
+                ..
+            }
+        ));
+
+        let signature_delta: AnthropicSSEEvent = serde_json::from_str(
+            r#"{"type":"content_block_delta","index":0,"delta":{"type":"signature_delta","signature":"sig"}}"#,
+        )
+        .unwrap();
+        assert!(matches!(
+            signature_delta,
+            AnthropicSSEEvent::ContentBlockDelta {
+                delta: AnthropicDelta::SignatureDelta { .. },
+                ..
+            }
+        ));
+
+        let redacted: AnthropicSSEEvent = serde_json::from_str(
+            r#"{"type":"content_block_start","index":0,"content_block":{"type":"redacted_thinking","data":"abc"}}"#,
+        )
+        .unwrap();
+        assert!(matches!(
+            redacted,
+            AnthropicSSEEvent::ContentBlockStart {
+                content_block: AnthropicContentBlockStart::RedactedThinking { .. },
+                ..
+            }
+        ));
+    }
+}
diff --git a/backend/windmill-ai/src/types.rs b/backend/windmill-ai/src/types.rs
index 8f864468db..6991e0e0d3 100644
--- a/backend/windmill-ai/src/types.rs
+++ b/backend/windmill-ai/src/types.rs
@@ -203,6 +203,10 @@ pub struct ProviderWithResource {
     pub kind: AIProvider,
     pub resource: ProviderResource,
     pub model: String,
+    /// Provider-native reasoning effort token (e.g. `low`, `high`, `none`).
+    /// Belongs to the model selection, so it rides on the provider config.
+    #[serde(default)]
+    pub reasoning_effort: Option<String>,
 }
 
 impl ProviderWithResource {
@@ -214,6 +218,12 @@ impl ProviderWithResource {
         &self.model
     }
 
+    /// The reasoning effort to thread to the provider, treating an empty string
+    /// (e.g. a cleared flow input) as unset.
+    pub fn get_reasoning_effort(&self) -> Option<&str> {
+        self.reasoning_effort.as_deref().filter(|s| !s.is_empty())
+    }
+
     pub async fn get_base_url(&self, db: &DB) -> Result<String, Error> {
         self.kind
             .get_base_url(self.resource.base_url.clone(), db)
@@ -365,6 +375,10 @@ pub struct AIAgentResult<'a> {
 pub enum StreamingEvent {
     /// Individual token from the AI response
     TokenDelta { content: String },
+    /// Individual token of the model's reasoning / thinking summary. Emitted
+    /// before the answer when reasoning is enabled; renderable as a "thinking"
+    /// affordance (thinking tokens bill regardless of whether they are shown).
+    ReasoningTokenDelta { content: String },
     /// Tool call has started
     ToolCall { call_id: String, function_name: String },
     /// Tool call arguments are complete
diff --git a/backend/windmill-api-assets/Cargo.toml b/backend/windmill-api-assets/Cargo.toml
index 1ea16c3f0d..c75715a3ac 100644
--- a/backend/windmill-api-assets/Cargo.toml
+++ b/backend/windmill-api-assets/Cargo.toml
@@ -8,11 +8,16 @@ edition.workspace = true
 name = "windmill_api_assets"
 path = "src/lib.rs"
 
+[features]
+private = ["windmill-common/private"]
+
 [dependencies]
 windmill-api-auth.workspace = true
 windmill-common = { workspace = true, default-features = false }
+windmill-parser-sql-asset.workspace = true
 axum.workspace = true
 chrono.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 sqlx.workspace = true
+tracing.workspace = true
diff --git a/backend/windmill-api-assets/src/backfill_oss.rs b/backend/windmill-api-assets/src/backfill_oss.rs
new file mode 100644
index 0000000000..b5f0da1d58
--- /dev/null
+++ b/backend/windmill-api-assets/src/backfill_oss.rs
@@ -0,0 +1,18 @@
+//! OSS fallback: backfilling a range of partitions is an enterprise
+//! feature (the resolution/enumeration logic lives in `windmill-ee-private`,
+//! `windmill-api-assets/src/backfill_ee.rs`). Single-partition runs with an
+//! explicit `partition` arg remain available in OSS.
+
+use windmill_common::error::{Error, Result};
+
+use crate::{PartitionsInRangeQuery, PartitionsInRangeResponse};
+
+pub(crate) async fn partitions_in_range(
+    _tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+    _w_id: &str,
+    _q: &PartitionsInRangeQuery,
+) -> Result<PartitionsInRangeResponse> {
+    Err(Error::BadRequest(
+        "Backfilling a range of partitions is an enterprise feature".to_string(),
+    ))
+}
diff --git a/backend/windmill-api-assets/src/lib.rs b/backend/windmill-api-assets/src/lib.rs
index be685b2fe6..997879e155 100644
--- a/backend/windmill-api-assets/src/lib.rs
+++ b/backend/windmill-api-assets/src/lib.rs
@@ -13,7 +13,19 @@ use windmill_common::{
     utils::escape_ilike_pattern,
 };
 
-use windmill_api_auth::ApiAuthed;
+use windmill_api_auth::{build_scope_path_predicate, ApiAuthed};
+
+// Partition-range backfill preview. The logic (producer resolution, range
+// enumeration, status join) is enterprise: the `private` build compiles the
+// EE module, the public build a stub that errors.
+#[cfg(feature = "private")]
+mod backfill_ee;
+#[cfg(feature = "private")]
+use backfill_ee as backfill;
+#[cfg(not(feature = "private"))]
+mod backfill_oss;
+#[cfg(not(feature = "private"))]
+use backfill_oss as backfill;
 
 pub fn workspaced_service() -> Router {
     Router::new()
@@ -22,6 +34,225 @@ pub fn workspaced_service() -> Router {
         .route("/list_favorites", get(list_favorites))
         .route("/graph", get(asset_graph))
         .route("/pipelines", get(list_pipeline_folders))
+        .route("/partitions", get(list_partitions))
+        .route("/partitions_in_range", get(list_partitions_in_range))
+        .route("/asset_schemas", get(list_asset_schemas))
+        .route("/record_materialization", post(record_materialization))
+        .route("/macros", get(list_macros))
+}
+
+// One registry macro, with its full definition — drives the macro-explorer
+// drawer (body preview) and the DuckDB editor autocomplete (signatures).
+#[derive(Serialize)]
+struct MacroListItem {
+    name: String,
+    params: String,
+    body: String,
+    is_table: bool,
+    provider_path: String,
+}
+
+// Every workspace macro (`// macros` libraries), grouped client-side by
+// provider. Small by construction — one row per macro definition. The rows
+// copy script body text, so visibility must match reading the provider
+// script itself: the EXISTS join runs under the user_db transaction (script
+// RLS filters libraries the caller can't read) and the scope predicate
+// covers path-scoped tokens, mirroring `list_scripts`.
+async fn list_macros(
+    authed: ApiAuthed,
+    Path(w_id): Path<String>,
+    Extension(user_db): Extension<UserDB>,
+) -> JsonResult<Vec<MacroListItem>> {
+    let scope_allowed = build_scope_path_predicate(&authed, "scripts", "read");
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = sqlx::query!(
+        r#"SELECT m.name AS "name!", m.params AS "params!", m.body AS "body!",
+                  m.is_table_macro AS "is_table_macro!", m.provider_path AS "provider_path!"
+           FROM macro_definition m
+           WHERE m.workspace_id = $1
+             AND EXISTS (
+                SELECT 1 FROM script s
+                WHERE s.workspace_id = m.workspace_id
+                  AND s.path = m.provider_path
+                  AND s.archived = false
+                  AND s.deleted = false
+             )
+           ORDER BY m.provider_path, m.name"#,
+        &w_id,
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    Ok(Json(
+        rows.into_iter()
+            .filter(|r| scope_allowed(&r.provider_path))
+            .map(|r| MacroListItem {
+                name: r.name,
+                params: r.params,
+                body: r.body,
+                is_table: r.is_table_macro,
+                provider_path: r.provider_path,
+            })
+            .collect(),
+    ))
+}
+
+#[derive(Deserialize)]
+struct PartitionsQuery {
+    // The materialized asset path (`<ducklake>/<table>`).
+    path: String,
+}
+
+// Per-partition materialization status for a ducklake asset — drives the
+// partition-status grid and the backfill worklist. Materialization targets are
+// ducklake-only in v1, so the kind is fixed.
+async fn list_partitions(
+    authed: ApiAuthed,
+    Path(w_id): Path<String>,
+    Extension(user_db): Extension<UserDB>,
+    Query(q): Query<PartitionsQuery>,
+) -> JsonResult<Vec<windmill_common::materialization::MaterializedPartition>> {
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = windmill_common::materialization::list_materialized_partitions(
+        &mut *tx,
+        &w_id,
+        AssetKind::Ducklake,
+        &q.path,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(Json(rows))
+}
+
+// Only the EE `backfill` module reads the fields; the OSS stub errors without
+// touching them.
+#[cfg_attr(not(feature = "private"), allow(dead_code))]
+#[derive(Deserialize)]
+struct PartitionsInRangeQuery {
+    // The materialized ducklake asset path (`<ducklake>/<table>`).
+    path: String,
+    // Inclusive calendar-day range (YYYY-MM-DD), local to the producer's
+    // partition tz.
+    from: chrono::NaiveDate,
+    to: chrono::NaiveDate,
+}
+
+#[derive(Serialize)]
+struct PartitionInRange {
+    partition: String,
+    // `missing` | `running` | `materialized` | `failed` — `missing` means no
+    // materialization was ever recorded for the slice.
+    status: &'static str,
+}
+
+#[derive(Serialize)]
+struct PartitionsInRangeResponse {
+    // The pipeline script that materializes the asset (managed `// materialize`
+    // target, or a partitioned writer using the SDK helpers) — the runnable a
+    // backfill launches (with an explicit `partition` arg per slice).
+    producer_path: String,
+    partition_kind: String,
+    partitions: Vec<PartitionInRange>,
+}
+
+// Backfill range preview: every partition the producer's `// partitioned` spec
+// expects in `[from, to]`, joined with what `materialized_partition` records —
+// the missing/failed subset is the backfill worklist. The logic is in the
+// `backfill` module pair: EE resolves and enumerates, the OSS stub errors
+// (single-partition runs stay available everywhere; fanning out over a range
+// is enterprise).
+async fn list_partitions_in_range(
+    authed: ApiAuthed,
+    Path(w_id): Path<String>,
+    Extension(user_db): Extension<UserDB>,
+    Query(q): Query<PartitionsInRangeQuery>,
+) -> JsonResult<PartitionsInRangeResponse> {
+    let mut tx = user_db.begin(&authed).await?;
+    let res = backfill::partitions_in_range(&mut tx, &w_id, &q).await?;
+    tx.commit().await?;
+    Ok(Json(res))
+}
+
+// Per-asset captured output schema versions for a ducklake asset (gap #2a) —
+// the schema-evolution history persisted after each managed `// materialize`.
+// Newest version first; materialization targets are ducklake-only in v1, so the
+// kind is fixed.
+async fn list_asset_schemas(
+    authed: ApiAuthed,
+    Path(w_id): Path<String>,
+    Extension(user_db): Extension<UserDB>,
+    Query(q): Query<PartitionsQuery>,
+) -> JsonResult<Vec<windmill_common::materialization::AssetSchemaVersion>> {
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = windmill_common::materialization::list_asset_schemas(
+        &mut *tx,
+        &w_id,
+        AssetKind::Ducklake,
+        &q.path,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(Json(rows))
+}
+
+// Record a materialization outcome from a polyglot (Python/TS) `wmill.ducklake`
+// helper running as a pipeline step. The DuckDB `// materialize` engine records
+// this itself; the SDK helpers post here instead so SDK-materialized slices show
+// up in the grid identically. When the helper also captured the output schema,
+// that schema version is upserted too. RLS-scoped to the caller's workspace.
+async fn record_materialization(
+    authed: ApiAuthed,
+    Path(w_id): Path<String>,
+    Extension(user_db): Extension<UserDB>,
+    Json(req): Json<windmill_common::materialization::RecordMaterializationRequest>,
+) -> JsonResult<()> {
+    let mut tx = user_db.clone().begin(&authed).await?;
+    windmill_common::materialization::record_materialization(
+        &mut *tx,
+        &w_id,
+        req.asset_kind,
+        &req.asset_path,
+        &req.partition,
+        req.status,
+        req.snapshot_id,
+        req.row_count,
+        req.job_id,
+        req.error.as_deref(),
+    )
+    .await?;
+    tx.commit().await?;
+    // Schema capture is independently best-effort (its own transaction for the
+    // per-asset advisory lock) and must never roll back the partition record
+    // above — mirroring the worker's `record_mat`. A lost schema version
+    // degrades the history, not the run. Only a successful (`Materialized`) write
+    // advances the recorded schema — a failed/running write must not (and a
+    // client shouldn't be able to bump the history by attaching a schema to one).
+    let is_materialized = matches!(
+        req.status,
+        windmill_common::materialization::MaterializationStatus::Materialized
+    );
+    if let (true, Some(columns)) = (is_materialized, req.schema.as_ref()) {
+        let res: windmill_common::error::Result<()> = async {
+            let mut tx = user_db.clone().begin(&authed).await?;
+            windmill_common::materialization::record_asset_schema(
+                &mut tx,
+                &w_id,
+                req.asset_kind,
+                &req.asset_path,
+                columns,
+                req.snapshot_id,
+                req.job_id,
+            )
+            .await?;
+            tx.commit().await?;
+            Ok(())
+        }
+        .await;
+        if let Err(e) = res {
+            tracing::warn!("failed to record captured asset schema: {e:#}");
+        }
+    }
+    Ok(Json(()))
 }
 
 #[derive(Deserialize)]
@@ -383,6 +614,21 @@ struct GraphQuery {
 struct GraphAssetNode {
     kind: AssetKind,
     path: String,
+    // Fork workspaces only: 'fork' when the fork has materialized this ducklake asset itself,
+    // 'deferred' when reads fall back to the parent workspace's current table (defer view).
+    // Absent outside forks, for non-ducklake assets, and for assets never materialized
+    // anywhere. Lockstep with TS `AssetGraphAssetNode.fork_materialization`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    fork_materialization: Option<String>,
+    // The base dimension this asset is the SCD2 `<dim>_current` companion view
+    // of — set only on a `ducklake://…/<dim>_current` node whose producer
+    // declares `// materialize … history` on `<dim>`. The producer edge already
+    // links it to that script (both writes are registered at deploy); this lets
+    // the canvas render it as a derived "current view" of the base rather than an
+    // unrelated table. Absent for every other asset. Lockstep with TS
+    // `AssetGraphAssetNode.derived_from`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    derived_from: Option<String>,
 }
 
 #[derive(Serialize, Debug)]
@@ -393,6 +639,100 @@ struct GraphRunnableNode {
     // pipeline-member visual state on the frontend.
     #[serde(skip_serializing_if = "std::ops::Not::not", default)]
     in_pipeline: bool,
+    // Annotation badges parsed from the deployed script body, so the canvas
+    // shows partition/freshness/tag/retry/data-test chips on *deployed* nodes
+    // (not only on live-edited drafts, which the frontend parses itself). Kept
+    // in lockstep with the TS `AssetGraphRunnableNode` fields the node renders.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    partition_kind: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    freshness: Option<String>,
+    // Completion time of the most recently started successful run of this
+    // pipeline member. The canvas checks it against the `// freshness` window
+    // to color the badge fresh/stale. The badge itself is passive; on EE the
+    // freshness watchdog (windmill-queue) separately re-runs stale
+    // unpartitioned producers. Absent when no successful run is visible to
+    // the caller (job RLS applies).
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    last_success_at: Option<chrono::DateTime<chrono::Utc>>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    tag: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    retry: Option<windmill_common::assets::RetrySpec>,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    data_tests: Vec<windmill_common::assets::DataTest>,
+    // `// column <out> <- <src>.<col>` declared column-level lineage, surfaced
+    // so the canvas can draw the column-lineage view on deployed nodes (not
+    // only live drafts). Lockstep with TS `AssetGraphRunnableNode.column_lineage`.
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    column_lineage: Vec<windmill_common::assets::ColumnLineage>,
+    // `// materialize <asset>` target — the asset this script's `column_lineage`
+    // describes. Lets the column-graph anchor lineage to the exact output asset
+    // instead of guessing a ducklake write-edge (a multi-output script writes
+    // several). Absent for scripts with no `// materialize` annotation.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    materialize_target: Option<MaterializeTargetNode>,
+    // Managed `// materialize` write strategy (`replace` | `append` | `merge`),
+    // absent for non-materializing or `manual` scripts. Surfaced so the asset
+    // panel can tell whether the captured schema can evolve: only whole-table
+    // `replace` (CREATE OR REPLACE) can change columns run-to-run; `append` /
+    // `merge` / any partitioned write INSERTs into a fixed-schema table.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    materialize_strategy: Option<String>,
+    // `on_schema_change=ignore` on the managed materialize — the producer's
+    // opt-out from downstream schema-contract warnings. Threaded to the editor
+    // so its client-side contract mirror suppresses the same warnings the
+    // server check does. Only serialized when set to `ignore` (default `warn`
+    // is absent). Lockstep with TS `AssetGraphRunnableNode.materialize_on_schema_change`.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    materialize_on_schema_change: Option<String>,
+    // Macros this script provides to the workspace registry (deployed
+    // `// macros` library). Drives the library node state + details-pane
+    // signature list. Lockstep with TS `AssetGraphRunnableNode.macros`.
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    macros: Vec<MacroInfo>,
+}
+
+// One macro of a `// macros` library, as surfaced on its graph node.
+#[derive(Serialize, Debug, Clone)]
+struct MacroInfo {
+    name: String,
+    // Verbatim parameter list, for the `name(params)` signature display.
+    params: String,
+    is_table: bool,
+}
+
+// A macro-library → consumer edge: the consumer calls `macro_names` of
+// `lib_path`'s macros (deploy-recorded detection), or pulls in the whole
+// library via `// use` (`via_use`, in which case `macro_names` lists all of
+// the library's macros).
+#[derive(Serialize, Debug)]
+struct MacroEdge {
+    lib_path: String,
+    consumer_path: String,
+    macro_names: Vec<String>,
+    via_use: bool,
+}
+
+// The output asset a producer's column lineage belongs to (the `// materialize`
+// target). Kept minimal — the column graph only needs (kind, path) to anchor.
+#[derive(Serialize, Debug)]
+struct MaterializeTargetNode {
+    kind: windmill_common::assets::AssetKind,
+    path: String,
+}
+
+// The partition's kind word for the node badge (the full PartitionSpec carries
+// tz/format/start, which the badge doesn't need).
+fn partition_kind_word(kind: &windmill_common::assets::PartitionKind) -> &'static str {
+    use windmill_common::assets::PartitionKind::*;
+    match kind {
+        Daily => "daily",
+        Hourly => "hourly",
+        Weekly => "weekly",
+        Monthly => "monthly",
+        Dynamic { .. } => "dynamic",
+    }
 }
 
 // Lineage edge from parsed r/w usages. One per (runnable, asset, access_type)
@@ -466,18 +806,42 @@ enum TriggerEdge {
     },
 }
 
+// Ordering-only "must-run-after" edge: `runnable_path`'s data test reads
+// `asset` (a `// data_test relationships` ref, or a custom test whose body
+// reads a known pipeline asset), so the asset's in-pipeline producer must
+// materialize before `runnable_path` runs. NOT a data-consumption edge — the
+// tested script doesn't ingest the asset's rows, it only needs the table to
+// exist at test time. Rendered dashed (like macro edges) and fed into the
+// cascade topo-sort so a cold cascade orders the referenced dimension first.
+// Only emitted when the referenced asset has a producer in the graph; an
+// external table (no producer) adds no edge — the runtime error stands.
+#[derive(Serialize, Debug)]
+struct TestEdge {
+    producer_kind: AssetUsageKind,
+    producer_path: String,
+    runnable_kind: AssetUsageKind,
+    runnable_path: String,
+    asset_kind: AssetKind,
+    asset_path: String,
+}
+
 #[derive(Serialize, Debug)]
 struct AssetGraphResponse {
     assets: Vec<GraphAssetNode>,
     runnables: Vec<GraphRunnableNode>,
     edges: Vec<GraphEdge>,
     triggers: Vec<TriggerEdge>,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    macro_edges: Vec<MacroEdge>,
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    test_edges: Vec<TestEdge>,
 }
 
 async fn asset_graph(
     authed: ApiAuthed,
     Path(w_id): Path<String>,
     Extension(user_db): Extension<UserDB>,
+    Extension(db): Extension<windmill_common::DB>,
     Query(q): Query<GraphQuery>,
 ) -> JsonResult<AssetGraphResponse> {
     let mut tx = user_db.begin(&authed).await?;
@@ -585,15 +949,22 @@ async fn asset_graph(
     .await?;
 
     // Which scripts in scope are pipeline members (have `// pipeline`).
+    // Pipeline members + their latest deployed body, so the graph can surface
+    // annotation badges (partition/freshness/tag/retry/data_test) on deployed
+    // nodes. `DISTINCT ON (path) … ORDER BY created_at DESC` picks the newest
+    // non-archived version per path (a redeploy archives the prior one, but be
+    // defensive against transient overlaps).
     let pipeline_member_paths = sqlx::query!(
         r#"
-        SELECT path AS "path!"
+        SELECT DISTINCT ON (path) path AS "path!", content AS "content!",
+               language AS "language!: windmill_common::scripts::ScriptLang"
         FROM script
         WHERE workspace_id = $1
           AND auto_kind = 'pipeline'
           AND archived = false
           AND deleted = false
           AND ($2::text IS NULL OR path LIKE $2)
+        ORDER BY path, created_at DESC
         "#,
         &w_id,
         folder_filter.as_deref(),
@@ -601,6 +972,46 @@ async fn asset_graph(
     .fetch_all(&mut *tx)
     .await?;
 
+    // Newest successful completed run per pipeline member, for the passive
+    // freshness status on the canvas. Correlated per-path lookup walks
+    // ix_job_root_job_index_by_path_2 newest-first until the first success,
+    // so cost is bounded by the member count, not run history. "Newest" is
+    // by created_at (the index order), not completed_at: with overlapping
+    // runs of one path this can pick an earlier completion, erring toward
+    // stale — never toward false-fresh. Inside the user tx so job-visibility
+    // RLS applies — a caller who can't see the runs gets no timestamp rather
+    // than leaked completion times.
+    let member_paths: Vec<String> = pipeline_member_paths
+        .iter()
+        .map(|r| r.path.clone())
+        .collect();
+    let last_success_rows = sqlx::query!(
+        r#"
+        SELECT p.path AS "path!",
+               (SELECT c.completed_at
+                  FROM v2_job j
+                  JOIN v2_job_completed c ON c.id = j.id
+                 WHERE j.workspace_id = $1
+                   AND j.runnable_path = p.path
+                   AND j.parent_job IS NULL
+                   -- No 'singlestepflow': flows may share a script's path, and
+                   -- a same-path flow run must not read as the script being
+                   -- fresh (false-fresh). Script retries land as native
+                   -- 'script' jobs; only the rare flow-wrapper fallback is
+                   -- missed, which errs stale. Kept in lockstep with the
+                   -- freshness watchdog's queries (freshness_watchdog_ee).
+                   AND j.kind IN ('script', 'preview')
+                   AND c.status = 'success'
+                 ORDER BY j.created_at DESC
+                 LIMIT 1) AS last_success_at
+          FROM unnest($2::text[]) AS p(path)
+        "#,
+        &w_id,
+        &member_paths,
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
     // Existing scripts / flows in the workspace. Used to filter out
     // orphan trigger rows whose `script_path` no longer resolves — those
     // would otherwise be added to `runnable_set` below and surface as
@@ -622,8 +1033,80 @@ async fn asset_graph(
     .fetch_all(&mut *tx)
     .await?;
 
+    // Workspace macro registry + deploy-recorded call edges. Definitions are
+    // fetched unfiltered so an out-of-folder library still appears as the
+    // provider endpoint of in-scope consumers' edges; consumers honor the
+    // folder filter like every other runnable query.
+    let macro_def_rows = sqlx::query!(
+        r#"SELECT name AS "name!", provider_path AS "provider_path!",
+                  params AS "params!", is_table_macro AS "is_table_macro!"
+           FROM macro_definition
+           WHERE workspace_id = $1
+           ORDER BY provider_path, name"#,
+        &w_id,
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    let macro_usage_rows = sqlx::query!(
+        r#"SELECT consumer_path AS "consumer_path!", macro_name AS "macro_name!"
+           FROM macro_usage
+           WHERE workspace_id = $1
+             AND ($2::text IS NULL OR consumer_path LIKE $2)"#,
+        &w_id,
+        folder_filter.as_deref(),
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
     tx.commit().await?;
 
+    // Parse each pipeline member's body once into its badge annotations, keyed
+    // by path, for the runnable-node construction below.
+    let annotations_by_path: std::collections::HashMap<
+        String,
+        windmill_common::assets::PipelineAnnotations,
+    > = pipeline_member_paths
+        .iter()
+        .map(|r| {
+            (
+                r.path.clone(),
+                windmill_common::assets::parse_pipeline_annotations(&r.content),
+            )
+        })
+        .collect();
+    // Column-level lineage per member. The annotation-only lineage (already
+    // parsed above) is the baseline. For DuckDB scripts we additionally run the
+    // full SQL asset parser to infer output→input column edges from the AST; it
+    // merges them with the `// column` annotations (annotation wins). If the SQL
+    // can't be parsed (DuckDB accepts grammar `sqlparser` rejects), we fall back
+    // to the annotation-only baseline rather than dropping explicit annotations.
+    let column_lineage_by_path: std::collections::HashMap<
+        String,
+        Vec<windmill_common::assets::ColumnLineage>,
+    > = pipeline_member_paths
+        .iter()
+        .map(|r| {
+            let annotated = || {
+                annotations_by_path
+                    .get(&r.path)
+                    .map(|a| a.column_lineage.clone())
+                    .unwrap_or_default()
+            };
+            let lineage = if r.language == windmill_common::scripts::ScriptLang::DuckDb {
+                windmill_parser_sql_asset::parse_assets(&r.content)
+                    .map(|o| o.column_lineage)
+                    .unwrap_or_else(|_| annotated())
+            } else {
+                annotated()
+            };
+            (r.path.clone(), lineage)
+        })
+        .collect();
+    let last_success_by_path: std::collections::HashMap<String, chrono::DateTime<chrono::Utc>> =
+        last_success_rows
+            .into_iter()
+            .filter_map(|r| r.last_success_at.map(|t| (r.path, t)))
+            .collect();
     let pipeline_member_script_paths: std::collections::HashSet<String> =
         pipeline_member_paths.into_iter().map(|r| r.path).collect();
     let existing_script_paths: std::collections::HashSet<String> =
@@ -736,9 +1219,272 @@ async fn asset_graph(
         triggers.push(edge);
     }
 
+    // Macro libraries + lib→consumer edges. Group per-provider macro lists,
+    // resolve each usage row's name to its provider (names are
+    // workspace-unique), and merge `// use` whole-lib edges from the parsed
+    // member annotations. Both endpoints are forced into the runnable set so
+    // an out-of-folder library still renders as the edge's provider node.
+    let mut macros_by_provider: std::collections::HashMap<String, Vec<MacroInfo>> =
+        Default::default();
+    let mut provider_by_name: std::collections::HashMap<String, String> = Default::default();
+    for r in macro_def_rows {
+        provider_by_name.insert(r.name.clone(), r.provider_path.clone());
+        macros_by_provider
+            .entry(r.provider_path)
+            .or_default()
+            .push(MacroInfo { name: r.name, params: r.params, is_table: r.is_table_macro });
+    }
+    let mut macro_edge_map: std::collections::BTreeMap<
+        (String, String),
+        (std::collections::BTreeSet<String>, bool),
+    > = Default::default();
+    for u in macro_usage_rows {
+        // Same orphan filter as the other edge loops.
+        if !runnable_exists(AssetUsageKind::Script, &u.consumer_path) {
+            continue;
+        }
+        let Some(lib) = provider_by_name.get(&u.macro_name) else {
+            continue;
+        };
+        let e = macro_edge_map
+            .entry((lib.clone(), u.consumer_path))
+            .or_default();
+        e.0.insert(u.macro_name);
+    }
+    for (path, ann) in &annotations_by_path {
+        for lib in &ann.use_libs {
+            // An undeployed `// use` target has no registry rows — the live
+            // draft overlay is the only surface that can render it.
+            let Some(lib_macros) = macros_by_provider.get(lib) else {
+                continue;
+            };
+            let e = macro_edge_map
+                .entry((lib.clone(), path.clone()))
+                .or_default();
+            e.1 = true;
+            e.0.extend(lib_macros.iter().map(|m| m.name.clone()));
+        }
+    }
+    let macro_edges: Vec<MacroEdge> = macro_edge_map
+        .into_iter()
+        // Same orphan filter as the other edge families: a registry row whose
+        // provider script no longer exists must not synthesize a phantom
+        // library node (consumers were filtered above, but the `// use` pass
+        // re-adds them, so re-check both endpoints).
+        .filter(|((lib_path, consumer_path), _)| {
+            runnable_exists(AssetUsageKind::Script, lib_path)
+                && runnable_exists(AssetUsageKind::Script, consumer_path)
+        })
+        .map(|((lib_path, consumer_path), (names, via_use))| MacroEdge {
+            lib_path,
+            consumer_path,
+            macro_names: names.into_iter().collect(),
+            via_use,
+        })
+        .collect();
+    for e in &macro_edges {
+        runnable_set.insert((AssetUsageKind::Script, e.lib_path.clone()));
+        runnable_set.insert((AssetUsageKind::Script, e.consumer_path.clone()));
+    }
+
+    // Data-test ordering edges. A `// data_test relationships <col> -> <asset>`
+    // (and, best-effort, a custom `// data_test <script>` whose body reads a
+    // pipeline asset) needs the referenced asset materialized before the tested
+    // script runs — but that dependency is otherwise absent from the execution
+    // DAG, so a cold cascade can run the tested script first and hard-fail
+    // ("Catalog Error: Table … does not exist"). Resolve the referenced asset's
+    // producer(s) from the write edges built above and add an ordering-only
+    // edge producer → testing_script. No producer (external table) ⇒ no edge.
+    let mut producers_by_asset: std::collections::HashMap<
+        (AssetKind, String),
+        Vec<(AssetUsageKind, String)>,
+    > = Default::default();
+    for e in &edges {
+        if matches!(e.access_type.as_deref(), Some("w") | Some("rw")) {
+            producers_by_asset
+                .entry((e.asset_kind, e.asset_path.clone()))
+                .or_default()
+                .push((e.runnable_kind, e.runnable_path.clone()));
+        }
+    }
+    // Assets a runnable reads, keyed by (usage_kind, path) — used to order a
+    // custom-test *script*'s producers before whichever member declares
+    // `// data_test <path>`. Keyed on the kind too because a flow can share a
+    // script's path; `// data_test <path>` resolves a deployed script body, so
+    // the lookup below pins `Script` and never pulls a same-path flow's reads.
+    let mut reads_by_runnable: std::collections::HashMap<
+        (AssetUsageKind, String),
+        Vec<(AssetKind, String)>,
+    > = Default::default();
+    for e in &edges {
+        if matches!(e.access_type.as_deref(), None | Some("r") | Some("rw")) {
+            reads_by_runnable
+                .entry((e.runnable_kind, e.runnable_path.clone()))
+                .or_default()
+                .push((e.asset_kind, e.asset_path.clone()));
+        }
+    }
+    let mut test_edges: Vec<TestEdge> = Vec::new();
+    // Dedup on (producer, tested_script, asset) so several tests referencing the
+    // same asset, or a repeated producer, yield one edge.
+    let mut seen_test_edges: std::collections::HashSet<(String, String, AssetKind, String)> =
+        Default::default();
+    for (member_path, ann) in &annotations_by_path {
+        for dt in &ann.data_tests {
+            use windmill_common::assets::DataTest;
+            let referenced: Vec<(AssetKind, String)> = match dt {
+                DataTest::Relationships { to_kind, to_path, .. } => {
+                    vec![(
+                        windmill_common::assets::asset_kind_from_parser(*to_kind),
+                        to_path.clone(),
+                    )]
+                }
+                // Best-effort: the custom test *script*'s parsed reads. Reading
+                // the member's OWN output resolves to the member as producer and
+                // is dropped by the self-edge guard below.
+                DataTest::Custom { path } => reads_by_runnable
+                    .get(&(AssetUsageKind::Script, path.clone()))
+                    .cloned()
+                    .unwrap_or_default(),
+                _ => vec![],
+            };
+            for (asset_kind, asset_path) in referenced {
+                let Some(producers) = producers_by_asset.get(&(asset_kind, asset_path.clone()))
+                else {
+                    continue;
+                };
+                for (producer_kind, producer_path) in producers {
+                    // Skip a self-edge: the tested script produces the asset it
+                    // tests (a materialize + relationships/custom on its own output).
+                    if *producer_kind == AssetUsageKind::Script && producer_path == member_path {
+                        continue;
+                    }
+                    if seen_test_edges.insert((
+                        producer_path.clone(),
+                        member_path.clone(),
+                        asset_kind,
+                        asset_path.clone(),
+                    )) {
+                        test_edges.push(TestEdge {
+                            producer_kind: *producer_kind,
+                            producer_path: producer_path.clone(),
+                            runnable_kind: AssetUsageKind::Script,
+                            runnable_path: member_path.clone(),
+                            asset_kind,
+                            asset_path: asset_path.clone(),
+                        });
+                    }
+                }
+            }
+        }
+    }
+    for e in &test_edges {
+        runnable_set.insert((e.producer_kind, e.producer_path.clone()));
+        runnable_set.insert((e.runnable_kind, e.runnable_path.clone()));
+    }
+
+    // Fork data-environment state per ducklake asset. The parent's rows are read on the plain
+    // pool: fork membership does not imply parent membership, and defer already exposes the
+    // parent's data to fork jobs — surfacing its materialization status is strictly less.
+    let fork_materialization_by_path: std::collections::HashMap<String, &'static str> = {
+        // The WHOLE ancestor chain, matching defer discovery: a grandchild fork whose direct
+        // parent only defers a table still reads it (from the grandparent), so it must show
+        // as deferred, not unmarked.
+        let ancestors = windmill_common::workspaces::fork_ancestor_chain(&db, &w_id).await?;
+        match ancestors {
+            // An orphaned `wm-fork-*` (parent deleted, chain empty) is still isolated — its
+            // own materializations must keep their 'fork' chips (nothing can be 'deferred').
+            a if a.is_empty() && !w_id.starts_with(windmill_common::workspaces::WM_FORK_PREFIX) => {
+                std::collections::HashMap::new()
+            }
+            ancestors => {
+                // Lakes the fork chose to SHARE at creation have no fork namespace — their
+                // assets live in the parent's tables for real, so no chip applies.
+                let shared_lakes: std::collections::HashSet<String> = sqlx::query_scalar!(
+                    "SELECT ducklake->'ducklakes' FROM workspace_settings WHERE workspace_id = $1",
+                    &w_id,
+                )
+                .fetch_optional(&db)
+                .await?
+                .flatten()
+                .and_then(|v| v.as_object().cloned())
+                .map(|lakes| {
+                    lakes
+                        .into_iter()
+                        .filter(|(_, cfg)| {
+                            cfg.get("fork_behavior").and_then(|b| b.as_str()) == Some("shared")
+                        })
+                        .map(|(name, _)| name)
+                        .collect()
+                })
+                .unwrap_or_default();
+                sqlx::query!(
+                    r#"
+                    -- Fork rows also count when a snapshot ever committed (a failed run
+                    -- preserves it): the physical table exists, so reads hit the FORK's
+                    -- data — showing 'deferred' would misstate what a query returns.
+                    -- Ancestor rows still require a clean materialization.
+                    SELECT DISTINCT asset_path AS "asset_path!", workspace_id AS "workspace_id!"
+                    FROM materialized_partition
+                    WHERE (workspace_id = $1 OR workspace_id = ANY($2))
+                      AND asset_kind = 'ducklake'
+                      AND (status = 'materialized'
+                           OR (workspace_id = $1 AND snapshot_id IS NOT NULL))
+                    "#,
+                    &w_id,
+                    &ancestors,
+                )
+                .fetch_all(&db)
+                .await?
+                .into_iter()
+                .filter(|r| {
+                    !shared_lakes.contains(r.asset_path.split('/').next().unwrap_or_default())
+                })
+                .fold(std::collections::HashMap::new(), |mut m, r| {
+                    // A fork row wins over an inherited 'deferred' from any ancestor's row.
+                    if r.workspace_id == w_id {
+                        m.insert(r.asset_path, "fork");
+                    } else {
+                        m.entry(r.asset_path).or_insert("deferred");
+                    }
+                    m
+                })
+            }
+        }
+    };
+
+    // (kind, `<dim>_current` path) → base `<dim>` path, for every managed scd2
+    // producer in the graph. Reads of the companion view resolve to a node
+    // whose producer edge already exists (the deploy path registers both writes)
+    // — this map lets that node advertise which base dimension it derives from.
+    let scd2_current_base: std::collections::HashMap<(AssetKind, String), String> =
+        annotations_by_path
+            .values()
+            .filter_map(|a| a.materialize.as_ref())
+            .filter_map(|m| {
+                m.scd2_current_target().map(|(k, current)| {
+                    (
+                        (windmill_common::assets::asset_kind_from_parser(k), current),
+                        m.target_path.clone(),
+                    )
+                })
+            })
+            .collect();
+
     let mut assets: Vec<GraphAssetNode> = asset_set
         .into_iter()
-        .map(|(kind, path)| GraphAssetNode { kind, path })
+        .map(|(kind, path)| GraphAssetNode {
+            fork_materialization: (kind == AssetKind::Ducklake)
+                .then(|| {
+                    fork_materialization_by_path
+                        .get(&path)
+                        .map(|s| s.to_string())
+                })
+                .flatten(),
+            derived_from: scd2_current_base.get(&(kind, path.clone())).cloned(),
+            kind,
+            path,
+        })
         .collect();
     assets.sort_by(|a, b| a.path.cmp(&b.path));
 
@@ -747,7 +1493,69 @@ async fn asset_graph(
         .map(|(usage_kind, path)| {
             let in_pipeline = usage_kind == AssetUsageKind::Script
                 && pipeline_member_script_paths.contains(&path);
-            GraphRunnableNode { path, usage_kind, in_pipeline }
+            // Annotation badges, only for pipeline-member scripts (the only
+            // bodies we parsed). Gate on the runnable kind too: a flow sharing a
+            // path with a pipeline script must not inherit its badges.
+            let ann = (usage_kind == AssetUsageKind::Script)
+                .then(|| annotations_by_path.get(&path))
+                .flatten();
+            GraphRunnableNode {
+                in_pipeline,
+                partition_kind: ann
+                    .and_then(|a| a.partition.as_ref())
+                    .map(|p| partition_kind_word(&p.kind).to_string()),
+                freshness: ann
+                    .and_then(|a| a.freshness.as_ref())
+                    .map(|f| f.duration.clone()),
+                last_success_at: (usage_kind == AssetUsageKind::Script)
+                    .then(|| last_success_by_path.get(&path))
+                    .flatten()
+                    .copied(),
+                tag: ann.and_then(|a| a.tag.clone()),
+                retry: ann.and_then(|a| a.retry.clone()),
+                data_tests: ann.map(|a| a.data_tests.clone()).unwrap_or_default(),
+                // Inferred (DuckDB AST) + annotation column lineage, gated to
+                // scripts like the badges above.
+                column_lineage: (usage_kind == AssetUsageKind::Script)
+                    .then(|| column_lineage_by_path.get(&path))
+                    .flatten()
+                    .cloned()
+                    .unwrap_or_default(),
+                materialize_target: ann.and_then(|a| a.materialize.as_ref()).map(|m| {
+                    MaterializeTargetNode {
+                        kind: windmill_common::assets::asset_kind_from_parser(m.target_kind),
+                        path: m.target_path.clone(),
+                    }
+                }),
+                materialize_strategy: ann.and_then(|a| a.materialize.as_ref()).and_then(|m| {
+                    // Precedence mirrors the runtime strategy derivation:
+                    // scd2 (`history`) > append > merge (`key=`) > replace.
+                    if m.manual {
+                        None
+                    } else if m.scd2 {
+                        Some("scd2".to_string())
+                    } else if m.append {
+                        Some("append".to_string())
+                    } else if m.unique_key.is_some() {
+                        Some("merge".to_string())
+                    } else {
+                        Some("replace".to_string())
+                    }
+                }),
+                materialize_on_schema_change: ann
+                    .and_then(|a| a.materialize.as_ref())
+                    .filter(|m| {
+                        m.on_schema_change == windmill_common::assets::OnSchemaChange::Ignore
+                    })
+                    .map(|_| "ignore".to_string()),
+                macros: (usage_kind == AssetUsageKind::Script)
+                    .then(|| macros_by_provider.get(&path))
+                    .flatten()
+                    .cloned()
+                    .unwrap_or_default(),
+                path,
+                usage_kind,
+            }
         })
         .collect();
     runnables.sort_by(|a, b| a.path.cmp(&b.path));
@@ -757,6 +1565,8 @@ async fn asset_graph(
         runnables,
         edges,
         triggers,
+        macro_edges,
+        test_edges,
     }))
 }
 
diff --git a/backend/windmill-api-auth/src/auth.rs b/backend/windmill-api-auth/src/auth.rs
index 314ba99450..59d9cd80b3 100644
--- a/backend/windmill-api-auth/src/auth.rs
+++ b/backend/windmill-api-auth/src/auth.rs
@@ -30,6 +30,7 @@ use windmill_common::{
     },
     error::{Error, JsonResult},
     jwt,
+    usernames::get_instance_username_or_fallback_to_email,
     users::{COOKIE_NAME, SUPERADMIN_SECRET_EMAIL},
 };
 
@@ -130,6 +131,13 @@ impl AuthCache {
         w_id: Option<String>,
         token: &str,
     ) -> Option<OptJobAuthed> {
+        // In no-auth mode there are no real tokens: resolve directly as the
+        // admin superadmin so direct cache callers (e.g. get_all_runnables,
+        // which re-validates the request token per workspace) don't reject the
+        // fabricated token.
+        if is_no_auth() {
+            return Some(OptJobAuthed { authed: no_auth_admin_authed(), job_id: None });
+        }
         let key = (
             w_id.as_ref().unwrap_or(&"".to_string()).to_string(),
             token.to_string(),
@@ -191,7 +199,11 @@ impl AuthCache {
                             is_operator: claims.is_operator,
                             groups: claims.groups,
                             folders: claims.folders,
-                            scopes: None,
+                            // Honor the scopes embedded in the JWT (mirrors the EE
+                            // jwt_ext_ branch). The route middleware only enforces
+                            // scopes when Some, so a None-scoped JWT (e.g. the job
+                            // WM_TOKEN) keeps full user privileges as before.
+                            scopes: claims.scopes,
                             username_override,
                             token_prefix: claims.audit_span,
                             read_only: false,
@@ -415,18 +427,34 @@ impl AuthCache {
                                                 read_only,
                                             })
                                         }
-                                        None if super_admin => Some(ApiAuthed {
-                                            email: email.clone(),
-                                            username: email,
-                                            is_admin: super_admin,
-                                            is_operator: false,
-                                            groups: vec![],
-                                            folders: vec![],
-                                            scopes,
-                                            username_override,
-                                            token_prefix: Some(safe_token_prefix(token)),
-                                            read_only,
-                                        }),
+                                        None if super_admin => {
+                                            // Fail closed on a DB error rather than
+                                            // letting the email leak in as the username.
+                                            match get_instance_username_or_fallback_to_email(
+                                                &self.db, &email,
+                                            )
+                                            .await
+                                            {
+                                                Ok(username) => Some(ApiAuthed {
+                                                    email,
+                                                    username,
+                                                    is_admin: super_admin,
+                                                    is_operator: false,
+                                                    groups: vec![],
+                                                    folders: vec![],
+                                                    scopes,
+                                                    username_override,
+                                                    token_prefix: Some(safe_token_prefix(token)),
+                                                    read_only,
+                                                }),
+                                                Err(e) => {
+                                                    tracing::error!(
+                                                        "Failed to resolve instance username for superadmin {email}: {e:#}"
+                                                    );
+                                                    None
+                                                }
+                                            }
+                                        }
                                         None => None,
                                     }
                                 } else {
@@ -577,6 +605,12 @@ where
                 let tokened = Self { token };
                 parts.extensions.insert(tokened.clone());
                 Ok(tokened)
+            } else if is_no_auth() {
+                // In `--no-auth` mode requests carry no token, but handlers that
+                // also require Tokened (e.g. global_whoami) must still resolve.
+                let tokened = Self { token: "no_auth".to_string() };
+                parts.extensions.insert(tokened.clone());
+                Ok(tokened)
             } else {
                 BRUTE_FORCE_COUNTER.increment().await;
                 Err((StatusCode::UNAUTHORIZED, "Unauthorized".to_owned()))
@@ -656,6 +690,30 @@ fn maybe_get_workspace_id_from_path(path_vec: &[&str]) -> Option<String> {
     workspace_id
 }
 
+/// `--no-auth` mode: compiled-in `oss` builds, or the `NO_AUTH` runtime flag on
+/// any build (the runtime flag is force-disabled on CLOUD_HOSTED). When on,
+/// every request resolves as the admin superadmin so a fronting gateway can
+/// handle authentication instead.
+pub fn is_no_auth() -> bool {
+    cfg!(feature = "no_auth") || *windmill_common::worker::NO_AUTH
+}
+
+/// The synthetic superadmin identity returned for every request in no-auth mode.
+fn no_auth_admin_authed() -> ApiAuthed {
+    ApiAuthed {
+        email: "admin@windmill.dev".to_string(),
+        username: "admin".to_string(),
+        is_admin: true,
+        is_operator: false,
+        groups: Vec::new(),
+        folders: Vec::new(),
+        scopes: None,
+        username_override: None,
+        token_prefix: None,
+        read_only: false,
+    }
+}
+
 /// Resolves OptJobAuthed from request parts.
 /// Takes ownership of Parts and returns them back.
 #[allow(unreachable_code, unused_mut)]
@@ -666,21 +724,11 @@ pub async fn resolve_opt_job_authed(
         return Ok((OptJobAuthed::default(), parts));
     };
 
-    #[cfg(feature = "no_auth")]
-    {
-        let authed = ApiAuthed {
-            email: "admin@windmill.dev".to_string(),
-            username: "admin".to_string(),
-            is_admin: true,
-            is_operator: false,
-            groups: Vec::new(),
-            folders: Vec::new(),
-            scopes: None,
-            username_override: None,
-            token_prefix: None,
-            read_only: false,
-        };
-        return Ok((OptJobAuthed { authed, job_id: None }, parts));
+    if is_no_auth() {
+        return Ok((
+            OptJobAuthed { authed: no_auth_admin_authed(), job_id: None },
+            parts,
+        ));
     }
 
     let already_authed = parts.extensions.get::<OptJobAuthed>().cloned();
diff --git a/backend/windmill-api-auth/src/lib.rs b/backend/windmill-api-auth/src/lib.rs
index b9e6a748d4..b1bf2d4273 100644
--- a/backend/windmill-api-auth/src/lib.rs
+++ b/backend/windmill-api-auth/src/lib.rs
@@ -31,8 +31,8 @@ use scopes::ScopeDefinition;
 
 // Re-export key auth types and functions
 pub use auth::{
-    get_end_user_email, invalidate_token_from_cache, AuthCache, ExpiringAuthCache, OptTokened,
-    Tokened, TruncatedTokenWithEmail, AUTH_CACHE,
+    get_end_user_email, invalidate_token_from_cache, is_no_auth, AuthCache, ExpiringAuthCache,
+    OptTokened, Tokened, TruncatedTokenWithEmail, AUTH_CACHE,
 };
 
 // ------------ ApiAuthed & OptJobAuthed types ------------
@@ -205,6 +205,33 @@ pub async fn require_super_admin(db: &DB, email: &str) -> error::Result<()> {
     }
 }
 
+/// Forbid sensitive global user/token management when authenticated as a
+/// superadmin *via a job token* (`WM_TOKEN`).
+///
+/// A `WM_TOKEN`'s identity is derived from an app/flow `on_behalf_of`, which a
+/// non-admin `wm_deployers` member can point at a superadmin. Trusting it for
+/// these operations would let them establish *persistent* superadmin (promote a
+/// user, reset a superadmin's password, mint a superadmin token, ...). `job_id`
+/// is set only for `WM_TOKEN`s; regular session/API tokens have it `None`, so a
+/// real superadmin who needs this from a script uses a dedicated superadmin API
+/// token (which only a real superadmin can create) instead of `$WM_TOKEN`.
+pub async fn forbid_superadmin_job_token(
+    db: &DB,
+    email: &str,
+    job_id: Option<uuid::Uuid>,
+) -> error::Result<()> {
+    if job_id.is_some() && is_super_admin_email(db, email).await? {
+        return Err(Error::NotAuthorized(
+            "This operation cannot be performed with a job token ($WM_TOKEN) that runs as a \
+             superadmin. If a script genuinely needs to do this, create a dedicated superadmin \
+             token from the User settings drawer (the 'Tokens' section), store it as a secret, \
+             and use that token explicitly instead of $WM_TOKEN."
+                .to_owned(),
+        ));
+    }
+    Ok(())
+}
+
 pub fn check_scopes<F>(authed: &ApiAuthed, required: F) -> error::Result<()>
 where
     F: FnOnce() -> String,
@@ -996,6 +1023,18 @@ pub fn require_path_read_access_for_preview(
         return Ok(());
     };
 
+    // Reject path traversal before any privilege-based short-circuit. A Preview's
+    // path is request-supplied and bypasses the DB `proper_id` CHECK that deployed
+    // runnables get; it then flows to the worker where it builds on-disk module
+    // directories. A `..` segment or an absolute path could let a write escape the
+    // per-job dir.
+    if path.starts_with('/') || path.split('/').any(|seg| seg == "..") || path.contains('\0') {
+        return Err(Error::BadRequest(format!(
+            "Invalid path for preview job: {}",
+            path
+        )));
+    }
+
     if authed.is_admin {
         return Ok(());
     }
@@ -1053,6 +1092,45 @@ mod tests {
         }
     }
 
+    // Regression tests for the Preview path traversal: a Preview's path skips the
+    // DB `proper_id` CHECK and reaches the worker, where it builds on-disk module
+    // dirs. Traversal must be rejected even for admins, who otherwise bypass the
+    // namespace/folder access check.
+    #[test]
+    fn preview_path_rejects_traversal() {
+        let admin = ApiAuthed { is_admin: true, username: "admin".into(), ..Default::default() };
+        for path in [
+            "u/admin/../../../../../../tmp/evil/payload",
+            "../../tmp/evil",
+            "/tmp/evil",
+            "u/admin/ok/../../../../etc/cron.d/x",
+        ] {
+            assert!(
+                require_path_read_access_for_preview(&admin, &Some(path.to_string())).is_err(),
+                "expected traversal path to be rejected: {path}"
+            );
+        }
+    }
+
+    #[test]
+    fn preview_path_allows_legitimate_paths() {
+        let alice = ApiAuthed { username: "alice".into(), ..Default::default() };
+        assert!(require_path_read_access_for_preview(&alice, &None).is_ok());
+        assert!(require_path_read_access_for_preview(&alice, &Some(String::new())).is_ok());
+        assert!(
+            require_path_read_access_for_preview(&alice, &Some("u/alice/my_script".into())).is_ok()
+        );
+
+        let admin = ApiAuthed { is_admin: true, username: "admin".into(), ..Default::default() };
+        assert!(
+            require_path_read_access_for_preview(&admin, &Some("hub/foo/bar/baz".into())).is_ok()
+        );
+        // `..` only as a substring of a segment is a valid name, not traversal.
+        assert!(
+            require_path_read_access_for_preview(&admin, &Some("f/team/my..script".into())).is_ok()
+        );
+    }
+
     #[test]
     fn predicate_no_scopes_allows_all() {
         let authed = authed_with_scopes(None);
diff --git a/backend/windmill-api-auth/src/scopes.rs b/backend/windmill-api-auth/src/scopes.rs
index 87ca3a8862..041885369c 100644
--- a/backend/windmill-api-auth/src/scopes.rs
+++ b/backend/windmill-api-auth/src/scopes.rs
@@ -274,6 +274,7 @@ pub enum ScopeDomain {
     Configs,
     OAuth,
     AI,
+    AiSkills,
 
     Indexer,
     Teams,   // Microsoft Teams integration
@@ -294,6 +295,7 @@ pub enum ScopeDomain {
     RawApps,      // Raw application data
     AgentWorkers, // Agent workers management
     Mcp,          // MCP
+    Docs,         // Self-hosted documentation search (read-only)
 }
 
 impl ScopeDomain {
@@ -329,6 +331,7 @@ impl ScopeDomain {
             Self::Configs => "configs",
             Self::OAuth => "oauth",
             Self::AI => "ai",
+            Self::AiSkills => "ai_skills",
             Self::Capture => "capture",
             Self::Drafts => "drafts",
             Self::Favorites => "favorites",
@@ -344,6 +347,7 @@ impl ScopeDomain {
             Self::Teams => "teams",
             Self::GitSync => "git_sync",
             Self::Mcp => "mcp",
+            Self::Docs => "docs",
         }
     }
 
@@ -378,6 +382,7 @@ impl ScopeDomain {
             "configs" => Some(Self::Configs),
             "oauth" => Some(Self::OAuth),
             "ai" => Some(Self::AI),
+            "ai_skills" => Some(Self::AiSkills),
             "indexer" | "srch" => Some(Self::Indexer),
             "teams" => Some(Self::Teams),
             "native_triggers" => Some(Self::NativeTriggers),
@@ -394,6 +399,7 @@ impl ScopeDomain {
             "raw_apps" => Some(Self::RawApps),
             "agent_workers" => Some(Self::AgentWorkers),
             "mcp" => Some(Self::Mcp),
+            "docs" => Some(Self::Docs),
             _ => None,
         }
     }
@@ -448,6 +454,30 @@ pub fn check_route_access(
     // Find the domain and kind for this route
     let (required_domain, required_kind, route_suffix) = extract_domain_from_route(route_path)?;
 
+    // App embed tokens (sentinel) carry broad read scopes (`jobs:read`,
+    // `users:read`, `folders:read`) that exist only for a handful of routes. The
+    // whole `/users`, `/folders` and `/jobs` routers are CORS-enabled for the
+    // opaque app iframe, so default-deny everything in those domains except the
+    // intended routes — otherwise the token could enumerate/export workspace data.
+    if has_app_embed_sentinel(Some(token_scopes)) {
+        if let Some(suffix) = route_suffix.as_deref() {
+            if app_embed_route_denied(required_domain, suffix) {
+                return Err(Error::PermissionDenied(
+                    "Access denied. App embed token cannot access this route.".to_string(),
+                ));
+            }
+            // The by-id job cancel is a POST (write) that the token's `jobs:read`
+            // wouldn't satisfy, but cancelling the app's own component runs is
+            // intended (most components supersede an in-flight run on re-run). Permit
+            // it here; `cancel_job_api` confines it to jobs the app launched
+            // (created_by == viewer). A read_only token is still rejected by the
+            // separate read-only check.
+            if suffix.starts_with("jobs_u/queue/cancel/") {
+                return Ok(());
+            }
+        }
+    }
+
     // MCP scopes (mcp:all, mcp:favorites, mcp:hub:*, etc.) use a custom format
     // that doesn't fit the standard domain:action model. Verify the token has at
     // least one mcp: scope; MCP handlers do their own fine-grained checking.
@@ -534,7 +564,7 @@ const FLOW_JOBS: [&'static str; 6] = [
 
 lazy_static::lazy_static! {
     static ref RUN_PATH_ACTIONS: Vec<&'static str> = {
-        let mut v = vec!["jobs/resume/", "jobs/run/batch_rerun_jobs", "jobs/run/workflow_as_code", "jobs/run/dependencies","jobs/run/flow_dependencies", "apps_u/execute_component"];
+        let mut v = vec!["jobs/resume/", "jobs/run/batch_rerun_jobs", "jobs/run/workflow_as_code", "jobs/run/dependencies","jobs/run/flow_dependencies", "apps_u/execute_component", "apps_u/upload_s3_file"];
 
         v.extend(SCRIPT_JOBS);
         v.extend(FLOW_JOBS);
@@ -637,6 +667,92 @@ const RUN_WHITELISTED_GET_PATHS: [&'static str; 20] = [
     "jobs/completed/get_result_maybe/",
 ];
 
+/// Sentinel scope in app embed tokens. Grants nothing itself; `check_route_access`
+/// uses it to deny the workspace-wide job enumeration routes `jobs:read` would
+/// otherwise reach, so an embedded app reads only jobs it launched (by id).
+pub const APP_EMBED_SENTINEL: &str = "app_embed";
+
+/// True if a token's scopes include the app-embed sentinel (a sandboxed app iframe
+/// token). Such tokens carry the viewer's identity but represent untrusted app JS,
+/// so several handlers confine them to the app's own resources/runs.
+pub fn has_app_embed_sentinel(scopes: Option<&[String]>) -> bool {
+    scopes.is_some_and(|s| s.iter().any(|x| x == APP_EMBED_SENTINEL))
+}
+
+/// Routes an app embed token (sentinel) is denied. Its broad scopes (`apps:run`,
+/// `jobs:read`, `users:read`, `folders:read`) exist only for a fixed set of routes a
+/// running app uses, but the whole `/apps`, `/jobs`, `/users`, `/folders` routers are
+/// CORS-enabled for the opaque app iframe. Default-deny those domains via an explicit
+/// allowlist so the token can't reach workspace inventory, counts, exports, or
+/// capability-minting routes (job signatures / resume URLs).
+fn app_embed_route_denied(domain: ScopeDomain, suffix: &str) -> bool {
+    match domain {
+        ScopeDomain::Apps => !app_embed_apps_route_allowed(suffix),
+        ScopeDomain::Jobs => !app_embed_job_route_allowed(suffix),
+        ScopeDomain::Users => suffix != "users/whoami",
+        ScopeDomain::Folders => suffix != "folders/listnames",
+        _ => false,
+    }
+}
+
+/// App routes a running app uses: its own definition (`apps/get/p/<path>`, further
+/// path-scoped by `apps:read:<path>`) and the public app-serving endpoints
+/// (`apps_u/*`: public_app, public_resource, get_data, and the path-taking
+/// `execute_component` / `download_s3_file`, which re-check `apps:run|read:<path>`
+/// in their handlers so they stay confined to this app). Everything else in the
+/// domain — workspace app inventory (`exists`, `custom_path_exists`, `list`,
+/// `list_paths*`, `secret_of`, history, management) — is denied.
+fn app_embed_apps_route_allowed(suffix: &str) -> bool {
+    // The embed-token mint endpoints live under `apps_u/` but they create
+    // credentials. A running app never calls them — the trusted embedder session/JWT
+    // mints the token and hands it to the iframe — so deny them here, otherwise an
+    // app embed token could renew itself indefinitely past the 12h expiry.
+    if suffix.starts_with("apps_u/embed_token") {
+        return false;
+    }
+    suffix.starts_with("apps/get/p/") || suffix.starts_with("apps_u/")
+}
+
+/// Job routes a running app uses (the by-id poll/cancel surface driven by the
+/// frontend JobLoader). Everything else in the jobs domain — enumeration, counts,
+/// exports, and the `job_signature`/`resume_urls` capability-minting routes — is
+/// denied. By-id reads are further confined to the app's own runs by
+/// `require_job_read_access` (the `app_embed` cutoff).
+fn app_embed_job_route_allowed(suffix: &str) -> bool {
+    // `get_root_job_id` is intentionally absent: its handler has no access check at
+    // all (returns any job's root id by id) and the app never calls it, so denying
+    // it costs nothing and avoids leaking a foreign job's flow lineage.
+    const ALLOWED: [&str; 15] = [
+        "jobs_u/get/",
+        "jobs_u/getupdate/",
+        "jobs_u/getupdate_sse/",
+        "jobs_u/get_logs/",
+        "jobs_u/get_completed_logs_tail/",
+        "jobs_u/get_args/",
+        "jobs_u/get_flow/",
+        "jobs_u/get_flow_all_logs/",
+        "jobs_u/get_flow_debug_info/",
+        "jobs_u/get_log_file/",
+        "jobs_u/completed/get/",
+        "jobs_u/completed/get_result/",
+        "jobs_u/completed/get_result_maybe/",
+        "jobs_u/completed/get_timing/",
+        "jobs_u/queue/cancel/",
+    ];
+    ALLOWED.iter().any(|p| suffix.starts_with(p))
+}
+
+/// Resource routes a metadata-only `resources:run` scope (app embed tokens) may
+/// GET: pickers (`/list`) and type schemas. Excludes every value-returning route
+/// (`get`, `get_value`, `get_value_interpolated`, `list_search`) so resource
+/// values — which can hold credentials — are never exposed.
+fn resource_metadata_route_allowed(suffix: &str) -> bool {
+    suffix == "resources/list"
+        || suffix.starts_with("resources/list_names/")
+        || suffix.starts_with("resources/exists/")
+        || suffix.starts_with("resources/type/")
+}
+
 fn scope_grants_access(
     scope: &ScopeDefinition,
     required_domain: ScopeDomain,
@@ -656,6 +772,14 @@ fn scope_grants_access(
     let scope_action = ScopeAction::from_str(&scope.action)
         .ok_or_else(|| Error::BadRequest(format!("Invalid scope action: {}", scope.action)))?;
 
+    // App embed tokens carry `resources:run`: metadata-only resource access via
+    // default-deny + allowlist (so a new value route is never exposed by accident).
+    // See `resource_metadata_route_allowed`.
+    if scope_domain == ScopeDomain::Resources && scope_action == ScopeAction::Run {
+        return Ok(required_action == ScopeAction::Read
+            && route_path.is_some_and(resource_metadata_route_allowed));
+    }
+
     if !scope_action.includes(&required_action)
         && !(scope_domain == ScopeDomain::Jobs
             && required_action == ScopeAction::Read
@@ -699,6 +823,23 @@ pub fn check_read_only_for_route(route_path: &str, http_method: &str) -> Result<
     }
 }
 
+/// The minimal scope string that grants access to exactly `{method} {path}`, as
+/// `check_route_access` would require it. Used to mint a least-privilege JWT for
+/// a single proxied request (the MCP endpoint proxy), so the minted token can do
+/// only that one operation rather than acting as a blank check.
+///
+/// `path` is the request path (e.g. `/api/w/{workspace}/variables/get/...`).
+/// Returns `None` if the route's domain can't be determined — the caller should
+/// then fail closed.
+pub fn scope_for_route(method: &str, path: &str) -> Option<String> {
+    let action = map_http_method_to_action(method, path);
+    let (domain, kind, _suffix) = extract_domain_from_route(path).ok()?;
+    Some(match (domain, action, kind) {
+        (ScopeDomain::Jobs, ScopeAction::Run, Some(kind)) => format!("jobs:run:{}", kind),
+        (domain, action, _) => format!("{}:{}", domain.as_str(), action.as_str()),
+    })
+}
+
 /// Helper function to check if scopes allow access to a route
 pub fn check_scopes_for_route(
     token_scopes: Option<&[String]>,
@@ -789,6 +930,12 @@ mod tests {
         assert_eq!(domain, ScopeDomain::FlowConversations);
         assert_eq!(kind, None);
         assert_eq!(route_suffix, Some("flow_conversations/list".to_string()));
+
+        let (domain, kind, route_suffix) =
+            extract_domain_from_route("/api/w/test_workspace/ai_skills/list").unwrap();
+        assert_eq!(domain, ScopeDomain::AiSkills);
+        assert_eq!(kind, None);
+        assert_eq!(route_suffix, Some("ai_skills/list".to_string()));
     }
 
     #[test]
@@ -845,6 +992,10 @@ mod tests {
             ScopeDomain::from_str("flow_conversations"),
             Some(ScopeDomain::FlowConversations)
         );
+        assert_eq!(
+            ScopeDomain::from_str("ai_skills"),
+            Some(ScopeDomain::AiSkills)
+        );
 
         // Test canonical string conversion
         assert_eq!(ScopeDomain::Acls.as_str(), "acls");
@@ -854,6 +1005,41 @@ mod tests {
             ScopeDomain::FlowConversations.as_str(),
             "flow_conversations"
         );
+        assert_eq!(ScopeDomain::AiSkills.as_str(), "ai_skills");
+    }
+
+    #[test]
+    fn test_ai_skills_scope_access() {
+        let read_scopes = vec!["ai_skills:read".to_string()];
+        assert!(
+            check_route_access(&read_scopes, "/api/w/test_workspace/ai_skills/list", "GET").is_ok()
+        );
+        assert!(check_route_access(
+            &read_scopes,
+            "/api/w/test_workspace/ai_skills/get/foo",
+            "GET"
+        )
+        .is_ok());
+        assert!(check_route_access(
+            &read_scopes,
+            "/api/w/test_workspace/ai_skills/upload",
+            "POST"
+        )
+        .is_err());
+
+        let write_scopes = vec!["ai_skills:write".to_string()];
+        assert!(check_route_access(
+            &write_scopes,
+            "/api/w/test_workspace/ai_skills/upload",
+            "POST"
+        )
+        .is_ok());
+        assert!(check_route_access(
+            &write_scopes,
+            "/api/w/test_workspace/ai_skills/delete/foo",
+            "DELETE"
+        )
+        .is_ok());
     }
 
     #[test]
@@ -1083,4 +1269,38 @@ mod tests {
         let scopes = vec!["jobs:read".to_string(), "mcp:all".to_string()];
         assert!(check_route_access(&scopes, "/api/w/test_workspace/mcp/something", "GET").is_ok());
     }
+
+    #[test]
+    fn test_scope_for_route() {
+        // The minted scope must be exactly what check_route_access requires for
+        // the same route, so a JWT carrying it passes for that one route only.
+        assert_eq!(
+            scope_for_route("GET", "/api/w/ws/variables/get/u/x/y").as_deref(),
+            Some("variables:read")
+        );
+        assert_eq!(
+            scope_for_route("POST", "/api/w/ws/variables/create").as_deref(),
+            Some("variables:write")
+        );
+        assert_eq!(
+            scope_for_route("DELETE", "/api/w/ws/resources/delete/u/x/y").as_deref(),
+            Some("resources:write")
+        );
+        // jobs run paths carry the runnable kind.
+        assert_eq!(
+            scope_for_route("POST", "/api/w/ws/jobs/run/p/u/x/y").as_deref(),
+            Some("jobs:run:scripts")
+        );
+        assert_eq!(
+            scope_for_route("POST", "/api/w/ws/jobs/run/f/u/x/y").as_deref(),
+            Some("jobs:run:flows")
+        );
+
+        // The minted scope actually satisfies the route check it targets.
+        let s = scope_for_route("POST", "/api/w/ws/variables/create").unwrap();
+        assert!(check_route_access(&[s], "/api/w/ws/variables/create", "POST").is_ok());
+
+        // Unknown route -> None so the caller fails closed.
+        assert!(scope_for_route("GET", "/healthz").is_none());
+    }
 }
diff --git a/backend/windmill-api-configs/src/lib.rs b/backend/windmill-api-configs/src/lib.rs
index e18afc35c8..f776712063 100644
--- a/backend/windmill-api-configs/src/lib.rs
+++ b/backend/windmill-api-configs/src/lib.rs
@@ -217,7 +217,7 @@ async fn delete_config(
     let mut tx = db.begin().await?;
 
     let deleted = sqlx::query!("DELETE FROM config WHERE name = $1 RETURNING name", name)
-        .fetch_all(&db)
+        .fetch_all(&mut *tx)
         .await?;
 
     audit_log(
diff --git a/backend/windmill-api-flows/src/flows.rs b/backend/windmill-api-flows/src/flows.rs
index b5f8e2f285..a9376d02ed 100644
--- a/backend/windmill-api-flows/src/flows.rs
+++ b/backend/windmill-api-flows/src/flows.rs
@@ -155,10 +155,11 @@ async fn list_flows(
             "o.labels",
             "draft.email IS NOT NULL as is_draft",
             // Per-path draft owners as a JSON array; see scripts.rs for the rationale
-            // (admins-workspace identity fallback, legacy NULL-email row).
-            "(SELECT json_agg(json_build_object('username', COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END)) ORDER BY COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END) NULLS LAST) \
+            // (non-member superadmin identity fallback via `password`, legacy NULL-email row).
+            "(SELECT json_agg(json_build_object('username', COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END)) ORDER BY COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END) NULLS LAST) \
               FROM draft d \
               LEFT JOIN usr u ON u.workspace_id = d.workspace_id AND u.email = d.email \
+              LEFT JOIN password p ON p.email = d.email AND p.super_admin = true \
               WHERE d.workspace_id = o.workspace_id AND d.path = o.path AND d.typ = 'flow') as draft_users",
             "folder_labels(o.workspace_id, o.path) as inherited_labels"
         ])
diff --git a/backend/windmill-api-groups/src/folders.rs b/backend/windmill-api-groups/src/folders.rs
index eedb43bc1a..67997bc965 100644
--- a/backend/windmill-api-groups/src/folders.rs
+++ b/backend/windmill-api-groups/src/folders.rs
@@ -146,12 +146,11 @@ async fn list_foldernames(
 }
 
 fn validate_owner(owner: &str) -> Result<()> {
-    if !owner
-        .chars()
-        .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '/' || c == '-')
-    {
+    if !owner.chars().all(|c| {
+        c.is_ascii_alphanumeric() || c == '_' || c == '/' || c == '-' || c == '.' || c == '@'
+    }) {
         return Err(error::Error::BadRequest(
-            "Invalid owner: must contain only alphanumeric characters, underscores, hyphens, or slashes".to_string(),
+            "Invalid owner: must contain only alphanumeric characters, underscores, hyphens, slashes, dots, or at-signs".to_string(),
         ));
     }
     Ok(())
diff --git a/backend/windmill-api-groups/src/granular_acls.rs b/backend/windmill-api-groups/src/granular_acls.rs
index 1f88c33e9f..663644e8e0 100644
--- a/backend/windmill-api-groups/src/granular_acls.rs
+++ b/backend/windmill-api-groups/src/granular_acls.rs
@@ -105,8 +105,6 @@ async fn add_granular_acl(
         return Err(Error::BadRequest("Invalid kind".to_string()));
     }
 
-    let mut tx = user_db.begin(&authed).await?;
-
     let identifier = if kind == "group_" || kind == "folder" || kind == "volume" {
         "name"
     } else {
@@ -140,6 +138,8 @@ async fn add_granular_acl(
         }
     }
 
+    let mut tx = user_db.begin(&authed).await?;
+
     if kind == "folder" {
         if let Some(obj) = sqlx::query_scalar!(
             "SELECT owners FROM folder WHERE name = $1 AND workspace_id = $2",
diff --git a/backend/windmill-api-integration-tests/tests/workspace_comparison.rs b/backend/windmill-api-integration-tests/tests/workspace_comparison.rs
index 88ffe6bb26..e98ee07a61 100644
--- a/backend/windmill-api-integration-tests/tests/workspace_comparison.rs
+++ b/backend/windmill-api-integration-tests/tests/workspace_comparison.rs
@@ -1399,7 +1399,9 @@ async fn test_delete_fork_purges_workspace_diff(db: Pool<Postgres>) -> anyhow::R
     // Delete the fork through the real handler.
     let delete_response = client
         .client()
-        .delete(&format!("{base_url}/workspaces/delete/wm-fork-test-workspace"))
+        .delete(&format!(
+            "{base_url}/workspaces/delete/wm-fork-test-workspace"
+        ))
         .send()
         .await?;
     assert!(
@@ -1521,3 +1523,249 @@ async fn test_create_fork_purges_stale_diff_state(db: Pool<Postgres>) -> anyhow:
 
     Ok(())
 }
+
+/// Regression: a stale/phantom trigger diff row must never block a privileged
+/// user's deploy. Triggers (unlike scripts/flows) are not re-validated by
+/// `compare_workspaces`, so a cached `has_changes=true` row for a trigger that
+/// no longer exists in the table is trusted, then dropped by the visibility
+/// filter (the row is gone) — flipping `all_ahead_items_visible` to false and
+/// hiding the deploy button. This used to happen even for a superadmin, because
+/// the item's absence is indistinguishable from a permission-hidden item.
+///
+/// The blast-radius guard forces the flag true for anyone who sees the relevant
+/// side in full: a target/fork admin (or superadmin) for ahead items. A regular
+/// user with no such visibility still gets the (conservative) warning, since we
+/// cannot tell a phantom from a genuine permission gap on their behalf.
+///
+/// The diff row and visibility query are OSS, so this runs on any build (no
+/// tally needed — the row is inserted directly, mimicking a delete that left the
+/// diff behind).
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn test_compare_workspaces_phantom_trigger_shortfuse(
+    db: Pool<Postgres>,
+) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let base_url = format!("http://localhost:{port}/api");
+    let superadmin = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+    let non_admin = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN_2".to_string(),
+    );
+
+    // Fork of test-workspace (INSERT directly; we only need the pair to exist).
+    sqlx::query!(
+        "INSERT INTO workspace (id, name, owner, parent_workspace_id)
+         VALUES ('wm-fork-test-workspace', 'Fork', 'test-user', 'test-workspace')"
+    )
+    .execute(&db)
+    .await?;
+    sqlx::query!("INSERT INTO workspace_settings (workspace_id) VALUES ('wm-fork-test-workspace')")
+        .execute(&db)
+        .await?;
+    sqlx::query!(
+        "INSERT INTO workspace_key(workspace_id, kind, key)
+         VALUES ('wm-fork-test-workspace', 'cloud', 'test-key')"
+    )
+    .execute(&db)
+    .await?;
+
+    // Phantom rows: cached diffs for http_triggers with no backing row (the exact
+    // state a trigger delete used to leave behind before it reset the tally). One
+    // ahead (fork side), one behind (source side) so both guard branches are hit.
+    sqlx::query!(
+        "INSERT INTO workspace_diff
+         (source_workspace_id, fork_workspace_id, path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork)
+         VALUES
+         ('test-workspace', 'wm-fork-test-workspace', 'f/rt/ghost', 'http_trigger', 1, 0, true, false, true),
+         ('test-workspace', 'wm-fork-test-workspace', 'f/rt/ghost_behind', 'http_trigger', 0, 1, true, true, false)"
+    )
+    .execute(&db)
+    .await?;
+
+    // Superadmin: the guard forces `all_ahead_items_visible = true`, and the
+    // non-existent trigger is not surfaced as a diff.
+    let comparison: serde_json::Value = superadmin
+        .client()
+        .get(&format!(
+            "{base_url}/w/test-workspace/workspaces/compare/wm-fork-test-workspace"
+        ))
+        .send()
+        .await?
+        .json()
+        .await?;
+    assert_eq!(
+        comparison["all_ahead_items_visible"].as_bool(),
+        Some(true),
+        "phantom trigger row must not trip the 'not visible' warning for a superadmin: {comparison}"
+    );
+    assert_eq!(
+        comparison["all_behind_items_visible"].as_bool(),
+        Some(true),
+        "phantom behind trigger row must not trip the warning for a superadmin: {comparison}"
+    );
+    assert!(
+        !comparison["diffs"]
+            .as_array()
+            .unwrap()
+            .iter()
+            .any(|d| d["path"] == "f/rt/ghost" || d["path"] == "f/rt/ghost_behind"),
+        "non-existent triggers must not be surfaced as diffs: {comparison}"
+    );
+
+    // Non-superadmin, non-fork-admin member of the source: no full-visibility
+    // guarantee, so the warning still (conservatively) fires.
+    let comparison: serde_json::Value = non_admin
+        .client()
+        .get(&format!(
+            "{base_url}/w/test-workspace/workspaces/compare/wm-fork-test-workspace"
+        ))
+        .send()
+        .await?
+        .json()
+        .await?;
+    assert_eq!(
+        comparison["all_ahead_items_visible"].as_bool(),
+        Some(false),
+        "a user without full visibility must not be short-circuited by the guard: {comparison}"
+    );
+    assert_eq!(
+        comparison["all_behind_items_visible"].as_bool(),
+        Some(false),
+        "the behind-side guard must not fire for a non-admin either: {comparison}"
+    );
+
+    Ok(())
+}
+
+/// Regression: the "sees everything" guard must require admin of BOTH sides, not
+/// just the fork. `filter_visible_diffs` keeps a modified/conflict row (one that
+/// exists in the source AND the fork) only when the caller can see it on both
+/// sides, so an ahead diff can be dropped for a *source-side* visibility gap even
+/// when the caller is a fork admin. If the guard cleared the ahead flag on
+/// fork-admin alone, the UI would report "all ahead visible" and let the user
+/// deploy from an incomplete comparison. Here test-user-2 is admin of the fork
+/// but only a plain member of the parent with no access to folder `restricted`,
+/// so the parent copy of the modified script is hidden from them and the ahead
+/// diff is (correctly) dropped — the flag must stay false.
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn test_compare_workspaces_fork_admin_source_hidden_ahead(
+    db: Pool<Postgres>,
+) -> anyhow::Result<()> {
+    initialize_tracing().await;
+
+    let server = ApiServer::start(db.clone()).await?;
+    let port = server.addr.port();
+    let base_url = format!("http://localhost:{port}/api");
+    let admin = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN".to_string(),
+    );
+    let fork_admin_user = windmill_api_client::create_client(
+        &format!("http://localhost:{port}"),
+        "SECRET_TOKEN_2".to_string(),
+    );
+
+    // Parent folder `restricted` owned by test-user (the admin), NOT test-user-2,
+    // and a script inside it (access flows through the folder). test-user-2 is a
+    // plain member of the parent, so RLS hides this script from them.
+    sqlx::query!(
+        "INSERT INTO folder (workspace_id, name, display_name, owners, extra_perms, summary, created_by)
+         VALUES ('test-workspace', 'restricted', 'restricted', ARRAY['u/test-user']::varchar[], '{\"u/test-user\": true}'::jsonb, '', 'test-user')"
+    )
+    .execute(&db)
+    .await?;
+    sqlx::query!(
+        "INSERT INTO script (workspace_id, path, hash, content, summary, description, language, created_by, created_at, archived, schema_validation, ws_error_handler_muted, deleted, extra_perms)
+         VALUES ('test-workspace', 'f/restricted/item', 314159, 'def main(): return 1', '', '', 'python3', 'test-user', NOW(), false, false, false, false, '{}'::jsonb)"
+    )
+    .execute(&db)
+    .await?;
+
+    // Fork (clones the folder + script into the fork).
+    let resp = admin
+        .client()
+        .post(&format!(
+            "{base_url}/w/test-workspace/workspaces/create_fork"
+        ))
+        .json(&json!({"id": "wm-fork-guard-test", "name": "Guard Fork", "color": "#0000ff"}))
+        .send()
+        .await?;
+    assert!(
+        resp.status().is_success(),
+        "fork creation failed: {}",
+        resp.status()
+    );
+
+    // test-user-2 is ADMIN of the fork (so they see the fork copy via RLS bypass)
+    // but only a plain member of the parent.
+    sqlx::query!(
+        "INSERT INTO usr (workspace_id, email, username, is_admin, role)
+         VALUES ('wm-fork-guard-test', 'test2@windmill.dev', 'test-user-2', true, 'Admin')"
+    )
+    .execute(&db)
+    .await?;
+
+    // A confirmed modified/ahead diff on the script that exists on both sides.
+    sqlx::query!(
+        "INSERT INTO workspace_diff
+         (source_workspace_id, fork_workspace_id, path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork)
+         VALUES ('test-workspace', 'wm-fork-guard-test', 'f/restricted/item', 'script', 1, 0, true, true, true)"
+    )
+    .execute(&db)
+    .await?;
+    sqlx::query!(
+        "DELETE FROM skip_workspace_diff_tally WHERE workspace_id IN ('test-workspace', 'wm-fork-guard-test')"
+    )
+    .execute(&db)
+    .await?;
+
+    let comparison: serde_json::Value = fork_admin_user
+        .client()
+        .get(&format!(
+            "{base_url}/w/test-workspace/workspaces/compare/wm-fork-guard-test"
+        ))
+        .send()
+        .await?
+        .json()
+        .await?;
+
+    // The parent copy is hidden from test-user-2, so the ahead diff is dropped.
+    // Fork-admin alone must NOT clear the flag — the comparison is incomplete.
+    assert_eq!(
+        comparison["all_ahead_items_visible"].as_bool(),
+        Some(false),
+        "fork admin without source-side visibility must not be reported as seeing all ahead items: {comparison}"
+    );
+    assert!(
+        !comparison["diffs"]
+            .as_array()
+            .unwrap()
+            .iter()
+            .any(|d| d["path"] == "f/restricted/item"),
+        "source-hidden item must not appear in the fork admin's diff list: {comparison}"
+    );
+
+    // Sanity: a superadmin (admin of both sides) still sees everything.
+    let comparison: serde_json::Value = admin
+        .client()
+        .get(&format!(
+            "{base_url}/w/test-workspace/workspaces/compare/wm-fork-guard-test"
+        ))
+        .send()
+        .await?
+        .json()
+        .await?;
+    assert_eq!(
+        comparison["all_ahead_items_visible"].as_bool(),
+        Some(true),
+        "superadmin must see all ahead items: {comparison}"
+    );
+
+    Ok(())
+}
diff --git a/backend/windmill-api-integration-tests/tests/workspaces.rs b/backend/windmill-api-integration-tests/tests/workspaces.rs
index fcbdeea8ba..92f179c39b 100644
--- a/backend/windmill-api-integration-tests/tests/workspaces.rs
+++ b/backend/windmill-api-integration-tests/tests/workspaces.rs
@@ -646,6 +646,20 @@ async fn test_workspace_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
             .unwrap();
         assert_eq!(resp.json::<bool>().await?, true);
 
+        // Regression: changing a fork's workspace id must preserve its parent
+        // linkage. Dropping it leaves a wm-fork- workspace with no parent — a
+        // "fork of nothing" that can no longer be compared or merged.
+        let parent: Option<String> =
+            sqlx::query_scalar("SELECT parent_workspace_id FROM workspace WHERE id = $1")
+                .bind("wm-fork-renamed")
+                .fetch_one(&db)
+                .await?;
+        assert_eq!(
+            parent.as_deref(),
+            Some("new-test-ws"),
+            "renamed fork must keep its parent_workspace_id"
+        );
+
         // --- create_fork over an existing (active) workspace id: clear 400, not a raw SQL 500 ---
         let resp = authed(client().post(format!("{new_ws_base}/create_fork")))
             .json(&json!({
diff --git a/backend/windmill-api-jobs/src/execution.rs b/backend/windmill-api-jobs/src/execution.rs
index 0581b7acd9..8ec60a69ba 100644
--- a/backend/windmill-api-jobs/src/execution.rs
+++ b/backend/windmill-api-jobs/src/execution.rs
@@ -55,7 +55,7 @@ pub async fn check_tag_available_for_workspace(
 ) -> error::Result<()> {
     if let Some(tag) = tag.as_deref().filter(|t| !t.is_empty()) {
         let tags = get_scope_tags(authed);
-        check_tag_available_for_workspace_internal(&db, w_id, tag, &authed.email, tags).await
+        check_tag_available_for_workspace_internal(db, w_id, tag, &authed.email, tags).await
     } else {
         Ok(())
     }
diff --git a/backend/windmill-api-jobs/src/jobs_export.rs b/backend/windmill-api-jobs/src/jobs_export.rs
index d8f1826948..0b188c0fa0 100644
--- a/backend/windmill-api-jobs/src/jobs_export.rs
+++ b/backend/windmill-api-jobs/src/jobs_export.rs
@@ -659,8 +659,34 @@ pub async fn delete_jobs(
     .await?
     .rows_affected();
 
+    // job_ids are request-supplied, so scope every side-table delete to the workspace exactly
+    // like the v2_job delete below — otherwise a workspace admin could erase another
+    // workspace's side rows by passing foreign job ids. zombie_job_counter and
+    // flow_conversation_message have no workspace_id, so scope them via v2_job / their conversation.
+    // (Side-table list kept in sync with windmill_common::jobs::delete_jobs.)
     let zombie_deleted = sqlx::query!(
-        "DELETE FROM zombie_job_counter WHERE job_id = ANY($1)",
+        "DELETE FROM zombie_job_counter WHERE job_id IN (SELECT id FROM v2_job WHERE workspace_id = $1 AND id = ANY($2))",
+        &w_id,
+        &job_ids
+    )
+    .execute(&mut *tx)
+    .await?
+    .rows_affected();
+
+    let dispatch_event_deleted = sqlx::query!(
+        "DELETE FROM dispatch_event WHERE workspace_id = $1 AND producer_job_id = ANY($2)",
+        &w_id,
+        &job_ids
+    )
+    .execute(&mut *tx)
+    .await?
+    .rows_affected();
+
+    let conversation_message_deleted = sqlx::query!(
+        "DELETE FROM flow_conversation_message m
+         USING flow_conversation c
+         WHERE m.conversation_id = c.id AND c.workspace_id = $1 AND m.job_id = ANY($2)",
+        &w_id,
         &job_ids
     )
     .execute(&mut *tx)
@@ -688,6 +714,8 @@ pub async fn delete_jobs(
         + queue_deleted
         + completed_deleted
         + zombie_deleted
+        + dispatch_event_deleted
+        + conversation_message_deleted
         + jobs_deleted;
 
     tracing::info!(
diff --git a/backend/windmill-api-jobs/src/types.rs b/backend/windmill-api-jobs/src/types.rs
index 6252cef9b7..c2175753e6 100644
--- a/backend/windmill-api-jobs/src/types.rs
+++ b/backend/windmill-api-jobs/src/types.rs
@@ -303,6 +303,7 @@ pub struct UnifiedJob {
     pub preprocessed: Option<bool>,
     pub worker: Option<String>,
     pub runnable_settings_handle: Option<i64>,
+    pub is_retry: Option<bool>,
 }
 
 const CJ_FIELDS: &[&str] = &[
@@ -344,6 +345,7 @@ const CJ_FIELDS: &[&str] = &[
     "v2_job.preprocessed",
     "v2_job_completed.worker",
     "null as runnable_settings_handle",
+    "EXISTS(SELECT 1 FROM native_retry_attempt WHERE job_id = v2_job.id) as is_retry",
 ];
 
 const QJ_FIELDS: &[&str] = &[
@@ -385,6 +387,7 @@ const QJ_FIELDS: &[&str] = &[
     "v2_job.preprocessed",
     "v2_job_queue.worker",
     "v2_job_queue.runnable_settings_handle",
+    "EXISTS(SELECT 1 FROM native_retry_attempt WHERE job_id = v2_job.id) as is_retry",
 ];
 
 impl UnifiedJob {
@@ -438,6 +441,7 @@ impl From<UnifiedJob> for Job {
                     priority: uj.priority,
                     labels: uj.labels,
                     preprocessed: uj.preprocessed,
+                    is_retry: uj.is_retry,
                 },
             )),
             "QueuedJob" => Job::QueuedJob(JobExtended::new(
@@ -487,6 +491,7 @@ impl From<UnifiedJob> for Job {
                     preprocessed: uj.preprocessed,
                     runnable_settings_handle: uj.runnable_settings_handle,
                     labels: uj.labels,
+                    is_retry: uj.is_retry,
                 },
             )),
             t => panic!("job type {} not valid", t),
diff --git a/backend/windmill-api-schedule/src/lib.rs b/backend/windmill-api-schedule/src/lib.rs
index 7cc0111c28..573c47e355 100644
--- a/backend/windmill-api-schedule/src/lib.rs
+++ b/backend/windmill-api-schedule/src/lib.rs
@@ -182,6 +182,19 @@ fn to_json_raw_opt(
     value.map(|v| sqlx::types::Json(to_raw_value(&v)))
 }
 
+/// Managed ducklake-maintenance schedules live under a reserved path prefix;
+/// their lifecycle is owned by the workspace ducklake settings, so the
+/// schedule API refuses to create/edit/delete/toggle them.
+fn reject_reserved_schedule_path(path: &str) -> Result<()> {
+    if path.starts_with(windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX) {
+        return Err(Error::BadRequest(format!(
+            "Schedules under {} are managed by the workspace ducklake settings",
+            windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX
+        )));
+    }
+    Ok(())
+}
+
 /// Validate that a dynamic skip handler (script or flow) exists
 async fn validate_dynamic_skip<'c>(
     tx: &mut Transaction<'c, Postgres>,
@@ -219,6 +232,7 @@ async fn create_schedule(
     Json(ns): Json<NewSchedule>,
 ) -> Result<String> {
     check_scopes(&authed, || format!("schedules:write:{}", ns.path))?;
+    reject_reserved_schedule_path(&ns.path)?;
 
     let authed = maybe_refresh_folders(&ns.path, &w_id, authed, &db).await;
 
@@ -468,6 +482,7 @@ async fn edit_schedule(
 ) -> Result<String> {
     let path = path.to_path();
     check_scopes(&authed, || format!("schedules:write:{}", path))?;
+    reject_reserved_schedule_path(path)?;
 
     let authed = maybe_refresh_folders(&path, &w_id, authed, &db).await;
     let mut tx = user_db.begin(&authed).await?;
@@ -750,6 +765,15 @@ async fn list_schedule(
         )
         .order_by("edited_at", true)
         .and_where("workspace_id = ?".bind(&w_id))
+        // managed ducklake-maintenance schedules are edited from the
+        // workspace ducklake settings, not the schedules UI/CLI.
+        // starts_with, not LIKE: the prefix contains `_` which LIKE treats as
+        // a wildcard, and a user folder like `ducklake-maintenance` must not
+        // be swept up.
+        .and_where(
+            "NOT starts_with(path, ?)"
+                .bind(&windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX),
+        )
         .offset(offset)
         .limit(per_page)
         .clone();
@@ -923,12 +947,13 @@ async fn list_schedule_with_jobs(
                 ORDER BY completed_at DESC
                 LIMIT 20
             ) AS jobs) t
-        WHERE workspace_id = $1
+        WHERE workspace_id = $1 AND NOT starts_with(schedule.path, $4)
         ORDER BY edited_at DESC
         LIMIT $2 OFFSET $3",
         w_id,
         per_page as i64,
-        offset as i64
+        offset as i64,
+        windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX
     )
     .fetch_all(&mut *tx)
     .await?;
@@ -1014,6 +1039,7 @@ pub async fn set_enabled(
     let mut tx = user_db.begin(&authed).await?;
     let path = path.to_path();
     check_scopes(&authed, || format!("schedules:write:{}", path))?;
+    reject_reserved_schedule_path(path)?;
 
     // Block enabling a schedule in a fork when the parent has the same path
     // (regardless of parent's enabled flag), unless force=true. Two enabled
@@ -1190,6 +1216,7 @@ async fn delete_schedule(
 ) -> Result<String> {
     let path = path.to_path();
     check_scopes(&authed, || format!("schedules:write:{}", path))?;
+    reject_reserved_schedule_path(path)?;
     let mut tx = user_db.begin(&authed).await?;
 
     clear_schedule(&mut tx, path, &w_id).await?;
@@ -1399,6 +1426,14 @@ async fn set_default_error_handler(
             }
         }
         for updated_schedule_path in updated_schedules {
+            // managed ducklake-maintenance rows get the handler update (their
+            // failures should reach workspace handlers) but must not be
+            // pushed into git-sync as deployed schedules
+            if updated_schedule_path
+                .starts_with(windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX)
+            {
+                continue;
+            }
             handle_deployment_metadata(
                 &authed.email,
                 &authed.username,
diff --git a/backend/windmill-api-scripts/Cargo.toml b/backend/windmill-api-scripts/Cargo.toml
index 2dee051c93..ecf0ff0b61 100644
--- a/backend/windmill-api-scripts/Cargo.toml
+++ b/backend/windmill-api-scripts/Cargo.toml
@@ -26,6 +26,7 @@ windmill-parser-ts.workspace = true
 windmill-parser.workspace = true
 windmill-parser-ts-asset.workspace = true
 windmill-parser-sql-asset.workspace = true
+windmill-parser-sql.workspace = true
 windmill-parser-yaml.workspace = true
 
 axum.workspace = true
diff --git a/backend/windmill-api-scripts/src/scripts.rs b/backend/windmill-api-scripts/src/scripts.rs
index 8115e2ef78..fd9899ea10 100644
--- a/backend/windmill-api-scripts/src/scripts.rs
+++ b/backend/windmill-api-scripts/src/scripts.rs
@@ -45,8 +45,9 @@ use windmill_dep_map::scoped_dependency_map::ScopedDependencyMap;
 use windmill_common::{
     assets::{
         clear_script_triggers, clear_static_asset_usage, clear_static_asset_usage_by_script_hash,
-        insert_script_trigger, parse_duration_secs, parse_pipeline_annotations,
-        replace_static_asset_usage, trigger_spec_to_row, AssetUsageKind, TriggerSpec,
+        derive_pipeline_asset_trigger_refs, insert_script_trigger, parse_duration_secs,
+        parse_pipeline_annotations, replace_static_asset_usage, trigger_spec_to_row,
+        AssetUsageKind, ScriptTriggerKind, TriggerSpec,
     },
     error::{self, to_anyhow},
     min_version::{MIN_VERSION_SUPPORTS_DEBOUNCING, MIN_VERSION_SUPPORTS_DEBOUNCING_V2},
@@ -141,6 +142,8 @@ pub fn workspaced_service() -> Router {
         // CI test results
         .route("/ci_test_results/{kind}/{*path}", get(get_ci_test_results))
         .route("/ci_test_results_batch", post(get_ci_test_results_batch))
+        // Save-time schema-contract check (pipelines gap #2b)
+        .route("/check_schema_contracts", post(check_schema_contracts))
 }
 
 #[derive(Serialize, FromRow)]
@@ -211,12 +214,15 @@ async fn list_scripts(
             // Canonical reference for the draft-feature comments; flows/apps point here.
             // Per-path draft owners as a JSON array (`Json<Vec<DraftUserRef>>`); NULL -> None,
             // never an empty array. LEFT JOIN `usr` keeps orphaned drafts (user left workspace)
-            // visible with `username = None`. In the `admins` workspace username IS the email,
-            // so fall back to `d.email` there or the authed user's own draft resolves to a phantom
-            // "Legacy workspace draft"; the genuine NULL-email legacy row stays None.
-            "(SELECT json_agg(json_build_object('username', COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END)) ORDER BY COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END) NULLS LAST) \
+            // visible with `username = None`. A superadmin authoring in a workspace they are not
+            // a member of has no `usr` row, so fall back to their instance-derived username
+            // (`password.username`), or their email when derivation is disabled — this keeps the
+            // raw email out of the payload whenever a derived username exists. The genuine
+            // NULL-email legacy row stays None (no `usr`/`password` match, `d.email` is NULL).
+            "(SELECT json_agg(json_build_object('username', COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END)) ORDER BY COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END) NULLS LAST) \
               FROM draft d \
               LEFT JOIN usr u ON u.workspace_id = d.workspace_id AND u.email = d.email \
+              LEFT JOIN password p ON p.email = d.email AND p.super_admin = true \
               WHERE d.workspace_id = o.workspace_id AND d.path = o.path AND d.typ = 'script') as draft_users",
             "folder_labels(o.workspace_id, o.path) as inherited_labels"
         ])
@@ -408,6 +414,14 @@ async fn list_scripts(
                 .and_then(|s| s.as_str())
                 .filter(|s| !s.is_empty() && *s != row.path.as_str())
                 .map(|s| s.to_string());
+            // A draft-only pipeline node (`// pipeline`) has no deployed row to carry
+            // auto_kind, so compute it from the draft content — mirroring the create
+            // path — so the home page folds it into its pipeline like a deployed member.
+            let auto_kind = v
+                .get("content")
+                .and_then(|s| s.as_str())
+                .filter(|c| parse_pipeline_annotations(c).in_pipeline)
+                .map(|_| "pipeline".to_string());
             rows.push(ListableScript {
                 hash: ScriptHash(0),
                 path: row.path,
@@ -429,7 +443,7 @@ async fn list_scripts(
                 draft_only: Some(true),
                 has_deploy_errors: false,
                 ws_error_handler_muted: None,
-                auto_kind: None,
+                auto_kind,
                 use_codebase: false,
                 deployment_msg: None,
                 kind,
@@ -1110,8 +1124,6 @@ async fn create_script_internal<'c>(
             .execute(&mut *tx)
             .await?;
 
-            clear_static_asset_usage_by_script_hash(&mut *tx, &w_id, hash).await?;
-
             r
         }
     }?;
@@ -1241,16 +1253,164 @@ async fn create_script_internal<'c>(
     // membership; parsed writes tell us what is produced (we don't record
     // them in auto_kind itself).
     let pipeline_annotations = parse_pipeline_annotations(&ns.content);
-    // `// freshness` is parsed but enforcement is a not-yet-implemented
-    // enterprise feature (skeleton in windmill_common::pipeline_advanced).
-    // Surface a clear TODO at deploy rather than silently accepting an
-    // annotation that does nothing.
-    if pipeline_annotations.freshness.is_some() {
+    // `// materialize` materializes a `ducklake://<name>/<table>` target from a
+    // DuckDB script. These two constraints hold for *both* modes: a non-DuckLake
+    // target would otherwise deploy, register a producer in the asset graph, then
+    // silently no-op at run time (`build_materialized_query` returns `Ok(None)`),
+    // and a non-DuckDB script never reaches the executor that records state. The
+    // managed-only checks (single trailing SELECT, no SQL args) come after — a
+    // `manual` script owns its DDL and skips them.
+    if let Some(m) = pipeline_annotations.materialize.as_ref() {
+        if ns.language != ScriptLang::DuckDb {
+            return Err(Error::BadRequest(format!(
+                "`// materialize` is only supported for DuckDB scripts, not {}. Use the \
+                 wmll.ducklake helpers to materialize from other languages.",
+                ns.language.as_str()
+            )));
+        }
+        if m.target_kind != windmill_parser::asset_parser::AssetKind::Ducklake {
+            return Err(Error::BadRequest(
+                "`// materialize` only supports a DuckLake target \
+                 (`ducklake://<name>/<table>`); other asset kinds aren't materializable."
+                    .to_string(),
+            ));
+        }
+        if !m.target_path.contains('/') {
+            return Err(Error::BadRequest(format!(
+                "`// materialize` needs a table in the target: \
+                 `ducklake://{0}/<table>` (got `ducklake://{0}`).",
+                m.target_path
+            )));
+        }
+        if !m.manual {
+            if let Err(e) = windmill_parser::sql_materialize::classify_wrap(&ns.content) {
+                return Err(Error::BadRequest(e.message()));
+            }
+            // SQL args are supported: managed materialize strips line comments
+            // (including `-- $name (type)` declarations) when it wraps the SELECT,
+            // but the executor parses the signature from the un-wrapped script, so
+            // `$name` references in the SELECT stay bound at run time.
+        }
+        // Reconciliation strategies are mutually exclusive; surface a conflict
+        // rather than silently dropping behavior the author may have intended.
+        // Precedence must mirror the runtime (`duckdb_executor` strategy
+        // derivation): scd2 (`history`) > append > merge (`key=`) > replace.
+        if m.scd2 && m.append {
+            tracing::warn!(
+                "script {}: both `history`/`scd2` and `append` set on // materialize; history wins (SCD2), append ignored",
+                ns.path
+            );
+        } else if m.unique_key.is_some() && m.append {
+            tracing::warn!(
+                "script {}: both `key=` and `append` set on // materialize; append wins (INSERT-only, no dedup)",
+                ns.path
+            );
+        }
+        // SCD2 (`key=<col> history` / `scd2`) option-combination checks the
+        // runtime cannot honor: reject at deploy with a clear message rather
+        // than letting the script deploy and fail on its first run. Mirrors the
+        // executor's safety-net `MaterializeSpec::validate` (duckdb_executor).
+        if let Err(e) = m.validate(pipeline_annotations.partition.is_some()) {
+            return Err(Error::BadRequest(e));
+        }
+        // `manual` materialize never captures a schema (no wrap codegen), so
+        // there is no contract for `on_schema_change` to mute downstream.
+        if m.manual && m.on_schema_change == windmill_parser::asset_parser::OnSchemaChange::Ignore {
+            tracing::warn!(
+                "script {}: `on_schema_change=ignore` on a `manual` materialize is inert — manual mode captures no schema, so consumers have no contract to check",
+                ns.path
+            );
+        }
+    }
+    // A `// data_test` line whose right-hand side doesn't parse into a known
+    // check is dropped silently by the parser (fail-safe). For a data-quality
+    // assertion that is a footgun — a typo disables the test with no signal —
+    // so warn at deploy. Warning, not rejection: it matches the other pipeline
+    // deploy checks above and can't false-positive a deploy on an edge the
+    // coarse count and the parser disagree on.
+    let malformed_data_tests =
+        windmill_parser::asset_parser::count_malformed_data_tests(&ns.content);
+    if malformed_data_tests > 0 {
         tracing::warn!(
-            "{}",
-            windmill_common::pipeline_advanced::freshness_enforcement_todo()
+            "script {}: {} `// data_test` line(s) are malformed and were dropped — the intended \
+             check(s) will not run. Fix the syntax (e.g. `data_test accepted_values <col> = a,b,c`, \
+             `data_test relationships <col> -> <asset>.<refcol>`).",
+            ns.path,
+            malformed_data_tests
         );
     }
+    // `// macros` — this script is a workspace macro library: its body is
+    // CREATE [OR REPLACE] MACRO statements plus plain setup, registered into
+    // `macro_definition` and injected as TEMP macros into consumer jobs.
+    // Pure shape checks happen here; the registry writes and the cross-lib
+    // name-collision check run inside the deploy transaction below.
+    let macro_lib_defs: Option<Vec<windmill_parser::duckdb_macros::ParsedMacro>> =
+        if pipeline_annotations.macros {
+            if ns.language != ScriptLang::DuckDb {
+                return Err(Error::BadRequest(format!(
+                    "`// macros` is only supported for DuckDB scripts, not {}",
+                    ns.language.as_str()
+                )));
+            }
+            if pipeline_annotations.materialize.is_some() {
+                return Err(Error::BadRequest(
+                    "`// macros` and `// materialize` are mutually exclusive — a macro \
+                     library defines reusable macros, it does not produce an asset"
+                        .to_string(),
+                ));
+            }
+            let lib = windmill_parser::duckdb_macros::parse_macro_library(&ns.content)
+                .map_err(Error::BadRequest)?;
+            let macros: Vec<_> = lib
+                .into_iter()
+                .filter_map(|s| match s {
+                    windmill_parser::duckdb_macros::LibStatement::Macro(m) => Some(m),
+                    windmill_parser::duckdb_macros::LibStatement::Setup(_) => None,
+                })
+                .collect();
+            if macros.is_empty() {
+                return Err(Error::BadRequest(
+                    "`// macros` library defines no macros".to_string(),
+                ));
+            }
+            let all_names: std::collections::HashSet<String> =
+                macros.iter().map(|m| m.name.clone()).collect();
+            // DuckDB bind-checks a macro body at CREATE time, so a body may
+            // only call same-file macros defined *earlier* — this also makes
+            // file order a valid creation order for whole-lib (`// use`)
+            // injection and rules out within-lib cycles.
+            let mut defined: std::collections::HashSet<String> = Default::default();
+            for m in &macros {
+                if windmill_parser::duckdb_builtins::is_duckdb_builtin(&m.name) {
+                    return Err(Error::BadRequest(format!(
+                        "macro `{}` shadows a DuckDB built-in function; pick another name",
+                        m.name
+                    )));
+                }
+                if defined.contains(&m.name) {
+                    return Err(Error::BadRequest(format!(
+                        "macro `{}` is defined twice in this library",
+                        m.name
+                    )));
+                }
+                let called =
+                    windmill_parser::duckdb_macros::detect_macro_calls(&m.body, &all_names);
+                if let Some(fwd) = called
+                    .iter()
+                    .find(|c| !defined.contains(*c) && *c != &m.name)
+                {
+                    return Err(Error::BadRequest(format!(
+                        "macro `{}` calls `{}`, which is defined later in the file; define \
+                         `{}` first (DuckDB bind-checks macro bodies at creation)",
+                        m.name, fwd, fwd
+                    )));
+                }
+                defined.insert(m.name.clone());
+            }
+            Some(macros)
+        } else {
+            None
+        };
     let in_pipeline = pipeline_annotations.in_pipeline;
     // `// trigger all` → AND join barrier (else OR, the default).
     let pipeline_join_all = !pipeline_annotations.join_mode.is_any();
@@ -1266,20 +1426,10 @@ async fn create_script_internal<'c>(
     if let Some(t) = pipeline_annotations.tag.clone() {
         ns.tag = Some(t);
     }
-    // `// retry <count> [<delay>]` is PARSED but PARKED: a retried subscriber
-    // is wrapped in a SingleStepFlow, whose run is a flow step and therefore
-    // ineligible for asset dispatch (asset_dispatch::is_eligible_kind) — so a
-    // retried subscriber would silently become a cascade dead-end (P1). We do
-    // not persist it to script_trigger; the cascade ignores retry until this
-    // is fixed. TODO(pipeline-retry): re-enable once cascade dispatch handles
-    // flow-wrapped producers.
-    if pipeline_annotations.retry.is_some() {
-        tracing::warn!(
-            "`// retry` on {} is not yet supported in the asset cascade and is ignored \
-             (a retried subscriber cannot trigger its downstream). TODO(pipeline-retry).",
-            ns.path
-        );
-    }
+    // `// retry <count> [<delay>]` is persisted to `script_trigger` below (asset
+    // edges only) and drives native subscriber retry in the cascade: a failed
+    // subscriber re-runs as a `Script` job (not a flow step), so it stays
+    // eligible for asset dispatch and can trigger its own downstream on success.
     // Asset presence is server-authoritative: re-parse the deployed content
     // (same parsers the frontend wasm wraps) and union with the client list.
     // The `asset` rows written below drive the asset-trigger cascade, so a
@@ -1290,7 +1440,50 @@ async fn create_script_internal<'c>(
         &ns.content,
         ns.assets.take(),
     );
-    let auto_kind = if in_pipeline {
+    // Register the `// materialize` target as a write asset so the deployed
+    // asset graph shows this script as the producer of the managed table — the
+    // body's `SELECT` doesn't express the write (the runtime generates it), so
+    // server-side inference wouldn't otherwise link it.
+    let effective_assets = if let Some(m) = pipeline_annotations.materialize.as_ref() {
+        let mut a = effective_assets.unwrap_or_default();
+        // Produced assets: the managed table, plus — for managed scd2 — the
+        // `<dim>_current` companion view the runtime (re)creates each run
+        // (`MaterializeSpec::write_targets`). Registering the view as a write
+        // asset lets `// on ducklake://…/<dim>_current` subscribers be
+        // dispatched by the cascade (which fans out from these deploy-time asset
+        // rows) and connects a consumer that reads only the view back to this
+        // producer; without it a subscriber on the view would silently never
+        // fire and the view would be an orphan node in the lineage graph.
+        for (target_kind, path) in m.write_targets() {
+            let kind = windmill_common::assets::asset_kind_from_parser(target_kind);
+            use windmill_common::assets::AssetUsageAccessType;
+            if let Some(existing) = a.iter_mut().find(|x| x.kind == kind && x.path == path) {
+                // The body reads its own managed target (an incremental/merge
+                // model `SELECT`ing from the table it materializes). The runtime
+                // still generates the write, so the effective access is RW — mark
+                // it so, otherwise it stays a plain read and (a) auto-derives a
+                // self-cascade edge back to this producer and (b) shows as a muted
+                // read on the canvas. Both are wrong: it's the script's own output.
+                if existing.access_type != Some(AssetUsageAccessType::W) {
+                    existing.access_type = Some(AssetUsageAccessType::RW);
+                }
+            } else {
+                a.push(windmill_common::assets::AssetWithAltAccessType {
+                    path,
+                    kind,
+                    access_type: Some(AssetUsageAccessType::W),
+                    alt_access_type: None,
+                    columns: None,
+                });
+            }
+        }
+        Some(a)
+    } else {
+        effective_assets
+    };
+    let auto_kind = if in_pipeline || macro_lib_defs.is_some() {
+        // A macro library is a pipeline member (graph node) even without the
+        // bare `// pipeline` marker.
         Some("pipeline".to_string())
     } else if ci_test_refs.is_some() {
         Some("test".to_string())
@@ -1302,6 +1495,7 @@ async fn create_script_internal<'c>(
         RunnableSettings {
             debouncing_settings: ns.debouncing_settings.insert_cached(&db).await?,
             concurrency_settings: ns.concurrency_settings.insert_cached(&db).await?,
+            retry_settings: None,
         },
         &db,
     )
@@ -1410,6 +1604,173 @@ async fn create_script_internal<'c>(
         }
     }
 
+    // DuckDB workspace macros: wipe-and-reinsert this script's registry rows
+    // (as provider) and call-site edges (as consumer), by new+old path so
+    // renames are handled — mirrors the ci_test_reference block above.
+    let macro_defs_deleted = sqlx::query!(
+        "DELETE FROM macro_definition WHERE workspace_id = $1 AND (provider_path = $2 OR provider_path = $3)",
+        &w_id,
+        &ns.path,
+        old_path.unwrap_or(&ns.path)
+    )
+    .execute(&mut *tx)
+    .await?
+    .rows_affected();
+    sqlx::query!(
+        "DELETE FROM macro_usage WHERE workspace_id = $1 AND (consumer_path = $2 OR consumer_path = $3)",
+        &w_id,
+        &ns.path,
+        old_path.unwrap_or(&ns.path)
+    )
+    .execute(&mut *tx)
+    .await?;
+    // Workers cache the registry per workspace; a mutation must evict it on
+    // every replica. Transactional emit — pollers see it only on commit.
+    if macro_lib_defs.is_some() || macro_defs_deleted > 0 {
+        sqlx::query!(
+            "INSERT INTO notify_event (channel, payload) VALUES ('notify_macro_registry_change', $1)",
+            &w_id
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    if let Some(ref macros) = macro_lib_defs {
+        // Macro names are workspace-unique (they're injected unqualified into
+        // consumers). This lib's own rows — old and new path — were deleted
+        // just above, so any remaining match is a genuine cross-lib clash.
+        let names: Vec<String> = macros.iter().map(|m| m.name.clone()).collect();
+        if let Some(clash) = sqlx::query!(
+            "SELECT name, provider_path FROM macro_definition WHERE workspace_id = $1 AND name = ANY($2) LIMIT 1",
+            &w_id,
+            &names[..]
+        )
+        .fetch_optional(&mut *tx)
+        .await?
+        {
+            return Err(Error::BadRequest(format!(
+                "macro `{}` is already defined by `{}`; macro names are workspace-unique",
+                clash.name, clash.provider_path
+            )));
+        }
+        for m in macros {
+            sqlx::query!(
+                "INSERT INTO macro_definition (workspace_id, name, provider_path, params, body, is_table_macro) \
+                 VALUES ($1, $2, $3, $4, $5, $6)",
+                &w_id,
+                &m.name,
+                &ns.path,
+                &m.params,
+                &m.body,
+                m.is_table
+            )
+            .execute(&mut *tx)
+            .await?;
+        }
+    }
+
+    if ns.language == ScriptLang::DuckDb {
+        // Record this script's macro-call edges for the asset graph (the
+        // worker re-detects calls live at job time, so these are display
+        // metadata only). A library's edges point at *other* libs' macros.
+        let registry_names: Vec<String> = sqlx::query_scalar!(
+            "SELECT name FROM macro_definition WHERE workspace_id = $1 AND provider_path != $2",
+            &w_id,
+            &ns.path
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        let names_set: std::collections::HashSet<String> = registry_names.into_iter().collect();
+        let mut called: Vec<String> =
+            windmill_parser::duckdb_macros::detect_macro_calls(&ns.content, &names_set)
+                .into_iter()
+                .collect();
+        called.sort();
+        for name in called {
+            sqlx::query!(
+                "INSERT INTO macro_usage (workspace_id, consumer_path, macro_name) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
+                &w_id,
+                &ns.path,
+                &name
+            )
+            .execute(&mut *tx)
+            .await?;
+        }
+        // `// use` targets should be deployed macro libraries — warn only:
+        // git-sync deploys scripts in arbitrary order, so the consumer landing
+        // first must not hard-fail. The runtime is the enforcement point.
+        for lib in &pipeline_annotations.use_libs {
+            let exists = sqlx::query_scalar!(
+                r#"SELECT EXISTS(SELECT 1 FROM macro_definition WHERE workspace_id = $1 AND provider_path = $2) AS "e!""#,
+                &w_id,
+                lib
+            )
+            .fetch_one(&mut *tx)
+            .await?;
+            if !exists {
+                tracing::warn!(
+                    "script {}: `// use {}` does not (yet) match a deployed macro library",
+                    ns.path,
+                    lib
+                );
+            }
+        }
+    } else if !pipeline_annotations.use_libs.is_empty() {
+        tracing::warn!(
+            "script {}: `// use` is only honored on DuckDB scripts; annotation ignored",
+            ns.path
+        );
+    }
+
+    if let Some(ref macros) = macro_lib_defs {
+        // Refresh every other DuckDB script's edges for this lib's names (a
+        // redeploy may add/remove macros; late-bound runtime picks changes up
+        // regardless — this only keeps the deployed graph current). The rescan
+        // covers ALL live DuckDB scripts, not just pipeline members: their
+        // edges were recorded at their own deploy and must survive the wipe.
+        let names: Vec<String> = macros.iter().map(|m| m.name.clone()).collect();
+        sqlx::query!(
+            "DELETE FROM macro_usage WHERE workspace_id = $1 AND macro_name = ANY($2) AND consumer_path != $3",
+            &w_id,
+            &names[..],
+            &ns.path
+        )
+        .execute(&mut *tx)
+        .await?;
+        let names_set: std::collections::HashSet<String> = names.into_iter().collect();
+        let members = sqlx::query!(
+            r#"SELECT DISTINCT ON (path) path AS "path!", content AS "content!"
+               FROM script
+               WHERE workspace_id = $1
+                 AND language = 'duckdb'::script_lang
+                 AND archived = false
+                 AND deleted = false
+                 AND path != $2
+               ORDER BY path, created_at DESC"#,
+            &w_id,
+            &ns.path
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        for member in members {
+            let mut called: Vec<String> =
+                windmill_parser::duckdb_macros::detect_macro_calls(&member.content, &names_set)
+                    .into_iter()
+                    .collect();
+            called.sort();
+            for name in called {
+                sqlx::query!(
+                    "INSERT INTO macro_usage (workspace_id, consumer_path, macro_name) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
+                    &w_id,
+                    &member.path,
+                    &name
+                )
+                .execute(&mut *tx)
+                .await?;
+            }
+        }
+    }
+
     let p_path_opt = parent_hashes_and_perms.as_ref().map(|x| x.p_path.clone());
     if let Some(ref p_path) = p_path_opt {
         if !skip_draft_deletion {
@@ -1626,15 +1987,17 @@ async fn create_script_internal<'c>(
     // discovered by the graph endpoint directly from the per-kind trigger
     // tables, so `trigger_spec_to_row` returns None for those.
     clear_script_triggers(&mut *tx, &w_id, &ns.path, AssetUsageKind::Script).await?;
-    // On rename, also drop the OLD path's trigger rows. clear is keyed by
-    // path (no by-hash variant), and only `ns.path` is wiped above — without
-    // this, stale `// on` edges for the old path keep matching producers and
-    // would trigger a script later recreated at that path even if it has no
-    // annotation (P1). (Producer/asset rows for the old path are already
-    // cleared via clear_static_asset_usage_by_script_hash on the parent.)
+    // On rename, also drop the OLD path's trigger and producer/asset rows.
+    // Both clears are keyed by path, and only `ns.path` is (re)written above
+    // (script_triggers here, asset rows via replace_static_asset_usage) — the
+    // renamed script no longer lives at the old path, so without this its
+    // stale `// on` edges keep matching producers (and would trigger a script
+    // later recreated at that path with no annotation, P1) and its producer
+    // rows keep it lingering in the asset graph.
     if let Some(ref old) = p_path_opt {
         if old != &ns.path {
             clear_script_triggers(&mut *tx, &w_id, old, AssetUsageKind::Script).await?;
+            clear_static_asset_usage(&mut *tx, &w_id, old, AssetUsageKind::Script).await?;
         }
     }
     for spec in &pipeline_triggers {
@@ -1651,6 +2014,24 @@ async fn create_script_internal<'c>(
                 .and_then(parse_duration_secs),
             _ => None,
         };
+        // `// retry` applies only to the asset cascade: a failed subscriber is
+        // re-run natively (a `Script` job, not a flow step), so it can still
+        // trigger its own downstream on success — see asset_dispatch.
+        let (retry_count, retry_delay_s) = match spec {
+            TriggerSpec::Asset { .. } => (
+                pipeline_annotations
+                    .retry
+                    .as_ref()
+                    // `// retry <count>` count is u32; saturate the narrowing to i16.
+                    .map(|r| r.count.min(i16::MAX as u32) as i16),
+                pipeline_annotations
+                    .retry
+                    .as_ref()
+                    .and_then(|r| r.delay.as_deref())
+                    .and_then(parse_duration_secs),
+            ),
+            _ => (None, None),
+        };
         insert_script_trigger(
             &mut *tx,
             &w_id,
@@ -1660,13 +2041,69 @@ async fn create_script_internal<'c>(
             &trigger_ref,
             pipeline_join_all,
             debounce_s,
-            // retry parked — see TODO(pipeline-retry) above.
-            None,
-            None,
+            retry_count,
+            retry_delay_s,
         )
         .await?;
     }
 
+    // Auto-derived cascade edges: within a `// pipeline`, a read of a ducklake
+    // table or s3 object wires the cascade edge straight from the FROM clause,
+    // so `// on <asset>` is only needed for edges inference can't see (dynamic
+    // SQL) or to carry per-edge opts. `// mute <asset>` / `// mute all` opt out.
+    // Explicit `// on` asset edges (inserted just above) win the dedup — they
+    // carry the per-edge debounce, so a derived row must not shadow them.
+    if in_pipeline && !pipeline_annotations.mute_all {
+        let asset_ref = |spec: &TriggerSpec| {
+            trigger_spec_to_row(spec)
+                .filter(|(k, _)| *k == ScriptTriggerKind::Asset)
+                .map(|(_, r)| r)
+        };
+        let explicit_refs: std::collections::HashSet<String> =
+            pipeline_triggers.iter().filter_map(asset_ref).collect();
+        let muted_refs: std::collections::HashSet<String> = pipeline_annotations
+            .mute
+            .iter()
+            .filter_map(asset_ref)
+            .collect();
+        let derived = derive_pipeline_asset_trigger_refs(
+            effective_assets.as_deref().unwrap_or(&[]),
+            &explicit_refs,
+            &muted_refs,
+            pipeline_annotations.mute_all,
+        );
+        // Derived edges have no per-`// on` opts, so they take the script-level
+        // `// debounce` default and `// retry` policy — same as writing a bare
+        // `// on <asset>` would.
+        let derived_debounce_s = pipeline_debounce_default
+            .as_deref()
+            .and_then(parse_duration_secs);
+        let derived_retry_count = pipeline_annotations
+            .retry
+            .as_ref()
+            .map(|r| r.count.min(i16::MAX as u32) as i16);
+        let derived_retry_delay_s = pipeline_annotations
+            .retry
+            .as_ref()
+            .and_then(|r| r.delay.as_deref())
+            .and_then(parse_duration_secs);
+        for trigger_ref in derived {
+            insert_script_trigger(
+                &mut *tx,
+                &w_id,
+                AssetUsageKind::Script,
+                &ns.path,
+                ScriptTriggerKind::Asset,
+                &trigger_ref,
+                pipeline_join_all,
+                derived_debounce_s,
+                derived_retry_count,
+                derived_retry_delay_s,
+            )
+            .await?;
+        }
+    }
+
     // Schedule annotations (`// on schedule`) are marker-only — the binding
     // lives on the schedule row's own `script_path` field, which the user
     // creates separately via the schedule editor. No script-create-time
@@ -2669,6 +3106,7 @@ async fn archive_script_by_path(
     // anything. Wipe declared `// on ...` edges (asset-event subscribers
     // look these up).
     clear_script_triggers(&mut *tx, &w_id, path, AssetUsageKind::Script).await?;
+    clear_macro_registry(&mut *tx, &w_id, path).await?;
 
     audit_log(
         &mut *tx,
@@ -2749,6 +3187,7 @@ async fn archive_script_by_hash(
     // Pipeline event hygiene: archived scripts must not be triggered by
     // anything. Wipe declared `// on ...` edges.
     clear_script_triggers(&mut *tx, &w_id, &script.path, AssetUsageKind::Script).await?;
+    clear_macro_registry(&mut *tx, &w_id, &script.path).await?;
 
     audit_log(
         &mut *tx,
@@ -2813,6 +3252,7 @@ async fn delete_script_by_hash(
     // anything. Wipe declared `// on ...` edges. Idempotent — safe even if
     // the script was never a pipeline member.
     clear_script_triggers(&mut *tx, &w_id, &script.path, AssetUsageKind::Script).await?;
+    clear_macro_registry(&mut *tx, &w_id, &script.path).await?;
 
     audit_log(
         &mut *tx,
@@ -2929,6 +3369,7 @@ async fn delete_script_by_path(
     // anything. Wipe declared `// on ...` edges. Idempotent — safe even if
     // the script was never a pipeline member.
     clear_script_triggers(&mut *tx, &w_id, path, AssetUsageKind::Script).await?;
+    clear_macro_registry(&mut *tx, &w_id, path).await?;
 
     if !query.keep_captures.unwrap_or(false) {
         sqlx::query!(
@@ -3091,6 +3532,10 @@ async fn delete_scripts_bulk(
     .execute(&mut *tx)
     .await?;
 
+    for path in &deleted_paths {
+        clear_macro_registry(&mut *tx, &w_id, path).await?;
+    }
+
     audit_log(
         &mut *tx,
         &authed,
@@ -3141,6 +3586,39 @@ async fn delete_scripts_bulk(
     Ok(Json(deleted_paths))
 }
 
+/// Deployed-macro hygiene for an archived/deleted script: it must neither
+/// provide macros to the workspace registry nor keep stale call-site edges.
+/// Usage edges pointing at the script's own macros go too (names are
+/// workspace-unique, so those edges can only reference this provider).
+async fn clear_macro_registry(db: &mut sqlx::PgConnection, w_id: &str, path: &str) -> Result<()> {
+    sqlx::query!(
+        "DELETE FROM macro_usage WHERE workspace_id = $1 AND (consumer_path = $2 \
+         OR macro_name IN (SELECT name FROM macro_definition WHERE workspace_id = $1 AND provider_path = $2))",
+        w_id,
+        path
+    )
+    .execute(&mut *db)
+    .await?;
+    let deleted = sqlx::query!(
+        "DELETE FROM macro_definition WHERE workspace_id = $1 AND provider_path = $2",
+        w_id,
+        path
+    )
+    .execute(&mut *db)
+    .await?
+    .rows_affected();
+    // Evict workers' per-workspace registry cache (transactional emit).
+    if deleted > 0 {
+        sqlx::query!(
+            "INSERT INTO notify_event (channel, payload) VALUES ('notify_macro_registry_change', $1)",
+            w_id
+        )
+        .execute(&mut *db)
+        .await?;
+    }
+    Ok(())
+}
+
 /// Validates that script debouncing configuration is supported by all workers
 /// Returns an error if debouncing is configured but workers are behind required version
 async fn guard_script_from_debounce_data(ns: &NewScript) -> Result<()> {
@@ -3587,3 +4065,46 @@ async fn get_ci_test_results_batch(
 
     Ok(Json(result_map))
 }
+
+#[derive(Deserialize)]
+struct CheckSchemaContractsRequest {
+    language: ScriptLang,
+    content: String,
+}
+
+#[derive(Serialize)]
+struct CheckSchemaContractsResponse {
+    warnings: Vec<windmill_common::schema_contracts::ContractWarning>,
+}
+
+// Save-time schema-contract check (pipelines gap #2b): validate the given
+// script content's asset references (body column reads, `// column` lineage,
+// `// data_test relationships`) against the latest captured producer schemas
+// and return WARNINGS — never errors, and deploy never blocks on this. The
+// frontend calls it right after a successful deploy (post-commit, so a
+// self-produced target resolves to the fresh content) and the editor mirrors
+// the same diff client-side; this endpoint is the authoritative check. Parsing
+// uses the same server path as deploy (`effective_script_assets` +
+// `parse_pipeline_annotations`) so the verdict matches what deployed.
+async fn check_schema_contracts(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Json(req): Json<CheckSchemaContractsRequest>,
+) -> JsonResult<CheckSchemaContractsResponse> {
+    let assets = crate::asset_inference::effective_script_assets(&req.language, &req.content, None)
+        .unwrap_or_default();
+    let ann = parse_pipeline_annotations(&req.content);
+    let mut tx = user_db.begin(&authed).await?;
+    let warnings = windmill_common::schema_contracts::check_schema_contracts(
+        &mut tx,
+        &w_id,
+        &assets,
+        &ann.column_lineage,
+        &ann.data_tests,
+        ann.materialize.as_ref(),
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(Json(CheckSchemaContractsResponse { warnings }))
+}
diff --git a/backend/windmill-api-settings/Cargo.toml b/backend/windmill-api-settings/Cargo.toml
index 5c4f429d9e..bc5078bce4 100644
--- a/backend/windmill-api-settings/Cargo.toml
+++ b/backend/windmill-api-settings/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [features]
 default = []
-enterprise = []
+enterprise = ["license"]
 private = ["windmill-common/private"]
 parquet = ["windmill-common/parquet", "windmill-object-store/parquet"]
 license = ["dep:rsa"]
diff --git a/backend/windmill-api-settings/src/audit_logs_s3.rs b/backend/windmill-api-settings/src/audit_logs_s3.rs
index 9fa4574a1e..d7d749cb58 100644
--- a/backend/windmill-api-settings/src/audit_logs_s3.rs
+++ b/backend/windmill-api-settings/src/audit_logs_s3.rs
@@ -20,9 +20,11 @@ use windmill_common::DB;
 pub struct AuditLogsS3ExportStatus {
     /// xid cursor: rows of transactions below this have been exported.
     pub last_xmin: i64,
-    /// Partition-pruning floor (the epoch sentinel while still bootstrapping).
+    /// Partition-pruning floor: the latest audit-row timestamp the cursor has
+    /// reached (also the read side's 7-day-fallback anchor).
     pub last_ts: Option<DateTime<Utc>>,
-    /// True until the initial post-enable backlog has been fully drained.
+    /// True while the exporter is draining a backlog — the last run was capped
+    /// at `MAX_XID_INTERVAL` xids and has not yet caught up to the live snapshot.
     pub bootstrapping: bool,
     /// The latest audit-row timestamp actually written to object storage so
     /// far (monotonic) — the "how current is the mirror" figure.
@@ -50,8 +52,7 @@ pub async fn get_status(db: &DB) -> error::Result<Option<AuditLogsS3ExportStatus
             .map(|d| d.with_timezone(&Utc))
     };
     let last_ts = parse_dt("last_ts");
-    let epoch = DateTime::<Utc>::from_timestamp(0, 0).unwrap();
-    let bootstrapping = last_ts.map(|t| t <= epoch).unwrap_or(true);
+    let bootstrapping = v.get("draining").and_then(|x| x.as_bool()).unwrap_or(false);
     Ok(Some(AuditLogsS3ExportStatus {
         last_xmin: v.get("last_xmin").and_then(|x| x.as_i64()).unwrap_or(0),
         last_ts,
diff --git a/backend/windmill-api-settings/src/audit_logs_s3_backfill.rs b/backend/windmill-api-settings/src/audit_logs_s3_backfill.rs
new file mode 100644
index 0000000000..0c5c55f7ed
--- /dev/null
+++ b/backend/windmill-api-settings/src/audit_logs_s3_backfill.rs
@@ -0,0 +1,708 @@
+#![cfg(feature = "parquet")]
+//! Opt-in historical backfill of audit logs to the instance object store.
+//!
+//! The steady-state exporter (the EE `export_audit_logs_to_object_store`) cursors
+//! on transaction xmin and, by design, only exports rows committed *after* the
+//! feature was enabled — it never rescans history (an `age(xmin)` predicate is
+//! unindexable, so scanning the whole partitioned table can't survive a
+//! `statement_timeout`). This module covers the complementary need: exporting a
+//! chosen historical `[from, to)` window (e.g. the gap left while the export was
+//! disabled) on demand.
+//!
+//! It is safe to run on a large table because it scans strictly by `timestamp`
+//! (the partition key — pruned and indexed) in bounded keyset pages, so every
+//! query touches at most one page worth of rows and survives a statement timeout.
+//! It does not touch the xmin cursor / checkpoint at all.
+//!
+//! Objects are written next to the steady-state ones under `logs/audit/dt=<day>/`
+//! as `audit_backfill_<window>_<min_id>.ndjson`, with the exact same row shape, so
+//! a consumer reads them uniformly. The key includes the requested window so two
+//! different backfill ranges never overwrite each other (a per-page `min_id` alone
+//! is not unique across windows). Re-running the *same* window is deterministic
+//! (audit history is append-only), so it overwrites the same objects rather than
+//! duplicating. A window that overlaps already-exported steady-state rows simply
+//! re-emits them under a different key; consumers dedupe by `id`.
+//!
+//! Scope: like the steady-state export, this reads only `audit_partitioned`. The
+//! pre-partitioning `audit` table is intentionally not exported; a window that
+//! overlaps any legacy `audit` row is rejected (see [`try_start`]) so a backfill
+//! never silently reports success while omitting them.
+//!
+//! Progress is persisted in `background_task_state` (name [`TASK_NAME`]) so any
+//! API replica can serve the status endpoint, mirroring `log_cleanup`.
+
+use std::sync::Arc;
+
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use tokio::sync::RwLock;
+
+use crate::background_task;
+use windmill_common::error::{self};
+use windmill_common::tracing_init::LOGS_AUDIT;
+use windmill_common::{DB, INSTANCE_NAME};
+
+use windmill_object_store::object_store_reexports::{ObjectStore, Path as ObjectPath};
+
+pub const TASK_NAME: &str = "audit_logs_s3_backfill";
+
+/// Rows fetched per keyset page. Bounds each query so it stays well under any
+/// `statement_timeout` even on a busy partition, and bounds peak memory (one
+/// page of ndjson is buffered before the day-grouped PUTs).
+const PAGE_ROWS: i64 = 10_000;
+
+/// Test-only override for [`PAGE_ROWS`] (0 = use the default), so a test can force
+/// multi-page / page-spanning-day keyset behaviour with only a handful of rows.
+#[cfg(test)]
+static PAGE_ROWS_OVERRIDE: std::sync::atomic::AtomicI64 = std::sync::atomic::AtomicI64::new(0);
+
+fn page_rows() -> i64 {
+    #[cfg(test)]
+    {
+        match PAGE_ROWS_OVERRIDE.load(std::sync::atomic::Ordering::Relaxed) {
+            0 => PAGE_ROWS,
+            n => n,
+        }
+    }
+    #[cfg(not(test))]
+    {
+        PAGE_ROWS
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize)]
+pub struct AuditBackfillProgress {
+    pub running: bool,
+    pub started_at: DateTime<Utc>,
+    pub finished_at: Option<DateTime<Utc>>,
+    /// Human-readable description of the current phase.
+    pub phase: String,
+    /// Inclusive lower / exclusive upper bound of the window being exported.
+    pub from: DateTime<Utc>,
+    pub to: DateTime<Utc>,
+    /// Audit rows written to object storage so far.
+    pub rows_written: u64,
+    /// Object PUTs issued so far (one per day per page).
+    pub objects_written: u64,
+    /// Keyset cursor: the timestamp of the last row exported (how far the
+    /// backfill has progressed through the window).
+    pub last_ts: Option<DateTime<Utc>>,
+    pub errors: u64,
+    pub last_error: Option<String>,
+}
+
+impl AuditBackfillProgress {
+    fn new_running(from: DateTime<Utc>, to: DateTime<Utc>) -> Self {
+        Self {
+            running: true,
+            started_at: Utc::now(),
+            finished_at: None,
+            phase: "starting".to_string(),
+            from,
+            to,
+            rows_written: 0,
+            objects_written: 0,
+            last_ts: None,
+            errors: 0,
+            last_error: None,
+        }
+    }
+}
+
+struct Session {
+    db: DB,
+    owner: String,
+    progress: RwLock<AuditBackfillProgress>,
+}
+
+impl Session {
+    async fn update<F: FnOnce(&mut AuditBackfillProgress)>(&self, f: F) {
+        let snapshot = {
+            let mut p = self.progress.write().await;
+            f(&mut p);
+            p.clone()
+        };
+        if let Err(e) =
+            background_task::update_state(&self.db, TASK_NAME, &self.owner, &snapshot).await
+        {
+            tracing::warn!("audit backfill: failed to persist progress: {e:#}");
+        }
+    }
+
+    async fn record_error(&self, msg: String) {
+        tracing::error!("audit backfill: {msg}");
+        self.update(|p| {
+            p.errors = p.errors.saturating_add(1);
+            p.last_error = Some(msg);
+        })
+        .await;
+    }
+
+    async fn release(&self) {
+        let snapshot = {
+            let mut p = self.progress.write().await;
+            p.running = false;
+            p.finished_at = Some(Utc::now());
+            p.phase = "done".to_string();
+            p.clone()
+        };
+        tracing::info!(
+            "audit backfill finished: {} row(s) in {} object(s) for [{}, {}), {} error(s)",
+            snapshot.rows_written,
+            snapshot.objects_written,
+            snapshot.from,
+            snapshot.to,
+            snapshot.errors
+        );
+        if let Err(e) = background_task::release(&self.db, TASK_NAME, &self.owner, &snapshot).await
+        {
+            tracing::warn!("audit backfill: failed to release lease: {e:#}");
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct BackfillRequest {
+    pub from: DateTime<Utc>,
+    pub to: DateTime<Utc>,
+}
+
+/// Atomically claim the backfill lease, or error if one is already running.
+pub async fn try_start(db: &DB, from: DateTime<Utc>, to: DateTime<Utc>) -> error::Result<()> {
+    if from >= to {
+        return Err(error::Error::BadRequest(
+            "audit backfill: `from` must be strictly before `to`".to_string(),
+        ));
+    }
+    // The backfill keyset-pages by `(timestamp, id)` over rows visible at scan time and
+    // declares the window fully exported once the scan runs dry. But a row's `timestamp`
+    // is its inserting transaction's `xact_start`, so a transaction that started inside
+    // `[from, to)` yet commits after the scan has passed that timestamp — or any row
+    // committed when `to` is in the future — would be silently omitted. Require `to` to
+    // be at or before the oldest in-flight `xact_start`: everything strictly older than
+    // the oldest running transaction is already committed and stable.
+    //
+    // That bound is only sound when we can see every xmin-holding transaction. A role
+    // without pg_read_all_stats/superuser sees only its own sessions, and a prepared
+    // (2PC) transaction is invisible to pg_stat_activity — in either case an old
+    // transaction could still commit rows inside an accepted window after our scan ends.
+    // Since a backfill asserts completeness, we REJECT in those cases (the function
+    // returns NULL). (The continuous exporter, which only claims bounded lag, keeps the
+    // 7-day fallback instead.) The probe lives in the `audit_logs_s3_oldest_inflight_ts()`
+    // SQL function (migration 20260626132251) so its `pg_has_role`/`pg_authid` read is
+    // wrapped in a subtransaction EXCEPTION: managed providers (e.g. Cloud SQL) forbid
+    // reading pg_authid from an elevated context, which would otherwise surface here as
+    // an opaque error instead of NULL → the actionable rejection below.
+    let settled_cutoff: Option<DateTime<Utc>> =
+        sqlx::query_scalar!(r#"SELECT audit_logs_s3_oldest_inflight_ts() AS "cutoff?""#)
+            .fetch_one(db)
+            .await?;
+    let Some(settled_cutoff) = settled_cutoff else {
+        return Err(error::Error::BadRequest(
+            "audit backfill: cannot determine a trustworthy settled-time boundary, so completeness \
+             can't be guaranteed. The windmill DB role needs pg_read_all_stats (or superuser) and \
+             there must be no prepared (2PC) transactions in progress — otherwise an old or \
+             invisible transaction could later commit audit rows inside the requested window and \
+             the backfill would miss them. Grant the privilege / resolve prepared transactions and \
+             retry."
+                .to_string(),
+        ));
+    };
+    if to > settled_cutoff {
+        return Err(error::Error::BadRequest(format!(
+            "audit backfill: `to` ({to}) must be at or before {settled_cutoff}, the newest point \
+             guaranteed settled (the oldest in-flight transaction's start); choose an earlier \
+             upper bound."
+        )));
+    }
+    // The backfill (like the steady-state export) reads only `audit_partitioned`. Audit
+    // history from before partitioning was introduced lives in the legacy `audit` table
+    // and is intentionally not exported. If the requested window overlaps any legacy row,
+    // reject — otherwise a "completed" backfill would silently omit them. Checking the
+    // legacy table directly (rather than min(audit_partitioned)) also covers an upgraded
+    // instance whose `audit_partitioned` is still empty, where a min() guard would no-op.
+    // Non-macro query: no compile-time-checked entry needed.
+    let overlaps_legacy: bool = sqlx::query_scalar::<_, bool>(
+        "SELECT EXISTS (SELECT 1 FROM audit WHERE timestamp >= $1 AND timestamp < $2)",
+    )
+    .bind(from)
+    .bind(to)
+    .fetch_one(db)
+    .await?;
+    if overlaps_legacy {
+        return Err(error::Error::BadRequest(
+            "audit backfill: the requested window overlaps rows in the legacy (pre-partitioning) \
+             `audit` table, which is not exported to object storage. Restrict the window to the \
+             partitioned era (after audit-log partitioning was introduced)."
+                .to_string(),
+        ));
+    }
+    let claimed = background_task::try_claim(
+        db,
+        TASK_NAME,
+        &*INSTANCE_NAME,
+        &AuditBackfillProgress::new_running(from, to),
+    )
+    .await?;
+    if !claimed {
+        return Err(error::Error::BadRequest(
+            "An audit log backfill is already running".to_string(),
+        ));
+    }
+    Ok(())
+}
+
+/// Fetch the current backfill status. Any API server can call this.
+pub async fn get_status(db: &DB) -> error::Result<Option<AuditBackfillProgress>> {
+    let Some(r) = background_task::get(db, TASK_NAME).await? else {
+        return Ok(None);
+    };
+    match serde_json::from_value::<AuditBackfillProgress>(r.value) {
+        Ok(mut p) => {
+            // get() collapses `running` to false when the heartbeat is stale.
+            p.running = r.running;
+            Ok(Some(p))
+        }
+        Err(e) => Err(error::Error::internal_err(format!(
+            "deserialize audit backfill progress: {e:#}"
+        ))),
+    }
+}
+
+pub fn spawn_backfill(db: DB, from: DateTime<Utc>, to: DateTime<Utc>) {
+    use futures::FutureExt;
+    use std::panic::AssertUnwindSafe;
+
+    tokio::spawn(async move {
+        let session = Arc::new(Session {
+            db: db.clone(),
+            owner: INSTANCE_NAME.clone(),
+            progress: RwLock::new(AuditBackfillProgress::new_running(from, to)),
+        });
+
+        let s = session.clone();
+        let task = async move {
+            let store = match windmill_object_store::get_object_store().await {
+                Some(st) => st,
+                None => {
+                    s.record_error("Object storage is not configured".to_string())
+                        .await;
+                    return;
+                }
+            };
+            if let Err(e) = run_backfill(&s, &db, &store, from, to).await {
+                s.record_error(format!("backfill failed: {e:#}")).await;
+            }
+        };
+
+        // catch_unwind so a panic can't leave the lease held forever.
+        if let Err(panic) = AssertUnwindSafe(task).catch_unwind().await {
+            let msg = panic
+                .downcast_ref::<&str>()
+                .map(|s| s.to_string())
+                .or_else(|| panic.downcast_ref::<String>().cloned())
+                .unwrap_or_else(|| "unknown panic".to_string());
+            session
+                .record_error(format!("backfill task panicked: {msg}"))
+                .await;
+        }
+
+        session.release().await;
+    });
+}
+
+/// Export `[from, to)` in keyset pages ordered by `(timestamp, id)`. Each page is
+/// a bounded, partition-pruned scan; rows are grouped by UTC day and written one
+/// object per day per page.
+async fn run_backfill(
+    session: &Session,
+    db: &DB,
+    store: &Arc<dyn ObjectStore>,
+    from: DateTime<Utc>,
+    to: DateTime<Utc>,
+) -> error::Result<()> {
+    session.update(|p| p.phase = "exporting".to_string()).await;
+
+    // Keyset cursor over (timestamp, id). `id` starts below any real value so the
+    // first page includes rows at exactly `from`.
+    let mut cursor_ts = from;
+    let mut cursor_id: i64 = -1;
+    let page_rows = page_rows();
+    // Namespace object keys by the requested window. The per-page `min_id` alone is not
+    // unique across runs: a narrower, overlapping backfill can start a day's page at the
+    // same first row (same `min_id`) but contain fewer rows, and `put` would overwrite a
+    // broader run's object — silently dropping the rows only that object held. Including
+    // the window makes different ranges write disjoint keys (same window re-runs stay
+    // idempotent); consumers already dedupe overlapping rows by `id`.
+    let window_key = format!("{}_{}", from.timestamp_millis(), to.timestamp_millis());
+
+    loop {
+        let rows = sqlx::query!(
+            r#"SELECT to_char(timestamp AT TIME ZONE 'UTC', 'YYYY-MM-DD') AS "day!",
+                      id AS "id!",
+                      timestamp AS "ts!",
+                      row_to_json(r)::text AS "line!"
+               FROM (
+                   SELECT workspace_id, id, timestamp, username, operation,
+                          action_kind::text AS action_kind, resource, parameters, email, span
+                   FROM audit_partitioned
+                   WHERE timestamp >= $1 AND timestamp < $2
+                     AND (timestamp, id) > ($3, $4)
+                   ORDER BY timestamp, id
+                   LIMIT $5
+               ) r
+               ORDER BY timestamp, id"#,
+            from,
+            to,
+            cursor_ts,
+            cursor_id,
+            page_rows
+        )
+        .fetch_all(db)
+        .await?;
+
+        if rows.is_empty() {
+            break;
+        }
+
+        // Group this page's ndjson lines by day, preserving (timestamp, id) order,
+        // and track the min id per day for a deterministic, collision-free key.
+        let mut by_day: Vec<(String, i64, String)> = Vec::new(); // (day, min_id, ndjson)
+        for row in &rows {
+            match by_day.last_mut() {
+                Some((day, _min_id, acc)) if *day == row.day => {
+                    acc.push('\n');
+                    acc.push_str(&row.line);
+                }
+                _ => by_day.push((row.day.clone(), row.id, row.line.clone())),
+            }
+        }
+
+        for (day, min_id, ndjson) in &by_day {
+            let object_path = ObjectPath::from(format!(
+                "{LOGS_AUDIT}dt={day}/audit_backfill_{window_key}_{min_id}.ndjson"
+            ));
+            store
+                .put(&object_path, ndjson.clone().into_bytes().into())
+                .await
+                .map_err(|e| error::Error::internal_err(format!("upload {object_path}: {e:#}")))?;
+            let n = ndjson.lines().count() as u64;
+            // Persist progress (and refresh the lease heartbeat) after every object,
+            // not just once the page completes: a stale heartbeat lets another replica
+            // re-claim the lease and run a concurrent backfill, so the gap between
+            // heartbeats must stay well under STALE_HEARTBEAT_SECS even if a page's
+            // uploads are slow.
+            session
+                .update(|p| {
+                    p.rows_written = p.rows_written.saturating_add(n);
+                    p.objects_written = p.objects_written.saturating_add(1);
+                })
+                .await;
+        }
+
+        // Advance the keyset cursor past the last row of this page.
+        let last = rows.last().expect("page is non-empty");
+        cursor_ts = last.ts;
+        cursor_id = last.id;
+
+        let new_last_ts = last.ts;
+        session.update(|p| p.last_ts = Some(new_last_ts)).await;
+
+        // A short page means the window is exhausted.
+        if (rows.len() as i64) < page_rows {
+            break;
+        }
+    }
+
+    Ok(())
+}
+
+#[cfg(all(test, feature = "parquet"))]
+mod tests {
+    use super::*;
+    use futures::stream::StreamExt;
+    use std::sync::atomic::Ordering;
+    use std::sync::Arc;
+    use windmill_object_store::object_store_reexports::{InMemory, ObjectStore, Path as OsPath};
+
+    /// A private, per-test object store. `run_backfill` takes the store as a parameter,
+    /// so tests use a local one and never touch the process-global `OBJECT_STORE_SETTINGS`
+    /// (which would otherwise race across the parallel test runner).
+    fn local_store() -> (Arc<InMemory>, Arc<dyn ObjectStore>) {
+        let store = Arc::new(InMemory::new());
+        let dynstore: Arc<dyn ObjectStore> = store.clone();
+        (store, dynstore)
+    }
+
+    /// Serializes the tests that touch the `PAGE_ROWS_OVERRIDE` process global (read
+    /// inside `run_backfill`) so they can't observe each other's value under the parallel
+    /// runner.
+    static PAGE_OVERRIDE_LOCK: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(());
+
+    /// Resets `PAGE_ROWS_OVERRIDE` on drop so a failing assertion can't leak a non-default
+    /// page size into another test.
+    struct ResetPageOverride;
+    impl Drop for ResetPageOverride {
+        fn drop(&mut self) {
+            PAGE_ROWS_OVERRIDE.store(0, Ordering::Relaxed);
+        }
+    }
+
+    /// Insert an audit row `days` days in the past (creating the daily partition if
+    /// needed). The row's `timestamp` defaults to that point, landing it in the
+    /// matching partition.
+    async fn insert_audit_days_ago(db: &DB, operation: &str, days: i64) -> i64 {
+        sqlx::query(&format!(
+            "DO $$ DECLARE d date := current_date - {days}; BEGIN \
+             EXECUTE format('CREATE TABLE IF NOT EXISTS %I PARTITION OF audit_partitioned \
+             FOR VALUES FROM (%L) TO (%L)', 'audit_'||to_char(d,'YYYYMMDD'), d, d + 1); END $$;"
+        ))
+        .execute(db)
+        .await
+        .ok();
+        sqlx::query_scalar::<_, i64>(&format!(
+            "INSERT INTO audit_partitioned
+                 (workspace_id, username, operation, action_kind, parameters, timestamp)
+             VALUES ('test-ws','tester',$1,'create'::action_kind,'{{}}'::jsonb,
+                     now() - interval '{days} days')
+             RETURNING id"
+        ))
+        .bind(operation)
+        .fetch_one(db)
+        .await
+        .expect("insert audit row")
+    }
+
+    /// Insert an audit row at an exact timestamp (creating the daily partition if
+    /// needed), for tests that need distinct in-day timestamps.
+    async fn insert_audit_at(db: &DB, operation: &str, ts: DateTime<Utc>) -> i64 {
+        sqlx::query(&format!(
+            "DO $$ DECLARE d date := '{}'; BEGIN \
+             EXECUTE format('CREATE TABLE IF NOT EXISTS %I PARTITION OF audit_partitioned \
+             FOR VALUES FROM (%L) TO (%L)', 'audit_'||to_char(d,'YYYYMMDD'), d, d + 1); END $$;",
+            ts.format("%Y-%m-%d")
+        ))
+        .execute(db)
+        .await
+        .ok();
+        sqlx::query_scalar::<_, i64>(
+            "INSERT INTO audit_partitioned
+                 (workspace_id, username, operation, action_kind, parameters, timestamp)
+             VALUES ('test-ws','tester',$1,'create'::action_kind,'{}'::jsonb,$2)
+             RETURNING id",
+        )
+        .bind(operation)
+        .bind(ts)
+        .fetch_one(db)
+        .await
+        .expect("insert audit row")
+    }
+
+    /// All ids across every `audit_backfill_*.ndjson` object, and the set of object
+    /// paths (to assert pagination/day keying).
+    async fn backfilled(store: &InMemory) -> (Vec<i64>, Vec<String>) {
+        let prefix = OsPath::from("logs/audit");
+        let metas = store
+            .list(Some(&prefix))
+            .collect::<Vec<_>>()
+            .await
+            .into_iter()
+            .map(|m| m.expect("list object"))
+            .collect::<Vec<_>>();
+        let mut ids = Vec::new();
+        let mut paths = Vec::new();
+        for meta in metas {
+            paths.push(meta.location.to_string());
+            let bytes = store
+                .get(&meta.location)
+                .await
+                .expect("get object")
+                .bytes()
+                .await
+                .expect("read bytes");
+            for line in std::str::from_utf8(&bytes).unwrap().lines() {
+                if line.is_empty() {
+                    continue;
+                }
+                let v: serde_json::Value = serde_json::from_str(line).expect("valid ndjson");
+                ids.push(v.get("id").and_then(|x| x.as_i64()).expect("row has id"));
+            }
+        }
+        ids.sort();
+        paths.sort();
+        (ids, paths)
+    }
+
+    fn session(db: &DB, from: DateTime<Utc>, to: DateTime<Utc>) -> Session {
+        Session {
+            db: db.clone(),
+            owner: INSTANCE_NAME.clone(),
+            progress: RwLock::new(AuditBackfillProgress::new_running(from, to)),
+        }
+    }
+
+    // End-to-end backfill: a settled multi-day window is exported in bounded keyset
+    // pages (forced to 2 rows/page) — every in-window row lands exactly once, rows
+    // outside [from,to) are excluded, a day that spans a page boundary produces more
+    // than one object, and re-running is idempotent (same keys overwritten, no dupes).
+    #[sqlx::test(migrations = "../migrations")]
+    async fn backfill_exports_window_in_pages(db: DB) -> anyhow::Result<()> {
+        let _serial = PAGE_OVERRIDE_LOCK.lock().await;
+        let _reset = ResetPageOverride; // restores the page override even on panic
+        let (store, dyn_store) = local_store();
+        // Force multi-page / page-spanning-day keyset behaviour with a handful of rows.
+        PAGE_ROWS_OVERRIDE.store(2, Ordering::Relaxed);
+
+        // In window [now-6d, now-2d): days 5, 4, 3 ago.
+        let mut want = Vec::new();
+        for i in 0..3 {
+            want.push(insert_audit_days_ago(&db, &format!("bf.d5.{i}"), 5).await);
+        }
+        for i in 0..2 {
+            want.push(insert_audit_days_ago(&db, &format!("bf.d4.{i}"), 4).await);
+        }
+        for i in 0..2 {
+            want.push(insert_audit_days_ago(&db, &format!("bf.d3.{i}"), 3).await);
+        }
+        want.sort();
+        // Out of window: before `from` and at/after `to`.
+        let before = insert_audit_days_ago(&db, "bf.before", 7).await;
+        let after = insert_audit_days_ago(&db, "bf.after", 1).await;
+
+        let from = Utc::now() - chrono::Duration::days(6);
+        let to = Utc::now() - chrono::Duration::days(2);
+
+        let s = session(&db, from, to);
+        run_backfill(&s, &db, &dyn_store, from, to).await?;
+
+        let (ids, paths) = backfilled(&store).await;
+        assert_eq!(ids, want, "exactly the in-window rows, each once: {ids:?}");
+        assert!(
+            !ids.contains(&before) && !ids.contains(&after),
+            "rows outside [from,to) must not be exported"
+        );
+        // 3 rows on the day-5 partition at a 2-row page size => that day spans pages,
+        // so it yields >1 object — proving keyset paging across a day boundary.
+        let day5_objects = paths
+            .iter()
+            .filter(|p| p.contains("audit_backfill_"))
+            .count();
+        assert!(
+            day5_objects >= 4,
+            "expected multiple paged objects (incl. a split day), got {paths:?}"
+        );
+        {
+            let p = s.progress.read().await;
+            assert_eq!(p.rows_written, want.len() as u64, "progress row count");
+        }
+
+        // Idempotent re-run: deterministic keys are overwritten, never duplicated.
+        let s2 = session(&db, from, to);
+        run_backfill(&s2, &db, &dyn_store, from, to).await?;
+        let (ids2, _) = backfilled(&store).await;
+        assert_eq!(ids2, want, "re-run stays exactly once per row: {ids2:?}");
+
+        Ok(())
+    }
+
+    // A narrower backfill overlapping a broader one must not overwrite (and drop rows
+    // from) the broader run's object: the object key includes the window. The two
+    // windows share a day and the same first row (so the same `min_id`), but the
+    // narrower one holds fewer rows.
+    #[sqlx::test(migrations = "../migrations")]
+    async fn backfill_window_in_key_prevents_overwrite(db: DB) -> anyhow::Result<()> {
+        // Hold the lock so no concurrent test's PAGE_ROWS_OVERRIDE is observed; this test
+        // wants the default (large) page size so each day is one object per window.
+        let _serial = PAGE_OVERRIDE_LOCK.lock().await;
+        let (store, dyn_store) = local_store();
+
+        // Four rows on the same day at distinct times.
+        let base = Utc::now() - chrono::Duration::days(5);
+        let r0 = insert_audit_at(&db, "ov.0", base).await;
+        let r1 = insert_audit_at(&db, "ov.1", base + chrono::Duration::seconds(10)).await;
+        let r2 = insert_audit_at(&db, "ov.2", base + chrono::Duration::seconds(20)).await;
+        let r3 = insert_audit_at(&db, "ov.3", base + chrono::Duration::seconds(30)).await;
+
+        // Broad run covers all four (one object for the day, keyed by r0).
+        let a_from = base - chrono::Duration::seconds(1);
+        let a_to = base + chrono::Duration::seconds(31);
+        run_backfill(&session(&db, a_from, a_to), &db, &dyn_store, a_from, a_to).await?;
+
+        // Narrow run starts at the same first row (same min_id) but holds only r0, r1.
+        let b_from = base - chrono::Duration::seconds(1);
+        let b_to = base + chrono::Duration::seconds(15);
+        run_backfill(&session(&db, b_from, b_to), &db, &dyn_store, b_from, b_to).await?;
+
+        let (ids, _) = backfilled(&store).await;
+        for id in [r0, r1, r2, r3] {
+            assert!(
+                ids.contains(&id),
+                "row {id} lost — a narrower overlapping window overwrote the broader run's \
+                 object: {ids:?}"
+            );
+        }
+        Ok(())
+    }
+
+    // The endpoint rejects a window whose upper bound is not yet settled (a row's
+    // timestamp is its txn's xact_start, so a future/live `to` could miss late
+    // commits), but accepts a window safely in the past.
+    #[sqlx::test(migrations = "../migrations")]
+    async fn backfill_rejects_unstable_window(db: DB) -> anyhow::Result<()> {
+        let future = Utc::now() + chrono::Duration::days(1);
+        let past_from = Utc::now() - chrono::Duration::days(2);
+        let err = try_start(&db, past_from, future).await.unwrap_err();
+        assert!(
+            matches!(err, error::Error::BadRequest(_)),
+            "a future `to` must be rejected as unstable, got {err:?}"
+        );
+
+        // A window fully in the settled past is accepted.
+        let from = Utc::now() - chrono::Duration::days(3);
+        let to = Utc::now() - chrono::Duration::days(2);
+        try_start(&db, from, to)
+            .await
+            .expect("a settled past window is accepted");
+        Ok(())
+    }
+
+    /// Insert a row into the legacy (non-partitioned) `audit` table at an exact time.
+    async fn insert_legacy_audit_at(db: &DB, operation: &str, ts: DateTime<Utc>) {
+        sqlx::query(
+            "INSERT INTO audit (workspace_id, username, operation, action_kind, parameters, timestamp)
+             VALUES ('test-ws','tester',$1,'create'::action_kind,'{}'::jsonb,$2)",
+        )
+        .bind(operation)
+        .bind(ts)
+        .execute(db)
+        .await
+        .expect("insert legacy audit row");
+    }
+
+    // A window overlapping rows in the legacy (non-partitioned) `audit` table is rejected:
+    // those rows are not exported, so the backfill must not report success while silently
+    // omitting them. Covers the empty-`audit_partitioned` case (a min(partitioned) guard
+    // would no-op there).
+    #[sqlx::test(migrations = "../migrations")]
+    async fn backfill_rejects_window_overlapping_legacy(db: DB) -> anyhow::Result<()> {
+        // A legacy row ~5 days ago, and no partitioned rows at all.
+        insert_legacy_audit_at(&db, "legacy.row", Utc::now() - chrono::Duration::days(5)).await;
+
+        // A window covering it is rejected.
+        let from = Utc::now() - chrono::Duration::days(6);
+        let to = Utc::now() - chrono::Duration::days(2);
+        let err = try_start(&db, from, to).await.unwrap_err();
+        assert!(
+            matches!(err, error::Error::BadRequest(_)),
+            "a window overlapping legacy audit rows must be rejected, got {err:?}"
+        );
+
+        // A window clear of any legacy row is accepted.
+        let from_ok = Utc::now() - chrono::Duration::days(2);
+        let to_ok = Utc::now() - chrono::Duration::days(1);
+        try_start(&db, from_ok, to_ok)
+            .await
+            .expect("a window with no legacy overlap is accepted");
+        Ok(())
+    }
+}
diff --git a/backend/windmill-api-settings/src/lib.rs b/backend/windmill-api-settings/src/lib.rs
index 7a278afc49..0a58f1f4b3 100644
--- a/backend/windmill-api-settings/src/lib.rs
+++ b/backend/windmill-api-settings/src/lib.rs
@@ -14,6 +14,8 @@ use std::{
 #[cfg(feature = "parquet")]
 mod audit_logs_s3;
 #[cfg(feature = "parquet")]
+mod audit_logs_s3_backfill;
+#[cfg(feature = "parquet")]
 mod background_task;
 #[cfg(feature = "private")]
 mod ee;
@@ -204,7 +206,12 @@ pub fn global_service() -> Router {
             )
             .route("/run_log_cleanup", post(run_log_cleanup))
             .route("/log_cleanup_status", get(log_cleanup_status))
-            .route("/audit_logs_s3_status", get(audit_logs_s3_status));
+            .route("/audit_logs_s3_status", get(audit_logs_s3_status))
+            .route("/audit_logs_s3_backfill", post(run_audit_logs_s3_backfill))
+            .route(
+                "/audit_logs_s3_backfill_status",
+                get(audit_logs_s3_backfill_status),
+            );
     }
 
     #[cfg(not(feature = "parquet"))]
@@ -256,52 +263,304 @@ pub async fn test_s3_bucket(
     use bytes::Bytes;
     use futures::StreamExt;
 
-    require_super_admin(&db, &authed.email).await?;
+    // The probe executes on the API server itself. On multi-tenant Cloud that is a shared control
+    // plane, so we constrain untrusted callers to remove the SSRF / credential-exfiltration /
+    // local-filesystem surface (see validate_object_storage_test). On self-hosted instances the
+    // object store usually lives on the local/private network and all authenticated users are
+    // trusted, so testing there stays unrestricted. Super admins keep the unrestricted path too.
+    let is_super_admin = is_super_admin_email(&db, &authed.email).await?;
+    let restrict = !is_super_admin && *CLOUD_HOSTED;
+    if restrict {
+        validate_object_storage_test(&test_s3_bucket).await?;
+    }
 
     let client = build_object_store_from_settings(test_s3_bucket, Some(&db))
         .await?
         .store;
 
-    let mut list = client.list(Some(
-        &windmill_object_store::object_store_reexports::Path::from("".to_string()),
-    ));
-    let first_file = list.next().await;
-    if first_file.is_some() {
-        if let Err(e) = first_file.as_ref().unwrap() {
-            tracing::error!("error listing bucket: {e:#}");
-            error::Error::internal_err(format!("Failed to list files in blob storage: {e:#}"));
+    let run = async {
+        let mut list = client.list(Some(
+            &windmill_object_store::object_store_reexports::Path::from("".to_string()),
+        ));
+        let first_file = list.next().await;
+        if first_file.is_some() {
+            if let Err(e) = first_file.as_ref().unwrap() {
+                tracing::error!("error listing bucket: {e:#}");
+                error::Error::internal_err(format!("Failed to list files in blob storage: {e:#}"));
+            }
+            tracing::info!("Listed files: {:?}", first_file.unwrap());
+        } else {
+            tracing::info!("No files in blob storage");
         }
-        tracing::info!("Listed files: {:?}", first_file.unwrap());
+
+        let path = windmill_object_store::object_store_reexports::Path::from(format!(
+            "/test-s3-bucket-{uuid}",
+            uuid = uuid::Uuid::new_v4()
+        ));
+        tracing::info!("Testing blob storage at path: {path}");
+        client
+            .put(
+                &path,
+                windmill_object_store::object_store_reexports::PutPayload::from_static(b"hello"),
+            )
+            .await
+            .map_err(|e| anyhow::anyhow!("error writing file to {path}: {e:#}"))?;
+        let content = client
+            .get(&path)
+            .await
+            .map_err(to_anyhow)?
+            .bytes()
+            .await
+            .map_err(to_anyhow)?;
+        if content != Bytes::from_static(b"hello") {
+            return Err(error::Error::internal_err(
+                "Failed to read back from blob storage".to_string(),
+            ));
+        }
+        client.delete(&path).await.map_err(to_anyhow)?;
+        Ok::<String, error::Error>("Tested blob storage successfully".to_string())
+    };
+
+    if restrict {
+        // The object-store client is built with timeouts disabled, so a malicious endpoint could
+        // otherwise hold the API server connection open indefinitely.
+        tokio::time::timeout(Duration::from_secs(15), run)
+            .await
+            .map_err(|_| {
+                error::Error::internal_err("Object storage connectivity test timed out".to_string())
+            })?
     } else {
-        tracing::info!("No files in blob storage");
+        run.await
+    }
+}
+
+// Hardening for the object-storage connectivity test by an untrusted (non-super-admin) caller on
+// Cloud. The probe runs on the shared API server, so without these constraints an authenticated
+// user could coerce the server into connecting to arbitrary internal endpoints (SSRF), signing
+// requests with the instance role (credential exfiltration), or reading/writing the server's local
+// disk (filesystem object store).
+#[cfg(feature = "parquet")]
+async fn validate_object_storage_test(settings: &ObjectSettings) -> error::Result<()> {
+    fn non_empty(opt: &Option<String>) -> bool {
+        opt.as_ref().is_some_and(|s| !s.is_empty())
     }
 
-    let path = windmill_object_store::object_store_reexports::Path::from(format!(
-        "/test-s3-bucket-{uuid}",
-        uuid = uuid::Uuid::new_v4()
-    ));
-    tracing::info!("Testing blob storage at path: {path}");
-    client
-        .put(
-            &path,
-            windmill_object_store::object_store_reexports::PutPayload::from_static(b"hello"),
-        )
-        .await
-        .map_err(|e| anyhow::anyhow!("error writing file to {path}: {e:#}"))?;
-    let content = client
-        .get(&path)
-        .await
-        .map_err(to_anyhow)?
-        .bytes()
-        .await
-        .map_err(to_anyhow)?;
-    if content != Bytes::from_static(b"hello") {
-        return Err(error::Error::internal_err(
-            "Failed to read back from blob storage".to_string(),
-        ));
+    // Reject backends that rely on the server's identity or local filesystem, require explicit
+    // credentials for the rest (so the server never falls back to its own ambient credentials), and
+    // resolve the host the client will actually connect to. We derive the *effective* endpoint here
+    // — mirroring build_*_from_settings: the region/account-derived default and the virtual-hosted
+    // bucket prefix — rather than only validating a caller-supplied `endpoint`, so caller-controlled
+    // `region`/`account_name`/`bucket` cannot smuggle an internal host past the check (e.g. an empty
+    // endpoint with region = "@169.254.169.254/" otherwise resolves to the cloud metadata service).
+    let effective_endpoint: Option<String> = match settings {
+        ObjectSettings::Filesystem(_) => {
+            return Err(error::Error::NotAuthorized(
+                "Testing a local filesystem object store requires a super admin".to_string(),
+            ));
+        }
+        ObjectSettings::AwsOidc(_) => {
+            return Err(error::Error::NotAuthorized(
+                "Testing OIDC-based object storage requires a super admin".to_string(),
+            ));
+        }
+        ObjectSettings::S3(s3) => {
+            if !(non_empty(&s3.access_key) && non_empty(&s3.secret_key)) {
+                return Err(error::Error::NotAuthorized(
+                    "Testing S3 storage without explicit credentials requires a super admin"
+                        .to_string(),
+                ));
+            }
+            let region = s3
+                .region
+                .clone()
+                .filter(|r| !r.is_empty())
+                .or_else(|| std::env::var("AWS_REGION").ok().filter(|r| !r.is_empty()))
+                .unwrap_or_else(|| "us-east-1".to_string());
+            let raw_endpoint = s3
+                .endpoint
+                .clone()
+                .filter(|e| !e.is_empty())
+                .or_else(|| std::env::var("S3_ENDPOINT").ok().filter(|e| !e.is_empty()))
+                .unwrap_or_else(|| format!("s3.{region}.amazonaws.com"));
+            Some(windmill_object_store::render_endpoint(
+                raw_endpoint,
+                !s3.allow_http.unwrap_or(true),
+                s3.port,
+                s3.path_style,
+                s3.bucket.clone().unwrap_or_default(),
+            ))
+        }
+        ObjectSettings::Azure(azure) => {
+            if !non_empty(&azure.access_key) {
+                return Err(error::Error::NotAuthorized(
+                    "Testing Azure storage without an explicit access key requires a super admin"
+                        .to_string(),
+                ));
+            }
+            Some(
+                azure
+                    .endpoint
+                    .clone()
+                    .filter(|e| !e.is_empty())
+                    .unwrap_or_else(|| format!("{}.blob.core.windows.net", azure.account_name)),
+            )
+        }
+        ObjectSettings::Gcs(gcs) => {
+            // Mirror `build_gcs_client`'s blank-key check (shared predicate): a blank/`{}` key falls
+            // back to the instance's ambient credentials there, so it must be rejected here too —
+            // otherwise an untrusted caller could probe with the server's identity (the very
+            // SSRF/credential-exfil this function guards against).
+            if windmill_object_store::gcs_service_account_key_is_blank(&gcs.service_account_key) {
+                return Err(error::Error::NotAuthorized(
+                    "Testing GCS storage without a service account key requires a super admin"
+                        .to_string(),
+                ));
+            }
+            // The service-account-key JSON can override the data-plane URL (`gcs_base_url`) and the
+            // OAuth token endpoint (`token_uri`); the GCS client connects to whatever they point at.
+            // Validate every http(s) URL embedded in the key. When none override it, the host stays
+            // the public storage.googleapis.com, so no further check is needed.
+            if let Ok(serde_json::Value::Object(map)) =
+                serde_json::from_str::<serde_json::Value>(&gcs.service_account_key)
+            {
+                for value in map.values() {
+                    if let Some(url) = value.as_str() {
+                        // Match how the URL parser reads the value: leading whitespace/control is
+                        // ignored and the scheme is case-insensitive.
+                        let url =
+                            url.trim_start_matches(|c: char| c.is_whitespace() || c.is_control());
+                        if strip_http_scheme(url).is_some() {
+                            validate_public_endpoint(url).await?;
+                        }
+                    }
+                }
+            }
+            None
+        }
+    };
+
+    // Block non-public network targets (internal services, cloud metadata, loopback, ...).
+    if let Some(endpoint) = effective_endpoint {
+        validate_public_endpoint(&endpoint).await?;
+    }
+    Ok(())
+}
+
+#[cfg(feature = "parquet")]
+async fn validate_public_endpoint(endpoint: &str) -> error::Result<()> {
+    let host = extract_host(endpoint).ok_or_else(|| {
+        error::Error::BadRequest(format!("Invalid object storage endpoint: {endpoint}"))
+    })?;
+
+    let addrs: Vec<std::net::SocketAddr> = tokio::net::lookup_host((host.as_str(), 443u16))
+        .await
+        .map_err(|e| {
+            error::Error::BadRequest(format!(
+                "Could not resolve object storage endpoint '{host}': {e}"
+            ))
+        })?
+        .collect();
+
+    if addrs.is_empty() {
+        return Err(error::Error::BadRequest(format!(
+            "Could not resolve object storage endpoint '{host}'"
+        )));
+    }
+
+    // Reject if any resolved address is non-public, which also defeats the simplest DNS-rebinding
+    // attempts (a name resolving to both a public and a private address).
+    for addr in addrs {
+        if is_forbidden_ip(addr.ip()) {
+            return Err(error::Error::NotAuthorized(
+                "Testing object storage at a private, loopback, or link-local endpoint requires a super admin"
+                    .to_string(),
+            ));
+        }
+    }
+    Ok(())
+}
+
+// Strip a leading `http://`/`https://` scheme case-insensitively (URL schemes are
+// case-insensitive), returning the remainder when one was present.
+#[cfg(feature = "parquet")]
+fn strip_http_scheme(s: &str) -> Option<&str> {
+    for scheme in ["https://", "http://"] {
+        let b = scheme.as_bytes();
+        if s.len() >= b.len() && s.as_bytes()[..b.len()].eq_ignore_ascii_case(b) {
+            return Some(&s[b.len()..]);
+        }
+    }
+    None
+}
+
+#[cfg(feature = "parquet")]
+fn extract_host(endpoint: &str) -> Option<String> {
+    let mut s = endpoint.trim();
+    if let Some(rest) = strip_http_scheme(s) {
+        s = rest;
+    }
+    s = s.split(['/', '?', '#', '\\']).next().unwrap_or(s);
+    if let Some((_, rest)) = s.rsplit_once('@') {
+        s = rest;
+    }
+    let host = if let Some(rest) = s.strip_prefix('[') {
+        // IPv6 literal, e.g. [::1]:9000
+        rest.split(']').next().unwrap_or(rest)
+    } else {
+        // host or host:port
+        s.split(':').next().unwrap_or(s)
+    }
+    .trim();
+    if host.is_empty() {
+        None
+    } else {
+        Some(host.to_string())
+    }
+}
+
+#[cfg(feature = "parquet")]
+fn is_forbidden_ip(ip: std::net::IpAddr) -> bool {
+    use std::net::{IpAddr, Ipv4Addr};
+    match ip {
+        IpAddr::V4(v4) => {
+            v4.is_loopback()
+                || v4.is_private()
+                || v4.is_link_local() // 169.254.0.0/16, incl. the cloud metadata endpoint
+                || v4.is_unspecified()
+                || v4.is_broadcast()
+                || v4.is_documentation()
+                || v4.is_multicast()
+                || v4.octets()[0] == 0 // 0.0.0.0/8
+                || (v4.octets()[0] == 100 && (v4.octets()[1] & 0xc0) == 64) // 100.64.0.0/10 CGNAT
+        }
+        IpAddr::V6(v6) => {
+            // Any IPv4 embedded in an IPv6 address (IPv4-mapped ::ffff:0:0/96, IPv4-compatible
+            // ::/96, or NAT64 64:ff9b::/96) is re-checked against the IPv4 rules, so e.g.
+            // 64:ff9b::169.254.169.254 cannot route to the metadata endpoint in a NAT64 network.
+            let seg = v6.segments();
+            let is_v4_compatible = seg[0..6] == [0, 0, 0, 0, 0, 0];
+            let is_nat64 = seg[0] == 0x0064 && seg[1] == 0xff9b && seg[2..6] == [0, 0, 0, 0];
+            if let Some(v4) = v6.to_ipv4_mapped() {
+                return is_forbidden_ip(IpAddr::V4(v4));
+            }
+            if is_v4_compatible || is_nat64 {
+                let embedded = Ipv4Addr::new(
+                    (seg[6] >> 8) as u8,
+                    (seg[6] & 0xff) as u8,
+                    (seg[7] >> 8) as u8,
+                    (seg[7] & 0xff) as u8,
+                );
+                if is_forbidden_ip(IpAddr::V4(embedded)) {
+                    return true;
+                }
+            }
+            v6.is_loopback()
+                || v6.is_unspecified()
+                || v6.is_multicast()
+                || (seg[0] & 0xfe00) == 0xfc00 // fc00::/7 unique local
+                || (seg[0] & 0xffc0) == 0xfe80 // fe80::/10 link-local
+        }
     }
-    client.delete(&path).await.map_err(to_anyhow)?;
-    Ok("Tested blob storage successfully".to_string())
 }
 
 #[cfg(feature = "parquet")]
@@ -353,6 +612,32 @@ async fn audit_logs_s3_status(
     Ok(Json(audit_logs_s3::get_status(&db).await?))
 }
 
+#[cfg(feature = "parquet")]
+async fn run_audit_logs_s3_backfill(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+    Json(req): Json<audit_logs_s3_backfill::BackfillRequest>,
+) -> error::Result<axum::http::StatusCode> {
+    require_super_admin(&db, &authed.email).await?;
+    if !matches!(get_license_plan().await, LicensePlan::Enterprise) {
+        return Err(error::Error::BadRequest(
+            "Audit log export to object storage is an Enterprise feature".to_string(),
+        ));
+    }
+    audit_logs_s3_backfill::try_start(&db, req.from, req.to).await?;
+    audit_logs_s3_backfill::spawn_backfill(db.clone(), req.from, req.to);
+    Ok(axum::http::StatusCode::ACCEPTED)
+}
+
+#[cfg(feature = "parquet")]
+async fn audit_logs_s3_backfill_status(
+    Extension(db): Extension<DB>,
+    authed: ApiAuthed,
+) -> error::JsonResult<Option<audit_logs_s3_backfill::AuditBackfillProgress>> {
+    require_super_admin(&db, &authed.email).await?;
+    Ok(Json(audit_logs_s3_backfill::get_status(&db).await?))
+}
+
 #[derive(Deserialize)]
 pub struct TestKey {
     pub license_key: String,
@@ -584,6 +869,37 @@ async fn run_setting_pre_write_hook(
                             err
                         ))
                     })?;
+            } else {
+                // Disabling is only allowed before any instance-wide username has been
+                // assigned. Once usernames exist they are globally unique and are baked
+                // into stored `u/<username>` identities (schedules, triggers, drafts,
+                // and non-member superadmin ownership). Disabling would drop back to
+                // workspace-local username uniqueness, letting a member reuse an
+                // existing instance username and silently take over those identities —
+                // so the setting is effectively one-way once derivation has taken
+                // effect. Re-saving `false` on an already-disabled instance is a no-op
+                // and stays allowed (guarded by the current-value check).
+                let currently_enabled = sqlx::query_scalar!(
+                    "SELECT value FROM global_settings WHERE name = $1",
+                    AUTOMATE_USERNAME_CREATION_SETTING
+                )
+                .fetch_optional(db)
+                .await?
+                .and_then(|v| v.as_bool())
+                .unwrap_or(true);
+                if currently_enabled {
+                    let usernames_exist = sqlx::query_scalar!(
+                        "SELECT EXISTS(SELECT 1 FROM password WHERE username IS NOT NULL)"
+                    )
+                    .fetch_one(db)
+                    .await?
+                    .unwrap_or(false);
+                    if usernames_exist {
+                        return Err(error::Error::BadRequest(
+                            "automate_username_creation cannot be disabled once instance-wide usernames have been assigned: existing u/<username> identities (schedules, triggers, drafts, superadmin ownership) rely on those usernames staying stable and globally unique.".to_string(),
+                        ));
+                    }
+                }
             }
         }
         CRITICAL_ALERT_MUTE_UI_SETTING => {
@@ -1275,8 +1591,8 @@ async fn setup_custom_instance_pg_database_inner(
     // Validate name to ensure it only contains alphanumeric characters
     // Prevents SQL injection on the instance database
     lazy_static::lazy_static! {
-        // Must start with a letter, then alphanumeric/underscore
-        static ref VALID_NAME: regex::Regex = regex::Regex::new(r"^[a-zA-Z][a-zA-Z0-9_]*$").unwrap();
+        // Must start with a letter, then alphanumeric/underscore/hyphen
+        static ref VALID_NAME: regex::Regex = regex::Regex::new(r"^[a-zA-Z][a-zA-Z0-9_-]*$").unwrap();
     }
     let dbname = dbname.trim();
     if dbname.is_empty() {
@@ -1292,7 +1608,7 @@ async fn setup_custom_instance_pg_database_inner(
     }
     if !VALID_NAME.is_match(dbname) {
         return Err(error::Error::BadRequest(
-            "Database name must start with a letter and contain only alphanumeric characters or underscores".to_string(),
+            "Database name must start with a letter and contain only alphanumeric characters, underscores, or hyphens".to_string(),
         ));
     }
     // Additional check: block PostgreSQL reserved/special names
@@ -1861,3 +2177,131 @@ mod tests {
         );
     }
 }
+
+#[cfg(all(test, feature = "parquet"))]
+mod object_storage_test_hardening {
+    use super::{extract_host, is_forbidden_ip, validate_object_storage_test};
+    use std::net::IpAddr;
+    use windmill_object_store::ObjectSettings;
+
+    // IP literals (not hostnames) keep validate_public_endpoint deterministic — `lookup_host`
+    // parses them without any network round-trip.
+    fn gcs_settings(gcs_base_url: &str) -> ObjectSettings {
+        serde_json::from_value(serde_json::json!({
+            "type": "Gcs",
+            "bucket": "b",
+            "serviceAccountKey": { "gcs_base_url": gcs_base_url, "client_email": "x@y.z" }
+        }))
+        .unwrap()
+    }
+
+    #[tokio::test]
+    async fn rejects_gcs_internal_base_url() {
+        // gcs_base_url in the service-account key must not smuggle an internal host past the check,
+        // including via a mixed-case scheme (URL schemes are case-insensitive).
+        for url in [
+            "http://169.254.169.254",
+            "HTTP://169.254.169.254",
+            "Https://10.0.0.5",
+        ] {
+            assert!(
+                validate_object_storage_test(&gcs_settings(url))
+                    .await
+                    .is_err(),
+                "{url} should be rejected"
+            );
+        }
+    }
+
+    #[tokio::test]
+    async fn allows_gcs_public_base_url() {
+        assert!(
+            validate_object_storage_test(&gcs_settings("https://8.8.8.8"))
+                .await
+                .is_ok()
+        );
+    }
+
+    #[tokio::test]
+    async fn rejects_gcs_blank_service_account_key() {
+        // A blank key makes build_gcs_client fall back to the instance's ambient credentials, so an
+        // untrusted caller must not be allowed to test with it. The `serviceAccountKey` field is
+        // serialized via serde's `as_string` (`to_string` of the JSON value), so the settings UI's
+        // "no key" empty object arrives as `"{}"` and a null as `"null"` — both must be rejected.
+        for key in [serde_json::json!({}), serde_json::json!(null)] {
+            let settings: ObjectSettings = serde_json::from_value(serde_json::json!({
+                "type": "Gcs",
+                "bucket": "b",
+                "serviceAccountKey": key
+            }))
+            .unwrap();
+            assert!(
+                validate_object_storage_test(&settings).await.is_err(),
+                "blank key {key:?} should be rejected"
+            );
+        }
+    }
+
+    fn ip(s: &str) -> IpAddr {
+        s.parse().unwrap()
+    }
+
+    #[test]
+    fn forbids_internal_ips() {
+        for s in [
+            "127.0.0.1",                // loopback
+            "169.254.169.254",          // cloud metadata (link-local)
+            "10.0.0.5",                 // private
+            "172.16.3.4",               // private
+            "192.168.1.10",             // private
+            "0.0.0.0",                  // unspecified
+            "100.64.0.1",               // CGNAT
+            "::1",                      // IPv6 loopback
+            "fe80::1",                  // IPv6 link-local
+            "fc00::1",                  // IPv6 unique local
+            "::ffff:127.0.0.1",         // IPv4-mapped loopback
+            "::ffff:169.254.169.254",   // IPv4-mapped metadata
+            "::169.254.169.254",        // IPv4-compatible metadata
+            "64:ff9b::169.254.169.254", // NAT64-embedded metadata
+            "64:ff9b::a9fe:a9fe",       // NAT64-embedded metadata (hex form)
+        ] {
+            assert!(is_forbidden_ip(ip(s)), "{s} should be forbidden");
+        }
+    }
+
+    #[test]
+    fn allows_public_ips() {
+        for s in ["8.8.8.8", "1.1.1.1", "52.95.110.1", "2606:4700:4700::1111"] {
+            assert!(!is_forbidden_ip(ip(s)), "{s} should be allowed");
+        }
+    }
+
+    #[test]
+    fn extracts_host_from_endpoint() {
+        let cases = [
+            ("s3.amazonaws.com", Some("s3.amazonaws.com")),
+            ("https://minio.internal:9000", Some("minio.internal")),
+            ("http://10.0.0.5:9000/bucket", Some("10.0.0.5")),
+            ("user:pass@host.example:443", Some("host.example")),
+            ("[::1]:9000", Some("::1")),
+            ("https://[fe80::1]/x", Some("fe80::1")),
+            ("", None),
+            // Injection via region/bucket interpolation into the default endpoint string: the
+            // userinfo `@` and the path `/` must not hide the real authority from the host check.
+            (
+                "https://s3.@169.254.169.254/.amazonaws.com",
+                Some("169.254.169.254"),
+            ),
+            (
+                "https://@169.254.169.254/mybucket.s3.amazonaws.com",
+                Some("169.254.169.254"),
+            ),
+            ("s3.#@169.254.169.254/x.amazonaws.com", Some("s3.")),
+            // Scheme is case-insensitive.
+            ("HTTP://169.254.169.254", Some("169.254.169.254")),
+        ];
+        for (input, expected) in cases {
+            assert_eq!(extract_host(input).as_deref(), expected, "input: {input}");
+        }
+    }
+}
diff --git a/backend/windmill-api-settings/src/log_cleanup.rs b/backend/windmill-api-settings/src/log_cleanup.rs
index 890b46ba9e..f5e5eab680 100644
--- a/backend/windmill-api-settings/src/log_cleanup.rs
+++ b/backend/windmill-api-settings/src/log_cleanup.rs
@@ -27,11 +27,14 @@ use uuid::Uuid;
 
 use crate::background_task;
 use windmill_common::error::{self};
+use windmill_common::jobs::delete_jobs;
 use windmill_common::tracing_init::{LOGS_SERVICE, TMP_WINDMILL_LOGS_SERVICE};
 use windmill_common::worker::WINDMILL_DIR;
 use windmill_common::{DB, INSTANCE_NAME, JOB_RETENTION_SECS, SERVICE_LOG_RETENTION_SECS};
 
-use windmill_object_store::object_store_reexports::{ObjectStore, Path as ObjectPath};
+use windmill_object_store::object_store_reexports::{
+    ObjectStore, ObjectStoreError, Path as ObjectPath,
+};
 
 pub const TASK_NAME: &str = "log_cleanup";
 
@@ -61,6 +64,10 @@ pub struct LogCleanupProgress {
     pub total_jobs: u64,
     pub processed_jobs: u64,
     pub s3_deleted: u64,
+    /// Number of delete calls that returned 404 (object already absent — a no-op
+    /// success). GCS returns 404 per missing key where S3's DeleteObjects stays silent.
+    #[serde(default)]
+    pub s3_not_found: u64,
     /// Number of S3 objects inspected during the orphan scan phase.
     pub orphans_scanned: u64,
     /// Number of orphan S3 objects deleted (no corresponding DB row).
@@ -81,6 +88,7 @@ impl LogCleanupProgress {
             total_jobs: 0,
             processed_jobs: 0,
             s3_deleted: 0,
+            s3_not_found: 0,
             orphans_scanned: 0,
             orphans_deleted: 0,
             errors: 0,
@@ -132,6 +140,13 @@ impl Session {
             p.phase = "done".to_string();
             p.clone()
         };
+        tracing::info!(
+            "log cleanup finished: {} object(s) deleted from object store, {} already absent (404), {} orphans deleted, {} error(s)",
+            snapshot.s3_deleted,
+            snapshot.s3_not_found,
+            snapshot.orphans_deleted,
+            snapshot.errors
+        );
         if let Err(e) = background_task::release(&self.db, TASK_NAME, &self.owner, &snapshot).await
         {
             tracing::warn!("log cleanup: failed to release lease: {e:#}");
@@ -179,21 +194,32 @@ pub async fn get_status(db: &DB) -> error::Result<Option<LogCleanupProgress>> {
 async fn s3_bulk_delete(
     store: &Arc<dyn ObjectStore>,
     paths: Vec<ObjectPath>,
-) -> (u64 /* deleted */, u64 /* errors */) {
+) -> (
+    u64, /* deleted */
+    u64, /* not_found */
+    u64, /* errors */
+) {
     let stream = futures::stream::iter(paths.into_iter().map(Ok)).boxed();
     let mut deleted = 0u64;
+    let mut not_found = 0u64;
     let mut errors = 0u64;
     let mut res = store.delete_stream(stream);
     while let Some(r) = res.next().await {
         match r {
             Ok(_) => deleted += 1,
+            // Deleting a non-existent object is a successful no-op. S3's DeleteObjects
+            // ignores missing keys, but GCS returns 404 per delete, surfacing as
+            // NotFound — track it separately so it isn't reported as an error.
+            Err(ObjectStoreError::NotFound { .. }) => {
+                not_found += 1;
+            }
             Err(e) => {
                 errors += 1;
                 tracing::warn!("log cleanup: failed to delete object: {e:#}");
             }
         }
     }
-    (deleted, errors)
+    (deleted, not_found, errors)
 }
 
 /// Delete the given relative paths from the local filesystem under `base_dir`.
@@ -265,7 +291,7 @@ async fn cleanup_service_logs(
             .iter()
             .map(|p| ObjectPath::from(format!("{}{}", LOGS_SERVICE, p)))
             .collect();
-        let (deleted, errors) = s3_bulk_delete(store, s3_paths).await;
+        let (deleted, not_found, errors) = s3_bulk_delete(store, s3_paths).await;
         disk_bulk_delete(&*TMP_WINDMILL_LOGS_SERVICE, &rel_paths).await;
 
         session
@@ -275,6 +301,7 @@ async fn cleanup_service_logs(
                     p.total_service = p.processed_service;
                 }
                 p.s3_deleted = p.s3_deleted.saturating_add(deleted);
+                p.s3_not_found = p.s3_not_found.saturating_add(not_found);
                 p.errors = p.errors.saturating_add(errors);
             })
             .await;
@@ -313,19 +340,21 @@ async fn cleanup_job_logs(
         return Ok(());
     }
 
+    let mut completed_at_floor: Option<DateTime<Utc>> = None;
     loop {
-        let (deleted_count, rel_paths) =
-            delete_expired_jobs_batch(db, retention_secs, JOB_BATCH).await?;
+        let (deleted_count, rel_paths, max_completed_at) =
+            delete_expired_jobs_batch(db, retention_secs, JOB_BATCH, completed_at_floor).await?;
 
         if deleted_count == 0 {
             break;
         }
+        completed_at_floor = max_completed_at.or(completed_at_floor);
 
         let s3_paths: Vec<ObjectPath> = rel_paths
             .iter()
             .map(|p| ObjectPath::from(p.clone()))
             .collect();
-        let (deleted, errors) = s3_bulk_delete(store, s3_paths).await;
+        let (deleted, not_found, errors) = s3_bulk_delete(store, s3_paths).await;
         disk_bulk_delete(&*WINDMILL_DIR, &rel_paths).await;
 
         session
@@ -335,6 +364,7 @@ async fn cleanup_job_logs(
                     p.total_jobs = p.processed_jobs;
                 }
                 p.s3_deleted = p.s3_deleted.saturating_add(deleted);
+                p.s3_not_found = p.s3_not_found.saturating_add(not_found);
                 p.errors = p.errors.saturating_add(errors);
             })
             .await;
@@ -355,7 +385,8 @@ async fn delete_expired_jobs_batch(
     db: &DB,
     job_retention_secs: i64,
     batch_size: i64,
-) -> error::Result<(usize, Vec<String>)> {
+    completed_at_floor: Option<DateTime<Utc>>,
+) -> error::Result<(usize, Vec<String>, Option<DateTime<Utc>>)> {
     let mut tx = db.begin().await?;
 
     let active_root_job_ids: Vec<Uuid> = sqlx::query_scalar!(
@@ -368,29 +399,61 @@ async fn delete_expired_jobs_batch(
     .fetch_all(&mut *tx)
     .await?;
 
-    let deleted_jobs: Vec<Uuid> = sqlx::query_scalar!(
-        "DELETE FROM v2_job_completed
-         WHERE id IN (
-             SELECT jc.id FROM v2_job_completed jc
-             LEFT JOIN v2_job j ON j.id = jc.id
-             WHERE jc.completed_at <= now() - ($1::bigint::text || ' s')::interval
-               AND COALESCE(j.root_job, j.flow_innermost_root_job, jc.id) != ALL($3)
-             ORDER BY jc.completed_at ASC
-             LIMIT $2
-             FOR UPDATE OF jc SKIP LOCKED
-         )
-         RETURNING id",
-        job_retention_secs,
-        batch_size,
-        &active_root_job_ids
-    )
-    .fetch_all(&mut *tx)
-    .await?;
+    // `completed_at_floor` carries a watermark across batches so each one resumes after the rows
+    // the previous batch processed instead of re-scanning the (potentially undeletable) oldest
+    // prefix; the empty-active-roots branch skips the v2_job join entirely. See
+    // backend/src/monitor.rs::delete_expired_jobs_batch for the full rationale.
+    let (deleted_jobs, max_completed_at) = if active_root_job_ids.is_empty() {
+        let rows = sqlx::query!(
+            "DELETE FROM v2_job_completed
+             WHERE id IN (
+                 SELECT id FROM v2_job_completed
+                 WHERE completed_at <= now() - ($1::bigint::text || ' s')::interval
+                   AND ($3::timestamptz IS NULL OR completed_at >= $3)
+                 ORDER BY completed_at ASC
+                 LIMIT $2
+                 FOR UPDATE SKIP LOCKED
+             )
+             RETURNING id, completed_at",
+            job_retention_secs,
+            batch_size,
+            completed_at_floor,
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        let max = rows.iter().map(|r| r.completed_at).max();
+        (rows.into_iter().map(|r| r.id).collect::<Vec<Uuid>>(), max)
+    } else {
+        let rows = sqlx::query!(
+            "DELETE FROM v2_job_completed
+             WHERE id IN (
+                 SELECT jc.id FROM v2_job_completed jc
+                 LEFT JOIN v2_job j ON j.id = jc.id
+                 WHERE jc.completed_at <= now() - ($1::bigint::text || ' s')::interval
+                   AND ($4::timestamptz IS NULL OR jc.completed_at >= $4)
+                   AND COALESCE(j.root_job, j.flow_innermost_root_job, jc.id) NOT IN (
+                       SELECT u FROM unnest($3::uuid[]) AS u WHERE u IS NOT NULL
+                   )
+                 ORDER BY jc.completed_at ASC
+                 LIMIT $2
+                 FOR UPDATE OF jc SKIP LOCKED
+             )
+             RETURNING id, completed_at",
+            job_retention_secs,
+            batch_size,
+            &active_root_job_ids,
+            completed_at_floor,
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        let max = rows.iter().map(|r| r.completed_at).max();
+        (rows.into_iter().map(|r| r.id).collect::<Vec<Uuid>>(), max)
+    };
 
     let deleted_count = deleted_jobs.len();
     if deleted_count == 0 {
         tx.commit().await?;
-        return Ok((0, Vec::new()));
+        return Ok((0, Vec::new(), max_completed_at));
     }
 
     if let Err(e) = sqlx::query!(
@@ -421,10 +484,21 @@ async fn delete_expired_jobs_batch(
         }
     };
 
-    if let Err(e) = sqlx::query!("DELETE FROM v2_job WHERE id = ANY($1)", &deleted_jobs)
-        .execute(&mut *tx)
-        .await
+    // Native retry markers have no FK (to keep this bulk delete cheap) — sweep
+    // them with their jobs here, same as the other side tables above. The table
+    // is created by a startup migration, so it always exists by the time cleanup
+    // runs.
+    if let Err(e) = sqlx::query!(
+        "DELETE FROM native_retry_attempt WHERE job_id = ANY($1)",
+        &deleted_jobs
+    )
+    .execute(&mut *tx)
+    .await
     {
+        tracing::error!("log cleanup: error deleting native retry markers: {e:?}");
+    }
+
+    if let Err(e) = delete_jobs(&mut *tx, &deleted_jobs).await {
         tracing::error!("log cleanup: error deleting job: {e:?}");
     }
 
@@ -440,7 +514,7 @@ async fn delete_expired_jobs_batch(
 
     tx.commit().await?;
 
-    Ok((deleted_count, log_paths))
+    Ok((deleted_count, log_paths, max_completed_at))
 }
 
 /// Scan S3 under the `logs/` prefix for orphan log files and delete them.
@@ -561,11 +635,12 @@ async fn flush_service_orphans(
     batch: &mut Vec<ObjectPath>,
 ) {
     let paths = std::mem::take(batch);
-    let (deleted, errors) = s3_bulk_delete(store, paths).await;
+    let (deleted, not_found, errors) = s3_bulk_delete(store, paths).await;
     session
         .update(|p| {
             p.orphans_deleted = p.orphans_deleted.saturating_add(deleted);
             p.s3_deleted = p.s3_deleted.saturating_add(deleted);
+            p.s3_not_found = p.s3_not_found.saturating_add(not_found);
             p.errors = p.errors.saturating_add(errors);
         })
         .await;
@@ -616,11 +691,12 @@ async fn flush_job_orphans(
         return;
     }
 
-    let (deleted, errors) = s3_bulk_delete(store, to_delete).await;
+    let (deleted, not_found, errors) = s3_bulk_delete(store, to_delete).await;
     session
         .update(|p| {
             p.orphans_deleted = p.orphans_deleted.saturating_add(deleted);
             p.s3_deleted = p.s3_deleted.saturating_add(deleted);
+            p.s3_not_found = p.s3_not_found.saturating_add(not_found);
             p.errors = p.errors.saturating_add(errors);
         })
         .await;
diff --git a/backend/windmill-api-users/src/users.rs b/backend/windmill-api-users/src/users.rs
index db9ecb118d..ff0e8e754e 100644
--- a/backend/windmill-api-users/src/users.rs
+++ b/backend/windmill-api-users/src/users.rs
@@ -27,7 +27,7 @@ use axum::{
     Json, Router,
 };
 use hyper::{header::LOCATION, StatusCode};
-use windmill_api_auth::require_super_admin;
+use windmill_api_auth::{forbid_superadmin_job_token, require_super_admin, OptJobAuthed};
 use windmill_common::usernames::{
     generate_instance_wide_unique_username, get_instance_username_or_create_pending,
 };
@@ -240,6 +240,11 @@ pub struct UserInfo {
     pub folders_owners: Vec<String>,
     pub name: Option<String>,
     pub is_service_account: bool,
+    // True when this row is a superadmin viewing a workspace they are not a
+    // member of (so `is_admin`/`role` reflect the superadmin fallback, not an
+    // actual membership). Always false for real member rows.
+    #[serde(default)]
+    pub non_member: bool,
 }
 
 #[derive(FromRow, Serialize)]
@@ -699,13 +704,17 @@ async fn whoami(
 ) -> JsonResult<UserInfo> {
     let ApiAuthed { username, email, is_admin, groups, folders, .. } = authed;
     let user = get_user(&w_id, &username, &db).await?;
-    if let Some(user) = user {
+    // Only treat the row as "this user is a member" when its email matches; the
+    // derived username is instance-unique so a match on a different email should
+    // never happen, but guard against it so a non-member superadmin is never
+    // shown another member's identity/role.
+    if let Some(user) = user.filter(|u| u.email == email) {
         Ok(Json(user))
     } else {
         Ok(Json(UserInfo {
             workspace_id: w_id,
-            email: email.clone(),
-            username: email,
+            email,
+            username,
             name: None,
             is_admin,
             is_super_admin: is_admin,
@@ -725,6 +734,7 @@ async fn whoami(
                 .filter_map(|x| if x.2 { Some(x.0) } else { None })
                 .collect(),
             is_service_account: false,
+            non_member: true,
         }))
     }
 }
@@ -889,6 +899,7 @@ async fn get_user(w_id: &str, username: &str, db: &DB) -> Result<Option<UserInfo
             .filter_map(|x| if x.2 { Some(x.0) } else { None })
             .collect(),
         is_service_account: usr.is_service_account,
+        non_member: false,
     }))
 }
 
@@ -1415,11 +1426,13 @@ async fn convert_user_to_group(
 
 async fn update_user(
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Path(email_to_update): Path<String>,
     Extension(db): Extension<DB>,
     Json(eu): Json<EditUser>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     let mut tx = db.begin().await?;
 
     let mut new_super_admin: Option<bool> = None;
@@ -1550,6 +1563,15 @@ async fn update_user(
     }
 
     if let Some(d) = eu.disabled {
+        #[cfg(feature = "enterprise")]
+        if !d {
+            if let Some(msg) =
+                windmill_common::ee_oss::check_seat_cap_for_reactivation(&db, &email_to_update)
+                    .await?
+            {
+                return Err(Error::BadRequest(msg));
+            }
+        }
         sqlx::query_scalar!(
             "UPDATE password SET disabled = $1 WHERE email = $2",
             d,
@@ -1581,10 +1603,12 @@ async fn update_user(
 
 async fn delete_user(
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Path(email_to_delete): Path<String>,
     Extension(db): Extension<DB>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     let mut tx = db.begin().await?;
 
     sqlx::query!("DELETE FROM token WHERE email = $1", &email_to_delete)
@@ -1840,7 +1864,7 @@ async fn delete_workspace_user(
         username_to_delete,
         &w_id,
     )
-    .fetch_optional(&db)
+    .fetch_optional(&mut *tx)
     .await?;
 
     let email_to_delete = not_found_if_none(email_to_delete_o, "User", &username_to_delete)?;
@@ -1877,9 +1901,11 @@ async fn set_login_type(
     Extension(db): Extension<DB>,
     Path(email): Path<String>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Json(et): Json<EditLoginType>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     let mut tx = db.begin().await?;
 
     sqlx::query!(
@@ -1916,8 +1942,10 @@ async fn login(
     Extension(argon2): Extension<Arc<Argon2<'_>>>,
     Json(Login { email, password }): Json<Login>,
 ) -> Result<String> {
-    #[cfg(feature = "no_auth")]
-    {
+    // In `--no-auth` mode there is no real login; the frontend never needs a
+    // session cookie because every request already resolves as the admin
+    // superadmin (see resolve_opt_job_authed).
+    if windmill_api_auth::is_no_auth() {
         return Ok("no_auth".to_string());
     }
 
@@ -2019,8 +2047,6 @@ async fn refresh_token(
     authed: ApiAuthed,
     cookies: Cookies,
 ) -> Result<String> {
-    let mut tx = db.begin().await?;
-
     if let Some(thresh_s) = query.if_expiring_in_less_than_s {
         let t_hash = windmill_common::auth::hash_token(&token);
         let not_expired = sqlx::query_scalar!("SELECT true FROM token WHERE token_hash = $1 and expiration IS NOT NULL and expiration > now() + $2::int * '1 sec'::interval", &t_hash, thresh_s)
@@ -2033,6 +2059,8 @@ async fn refresh_token(
         }
     }
 
+    let mut tx = db.begin().await?;
+
     let super_admin = sqlx::query_scalar!(
         "SELECT super_admin FROM password WHERE email = $1 AND disabled = false",
         &authed.email
@@ -2159,8 +2187,10 @@ pub async fn create_session_token<'c>(
 async fn create_token(
     Extension(db): Extension<DB>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Json(token_config): Json<NewToken>,
 ) -> Result<(StatusCode, String)> {
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     check_token_create_rate_limit(&authed.username)?;
 
     windmill_api_auth::ensure_scopes_within_caller(&authed, token_config.scopes.as_deref())?;
@@ -2176,6 +2206,7 @@ async fn create_token(
 async fn impersonate(
     Extension(db): Extension<DB>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Json(new_token): Json<NewToken>,
 ) -> Result<(StatusCode, String)> {
     use windmill_common::min_version::MIN_VERSION_SUPPORTS_TOKEN_HASH;
@@ -2189,6 +2220,7 @@ async fn impersonate(
         Some(&token)
     };
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
 
     if new_token.impersonate_email.is_none() {
         return Err(Error::BadRequest(
@@ -2676,6 +2708,12 @@ async fn username_to_email(
     Path((w_id, username)): Path<(String, String)>,
     Extension(db): Extension<DB>,
 ) -> Result<String> {
+    // Members only: this workspace-scoped endpoint has no superadmin/target gate,
+    // so it must NOT use the `password` superadmin fallback — otherwise any
+    // workspace-authenticated caller could turn a guessed derived username into a
+    // non-member superadmin's email. Internal callers that legitimately need the
+    // fallback (schedule/trigger/draft resolution) use `resolve_username_to_email`
+    // directly and never return the email to an arbitrary caller.
     let email = sqlx::query_scalar!(
         "SELECT email FROM usr WHERE username = $1 AND workspace_id = $2",
         &username,
@@ -2707,8 +2745,10 @@ struct ExportedGlobalUser {
 async fn export_global_users(
     Extension(db): Extension<DB>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
 ) -> JsonResult<Vec<ExportedGlobalUser>> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     let mut tx = db.begin().await?;
     let users = sqlx::query_as!(
         ExportedGlobalUser,
@@ -2744,9 +2784,11 @@ async fn export_global_users() -> JsonResult<String> {
 async fn overwrite_global_users(
     Extension(db): Extension<DB>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Json(users): Json<Vec<ExportedGlobalUser>>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     let mut tx = db.begin().await?;
     sqlx::query!("DELETE FROM password")
         .execute(&mut *tx)
diff --git a/backend/windmill-api-workspaces/Cargo.toml b/backend/windmill-api-workspaces/Cargo.toml
index 4a9e04c417..52a58aa1a3 100644
--- a/backend/windmill-api-workspaces/Cargo.toml
+++ b/backend/windmill-api-workspaces/Cargo.toml
@@ -11,10 +11,14 @@ path = "src/lib.rs"
 [features]
 default = []
 enterprise = ["windmill-common/enterprise"]
-private = ["windmill-common/private"]
+private = [
+    "windmill-common/private",
+    "windmill-queue/private",
+    "windmill-audit/private",
+]
 cloud = ["windmill-common/cloud"]
 no_auth = ["windmill-api-auth/no_auth"]
-parquet = ["windmill-object-store/parquet"]
+parquet = ["windmill-object-store/parquet", "dep:futures"]
 
 [dependencies]
 windmill-common = { workspace = true, default-features = false }
@@ -31,6 +35,7 @@ windmill-store.workspace = true
 
 axum.workspace = true
 chrono.workspace = true
+futures = { workspace = true, optional = true }
 hex.workspace = true
 magic-crypt.workspace = true
 http.workspace = true
@@ -42,6 +47,7 @@ serde_json.workspace = true
 sha2.workspace = true
 sqlx.workspace = true
 tokio.workspace = true
+tokio-postgres.workspace = true
 tracing.workspace = true
 uuid.workspace = true
 strum.workspace = true
diff --git a/backend/windmill-api-workspaces/src/datatable_migrations.rs b/backend/windmill-api-workspaces/src/datatable_migrations.rs
new file mode 100644
index 0000000000..fef9963933
--- /dev/null
+++ b/backend/windmill-api-workspaces/src/datatable_migrations.rs
@@ -0,0 +1,1712 @@
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2022
+ * This file and its contents are licensed under the AGPLv3 License.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-AGPL for a copy of the license.
+ */
+
+//! Data table SQL migrations: CRUD endpoints, run/rollback execution, opt-in
+//! management, and the workspace-merge diff helper. Split out of `workspaces.rs`
+//! to keep that file focused on core workspace configuration.
+
+use crate::workspaces::{pg_dump_database, ItemComparison};
+
+use axum::{
+    extract::{Extension, Path, Query},
+    routing::{delete, get, post},
+    Json, Router,
+};
+use chrono::Utc;
+use serde::{Deserialize, Serialize};
+use sqlx::{Postgres, Transaction};
+use std::collections::{HashMap, HashSet};
+
+use windmill_api_auth::{require_super_admin, ApiAuthed};
+use windmill_api_jobs::run_wait_result_internal;
+use windmill_audit::audit_oss::audit_log;
+use windmill_audit::ActionKind;
+use windmill_common::db::UserDB;
+use windmill_common::error::{Error, JsonResult, Result};
+use windmill_common::jobs::{JobPayload, RawCode};
+use windmill_common::runnable_settings::{ConcurrencySettingsWithCustom, DebouncingSettings};
+use windmill_common::scripts::ScriptLang;
+use windmill_common::users::username_to_permissioned_as;
+use windmill_common::worker::to_raw_value;
+use windmill_common::workspaces::get_datatable_resource_from_db_unchecked;
+use windmill_common::{PgDatabase, DB};
+use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
+use windmill_queue::{push, PushArgs, PushIsolationLevel};
+
+pub(crate) fn routes() -> Router {
+    Router::new()
+        .route(
+            "/run_datatable_migrations/{datatable_name}",
+            post(run_datatable_migrations),
+        )
+        .route(
+            "/rollback_datatable_migrations/{datatable_name}",
+            post(rollback_datatable_migrations),
+        )
+        .route("/list_datatable_migrations", get(list_datatable_migrations))
+        .route(
+            "/datatable_migrations_status/{datatable_name}",
+            get(datatable_migrations_status),
+        )
+        .route(
+            "/enable_datatable_migrations/{datatable_name}",
+            post(enable_datatable_migrations),
+        )
+        .route(
+            "/disable_datatable_migrations/{datatable_name}",
+            post(disable_datatable_migrations),
+        )
+        .route(
+            "/create_datatable_migration/{datatable_name}",
+            post(create_datatable_migration),
+        )
+        .route(
+            "/delete_datatable_migration/{datatable_name}/{timestamp}",
+            delete(delete_datatable_migration),
+        )
+        .route(
+            "/upsert_datatable_migration/{datatable_name}",
+            post(upsert_datatable_migration),
+        )
+        .route(
+            "/generate_initial_datatable_migration/{datatable_name}",
+            post(generate_initial_datatable_migration),
+        )
+}
+
+#[derive(Serialize)]
+struct AppliedMigration {
+    version: i64,
+    name: String,
+}
+
+#[derive(Serialize)]
+struct RunDatatableMigrationsResult {
+    applied: Vec<AppliedMigration>,
+}
+
+#[derive(Deserialize)]
+struct RunDatatableMigrationsQuery {
+    /// When set, only apply pending migrations up to and including this version.
+    up_to: Option<i64>,
+    /// When set, apply only this specific migration version (if not already
+    /// applied), ignoring any other pending migrations. Takes precedence over
+    /// `up_to`.
+    only: Option<i64>,
+}
+
+/// Build the `database` argument for a migration job. Both resource-backed and
+/// instance data tables pass a `datatable://<name>` reference; the pg executor
+/// resolves it to real credentials server-side at run time. It must never be
+/// resolved here: the resolved instance credentials include a single
+/// instance-wide Postgres password, and the job's `args` are readable by the —
+/// possibly non-admin — user who ran the migration.
+async fn datatable_database_arg(
+    db: &DB,
+    w_id: &str,
+    datatable_name: &str,
+) -> Result<Box<serde_json::value::RawValue>> {
+    // Fail fast with a clear error if the data table doesn't exist.
+    sqlx::query_scalar!(
+        "SELECT ws.datatable->'datatables'->$2 FROM workspace_settings ws WHERE ws.workspace_id = $1",
+        w_id,
+        datatable_name,
+    )
+    .fetch_one(db)
+    .await?
+    .ok_or_else(|| Error::internal_err(format!("datatable {datatable_name} not found")))?;
+
+    Ok(to_raw_value(&format!("datatable://{datatable_name}")))
+}
+
+/// Run a migration's SQL as a normal Windmill `postgresql` job, permissioned as
+/// the requesting user and labelled `datatable_migration` for traceability, then
+/// wait for it. Errors if the job fails.
+async fn run_datatable_migration_job(
+    db: &DB,
+    user_db: &UserDB,
+    authed: &ApiAuthed,
+    w_id: &str,
+    database_arg: &Box<serde_json::value::RawValue>,
+    sql: &str,
+) -> Result<()> {
+    let mut args = HashMap::new();
+    args.insert("database".to_string(), database_arg.clone());
+    let push_args = PushArgs { extra: None, args: &args };
+
+    let (uuid, mut tx) = push(
+        db,
+        PushIsolationLevel::Isolated(user_db.clone(), authed.clone().into()),
+        w_id,
+        JobPayload::Code(RawCode {
+            content: sql.to_string(),
+            path: Some("datatable_migration".to_string()),
+            hash: None,
+            language: ScriptLang::Postgresql,
+            lock: None,
+            cache_ttl: None,
+            cache_ignore_s3_path: None,
+            dedicated_worker: None,
+            tag: None,
+            concurrency_settings: ConcurrencySettingsWithCustom::default(),
+            debouncing_settings: DebouncingSettings::default(),
+            modules: None,
+        }),
+        push_args,
+        authed.display_username(),
+        &authed.email,
+        username_to_permissioned_as(&authed.username),
+        authed.token_prefix.as_deref(),
+        None,
+        None,
+        None,
+        None,
+        None,
+        None,
+        false,
+        false,
+        None,
+        true,
+        None,
+        None,
+        None,
+        None,
+        Some(&authed.clone().into()),
+        false,
+        None,
+        None,
+        None,
+    )
+    .await?;
+
+    // Tag the job so migration runs are easy to find in the run history.
+    sqlx::query!(
+        "UPDATE v2_job SET labels = (
+                SELECT array_agg(DISTINCT l)
+                FROM unnest(coalesce(labels, ARRAY[]::TEXT[]) || $2) l
+            ) WHERE id = $1",
+        uuid,
+        &vec!["datatable_migration".to_string()],
+    )
+    .execute(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    let (result, success) =
+        run_wait_result_internal(db, uuid, w_id, None, false, &authed.username).await?;
+    if !success {
+        // On failure the job result is `{"error": {"name", "message", ...}}`;
+        // surface the executor's message (the Postgres error, e.g. `relation
+        // "foo" does not exist`) instead of the raw JSON envelope.
+        let detail = serde_json::from_str::<serde_json::Value>(result.get())
+            .ok()
+            .as_ref()
+            .and_then(|v| v.get("error"))
+            .and_then(|e| e.get("message"))
+            .and_then(|m| m.as_str())
+            .map(str::to_string)
+            .unwrap_or_else(|| result.get().to_string());
+        return Err(Error::internal_err(detail));
+    }
+    Ok(())
+}
+
+/// Ensure the `_wm_migrations` bookkeeping table exists. Migration versions are
+/// only unique per data table, but several data-table configs can point at one
+/// physical database, so it is keyed by `(datatable, version)` — a version-only
+/// key would let one data table's migration mark another's same-version
+/// migration as already applied (and rollback could touch the wrong row).
+async fn ensure_wm_migrations_schema(client: &tokio_postgres::Client) -> Result<()> {
+    client
+        .batch_execute(
+            "CREATE TABLE IF NOT EXISTS _wm_migrations (\
+                datatable TEXT NOT NULL, \
+                version BIGINT NOT NULL, \
+                installed_at TIMESTAMPTZ NOT NULL DEFAULT now(), \
+                PRIMARY KEY (datatable, version))",
+        )
+        .await
+        .map_err(|e| {
+            Error::internal_err(format!("Failed to ensure _wm_migrations table: {}", e))
+        })?;
+    Ok(())
+}
+
+/// Open a connection to a data table's own database and hold the session-level
+/// advisory lock that serializes migration runs/rollbacks. The lock is released
+/// when the returned client is dropped, so callers must keep it in scope for the
+/// whole critical section.
+///
+/// Runs, rollbacks *and* definition rewrites/deletes all take this lock: a run
+/// snapshots a migration's `code_up` from `datatable_migrations` and only records
+/// its version in `_wm_migrations` after the job succeeds, so an unserialized edit
+/// could rewrite the definition in that window and leave `_wm_migrations` pointing
+/// at SQL that was never applied. `_wm_migrations` is per-database, so a single
+/// key is sufficient.
+async fn lock_datatable_migration_runs(
+    db: &DB,
+    w_id: &str,
+    datatable_name: &str,
+) -> Result<tokio_postgres::Client> {
+    let db_resource = get_datatable_resource_from_db_unchecked(db, w_id, datatable_name).await?;
+    let pg_db: PgDatabase = serde_json::from_value(db_resource)
+        .map_err(|e| Error::internal_err(format!("Failed to parse database credentials: {}", e)))?;
+    let (client, connection) = pg_db.connect(Some(db)).await?;
+    tokio::spawn(async move {
+        if let Err(e) = connection.await {
+            tracing::error!("Datatable connection error: {}", e);
+        }
+    });
+    client
+        .batch_execute("SELECT pg_advisory_lock(hashtext('windmill_datatable_migrations')::int8)")
+        .await
+        .map_err(|e| Error::internal_err(format!("Failed to acquire migration lock: {}", e)))?;
+    Ok(client)
+}
+
+/// Read the versions recorded as applied in a data table's `_wm_migrations`,
+/// scoped to that data table, using an existing connection. An absent table
+/// (`42P01`) means nothing has been migrated yet.
+async fn read_applied_versions_on_client(
+    client: &tokio_postgres::Client,
+    datatable_name: &str,
+) -> Result<HashSet<i64>> {
+    match client
+        .query(
+            "SELECT version FROM _wm_migrations WHERE datatable = $1",
+            &[&datatable_name],
+        )
+        .await
+    {
+        Ok(rows) => Ok(rows.iter().map(|row| row.get::<_, i64>(0)).collect()),
+        Err(e) if e.as_db_error().map(|d| d.code().code()) == Some("42P01") => Ok(HashSet::new()),
+        Err(e) => Err(Error::internal_err(format!(
+            "Failed to read _wm_migrations: {}",
+            e
+        ))),
+    }
+}
+
+/// Apply the workspace's pending data table migrations to a given data table.
+/// Each migration runs as a normal Windmill `postgresql` job (permissioned as
+/// the requester, labelled `datatable_migration`); applied versions are then
+/// recorded in the data table's own `_wm_migrations` table, so only migrations
+/// not recorded there are run, in ascending `timestamp` order.
+async fn run_datatable_migrations(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+    Query(query): Query<RunDatatableMigrationsQuery>,
+) -> JsonResult<RunDatatableMigrationsResult> {
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.run_datatable_migrations",
+        ActionKind::Update,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    let database_arg = datatable_database_arg(&db, &w_id, &datatable_name).await?;
+
+    // Take the run-serialization lock before snapshotting the migration
+    // definitions: a concurrent definition rewrite/delete takes the same lock, so
+    // the `code_up` we read here can't change between now and when we record its
+    // version below. The lock is held until `client` drops at return.
+    let client = lock_datatable_migration_runs(&db, &w_id, &datatable_name).await?;
+
+    let migrations = sqlx::query!(
+        "SELECT timestamp, name, code_up FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 ORDER BY timestamp ASC",
+        &w_id,
+        &datatable_name,
+    )
+    .fetch_all(&db)
+    .await?;
+
+    ensure_wm_migrations_schema(&client).await?;
+
+    let applied_versions = read_applied_versions_on_client(&client, &datatable_name).await?;
+
+    let mut applied = Vec::new();
+    for m in migrations {
+        if let Some(only) = query.only {
+            // Run a single specific migration, skipping every other one.
+            if m.timestamp != only {
+                continue;
+            }
+        } else if query.up_to.is_some_and(|up_to| m.timestamp > up_to) {
+            // Migrations are ordered ascending, so once we pass `up_to` we're done.
+            break;
+        }
+        if applied_versions.contains(&m.timestamp) {
+            continue;
+        }
+        run_datatable_migration_job(&db, &user_db, &authed, &w_id, &database_arg, &m.code_up)
+            .await
+            .map_err(|e| {
+                Error::internal_err(format!(
+                    "Failed to apply migration {} ({}): {}",
+                    m.timestamp, m.name, e
+                ))
+            })?;
+        // Record the migration as installed once its job has succeeded.
+        client
+            .execute(
+                "INSERT INTO _wm_migrations (datatable, version) VALUES ($1, $2) \
+                 ON CONFLICT (datatable, version) DO NOTHING",
+                &[&datatable_name, &m.timestamp],
+            )
+            .await
+            .map_err(|e| Error::internal_err(format!("Failed to record migration: {}", e)))?;
+        applied.push(AppliedMigration { version: m.timestamp, name: m.name });
+    }
+
+    Ok(Json(RunDatatableMigrationsResult { applied }))
+}
+
+#[derive(Serialize)]
+struct RolledBackMigration {
+    version: i64,
+    name: String,
+}
+
+#[derive(Serialize)]
+struct RollbackDatatableMigrationsResult {
+    rolled_back: Vec<RolledBackMigration>,
+}
+
+#[derive(Deserialize)]
+struct RollbackDatatableMigrationsQuery {
+    /// When set, roll back this specific applied migration version instead of
+    /// the most recently applied one.
+    only: Option<i64>,
+}
+
+/// Roll back a migration on a given data table: run its `code_down` as a normal
+/// Windmill `postgresql` job (permissioned as the requester, labelled
+/// `datatable_migration`) then drop its `_wm_migrations` row. Without `only` this
+/// targets the most recently applied migration (one step); with `only` it
+/// targets that specific applied version.
+async fn rollback_datatable_migrations(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+    Query(query): Query<RollbackDatatableMigrationsQuery>,
+) -> JsonResult<RollbackDatatableMigrationsResult> {
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.rollback_datatable_migrations",
+        ActionKind::Update,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    // The data table's `_wm_migrations` bookkeeping is read here and the version
+    // dropped after the job succeeds; the down SQL itself runs in the job. The
+    // lock is held (until `client` drops at return) so a concurrent run or
+    // definition rewrite can't interleave with this rollback.
+    let client = lock_datatable_migration_runs(&db, &w_id, &datatable_name).await?;
+
+    ensure_wm_migrations_schema(&client).await?;
+
+    // Resolve which applied version to roll back: a specific one when `only` is
+    // given (and actually applied), otherwise the most recently applied. Scoped
+    // to this data table so a shared physical database can't surface another
+    // data table's version.
+    let target = match query.only {
+        Some(only) => client
+            .query_opt(
+                "SELECT version FROM _wm_migrations WHERE datatable = $1 AND version = $2",
+                &[&datatable_name, &only],
+            )
+            .await
+            .map_err(|e| Error::internal_err(format!("Failed to read _wm_migrations: {}", e)))?,
+        None => client
+            .query_opt(
+                "SELECT version FROM _wm_migrations WHERE datatable = $1 \
+                 ORDER BY version DESC LIMIT 1",
+                &[&datatable_name],
+            )
+            .await
+            .map_err(|e| Error::internal_err(format!("Failed to read _wm_migrations: {}", e)))?,
+    };
+
+    let version: i64 = match target {
+        Some(row) => row.get::<_, i64>(0),
+        None => {
+            return Ok(Json(RollbackDatatableMigrationsResult {
+                rolled_back: vec![],
+            }))
+        }
+    };
+
+    let definition = sqlx::query!(
+        "SELECT name, code_down FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+        &w_id,
+        &datatable_name,
+        version
+    )
+    .fetch_optional(&db)
+    .await?
+    .ok_or_else(|| {
+        Error::BadRequest(format!(
+            "Cannot roll back migration {version}: its definition no longer exists"
+        ))
+    })?;
+
+    let code_down = definition.code_down.ok_or_else(|| {
+        Error::BadRequest(format!(
+            "Cannot roll back migration {} ({}): it has no down migration",
+            version, definition.name
+        ))
+    })?;
+
+    let database_arg = datatable_database_arg(&db, &w_id, &datatable_name).await?;
+    run_datatable_migration_job(&db, &user_db, &authed, &w_id, &database_arg, &code_down)
+        .await
+        .map_err(|e| {
+            Error::internal_err(format!(
+                "Failed to roll back migration {} ({}): {}",
+                version, definition.name, e
+            ))
+        })?;
+
+    // Forget the version once its down job has succeeded.
+    client
+        .execute(
+            "DELETE FROM _wm_migrations WHERE datatable = $1 AND version = $2",
+            &[&datatable_name, &version],
+        )
+        .await
+        .map_err(|e| Error::internal_err(format!("Failed to drop migration record: {}", e)))?;
+
+    Ok(Json(RollbackDatatableMigrationsResult {
+        rolled_back: vec![RolledBackMigration { version, name: definition.name }],
+    }))
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct DatatableMigration {
+    pub datatable: String,
+    pub timestamp: i64,
+    pub name: String,
+    pub code_up: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub code_down: Option<String>,
+}
+
+async fn list_datatable_migrations(
+    _authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<Vec<DatatableMigration>> {
+    let migrations = sqlx::query_as!(
+        DatatableMigration,
+        "SELECT datatable, timestamp, name, code_up, code_down FROM datatable_migrations \
+         WHERE workspace_id = $1 ORDER BY datatable, timestamp ASC",
+        &w_id
+    )
+    .fetch_all(&db)
+    .await?;
+
+    Ok(Json(migrations))
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "snake_case")]
+enum DatatableMigrationRunStatus {
+    /// Recorded in the data table's `_wm_migrations` table.
+    Ran,
+    /// Defined but not yet applied.
+    NotRun,
+    /// Applied status could not be determined (connection failure).
+    Unknown,
+}
+
+#[derive(Serialize)]
+struct DatatableMigrationWithStatus {
+    timestamp: i64,
+    name: String,
+    code_up: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    code_down: Option<String>,
+    status: DatatableMigrationRunStatus,
+}
+
+#[derive(Serialize)]
+struct DatatableMigrationsStatusResult {
+    /// Whether the migrations feature is opted in for this data table.
+    enabled: bool,
+    migrations: Vec<DatatableMigrationWithStatus>,
+    /// Set when the applied status couldn't be read from the data table.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    error: Option<String>,
+}
+
+/// Whether the SQL-migrations feature is enabled for a data table. Honors the
+/// explicit `migrations_enabled` flag; when unset (data tables predating the
+/// feature) it is considered enabled only if migrations already exist.
+async fn datatable_migrations_enabled(db: &DB, w_id: &str, datatable_name: &str) -> Result<bool> {
+    let flag: Option<bool> = sqlx::query_scalar!(
+        "SELECT (ws.datatable->'datatables'->$2->>'migrations_enabled')::boolean \
+         FROM workspace_settings ws WHERE ws.workspace_id = $1",
+        w_id,
+        datatable_name,
+    )
+    .fetch_optional(db)
+    .await?
+    .flatten();
+
+    match flag {
+        Some(v) => Ok(v),
+        None => Ok(sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM datatable_migrations \
+             WHERE workspace_id = $1 AND datatable = $2)",
+            w_id,
+            datatable_name,
+        )
+        .fetch_one(db)
+        .await?
+        .unwrap_or(false)),
+    }
+}
+
+/// Reject the request when migrations are not enabled for the data table.
+async fn ensure_datatable_migrations_enabled(
+    db: &DB,
+    w_id: &str,
+    datatable_name: &str,
+) -> Result<()> {
+    if !datatable_migrations_enabled(db, w_id, datatable_name).await? {
+        return Err(Error::BadRequest(format!(
+            "Migrations are not enabled for data table '{}'. Enable them first.",
+            datatable_name
+        )));
+    }
+    Ok(())
+}
+
+/// Read the versions recorded in a data table's `_wm_migrations` table. A
+/// missing table means nothing has been applied yet (empty set, not an error).
+async fn read_applied_datatable_versions(
+    db: &DB,
+    w_id: &str,
+    datatable_name: &str,
+) -> Result<HashSet<i64>> {
+    let db_resource = get_datatable_resource_from_db_unchecked(db, w_id, datatable_name).await?;
+    let pg_db: PgDatabase = serde_json::from_value(db_resource)
+        .map_err(|e| Error::internal_err(format!("Failed to parse database credentials: {}", e)))?;
+    let (client, connection) = pg_db.connect(Some(db)).await?;
+    tokio::spawn(async move {
+        if let Err(e) = connection.await {
+            tracing::error!("Datatable connection error: {}", e);
+        }
+    });
+
+    // Read-only status path: don't create the table here, and don't take the run
+    // lock — a stale-by-a-moment applied set is fine for display.
+    read_applied_versions_on_client(&client, datatable_name).await
+}
+
+/// List a data table's migrations annotated with whether each has been applied.
+async fn datatable_migrations_status(
+    _authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+) -> JsonResult<DatatableMigrationsStatusResult> {
+    let enabled = datatable_migrations_enabled(&db, &w_id, &datatable_name).await?;
+    if !enabled {
+        return Ok(Json(DatatableMigrationsStatusResult {
+            enabled: false,
+            migrations: vec![],
+            error: None,
+        }));
+    }
+
+    let defs = sqlx::query!(
+        "SELECT timestamp, name, code_up, code_down FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 ORDER BY timestamp ASC",
+        &w_id,
+        &datatable_name,
+    )
+    .fetch_all(&db)
+    .await?;
+
+    let (applied, error) = match read_applied_datatable_versions(&db, &w_id, &datatable_name).await
+    {
+        Ok(set) => (Some(set), None),
+        Err(e) => (None, Some(e.to_string())),
+    };
+
+    let migrations = defs
+        .into_iter()
+        .map(|m| {
+            let status = match &applied {
+                Some(set) if set.contains(&m.timestamp) => DatatableMigrationRunStatus::Ran,
+                Some(_) => DatatableMigrationRunStatus::NotRun,
+                None => DatatableMigrationRunStatus::Unknown,
+            };
+            DatatableMigrationWithStatus {
+                timestamp: m.timestamp,
+                name: m.name,
+                code_up: m.code_up,
+                code_down: m.code_down,
+                status,
+            }
+        })
+        .collect();
+
+    Ok(Json(DatatableMigrationsStatusResult {
+        enabled: true,
+        migrations,
+        error,
+    }))
+}
+
+/// Only workspace admins and super admins may opt a data table in or out of
+/// migrations.
+async fn require_datatable_migrations_manager(db: &DB, authed: &ApiAuthed) -> Result<()> {
+    if authed.is_admin || require_super_admin(db, &authed.email).await.is_ok() {
+        Ok(())
+    } else {
+        Err(Error::BadRequest(
+            "Only workspace admins and super admins can enable or disable data table migrations"
+                .to_string(),
+        ))
+    }
+}
+
+async fn enable_datatable_migrations(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+) -> Result<String> {
+    require_datatable_migrations_manager(&db, &authed).await?;
+
+    let updated = sqlx::query_scalar!(
+        "UPDATE workspace_settings \
+         SET datatable = jsonb_set(datatable, ARRAY['datatables', $2::text, 'migrations_enabled'], 'true'::jsonb) \
+         WHERE workspace_id = $1 AND jsonb_exists(datatable->'datatables', $2) \
+         RETURNING 1",
+        &w_id,
+        &datatable_name,
+    )
+    .fetch_optional(&db)
+    .await?;
+    if updated.is_none() {
+        return Err(Error::NotFound(format!(
+            "data table {datatable_name} not found"
+        )));
+    }
+
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.enable_datatable_migrations",
+        ActionKind::Update,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    Ok(format!(
+        "Enabled migrations for data table {datatable_name}"
+    ))
+}
+
+/// Opt a data table out of migrations. Deletes ALL of its migration definitions.
+async fn disable_datatable_migrations(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+) -> Result<String> {
+    require_datatable_migrations_manager(&db, &authed).await?;
+
+    let mut tx = db.begin().await?;
+
+    let updated = sqlx::query_scalar!(
+        "UPDATE workspace_settings \
+         SET datatable = jsonb_set(datatable, ARRAY['datatables', $2::text, 'migrations_enabled'], 'false'::jsonb) \
+         WHERE workspace_id = $1 AND jsonb_exists(datatable->'datatables', $2) \
+         RETURNING 1",
+        &w_id,
+        &datatable_name,
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    if updated.is_none() {
+        return Err(Error::NotFound(format!(
+            "data table {datatable_name} not found"
+        )));
+    }
+
+    // Capture the deleted definitions so each removal is tallied as a deployed
+    // object (like single-migration deletion), keeping workspace comparison and
+    // git-sync callbacks in sync when a fork opts back out of migrations.
+    let deleted = sqlx::query!(
+        "DELETE FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2 \
+         RETURNING timestamp, name",
+        &w_id,
+        &datatable_name,
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "workspaces.disable_datatable_migrations",
+        ActionKind::Delete,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    tx.commit().await?;
+
+    for m in deleted {
+        record_datatable_migration_deployment(
+            &authed,
+            &db,
+            &w_id,
+            &datatable_name,
+            m.timestamp,
+            &m.name,
+        )
+        .await?;
+    }
+
+    Ok(format!(
+        "Disabled migrations for data table {datatable_name} and deleted its migrations"
+    ))
+}
+
+#[derive(Deserialize)]
+pub struct CreateDatatableMigration {
+    pub name: String,
+    pub code_up: String,
+    #[serde(default)]
+    pub code_down: Option<String>,
+}
+
+/// Migration names map onto on-disk file names and the `_wm_migrations` record,
+/// so keep them to a safe path-segment charset (matches the CLI scaffold).
+fn validate_migration_name(name: &str) -> Result<()> {
+    if name.is_empty()
+        || !name
+            .chars()
+            .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
+    {
+        return Err(Error::BadRequest(format!(
+            "Invalid migration name '{name}': use only letters, digits, '_' and '-'"
+        )));
+    }
+    Ok(())
+}
+
+/// The data table name becomes a directory segment in the sync export
+/// (`migrations/datatable/<datatable>/...`); reject anything that could escape it.
+pub(crate) fn validate_datatable_path_segment(datatable: &str) -> Result<()> {
+    if datatable.is_empty()
+        || datatable.contains('/')
+        || datatable.contains('\\')
+        || datatable.contains("..")
+    {
+        return Err(Error::BadRequest(format!(
+            "Invalid data table name '{datatable}': must not contain '/', '\\' or '..'"
+        )));
+    }
+    Ok(())
+}
+
+/// Record a data table migration change as a deployed object so it is tallied
+/// into `workspace_diff` and shows up as a `datatable_migration` item in the
+/// workspace-merge diff. The diff path is `<datatable>/<timestamp>_<name>`,
+/// matching `parse_datatable_migration_diff_path`.
+async fn record_datatable_migration_deployment(
+    authed: &ApiAuthed,
+    db: &DB,
+    w_id: &str,
+    datatable: &str,
+    timestamp: i64,
+    name: &str,
+) -> Result<()> {
+    handle_deployment_metadata(
+        &authed.email,
+        &authed.username,
+        db,
+        w_id,
+        DeployedObject::DatatableMigration { path: format!("{datatable}/{timestamp}_{name}") },
+        Some(format!(
+            "Data table migration {name} ({timestamp}) on {datatable}"
+        )),
+        false,
+        None,
+    )
+    .await
+}
+
+/// Allocate the next version for a data table and insert the migration
+/// definition, in one transaction. A per-(workspace, data table) advisory lock
+/// serializes concurrent version allocation so two creates can't read the same
+/// `MAX(timestamp)` and collide on the `(workspace_id, datatable, timestamp)`
+/// primary key. The version is the current UTC `YYYYMMDDHHMMSS`, bumped past any
+/// existing version to stay unique and monotonically increasing.
+async fn insert_datatable_migration_def(
+    tx: &mut Transaction<'_, Postgres>,
+    w_id: &str,
+    datatable: &str,
+    name: &str,
+    code_up: &str,
+    code_down: Option<&str>,
+) -> Result<i64> {
+    sqlx::query!(
+        "SELECT pg_advisory_xact_lock(hashtext($1), hashtext($2))",
+        w_id,
+        datatable,
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    let now_ts: i64 = Utc::now()
+        .format("%Y%m%d%H%M%S")
+        .to_string()
+        .parse()
+        .map_err(|e| Error::internal_err(format!("Failed to build migration version: {}", e)))?;
+    let max_existing: Option<i64> = sqlx::query_scalar!(
+        "SELECT MAX(timestamp) FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2",
+        w_id,
+        datatable,
+    )
+    .fetch_one(&mut **tx)
+    .await?;
+    let timestamp = match max_existing {
+        Some(m) if m >= now_ts => m + 1,
+        _ => now_ts,
+    };
+
+    sqlx::query!(
+        "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down) \
+         VALUES ($1, $2, $3, $4, $5, $6)",
+        w_id,
+        datatable,
+        timestamp,
+        name,
+        code_up,
+        code_down,
+    )
+    .execute(&mut **tx)
+    .await?;
+
+    Ok(timestamp)
+}
+
+/// Mark a version as already installed in a data table's `_wm_migrations` table
+/// (ensuring the table exists first).
+async fn mark_datatable_version_installed(
+    db: &DB,
+    pg_db: &PgDatabase,
+    datatable: &str,
+    version: i64,
+) -> Result<()> {
+    let (client, connection) = pg_db.connect(Some(db)).await?;
+    tokio::spawn(async move {
+        if let Err(e) = connection.await {
+            tracing::error!("Datatable connection error: {}", e);
+        }
+    });
+    ensure_wm_migrations_schema(&client).await?;
+    client
+        .execute(
+            "INSERT INTO _wm_migrations (datatable, version) VALUES ($1, $2) \
+             ON CONFLICT (datatable, version) DO NOTHING",
+            &[&datatable, &version],
+        )
+        .await
+        .map_err(|e| {
+            Error::internal_err(format!("Failed to mark initial migration installed: {}", e))
+        })?;
+    Ok(())
+}
+
+/// Create a single migration for a data table. The version is generated
+/// server-side (current UTC `YYYYMMDDHHMMSS`), bumped past any existing version
+/// so it stays unique and monotonically increasing.
+async fn create_datatable_migration(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+    Json(payload): Json<CreateDatatableMigration>,
+) -> JsonResult<DatatableMigration> {
+    validate_datatable_path_segment(&datatable_name)?;
+    validate_migration_name(&payload.name)?;
+    ensure_datatable_migrations_enabled(&db, &w_id, &datatable_name).await?;
+
+    let mut tx = db.begin().await?;
+    let timestamp = insert_datatable_migration_def(
+        &mut tx,
+        &w_id,
+        &datatable_name,
+        &payload.name,
+        &payload.code_up,
+        payload.code_down.as_deref(),
+    )
+    .await?;
+    tx.commit().await?;
+
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.create_datatable_migration",
+        ActionKind::Create,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    record_datatable_migration_deployment(
+        &authed,
+        &db,
+        &w_id,
+        &datatable_name,
+        timestamp,
+        &payload.name,
+    )
+    .await?;
+
+    Ok(Json(DatatableMigration {
+        datatable: datatable_name,
+        timestamp,
+        name: payload.name,
+        code_up: payload.code_up,
+        code_down: payload.code_down,
+    }))
+}
+
+/// Delete a single migration definition from a data table.
+async fn delete_datatable_migration(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name, timestamp)): Path<(String, String, i64)>,
+) -> Result<String> {
+    // Hold the run-serialization lock across the applied-check and the delete: a
+    // run snapshots a migration's SQL before recording its version, so an
+    // unserialized delete could race it and leave `_wm_migrations` pointing at a
+    // definition that no longer exists (breaking rollback and hiding the applied
+    // version). Held until the handler returns. Fail closed if we can't verify.
+    let unreachable = |e| {
+        Error::internal_err(format!(
+            "Cannot verify whether migration {} on data table '{}' has already been applied \
+             (its database is unreachable: {}). Refusing to delete it; retry once the database \
+             is reachable.",
+            timestamp, datatable_name, e
+        ))
+    };
+    let lock_client = lock_datatable_migration_runs(&db, &w_id, &datatable_name)
+        .await
+        .map_err(unreachable)?;
+    let applied = read_applied_versions_on_client(&lock_client, &datatable_name)
+        .await
+        .map_err(unreachable)?;
+    if applied.contains(&timestamp) {
+        return Err(Error::BadRequest(format!(
+            "Migration {} on data table '{}' has already been applied and cannot be deleted. \
+             Revert it first.",
+            timestamp, datatable_name
+        )));
+    }
+
+    let deleted_name = sqlx::query_scalar!(
+        "DELETE FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3 \
+         RETURNING name",
+        &w_id,
+        &datatable_name,
+        timestamp,
+    )
+    .fetch_optional(&db)
+    .await?;
+    // The definition is removed; runs may resume (audit/deploy metadata below
+    // don't need the lock).
+    drop(lock_client);
+
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.delete_datatable_migration",
+        ActionKind::Delete,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    // Only tally a change if a migration was actually deleted.
+    if let Some(name) = deleted_name {
+        record_datatable_migration_deployment(
+            &authed,
+            &db,
+            &w_id,
+            &datatable_name,
+            timestamp,
+            &name,
+        )
+        .await?;
+    }
+
+    Ok(format!(
+        "Deleted migration {} from {}",
+        timestamp, datatable_name
+    ))
+}
+
+#[derive(Deserialize)]
+pub struct UpsertDatatableMigration {
+    pub timestamp: i64,
+    pub name: String,
+    pub code_up: String,
+    #[serde(default)]
+    pub code_down: Option<String>,
+}
+
+/// Insert or update a single migration at an explicit version. Used by
+/// `wmill sync` to push a `migrations/datatable/<dt>/<version>_<name>.up.sql`
+/// (and `.down.sql`) file as the source of truth.
+async fn upsert_datatable_migration(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+    Json(payload): Json<UpsertDatatableMigration>,
+) -> Result<String> {
+    validate_datatable_path_segment(&datatable_name)?;
+    validate_migration_name(&payload.name)?;
+    ensure_datatable_migrations_enabled(&db, &w_id, &datatable_name).await?;
+
+    // Guard against silently rewriting a migration that has already run in the
+    // data table's database: its `_wm_migrations` record would no longer match
+    // its SQL, so a later `migrate up` would skip it and a rollback would run a
+    // `down` that doesn't correspond to what was applied. Only an actual change
+    // to an existing migration is guarded; unchanged re-pushes (e.g.
+    // `wmill sync push`) always proceed.
+    let existing = sqlx::query!(
+        "SELECT name, code_up, code_down FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+        &w_id,
+        &datatable_name,
+        payload.timestamp,
+    )
+    .fetch_optional(&db)
+    .await?;
+    // When modifying an existing definition, hold the run-serialization lock
+    // across the applied-check and the write below so an in-flight run can't
+    // record a version for the SQL we're about to overwrite. Held until the end
+    // of the handler (well past the write); a new/unchanged upsert needs no lock.
+    let _run_lock = match existing {
+        Some(existing)
+            if !(existing.name == payload.name
+                && existing.code_up == payload.code_up
+                && existing.code_down == payload.code_down) =>
+        {
+            // Fail closed: if we can't lock/read the applied set (e.g. the
+            // data-table database is temporarily unreachable), refuse the change
+            // rather than risk overwriting a migration that has already run.
+            let unreachable = |e| {
+                Error::internal_err(format!(
+                    "Cannot verify whether migration {} on data table '{}' has already been \
+                     applied (its database is unreachable: {}). Refusing to modify it; retry \
+                     once the database is reachable.",
+                    payload.timestamp, datatable_name, e
+                ))
+            };
+            let client = lock_datatable_migration_runs(&db, &w_id, &datatable_name)
+                .await
+                .map_err(unreachable)?;
+            let applied = read_applied_versions_on_client(&client, &datatable_name)
+                .await
+                .map_err(unreachable)?;
+            if applied.contains(&payload.timestamp) {
+                return Err(Error::BadRequest(format!(
+                    "Migration {} on data table '{}' has already been applied and cannot be modified. \
+                     Revert it first, or add a new migration instead.",
+                    payload.timestamp, datatable_name
+                )));
+            }
+            Some(client)
+        }
+        _ => None,
+    };
+
+    sqlx::query!(
+        "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down) \
+         VALUES ($1, $2, $3, $4, $5, $6) \
+         ON CONFLICT (workspace_id, datatable, timestamp) DO UPDATE \
+         SET name = EXCLUDED.name, code_up = EXCLUDED.code_up, code_down = EXCLUDED.code_down",
+        &w_id,
+        &datatable_name,
+        payload.timestamp,
+        &payload.name,
+        &payload.code_up,
+        payload.code_down.as_deref(),
+    )
+    .execute(&db)
+    .await?;
+    // The definition is written; runs may resume (audit/deploy metadata below
+    // don't need the lock).
+    drop(_run_lock);
+
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.upsert_datatable_migration",
+        ActionKind::Update,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    record_datatable_migration_deployment(
+        &authed,
+        &db,
+        &w_id,
+        &datatable_name,
+        payload.timestamp,
+        &payload.name,
+    )
+    .await?;
+
+    Ok(format!(
+        "Upserted migration {} in {}",
+        payload.timestamp, datatable_name
+    ))
+}
+
+/// Generate the first migration for a data table by snapshotting its current
+/// schema with `pg_dump`. The migration is recorded as already installed (the
+/// definition is written first, then its version is marked in the data table's
+/// `_wm_migrations`, so it ends up considered applied and is never re-run) and
+/// has no down migration.
+async fn generate_initial_datatable_migration(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, datatable_name)): Path<(String, String)>,
+) -> JsonResult<DatatableMigration> {
+    validate_datatable_path_segment(&datatable_name)?;
+    ensure_datatable_migrations_enabled(&db, &w_id, &datatable_name).await?;
+
+    // The initial snapshot only makes sense on a data table with no migrations
+    // yet; reject otherwise so repeated calls don't pile up duplicate "initial"
+    // definitions (each at a distinct timestamp, each marked installed).
+    let has_migrations: bool = sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM datatable_migrations WHERE workspace_id = $1 AND datatable = $2)",
+        &w_id,
+        &datatable_name,
+    )
+    .fetch_one(&db)
+    .await?
+    .unwrap_or(false);
+    if has_migrations {
+        return Err(Error::BadRequest(format!(
+            "Data table '{datatable_name}' already has migrations; the initial migration can only be generated when there are none."
+        )));
+    }
+
+    let db_resource = get_datatable_resource_from_db_unchecked(&db, &w_id, &datatable_name).await?;
+    let pg_db: PgDatabase = serde_json::from_value(db_resource)
+        .map_err(|e| Error::internal_err(format!("Failed to parse database credentials: {}", e)))?;
+
+    // Snapshot the schema, excluding Windmill's own migration bookkeeping table.
+    let dump_file = pg_dump_database(&pg_db, true, &["_wm_migrations"]).await?;
+    let raw_dump = tokio::fs::read_to_string(&dump_file.path)
+        .await
+        .map_err(|e| Error::internal_err(format!("Failed to read schema dump: {}", e)))?;
+    // pg_dump emits psql meta-commands (\restrict / \unrestrict) that aren't
+    // valid SQL; drop them so the migration body can run via a plain query.
+    let code_up: String = raw_dump
+        .lines()
+        .filter(|line| !line.trim_start().starts_with('\\'))
+        .collect::<Vec<_>>()
+        .join("\n");
+
+    // Record the definition first, then mark it installed. If marking fails we
+    // delete the definition, so a failure leaves no phantom "initial" (rather
+    // than a `_wm_migrations` version with no definition that the UI can't
+    // clear). The narrow window where it briefly shows "not run" is benign:
+    // running it would just no-op/fail harmlessly against the existing schema.
+    let mut tx = db.begin().await?;
+    let timestamp =
+        insert_datatable_migration_def(&mut tx, &w_id, &datatable_name, "initial", &code_up, None)
+            .await?;
+    tx.commit().await?;
+
+    if let Err(e) = mark_datatable_version_installed(&db, &pg_db, &datatable_name, timestamp).await
+    {
+        let _ = sqlx::query!(
+            "DELETE FROM datatable_migrations \
+             WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+            &w_id,
+            &datatable_name,
+            timestamp,
+        )
+        .execute(&db)
+        .await;
+        return Err(e);
+    }
+
+    audit_log(
+        &db,
+        &authed,
+        "workspaces.generate_initial_datatable_migration",
+        ActionKind::Create,
+        &w_id,
+        Some(datatable_name.as_str()),
+        None,
+    )
+    .await?;
+
+    record_datatable_migration_deployment(
+        &authed,
+        &db,
+        &w_id,
+        &datatable_name,
+        timestamp,
+        "initial",
+    )
+    .await?;
+
+    Ok(Json(DatatableMigration {
+        datatable: datatable_name,
+        timestamp,
+        name: "initial".to_string(),
+        code_up,
+        code_down: None,
+    }))
+}
+
+/// A datatable migration diff item has path `<datatable>/<timestamp>_<name>`.
+/// Parse out the (datatable, timestamp) needed to look it up.
+fn parse_datatable_migration_diff_path(path: &str) -> Option<(String, i64)> {
+    let (datatable, file) = path.split_once('/')?;
+    let ts_str: String = file.chars().take_while(|c| c.is_ascii_digit()).collect();
+    let timestamp = ts_str.parse::<i64>().ok()?;
+    Some((datatable.to_string(), timestamp))
+}
+
+pub(crate) async fn compare_two_datatable_migration(
+    db: &DB,
+    source_workspace_id: &str,
+    fork_workspace_id: &str,
+    path: &str,
+) -> Result<ItemComparison> {
+    let (datatable, timestamp) = match parse_datatable_migration_diff_path(path) {
+        Some(v) => v,
+        None => {
+            return Ok(ItemComparison {
+                has_changes: false,
+                exists_in_source: false,
+                exists_in_fork: false,
+            })
+        }
+    };
+
+    let source = sqlx::query!(
+        "SELECT name, code_up, code_down FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+        source_workspace_id,
+        datatable,
+        timestamp,
+    )
+    .fetch_optional(db)
+    .await?;
+    let target = sqlx::query!(
+        "SELECT name, code_up, code_down FROM datatable_migrations \
+         WHERE workspace_id = $1 AND datatable = $2 AND timestamp = $3",
+        fork_workspace_id,
+        datatable,
+        timestamp,
+    )
+    .fetch_optional(db)
+    .await?;
+
+    let has_changes = match (&source, &target) {
+        (Some(s), Some(t)) => {
+            s.name != t.name || s.code_up != t.code_up || s.code_down != t.code_down
+        }
+        _ => source.is_some() || target.is_some(),
+    };
+
+    Ok(ItemComparison {
+        has_changes,
+        exists_in_source: source.is_some(),
+        exists_in_fork: target.is_some(),
+    })
+}
+
+#[derive(Deserialize, Debug)]
+pub(crate) struct DatatableRename {
+    pub(crate) from: String,
+    pub(crate) to: String,
+}
+
+async fn resolve_datatable_pg(db: &DB, w_id: &str, datatable: &str) -> Result<PgDatabase> {
+    let db_resource = get_datatable_resource_from_db_unchecked(db, w_id, datatable).await?;
+    serde_json::from_value(db_resource)
+        .map_err(|e| Error::internal_err(format!("Failed to parse database credentials: {}", e)))
+}
+
+/// Tolerate a data table whose database has no `_wm_migrations` yet (42P01 =
+/// undefined_table): it has never run a migration, so nothing to rename or forget.
+fn ignore_missing_wm_migrations(e: tokio_postgres::Error) -> Result<()> {
+    match e.as_db_error().map(|d| d.code().code()) {
+        Some("42P01") => Ok(()),
+        _ => Err(Error::internal_err(format!(
+            "Failed to update _wm_migrations: {}",
+            e
+        ))),
+    }
+}
+
+/// Drop a data table's rows from its own database's `_wm_migrations`.
+async fn remote_forget_datatable_migrations(db: &DB, w_id: &str, datatable: &str) -> Result<()> {
+    let pg_db = resolve_datatable_pg(db, w_id, datatable).await?;
+    let (client, connection) = pg_db.connect(Some(db)).await?;
+    tokio::spawn(async move {
+        let _ = connection.await;
+    });
+    client
+        .execute(
+            "DELETE FROM _wm_migrations WHERE datatable = $1",
+            &[&datatable],
+        )
+        .await
+        .map(|_| ())
+        .or_else(ignore_missing_wm_migrations)
+}
+
+/// Relabel a data table's rows in its own database's `_wm_migrations`. `resolve_by`
+/// names the config entry used to find the database (the old name, still present
+/// pre-commit); `from`/`to` are the `datatable` column values to move between.
+async fn remote_rename_datatable_migrations(
+    db: &DB,
+    w_id: &str,
+    resolve_by: &str,
+    from: &str,
+    to: &str,
+) -> Result<()> {
+    let pg_db = resolve_datatable_pg(db, w_id, resolve_by).await?;
+    let (client, connection) = pg_db.connect(Some(db)).await?;
+    tokio::spawn(async move {
+        let _ = connection.await;
+    });
+    client
+        .execute(
+            "UPDATE _wm_migrations SET datatable = $2 WHERE datatable = $1",
+            &[&from, &to],
+        )
+        .await
+        .map(|_| ())
+        .or_else(ignore_missing_wm_migrations)
+}
+
+/// Keep migration bookkeeping in sync when data tables are renamed or deleted in
+/// the workspace config: the control table `datatable_migrations` (this database,
+/// in `tx`) and each data table's own `_wm_migrations` (its own database, keyed
+/// by data table name — see [`ensure_wm_migrations_schema`]).
+///
+/// Renames are applied in two phases through a temporary key so that a rename
+/// chain or a swap (A->B, B->A) can't transiently collide on the
+/// (datatable, ...) uniqueness mid-update.
+///
+/// The `_wm_migrations` updates are best-effort: they run just before `tx`
+/// commits (resolved via the pool, which still exposes the old names), and a
+/// temporarily unreachable data-table database is logged rather than failing the
+/// whole config edit. If one is missed, the next run re-applies its migrations
+/// against the existing schema.
+pub(crate) async fn cascade_datatable_migration_renames_and_deletes(
+    db: &DB,
+    tx: &mut Transaction<'_, Postgres>,
+    w_id: &str,
+    renames: &[DatatableRename],
+    deleted_datatables: &[String],
+) -> Result<()> {
+    if !deleted_datatables.is_empty() {
+        sqlx::query!(
+            "DELETE FROM datatable_migrations WHERE workspace_id = $1 AND datatable = ANY($2::text[])",
+            w_id,
+            deleted_datatables
+        )
+        .execute(&mut **tx)
+        .await?;
+    }
+
+    for (i, r) in renames.iter().enumerate() {
+        let tmp = format!("__wm_rename_tmp/{i}");
+        sqlx::query!(
+            "UPDATE datatable_migrations SET datatable = $3 WHERE workspace_id = $1 AND datatable = $2",
+            w_id,
+            &r.from,
+            &tmp
+        )
+        .execute(&mut **tx)
+        .await?;
+    }
+    for (i, r) in renames.iter().enumerate() {
+        let tmp = format!("__wm_rename_tmp/{i}");
+        sqlx::query!(
+            "UPDATE datatable_migrations SET datatable = $3 WHERE workspace_id = $1 AND datatable = $2",
+            w_id,
+            &tmp,
+            &r.to
+        )
+        .execute(&mut **tx)
+        .await?;
+    }
+
+    for name in deleted_datatables {
+        if let Err(e) = remote_forget_datatable_migrations(db, w_id, name).await {
+            tracing::warn!("Failed to clear _wm_migrations for deleted data table {name}: {e}");
+        }
+    }
+    for (i, r) in renames.iter().enumerate() {
+        let tmp = format!("__wm_rename_tmp/{i}");
+        if let Err(e) = remote_rename_datatable_migrations(db, w_id, &r.from, &r.from, &tmp).await {
+            tracing::warn!(
+                "Failed to stage _wm_migrations rename {} -> {}: {e}",
+                r.from,
+                r.to
+            );
+        }
+    }
+    for (i, r) in renames.iter().enumerate() {
+        let tmp = format!("__wm_rename_tmp/{i}");
+        if let Err(e) = remote_rename_datatable_migrations(db, w_id, &r.from, &tmp, &r.to).await {
+            tracing::warn!(
+                "Failed to finish _wm_migrations rename {} -> {}: {e}",
+                r.from,
+                r.to
+            );
+        }
+    }
+
+    Ok(())
+}
+
+/// Copy a workspace's migration definitions to another workspace, so a fork
+/// inherits the same per-data-table migration history as its parent.
+pub(crate) async fn clone_datatable_migrations(
+    tx: &mut Transaction<'_, Postgres>,
+    source_workspace_id: &str,
+    target_workspace_id: &str,
+) -> Result<()> {
+    sqlx::query!(
+        "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up, code_down)
+         SELECT $2, datatable, timestamp, name, code_up, code_down
+         FROM datatable_migrations WHERE workspace_id = $1",
+        source_workspace_id,
+        target_workspace_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn validate_migration_name_accepts_safe_names() {
+        for name in ["initial", "add_index_to_customers", "fix-bug_2", "ABC123"] {
+            assert!(
+                validate_migration_name(name).is_ok(),
+                "{name} should be valid"
+            );
+        }
+    }
+
+    #[test]
+    fn validate_migration_name_rejects_unsafe_names() {
+        for name in [
+            "",
+            "add index",
+            "a/b",
+            "a\\b",
+            "a..b",
+            "a.b",
+            "naïve",
+            "a/../b",
+        ] {
+            assert!(
+                validate_migration_name(name).is_err(),
+                "{name} should be rejected"
+            );
+        }
+    }
+
+    #[test]
+    fn validate_datatable_path_segment_accepts_and_rejects() {
+        for ok in ["mydt", "my-dt", "main", "a b"] {
+            assert!(
+                validate_datatable_path_segment(ok).is_ok(),
+                "{ok} should be ok"
+            );
+        }
+        for bad in ["", "a/b", "a\\b", "..", "a..b", "../etc", "x/.."] {
+            assert!(
+                validate_datatable_path_segment(bad).is_err(),
+                "{bad} should be rejected"
+            );
+        }
+    }
+
+    #[test]
+    fn parse_datatable_migration_diff_path_roundtrips() {
+        assert_eq!(
+            parse_datatable_migration_diff_path("mydt/20260101000001_create_users.up.sql"),
+            Some(("mydt".to_string(), 20260101000001))
+        );
+        // up and down map to the same (datatable, timestamp) record.
+        assert_eq!(
+            parse_datatable_migration_diff_path("mydt/20260101000001_create_users.down.sql"),
+            Some(("mydt".to_string(), 20260101000001))
+        );
+        // datatable names may themselves be hyphenated.
+        assert_eq!(
+            parse_datatable_migration_diff_path("my-dt/42_x.up.sql"),
+            Some(("my-dt".to_string(), 42))
+        );
+    }
+
+    #[test]
+    fn parse_datatable_migration_diff_path_rejects_malformed() {
+        // no slash → not a migration path
+        assert_eq!(parse_datatable_migration_diff_path("nofile"), None);
+        // filename not starting with digits → no timestamp
+        assert_eq!(
+            parse_datatable_migration_diff_path("mydt/create_users.up.sql"),
+            None
+        );
+        // empty filename
+        assert_eq!(parse_datatable_migration_diff_path("mydt/"), None);
+    }
+
+    async fn seed_migration(pool: &DB, w_id: &str, datatable: &str, timestamp: i64, name: &str) {
+        sqlx::query(
+            "INSERT INTO datatable_migrations (workspace_id, datatable, timestamp, name, code_up) \
+             VALUES ($1, $2, $3, $4, 'select 1;')",
+        )
+        .bind(w_id)
+        .bind(datatable)
+        .bind(timestamp)
+        .bind(name)
+        .execute(pool)
+        .await
+        .unwrap();
+    }
+
+    async fn migration_keys(pool: &DB, w_id: &str) -> Vec<(String, String)> {
+        sqlx::query_as::<_, (String, String)>(
+            "SELECT datatable, name FROM datatable_migrations WHERE workspace_id = $1 \
+             ORDER BY datatable, timestamp",
+        )
+        .bind(w_id)
+        .fetch_all(pool)
+        .await
+        .unwrap()
+    }
+
+    // The cascade keeps each data table's migrations attached to its name when a
+    // data table is renamed, drops them when it is deleted, and survives a swap
+    // (A->B, B->A) at a shared timestamp without a primary-key collision.
+    #[sqlx::test(migrations = "../migrations")]
+    async fn cascade_renames_and_deletes_datatable_migrations(pool: DB) {
+        let w_id = format!("dtmig{}", uuid::Uuid::new_v4().simple());
+        sqlx::query("INSERT INTO workspace (id, name, owner) VALUES ($1, $1, 'test@windmill.dev')")
+            .bind(&w_id)
+            .execute(&pool)
+            .await
+            .unwrap();
+
+        // rename a -> a2, delete d, and swap sa <-> sb (both at timestamp 5000)
+        seed_migration(&pool, &w_id, "a", 1, "a_mig").await;
+        seed_migration(&pool, &w_id, "d", 1, "d_mig").await;
+        seed_migration(&pool, &w_id, "sa", 5000, "sa_mig").await;
+        seed_migration(&pool, &w_id, "sb", 5000, "sb_mig").await;
+
+        let mut tx = pool.begin().await.unwrap();
+        cascade_datatable_migration_renames_and_deletes(
+            &pool,
+            &mut tx,
+            &w_id,
+            &[
+                DatatableRename { from: "a".to_string(), to: "a2".to_string() },
+                DatatableRename { from: "sa".to_string(), to: "sb".to_string() },
+                DatatableRename { from: "sb".to_string(), to: "sa".to_string() },
+            ],
+            &["d".to_string()],
+        )
+        .await
+        .unwrap();
+        tx.commit().await.unwrap();
+
+        assert_eq!(
+            migration_keys(&pool, &w_id).await,
+            vec![
+                ("a2".to_string(), "a_mig".to_string()),
+                ("sa".to_string(), "sb_mig".to_string()),
+                ("sb".to_string(), "sa_mig".to_string()),
+            ]
+        );
+    }
+
+    // A fork inherits its parent's migration definitions unchanged.
+    #[sqlx::test(migrations = "../migrations")]
+    async fn clone_copies_datatable_migrations_to_target(pool: DB) {
+        let src = format!("src{}", uuid::Uuid::new_v4().simple());
+        let dst = format!("dst{}", uuid::Uuid::new_v4().simple());
+        for w in [&src, &dst] {
+            sqlx::query(
+                "INSERT INTO workspace (id, name, owner) VALUES ($1, $1, 'test@windmill.dev')",
+            )
+            .bind(w)
+            .execute(&pool)
+            .await
+            .unwrap();
+        }
+        seed_migration(&pool, &src, "customers", 1, "create_customers").await;
+        seed_migration(&pool, &src, "customers", 2, "add_index").await;
+        seed_migration(&pool, &src, "orders", 3, "create_orders").await;
+
+        let mut tx = pool.begin().await.unwrap();
+        clone_datatable_migrations(&mut tx, &src, &dst)
+            .await
+            .unwrap();
+        tx.commit().await.unwrap();
+
+        // the target ends up with an identical set, and the source is untouched.
+        let expected = vec![
+            ("customers".to_string(), "create_customers".to_string()),
+            ("customers".to_string(), "add_index".to_string()),
+            ("orders".to_string(), "create_orders".to_string()),
+        ];
+        assert_eq!(migration_keys(&pool, &dst).await, expected);
+        assert_eq!(migration_keys(&pool, &src).await, expected);
+    }
+}
diff --git a/backend/windmill-api-workspaces/src/deployment_requests.rs b/backend/windmill-api-workspaces/src/deployment_requests.rs
index 7782382073..a279f82d6c 100644
--- a/backend/windmill-api-workspaces/src/deployment_requests.rs
+++ b/backend/windmill-api-workspaces/src/deployment_requests.rs
@@ -717,16 +717,27 @@ async fn create_deployment_request_comment(
 // ---- helpers ------------------------------------------------------------
 
 async fn parent_of_fork(db: &DB, w_id: &str) -> Result<String> {
-    sqlx::query_scalar!(
-        "SELECT parent_workspace_id FROM workspace WHERE id = $1",
+    // Resolve the fork's parent and require it to still exist and be active. A
+    // parent that is archived (soft-deleted) can no longer be accessed, so a
+    // diff or deployment request against it targets an unreachable workspace.
+    let parent = sqlx::query!(
+        "SELECT p.id AS \"id!\", p.deleted AS \"deleted!\"
+         FROM workspace f
+         JOIN workspace p ON p.id = f.parent_workspace_id
+         WHERE f.id = $1",
         w_id,
     )
     .fetch_optional(db)
-    .await?
-    .flatten()
-    .ok_or_else(|| {
-        Error::BadRequest(format!(
+    .await?;
+
+    match parent {
+        None => Err(Error::BadRequest(format!(
             "workspace {w_id} is not a fork (no parent_workspace_id)"
-        ))
-    })
+        ))),
+        Some(p) if p.deleted => Err(Error::BadRequest(format!(
+            "parent workspace {} of fork {w_id} is archived",
+            p.id
+        ))),
+        Some(p) => Ok(p.id),
+    }
 }
diff --git a/backend/windmill-api-workspaces/src/lib.rs b/backend/windmill-api-workspaces/src/lib.rs
index b3e9853de9..c2b62d450b 100644
--- a/backend/windmill-api-workspaces/src/lib.rs
+++ b/backend/windmill-api-workspaces/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod datatable_migrations;
 pub mod deployment_requests;
 pub mod workspaces;
 pub mod workspaces_extra;
diff --git a/backend/windmill-api-workspaces/src/workspaces.rs b/backend/windmill-api-workspaces/src/workspaces.rs
index 6387bb27c8..2c28a6729a 100644
--- a/backend/windmill-api-workspaces/src/workspaces.rs
+++ b/backend/windmill-api-workspaces/src/workspaces.rs
@@ -6,7 +6,10 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-use windmill_api_auth::{require_devops_role, require_super_admin, ApiAuthed};
+use windmill_api_auth::{
+    build_scope_path_predicate, check_scopes, require_devops_role, require_is_writer,
+    require_super_admin, ApiAuthed,
+};
 use windmill_api_users::users::WorkspaceInvite;
 use windmill_common::email_oss::send_email_if_possible;
 use windmill_common::usernames::{get_instance_username_or_create_pending, VALID_USERNAME};
@@ -40,9 +43,10 @@ use windmill_common::workspaces::GitRepositorySettings;
 #[cfg(feature = "enterprise")]
 use windmill_common::workspaces::WorkspaceDeploymentUISettings;
 use windmill_common::workspaces::{
-    check_user_against_rule, get_datatable_resource_from_db_unchecked, validate_fork_workspace_id,
-    DataTable, DataTableCatalogResourceType, DataTableForkBehavior, ProtectionRuleKind,
-    ProtectionRules, ProtectionRuleset, RuleCheckResult, WorkspaceGitSyncSettings,
+    check_deploy_rules, check_user_against_rule, get_datatable_resource_from_db_unchecked,
+    validate_dev_workspace_id, validate_fork_workspace_id, validate_workspace_name, DataTable,
+    DataTableCatalogResourceType, DataTableForkBehavior, ProtectionRuleKind, ProtectionRules,
+    ProtectionRuleset, RuleCheckResult, WorkspaceGitSyncSettings, DEV_WORKSPACE_LOCK_RULE_NAME,
 };
 use windmill_common::workspaces::{Ducklake, DucklakeCatalogResourceType};
 use windmill_common::PgDatabase;
@@ -65,8 +69,11 @@ use windmill_types::s3::LargeFileStorage;
 
 use hyper::StatusCode;
 use serde::{Deserialize, Serialize};
-use sqlx::{FromRow, Postgres, Transaction};
+use sqlx::{FromRow, Postgres, Row, Transaction};
 use windmill_common::oauth2::InstanceEvent;
+use windmill_common::secret_backend::{
+    get_secret_backend, is_external_stored_value, is_vault_backend_configured,
+};
 use windmill_common::utils::not_found_if_none;
 
 lazy_static::lazy_static! {
@@ -128,6 +135,7 @@ pub fn workspaced_service() -> Router {
             get(get_datatable_table_schema),
         )
         .route("/edit_datatable_config", post(edit_datatable_config))
+        .merge(crate::datatable_migrations::routes())
         .route("/git_sync_enabled", get(get_git_sync_enabled))
         .route("/edit_git_sync_config", post(edit_git_sync_config))
         .route("/edit_git_sync_repository", post(edit_git_sync_repository))
@@ -150,6 +158,10 @@ pub fn workspaced_service() -> Router {
         .route("/leave", post(leave_workspace))
         .route("/get_workspace_name", get(get_workspace_name))
         .route("/create_fork", post(create_workspace_fork))
+        .route("/attach_dev_workspace", post(attach_dev_workspace))
+        .route("/detach_dev_workspace", post(detach_dev_workspace))
+        .route("/set_dev_workspace_label", post(set_dev_workspace_label))
+        .route("/get_dev_workspace", get(get_dev_workspace))
         .route("/change_workspace_name", post(change_workspace_name))
         .route("/change_workspace_color", post(change_workspace_color))
         .route(
@@ -176,6 +188,10 @@ pub fn workspaced_service() -> Router {
             "/drop_forked_datatable_databases",
             post(crate::workspaces_extra::drop_forked_datatable_databases),
         )
+        .route(
+            "/drop_forked_ducklake_namespaces",
+            post(crate::workspaces_extra::drop_forked_ducklake_namespaces),
+        )
         .route(
             "/get_datatable_full_schema",
             post(get_datatable_full_schema),
@@ -191,12 +207,14 @@ pub fn workspaced_service() -> Router {
         .route("/prune_versions", post(prune_versions))
         .route("/list_ws_specific", get(list_ws_specific))
         .route("/list_ws_specific_versions", get(list_ws_specific_versions))
+        .route("/set_ws_specific", post(set_ws_specific))
 }
 pub fn global_service() -> Router {
     Router::new()
         .route("/list_as_superadmin", get(list_workspaces_as_super_admin))
         .route("/list", get(list_workspaces))
         .route("/users", get(user_workspaces))
+        .route("/session_workspace_status", post(session_workspace_status))
         .route("/create", post(create_workspace))
         .route("/create_fork", post(deprecated_create_workspace_fork))
         .route("/exists", post(exists_workspace))
@@ -416,6 +434,12 @@ pub struct DucklakeSettings {
 #[derive(Deserialize, Debug)]
 struct EditDataTableConfig {
     settings: DataTableSettings,
+    // Data table renames (old -> new) and deletions, tracked client-side by a
+    // stable id, so we can cascade or drop each data table's migrations.
+    #[serde(default)]
+    renames: Vec<crate::datatable_migrations::DatatableRename>,
+    #[serde(default)]
+    deleted_datatables: Vec<String>,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -440,6 +464,29 @@ struct CreateWorkspaceFork {
     /// forked workspace's datatable config to point to the new database.
     #[serde(default)]
     forked_datatables: Vec<ForkedDatatableInfo>,
+    /// Lakes the user explicitly chose to SHARE with the parent (the fork then reads and
+    /// writes the parent's lake directly). Every lake not listed gets the default isolated
+    /// fork namespace + read-defer.
+    #[serde(default)]
+    shared_ducklakes: Vec<String>,
+    /// Create the fork as a persistent dev workspace: the id is not required to carry the
+    /// `wm-fork-` prefix, and at most one dev workspace may exist per parent.
+    #[serde(default)]
+    is_dev_workspace: bool,
+    /// When creating a dev workspace, lock the parent ("prod") against direct deployment and/or
+    /// ad-hoc forking, so edits are funneled through the dev workspace.
+    #[serde(default)]
+    lock_prod_deploy: bool,
+    #[serde(default)]
+    lock_prod_forking: bool,
+    /// Copy the parent's members (usr rows + group memberships) into the fork so
+    /// the team can work in it. Defaults off; the dev-workspace UI defaults it on.
+    #[serde(default)]
+    copy_members: bool,
+    /// Cosmetic display label for the dev workspace: 'dev' | 'staging'. Purely visual (badge text +
+    /// wording); ignored for non-dev forks. None defaults to 'dev'.
+    #[serde(default)]
+    dev_workspace_label: Option<String>,
 }
 
 #[derive(Deserialize)]
@@ -468,6 +515,8 @@ struct UserWorkspace {
     pub color: Option<String>,
     pub operator_settings: Option<Option<serde_json::Value>>,
     pub parent_workspace_id: Option<String>,
+    pub is_dev_workspace: bool,
+    pub dev_workspace_label: Option<String>,
     pub disabled: bool,
 }
 
@@ -605,11 +654,13 @@ async fn list_pending_invites(
 }
 
 async fn is_premium(
-    authed: ApiAuthed,
+    _authed: ApiAuthed,
     Extension(_db): Extension<DB>,
     Path(_w_id): Path<String>,
 ) -> JsonResult<bool> {
-    require_admin(authed.is_admin, &authed.username)?;
+    // Any workspace member (not just admins) may read whether the workspace is on a paid plan: it's a
+    // single boolean, and the frontend needs it to decide whether to surface premium-gated affordances
+    // (e.g. forking) to non-admin developers too. The `_authed` extractor still enforces membership.
     #[cfg(feature = "cloud")]
     let premium = windmill_common::workspaces::get_team_plan_status(&_db, &_w_id)
         .await?
@@ -636,6 +687,48 @@ async fn exists_workspace(
     Ok(Json(exists))
 }
 
+/// Whether this workspace already has an active canonical dev workspace. The create-fork UI can't
+/// rely on the caller's workspace list to decide this — a dev paired to this prod may exist that the
+/// caller isn't a member of — so it asks the server, which sees all children.
+#[derive(Serialize)]
+struct DevWorkspaceInfo {
+    id: String,
+    name: String,
+    dev_workspace_label: Option<String>,
+}
+
+/// Normalize/validate the cosmetic dev-workspace display label. None or 'dev' both render as "dev";
+/// 'staging' renders as "stg". Anything else is rejected. Stored explicitly ('dev'/'staging') so it
+/// round-trips, but a NULL column is treated as 'dev' on the read side too.
+fn normalize_dev_workspace_label(label: Option<String>) -> Result<Option<String>> {
+    match label.as_deref() {
+        None | Some("dev") => Ok(Some("dev".to_string())),
+        Some("staging") => Ok(Some("staging".to_string())),
+        Some(other) => Err(Error::BadRequest(format!(
+            "invalid dev workspace label '{other}' (expected 'dev' or 'staging')"
+        ))),
+    }
+}
+
+/// This workspace's active canonical dev workspace, if any. The create-fork UI and the dev-workspace
+/// settings tab can't rely on the caller's workspace list — a dev paired to this prod may exist that
+/// the caller isn't a member of — so they ask the server, which sees all children. Returns its id/name
+/// so a prod admin who isn't a dev member can still see the pairing and detach it.
+async fn get_dev_workspace(
+    _authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<Option<DevWorkspaceInfo>> {
+    let dev = sqlx::query_as!(
+        DevWorkspaceInfo,
+        "SELECT id, name, dev_workspace_label FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false",
+        &w_id
+    )
+    .fetch_optional(&db)
+    .await?;
+    Ok(Json(dev))
+}
+
 async fn list_workspaces(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -1838,6 +1931,38 @@ mod tests {
             format!("text={}...", "é".repeat(27))
         );
     }
+
+    // A real NUL can't live in Rust source, so build `{"k":"<n backslashes>u0000"}`
+    // by repeating backslashes: an ODD run before `u0000` is a genuine NUL escape,
+    // an EVEN run is an escaped backslash then the literal text "u0000".
+    fn nul_json(backslashes: usize) -> String {
+        format!(r#"{{"k":"{}u0000"}}"#, "\\".repeat(backslashes))
+    }
+
+    #[test]
+    fn nul_escape_detected_only_for_odd_backslash_runs() {
+        // 1 backslash: `\u0000` — a genuine NUL escape.
+        assert!(json_text_has_nul_escape(&nul_json(1)));
+        // 3 backslashes: escaped backslash + genuine NUL escape.
+        assert!(json_text_has_nul_escape(&nul_json(3)));
+        // 2 backslashes: escaped backslash then literal "u0000" (e.g. minified JS) — safe.
+        assert!(!json_text_has_nul_escape(&nul_json(2)));
+        // 0 backslashes: the bare token "u0000" — safe.
+        assert!(!json_text_has_nul_escape(&nul_json(0)));
+    }
+
+    #[test]
+    fn nul_escape_ignores_clean_values() {
+        assert!(!json_text_has_nul_escape(
+            r#"{"files":{"/index.tsx":"hello"}}"#
+        ));
+        assert!(!json_text_has_nul_escape(""));
+        // A later genuine NUL is still caught even after an earlier even (safe) run.
+        assert!(json_text_has_nul_escape(&format!(
+            r#"{{"a":"x{b}{b}u0000y","b":"z{b}u0000"}}"#,
+            b = "\\"
+        )));
+    }
 }
 
 /// Resolve a source string to PgDatabase credentials with user-scoped permission checks.
@@ -1890,8 +2015,8 @@ pub(crate) async fn resolve_pg_source_checked(
 }
 
 /// A temporary file for pg_dump output that is automatically deleted when dropped.
-struct DumpFile {
-    path: std::path::PathBuf,
+pub(crate) struct DumpFile {
+    pub(crate) path: std::path::PathBuf,
 }
 
 impl DumpFile {
@@ -1938,7 +2063,11 @@ impl Drop for DumpFile {
 
 /// Run pg_dump against a PgDatabase, writing output to a temp file on disk.
 /// Returns a DumpFile handle; the file is deleted when the handle is dropped.
-async fn pg_dump_database(pg_db: &PgDatabase, schema_only: bool) -> Result<DumpFile> {
+pub(crate) async fn pg_dump_database(
+    pg_db: &PgDatabase,
+    schema_only: bool,
+    exclude_tables: &[&str],
+) -> Result<DumpFile> {
     let dump_file = DumpFile::new()?;
 
     let host = &pg_db.host;
@@ -1951,6 +2080,9 @@ async fn pg_dump_database(pg_db: &PgDatabase, schema_only: bool) -> Result<DumpF
     if schema_only {
         cmd.arg("--schema-only");
     }
+    for table in exclude_tables {
+        cmd.arg(format!("--exclude-table={table}"));
+    }
     cmd.arg("--host")
         .arg(host)
         .arg("--port")
@@ -2174,7 +2306,7 @@ async fn import_pg_database(
     }
     windmill_common::validate_dbname(&target_pg.dbname)?;
 
-    let dump_file = pg_dump_database(&source_pg, schema_only).await?;
+    let dump_file = pg_dump_database(&source_pg, schema_only, &[]).await?;
     pg_import_dump(&target_pg, &dump_file).await?;
 
     Ok(format!(
@@ -2196,7 +2328,7 @@ async fn export_pg_schema(
     Json(req): Json<ExportPgSchemaRequest>,
 ) -> Result<String> {
     let pg = resolve_pg_source_checked(&db, &user_db, &authed, &w_id, &req.source).await?;
-    let dump_file = pg_dump_database(&pg, true).await?;
+    let dump_file = pg_dump_database(&pg, true, &[]).await?;
     tokio::fs::read_to_string(&dump_file.path)
         .await
         .map_err(|e| Error::internal_err(format!("Failed to read dump file: {}", e)))
@@ -2241,6 +2373,17 @@ async fn edit_ducklake_config(
     require_admin(is_admin, &username)?;
     let is_superadmin = require_super_admin(&db, &email).await.is_ok();
 
+    // Lake names end up interpolated in `ATTACH 'ducklake://<name>'`,
+    // generated maintenance SQL and the reserved maintenance schedule path
+    // (CHECK-constrained to [\w-]+ segments).
+    for name in new_config.settings.ducklakes.keys() {
+        if !windmill_common::workspaces::is_valid_ducklake_name(name) {
+            return Err(Error::BadRequest(format!(
+                "Invalid ducklake name '{name}': only letters, digits, '_' and '-' are allowed"
+            )));
+        }
+    }
+
     let mut tx = db.begin().await?;
 
     let args_for_audit = format!("{:?}", new_config.settings);
@@ -2255,21 +2398,22 @@ async fn edit_ducklake_config(
     )
     .await?;
 
+    let old_ducklakes = sqlx::query_scalar!(
+        r#"
+            SELECT ws.ducklake->'ducklakes' AS ducklake_name
+            FROM workspace_settings ws
+            WHERE ws.workspace_id = $1
+        "#,
+        &w_id
+    )
+    .fetch_one(&mut *tx)
+    .await?
+    .unwrap_or(serde_json::Value::Null);
+    let old_ducklakes: HashMap<String, Ducklake> =
+        serde_json::from_value(old_ducklakes).unwrap_or_default();
+
     // Check that non-superadmins are not abusing Instance databases
     if !is_superadmin {
-        let old_ducklakes = sqlx::query_scalar!(
-            r#"
-                SELECT ws.ducklake->'ducklakes' AS ducklake_name
-                FROM workspace_settings ws
-                WHERE ws.workspace_id = $1
-            "#,
-            &w_id
-        )
-        .fetch_one(&db)
-        .await?
-        .unwrap_or(serde_json::Value::Null);
-        let old_ducklakes: HashMap<String, Ducklake> =
-            serde_json::from_value(old_ducklakes).unwrap_or_default();
         for (name, dl) in new_config.settings.ducklakes.iter() {
             if dl.catalog.resource_type == DucklakeCatalogResourceType::Instance {
                 let old_dl = old_ducklakes.get(name);
@@ -2287,7 +2431,7 @@ async fn edit_ducklake_config(
         }
     }
 
-    let config: serde_json::Value = serde_json::to_value(new_config.settings)
+    let config: serde_json::Value = serde_json::to_value(&new_config.settings)
         .map_err(|err| Error::internal_err(err.to_string()))?;
 
     sqlx::query!(
@@ -2298,6 +2442,19 @@ async fn edit_ducklake_config(
     .execute(&mut *tx)
     .await?;
 
+    // Same tx as the settings update: a failed schedule sync/push must fail
+    // the whole save — nothing reconciles a half-applied state later.
+    let tx = windmill_queue::ducklake_maintenance::sync_ducklake_maintenance_schedules(
+        &db,
+        tx,
+        &w_id,
+        &new_config.settings.ducklakes,
+        &old_ducklakes,
+        &username,
+        &email,
+    )
+    .await?;
+
     tx.commit().await?;
 
     Ok(format!("Edit ducklake config for workspace {}", &w_id))
@@ -2308,13 +2465,57 @@ async fn edit_datatable_config(
     Extension(db): Extension<DB>,
     Path(w_id): Path<String>,
     ApiAuthed { is_admin, username, email, .. }: ApiAuthed,
-    Json(new_config): Json<EditDataTableConfig>,
+    Json(mut new_config): Json<EditDataTableConfig>,
 ) -> Result<String> {
     require_admin(is_admin, &username)?;
     let is_superadmin = require_super_admin(&db, &email).await.is_ok();
 
     let mut tx = db.begin().await?;
 
+    let old_datatables: HashMap<String, DataTable> = serde_json::from_value(
+        sqlx::query_scalar!(
+            "SELECT ws.datatable->'datatables' FROM workspace_settings ws WHERE ws.workspace_id = $1",
+            &w_id
+        )
+        .fetch_one(&db)
+        .await?
+        .unwrap_or(serde_json::Value::Null),
+    )
+    .unwrap_or_default();
+
+    // Validate every persisted data table name and rename segment before
+    // touching anything, since they become directory segments in migration
+    // storage/export keys (`migrations/datatable/<name>/...`).
+    for name in new_config.settings.datatables.keys() {
+        crate::datatable_migrations::validate_datatable_path_segment(name)?;
+    }
+    for r in &new_config.renames {
+        crate::datatable_migrations::validate_datatable_path_segment(&r.from)?;
+        crate::datatable_migrations::validate_datatable_path_segment(&r.to)?;
+    }
+
+    // Map new name -> old name so a renamed data table inherits the previous
+    // flag instead of being treated as brand new.
+    let rename_src: HashMap<&str, &str> = new_config
+        .renames
+        .iter()
+        .map(|r| (r.to.as_str(), r.from.as_str()))
+        .collect();
+
+    // Migrations opt-in is owned by the enable/disable endpoints, not this config
+    // form: preserve each existing data table's flag, and default brand-new data
+    // tables to enabled.
+    for (name, dt) in new_config.settings.datatables.iter_mut() {
+        let lookup = rename_src
+            .get(name.as_str())
+            .copied()
+            .unwrap_or(name.as_str());
+        dt.migrations_enabled = match old_datatables.get(lookup) {
+            Some(old) => old.migrations_enabled,
+            None => Some(true),
+        };
+    }
+
     let args_for_audit = format!("{:?}", new_config.settings);
     audit_log(
         &mut *tx,
@@ -2329,19 +2530,6 @@ async fn edit_datatable_config(
 
     // Check that non-superadmins are not abusing Instance databases
     if !is_superadmin {
-        let old_datatables = sqlx::query_scalar!(
-            r#"
-                SELECT ws.datatable->'datatables' AS datatable_name
-                FROM workspace_settings ws
-                WHERE ws.workspace_id = $1
-            "#,
-            &w_id
-        )
-        .fetch_one(&db)
-        .await?
-        .unwrap_or(serde_json::Value::Null);
-        let old_datatables: HashMap<String, DataTable> =
-            serde_json::from_value(old_datatables).unwrap_or_default();
         for (name, dt) in new_config.settings.datatables.iter() {
             if dt.database.resource_type == DataTableCatalogResourceType::Instance {
                 let old_dt = old_datatables.get(name);
@@ -2370,6 +2558,15 @@ async fn edit_datatable_config(
     .execute(&mut *tx)
     .await?;
 
+    crate::datatable_migrations::cascade_datatable_migration_renames_and_deletes(
+        &db,
+        &mut tx,
+        &w_id,
+        &new_config.renames,
+        &new_config.deleted_datatables,
+    )
+    .await?;
+
     tx.commit().await?;
 
     Ok(format!("Edit datatable config for workspace {}", &w_id))
@@ -3609,6 +3806,7 @@ async fn user_workspaces(
     let workspaces = sqlx::query_as!(
         UserWorkspace,
         "SELECT workspace.id, workspace.name, usr.username, workspace_settings.color, workspace.parent_workspace_id,
+                workspace.is_dev_workspace, workspace.dev_workspace_label,
                 CASE WHEN usr.operator THEN workspace_settings.operator_settings ELSE NULL END as operator_settings,
                 usr.disabled
          FROM workspace
@@ -3623,6 +3821,47 @@ async fn user_workspaces(
     Ok(Json(WorkspaceList { email, workspaces }))
 }
 
+#[derive(Deserialize)]
+struct SessionWorkspaceStatusRequest {
+    workspace_ids: Vec<String>,
+}
+
+/// Reconciliation support for client-side AI sessions, which the backend cannot touch
+/// directly. The client posts the workspace ids its sessions reference and uses the
+/// per-id status to keep sessions in sync with workspace lifecycle: `deleted` (no row /
+/// no access → unresolvable) drops the sessions, `archived` (soft-deleted, still a
+/// member) archives them, `active` restores ones previously archived-by-workspace.
+/// Archived and hard-deleted workspaces are absent from `user_workspaces`, so this is the
+/// only way the client learns about a change made while it was away or on another device.
+async fn session_workspace_status(
+    Extension(db): Extension<DB>,
+    ApiAuthed { email, .. }: ApiAuthed,
+    Json(req): Json<SessionWorkspaceStatusRequest>,
+) -> JsonResult<HashMap<String, String>> {
+    if req.workspace_ids.len() > 1000 {
+        return Err(Error::BadRequest(
+            "Too many workspace ids (max 1000)".to_string(),
+        ));
+    }
+    let rows = sqlx::query!(
+        "SELECT req.id AS \"id!\",
+                (CASE
+                    WHEN usr.email IS NULL THEN 'deleted'
+                    WHEN workspace.deleted THEN 'archived'
+                    ELSE 'active'
+                END) AS \"status!\"
+         FROM unnest($1::text[]) AS req(id)
+         LEFT JOIN workspace ON workspace.id = req.id
+         LEFT JOIN usr ON usr.workspace_id = workspace.id AND usr.email = $2",
+        &req.workspace_ids[..],
+        email,
+    )
+    .fetch_all(&db)
+    .await?;
+    let statuses = rows.into_iter().map(|r| (r.id, r.status)).collect();
+    Ok(Json(statuses))
+}
+
 pub async fn check_w_id_conflict<'c>(tx: &mut Transaction<'c, Postgres>, w_id: &str) -> Result<()> {
     if w_id == "global" {
         return Err(windmill_common::error::Error::BadRequest(
@@ -3703,6 +3942,24 @@ lazy_static::lazy_static! {
         }
     };
 
+    // Cloud only: how many forks a premium workspace may have per paid (developer) seat.
+    pub static ref MAX_FORKS_PER_SEAT: i64 = std::env::var("MAX_FORKS_PER_SEAT")
+        .ok()
+        .and_then(|v| v.parse::<i64>().ok())
+        .filter(|v| *v >= 0)
+        .unwrap_or(5);
+
+    // How deep a fork chain may nest (root = depth 0, a direct fork = depth 1). A general guardrail
+    // for all builds, independent of the cloud per-seat cap: deep fork chains are a footgun and no
+    // real use case needs them. Clamped to [1, 20] so it's always a real limit and can never exceed
+    // the fork-walk recursion backstop (20) that billing/count resolution uses (a chain deeper than
+    // the backstop would truncate and mis-resolve its root).
+    pub static ref MAX_FORK_DEPTH: i64 = std::env::var("MAX_FORK_DEPTH")
+        .ok()
+        .and_then(|v| v.parse::<i64>().ok())
+        .map(|v| v.clamp(1, 20))
+        .unwrap_or(5);
+
 }
 
 async fn create_workspace_require_superadmin() -> String {
@@ -3724,6 +3981,21 @@ async fn _check_nb_of_workspaces(db: &DB) -> Result<()> {
     return Ok(());
 }
 
+async fn _check_nb_of_archived_workspaces(db: &DB) -> Result<()> {
+    let nb_archived = sqlx::query_scalar!(
+        "SELECT COUNT(*) FROM workspace WHERE id != 'admins' AND deleted = true",
+    )
+    .fetch_one(db)
+    .await?;
+    if nb_archived.unwrap_or(0) >= 1 {
+        return Err(Error::BadRequest(
+            "You have reached the maximum number of archived workspaces (1) without an enterprise license. Permanently delete or unarchive the existing archived workspace first"
+                .to_string(),
+        ));
+    }
+    return Ok(());
+}
+
 async fn create_workspace(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
@@ -3751,6 +4023,8 @@ async fn create_workspace(
         }
     }
 
+    validate_workspace_name(&nw.name)?;
+
     let mut tx: Transaction<'_, Postgres> = db.begin().await?;
 
     check_w_id_conflict(&mut tx, &nw.id).await?;
@@ -3876,6 +4150,7 @@ async fn create_workspace(
 // their drafts would dangle as orphans.
 async fn clone_workspace_data(
     tx: &mut Transaction<'_, Postgres>,
+    db: &DB,
     source_workspace_id: &str,
     target_workspace_id: &str,
     authed_email: &str,
@@ -3883,6 +4158,15 @@ async fn clone_workspace_data(
     // Clone workspace settings (merge with existing basic settings)
     update_workspace_settings(tx, source_workspace_id, target_workspace_id).await?;
 
+    // Clone data table migration definitions (the settings above carry the data
+    // table config; this carries their migration history).
+    crate::datatable_migrations::clone_datatable_migrations(
+        tx,
+        source_workspace_id,
+        target_workspace_id,
+    )
+    .await?;
+
     // Clone workspace environment variables
     clone_workspace_env(tx, source_workspace_id, target_workspace_id).await?;
 
@@ -3898,14 +4182,16 @@ async fn clone_workspace_data(
     // Clone resources
     clone_resources(tx, source_workspace_id, target_workspace_id).await?;
 
-    // Clone variables with re-encryption
-    clone_variables(tx, source_workspace_id, target_workspace_id).await?;
+    // Clone variables (including external secret backend replication)
+    clone_variables(tx, db, source_workspace_id, target_workspace_id).await?;
 
     // Clone scripts with new hashes
     clone_scripts(tx, source_workspace_id, target_workspace_id).await?;
 
     // Clone CI test references
     clone_ci_test_references(tx, source_workspace_id, target_workspace_id).await?;
+    clone_macro_registry(tx, source_workspace_id, target_workspace_id).await?;
+    clone_asset_usages_and_triggers(tx, source_workspace_id, target_workspace_id).await?;
 
     // Clone flows with new versions
     clone_flows(tx, source_workspace_id, target_workspace_id).await?;
@@ -3947,6 +4233,9 @@ async fn clone_triggers_and_schedules(
     source_workspace_id: &str,
     target_workspace_id: &str,
 ) -> Result<()> {
+    // Managed ducklake-maintenance schedules are excluded: the fork starts
+    // with no ducklake config, so cloned rows could never resolve a lake and
+    // the schedule API refuses mutations under the reserved prefix.
     sqlx::query!(
         r#"INSERT INTO schedule (
             workspace_id, path, edited_by, edited_at, schedule, enabled, script_path,
@@ -3963,9 +4252,10 @@ async fn clone_triggers_and_schedules(
             on_recovery_times, on_recovery_extra_args, ws_error_handler_muted, retry,
             summary, no_flow_overlap, tag, paused_until, on_success, on_success_extra_args,
             cron_version, description, dynamic_skip, permissioned_as, labels
-        FROM schedule WHERE workspace_id = $2"#,
+        FROM schedule WHERE workspace_id = $2 AND NOT starts_with(path, $3)"#,
         target_workspace_id,
         source_workspace_id,
+        windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX,
     )
     .execute(&mut **tx)
     .await?;
@@ -4336,6 +4626,28 @@ async fn clone_groups(
     Ok(())
 }
 
+/// Copy the source workspace's members (the `usr` rows, carrying each member's role) into the
+/// target so a fork/dev can be a shared environment. Idempotent — skips members the target already
+/// has. Group memberships are not handled here: the sole caller is the create-fork path, where
+/// `clone_groups` already copies the source's full group structure (including `all` membership).
+async fn copy_workspace_members(
+    tx: &mut Transaction<'_, Postgres>,
+    source_workspace_id: &str,
+    target_workspace_id: &str,
+) -> Result<()> {
+    sqlx::query!(
+        "INSERT INTO usr (workspace_id, username, email, is_admin, created_at, operator, disabled, role, is_service_account, added_via)
+         SELECT $1, username, email, is_admin, created_at, operator, disabled, role, is_service_account, added_via
+         FROM usr WHERE workspace_id = $2
+         ON CONFLICT DO NOTHING",
+        target_workspace_id,
+        source_workspace_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
 async fn clone_resource_types(
     tx: &mut Transaction<'_, Postgres>,
     source_workspace_id: &str,
@@ -4376,6 +4688,7 @@ async fn clone_resources(
 
 async fn clone_variables(
     tx: &mut Transaction<'_, Postgres>,
+    db: &DB,
     source_workspace_id: &str,
     target_workspace_id: &str,
 ) -> Result<()> {
@@ -4390,6 +4703,56 @@ async fn clone_variables(
     .execute(&mut **tx)
     .await?;
 
+    // With an external secret backend (Vault / Azure KV / AWS SM), the copied
+    // `value` is only a `$vault:`/`$azure_kv:`/`$aws_sm:` marker: the actual
+    // secret lives in the external store under a key derived from
+    // (workspace_id, path). The row copy above therefore leaves the fork's
+    // markers pointing at keys that don't exist — replicate each secret under
+    // the fork's workspace id.
+    if is_vault_backend_configured(db).await? {
+        let secret_variables = sqlx::query!(
+            "SELECT path, value FROM variable
+             WHERE workspace_id = $1 AND is_secret = true AND value != ''",
+            target_workspace_id,
+        )
+        .fetch_all(&mut **tx)
+        .await?;
+
+        let backend = get_secret_backend(db).await?;
+        for variable in secret_variables
+            .into_iter()
+            .filter(|v| is_external_stored_value(&v.value))
+        {
+            match backend
+                .get_secret(source_workspace_id, &variable.path)
+                .await
+            {
+                Ok(plain_value) => {
+                    backend
+                        .set_secret(target_workspace_id, &variable.path, &plain_value)
+                        .await
+                        .map_err(|e| {
+                            Error::internal_err(format!(
+                                "Failed to replicate secret variable {} to the external secret backend for the forked workspace: {e}",
+                                variable.path
+                            ))
+                        })?;
+                }
+                // The source secret is unreadable (e.g. deleted out-of-band from
+                // the external store), so the variable is equally broken in the
+                // source workspace — don't let it block forking.
+                Err(e) => {
+                    tracing::warn!(
+                        workspace_id = %source_workspace_id,
+                        path = %variable.path,
+                        error = %e,
+                        "Could not read secret variable from the external secret backend while forking; the forked variable will not resolve"
+                    );
+                }
+            }
+        }
+    }
+
     Ok(())
 }
 
@@ -4447,6 +4810,68 @@ async fn clone_ci_test_references(
     Ok(())
 }
 
+// DuckDB macro registry + call-site edges are deploy-derived like
+// ci_test_reference: without cloning them, a forked consumer script fails at
+// run time until every macro library is manually redeployed in the fork.
+async fn clone_macro_registry(
+    tx: &mut Transaction<'_, Postgres>,
+    source_workspace_id: &str,
+    target_workspace_id: &str,
+) -> Result<()> {
+    sqlx::query!(
+        "INSERT INTO macro_definition (workspace_id, name, provider_path, params, body, is_table_macro)
+         SELECT $2, name, provider_path, params, body, is_table_macro
+         FROM macro_definition WHERE workspace_id = $1",
+        source_workspace_id,
+        target_workspace_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    sqlx::query!(
+        "INSERT INTO macro_usage (workspace_id, consumer_path, macro_name)
+         SELECT $2, consumer_path, macro_name
+         FROM macro_usage WHERE workspace_id = $1",
+        source_workspace_id,
+        target_workspace_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
+// Asset usage rows and `// on` subscriber triggers are deploy-derived like
+// ci_test_reference / the macro registry: without cloning them the fork's
+// pipeline graph has no asset nodes or lineage edges, and — worse — the asset
+// dispatch cascade never fires in the fork (it reads `script_trigger`), so
+// materializing an upstream node can't trigger its consumers until every
+// script is manually redeployed. `job`-kind usage rows (runtime-detected,
+// ephemeral) are skipped like the graph does.
+async fn clone_asset_usages_and_triggers(
+    tx: &mut Transaction<'_, Postgres>,
+    source_workspace_id: &str,
+    target_workspace_id: &str,
+) -> Result<()> {
+    sqlx::query!(
+        "INSERT INTO asset (workspace_id, path, kind, usage_access_type, usage_path, usage_kind, columns)
+         SELECT $2, path, kind, usage_access_type, usage_path, usage_kind, columns
+         FROM asset WHERE workspace_id = $1 AND usage_kind IN ('script', 'flow')",
+        source_workspace_id,
+        target_workspace_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    sqlx::query!(
+        "INSERT INTO script_trigger (workspace_id, runnable_kind, runnable_path, trigger_kind, trigger_ref, join_all, debounce_s, retry_count, retry_delay_s)
+         SELECT $2, runnable_kind, runnable_path, trigger_kind, trigger_ref, join_all, debounce_s, retry_count, retry_delay_s
+         FROM script_trigger WHERE workspace_id = $1",
+        source_workspace_id,
+        target_workspace_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
 async fn clone_flows(
     tx: &mut Transaction<'_, Postgres>,
     source_workspace_id: &str,
@@ -4551,9 +4976,18 @@ async fn clone_apps(
     .await?;
 
     let mut app_id_mapping: HashMap<i64, i64> = HashMap::new();
+    // Only a raw app's current (last) version has a bundle worth carrying into the fork: bundles exist
+    // only for raw apps, and older versions aren't viewable/runnable (the bundle secret is only ever
+    // minted for `versions.last()`). Copying a bundle for every version of every app is what makes
+    // forking a workspace with many app versions hang — a serial S3 round-trip per version, held inside
+    // the fork transaction. Collect each app's current version here; intersect with raw versions below.
+    let mut latest_version_ids: HashSet<i64> = HashSet::new();
 
     // Clone apps with new IDs
     for app in apps {
+        if let Some(&current_version) = app.versions.last() {
+            latest_version_ids.insert(current_version);
+        }
         let new_app_id = sqlx::query_scalar!(
             "INSERT INTO app (workspace_id, path, summary, policy, versions, extra_perms, custom_path)
              VALUES ($1, $2, $3, $4, $5, $6, $7)
@@ -4573,6 +5007,7 @@ async fn clone_apps(
     }
 
     let mut version_id_mapping: HashMap<i64, i64> = HashMap::new();
+    let mut raw_version_ids: HashSet<i64> = HashSet::new();
 
     {
         // Clone app versions
@@ -4588,6 +5023,9 @@ async fn clone_apps(
 
         for version in app_versions {
             if let Some(&new_app_id) = app_id_mapping.get(&version.app_id) {
+                if version.raw_app {
+                    raw_version_ids.insert(version.id);
+                }
                 let new_version_id = sqlx::query_scalar!(
                     "INSERT INTO app_version (app_id, value, created_by, created_at, raw_app)
                  VALUES ($1, $2, $3, $4, $5) RETURNING id",
@@ -4605,9 +5043,16 @@ async fn clone_apps(
         }
     }
 
-    // Clone app bundles for raw apps
-    if !version_id_mapping.is_empty() {
-        let old_ids: Vec<i64> = version_id_mapping.keys().copied().collect();
+    // The bundles worth cloning: each raw app's current version (latest ∩ raw). Everything else either
+    // has no bundle (low-code apps) or an unreachable one (older versions), so we don't touch S3 for it.
+    let bundle_version_ids: HashSet<i64> = latest_version_ids
+        .intersection(&raw_version_ids)
+        .copied()
+        .collect();
+
+    // Clone app bundles — only the current version of each raw app (see bundle_version_ids).
+    if !bundle_version_ids.is_empty() {
+        let old_ids: Vec<i64> = bundle_version_ids.iter().copied().collect();
         let bundles = sqlx::query!(
             "SELECT app_version_id, file_type, data FROM app_bundles
              WHERE app_version_id = ANY($1) AND w_id = $2",
@@ -4643,40 +5088,31 @@ async fn clone_apps(
             let object_store = windmill_object_store::get_object_store().await;
             if let Some(os) = object_store {
                 for (&old_version_id, &new_version_id) in &version_id_mapping {
+                    if !bundle_version_ids.contains(&old_version_id) {
+                        continue;
+                    }
                     for file_type in &["js", "css"] {
                         if cloned_from_db.contains(&(old_version_id, file_type.to_string())) {
                             continue;
                         }
-                        let src_path = format!(
-                            "/app_bundles/{}/{}.{}",
-                            source_workspace_id, old_version_id, file_type
-                        );
-                        let get_result = os
-                            .get(&windmill_object_store::object_store_reexports::Path::from(
-                                src_path,
-                            ))
-                            .await;
-                        match get_result {
-                            Ok(result) => {
-                                let data = result.bytes().await.map_err(
-                                    windmill_object_store::object_store_error_to_error,
-                                )?;
-                                let dst_path = format!(
-                                    "/app_bundles/{}/{}.{}",
-                                    target_workspace_id, new_version_id, file_type
-                                );
-                                os.put(
-                                    &windmill_object_store::object_store_reexports::Path::from(
-                                        dst_path.clone(),
-                                    ),
-                                    data.into(),
-                                )
-                                .await
-                                .map_err(
-                                    windmill_object_store::object_store_error_to_error,
-                                )?;
+                        // Prefer a server-side copy (no bytes through the backend). A missing source —
+                        // e.g. a raw app with a js bundle but no css — surfaces as NotFound and is
+                        // skipped. Not every object-store provider supports server-side copy, so fall
+                        // back to download+upload on any other error.
+                        let src_path =
+                            windmill_object_store::object_store_reexports::Path::from(format!(
+                                "/app_bundles/{}/{}.{}",
+                                source_workspace_id, old_version_id, file_type
+                            ));
+                        let dst_path =
+                            windmill_object_store::object_store_reexports::Path::from(format!(
+                                "/app_bundles/{}/{}.{}",
+                                target_workspace_id, new_version_id, file_type
+                            ));
+                        match os.copy(&src_path, &dst_path).await {
+                            Ok(()) => {
                                 tracing::info!(
-                                    "Cloned app bundle from S3: {}.{} -> {}.{}",
+                                    "Cloned app bundle in object store: {}.{} -> {}.{}",
                                     old_version_id,
                                     file_type,
                                     new_version_id,
@@ -4684,12 +5120,39 @@ async fn clone_apps(
                                 );
                             }
                             Err(windmill_object_store::object_store_reexports::ObjectStoreError::NotFound { .. }) => {
-                                // No bundle in S3 for this version/type, skip
+                                // No bundle in the object store for this version/type, skip
                             }
-                            Err(e) => {
-                                return Err(
-                                    windmill_object_store::object_store_error_to_error(e),
+                            Err(copy_err) => {
+                                // Provider may not support server-side copy — fall back to get+put.
+                                tracing::warn!(
+                                    "object store copy failed ({copy_err:#}), falling back to get+put for app bundle {}.{}",
+                                    old_version_id, file_type
                                 );
+                                match os.get(&src_path).await {
+                                    Ok(result) => {
+                                        let data = result.bytes().await.map_err(
+                                            windmill_object_store::object_store_error_to_error,
+                                        )?;
+                                        os.put(&dst_path, data.into()).await.map_err(
+                                            windmill_object_store::object_store_error_to_error,
+                                        )?;
+                                        tracing::info!(
+                                            "Cloned app bundle via get+put fallback: {}.{} -> {}.{}",
+                                            old_version_id,
+                                            file_type,
+                                            new_version_id,
+                                            file_type
+                                        );
+                                    }
+                                    Err(windmill_object_store::object_store_reexports::ObjectStoreError::NotFound { .. }) => {
+                                        // No bundle for this version/type, skip
+                                    }
+                                    Err(e) => {
+                                        return Err(
+                                            windmill_object_store::object_store_error_to_error(e),
+                                        );
+                                    }
+                                }
                             }
                         }
                     }
@@ -4863,10 +5326,12 @@ async fn create_workspace_fork_branch(
     Path(w_id): Path<String>,
     Json(nw): Json<CreateWorkspaceFork>,
 ) -> JsonResult<Vec<Uuid>> {
+    // Pre-check the fork guards before creating any git branch, so we don't leave orphaned branches
+    // behind when the follow-up create_workspace_fork would be rejected anyway.
+    enforce_fork_depth(&db, &w_id, 0).await?;
+    #[cfg(feature = "cloud")]
     if *CLOUD_HOSTED {
-        return Err(Error::BadRequest(format!(
-            "Forking workspaces is not available on app.windmill.dev"
-        )));
+        enforce_cloud_fork_cap(&db, &w_id).await?;
     }
 
     if *DISABLE_WORKSPACE_FORK {
@@ -4885,7 +5350,29 @@ async fn create_workspace_fork_branch(
         return Err(Error::PermissionDenied(msg));
     }
 
-    validate_fork_workspace_id(&nw.id)?;
+    // Two-phase create for git-synced workspaces: this endpoint only creates the git branch(es) and
+    // validates up front; it does NOT create the workspace row. The caller follows up with
+    // `create_workspace_fork`, which inserts the row and applies the dev designation + prod lock +
+    // member copy. So the dev/lock/copy_members fields here are validated only — they are acted on by
+    // that second call. Validating early lets a bad request fail before any branch is created.
+    if nw.is_dev_workspace {
+        validate_dev_workspace_id(&nw.id)?;
+        // Reject a bad cosmetic label before any git branch is created (acted on in create_workspace_fork).
+        normalize_dev_workspace_label(nw.dev_workspace_label.clone())?;
+        ensure_dev_parent_is_root(&db, &w_id).await?;
+        // Reject before creating any git branch if the parent already has a dev workspace,
+        // otherwise the deferred branch-creation job leaves a dangling branch on the synced repos.
+        ensure_no_existing_dev_workspace(&db, &w_id).await?;
+        // Creating the canonical dev consumes the parent's one-dev-per-prod slot (and locking the
+        // parent mutates its protection rules), so require admin of the parent regardless of the lock
+        // flags — mirrors attach/detach, which are prod-admin gated. Without this a non-admin forker
+        // could claim the dev slot. Enforced in this first phase too so the request fails before any
+        // git branch is created rather than leaving dangling branches.
+        require_admin(authed.is_admin, &authed.username)?;
+    } else {
+        validate_fork_workspace_id(&nw.id)?;
+    }
+    validate_workspace_name(&nw.name)?;
 
     // Fail before creating any git branch so a name conflict doesn't leave a
     // dangling branch on the synced repos.
@@ -5018,24 +5505,226 @@ async fn apply_forked_datatable(
     Ok(())
 }
 
+/// Cloud: require the fork/dev's root (billing) workspace be premium; returns the resolved root id.
+#[cfg(feature = "cloud")]
+async fn require_cloud_fork_premium(db: &DB, parent_workspace_id: &str) -> Result<String> {
+    let root =
+        windmill_common::workspaces::get_billing_workspace_id(db, parent_workspace_id).await?;
+    if !windmill_common::workspaces::get_team_plan_status(db, &root)
+        .await?
+        .premium
+    {
+        return Err(Error::BadRequest(
+            "Creating a fork or dev workspace on the cloud requires a paid team plan. Upgrade the workspace first.".to_string(),
+        ));
+    }
+    Ok(root)
+}
+
+/// Cloud: reject if adding `incoming` fork/dev workspaces would push `root`'s family over its per-seat
+/// allotment. `incoming` is the number of workspaces the operation adds to the family — 1 for a plain
+/// create, but `1 + candidate_subtree` for an attach whose candidate already has child forks.
+#[cfg(feature = "cloud")]
+async fn enforce_cloud_fork_count(db: &DB, root: &str, incoming: i64) -> Result<()> {
+    let seats = windmill_common::workspaces::count_paid_seats(db, root).await?;
+    let per_seat = *MAX_FORKS_PER_SEAT;
+    // Any premium workspace has at least one paid seat, so floor the seat count at 1.
+    let allowed = seats.max(1) * per_seat;
+
+    let existing = windmill_common::workspaces::count_workspace_forks(db, root).await?;
+    let projected = existing + incoming;
+    if projected > allowed {
+        return Err(Error::BadRequest(format!(
+            "Fork limit reached: this would bring the workspace family to {projected} fork(s), over the cap of {allowed} ({seats} paid seat(s) × {per_seat} per seat). Delete a fork or add seats."
+        )));
+    }
+
+    Ok(())
+}
+
+/// Cloud-only guard for creating a fork/dev workspace. Forks piggyback on the parent's plan (a fork
+/// inherits the root's premium and meters its usage into the root's bill), so forking is limited to
+/// premium workspaces and capped at `MAX_FORKS_PER_SEAT` per paid (developer) seat of the root.
+#[cfg(feature = "cloud")]
+async fn enforce_cloud_fork_cap(db: &DB, parent_workspace_id: &str) -> Result<()> {
+    let root = require_cloud_fork_premium(db, parent_workspace_id).await?;
+    enforce_cloud_fork_count(db, &root, 1).await
+}
+
+/// General guardrail (all builds): reject creating a fork/dev under `parent` when it would nest deeper
+/// than `MAX_FORK_DEPTH`. `added_subtree_height` is the height of the subtree grafted below the new
+/// node — 0 for a plain fork, or the candidate's own subtree height for an attach.
+async fn enforce_fork_depth(
+    db: &DB,
+    parent_workspace_id: &str,
+    added_subtree_height: i64,
+) -> Result<()> {
+    let parent_depth =
+        windmill_common::workspaces::fork_chain_depth(db, parent_workspace_id).await?;
+    // The new node sits one level below the parent; its deepest descendant adds the grafted height.
+    let resulting_depth = parent_depth + 1 + added_subtree_height;
+    if resulting_depth > *MAX_FORK_DEPTH {
+        return Err(Error::BadRequest(format!(
+            "Fork depth limit reached: forks can be nested at most {} level(s) deep, but this would create a fork at depth {}. Fork from a workspace closer to the root instead.",
+            *MAX_FORK_DEPTH, resulting_depth
+        )));
+    }
+    Ok(())
+}
+
+/// True if `raw` (the text form of a `json` value) contains a genuine `\u0000`
+/// NUL escape: a `u0000` preceded by an ODD run of backslashes. Mirrors the
+/// parity rule in `strip_null_chars` (windmill-api `apps.rs`) — an even run
+/// (`\\u0000`) is an escaped backslash then the literal text "u0000" (common in
+/// minified JS) and is jsonb-safe. A genuine NUL is exactly what the
+/// `json`→`jsonb` re-encode in `clone_apps` / `clone_flows` rejects with
+/// SQLSTATE 22P05.
+fn json_text_has_nul_escape(raw: &str) -> bool {
+    let bytes = raw.as_bytes();
+    let mut search_from = 0;
+    while let Some(rel) = raw[search_from..].find("u0000") {
+        let at = search_from + rel;
+        let mut backslashes = 0;
+        let mut j = at;
+        while j > 0 && bytes[j - 1] == b'\\' {
+            backslashes += 1;
+            j -= 1;
+        }
+        if backslashes % 2 == 1 {
+            return true;
+        }
+        search_from = at + 5;
+    }
+    false
+}
+
+/// SQLSTATE 22P05 (`untranslatable_character`) is what Postgres raises for
+/// "unsupported Unicode escape sequence" when a `json` value carrying a genuine
+/// `\u0000` is re-encoded to `jsonb` — the exact failure the per-row `json`
+/// clones (`clone_apps`, `clone_flows`) hit when a source item holds a NUL.
+fn is_unsupported_unicode_escape(e: &Error) -> bool {
+    matches!(
+        e,
+        Error::SqlErr { error, .. }
+            if error.as_database_error().and_then(|d| d.code()).as_deref() == Some("22P05")
+    )
+}
+
+/// After a fork clone aborts on a NUL escape, locate the offending source items
+/// so the error can name them. Reads the committed source workspace on the pool
+/// (the clone transaction is already poisoned and unusable). Only the `json`
+/// columns re-encoded to `jsonb` during the clone can trigger the failure:
+/// `app_version.value` (clone_apps) and `flow_version.schema` (clone_flows).
+/// Best-effort — returns an empty list rather than erroring if a probe query
+/// fails, so the caller can still surface a generic message.
+async fn find_nul_escape_locations(db: &DB, workspace_id: &str) -> Vec<String> {
+    let mut apps: std::collections::BTreeSet<String> = Default::default();
+    if let Ok(rows) = sqlx::query(
+        "SELECT a.path AS path, av.value::text AS value
+         FROM app_version av JOIN app a ON a.id = av.app_id
+         WHERE a.workspace_id = $1 AND av.value IS NOT NULL",
+    )
+    .bind(workspace_id)
+    .fetch_all(db)
+    .await
+    {
+        for row in rows {
+            let value: String = row.get("value");
+            if json_text_has_nul_escape(&value) {
+                apps.insert(row.get::<String, _>("path"));
+            }
+        }
+    }
+
+    let mut flows: std::collections::BTreeSet<String> = Default::default();
+    if let Ok(rows) = sqlx::query(
+        "SELECT fv.path AS path, fv.schema::text AS schema
+         FROM flow_version fv
+         WHERE fv.workspace_id = $1 AND fv.schema IS NOT NULL",
+    )
+    .bind(workspace_id)
+    .fetch_all(db)
+    .await
+    {
+        for row in rows {
+            let schema: String = row.get("schema");
+            if json_text_has_nul_escape(&schema) {
+                flows.insert(row.get::<String, _>("path"));
+            }
+        }
+    }
+
+    apps.into_iter()
+        .map(|p| format!("app: {p}"))
+        .chain(flows.into_iter().map(|p| format!("flow: {p}")))
+        .collect()
+}
+
 async fn create_workspace_fork(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
     Path(parent_workspace_id): Path<String>,
     Json(nw): Json<CreateWorkspaceFork>,
 ) -> Result<String> {
+    enforce_fork_depth(&db, &parent_workspace_id, 0).await?;
+    #[cfg(feature = "cloud")]
     if *CLOUD_HOSTED {
-        return Err(Error::BadRequest(format!(
-            "Forking workspaces is not available on app.windmill.dev"
-        )));
+        enforce_cloud_fork_cap(&db, &parent_workspace_id).await?;
     }
 
-    validate_fork_workspace_id(&nw.id)?;
+    if nw.is_dev_workspace {
+        validate_dev_workspace_id(&nw.id)?;
+    } else {
+        validate_fork_workspace_id(&nw.id)?;
+    }
+    validate_workspace_name(&nw.name)?;
+    // Cosmetic label only applies to dev workspaces; a non-dev fork stores NULL.
+    let dev_workspace_label = if nw.is_dev_workspace {
+        normalize_dev_workspace_label(nw.dev_workspace_label.clone())?
+    } else {
+        None
+    };
     // Check the id conflict before the CE workspace-count limit so that
     // re-using a taken (possibly archived) fork id reports the actual
     // conflict instead of a misleading "maximum number of workspaces" error.
     check_fork_w_id_conflict(&db, &nw.id).await?;
     purge_stale_fork_diff_state(&db, &nw.id).await?;
+    // A previously deleted fork with this id may have left ducklake namespaces behind if its
+    // physical cleanup failed after the delete committed (registry rows are the durable
+    // ledger — no FK, they outlive the workspace). Retry that cleanup now, and refuse to
+    // proceed while any metadata schema still can't be dropped: creating the fork anyway
+    // would silently reattach the deterministic namespace and its stale tables. Data-file
+    // leftovers alone don't block — once the schema is gone they are inert (a deleted fork's
+    // `$res:` storage resource is gone forever, so they may never resolve again), and the
+    // surviving registry row has the next successful same-prefix cleanup sweep them.
+    // `$res:` fallback = the workspace being forked: the deleted fork's resource clones came
+    // from a parent, so the new parent is the natural donor for the retry's credentials.
+    let leftover_issues = crate::workspaces_extra::drop_forked_ducklake_namespaces_impl(
+        &db,
+        &nw.id,
+        Some(&parent_workspace_id),
+    )
+    .await?;
+    let blocking: Vec<&str> = leftover_issues
+        .iter()
+        .filter(|i| i.blocking)
+        .map(|i| i.msg.as_str())
+        .collect();
+    if !blocking.is_empty() {
+        return Err(Error::BadRequest(format!(
+            "a previously deleted workspace with id '{}' left ducklake namespaces that could \
+             not be cleaned up: {}; retry once the catalog is reachable again",
+            nw.id,
+            blocking.join("; ")
+        )));
+    }
+    for i in &leftover_issues {
+        tracing::warn!(
+            "creating fork {}: leftover ducklake cleanup: {}",
+            nw.id,
+            i.msg
+        );
+    }
 
     #[cfg(not(feature = "enterprise"))]
     _check_nb_of_workspaces(&db).await?;
@@ -5056,18 +5745,30 @@ async fn create_workspace_fork(
         return Err(Error::PermissionDenied(msg));
     }
 
+    if nw.is_dev_workspace {
+        ensure_dev_parent_is_root(&db, &parent_workspace_id).await?;
+        // Creating the canonical dev consumes the parent's one-dev-per-prod slot (and locking prod
+        // mutates its protection rules), so require admin of the parent regardless of the lock flags —
+        // mirrors attach/detach, which are prod-admin gated. Without this a non-admin forker could
+        // claim the dev slot (and, without member copy, prod admins might not even see it to detach).
+        require_admin(authed.is_admin, &authed.username)?;
+        ensure_no_existing_dev_workspace(&db, &parent_workspace_id).await?;
+    }
+
     let mut tx: Transaction<'_, Postgres> = db.begin().await?;
 
     let forked_id = nw.id;
 
     sqlx::query!(
         "INSERT INTO workspace
-            (id, name, owner, parent_workspace_id)
-            VALUES ($1, $2, $3, $4)",
+            (id, name, owner, parent_workspace_id, is_dev_workspace, dev_workspace_label)
+            VALUES ($1, $2, $3, $4, $5, $6)",
         forked_id,
         nw.name,
         authed.email,
         parent_workspace_id,
+        nw.is_dev_workspace,
+        dev_workspace_label,
     )
     .execute(&mut *tx)
     .await?;
@@ -5082,11 +5783,24 @@ async fn create_workspace_fork(
     .execute(&mut *tx)
     .await?;
 
+    // Optionally bring the parent's members into the fork (a shared dev env). Dev-only: it's part of the
+    // dev-workspace feature (and the frontend only offers it there), so the backend enforces it rather
+    // than trusting the client — copying the parent's whole team into an ordinary throwaway fork isn't
+    // intended. Dev creation is already admin-gated, so this is transitively admin-only too. Done before
+    // the explicit creator insert below so the creator (a parent member) is copied with full metadata
+    // (operator/role/is_service_account/added_via), not the bare row the insert alone would leave.
+    if nw.copy_members && nw.is_dev_workspace {
+        copy_workspace_members(&mut tx, &parent_workspace_id, &forked_id).await?;
+    }
+
+    // Ensure the creator is a member of the fork even without copy_members (or if they aren't a parent
+    // member). No-op when copy_members already brought their full row.
     sqlx::query!(
         "INSERT INTO usr
            (workspace_id, email, username, is_admin)
            SELECT $1, email, username, is_admin FROM usr
          WHERE workspace_id = $3 AND email = $2
+         ON CONFLICT DO NOTHING
         ",
         forked_id,
         authed.email,
@@ -5096,7 +5810,33 @@ async fn create_workspace_fork(
     .await?;
 
     // Clone all data from the parent workspace using Rust implementation
-    clone_workspace_data(&mut tx, &parent_workspace_id, &forked_id, &authed.email).await?;
+    if let Err(e) =
+        clone_workspace_data(&mut tx, &db, &parent_workspace_id, &forked_id, &authed.email).await
+    {
+        // A genuine `\u0000` in a source `json` value (`app_version.value` /
+        // `flow_version.schema`) aborts the clone when it is re-encoded to jsonb:
+        // Postgres raises 22P05 with only "unsupported Unicode escape sequence"
+        // and no hint at which item. Pinpoint the offenders so the user can fix
+        // them — re-saving strips the NUL, and the usual source is a binary file
+        // (e.g. `.DS_Store`) accidentally bundled into a raw app.
+        if is_unsupported_unicode_escape(&e) {
+            drop(tx); // release the poisoned connection before probing on the pool
+            let locations = find_nul_escape_locations(&db, &parent_workspace_id).await;
+            let where_clause = if locations.is_empty() {
+                "The offending item could not be pinpointed — check recently edited apps and flows."
+                    .to_string()
+            } else {
+                format!("Offending item(s):\n  - {}", locations.join("\n  - "))
+            };
+            return Err(Error::BadRequest(format!(
+                "Cannot fork workspace '{parent_workspace_id}': an item contains a NUL character \
+                 (\\u0000) that Postgres cannot store as jsonb. Re-save the item to remove it \
+                 (the editor strips NUL automatically), or delete the offending binary/character \
+                 from its source (often a file like .DS_Store bundled into a raw app). {where_clause}"
+            )));
+        }
+        return Err(e);
+    }
 
     // Clone triggers and schedules unconditionally, always with mode='disabled' /
     // enabled=false. Disabled rows have no side effects (no listener
@@ -5109,6 +5849,54 @@ async fn create_workspace_fork(
         apply_forked_datatable(&db, &mut tx, &parent_workspace_id, &forked_id, fdt).await?;
     }
 
+    // The settings clone copies the source's ducklake config verbatim — including a parent
+    // fork's own `fork_behavior` stamps. Sharing is a per-fork-creation choice, never
+    // inherited: reset any cloned stamps first, then apply this fork's requested list.
+    sqlx::query!(
+        r#"UPDATE workspace_settings
+           SET ducklake = jsonb_set(ducklake, '{ducklakes}', (
+               SELECT COALESCE(jsonb_object_agg(key, value - 'fork_behavior'), '{}'::jsonb)
+               FROM jsonb_each(ducklake->'ducklakes')
+           ))
+           WHERE workspace_id = $1 AND jsonb_typeof(ducklake->'ducklakes') = 'object'"#,
+        &forked_id,
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    // Stamp the per-lake ducklake fork choice into the fork's own settings. Only the `shared`
+    // opt-out needs stamping — absent `fork_behavior` already means isolated (the default),
+    // so unlisted lakes and API callers that omit the field stay safe.
+    for lake in &nw.shared_ducklakes {
+        let stamped = sqlx::query_scalar!(
+            r#"UPDATE workspace_settings
+               SET ducklake = jsonb_set(ducklake, ARRAY['ducklakes', $2, 'fork_behavior'], '"shared"')
+               WHERE workspace_id = $1 AND ducklake->'ducklakes' ? $2
+               RETURNING 1 AS "one!""#,
+            &forked_id,
+            lake,
+        )
+        .fetch_optional(&mut *tx)
+        .await?;
+        if stamped.is_none() {
+            return Err(Error::BadRequest(format!(
+                "cannot mark ducklake `{lake}` as shared: no such lake in the workspace settings"
+            )));
+        }
+    }
+
+    // Lock the parent ("prod") so edits are funneled through this dev workspace.
+    let locked_prod = nw.is_dev_workspace && (nw.lock_prod_deploy || nw.lock_prod_forking);
+    if locked_prod {
+        lock_prod_workspace(
+            &mut tx,
+            &parent_workspace_id,
+            nw.lock_prod_deploy,
+            nw.lock_prod_forking,
+        )
+        .await?;
+    }
+
     audit_log(
         &mut *tx,
         &authed,
@@ -5121,9 +5909,327 @@ async fn create_workspace_fork(
     .await?;
     tx.commit().await?;
 
+    // A pre-creation lookup could have cached an EMPTY ancestor chain for this id, which
+    // would bypass ducklake fork isolation for the TTL.
+    windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(&forked_id);
+
+    if locked_prod {
+        windmill_common::workspaces::invalidate_protection_rules_cache(&parent_workspace_id);
+    }
+
     Ok(format!("Created forked workspace {}", &forked_id))
 }
 
+#[derive(Deserialize)]
+struct AttachDevWorkspace {
+    dev_workspace_id: String,
+    #[serde(default)]
+    lock_prod_deploy: bool,
+    #[serde(default)]
+    lock_prod_forking: bool,
+    /// Cosmetic display label for the attached dev workspace: 'dev' | 'staging'. None defaults to 'dev'.
+    #[serde(default)]
+    dev_workspace_label: Option<String>,
+}
+
+#[derive(Deserialize)]
+struct DetachDevWorkspace {
+    dev_workspace_id: String,
+}
+
+/// Pair an existing standalone workspace to this workspace ("prod") as its dev workspace, without
+/// cloning any data (both already exist). Sets the dev's parent + deploy_to to prod and, optionally,
+/// locks prod against direct deployment.
+async fn attach_dev_workspace(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(prod_w_id): Path<String>,
+    Json(req): Json<AttachDevWorkspace>,
+) -> Result<String> {
+    require_admin(authed.is_admin, &authed.username)?;
+
+    // Attaching grafts the candidate (and its own fork subtree) under prod, so enforce the general
+    // depth limit on the deepest resulting node.
+    let candidate_height =
+        windmill_common::workspaces::fork_subtree_height(&db, &req.dev_workspace_id).await?;
+    enforce_fork_depth(&db, &prod_w_id, candidate_height).await?;
+
+    // Attaching reparents a workspace under prod (one dev per prod, admin-gated) and it then draws
+    // prod's plan, so hold it to the same premium requirement as creating a fork. Only enforce the
+    // per-seat count when the attach actually adds a new workspace to the family: re-designating a
+    // workspace already under this root as its dev doesn't increase the descendant count.
+    #[cfg(feature = "cloud")]
+    if *CLOUD_HOSTED {
+        let root = require_cloud_fork_premium(&db, &prod_w_id).await?;
+        // Only count against the cap when this attach adds workspaces to the family (candidate not
+        // already under this root). The candidate may itself have child forks, so reserve slots for its
+        // whole incoming subtree (the candidate + its descendants), not just one.
+        if windmill_common::workspaces::get_billing_workspace_id(&db, &req.dev_workspace_id).await?
+            != root
+        {
+            let incoming =
+                1 + windmill_common::workspaces::count_workspace_forks(&db, &req.dev_workspace_id)
+                    .await?;
+            enforce_cloud_fork_count(&db, &root, incoming).await?;
+        }
+    }
+
+    let dev_w_id = req.dev_workspace_id;
+    if dev_w_id == prod_w_id {
+        return Err(Error::BadRequest(
+            "A workspace cannot be its own dev workspace".to_string(),
+        ));
+    }
+
+    // The id is interpolated into a `wm-fork/<branch>/<id>` branch name like any fork.
+    validate_dev_workspace_id(&dev_w_id)?;
+    let dev_workspace_label = normalize_dev_workspace_label(req.dev_workspace_label.clone())?;
+
+    let dev = sqlx::query!(
+        r#"SELECT parent_workspace_id, deleted FROM workspace WHERE id = $1"#,
+        &dev_w_id
+    )
+    .fetch_optional(&db)
+    .await?
+    .ok_or_else(|| Error::NotFound(format!("Workspace {} not found", dev_w_id)))?;
+
+    if dev.deleted {
+        return Err(Error::BadRequest(format!(
+            "Workspace {} is archived",
+            dev_w_id
+        )));
+    }
+    // A candidate that already belongs to a DIFFERENT parent can't be attached. A candidate already
+    // parented to this prod is allowed: it's the recovery path after renaming a dev workspace (the
+    // rename keeps the parent but drops the dev flag), and re-designating an existing fork of this
+    // prod as its dev.
+    if dev
+        .parent_workspace_id
+        .as_deref()
+        .is_some_and(|p| p != prod_w_id)
+    {
+        return Err(Error::BadRequest(format!(
+            "Workspace {} is already a fork or dev workspace of another workspace",
+            dev_w_id
+        )));
+    }
+    // The candidate can't itself be a prod with its own dev workspace (no nested dev chains).
+    ensure_no_existing_dev_workspace(&db, &dev_w_id).await?;
+
+    // Prod must be a root workspace, otherwise attaching could form a parent<->child cycle (e.g.
+    // attaching A as the dev of B when B is already the dev of A), which breaks hierarchy traversal.
+    let prod_has_parent = sqlx::query_scalar!(
+        r#"SELECT (parent_workspace_id IS NOT NULL) AS "has_parent!" FROM workspace WHERE id = $1"#,
+        &prod_w_id
+    )
+    .fetch_optional(&db)
+    .await?
+    .ok_or_else(|| Error::NotFound(format!("Workspace {} not found", prod_w_id)))?;
+    if prod_has_parent {
+        return Err(Error::BadRequest(format!(
+            "Workspace {} is itself a fork or dev workspace and cannot be a prod workspace",
+            prod_w_id
+        )));
+    }
+
+    // The caller must be admin of the dev workspace too (or a superadmin).
+    let is_admin_of_dev = sqlx::query_scalar!(
+        "SELECT is_admin FROM usr WHERE workspace_id = $1 AND email = $2",
+        &dev_w_id,
+        &authed.email
+    )
+    .fetch_optional(&db)
+    .await?
+    .unwrap_or(false);
+    if !is_admin_of_dev && !windmill_common::auth::is_super_admin_email(&db, &authed.email).await? {
+        return Err(Error::PermissionDenied(format!(
+            "Attaching workspace '{dev_w_id}' as a dev requires being an admin of it (or a superadmin)"
+        )));
+    }
+
+    ensure_no_existing_dev_workspace(&db, &prod_w_id).await?;
+
+    let mut tx = db.begin().await?;
+    sqlx::query!(
+        "UPDATE workspace SET parent_workspace_id = $1, is_dev_workspace = true, dev_workspace_label = $3 WHERE id = $2",
+        &prod_w_id,
+        &dev_w_id,
+        dev_workspace_label,
+    )
+    .execute(&mut *tx)
+    .await?;
+    sqlx::query!(
+        "UPDATE workspace_settings SET deploy_to = $1 WHERE workspace_id = $2",
+        &prod_w_id,
+        &dev_w_id
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    if req.lock_prod_deploy || req.lock_prod_forking {
+        lock_prod_workspace(
+            &mut tx,
+            &prod_w_id,
+            req.lock_prod_deploy,
+            req.lock_prod_forking,
+        )
+        .await?;
+    }
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "workspaces.attach_dev_workspace",
+        ActionKind::Update,
+        &prod_w_id,
+        Some(&dev_w_id),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    // The dev workspace's parent just changed (none -> prod); drop its cached fork->parent mapping
+    // so per-workspace job tags route to the prod family immediately rather than after the TTL.
+    windmill_queue::tags::invalidate_fork_parent_cache(&dev_w_id);
+    // Drop the cached ancestor chains too — the workspace existed BEFORE the attach, so a
+    // cached empty chain reads as "not a fork" and its ducklake jobs would write the shared
+    // lake until the TTL. Descendants' chains also gained the new root.
+    windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(&dev_w_id);
+    for id in windmill_common::workspaces::list_fork_descendants(&db, &dev_w_id).await? {
+        windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(&id);
+    }
+    // Same reparent invalidates the billing-workspace mapping so its usage meters to prod at once. The
+    // candidate can bring its own fork subtree, whose descendants had resolved their (now-stale) root
+    // to the candidate's old family; invalidate them too so they meter to prod without waiting out the
+    // 60s TTL. Their immediate fork->parent links don't move, so the tag-routing cache needs no change.
+    #[cfg(feature = "cloud")]
+    {
+        windmill_common::workspaces::invalidate_billing_workspace_cache(&dev_w_id);
+        for id in windmill_common::workspaces::list_fork_descendants(&db, &dev_w_id).await? {
+            windmill_common::workspaces::invalidate_billing_workspace_cache(&id);
+        }
+    }
+
+    if req.lock_prod_deploy || req.lock_prod_forking {
+        windmill_common::workspaces::invalidate_protection_rules_cache(&prod_w_id);
+    }
+
+    Ok(format!(
+        "Attached {} as dev workspace of {}",
+        dev_w_id, prod_w_id
+    ))
+}
+
+#[derive(Deserialize)]
+struct SetDevWorkspaceLabel {
+    #[serde(default)]
+    dev_workspace_label: Option<String>,
+}
+
+/// Change the cosmetic display label ('dev' | 'staging') of the current workspace, which must itself
+/// be a dev workspace. Purely visual (badge text + wording); requires admin of the dev workspace.
+async fn set_dev_workspace_label(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+    Json(req): Json<SetDevWorkspaceLabel>,
+) -> Result<String> {
+    require_admin(authed.is_admin, &authed.username)?;
+    let label = normalize_dev_workspace_label(req.dev_workspace_label)?;
+
+    let mut tx = db.begin().await?;
+    let updated = sqlx::query_scalar!(
+        "UPDATE workspace SET dev_workspace_label = $1 WHERE id = $2 AND is_dev_workspace RETURNING id",
+        label,
+        &w_id,
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    if updated.is_none() {
+        return Err(Error::BadRequest(format!(
+            "Workspace '{w_id}' is not a dev workspace"
+        )));
+    }
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "workspaces.set_dev_workspace_label",
+        ActionKind::Update,
+        &w_id,
+        label.as_deref(),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(format!("Updated dev workspace label for {w_id}"))
+}
+
+/// Reverse [`attach_dev_workspace`] / clear the dev designation: unset the dev flag and remove the
+/// prod lock. The workspace keeps its `parent_workspace_id` (it remains an ordinary fork).
+async fn detach_dev_workspace(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(prod_w_id): Path<String>,
+    Json(req): Json<DetachDevWorkspace>,
+) -> Result<String> {
+    require_admin(authed.is_admin, &authed.username)?;
+
+    let dev_w_id = req.dev_workspace_id;
+    let is_dev_of_prod = sqlx::query_scalar!(
+        r#"SELECT EXISTS(
+            SELECT 1 FROM workspace
+            WHERE id = $1 AND parent_workspace_id = $2 AND is_dev_workspace
+        )"#,
+        &dev_w_id,
+        &prod_w_id
+    )
+    .fetch_one(&db)
+    .await?
+    .unwrap_or(false);
+    if !is_dev_of_prod {
+        return Err(Error::BadRequest(format!(
+            "{} is not the dev workspace of {}",
+            dev_w_id, prod_w_id
+        )));
+    }
+
+    let mut tx = db.begin().await?;
+    sqlx::query!(
+        "UPDATE workspace SET is_dev_workspace = false WHERE id = $1",
+        &dev_w_id
+    )
+    .execute(&mut *tx)
+    .await?;
+    // Only one dev per prod, so detaching it means prod no longer has a dev: drop the lock rule.
+    sqlx::query!(
+        "DELETE FROM workspace_protection_rule WHERE workspace_id = $1 AND name = $2",
+        &prod_w_id,
+        DEV_WORKSPACE_LOCK_RULE_NAME
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "workspaces.detach_dev_workspace",
+        ActionKind::Update,
+        &prod_w_id,
+        Some(&dev_w_id),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    windmill_common::workspaces::invalidate_protection_rules_cache(&prod_w_id);
+
+    Ok(format!(
+        "Detached dev workspace {} from {}",
+        dev_w_id, prod_w_id
+    ))
+}
+
 async fn edit_workspace(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
@@ -5163,6 +6269,10 @@ pub(crate) async fn archive_workspace_impl(
     db: &DB,
     w_id: &str,
     username: &str,
+    // When archiving a dev workspace, its parent prod. The pairing teardown (clear is_dev + drop the
+    // prod's lock) is folded into the same transaction as `deleted = true` so it's atomic with the
+    // archive — a later failure can't strand a half-archived dev that's still flagged/locked.
+    dev_lock_parent: Option<&str>,
 ) -> Result<(usize, usize, usize)> {
     // Step 1: Disable all schedules and clear their queued jobs
     let mut tx = db.begin().await?;
@@ -5204,6 +6314,30 @@ pub(crate) async fn archive_workspace_impl(
         .execute(&mut *tx)
         .await?;
 
+    if let Some(prod) = dev_lock_parent {
+        // Dissolve the dev pairing atomically with the archive: clear the canonical-dev flag (so the
+        // archived row no longer occupies the parent's one-dev slot), and drop the prod's lock unless a
+        // replacement dev already holds it (NOT EXISTS sees the just-cleared flag within this tx, so the
+        // row being archived doesn't count).
+        sqlx::query!(
+            "UPDATE workspace SET is_dev_workspace = false WHERE id = $1",
+            w_id
+        )
+        .execute(&mut *tx)
+        .await?;
+        sqlx::query!(
+            "DELETE FROM workspace_protection_rule WHERE workspace_id = $1 AND name = $2
+             AND NOT EXISTS (
+                 SELECT 1 FROM workspace
+                 WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false
+             )",
+            prod,
+            DEV_WORKSPACE_LOCK_RULE_NAME
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
     tx.commit().await?;
 
     // Step 2: Get all remaining queued jobs for this workspace (non-schedule jobs)
@@ -5247,8 +6381,44 @@ async fn archive_workspace(
 ) -> Result<String> {
     require_admin(authed.is_admin, &authed.username)?;
 
+    // CE caps the number of archived (soft-deleted) workspaces so archiving can't be used to
+    // stockpile hidden workspaces. Enforced here so a second archive is refused up front.
+    #[cfg(not(feature = "enterprise"))]
+    _check_nb_of_archived_workspaces(&db).await?;
+
+    // If this is an attached dev workspace, archiving it leaves the prod with no active dev (the
+    // unique index and user_workspaces both ignore deleted=true), so clear the prod's
+    // dev_workspace_lock too. Gate it on prod-admin since it removes prod's protection rule (mirrors
+    // detach/delete) — a dev-admin who isn't a prod-admin must not be able to unlock prod this way.
+    let dev_lock_parent: Option<String> = sqlx::query_scalar!(
+        "SELECT parent_workspace_id FROM workspace WHERE id = $1 AND is_dev_workspace",
+        &w_id
+    )
+    .fetch_optional(&db)
+    .await?
+    .flatten();
+    if let Some(ref prod) = dev_lock_parent {
+        let is_prod_admin = sqlx::query_scalar!(
+            "SELECT is_admin FROM usr WHERE workspace_id = $1 AND email = $2",
+            prod,
+            &authed.email
+        )
+        .fetch_optional(&db)
+        .await?
+        .unwrap_or(false);
+        if !is_prod_admin
+            && !windmill_common::auth::is_super_admin_email(&db, &authed.email).await?
+        {
+            return Err(Error::PermissionDenied(format!(
+                "Archiving dev workspace '{w_id}' requires being an admin of its parent prod workspace '{prod}' (or a superadmin)"
+            )));
+        }
+    }
+
+    // The dev pairing teardown (clear is_dev + drop the prod lock) runs inside archive_workspace_impl's
+    // transaction, atomically with `deleted = true`.
     let (schedules_count, canceled_count, deleted_tokens_count) =
-        archive_workspace_impl(&db, &w_id, &authed.username).await?;
+        archive_workspace_impl(&db, &w_id, &authed.username, dev_lock_parent.as_deref()).await?;
 
     // Audit log
     let mut tx = db.begin().await?;
@@ -5283,6 +6453,10 @@ async fn archive_workspace(
     .await?;
     tx.commit().await?;
 
+    if let Some(prod) = dev_lock_parent {
+        windmill_common::workspaces::invalidate_protection_rules_cache(&prod);
+    }
+
     Ok(format!(
         "Archived workspace {}, disabled {} schedules, canceled {} jobs and deleted {} tokens",
         &w_id, schedules_count, canceled_count, deleted_tokens_count
@@ -5324,6 +6498,13 @@ async fn unarchive_workspace(
     authed: ApiAuthed,
 ) -> Result<String> {
     require_admin(authed.is_admin, &authed.username)?;
+
+    // Unarchiving re-activates a soft-deleted workspace, so it must respect the
+    // same CE workspace-count cap as creating one. The archived workspace is
+    // deleted = true and thus excluded from the count until it is restored.
+    #[cfg(not(feature = "enterprise"))]
+    _check_nb_of_workspaces(&db).await?;
+
     let mut tx = db.begin().await?;
     sqlx::query!("UPDATE workspace SET deleted = false WHERE id = $1", &w_id)
         .execute(&mut *tx)
@@ -5920,6 +7101,17 @@ async fn change_workspace_color(
 }
 
 async fn get_usage(Extension(db): Extension<DB>, Path(w_id): Path<String>) -> Result<String> {
+    // On cloud, a fork's executions meter against its billing root, so report the root's usage here too;
+    // otherwise the free-execs indicator would show the fork's own (often 0) count while enforcement
+    // applies the root's shared quota. Gated on `*CLOUD_HOSTED` (not just the `cloud` feature, which is
+    // compiled into all EE builds): self-hosted doesn't meter usage this way. Off-fork it resolves to
+    // `w_id` itself anyway.
+    #[cfg(feature = "cloud")]
+    let w_id = if *CLOUD_HOSTED {
+        windmill_common::workspaces::get_billing_workspace_id(&db, &w_id).await?
+    } else {
+        w_id
+    };
     let usage = sqlx::query_scalar!(
         "
     SELECT usage.usage FROM usage
@@ -6124,6 +7316,119 @@ async fn list_protection_rules(
     ))
 }
 
+/// Insert or replace a protection ruleset within an existing transaction. Unlike the
+/// `create_protection_rule` handler (which rejects an existing name), this upserts, so it is safe to
+/// call programmatically when designating a dev/prod pair. Callers MUST invalidate the
+/// protection-rules cache (`invalidate_protection_rules_cache`) after the transaction commits.
+async fn upsert_protection_rule(
+    tx: &mut Transaction<'_, Postgres>,
+    w_id: &str,
+    name: &str,
+    rules: ProtectionRules,
+    bypass_groups: &[String],
+    bypass_users: &[String],
+) -> Result<()> {
+    sqlx::query!(
+        r#"
+            INSERT INTO workspace_protection_rule (workspace_id, name, rules, bypass_groups, bypass_users)
+            VALUES ($1, $2, $3, $4, $5)
+            ON CONFLICT (workspace_id, name)
+            DO UPDATE SET rules = EXCLUDED.rules,
+                          bypass_groups = EXCLUDED.bypass_groups,
+                          bypass_users = EXCLUDED.bypass_users
+        "#,
+        w_id,
+        name,
+        rules.bits(),
+        bypass_groups,
+        bypass_users,
+    )
+    .execute(&mut **tx)
+    .await?;
+    Ok(())
+}
+
+/// Lock a prod workspace by applying the reserved dev-workspace lock rule with the selected
+/// restrictions (block direct deployment and/or ad-hoc forking). Non-admins are then funneled
+/// through the one dev workspace; admins bypass the rules (their existing escape hatch).
+async fn lock_prod_workspace(
+    tx: &mut Transaction<'_, Postgres>,
+    prod_w_id: &str,
+    block_deploy: bool,
+    block_forking: bool,
+) -> Result<()> {
+    let mut rules = Vec::new();
+    if block_deploy {
+        rules.push(ProtectionRuleKind::DisableDirectDeployment);
+    }
+    if block_forking {
+        rules.push(ProtectionRuleKind::DisableWorkspaceForking);
+    }
+    if rules.is_empty() {
+        return Ok(());
+    }
+    upsert_protection_rule(
+        tx,
+        prod_w_id,
+        DEV_WORKSPACE_LOCK_RULE_NAME,
+        ProtectionRules::from(&rules),
+        &[],
+        &[],
+    )
+    .await
+}
+
+/// Error out if `parent_w_id` already has an active (non-archived) dev workspace. Mirrors the
+/// partial unique index `workspace_canonical_dev_idx` with a friendly message.
+async fn ensure_no_existing_dev_workspace(db: &DB, parent_w_id: &str) -> Result<()> {
+    let existing = sqlx::query_scalar!(
+        "SELECT id FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace AND deleted = false",
+        parent_w_id
+    )
+    .fetch_optional(db)
+    .await?;
+    if let Some(existing) = existing {
+        return Err(Error::BadRequest(format!(
+            "Workspace '{}' already has a dev workspace ('{}'). Detach it before creating another.",
+            parent_w_id, existing
+        )));
+    }
+    Ok(())
+}
+
+/// A dev workspace pairs with a root prod workspace; nesting dev workspaces (a dev of a dev) isn't
+/// supported and would muddle the prod<->dev relationship.
+async fn ensure_dev_parent_is_root(db: &DB, parent_w_id: &str) -> Result<()> {
+    let parent_is_fork = sqlx::query_scalar!(
+        r#"SELECT (parent_workspace_id IS NOT NULL) AS "is_fork!" FROM workspace WHERE id = $1"#,
+        parent_w_id
+    )
+    .fetch_optional(db)
+    .await?
+    .unwrap_or(false);
+    if parent_is_fork {
+        return Err(Error::BadRequest(format!(
+            "Cannot create a dev workspace of '{}' because it is itself a fork or dev workspace.",
+            parent_w_id
+        )));
+    }
+    Ok(())
+}
+
+/// `dev_workspace_lock` is owned by the dev-workspace feature (attach/detach/archive/delete create and
+/// remove it by name). Reserve it from the public protection-rule API so a user-managed rule can't
+/// collide: otherwise the feature's name-based cleanup would clobber the user's rule, or a manual edit
+/// could weaken the feature's lock.
+fn reject_reserved_rule_name(name: &str) -> Result<()> {
+    if name == DEV_WORKSPACE_LOCK_RULE_NAME {
+        return Err(Error::BadRequest(format!(
+            "'{}' is a reserved protection-rule name managed by the dev workspace feature",
+            DEV_WORKSPACE_LOCK_RULE_NAME
+        )));
+    }
+    Ok(())
+}
+
 /// Create a new protection rule
 async fn create_protection_rule(
     authed: ApiAuthed,
@@ -6132,6 +7437,7 @@ async fn create_protection_rule(
     Json(req): Json<CreateProtectionRuleRequest>,
 ) -> Result<String> {
     require_admin(authed.is_admin, &authed.username)?;
+    reject_reserved_rule_name(&req.name)?;
 
     let mut tx = db.begin().await?;
 
@@ -6206,6 +7512,7 @@ async fn update_protection_rule(
     Json(req): Json<UpdateProtectionRuleRequest>,
 ) -> Result<String> {
     require_admin(authed.is_admin, &authed.username)?;
+    reject_reserved_rule_name(&rule_name)?;
 
     let mut tx = db.begin().await?;
 
@@ -6280,6 +7587,7 @@ async fn delete_protection_rule(
     Path((w_id, rule_name)): Path<(String, String)>,
 ) -> Result<String> {
     require_admin(authed.is_admin, &authed.username)?;
+    reject_reserved_rule_name(&rule_name)?;
 
     let mut tx = db.begin().await?;
 
@@ -6337,6 +7645,27 @@ pub struct WorkspaceComparison {
     pub skipped_comparison: bool,
     pub diffs: Vec<WorkspaceDiffRow>,
     pub summary: CompareSummary,
+    /// Items that exist in the diff but were dropped from `diffs` because they
+    /// are not visible to the caller (excluded from the partial deploy). Split
+    /// by direction: `hidden_ahead` lives in the fork, `hidden_behind` in the
+    /// parent. `by_kind`/`total` are always populated (aggregate, no names);
+    /// `items` (kind+path) is only filled for a caller who is admin of that side
+    /// — never leak the paths of items the ACL is hiding from a regular user.
+    pub hidden_ahead: HiddenItemsSummary,
+    pub hidden_behind: HiddenItemsSummary,
+}
+
+#[derive(Serialize, Default)]
+pub struct HiddenItemsSummary {
+    pub total: usize,
+    pub by_kind: std::collections::BTreeMap<String, usize>,
+    pub items: Vec<HiddenItem>,
+}
+
+#[derive(Serialize)]
+pub struct HiddenItem {
+    pub kind: String,
+    pub path: String,
 }
 
 #[derive(Serialize, Default)]
@@ -6353,6 +7682,7 @@ pub struct CompareSummary {
     pub folders_changed: usize,
     pub schedules_changed: usize,
     pub triggers_changed: usize,
+    pub datatable_migrations_changed: usize,
     pub conflicts: usize, // Items that are both ahead and behind
 }
 
@@ -6421,13 +7751,27 @@ async fn compare_workspaces(
             skipped_comparison,
             diffs: vec![],
             summary: Default::default(),
+            hidden_ahead: Default::default(),
+            hidden_behind: Default::default(),
         }));
     }
 
+    // Honor ws_specific at read time: a workspace-specific resource/variable keeps its own value per
+    // environment, so it must never appear in the normal diff (the per-item compare suppresses it,
+    // but a cached `has_changes=true` row is trusted without re-running that compare, so filter those
+    // here too). Seeding the initial copy onto a side that lacks it is a separate explicit action
+    // (the "Create in <other>" button on the Workspace-specific list), not part of the diff. The row
+    // is left intact, so unpinning resurfaces it without a re-tally.
     let diff_items = sqlx::query_as!(
         WorkspaceDiffRow,
         "SELECT path, kind, ahead, behind, has_changes, exists_in_source, exists_in_fork FROM workspace_diff
-        WHERE source_workspace_id = $1 AND fork_workspace_id = $2",
+        WHERE source_workspace_id = $1 AND fork_workspace_id = $2
+        AND NOT EXISTS (
+            SELECT 1 FROM ws_specific ws
+            WHERE ws.path = workspace_diff.path
+              AND ws.item_kind = workspace_diff.kind
+              AND ws.workspace_id IN (workspace_diff.source_workspace_id, workspace_diff.fork_workspace_id)
+        )",
         source_workspace_id,
         fork_workspace_id,
     )
@@ -6530,6 +7874,15 @@ async fn compare_workspaces(
                 compare_two_folders(&db, &source_workspace_id, &fork_workspace_id, &item.path)
                     .await?,
             ),
+            "datatable_migration" => Some(
+                crate::datatable_migrations::compare_two_datatable_migration(
+                    &db,
+                    &source_workspace_id,
+                    &fork_workspace_id,
+                    &item.path,
+                )
+                .await?,
+            ),
             // Triggers and schedules are diffed against a hardcoded ignore list
             // (mode/enabled/server_id/last_server_ping/edited_at/by/error/extra_perms/permissioned_as/email)
             // so that fork-clones — which differ from the parent only in the runtime
@@ -6652,6 +8005,10 @@ async fn compare_workspaces(
             .iter()
             .filter(|s| s.kind.ends_with("_trigger"))
             .count(),
+        datatable_migrations_changed: visible_diffs
+            .iter()
+            .filter(|s| s.kind == "datatable_migration")
+            .count(),
         conflicts: visible_diffs
             .iter()
             .filter(|s| s.ahead > 0 && s.behind > 0)
@@ -6669,12 +8026,72 @@ async fn compare_workspaces(
             .map(|s| s.behind)
             .fold(0, |acc, s| acc + s.try_into().unwrap_or(0));
 
+    // Blast-radius guard for the "changes not visible to your user" warning
+    // (which hides the deploy button). The flag is a pure visibility guarantee —
+    // the deploy re-authorizes each item against the target workspace's
+    // create/update endpoints — so it is safe to force true for a caller who sees
+    // every item on BOTH sides, for whom any diff the filter dropped is provably a
+    // stale/phantom row, never a permission gap.
+    //
+    // It must be BOTH sides, not per-side: `filter_visible_diffs` keeps a modified
+    // or conflict row (one that exists in the source AND the fork) only when the
+    // caller can see it on both sides, so an ahead/conflict diff can be dropped for
+    // a source-side visibility gap even when the caller is a fork admin. Gating the
+    // ahead flag on fork-admin alone would then wrongly report "all ahead visible"
+    // and let the UI deploy from an incomplete comparison. So require admin of the
+    // source AND the fork (superadmin satisfies both), which guarantees full
+    // visibility of every item on every side. `fork_authed.is_admin` already folds
+    // in superadmin; `authed.is_admin` (source side) does not, so OR it in.
+    let is_super_admin = windmill_common::auth::is_super_admin_email(&db, &authed.email).await?;
+    let sees_all_items = is_super_admin || (authed.is_admin && fork_authed.is_admin);
+    let all_ahead_items_visible = all_ahead_items_visible || sees_all_items;
+    let all_behind_items_visible = all_behind_items_visible || sees_all_items;
+
+    // Items dropped by the visibility filter (in confirmed_diffs but not in the
+    // returned visible_diffs). Surface what the partial deploy excludes: aggregate
+    // counts by kind for everyone, but kind+path only to a caller who `sees_all_items`
+    // (superadmin, or admin of the source AND the fork). For them a dropped item is
+    // provably a phantom/stale row, not an ACL-hidden secret, so no path leaks —
+    // fork-admin alone is not enough (a fork-deleted ahead item lives only in the
+    // parent, whose path a non-parent-admin must not see).
+    let visible_keys: HashSet<(&str, &str)> = visible_diffs
+        .iter()
+        .map(|d| (d.kind.as_str(), d.path.as_str()))
+        .collect();
+    let mut hidden_ahead = HiddenItemsSummary::default();
+    let mut hidden_behind = HiddenItemsSummary::default();
+    for d in &confirmed_diffs {
+        if visible_keys.contains(&(d.kind.as_str(), d.path.as_str())) {
+            continue;
+        }
+        if d.ahead > 0 {
+            hidden_ahead.total += 1;
+            *hidden_ahead.by_kind.entry(d.kind.clone()).or_default() += 1;
+            if sees_all_items {
+                hidden_ahead
+                    .items
+                    .push(HiddenItem { kind: d.kind.clone(), path: d.path.clone() });
+            }
+        }
+        if d.behind > 0 {
+            hidden_behind.total += 1;
+            *hidden_behind.by_kind.entry(d.kind.clone()).or_default() += 1;
+            if sees_all_items {
+                hidden_behind
+                    .items
+                    .push(HiddenItem { kind: d.kind.clone(), path: d.path.clone() });
+            }
+        }
+    }
+
     return Ok(Json(WorkspaceComparison {
         all_ahead_items_visible,
         all_behind_items_visible,
         skipped_comparison: false,
         diffs: visible_diffs,
         summary,
+        hidden_ahead,
+        hidden_behind,
     }));
 }
 
@@ -6897,6 +8314,45 @@ async fn query_visible_items<'c>(
                 .fetch_all(&mut **tx)
                 .await?
             }
+            "datatable_migration" => {
+                // Match by (datatable, timestamp), not the full path: a migration
+                // keeps its identity across a rename, so the candidate path's
+                // `name` segment can differ from the stored one. Parse each
+                // `<datatable>/<timestamp>_<name>` candidate, probe existence by
+                // (datatable, timestamp), and return the *original* candidate path
+                // so the visibility set stays keyed by the diff's path.
+                let parsed: Vec<(String, i64, String)> = paths_vec
+                    .iter()
+                    .filter_map(|p| {
+                        let (dt, rest) = p.split_once('/')?;
+                        let ts = rest.split_once('_')?.0.parse::<i64>().ok()?;
+                        Some((dt.to_string(), ts, p.clone()))
+                    })
+                    .collect();
+                if parsed.is_empty() {
+                    vec![]
+                } else {
+                    let dts: Vec<String> = parsed.iter().map(|(d, _, _)| d.clone()).collect();
+                    let tss: Vec<i64> = parsed.iter().map(|(_, t, _)| *t).collect();
+                    let existing: HashSet<(String, i64)> = sqlx::query!(
+                        "SELECT datatable, timestamp FROM datatable_migrations \
+                         WHERE workspace_id = $1 AND datatable = ANY($2) AND timestamp = ANY($3)",
+                        workspace_id,
+                        &dts,
+                        &tss,
+                    )
+                    .fetch_all(&mut **tx)
+                    .await?
+                    .into_iter()
+                    .map(|r| (r.datatable, r.timestamp))
+                    .collect();
+                    parsed
+                        .into_iter()
+                        .filter(|(d, t, _)| existing.contains(&(d.clone(), *t)))
+                        .map(|(_, _, p)| p)
+                        .collect()
+                }
+            }
             k if TRIGGER_OR_SCHEDULE_TABLES.contains(&k) => {
                 // SAFETY: `kind` comes from a hardcoded allowlist
                 // TRIGGER_OR_SCHEDULE_TABLES, not user input.
@@ -6964,10 +8420,10 @@ async fn existing_runnables(
 }
 
 #[derive(Debug)]
-struct ItemComparison {
-    has_changes: bool,
-    exists_in_source: bool,
-    exists_in_fork: bool,
+pub(crate) struct ItemComparison {
+    pub(crate) has_changes: bool,
+    pub(crate) exists_in_source: bool,
+    pub(crate) exists_in_fork: bool,
 }
 
 async fn compare_two_scripts(
@@ -7155,7 +8611,6 @@ async fn compare_two_resources(
     .fetch_optional(db)
     .await?;
 
-    // If either side is ws_specific, consider unchanged
     let source_ws_specific = sqlx::query_scalar!(
         "SELECT EXISTS(SELECT 1 FROM ws_specific WHERE workspace_id = $1 AND item_kind = 'resource' AND path = $2)",
         source_workspace_id,
@@ -7174,6 +8629,9 @@ async fn compare_two_resources(
     .await?
     .unwrap_or(false);
 
+    // A workspace-specific resource keeps its own value per environment, so it never appears in the
+    // diff (in either direction). Seeding the initial copy onto a side that lacks it is a separate
+    // explicit action ("Create in <other>"), not a diff entry.
     if source_ws_specific || target_ws_specific {
         return Ok(ItemComparison {
             has_changes: false,
@@ -7230,7 +8688,8 @@ async fn compare_two_variables(
     .fetch_one(db)
     .await?;
 
-    // If either side is ws_specific, consider unchanged
+    // A workspace-specific variable keeps its own value per environment, so it never appears in the
+    // diff. Seeding the initial copy onto a side that lacks it is a separate explicit action.
     if presence.src_ws || presence.tgt_ws {
         return Ok(ItemComparison {
             has_changes: false,
@@ -7521,6 +8980,10 @@ struct CloudQuotas {
     apps: QuotaInfo,
     variables: QuotaInfo,
     resources: QuotaInfo,
+    /// Fork/dev workspaces under this workspace's billing root vs the per-seat cap. `limit` is 0 for a
+    /// non-premium root (forking is premium-only). Family-wide: resolves to the billing root, so it
+    /// reads the same whether viewed from the root or one of its forks.
+    forks: QuotaInfo,
 }
 
 async fn get_cloud_quotas(
@@ -7601,12 +9064,32 @@ async fn get_cloud_quotas(
     .await?
     .unwrap_or(0);
 
+    // Fork/dev workspaces vs the per-seat cap, resolved to the billing root. Non-premium roots can't
+    // fork, so their allowance is 0.
+    #[cfg(feature = "cloud")]
+    let forks = {
+        use windmill_common::workspaces::{
+            count_paid_seats, count_workspace_forks, get_billing_workspace_id, get_team_plan_status,
+        };
+        let root = get_billing_workspace_id(&db, &w_id).await?;
+        let used = count_workspace_forks(&db, &root).await?;
+        let limit = if get_team_plan_status(&db, &root).await?.premium {
+            count_paid_seats(&db, &root).await?.max(1) * *MAX_FORKS_PER_SEAT
+        } else {
+            0
+        };
+        QuotaInfo { used, limit, prunable: 0 }
+    };
+    #[cfg(not(feature = "cloud"))]
+    let forks = QuotaInfo { used: 0, limit: 0, prunable: 0 };
+
     Ok(Json(CloudQuotas {
         scripts: QuotaInfo { used: scripts_used, limit: 5000, prunable: scripts_prunable },
         flows: QuotaInfo { used: flows_used, limit: 1000, prunable: flows_prunable },
         apps: QuotaInfo { used: apps_used, limit: 1000, prunable: apps_prunable },
         variables: QuotaInfo { used: variables_used, limit: 10000, prunable: 0 },
         resources: QuotaInfo { used: resources_used, limit: 10000, prunable: 0 },
+        forks,
     }))
 }
 
@@ -7744,6 +9227,19 @@ async fn list_ws_specific(
     .fetch_all(&mut *tx)
     .await?;
     tx.commit().await?;
+    // RLS gates membership/folder access, but a scoped API token must also be held to its read
+    // scopes — mirror the resource/variable list endpoints, which filter with these predicates so a
+    // token lacking `resources:read:*` / `variables:read:*` can't enumerate pinned paths it can't read.
+    let resource_allowed = build_scope_path_predicate(&authed, "resources", "read");
+    let variable_allowed = build_scope_path_predicate(&authed, "variables", "read");
+    let items = items
+        .into_iter()
+        .filter(|it| match it.item_kind.as_str() {
+            "resource" => resource_allowed(&it.path),
+            "variable" => variable_allowed(&it.path),
+            _ => false,
+        })
+        .collect::<Vec<_>>();
     Ok(Json(items))
 }
 
@@ -7766,6 +9262,17 @@ async fn list_ws_specific_versions(
         )));
     }
 
+    // A scoped API token must hold the read scope for this path, like the resource/variable read
+    // endpoints. Without the scope, report no versions rather than leaking the path's history.
+    let domain = if q.kind == "resource" {
+        "resources"
+    } else {
+        "variables"
+    };
+    if !build_scope_path_predicate(&authed, domain, "read")(&q.path) {
+        return Ok(Json(vec![]));
+    }
+
     let versions: Vec<String> = sqlx::query_scalar!(
         r#"SELECT ws AS "ws!" FROM list_ws_specific_versions($1, $2, $3, $4)"#,
         &w_id,
@@ -7778,3 +9285,155 @@ async fn list_ws_specific_versions(
 
     Ok(Json(versions))
 }
+
+#[derive(Deserialize)]
+struct SetWsSpecificBody {
+    item_kind: String,
+    path: String,
+    value: bool,
+}
+
+/// Mark (or unmark) a single resource/variable as workspace-specific. Pinning
+/// excludes it from the deploy diff so each environment keeps its own value
+/// (see `compare_two_resources`/`compare_two_variables`). Set per-workspace, so
+/// the compare page calls this once per side to flag both environments.
+async fn set_ws_specific(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+    Json(body): Json<SetWsSpecificBody>,
+) -> Result<String> {
+    if body.item_kind != "resource" && body.item_kind != "variable" {
+        return Err(Error::BadRequest(format!(
+            "Invalid kind '{}'. Must be 'resource' or 'variable'",
+            body.item_kind
+        )));
+    }
+
+    // Reject a malformed path with a 400 before the auth check, which indexes the leading segments and
+    // would otherwise panic (500) on a path like `u` with no segment. Accept all three shared path
+    // shapes Windmill uses — `u/<user>`, `f/<folder>`, `g/<group>` (e.g. seeded `g/all/...` resources).
+    let segs: Vec<&str> = body.path.split('/').collect();
+    if segs.len() < 2 || !matches!(segs[0], "u" | "f" | "g") || segs[1].is_empty() {
+        return Err(Error::BadRequest(format!(
+            "Invalid {} path: {}",
+            body.item_kind, body.path
+        )));
+    }
+
+    // Authorize like the resource/variable editors' own ws_specific toggle:
+    // actual write access to the item + token scope + the workspace deploy rules.
+    // `require_owner_of_path` is the real write gate (the resource editor uses it);
+    // `check_scopes` only constrains scoped tokens (it is a no-op for session/cookie
+    // logins). Together: a non-admin who can edit the item may pin it, while a
+    // read-only member is rejected and a locked workspace still blocks non-deployers.
+    // `require_is_writer` matches the resource/variable editors' write semantics (owner, folder
+    // writer, or item writer via extra_perms) — not owner-only.
+    let writer_query = if body.item_kind == "resource" {
+        "SELECT extra_perms FROM resource WHERE path = $1 AND workspace_id = $2"
+    } else {
+        "SELECT extra_perms FROM variable WHERE path = $1 AND workspace_id = $2"
+    };
+    require_is_writer(
+        &authed,
+        &body.path,
+        &w_id,
+        db.clone(),
+        writer_query,
+        &body.item_kind,
+    )
+    .await?;
+    check_scopes(&authed, || {
+        format!("{}s:write:{}", body.item_kind, body.path)
+    })?;
+    if let RuleCheckResult::Blocked(msg) = check_deploy_rules(
+        &w_id,
+        &authed.username,
+        &authed.groups,
+        authed.is_admin,
+        &db,
+    )
+    .await?
+    {
+        return Err(Error::PermissionDenied(msg));
+    }
+
+    let mut tx = user_db.begin(&authed).await?;
+
+    if body.value {
+        // Existence guard keeps a dangling marker from being created for a
+        // path absent in this workspace.
+        if body.item_kind == "resource" {
+            sqlx::query!(
+                "INSERT INTO ws_specific (workspace_id, item_kind, path)
+                 SELECT $1::varchar, 'resource', $2::varchar
+                 WHERE EXISTS (SELECT 1 FROM resource WHERE workspace_id = $1::varchar AND path = $2::varchar)
+                 ON CONFLICT DO NOTHING",
+                w_id,
+                body.path,
+            )
+            .execute(&mut *tx)
+            .await?;
+            // A resource owns its `$var:` secrets, so pin those too.
+            windmill_store::resources::mark_linked_variables_ws_specific(
+                &mut tx, &authed, &w_id, &body.path,
+            )
+            .await?;
+        } else {
+            sqlx::query!(
+                "INSERT INTO ws_specific (workspace_id, item_kind, path)
+                 SELECT $1::varchar, 'variable', $2::varchar
+                 WHERE EXISTS (SELECT 1 FROM variable WHERE workspace_id = $1::varchar AND path = $2::varchar)
+                 ON CONFLICT DO NOTHING",
+                w_id,
+                body.path,
+            )
+            .execute(&mut *tx)
+            .await?;
+        }
+    } else {
+        // Unmark only this item; linked variables stay flagged (they may be
+        // referenced by other resources) — mirrors the resource-form toggle.
+        sqlx::query!(
+            "DELETE FROM ws_specific WHERE workspace_id = $1 AND item_kind = $2 AND path = $3",
+            w_id,
+            body.item_kind,
+            body.path,
+        )
+        .execute(&mut *tx)
+        .await?;
+        // While pinned, the item's cached workspace_diff verdict was never recomputed (the compare
+        // read filter excludes it), so it may now be stale in either direction. Mark it NULL so the
+        // next compare re-evaluates from scratch — and the now-shared item reappears (or is dropped)
+        // correctly instead of being stuck on its pre-pin verdict.
+        sqlx::query!(
+            "UPDATE workspace_diff SET has_changes = NULL
+             WHERE path = $2 AND kind = $3
+               AND ($1 IN (source_workspace_id, fork_workspace_id))",
+            w_id,
+            body.path,
+            body.item_kind,
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    let value_str = body.value.to_string();
+    audit_log(
+        &mut *tx,
+        &authed,
+        &format!("{}s.set_ws_specific", body.item_kind),
+        ActionKind::Update,
+        &w_id,
+        Some(&body.path),
+        Some([("value", value_str.as_str())].into()),
+    )
+    .await?;
+
+    tx.commit().await?;
+    Ok(format!(
+        "Set workspace-specific={} for {} {}",
+        body.value, body.item_kind, body.path
+    ))
+}
diff --git a/backend/windmill-api-workspaces/src/workspaces_extra.rs b/backend/windmill-api-workspaces/src/workspaces_extra.rs
index aa64514b4c..6b4ace5f0a 100644
--- a/backend/windmill-api-workspaces/src/workspaces_extra.rs
+++ b/backend/windmill-api-workspaces/src/workspaces_extra.rs
@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use windmill_api_auth::{require_super_admin, ApiAuthed};
-use windmill_common::workspaces::WM_FORK_PREFIX;
 use windmill_common::DB;
 
 use crate::workspaces::{
@@ -26,7 +25,7 @@ use windmill_common::{
     db::UserDB,
     error::{Error, Result},
     utils::require_admin,
-    workspaces::DataTable,
+    workspaces::{DataTable, DEV_WORKSPACE_LOCK_RULE_NAME, WM_FORK_PREFIX},
 };
 use windmill_queue::schedule::{get_schedule_opt, push_scheduled_job};
 
@@ -65,13 +64,43 @@ pub(crate) async fn change_workspace_id(
         old_id, rw.new_id
     );
 
-    // Create new workspace with new id and name
+    // Create new workspace with new id and name. Fork lineage AND the dev designation are preserved
+    // from the source row, not inferred from the new id's prefix: a prefix-less fork (a dev or
+    // detached-dev workspace) would otherwise be silently promoted to a root workspace, and a dev
+    // would lose its flag — leaving its prod locked with no canonical dev. Promoting out of a fork is
+    // a separate, explicit action — a rename never does it implicitly.
     info!("Creating new workspace row");
+    let old = sqlx::query!(
+        r#"SELECT (parent_workspace_id IS NOT NULL) AS "has_parent!", is_dev_workspace
+           FROM workspace WHERE id = $1"#,
+        &old_id
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    let new_is_fork = old.as_ref().map(|o| o.has_parent).unwrap_or(false);
+    let new_is_dev = new_is_fork && old.as_ref().map(|o| o.is_dev_workspace).unwrap_or(false);
+    // Neutralize the old row's dev flag BEFORE inserting the new one: the move-and-archive archives
+    // the old row only later, so without this the new dev row and the not-yet-archived old dev row
+    // would momentarily both be active under the same parent and trip the one-dev-per-parent index.
+    if new_is_dev {
+        sqlx::query!(
+            "UPDATE workspace SET is_dev_workspace = false WHERE id = $1",
+            &old_id
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
     sqlx::query!(
-        "INSERT INTO workspace SELECT $1, $2, owner, false, premium FROM workspace WHERE id = $3",
+        "INSERT INTO workspace (id, name, owner, deleted, premium, parent_workspace_id, is_dev_workspace, dev_workspace_label)
+         SELECT $1, $2, owner, false, premium,
+                CASE WHEN $4 THEN parent_workspace_id ELSE NULL END, $5,
+                CASE WHEN $5 THEN dev_workspace_label ELSE NULL END
+         FROM workspace WHERE id = $3",
         &rw.new_id,
         &rw.new_name,
-        &old_id
+        &old_id,
+        new_is_fork,
+        new_is_dev
     )
     .execute(&mut *tx)
     .await?;
@@ -248,6 +277,24 @@ pub(crate) async fn change_workspace_id(
     .execute(&mut *tx)
     .await?;
 
+    info!("Updating macro_definition table");
+    sqlx::query!(
+        "UPDATE macro_definition SET workspace_id = $1 WHERE workspace_id = $2",
+        &rw.new_id,
+        &old_id
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    info!("Updating macro_usage table");
+    sqlx::query!(
+        "UPDATE macro_usage SET workspace_id = $1 WHERE workspace_id = $2",
+        &rw.new_id,
+        &old_id
+    )
+    .execute(&mut *tx)
+    .await?;
+
     info!("Updating deployment_metadata table");
     sqlx::query!(
         "UPDATE deployment_metadata SET workspace_id = $1 WHERE workspace_id = $2",
@@ -347,6 +394,28 @@ pub(crate) async fn change_workspace_id(
     .execute(&mut *tx)
     .await?;
 
+    // Re-parent child forks: any fork whose parent_workspace_id was the old id
+    // must follow the renamed parent to the new id, otherwise it is left
+    // pointing at the soft-deleted old shell (whose data has moved here).
+    info!("Re-parenting child forks to the new workspace id");
+    let reparented_children: Vec<String> = sqlx::query_scalar!(
+        "UPDATE workspace SET parent_workspace_id = $1 WHERE parent_workspace_id = $2 RETURNING id",
+        &rw.new_id,
+        &old_id
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
+    // A dev/fork's `deploy_to` points at the prod root, so it must follow the rename too — otherwise
+    // the child re-parents to the new id but still deploys to the soft-deleted old shell.
+    sqlx::query!(
+        "UPDATE workspace_settings SET deploy_to = $1 WHERE deploy_to = $2",
+        &rw.new_id,
+        &old_id
+    )
+    .execute(&mut *tx)
+    .await?;
+
     info!("Updating workspace_protection_rule table");
     sqlx::query!(
         "UPDATE workspace_protection_rule SET workspace_id = $1 WHERE workspace_id = $2",
@@ -675,11 +744,31 @@ pub(crate) async fn change_workspace_id(
 
     tx.commit().await?;
 
+    // The children's parent_workspace_id changed (old root -> new root); invalidate their fork-parent
+    // routing cache and their billing-workspace mapping so jobs route + meter under the renamed root
+    // rather than the old (archived) one, instead of waiting for the caches' TTLs. Deeper descendants
+    // (fork-of-fork) self-heal via the 60s billing-cache TTL.
+    for child in &reparented_children {
+        windmill_queue::tags::invalidate_fork_parent_cache(child);
+        windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(child);
+        // Grandchildren's cached chains contain the old (renamed-away) ancestor id; a stale
+        // chain drops all defer ancestors in the ducklake resolver, so sweep the subtree
+        // rather than letting it wait out the TTL.
+        for id in windmill_common::workspaces::list_fork_descendants(&db, child)
+            .await
+            .unwrap_or_default()
+        {
+            windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(&id);
+        }
+        #[cfg(feature = "cloud")]
+        windmill_common::workspaces::invalidate_billing_workspace_cache(child);
+    }
+
     // Archive old workspace: disable schedules, cancel remaining jobs, set deleted=true
     // Note: schedules were already moved to new workspace, so this will find 0 schedules
     info!("Archiving old workspace");
     let (_schedules_count, canceled_count, _deleted_tokens_count) =
-        archive_workspace_impl(&db, &old_id, &authed.username).await?;
+        archive_workspace_impl(&db, &old_id, &authed.username, None).await?;
 
     info!(
         "Workspace id change completed: moved {} to {}, archived old workspace",
@@ -713,17 +802,58 @@ pub(crate) async fn delete_workspace(
         _ => Ok(w_id),
     }?;
 
-    if dwq.only_delete_forks.unwrap_or(false) && !w_id.starts_with(WM_FORK_PREFIX) {
+    let is_fork = workspace_is_fork(&db, &w_id).await?;
+    if dwq.only_delete_forks.unwrap_or(false) && !is_fork {
         return Err(Error::BadRequest(
             "Cannot delete this workspace because it is not a workspace fork.".to_string(),
         ));
     }
 
     let mut tx = db.begin().await?;
-    if !(w_id.starts_with(WM_FORK_PREFIX) && is_workspace_owner(&authed, &w_id, &mut tx).await?) {
-        require_super_admin(&db, &authed.email).await?;
+    if !(is_fork && is_workspace_owner(&authed, &w_id, &mut tx).await?)
+        && !is_super_admin_email(&db, &authed.email).await?
+    {
+        return Err(Error::PermissionDenied(
+            "Deleting this workspace requires being the fork's owner or a superadmin".to_string(),
+        ));
     }
 
+    // Don't hard-delete a workspace that still has a dev workspace paired to it: the FK is
+    // ON DELETE SET NULL, which would orphan the (prefix-less) dev into a parentless, non-fork row
+    // its owner could no longer self-delete. Require detaching/deleting the dev first. Ordinary
+    // forks have no such guard — they keep their prefix and stay owner-deletable when orphaned.
+    // Archived devs (deleted = true) are included: they keep is_dev_workspace = true, so SET NULL on
+    // their parent would violate the `is_dev ⇒ has parent` CHECK and fail the whole delete with a 500.
+    if let Some(dev_id) = sqlx::query_scalar!(
+        "SELECT id FROM workspace WHERE parent_workspace_id = $1 AND is_dev_workspace",
+        &w_id
+    )
+    .fetch_optional(&mut *tx)
+    .await?
+    {
+        return Err(Error::BadRequest(format!(
+            "Cannot delete workspace '{}' because it has a dev workspace ('{}'). Detach or delete the dev workspace first.",
+            w_id, dev_id
+        )));
+    }
+
+    // Deleting an attached dev workspace removes the parent prod's dev_workspace_lock (below), so it
+    // must be a prod-admin action, not just the dev's own owner (dev ownership can diverge from
+    // prod's) — mirrors detach_dev_workspace, which is prod-admin gated.
+    require_prod_admin_for_dev_workspace(&db, &authed, &w_id).await?;
+
+    // Snapshot the fork's ducklake namespaces + RESOLVE their connection material NOW — the
+    // registry rows and the fork's `$res:` resources both CASCADE with the workspace row —
+    // but the destructive cleanup itself runs only after the commit below: a delete that
+    // fails mid-way must never leave a live workspace with its fork data destroyed and no
+    // registry row to retry from. Read-only: nothing is dropped here.
+    let fork_ducklake_cleanups = prepare_fork_ducklake_cleanups(&db, &w_id, None)
+        .await
+        .unwrap_or_else(|e| {
+            tracing::warn!("deleting workspace {w_id}: preparing ducklake cleanup: {e:#}");
+            vec![]
+        });
+
     sqlx::query!("DELETE FROM ai_agent_memory WHERE workspace_id = $1", &w_id)
         .execute(&mut *tx)
         .await?;
@@ -742,9 +872,30 @@ pub(crate) async fn delete_workspace(
     sqlx::query!("DELETE FROM dependency_map WHERE workspace_id = $1", &w_id)
         .execute(&mut *tx)
         .await?;
+    sqlx::query!("DELETE FROM macro_usage WHERE workspace_id = $1", &w_id)
+        .execute(&mut *tx)
+        .await?;
+    sqlx::query!(
+        "DELETE FROM macro_definition WHERE workspace_id = $1",
+        &w_id
+    )
+    .execute(&mut *tx)
+    .await?;
     sqlx::query!("DELETE FROM v2_job_queue WHERE workspace_id = $1", &w_id)
         .execute(&mut *tx)
         .await?;
+    // dispatch_event / flow_conversation_message / zombie_job_counter no longer cascade from
+    // v2_job (see migration drop_v2_job_side_table_cascades); delete them before v2_job so the
+    // workspace's jobs leave no orphan side rows. One round-trip, scanning v2_job once.
+    sqlx::query!(
+        "WITH ids AS (SELECT id FROM v2_job WHERE workspace_id = $1),
+              _de AS (DELETE FROM dispatch_event WHERE workspace_id = $1),
+              _fc AS (DELETE FROM flow_conversation_message WHERE job_id IN (SELECT id FROM ids))
+         DELETE FROM zombie_job_counter WHERE job_id IN (SELECT id FROM ids)",
+        &w_id
+    )
+    .execute(&mut *tx)
+    .await?;
     sqlx::query!("DELETE FROM v2_job WHERE workspace_id = $1", &w_id)
         .execute(&mut *tx)
         .await?;
@@ -887,10 +1038,41 @@ pub(crate) async fn delete_workspace(
     .execute(&mut *tx)
     .await?;
 
+    // If this workspace is itself a dev workspace, deleting it dissolves the pairing, so also drop
+    // the parent prod's reserved dev_workspace_lock (mirrors detach_dev_workspace) — otherwise prod
+    // stays locked against direct deploy/forking with no dev workspace left to make changes in.
+    let dev_lock_parent: Option<String> = sqlx::query_scalar!(
+        "SELECT parent_workspace_id FROM workspace WHERE id = $1 AND is_dev_workspace",
+        &w_id
+    )
+    .fetch_optional(&mut *tx)
+    .await?
+    .flatten();
+
+    // Capture direct child forks before the delete: the FK is ON DELETE SET NULL, so they're about to
+    // be orphaned (their billing root changes from this workspace's root to themselves). We drop their
+    // cached mappings after commit alongside the deleted id itself.
+    let orphaned_children: Vec<String> = sqlx::query_scalar!(
+        "SELECT id FROM workspace WHERE parent_workspace_id = $1",
+        &w_id
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+
     sqlx::query!("DELETE FROM workspace WHERE id = $1", &w_id)
         .execute(&mut *tx)
         .await?;
 
+    if let Some(ref parent) = dev_lock_parent {
+        sqlx::query!(
+            "DELETE FROM workspace_protection_rule WHERE workspace_id = $1 AND name = $2",
+            parent,
+            DEV_WORKSPACE_LOCK_RULE_NAME
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
     // Record under the instance-level "admins" workspace. The per-workspace audit
     // rows are deleted along with the workspace, so this instance-level entry is the
     // only durable, superadmin-discoverable record of who deleted the workspace.
@@ -906,6 +1088,54 @@ pub(crate) async fn delete_workspace(
     .await?;
     tx.commit().await?;
 
+    // Physical ducklake-namespace cleanup, post-commit, from the pre-read snapshot: fork
+    // namespaces are deterministic from (id, lake), so an orphan would silently REATTACH to a
+    // recreated identical fork id. Runs inline so every delete path is covered (CLI,
+    // force-delete dialog, direct API — not just the sidebar flow, which still calls the
+    // endpoint first for per-lake error toasts; the rerun is an idempotent no-op). Best
+    // effort: failures are logged — the workspace row is already gone, and broken storage
+    // credentials must not have made it undeletable.
+    for e in cleanup_fork_ducklake_namespaces(&db, &w_id, fork_ducklake_cleanups).await {
+        tracing::warn!(
+            "deleted workspace {w_id}: ducklake namespace cleanup: {}",
+            e.msg
+        );
+    }
+
+    if let Some(parent) = dev_lock_parent {
+        windmill_common::workspaces::invalidate_protection_rules_cache(&parent);
+    }
+
+    // Workspace ids are reusable after permanent deletion, so drop every cached mapping keyed by the
+    // deleted id (and any just-orphaned children) — otherwise a recreated id could inherit the gone
+    // workspace's state within the caches' lifetimes. This covers fork->parent (tag routing) and
+    // fork->root (billing), plus the premium/team-plan status: TEAM_PLAN_CACHE has no TTL and is only
+    // evicted by the premium-change NOTIFY, so without this a reused id would keep the old workspace's
+    // premium indefinitely (free forks/usage). Deeper (grandchild) descendants self-heal via the 60s
+    // billing TTL.
+    for id in std::iter::once(&w_id).chain(orphaned_children.iter()) {
+        windmill_queue::tags::invalidate_fork_parent_cache(id);
+        windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(id);
+        #[cfg(feature = "cloud")]
+        {
+            windmill_common::workspaces::invalidate_billing_workspace_cache(id);
+            windmill_common::workspaces::invalidate_team_plan_cache(id);
+        }
+    }
+    // Deeper descendants' cached ancestor CHAINS still contain the deleted workspace; unlike
+    // the sibling caches (which self-heal harmlessly via TTL), a stale chain makes the
+    // ducklake resolver drop all defer ancestors (all-or-nothing on broken links) — a visible
+    // defer/chips outage for up to the TTL. Anchor at the orphaned children: the deleted row
+    // is gone, but their subtrees are intact.
+    for child in orphaned_children.iter() {
+        for id in windmill_common::workspaces::list_fork_descendants(&db, child)
+            .await
+            .unwrap_or_default()
+        {
+            windmill_common::workspaces::invalidate_fork_ancestor_chain_cache(&id);
+        }
+    }
+
     Ok(format!("Deleted workspace {}", &w_id))
 }
 
@@ -924,9 +1154,15 @@ pub async fn drop_forked_datatable_databases(
     Json(req): Json<DropForkedDatatableDatabasesRequest>,
 ) -> Result<Json<Vec<String>>> {
     // Same permission check as delete_workspace: fork owner or super admin
+    let is_fork = workspace_is_fork(&db, &w_id).await?;
     let mut tx = db.begin().await?;
-    if !(w_id.starts_with(WM_FORK_PREFIX) && is_workspace_owner(&authed, &w_id, &mut tx).await?) {
-        require_super_admin(&db, &authed.email).await?;
+    if !(is_fork && is_workspace_owner(&authed, &w_id, &mut tx).await?)
+        && !is_super_admin_email(&db, &authed.email).await?
+    {
+        return Err(Error::PermissionDenied(
+            "Dropping forked datatable databases requires being the fork's owner or a superadmin"
+                .to_string(),
+        ));
     }
     tx.commit().await?;
 
@@ -1060,6 +1296,538 @@ pub async fn drop_forked_datatable_databases(
     Ok(Json(errors))
 }
 
+/// Drop this fork workspace's ducklake namespaces: the `wm_fork_*` metadata schema in each
+/// lake's catalog database, plus (best effort) the fork's `__wm_forks/<wid>/…` data files in
+/// the workspace storage. Driven by the `fork_ducklake_namespace` registry written at first
+/// fork attach, so it works even after settings drift. Returns errors per lake that failed;
+/// the registry row is only deleted once both cleanups succeeded, so a retry resumes.
+/// Same permission as delete_workspace: fork owner or super admin. `delete_workspace` also
+/// runs this inline (the UI calls this endpoint first for error visibility; the inline run
+/// covers every other delete path — CLI, force-delete dialogs, direct API — whose row delete
+/// would otherwise CASCADE the registry away while orphaning the physical namespaces, which a
+/// recreated identical fork id would then silently reattach).
+pub async fn drop_forked_ducklake_namespaces(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+) -> Result<Json<Vec<String>>> {
+    let is_fork = workspace_is_fork(&db, &w_id).await?;
+    let mut tx = db.begin().await?;
+    if !(is_fork && is_workspace_owner(&authed, &w_id, &mut tx).await?)
+        && !is_super_admin_email(&db, &authed.email).await?
+    {
+        return Err(Error::PermissionDenied(
+            "Dropping forked ducklake namespaces requires being the fork's owner or a superadmin"
+                .to_string(),
+        ));
+    }
+    tx.commit().await?;
+    require_prod_admin_for_dev_workspace(&db, &authed, &w_id).await?;
+    Ok(Json(
+        drop_forked_ducklake_namespaces_impl(&db, &w_id, None)
+            .await?
+            .into_iter()
+            .map(|i| i.msg)
+            .collect(),
+    ))
+}
+
+/// The cleanup itself, shared by the endpoint and the post-commit `delete_workspace` run. No
+/// authorization of its own — callers gate.
+pub(crate) async fn drop_forked_ducklake_namespaces_impl(
+    db: &DB,
+    w_id: &str,
+    res_fallback_w_id: Option<&str>,
+) -> Result<Vec<ForkDucklakeCleanupIssue>> {
+    let prepared = prepare_fork_ducklake_cleanups(db, w_id, res_fallback_w_id).await?;
+    Ok(cleanup_fork_ducklake_namespaces(db, w_id, prepared).await)
+}
+
+struct ForkDucklakeNamespaceRow {
+    ducklake_name: String,
+    metadata_schema: String,
+    catalog: String,
+    storage: String,
+    storage_ref: String,
+    schema_dropped: bool,
+    data_path: String,
+}
+
+/// A namespace row plus its RESOLVED connection material. `delete_workspace` prepares these
+/// BEFORE its transaction commits — the registry rows AND the fork's `$res:` resources both
+/// disappear with the workspace row — and runs the destructive cleanup only AFTER the commit:
+/// a delete that fails mid-way must never leave a live workspace with its fork data
+/// destroyed, and a committed delete must still be able to reach catalogs/storages whose
+/// credentials lived in the (now gone) fork resources. Per-row resolution failures are
+/// carried as strings so they surface with the other cleanup errors.
+pub(crate) struct PreparedForkDucklakeCleanup {
+    ns: ForkDucklakeNamespaceRow,
+    catalog_pg: std::result::Result<windmill_common::PgDatabase, String>,
+    store: std::result::Result<(windmill_types::s3::LargeFileStorage, serde_json::Value), String>,
+}
+
+/// One row per (lake, catalog, storage, data path) ever attached — settings drift adds rows,
+/// so every location the fork wrote gets cleaned, not just the first. Read-only: resolves
+/// credentials but destroys nothing.
+/// `res_fallback_w_id`: second workspace to resolve `$res:` catalog/storage paths against
+/// when the row's own workspace no longer has them — the retry path runs AFTER the fork and
+/// its resources were deleted. Fork resources are clones of a parent's, so the workspace
+/// being forked again is the natural donor. None on live-workspace paths.
+pub(crate) async fn prepare_fork_ducklake_cleanups(
+    db: &DB,
+    w_id: &str,
+    res_fallback_w_id: Option<&str>,
+) -> Result<Vec<PreparedForkDucklakeCleanup>> {
+    let rows = sqlx::query_as!(
+        ForkDucklakeNamespaceRow,
+        r#"SELECT ducklake_name AS "ducklake_name!", metadata_schema AS "metadata_schema!",
+                  catalog AS "catalog!", storage AS "storage!",
+                  storage_ref AS "storage_ref!", data_path AS "data_path!",
+                  schema_dropped AS "schema_dropped!"
+             FROM fork_ducklake_namespace WHERE workspace_id = $1"#,
+        w_id
+    )
+    .fetch_all(db)
+    .await?;
+    let mut prepared = Vec::with_capacity(rows.len());
+    for ns in rows {
+        let catalog_pg = if ns.schema_dropped {
+            // Schema phase already done — the retry needs no catalog connection at all
+            // (its credentials may be unresolvable for good with the fork's resources gone).
+            Err("unused: metadata schema already dropped".to_string())
+        } else {
+            resolve_fork_catalog_pg(db, w_id, res_fallback_w_id, &ns.ducklake_name, &ns.catalog)
+                .await
+                .map_err(|e| e.to_string())
+        };
+        let storage = Some(ns.storage.as_str()).filter(|s| !s.is_empty());
+        let store = resolve_fork_storage(db, w_id, res_fallback_w_id, storage, &ns.storage_ref)
+            .await
+            .map_err(|e| e.to_string());
+        prepared.push(PreparedForkDucklakeCleanup { ns, catalog_pg, store });
+    }
+    Ok(prepared)
+}
+
+/// Drop the prepared namespaces' metadata schemas + data files, deleting each registry row
+/// only after both succeed (a no-op when the row already cascaded away with the workspace).
+/// Returns per-namespace error strings; never fails as a whole.
+/// One failed step of a fork ducklake cleanup. `blocking` = the metadata schema (or its
+/// guards) failed, so the namespace is still attachable and a same-id fork must NOT be
+/// created. Non-blocking = the schema is gone and only data files (or the registry-row
+/// delete) failed — inert storage leftovers, tracked by the surviving row and swept by the
+/// next successful cleanup of the same prefix.
+pub(crate) struct ForkDucklakeCleanupIssue {
+    pub(crate) blocking: bool,
+    pub(crate) msg: String,
+}
+
+pub(crate) async fn cleanup_fork_ducklake_namespaces(
+    db: &DB,
+    w_id: &str,
+    prepared: Vec<PreparedForkDucklakeCleanup>,
+) -> Vec<ForkDucklakeCleanupIssue> {
+    // The registration once-cache must not outlive the rows it mirrors: a same-id fork
+    // recreated within the TTL would otherwise skip re-registration, and ITS eventual
+    // deletion would find no rows — orphaning the deterministic namespace for the next
+    // same-id fork to silently reattach.
+    windmill_common::workspaces::invalidate_fork_ducklake_registration_cache(w_id);
+    let mut errors: Vec<ForkDucklakeCleanupIssue> = Vec::new();
+    for PreparedForkDucklakeCleanup { ns, catalog_pg, store } in prepared {
+        // Hard guards mirroring the forked-datatable drop: never touch a schema outside the
+        // fork prefix, never delete outside the fork data dir — even if a registry row was
+        // somehow tampered with.
+        if !ns
+            .metadata_schema
+            .starts_with(windmill_common::workspaces::FORK_DUCKLAKE_SCHEMA_PREFIX)
+        {
+            errors.push(ForkDucklakeCleanupIssue {
+                blocking: true,
+                msg: format!(
+                    "Refusing to drop schema '{}' for ducklake://{}: name does not start with '{}'",
+                    ns.metadata_schema,
+                    ns.ducklake_name,
+                    windmill_common::workspaces::FORK_DUCKLAKE_SCHEMA_PREFIX
+                ),
+            });
+            continue;
+        }
+        // The fork's directory segment, NOT the raw workspace id: ids are only
+        // git-branch-safe and may contain `/`, which raw would let one fork's prefix nest
+        // inside a sibling's (`wm-fork-a/b` under `wm-fork-a`) and be swept by its cleanup.
+        let expected_prefix = format!(
+            "{}/{}/",
+            windmill_common::workspaces::FORK_DUCKLAKE_DATA_DIR,
+            windmill_common::workspaces::fork_data_dir_segment(w_id)
+        );
+        if !format!("{}/", ns.data_path.trim_end_matches('/')).starts_with(&expected_prefix) {
+            errors.push(ForkDucklakeCleanupIssue {
+                blocking: true,
+                msg: format!(
+                    "Refusing to delete data path '{}' for ducklake://{}: not under '{}'",
+                    ns.data_path, ns.ducklake_name, expected_prefix
+                ),
+            });
+            continue;
+        }
+
+        let drop_res = if ns.schema_dropped {
+            // Recorded as already dropped by a prior partial cleanup; skipping means no
+            // catalog credentials are needed. Registration resets the flag when a live fork
+            // re-attaches (recreating the schema).
+            Ok(())
+        } else {
+            match catalog_pg {
+                Ok(pg) => drop_fork_ducklake_metadata_schema(db, pg, &ns.metadata_schema).await,
+                Err(e) => Err(Error::internal_err(e)),
+            }
+        };
+        if let Err(e) = drop_res {
+            errors.push(ForkDucklakeCleanupIssue {
+                blocking: true,
+                msg: format!(
+                    "Could not drop metadata schema '{}' for ducklake://{}: {e}",
+                    ns.metadata_schema, ns.ducklake_name
+                ),
+            });
+            continue;
+        }
+        let delete_res = match store {
+            Ok((lfs, resource_value)) => {
+                delete_fork_ducklake_data(lfs, resource_value, &ns.data_path).await
+            }
+            Err(e) => Err(Error::internal_err(e)),
+        };
+        if let Err(e) = delete_res {
+            // Record the completed schema phase so retries never need catalog credentials
+            // again (best effort — a failed update just means the next retry re-drops an
+            // absent schema, which requires the catalog to be reachable).
+            sqlx::query!(
+                "UPDATE fork_ducklake_namespace SET schema_dropped = true
+                 WHERE workspace_id = $1 AND ducklake_name = $2 AND catalog = $3
+                   AND storage = $4 AND storage_ref = $5 AND data_path = $6",
+                w_id,
+                &ns.ducklake_name,
+                &ns.catalog,
+                &ns.storage,
+                &ns.storage_ref,
+                &ns.data_path,
+            )
+            .execute(db)
+            .await
+            .ok();
+            errors.push(ForkDucklakeCleanupIssue {
+                blocking: false,
+                msg: format!(
+                    "Dropped metadata schema but could not delete data files under '{}' for ducklake://{}: {e}",
+                    ns.data_path, ns.ducklake_name
+                ),
+            });
+            continue;
+        }
+        sqlx::query!(
+            "DELETE FROM fork_ducklake_namespace
+             WHERE workspace_id = $1 AND ducklake_name = $2 AND catalog = $3
+               AND storage = $4 AND storage_ref = $5 AND data_path = $6",
+            w_id,
+            &ns.ducklake_name,
+            &ns.catalog,
+            &ns.storage,
+            &ns.storage_ref,
+            &ns.data_path,
+        )
+        .execute(db)
+        .await
+        .map_err(|e| {
+            errors.push(ForkDucklakeCleanupIssue {
+                blocking: false,
+                msg: format!(
+                    "Cleaned ducklake://{} but could not delete its registry row: {e}",
+                    ns.ducklake_name
+                ),
+            })
+        })
+        .ok();
+    }
+    errors
+}
+
+/// Drop the fork's metadata schema in the catalog database recorded by the registry row —
+/// NOT whatever the fork's settings point at by now: a drifted catalog resource must not make
+/// cleanup drop a schema in the wrong database while orphaning the real one. The pg schema
+/// holds only DuckLake metadata tables (auto-created at first fork attach), so a plain
+/// `DROP SCHEMA … CASCADE` on the catalog connection removes the whole fork namespace.
+/// Resolve the catalog connection recorded in the registry row (read-only): instance
+/// identities rebuild instance creds; resource identities resolve their `$res:` in the fork's
+/// workspace — which is why this must run BEFORE the workspace (and its resources) are
+/// deleted. Mysql never registers (rejected at resolution).
+async fn resolve_fork_catalog_pg(
+    db: &DB,
+    w_id: &str,
+    res_fallback_w_id: Option<&str>,
+    ducklake_name: &str,
+    catalog: &str,
+) -> Result<windmill_common::PgDatabase> {
+    let (resource_type, resource_path) = catalog.split_once(':').ok_or_else(|| {
+        Error::internal_err(format!(
+            "ducklake://{ducklake_name}: malformed registry catalog identity `{catalog}`"
+        ))
+    })?;
+    let catalog_resource = if resource_type == "instance" {
+        let mut pg_creds = windmill_common::PgDatabase::parse_uri(
+            &windmill_common::get_database_url().await?.as_str().await,
+        )?;
+        pg_creds.dbname = resource_path.to_string();
+        pg_creds.user = Some("custom_instance_user".to_string());
+        pg_creds.password =
+            Some(windmill_common::utils::get_custom_pg_instance_password(db).await?);
+        serde_json::to_value(&pg_creds)
+            .map_err(|e| Error::internal_err(format!("serializing pg creds: {e}")))?
+    } else {
+        resolve_res_with_fallback(db, w_id, res_fallback_w_id, resource_path).await?
+    };
+    serde_json::from_value(catalog_resource).map_err(|e| {
+        Error::internal_err(format!(
+            "ducklake://{ducklake_name}: catalog resource is not a postgres database: {e}"
+        ))
+    })
+}
+
+async fn drop_fork_ducklake_metadata_schema(
+    db: &DB,
+    pg: windmill_common::PgDatabase,
+    metadata_schema: &str,
+) -> Result<()> {
+    let (client, connection) = pg.connect(Some(db)).await?;
+    let join_handle = tokio::spawn(async move { connection.await });
+    let res = client
+        .execute(
+            &format!(
+                "DROP SCHEMA IF EXISTS \"{}\" CASCADE",
+                metadata_schema.replace('"', "\"\"")
+            ),
+            &[],
+        )
+        .await;
+    drop(client);
+    let _ = join_handle.await;
+    res.map_err(|e| Error::internal_err(format!("{e:#}")))?;
+    Ok(())
+}
+
+/// Resolve the storage identified by the registry's `storage_ref` (read-only) — the storage
+/// that was active when the fork's data was WRITTEN, not whatever the logical storage name
+/// points at by deletion time (a repointed storage must not orphan the original fork data,
+/// nor get a colliding prefix deleted). `storage_ref` = '' falls back to resolving the
+/// logical name against current settings (registration couldn't identify the storage — best
+/// effort). Resolves the `$res:` in the fork's workspace, which is why this must run BEFORE
+/// the workspace is deleted.
+async fn resolve_fork_storage(
+    db: &DB,
+    w_id: &str,
+    res_fallback_w_id: Option<&str>,
+    storage: Option<&str>,
+    storage_ref: &str,
+) -> Result<(windmill_types::s3::LargeFileStorage, serde_json::Value)> {
+    use windmill_types::s3::{
+        AzureBlobStorage, FilesystemStorage, GoogleCloudStorage, LargeFileStorage, S3Storage,
+    };
+
+    let lfs: LargeFileStorage = if let Some((typ, path)) = storage_ref.split_once(':') {
+        // Rebuild the LFS entry from the registered identity; only the variant (which
+        // resource parser applies) and the path matter to `lfs_to_object_store_resource`.
+        let s3 = |p: &str| S3Storage {
+            s3_resource_path: p.to_string(),
+            public_resource: None,
+            advanced_permissions: None,
+        };
+        match typ {
+            "S3Storage" => LargeFileStorage::S3Storage(s3(path)),
+            "S3AwsOidc" => LargeFileStorage::S3AwsOidc(s3(path)),
+            "AzureBlobStorage" => LargeFileStorage::AzureBlobStorage(AzureBlobStorage {
+                azure_blob_resource_path: path.to_string(),
+                public_resource: None,
+                advanced_permissions: None,
+            }),
+            "AzureWorkloadIdentity" => LargeFileStorage::AzureWorkloadIdentity(AzureBlobStorage {
+                azure_blob_resource_path: path.to_string(),
+                public_resource: None,
+                advanced_permissions: None,
+            }),
+            "GoogleCloudStorage" => LargeFileStorage::GoogleCloudStorage(GoogleCloudStorage {
+                gcs_resource_path: path.to_string(),
+                public_resource: None,
+                advanced_permissions: None,
+            }),
+            "FilesystemStorage" => LargeFileStorage::FilesystemStorage(FilesystemStorage {
+                root_path: path.to_string(),
+                public_resource: None,
+                advanced_permissions: None,
+            }),
+            other => {
+                return Err(Error::internal_err(format!(
+                    "unknown registered storage type `{other}`"
+                )))
+            }
+        }
+    } else {
+        let lfs_json = sqlx::query_scalar!(
+            "SELECT large_file_storage FROM workspace_settings WHERE workspace_id = $1",
+            w_id
+        )
+        .fetch_optional(db)
+        .await?
+        .flatten()
+        .ok_or_else(|| Error::BadRequest("workspace has no storage configured".to_string()))?;
+        // Named storages live under `secondary_storage`; `None`/`_default_` is the primary.
+        match storage.filter(|s| *s != "_default_") {
+            None => serde_json::from_value(lfs_json.clone())
+                .map_err(|e| Error::internal_err(format!("parsing large_file_storage: {e}")))?,
+            Some(name) => serde_json::from_value(
+                lfs_json
+                    .get("secondary_storage")
+                    .and_then(|s| s.get(name))
+                    .cloned()
+                    .ok_or_else(|| {
+                        Error::BadRequest(format!("workspace has no storage named {name}"))
+                    })?,
+            )
+            .map_err(|e| Error::internal_err(format!("parsing storage {name}: {e}")))?,
+        }
+    };
+    // Filesystem storage stores a direct path (`lfs_to_object_store_resource` ignores the
+    // resource value); everything else references a resource whose stored path may or may not
+    // carry the `$res:` prefix — same normalization as `get_workspace_s3_resource_from_lfs`.
+    let resource_value = if matches!(lfs, LargeFileStorage::FilesystemStorage(_)) {
+        serde_json::Value::Null
+    } else {
+        let path = lfs.get_s3_resource_path();
+        let path = path.strip_prefix("$res:").unwrap_or(path);
+        resolve_res_with_fallback(db, w_id, res_fallback_w_id, path).await?
+    };
+    Ok((lfs, resource_value))
+}
+
+/// Resolve a `$res:` path in `w_id`, falling back to the same path in `res_fallback_w_id`
+/// when the first lookup fails — retry-path cleanups run after the fork workspace (and its
+/// cloned resource rows) were deleted, and the fork's resources were clones of a parent's.
+async fn resolve_res_with_fallback(
+    db: &DB,
+    w_id: &str,
+    res_fallback_w_id: Option<&str>,
+    resource_path: &str,
+) -> Result<serde_json::Value> {
+    let res = windmill_common::workspaces::transform_json_value_unchecked(
+        &serde_json::Value::String(format!("$res:{resource_path}")),
+        w_id,
+        db,
+    )
+    .await;
+    match (res, res_fallback_w_id) {
+        (Ok(v), _) => Ok(v),
+        (Err(e), None) => Err(e),
+        (Err(_), Some(fb)) => {
+            windmill_common::workspaces::transform_json_value_unchecked(
+                &serde_json::Value::String(format!("$res:{resource_path}")),
+                fb,
+                db,
+            )
+            .await
+        }
+    }
+}
+
+/// Delete every object under the fork's data prefix in the pre-resolved storage. Requires the
+/// `parquet` (object store) feature; without it the metadata schema is still dropped and the
+/// unreachable data files are left for manual cleanup.
+#[cfg(feature = "parquet")]
+async fn delete_fork_ducklake_data(
+    lfs: windmill_types::s3::LargeFileStorage,
+    resource_value: serde_json::Value,
+    data_path: &str,
+) -> Result<()> {
+    use futures::{StreamExt, TryStreamExt};
+
+    let store = windmill_object_store::build_object_store_client(
+        &windmill_object_store::lfs_to_object_store_resource(&lfs, resource_value)?,
+    )
+    .await?;
+
+    let prefix = windmill_object_store::object_store_reexports::Path::from(
+        data_path.trim_matches('/').to_string(),
+    );
+    let locations: Vec<_> = store
+        .list(Some(&prefix))
+        .map_ok(|m| m.location)
+        .try_collect()
+        .await
+        .map_err(windmill_object_store::object_store_error_to_error)?;
+    // The object_store crate evaluates list prefixes on a path-SEGMENT basis (`a/b` does not
+    // match `a/bc/…`), so sibling fork segments sharing a string prefix are already excluded.
+    // Filter anyway — deletion must not depend on a listing implementation detail.
+    let boundary = format!("{}/", prefix.as_ref());
+    let locations: Vec<_> = locations
+        .into_iter()
+        .filter(|l| l.as_ref().starts_with(&boundary))
+        .collect();
+    // 1000-object chunks: S3 DeleteObjects caps a batch at 1000 keys.
+    for chunk in locations.chunks(1000) {
+        store
+            .delete_stream(futures::stream::iter(chunk.iter().cloned().map(Ok)).boxed())
+            .try_collect::<Vec<_>>()
+            .await
+            .map_err(windmill_object_store::object_store_error_to_error)?;
+    }
+    Ok(())
+}
+
+#[cfg(not(feature = "parquet"))]
+async fn delete_fork_ducklake_data(
+    _lfs: windmill_types::s3::LargeFileStorage,
+    _resource_value: serde_json::Value,
+    _data_path: &str,
+) -> Result<()> {
+    Err(Error::internal_err(
+        "object storage support (parquet feature) is not compiled in".to_string(),
+    ))
+}
+
+/// Destroying an ATTACHED dev workspace (or its data environments) must be a prod-admin
+/// action, not just the dev's own owner (dev ownership can diverge from prod's) — mirrors
+/// detach_dev_workspace. Shared by `delete_workspace` and `drop_forked_ducklake_namespaces`
+/// so the two gates cannot drift: the sidebar calls the drop endpoint BEFORE deleteWorkspace,
+/// and a weaker gate on the drop would let a non-prod-admin dev owner destroy the live dev's
+/// materializations and then have the deletion itself rejected. No-op for non-dev workspaces.
+async fn require_prod_admin_for_dev_workspace(
+    db: &DB,
+    authed: &ApiAuthed,
+    w_id: &str,
+) -> Result<()> {
+    if let Some(prod) = sqlx::query_scalar!(
+        "SELECT parent_workspace_id FROM workspace WHERE id = $1 AND is_dev_workspace",
+        w_id
+    )
+    .fetch_optional(db)
+    .await?
+    .flatten()
+    {
+        let is_prod_admin = sqlx::query_scalar!(
+            "SELECT is_admin FROM usr WHERE workspace_id = $1 AND email = $2",
+            &prod,
+            &authed.email
+        )
+        .fetch_optional(db)
+        .await?
+        .unwrap_or(false);
+        if !is_prod_admin && !is_super_admin_email(db, &authed.email).await? {
+            return Err(Error::PermissionDenied(format!(
+                "Destroying dev workspace '{w_id}' or its data requires being an admin of its parent prod workspace '{prod}' (or a superadmin)"
+            )));
+        }
+    }
+    Ok(())
+}
+
 async fn is_workspace_owner(
     authed: &ApiAuthed,
     w_id: &str,
@@ -1070,3 +1838,21 @@ async fn is_workspace_owner(
         .await?;
     Ok(owner.map(|o| o == authed.email).unwrap_or(false))
 }
+
+/// Whether a workspace is a fork or dev workspace. Both forks and dev workspaces set
+/// `parent_workspace_id`, but a `wm-fork-` workspace can outlive its parent (the FK is
+/// `ON DELETE SET NULL`), so also treat the prefix as fork-ness — otherwise an orphaned fork would
+/// lose owner-self-delete. Used to gate owner-self-delete, which is permitted for forks/dev
+/// workspaces but requires superadmin otherwise.
+async fn workspace_is_fork(db: &DB, w_id: &str) -> Result<bool> {
+    if w_id.starts_with(WM_FORK_PREFIX) {
+        return Ok(true);
+    }
+    Ok(sqlx::query_scalar!(
+        r#"SELECT (parent_workspace_id IS NOT NULL) AS "has_parent!" FROM workspace WHERE id = $1"#,
+        w_id
+    )
+    .fetch_optional(db)
+    .await?
+    .unwrap_or(false))
+}
diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml
index 94e72e7c4a..fa9ed3f2e5 100644
--- a/backend/windmill-api/Cargo.toml
+++ b/backend/windmill-api/Cargo.toml
@@ -10,8 +10,8 @@ path = "src/lib.rs"
 
 [features]
 default = []
-private = ["windmill-audit/private", "windmill-common/private", "windmill-api-auth/private", "windmill-store/private", "windmill-api-users/private", "windmill-api-workspaces/private", "windmill-api-groups/private", "windmill-api-configs/private", "windmill-api-settings/private", "windmill-api-agent-workers?/private", "windmill-trigger-kafka?/private", "windmill-trigger-postgres?/private", "windmill-trigger-mqtt?/private", "windmill-trigger-websocket?/private", "windmill-trigger-nats?/private", "windmill-trigger-sqs?/private", "windmill-trigger-gcp?/private", "windmill-trigger-azure?/private", "windmill-trigger-email?/private", "windmill-git-sync/private", "windmill-autoscaling?/private"]
-enterprise = ["windmill-queue/enterprise", "windmill-audit/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "windmill-worker?/enterprise", "windmill-api-auth/enterprise", "windmill-store/enterprise", "windmill-api-jobs/enterprise", "windmill-api-scripts/enterprise", "windmill-api-flows/enterprise", "windmill-api-users/enterprise", "windmill-api-workspaces/enterprise", "windmill-api-groups/enterprise", "windmill-api-configs/enterprise", "windmill-api-settings/enterprise", "windmill-api-schedule/enterprise", "windmill-api-agent-workers?/enterprise", "windmill-trigger/enterprise", "windmill-trigger-kafka?/enterprise", "windmill-trigger-postgres?/enterprise", "windmill-trigger-mqtt?/enterprise", "windmill-trigger-websocket?/enterprise", "windmill-trigger-email?/enterprise", "windmill-trigger-nats?/enterprise", "windmill-trigger-sqs?/enterprise", "windmill-trigger-gcp?/enterprise", "windmill-trigger-azure?/enterprise", "windmill-trigger-http?/enterprise", "windmill-native-triggers?/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise"]
+private = ["windmill-audit/private", "windmill-common/private", "windmill-api-auth/private", "windmill-store/private", "windmill-api-users/private", "windmill-api-workspaces/private", "windmill-api-groups/private", "windmill-api-configs/private", "windmill-api-settings/private", "windmill-api-assets/private", "windmill-api-agent-workers?/private", "windmill-trigger-kafka?/private", "windmill-trigger-postgres?/private", "windmill-trigger-mqtt?/private", "windmill-trigger-websocket?/private", "windmill-trigger-nats?/private", "windmill-trigger-sqs?/private", "windmill-trigger-gcp?/private", "windmill-trigger-azure?/private", "windmill-trigger-email?/private", "windmill-git-sync/private", "windmill-autoscaling?/private", "windmill-object-store/private"]
+enterprise = ["windmill-queue/enterprise", "windmill-audit/enterprise", "windmill-git-sync/enterprise", "windmill-common/enterprise", "windmill-worker?/enterprise", "windmill-api-auth/enterprise", "windmill-store/enterprise", "windmill-api-jobs/enterprise", "windmill-api-scripts/enterprise", "windmill-api-flows/enterprise", "windmill-api-users/enterprise", "windmill-api-workspaces/enterprise", "windmill-api-groups/enterprise", "windmill-api-configs/enterprise", "windmill-api-settings/enterprise", "windmill-api-schedule/enterprise", "windmill-api-agent-workers?/enterprise", "windmill-trigger/enterprise", "windmill-trigger-kafka?/enterprise", "windmill-trigger-postgres?/enterprise", "windmill-trigger-mqtt?/enterprise", "windmill-trigger-websocket?/enterprise", "windmill-trigger-email?/enterprise", "windmill-trigger-nats?/enterprise", "windmill-trigger-sqs?/enterprise", "windmill-trigger-gcp?/enterprise", "windmill-trigger-azure?/enterprise", "windmill-trigger-http?/enterprise", "windmill-native-triggers?/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise", "license"]
 stripe = []
 run_inline = ["dep:windmill-worker", "windmill-api-configs/run_inline"]
 agent_worker_server = ["dep:windmill-worker", "dep:windmill-api-agent-workers"]
@@ -43,7 +43,7 @@ mcp = ["dep:windmill-mcp", "windmill-mcp/server", "windmill-mcp/auth", "windmill
 bedrock = ["windmill-ai/bedrock"]
 python = ["windmill-dep-map/python", "dep:windmill-parser-py", "dep:windmill-parser-py-imports", "windmill-api-scripts/python", "windmill-api-configs/python", "windmill-api-agent-workers?/python", "windmill-trigger/python", "windmill-common/python"]
 no_auth = ["windmill-api-auth/no_auth", "windmill-store/no_auth", "windmill-api-users/no_auth"]
-quickjs = ["windmill-jseval/quickjs"]
+quickjs = ["windmill-jseval/quickjs", "windmill-queue/quickjs"]
 
 [dependencies]
 windmill-ai = { workspace = true, default-features = false }
diff --git a/backend/windmill-api/docs_snapshot/README.md b/backend/windmill-api/docs_snapshot/README.md
new file mode 100644
index 0000000000..09a1ac6615
--- /dev/null
+++ b/backend/windmill-api/docs_snapshot/README.md
@@ -0,0 +1,19 @@
+# Vendored docs snapshot
+
+`llms.txt.gz` (curated page index) and `llms-full.txt.gz` (full corpus, every docs
+page concatenated and delimited by `Source:` lines) are a gzipped snapshot of
+`https://www.windmill.dev/llms.txt` and `/llms-full.txt`.
+
+They are embedded into the binary by `../src/docs/corpus.rs` (`include_bytes!`) and
+decompressed/parsed once at first use. This lets in-product docs search
+(`GET /api/docs/search`, `GET /api/docs/page`) — used by the AI chat, the MCP
+`searchDocs`/`readDocsPage` tools, and the `wmill docs` CLI — work with **no
+runtime network egress**, including on air-gapped instances.
+
+The tradeoff is staleness: the snapshot is pinned to whatever was published when
+`fetch.sh` was last run. Refresh on each release:
+
+```bash
+./fetch.sh        # re-downloads and re-gzips both files
+git add llms.txt.gz llms-full.txt.gz
+```
diff --git a/backend/windmill-api/docs_snapshot/fetch.sh b/backend/windmill-api/docs_snapshot/fetch.sh
new file mode 100755
index 0000000000..bf24d42f7b
--- /dev/null
+++ b/backend/windmill-api/docs_snapshot/fetch.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Refresh the vendored documentation snapshot embedded into windmill-api.
+#
+# The backend self-hosts the docs corpus (see ../src/docs/) so docs search works
+# with no runtime egress. This snapshot is pinned to whatever was published on
+# windmill.dev when this script was last run — re-run it on each release to keep
+# the in-product docs search reasonably fresh, then commit the updated *.gz.
+set -euo pipefail
+
+DOCS_ORIGIN="${DOCS_ORIGIN:-https://www.windmill.dev}"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+fetch() {
+  local name="$1"
+  echo "Fetching ${DOCS_ORIGIN}/${name} ..."
+  curl -fSL "${DOCS_ORIGIN}/${name}" -o "${DIR}/${name}"
+  # -9 max compression; -n omit the original name/timestamp so the artifact is
+  # reproducible and diffs only when the docs actually change.
+  gzip -9 -n -c "${DIR}/${name}" > "${DIR}/${name}.gz"
+  rm -f "${DIR}/${name}"
+  echo "  wrote ${name}.gz ($(wc -c < "${DIR}/${name}.gz") bytes)"
+}
+
+fetch "llms.txt"
+fetch "llms-full.txt"
+echo "Done. Commit the updated *.gz files."
diff --git a/backend/windmill-api/docs_snapshot/llms-full.txt.gz b/backend/windmill-api/docs_snapshot/llms-full.txt.gz
new file mode 100644
index 0000000000..cc52e79f2c
Binary files /dev/null and b/backend/windmill-api/docs_snapshot/llms-full.txt.gz differ
diff --git a/backend/windmill-api/docs_snapshot/llms.txt.gz b/backend/windmill-api/docs_snapshot/llms.txt.gz
new file mode 100644
index 0000000000..111dc1537f
Binary files /dev/null and b/backend/windmill-api/docs_snapshot/llms.txt.gz differ
diff --git a/backend/windmill-api/openapi-deref.json b/backend/windmill-api/openapi-deref.json
index 135131af41..e511578821 100644
--- a/backend/windmill-api/openapi-deref.json
+++ b/backend/windmill-api/openapi-deref.json
@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.3",
   "info": {
-    "version": "1.728.0",
+    "version": "1.740.0",
     "title": "Windmill API",
     "contact": {
       "name": "Windmill Team",
@@ -174,52 +174,124 @@
         }
       }
     },
-    "/inkeep": {
-      "post": {
-        "summary": "query Windmill AI documentation assistant (EE only)",
-        "operationId": "queryDocumentation",
+    "/docs/search": {
+      "get": {
+        "summary": "Full-text search across the entire Windmill documentation. Provide one or more keywords; returns the most relevant docs pages, each with its Source URL and short matching snippets. Use this FIRST to find relevant pages by their content (a flag, function, error message, config key or concept). If the snippets answer the question, answer directly; otherwise call readDocsPage with a returned Source URL to read more.",
+        "operationId": "searchDocs",
         "x-mcp-tool": true,
         "tags": [
           "documentation"
         ],
-        "requestBody": {
-          "description": "query to send to the AI documentation assistant",
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "query": {
-                    "type": "string",
-                    "description": "The documentation query to send to the AI assistant"
-                  }
-                },
-                "required": [
-                  "query"
-                ]
-              }
+        "parameters": [
+          {
+            "name": "query",
+            "description": "Keywords to search for in the documentation body, e.g. \"chromium worker tag\" or \"retry exponential backoff\". Fewer, more distinctive words match better.",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
           }
-        },
+        ],
         "responses": {
           "200": {
-            "description": "AI documentation assistant response",
+            "description": "matching documentation pages",
             "content": {
               "application/json": {
                 "schema": {
                   "type": "object",
-                  "description": "Response from Inkeep service"
+                  "properties": {
+                    "text": {
+                      "type": "string",
+                      "description": "Model-ready rendering of the results"
+                    },
+                    "results": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "url": {
+                            "type": "string"
+                          },
+                          "title": {
+                            "type": "string"
+                          },
+                          "score": {
+                            "type": "integer"
+                          },
+                          "snippets": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          }
+                        },
+                        "required": [
+                          "url",
+                          "title",
+                          "score",
+                          "snippets"
+                        ]
+                      }
+                    }
+                  },
+                  "required": [
+                    "text",
+                    "results"
+                  ]
                 }
               }
             }
+          }
+        }
+      }
+    },
+    "/docs/page": {
+      "get": {
+        "summary": "Fetch the markdown of a single Windmill documentation page. Provide the `url` of a page found via searchDocs (its Source URL). If the page is large, this returns its list of section headings instead of the full content; call again with the `section` argument set to one of those headings to read that section.",
+        "operationId": "readDocsPage",
+        "x-mcp-tool": true,
+        "tags": [
+          "documentation"
+        ],
+        "parameters": [
+          {
+            "name": "url",
+            "description": "The docs page to read, as a Source URL returned by searchDocs (e.g. https://www.windmill.dev/docs/core_concepts/jobs). A bare path (e.g. /docs/core_concepts/jobs) is also accepted.",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
           },
-          "403": {
-            "description": "Enterprise Edition required",
+          {
+            "name": "section",
+            "description": "Optional. A heading title from the page outline to read just that section instead of the full page.",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "documentation page content",
             "content": {
-              "text/plain": {
+              "application/json": {
                 "schema": {
-                  "type": "string"
+                  "type": "object",
+                  "properties": {
+                    "text": {
+                      "type": "string"
+                    },
+                    "source_url": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "text",
+                    "source_url"
+                  ]
                 }
               }
             }
@@ -1531,6 +1603,56 @@
         }
       }
     },
+    "/workspaces/session_workspace_status": {
+      "post": {
+        "summary": "get the lifecycle status of workspaces referenced by client-side sessions",
+        "operationId": "getSessionWorkspaceStatus",
+        "tags": [
+          "workspace"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "workspace_ids": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "required": [
+                  "workspace_ids"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "map of workspace id to status (active, archived, or deleted)",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "type": "string",
+                    "enum": [
+                      "active",
+                      "archived",
+                      "deleted"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/workspaces/get_as_superadmin": {
       "get": {
         "summary": "get workspace as super admin (require to be super admin)",
@@ -2492,6 +2614,10 @@
                       "type": "integer",
                       "format": "int64"
                     },
+                    "s3_not_found": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
                     "orphans_scanned": {
                       "type": "integer",
                       "format": "int64"
@@ -2593,6 +2719,124 @@
         }
       }
     },
+    "/settings/audit_logs_s3_backfill": {
+      "post": {
+        "summary": "start an opt-in historical backfill of audit logs to object storage",
+        "operationId": "runAuditLogsS3Backfill",
+        "tags": [
+          "setting"
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "from": {
+                    "type": "string",
+                    "format": "date-time",
+                    "description": "inclusive lower bound of the window to export"
+                  },
+                  "to": {
+                    "type": "string",
+                    "format": "date-time",
+                    "description": "exclusive upper bound of the window to export"
+                  }
+                },
+                "required": [
+                  "from",
+                  "to"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "202": {
+            "description": "backfill started"
+          }
+        }
+      }
+    },
+    "/settings/audit_logs_s3_backfill_status": {
+      "get": {
+        "summary": "get status of the audit-log object-store historical backfill",
+        "operationId": "getAuditLogsS3BackfillStatus",
+        "tags": [
+          "setting"
+        ],
+        "responses": {
+          "200": {
+            "description": "current backfill status (null if never run)",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "nullable": true,
+                  "type": "object",
+                  "properties": {
+                    "running": {
+                      "type": "boolean"
+                    },
+                    "started_at": {
+                      "type": "string",
+                      "format": "date-time"
+                    },
+                    "finished_at": {
+                      "type": "string",
+                      "format": "date-time",
+                      "nullable": true
+                    },
+                    "phase": {
+                      "type": "string"
+                    },
+                    "from": {
+                      "type": "string",
+                      "format": "date-time"
+                    },
+                    "to": {
+                      "type": "string",
+                      "format": "date-time"
+                    },
+                    "rows_written": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "objects_written": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "last_ts": {
+                      "type": "string",
+                      "format": "date-time",
+                      "nullable": true
+                    },
+                    "errors": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "last_error": {
+                      "type": "string",
+                      "nullable": true
+                    }
+                  },
+                  "required": [
+                    "running",
+                    "started_at",
+                    "phase",
+                    "from",
+                    "to",
+                    "rows_written",
+                    "objects_written",
+                    "errors"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/settings/send_stats": {
       "post": {
         "summary": "send stats",
@@ -9704,6 +9948,10 @@
                     "type": "string",
                     "description": "Instance name for built-in providers whose client-credentials token URL is instance-templated; substituted into the fixed-host registry template server-side (client_credentials flow only). The token URL is never caller-supplied."
                   },
+                  "cc_token_url": {
+                    "type": "string",
+                    "description": "Bring-your-own token endpoint override (client_credentials flow only). Only honored together with cc_client_id/cc_client_secret and mutually exclusive with cc_instance; ignored/rejected on the shared-instance path."
+                  },
                   "mcp_server_url": {
                     "type": "string",
                     "description": "MCP server URL for MCP OAuth token refresh"
@@ -9785,6 +10033,10 @@
                   "cc_instance": {
                     "type": "string",
                     "description": "Instance name for built-in providers whose client-credentials token URL is instance-templated; substituted into the fixed-host registry template server-side. The token URL is never caller-supplied."
+                  },
+                  "cc_token_url": {
+                    "type": "string",
+                    "description": "Bring-your-own token endpoint override. Only honored together with cc_client_id/cc_client_secret and mutually exclusive with cc_instance; rejected on the shared-instance path."
                   }
                 }
               }
@@ -11614,6 +11866,32 @@
         }
       }
     },
+    "/apps_u/embed_token_by_custom_path/{custom_path}": {
+      "get": {
+        "summary": "get app embed token by custom path",
+        "operationId": "getAppEmbedTokenByCustomPath",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/CustomPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "embed token",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EmbedTokenResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/scripts/hub/get/{path}": {
       "get": {
         "summary": "get hub script content by path",
@@ -12188,6 +12466,14 @@
         "parameters": [
           {
             "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "all_users",
+            "in": "query",
+            "description": "List every draft in the workspace (all users), not just the current user's own + legacy rows. Other users' rows come back with `mine=false` (view-only).",
+            "schema": {
+              "type": "boolean"
+            }
           }
         ],
         "responses": {
@@ -12225,6 +12511,27 @@
                       "created_at": {
                         "type": "string",
                         "format": "date-time"
+                      },
+                      "can_write": {
+                        "type": "boolean",
+                        "description": "Whether the current user may deploy/discard this draft (same check the deploy/discard endpoints enforce)."
+                      },
+                      "mine": {
+                        "type": "boolean",
+                        "description": "The row belongs to the current user (own draft or the legacy no-owner row) and is therefore actionable. Always true in the default listing; with `all_users=true`, other users' rows are false (view-only)."
+                      },
+                      "draft_users": {
+                        "description": "Draft authors at this (path, kind) — the legacy NULL-email row surfaced as a null username.\nPopulated only for the shared full-page-editor kinds (script/flow/app/raw_app); omitted for\ndrawer kinds, which keep their drafts private. Feeds the Draft badge's owner-avatar circles.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "username": {
+                              "type": "string",
+                              "nullable": true
+                            }
+                          }
+                        }
                       }
                     },
                     "required": [
@@ -12232,7 +12539,9 @@
                       "path",
                       "draft_only",
                       "legacy_draft",
-                      "created_at"
+                      "created_at",
+                      "can_write",
+                      "mine"
                     ]
                   }
                 }
@@ -12302,6 +12611,55 @@
         }
       }
     },
+    "/w/{workspace}/drafts/get_own/{kind}/{path}": {
+      "get": {
+        "summary": "fetch the current user's own draft content at a path (any kind)",
+        "operationId": "getOwnDraft",
+        "tags": [
+          "draft"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "kind",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/UserDraftItemKind"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "the user's draft content, or null when none exists",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "nullable": true,
+                  "type": "object",
+                  "properties": {
+                    "value": {},
+                    "created_at": {
+                      "type": "string",
+                      "format": "date-time"
+                    }
+                  },
+                  "required": [
+                    "value",
+                    "created_at"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/drafts/update/{kind}/{path}": {
       "post": {
         "summary": "upsert (or clear) the current user's draft at a path",
@@ -12348,6 +12706,11 @@
                   "legacy": {
                     "type": "boolean",
                     "description": "Delete-only. Target the legacy workspace-level row (email NULL) instead of the current user's row. Used to discard a legacy draft from the review page."
+                  },
+                  "created_at": {
+                    "type": "string",
+                    "format": "date-time",
+                    "description": "Upsert-only override for the stored creation timestamp. Normal saves omit it (stamped server-side); the localStorage→DB migration passes the draft's original write time so migrated drafts keep their age."
                   }
                 }
               }
@@ -12385,6 +12748,67 @@
         }
       }
     },
+    "/w/{workspace}/drafts/migrate_legacy/{kind}/{path}": {
+      "post": {
+        "summary": "resolve a legacy (workspace-level) draft (admin only)",
+        "description": "Delete a legacy draft (email NULL) or assign it to the authed admin as a per-user draft. Workspace admins / superadmins only.",
+        "operationId": "migrateLegacyDraft",
+        "tags": [
+          "draft"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "kind",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "$ref": "#/components/schemas/UserDraftItemKind"
+            }
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "action": {
+                    "type": "string",
+                    "enum": [
+                      "delete",
+                      "assign_to_self"
+                    ],
+                    "description": "delete the legacy draft, or take ownership of it."
+                  }
+                },
+                "required": [
+                  "action"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "migration result",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/scripts/create": {
       "post": {
         "summary": "create script",
@@ -16099,6 +16523,202 @@
         }
       }
     },
+    "/w/{workspace}/ai_skills/list": {
+      "get": {
+        "summary": "list the workspace AI chat skills (name + description only)",
+        "operationId": "listAiSkills",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "skill listing",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "name",
+                      "description"
+                    ],
+                    "properties": {
+                      "name": {
+                        "type": "string"
+                      },
+                      "description": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/ai_skills/get/{name}": {
+      "get": {
+        "summary": "get a workspace AI chat skill including its instructions",
+        "operationId": "getAiSkill",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "skill",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "required": [
+                    "name",
+                    "description",
+                    "instructions"
+                  ],
+                  "properties": {
+                    "name": {
+                      "type": "string"
+                    },
+                    "description": {
+                      "type": "string"
+                    },
+                    "instructions": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/ai_skills/upload": {
+      "post": {
+        "summary": "upsert workspace AI chat skills (admin only)",
+        "operationId": "uploadAiSkills",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "required": [
+                  "skills"
+                ],
+                "properties": {
+                  "skills": {
+                    "type": "array",
+                    "maxItems": 50,
+                    "items": {
+                      "type": "object",
+                      "required": [
+                        "name",
+                        "description",
+                        "instructions"
+                      ],
+                      "properties": {
+                        "name": {
+                          "type": "string",
+                          "minLength": 1,
+                          "maxLength": 64,
+                          "pattern": "^[a-z0-9-]+$"
+                        },
+                        "description": {
+                          "type": "string",
+                          "minLength": 1,
+                          "maxLength": 1024
+                        },
+                        "instructions": {
+                          "type": "string",
+                          "minLength": 1,
+                          "maxLength": 65536
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "uploaded",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/ai_skills/delete/{name}": {
+      "delete": {
+        "summary": "delete a workspace AI chat skill (admin only)",
+        "operationId": "deleteAiSkill",
+        "tags": [
+          "workspace"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "deleted",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps/get_data/v/{secretWithExtension}": {
       "get": {
         "summary": "get raw app data by",
@@ -16114,6 +16734,7 @@
             "name": "secretWithExtension",
             "in": "path",
             "required": true,
+            "description": "App version secret suffixed with the requested file type extension. Supported extensions are `.js` (JavaScript bundle), `.css` (stylesheet), and `.html` (sandboxed wrapper document).",
             "schema": {
               "type": "string"
             }
@@ -16127,6 +16748,16 @@
                 "schema": {
                   "type": "string"
                 }
+              },
+              "text/css": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/html": {
+                "schema": {
+                  "type": "string"
+                }
               }
             }
           }
@@ -16518,6 +17149,35 @@
         }
       }
     },
+    "/w/{workspace}/apps/embed_token/p/{path}": {
+      "get": {
+        "summary": "get app embed token by path",
+        "operationId": "getAppEmbedTokenByPath",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/ScriptPath"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "embed token",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EmbedTokenResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps/get/lite/{path}": {
       "get": {
         "summary": "get app lite by path",
@@ -16720,6 +17380,40 @@
         }
       }
     },
+    "/w/{workspace}/apps_u/embed_token/{secret}": {
+      "get": {
+        "summary": "get app embed token by secret",
+        "operationId": "getAppEmbedTokenBySecret",
+        "tags": [
+          "app"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "secret",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "embed token",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EmbedTokenResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/apps_u/public_resource/{path}": {
       "get": {
         "summary": "get public resource",
@@ -17864,6 +18558,14 @@
               "type": "boolean"
             }
           },
+          {
+            "name": "timeout",
+            "description": "custom timeout in seconds for this preview run",
+            "in": "query",
+            "schema": {
+              "type": "integer"
+            }
+          },
           {
             "$ref": "#/components/parameters/NewJobId"
           }
@@ -19889,6 +20591,89 @@
         }
       }
     },
+    "/w/{workspace}/jobs_u/get_flow_all_logs_structured/{id}": {
+      "get": {
+        "summary": "get all logs for a flow job in a structured format",
+        "operationId": "getFlowAllLogsStructured",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "structured logs of all flow steps, one entry per job",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "job_id": {
+                        "type": "string"
+                      },
+                      "label": {
+                        "type": "string",
+                        "description": "human-readable label describing the job's position in the flow tree"
+                      },
+                      "kind": {
+                        "type": "string",
+                        "description": "job kind (script, flow, forloopflow, ...)"
+                      },
+                      "flow_step_id": {
+                        "type": "string",
+                        "nullable": true
+                      },
+                      "step_path": {
+                        "type": "string",
+                        "nullable": true,
+                        "description": "materialized step path (e.g. \"a/b\")"
+                      },
+                      "depth": {
+                        "type": "integer",
+                        "description": "depth in the flow tree (0 for the root flow job)"
+                      },
+                      "parent_module_type": {
+                        "type": "string",
+                        "nullable": true,
+                        "description": "parent module type (forloopflow, branchall, ...)"
+                      },
+                      "sibling_index": {
+                        "type": "integer",
+                        "description": "1-based index of this job among siblings sharing the same step"
+                      },
+                      "sibling_count": {
+                        "type": "integer",
+                        "description": "total number of siblings sharing the same step"
+                      },
+                      "logs": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "job_id",
+                      "label",
+                      "kind",
+                      "depth",
+                      "sibling_index",
+                      "sibling_count",
+                      "logs"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs_u/get_completed_logs_tail/{id}": {
       "get": {
         "summary": "get completed job logs tail",
@@ -20401,6 +21186,192 @@
         }
       }
     },
+    "/w/{workspace}/jobs_u/dispatch_events/{id}": {
+      "get": {
+        "summary": "list asset-trigger dispatch events for a producer job",
+        "description": "Returns the chronological log of decisions the asset-trigger dispatcher made after this producer job completed. Each row is one (subscriber, asset write) decision: `dispatched` (with `child_job_id`), `join_pending` (with `received_inputs` / `required_inputs` / `partition`), or `skipped` (with `reason`). Rows are reaped automatically when the producer's `v2_job` row is deleted by the retention sweep.\n",
+        "operationId": "listDispatchEvents",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "$ref": "#/components/parameters/JobId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "dispatch events for this producer job",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "subscriber_path": {
+                        "type": "string"
+                      },
+                      "asset_kind": {
+                        "type": "string",
+                        "enum": [
+                          "s3object",
+                          "resource",
+                          "variable",
+                          "ducklake",
+                          "datatable",
+                          "volume"
+                        ]
+                      },
+                      "asset_path": {
+                        "type": "string"
+                      },
+                      "outcome": {
+                        "type": "string",
+                        "enum": [
+                          "dispatched",
+                          "join_pending",
+                          "skipped"
+                        ]
+                      },
+                      "child_job_id": {
+                        "type": "string",
+                        "format": "uuid"
+                      },
+                      "partition": {
+                        "type": "string"
+                      },
+                      "received_inputs": {
+                        "type": "integer"
+                      },
+                      "required_inputs": {
+                        "type": "integer"
+                      },
+                      "debounce_s": {
+                        "type": "integer"
+                      },
+                      "reason": {
+                        "type": "string"
+                      },
+                      "created_at": {
+                        "type": "string",
+                        "format": "date-time"
+                      }
+                    },
+                    "required": [
+                      "subscriber_path",
+                      "asset_kind",
+                      "asset_path",
+                      "outcome",
+                      "created_at"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/jobs/asset_dispatch_edges": {
+      "get": {
+        "summary": "list asset-cascade producer→child job edges for a folder",
+        "description": "Returns the `dispatched` asset-trigger edges (producer job → child job) whose subscriber lives under `path_start`. Lets a pipeline view reconstruct the cascade tree of a folder by job id and group connected runs. Visibility follows the producer job's RLS.\n",
+        "operationId": "listAssetDispatchEdges",
+        "tags": [
+          "job"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "path_start",
+            "in": "query",
+            "required": true,
+            "description": "Folder path prefix the children live under, e.g. `f/orders/`.",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "created_after",
+            "in": "query",
+            "required": false,
+            "description": "Only edges dispatched at/after this instant.",
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "asset-cascade edges for the folder",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "producer_job_id": {
+                        "type": "string",
+                        "format": "uuid"
+                      },
+                      "child_job_id": {
+                        "type": "string",
+                        "format": "uuid",
+                        "description": "Set for `dispatched`; absent for `join_pending` inputs."
+                      },
+                      "subscriber_path": {
+                        "type": "string"
+                      },
+                      "outcome": {
+                        "type": "string",
+                        "enum": [
+                          "dispatched",
+                          "join_pending"
+                        ]
+                      },
+                      "asset_kind": {
+                        "type": "string",
+                        "enum": [
+                          "s3object",
+                          "resource",
+                          "variable",
+                          "ducklake",
+                          "datatable",
+                          "volume"
+                        ]
+                      },
+                      "asset_path": {
+                        "type": "string"
+                      },
+                      "created_at": {
+                        "type": "string",
+                        "format": "date-time"
+                      }
+                    },
+                    "required": [
+                      "producer_job_id",
+                      "subscriber_path",
+                      "outcome",
+                      "asset_kind",
+                      "asset_path",
+                      "created_at"
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/jobs/completed/delete/{id}": {
       "post": {
         "summary": "delete completed job (erase content but keep run id)",
@@ -21097,6 +22068,10 @@
                           }
                         }
                       }
+                    },
+                    "view_token": {
+                      "type": "string",
+                      "description": "Share-read-link token for the flow. An authenticated workspace member can append it as a `view_token` query param on the run page to read a flow they don't otherwise have access to."
                     }
                   }
                 }
@@ -21517,6 +22492,10 @@
                           "approver"
                         ]
                       }
+                    },
+                    "view_token": {
+                      "type": "string",
+                      "description": "Share-read-link token for the parent flow. An authenticated workspace member can append it as a `view_token` query param on the run page to read a flow they don't otherwise have access to."
                     }
                   },
                   "required": [
@@ -32737,6 +33716,241 @@
         }
       }
     },
+    "/w/{workspace}/assets/graph": {
+      "get": {
+        "summary": "Get the workspace-wide asset <-> runnable graph",
+        "operationId": "getAssetsGraph",
+        "tags": [
+          "asset"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          },
+          {
+            "name": "asset_kinds",
+            "in": "query",
+            "description": "Filter by asset kinds (comma-separated list)",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "folder",
+            "in": "query",
+            "description": "Scope the graph to runnables in a single folder",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "asset graph nodes, lineage edges and trigger edges",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "required": [
+                    "assets",
+                    "runnables",
+                    "edges",
+                    "triggers"
+                  ],
+                  "properties": {
+                    "assets": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "kind",
+                          "path"
+                        ],
+                        "properties": {
+                          "kind": {
+                            "$ref": "#/components/schemas/AssetKind"
+                          },
+                          "path": {
+                            "type": "string"
+                          }
+                        }
+                      }
+                    },
+                    "runnables": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "path",
+                          "usage_kind"
+                        ],
+                        "properties": {
+                          "path": {
+                            "type": "string"
+                          },
+                          "usage_kind": {
+                            "$ref": "#/components/schemas/AssetUsageKind"
+                          },
+                          "in_pipeline": {
+                            "type": "boolean",
+                            "description": "True iff the script is a pipeline member (deployed with `// pipeline`). Omitted when false."
+                          }
+                        }
+                      }
+                    },
+                    "edges": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "required": [
+                          "runnable_path",
+                          "runnable_kind",
+                          "asset_kind",
+                          "asset_path"
+                        ],
+                        "properties": {
+                          "runnable_path": {
+                            "type": "string"
+                          },
+                          "runnable_kind": {
+                            "$ref": "#/components/schemas/AssetUsageKind"
+                          },
+                          "asset_kind": {
+                            "$ref": "#/components/schemas/AssetKind"
+                          },
+                          "asset_path": {
+                            "type": "string"
+                          },
+                          "access_type": {
+                            "$ref": "#/components/schemas/AssetUsageAccessType"
+                          }
+                        }
+                      }
+                    },
+                    "triggers": {
+                      "type": "array",
+                      "items": {
+                        "oneOf": [
+                          {
+                            "type": "object",
+                            "description": "Asset trigger edge (`// on <asset>`)",
+                            "required": [
+                              "trigger_kind",
+                              "asset_kind",
+                              "asset_path",
+                              "runnable_kind",
+                              "runnable_path"
+                            ],
+                            "properties": {
+                              "trigger_kind": {
+                                "type": "string",
+                                "enum": [
+                                  "asset"
+                                ]
+                              },
+                              "asset_kind": {
+                                "$ref": "#/components/schemas/AssetKind"
+                              },
+                              "asset_path": {
+                                "type": "string"
+                              },
+                              "runnable_kind": {
+                                "$ref": "#/components/schemas/AssetUsageKind"
+                              },
+                              "runnable_path": {
+                                "type": "string"
+                              }
+                            }
+                          },
+                          {
+                            "type": "object",
+                            "description": "Native trigger edge (schedule, email, kafka, ...). `path` is the trigger row's path.",
+                            "required": [
+                              "trigger_kind",
+                              "path",
+                              "runnable_kind",
+                              "runnable_path"
+                            ],
+                            "properties": {
+                              "trigger_kind": {
+                                "type": "string",
+                                "enum": [
+                                  "schedule",
+                                  "email",
+                                  "kafka",
+                                  "mqtt",
+                                  "nats",
+                                  "postgres",
+                                  "sqs",
+                                  "gcp"
+                                ]
+                              },
+                              "path": {
+                                "type": "string"
+                              },
+                              "runnable_kind": {
+                                "$ref": "#/components/schemas/AssetUsageKind"
+                              },
+                              "runnable_path": {
+                                "type": "string"
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/w/{workspace}/assets/pipelines": {
+      "get": {
+        "summary": "List folders that contain at least one pipeline-member script",
+        "operationId": "listPipelineFolders",
+        "tags": [
+          "asset"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/WorkspaceId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "folders containing pipeline scripts, with their script counts",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "folder",
+                      "script_count"
+                    ],
+                    "properties": {
+                      "folder": {
+                        "type": "string",
+                        "description": "The folder name (without the `f/` prefix)"
+                      },
+                      "script_count": {
+                        "type": "integer",
+                        "format": "int64",
+                        "description": "Number of pipeline-member scripts in the folder"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/w/{workspace}/volumes/list": {
       "get": {
         "summary": "List all volumes in the workspace",
@@ -33686,7 +34900,8 @@
           "trigger_cli",
           "trigger_nextcloud",
           "trigger_google",
-          "trigger_github"
+          "trigger_github",
+          "data_pipeline"
         ]
       },
       "OpenFlow": {
@@ -36308,6 +37523,10 @@
           "parent_hash": {
             "type": "string"
           },
+          "auto_parent": {
+            "type": "boolean",
+            "description": "When true, the backend resolves the parent to the current deployed head for this path within the transaction (ignoring parent_hash), instead of failing with a \"lineage must be linear\" error when the supplied parent_hash is stale."
+          },
           "summary": {
             "type": "string"
           },
@@ -36709,6 +37928,9 @@
           "preprocessed": {
             "type": "boolean"
           },
+          "is_retry": {
+            "type": "boolean"
+          },
           "worker": {
             "type": "string"
           }
@@ -36866,6 +38088,9 @@
           "preprocessed": {
             "type": "boolean"
           },
+          "is_retry": {
+            "type": "boolean"
+          },
           "worker": {
             "type": "string"
           }
@@ -37373,6 +38598,12 @@
               "type": "string"
             }
           },
+          "folders_read": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
           "folders_owners": {
             "type": "array",
             "items": {
@@ -37400,6 +38631,7 @@
           "operator",
           "disabled",
           "folders",
+          "folders_read",
           "folders_owners"
         ]
       },
@@ -39303,7 +40535,8 @@
           "gcp",
           "azure",
           "google",
-          "github"
+          "github",
+          "asset"
         ]
       },
       "TriggerMode": {
@@ -43149,6 +44382,10 @@
           },
           "on_behalf_of_email": {
             "type": "string"
+          },
+          "sandbox": {
+            "type": "boolean",
+            "description": "Publisher opt-in to app sandbox isolation (alpha). When true the app is isolated from each viewer's Windmill session. When false/absent the app runs same-origin with the viewer's full session (the default, pre-isolation behavior).\n"
           }
         }
       },
@@ -43430,6 +44667,44 @@
           "version"
         ]
       },
+      "EmbedTokenResponse": {
+        "type": "object",
+        "properties": {
+          "token": {
+            "type": "string",
+            "nullable": true,
+            "description": "Narrowly-scoped embed token for the iframe. Absent for fully anonymous or raw apps, which load without a scoped token."
+          },
+          "expiration": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true,
+            "description": "Expiration of the embed token."
+          },
+          "raw_app": {
+            "type": "boolean",
+            "description": "Raw apps render single-iframe and skip the opaque-viewer indirection and the embed token entirely."
+          },
+          "sandbox": {
+            "type": "boolean",
+            "description": "Publisher opted this app into sandbox isolation. When false the viewer runs the app same-origin with its full session."
+          },
+          "app_path": {
+            "type": "string",
+            "nullable": true,
+            "description": "The resolved app path; the embedder uses it to scope the app's backing localStorage per app."
+          },
+          "workspace_id": {
+            "type": "string",
+            "nullable": true,
+            "description": "The resolved workspace; pairs with app_path so apps at the same path in different workspaces don't share a localStorage store."
+          }
+        },
+        "required": [
+          "raw_app",
+          "sandbox"
+        ]
+      },
       "FlowVersion": {
         "type": "object",
         "properties": {
diff --git a/backend/windmill-api/openapi-deref.yaml b/backend/windmill-api/openapi-deref.yaml
index e45131d81b..e17c38efaf 100644
--- a/backend/windmill-api/openapi-deref.yaml
+++ b/backend/windmill-api/openapi-deref.yaml
@@ -1,6 +1,6 @@
 openapi: 3.0.3
 info:
-  version: 1.728.0
+  version: 1.740.0
   title: Windmill API
   contact:
     name: Windmill Team
@@ -146,18 +146,18 @@ paths:
                   checks:
                     type: object
                     description: Detailed health checks
-                    required: &ref_352
+                    required: &ref_354
                       - database
                       - readiness
-                    properties: &ref_353
+                    properties: &ref_355
                       database:
                         type: object
                         description: Database health status
-                        required: &ref_354
+                        required: &ref_356
                           - healthy
                           - latency_ms
                           - pool
-                        properties: &ref_355
+                        properties: &ref_357
                           healthy:
                             type: boolean
                             description: Whether the database is reachable
@@ -168,11 +168,11 @@ paths:
                           pool:
                             type: object
                             description: Database connection pool statistics
-                            required: &ref_356
+                            required: &ref_358
                               - size
                               - idle
                               - max_connections
-                            properties: &ref_357
+                            properties: &ref_359
                               size:
                                 type: integer
                                 description: Current number of connections in the pool
@@ -186,13 +186,13 @@ paths:
                         description: Workers health status
                         nullable: true
                         type: object
-                        required: &ref_358
+                        required: &ref_360
                           - healthy
                           - active_count
                           - worker_groups
                           - min_version
                           - versions
-                        properties: &ref_359
+                        properties: &ref_361
                           healthy:
                             type: boolean
                             description: Whether any workers are active
@@ -219,10 +219,10 @@ paths:
                         description: Job queue status
                         nullable: true
                         type: object
-                        required: &ref_360
+                        required: &ref_362
                           - pending_jobs
                           - running_jobs
-                        properties: &ref_361
+                        properties: &ref_363
                           pending_jobs:
                             type: integer
                             format: int64
@@ -234,9 +234,9 @@ paths:
                       readiness:
                         type: object
                         description: Server readiness status
-                        required: &ref_362
+                        required: &ref_364
                           - healthy
-                        properties: &ref_363
+                        properties: &ref_365
                           healthy:
                             type: boolean
                             description: Whether the server is ready to accept requests
@@ -275,40 +275,107 @@ paths:
             text/plain:
               schema:
                 type: string
-  /inkeep:
-    post:
-      summary: query Windmill AI documentation assistant (EE only)
-      operationId: queryDocumentation
+  /docs/search:
+    get:
+      summary: >-
+        Full-text search across the entire Windmill documentation. Provide one
+        or more keywords; returns the most relevant docs pages, each with its
+        Source URL and short matching snippets. Use this FIRST to find relevant
+        pages by their content (a flag, function, error message, config key or
+        concept). If the snippets answer the question, answer directly;
+        otherwise call readDocsPage with a returned Source URL to read more.
+      operationId: searchDocs
       x-mcp-tool: true
       tags:
         - documentation
-      requestBody:
-        description: query to send to the AI documentation assistant
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                query:
-                  type: string
-                  description: The documentation query to send to the AI assistant
-              required:
-                - query
+      parameters:
+        - name: query
+          description: >-
+            Keywords to search for in the documentation body, e.g. "chromium
+            worker tag" or "retry exponential backoff". Fewer, more distinctive
+            words match better.
+          in: query
+          required: true
+          schema:
+            type: string
       responses:
         '200':
-          description: AI documentation assistant response
+          description: matching documentation pages
           content:
             application/json:
               schema:
                 type: object
-                description: Response from Inkeep service
-        '403':
-          description: Enterprise Edition required
+                properties:
+                  text:
+                    type: string
+                    description: Model-ready rendering of the results
+                  results:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        url:
+                          type: string
+                        title:
+                          type: string
+                        score:
+                          type: integer
+                        snippets:
+                          type: array
+                          items:
+                            type: string
+                      required:
+                        - url
+                        - title
+                        - score
+                        - snippets
+                required:
+                  - text
+                  - results
+  /docs/page:
+    get:
+      summary: >-
+        Fetch the markdown of a single Windmill documentation page. Provide the
+        `url` of a page found via searchDocs (its Source URL). If the page is
+        large, this returns its list of section headings instead of the full
+        content; call again with the `section` argument set to one of those
+        headings to read that section.
+      operationId: readDocsPage
+      x-mcp-tool: true
+      tags:
+        - documentation
+      parameters:
+        - name: url
+          description: >-
+            The docs page to read, as a Source URL returned by searchDocs (e.g.
+            https://www.windmill.dev/docs/core_concepts/jobs). A bare path (e.g.
+            /docs/core_concepts/jobs) is also accepted.
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: section
+          description: >-
+            Optional. A heading title from the page outline to read just that
+            section instead of the full page.
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: documentation page content
           content:
-            text/plain:
+            application/json:
               schema:
-                type: string
+                type: object
+                properties:
+                  text:
+                    type: string
+                  source_url:
+                    type: string
+                required:
+                  - text
+                  - source_url
   /openapi.yaml:
     get:
       summary: get openapi yaml spec
@@ -488,24 +555,24 @@ paths:
         - name: before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_304
+          schema: &ref_306
             type: string
             format: date-time
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_305
+          schema: &ref_307
             type: string
             format: date-time
         - name: username
           description: filter on exact username of user
           in: query
-          schema: &ref_313
+          schema: &ref_315
             type: string
         - name: operation
           description: filter on exact or prefix name of operation
           in: query
-          schema: &ref_314
+          schema: &ref_316
             type: string
         - name: operations
           in: query
@@ -520,12 +587,12 @@ paths:
         - name: resource
           description: filter on exact or prefix name of resource
           in: query
-          schema: &ref_315
+          schema: &ref_317
             type: string
         - name: action_kind
           description: filter on type of operation
           in: query
-          schema: &ref_316
+          schema: &ref_318
             type: string
             enum:
               - Create
@@ -562,12 +629,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_403
+              properties: &ref_405
                 email:
                   type: string
                 password:
                   type: string
-              required: &ref_404
+              required: &ref_406
                 - email
                 - password
       responses:
@@ -749,6 +816,10 @@ paths:
                     type: array
                     items:
                       type: string
+                  folders_read:
+                    type: array
+                    items:
+                      type: string
                   folders_owners:
                     type: array
                     items:
@@ -757,7 +828,7 @@ paths:
                     nullable: true
                     allOf:
                       - type: object
-                        properties: &ref_400
+                        properties: &ref_402
                           source:
                             type: string
                             enum:
@@ -775,7 +846,7 @@ paths:
                             description: >-
                               The instance group name (when source is
                               'instance_group')
-                        required: &ref_401
+                        required: &ref_403
                           - source
                   is_service_account:
                     type: boolean
@@ -788,6 +859,7 @@ paths:
                   - operator
                   - disabled
                   - folders
+                  - folders_read
                   - folders_owners
   /w/{workspace}/users/update/{username}:
     post:
@@ -813,7 +885,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_405
+              properties: &ref_407
                 is_admin:
                   type: boolean
                 operator:
@@ -1187,7 +1259,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_419
+                  properties: &ref_421
                     jwt_hash:
                       type: integer
                       format: int64
@@ -1210,7 +1282,7 @@ paths:
                     last_used_at:
                       type: string
                       format: date-time
-                  required: &ref_420
+                  required: &ref_422
                     - jwt_hash
                     - email
                     - username
@@ -1342,7 +1414,7 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_406
+                      properties: &ref_408
                         label:
                           type: string
                         scopes:
@@ -1351,7 +1423,7 @@ paths:
                             type: string
                         expiration:
                           type: string
-                      required: &ref_407
+                      required: &ref_409
                         - label
                         - scopes
                     description: Tokens owned by this user (will be deleted)
@@ -1395,7 +1467,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_408
+              properties: &ref_410
                 reassign_to:
                   type: string
                   description: 'Target for reassignment: ''u/{username}'' or ''f/{folder}'''
@@ -1409,7 +1481,7 @@ paths:
                   type: boolean
                   default: true
                   description: Whether to also remove the user from the workspace
-              required: &ref_409
+              required: &ref_411
                 - reassign_to
       responses:
         '200':
@@ -1428,7 +1500,7 @@ paths:
                       on success.
                   summary:
                     type: object
-                    properties: &ref_410
+                    properties: &ref_412
                       scripts_reassigned:
                         type: integer
                       flows_reassigned:
@@ -1445,7 +1517,7 @@ paths:
                         type: integer
                       drafts_deleted:
                         type: integer
-                    required: &ref_411
+                    required: &ref_413
                       - scripts_reassigned
                       - flows_reassigned
                       - apps_reassigned
@@ -1475,12 +1547,12 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_412
+                properties: &ref_414
                   workspaces:
                     type: array
                     items:
                       type: object
-                      properties: &ref_414
+                      properties: &ref_416
                         workspace_id:
                           type: string
                         username:
@@ -1489,11 +1561,11 @@ paths:
                           type: object
                           properties: *ref_12
                           required: *ref_13
-                      required: &ref_415
+                      required: &ref_417
                         - workspace_id
                         - username
                         - preview
-                required: &ref_413
+                required: &ref_415
                   - workspaces
   /users/offboard/{email}:
     post:
@@ -1515,12 +1587,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_416
+              properties: &ref_418
                 reassignments:
                   type: object
                   additionalProperties:
                     type: object
-                    properties: &ref_417
+                    properties: &ref_419
                       reassign_to:
                         type: string
                         description: 'Target: ''u/{username}'' or ''f/{folder}'''
@@ -1529,7 +1601,7 @@ paths:
                         description: >-
                           Required when reassign_to is a folder. Username to use
                           as permissioned_as.
-                    required: &ref_418
+                    required: &ref_420
                       - reassign_to
                   description: Map of workspace_id to reassignment config
                 delete_user:
@@ -1589,7 +1661,7 @@ paths:
             application/json:
               schema:
                 type: array
-                items: &ref_563
+                items: &ref_565
                   type: object
                   properties:
                     workspace_id:
@@ -1699,7 +1771,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_504
+                properties: &ref_506
                   email:
                     type: string
                   workspaces:
@@ -1774,9 +1846,43 @@ paths:
                         - username
                         - color
                         - disabled
-                required: &ref_505
+                required: &ref_507
                   - email
                   - workspaces
+  /workspaces/session_workspace_status:
+    post:
+      summary: >-
+        get the lifecycle status of workspaces referenced by client-side
+        sessions
+      operationId: getSessionWorkspaceStatus
+      tags:
+        - workspace
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                workspace_ids:
+                  type: array
+                  items:
+                    type: string
+              required:
+                - workspace_ids
+      responses:
+        '200':
+          description: map of workspace id to status (active, archived, or deleted)
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: string
+                  enum:
+                    - active
+                    - archived
+                    - deleted
   /w/{workspace}/workspaces/get_as_superadmin:
     get:
       summary: get workspace as super admin (require to be super admin)
@@ -1836,7 +1942,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_506
+              properties: &ref_508
                 id:
                   type: string
                 name:
@@ -1845,7 +1951,7 @@ paths:
                   type: string
                 color:
                   type: string
-              required: &ref_507
+              required: &ref_509
                 - id
                 - name
       responses:
@@ -2021,7 +2127,7 @@ paths:
                   properties: &ref_24
                     logs:
                       type: object
-                      properties: &ref_472
+                      properties: &ref_474
                         super_admin:
                           type: string
                           enum: &ref_21
@@ -2548,6 +2654,9 @@ paths:
                   s3_deleted:
                     type: integer
                     format: int64
+                  s3_not_found:
+                    type: integer
+                    format: int64
                   orphans_scanned:
                     type: integer
                     format: int64
@@ -2618,6 +2727,90 @@ paths:
                   - bootstrapping
                   - last_run_exported
                   - updated_at
+  /settings/audit_logs_s3_backfill:
+    post:
+      summary: start an opt-in historical backfill of audit logs to object storage
+      operationId: runAuditLogsS3Backfill
+      tags:
+        - setting
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                from:
+                  type: string
+                  format: date-time
+                  description: inclusive lower bound of the window to export
+                to:
+                  type: string
+                  format: date-time
+                  description: exclusive upper bound of the window to export
+              required:
+                - from
+                - to
+      responses:
+        '202':
+          description: backfill started
+  /settings/audit_logs_s3_backfill_status:
+    get:
+      summary: get status of the audit-log object-store historical backfill
+      operationId: getAuditLogsS3BackfillStatus
+      tags:
+        - setting
+      responses:
+        '200':
+          description: current backfill status (null if never run)
+          content:
+            application/json:
+              schema:
+                nullable: true
+                type: object
+                properties:
+                  running:
+                    type: boolean
+                  started_at:
+                    type: string
+                    format: date-time
+                  finished_at:
+                    type: string
+                    format: date-time
+                    nullable: true
+                  phase:
+                    type: string
+                  from:
+                    type: string
+                    format: date-time
+                  to:
+                    type: string
+                    format: date-time
+                  rows_written:
+                    type: integer
+                    format: int64
+                  objects_written:
+                    type: integer
+                    format: int64
+                  last_ts:
+                    type: string
+                    format: date-time
+                    nullable: true
+                  errors:
+                    type: integer
+                    format: int64
+                  last_error:
+                    type: string
+                    nullable: true
+                required:
+                  - running
+                  - started_at
+                  - phase
+                  - from
+                  - to
+                  - rows_written
+                  - objects_written
+                  - errors
   /settings/send_stats:
     post:
       summary: send stats
@@ -2828,11 +3021,11 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_546
+                  properties: &ref_548
                     name:
                       type: string
                     value: {}
-                  required: &ref_547
+                  required: &ref_549
                     - name
                     - value
   /settings/instance_config:
@@ -2930,9 +3123,9 @@ paths:
             application/json:
               schema:
                 type: object
-                required: &ref_375
+                required: &ref_377
                   - keys
-                properties: &ref_376
+                properties: &ref_378
                   keys:
                     type: array
                     items:
@@ -3049,11 +3242,11 @@ paths:
                     type: array
                     items:
                       type: object
-                      required: &ref_373
+                      required: &ref_375
                         - workspace_id
                         - path
                         - error
-                      properties: &ref_374
+                      properties: &ref_376
                         workspace_id:
                           type: string
                           description: Workspace ID where the secret is located
@@ -4348,13 +4541,13 @@ paths:
             application/json:
               schema:
                 type: object
-                required: &ref_555
+                required: &ref_557
                   - all_ahead_items_visible
                   - all_behind_items_visible
                   - skipped_comparison
                   - diffs
                   - summary
-                properties: &ref_556
+                properties: &ref_558
                   all_ahead_items_visible:
                     type: boolean
                     description: >-
@@ -4375,7 +4568,7 @@ paths:
                     description: List of differences found between workspaces
                     items:
                       type: object
-                      required: &ref_557
+                      required: &ref_559
                         - kind
                         - path
                         - ahead
@@ -4383,7 +4576,7 @@ paths:
                         - has_changes
                         - exists_in_source
                         - exists_in_fork
-                      properties: &ref_558
+                      properties: &ref_560
                         kind:
                           type: string
                           enum:
@@ -4428,7 +4621,7 @@ paths:
                   summary:
                     description: Summary statistics of the comparison
                     type: object
-                    required: &ref_559
+                    required: &ref_561
                       - total_diffs
                       - total_ahead
                       - total_behind
@@ -4442,7 +4635,7 @@ paths:
                       - schedules_changed
                       - triggers_changed
                       - conflicts
-                    properties: &ref_560
+                    properties: &ref_562
                       total_diffs:
                         type: integer
                         description: Total number of items with differences
@@ -4639,12 +4832,12 @@ paths:
                         type: array
                         items:
                           type: object
-                          properties: &ref_532
+                          properties: &ref_534
                             pattern:
                               type: string
                             allow:
                               type: string
-                          required: &ref_533
+                          required: &ref_535
                             - pattern
                             - allow
                       secondary_storage:
@@ -4777,7 +4970,7 @@ paths:
                   auto_invite:
                     type: object
                     description: Configuration for auto-inviting users to the workspace
-                    properties: &ref_364
+                    properties: &ref_366
                       enabled:
                         type: boolean
                         default: false
@@ -4818,7 +5011,7 @@ paths:
                         type: object
                         additionalProperties:
                           type: object
-                          properties: &ref_383
+                          properties: &ref_385
                             resource_path:
                               type: string
                             models:
@@ -4827,7 +5020,7 @@ paths:
                                 type: string
                             web_search_enabled:
                               type: boolean
-                          required: &ref_384
+                          required: &ref_386
                             - resource_path
                             - models
                       default_model:
@@ -4873,7 +5066,7 @@ paths:
                   error_handler:
                     type: object
                     description: Configuration for the workspace error handler
-                    properties: &ref_365
+                    properties: &ref_367
                       path:
                         type: string
                         description: Path to the error handler script or flow
@@ -4890,7 +5083,7 @@ paths:
                   success_handler:
                     type: object
                     description: Configuration for the workspace success handler
-                    properties: &ref_366
+                    properties: &ref_368
                       path:
                         type: string
                         description: Path to the success handler script or flow
@@ -5194,7 +5387,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_509
+                  properties: &ref_511
                     importer_path:
                       type: string
                     importer_kind:
@@ -5208,7 +5401,7 @@ paths:
                       items:
                         type: string
                       nullable: true
-                  required: &ref_510
+                  required: &ref_512
                     - importer_path
                     - importer_kind
   /w/{workspace}/workspaces/get_imports/{importer_path}:
@@ -5266,13 +5459,13 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_511
+                  properties: &ref_513
                     imported_path:
                       type: string
                     count:
                       type: integer
                       format: int64
-                  required: &ref_512
+                  required: &ref_514
                     - imported_path
                     - count
   /w/{workspace}/workspaces/get_dependency_map:
@@ -5295,7 +5488,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_508
+                  properties: &ref_510
                     workspace_id:
                       type: string
                       nullable: true
@@ -5827,7 +6020,7 @@ paths:
                         type: array
                         items:
                           type: object
-                          properties: &ref_385
+                          properties: &ref_387
                             provider:
                               type: string
                               enum: *ref_51
@@ -5835,7 +6028,7 @@ paths:
                               type: array
                               items:
                                 type: string
-                          required: &ref_386
+                          required: &ref_388
                             - provider
                             - models
                       default_model:
@@ -5926,10 +6119,10 @@ paths:
                 Request body for editing the workspace error handler. Accepts
                 both new grouped format and legacy flat format for backward
                 compatibility.
-              oneOf: &ref_367
+              oneOf: &ref_369
                 - type: object
                   description: New grouped format for editing error handler
-                  properties: &ref_368
+                  properties: &ref_370
                     path:
                       type: string
                       description: Path to the error handler script or flow
@@ -5947,7 +6140,7 @@ paths:
                   description: >-
                     Legacy flat format for editing error handler (deprecated,
                     use new format)
-                  properties: &ref_369
+                  properties: &ref_371
                     error_handler:
                       type: string
                       description: Path to the error handler script or flow
@@ -5986,10 +6179,10 @@ paths:
                 Request body for editing the workspace success handler. Accepts
                 both new grouped format and legacy flat format for backward
                 compatibility.
-              oneOf: &ref_370
+              oneOf: &ref_372
                 - type: object
                   description: New grouped format for editing success handler
-                  properties: &ref_371
+                  properties: &ref_373
                     path:
                       type: string
                       description: Path to the success handler script or flow
@@ -6001,7 +6194,7 @@ paths:
                   description: >-
                     Legacy flat format for editing success handler (deprecated,
                     use new format)
-                  properties: &ref_372
+                  properties: &ref_374
                     success_handler:
                       type: string
                       description: Path to the success handler script or flow
@@ -6118,10 +6311,10 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_524
+                  required: &ref_526
                     - datatable_name
                     - schemas
-                  properties: &ref_525
+                  properties: &ref_527
                     datatable_name:
                       type: string
                     schemas:
@@ -6163,10 +6356,10 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_526
+                  required: &ref_528
                     - datatable_name
                     - schemas
-                  properties: &ref_527
+                  properties: &ref_529
                     datatable_name:
                       type: string
                     schemas:
@@ -6211,12 +6404,12 @@ paths:
             application/json:
               schema:
                 type: object
-                required: &ref_528
+                required: &ref_530
                   - datatable_name
                   - schema_name
                   - table_name
                   - columns
-                properties: &ref_529
+                properties: &ref_531
                   datatable_name:
                     type: string
                   schema_name:
@@ -6977,7 +7170,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_402
+                  properties: &ref_404
                     email:
                       type: string
                     executions:
@@ -7040,7 +7233,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_520
+                  properties: &ref_522
                     name:
                       type: string
                     description:
@@ -7050,7 +7243,7 @@ paths:
                       type: array
                       items:
                         type: object
-                        properties: &ref_518
+                        properties: &ref_520
                           value:
                             type: string
                           label:
@@ -7060,11 +7253,11 @@ paths:
                             nullable: true
                           requires_resource_path:
                             type: boolean
-                        required: &ref_519
+                        required: &ref_521
                           - value
                           - label
                           - requires_resource_path
-                  required: &ref_521
+                  required: &ref_523
                     - name
                     - scopes
   /users/tokens/create:
@@ -7080,7 +7273,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_421
+              properties: &ref_423
                 label:
                   type: string
                 expiration:
@@ -7121,7 +7314,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_422
+              properties: &ref_424
                 label:
                   type: string
                 expiration:
@@ -7131,7 +7324,7 @@ paths:
                   type: string
                 workspace_id:
                   type: string
-              required: &ref_423
+              required: &ref_425
                 - impersonate_email
       responses:
         '201':
@@ -7249,7 +7442,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_108
+                  properties: &ref_109
                     label:
                       type: string
                     expiration:
@@ -7273,7 +7466,7 @@ paths:
                       type: string
                     read_only:
                       type: boolean
-                  required: &ref_109
+                  required: &ref_110
                     - token_prefix
                     - created_at
                     - last_used_at
@@ -7329,7 +7522,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_426
+              properties: &ref_428
                 path:
                   type: string
                   description: The path to the variable
@@ -7358,7 +7551,7 @@ paths:
                     type: string
                 ws_specific:
                   type: boolean
-              required: &ref_427
+              required: &ref_429
                 - path
                 - value
                 - is_secret
@@ -7480,7 +7673,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_428
+              properties: &ref_430
                 path:
                   type: string
                   description: The path to the variable
@@ -7853,7 +8046,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_424
+                  properties: &ref_426
                     name:
                       type: string
                     value:
@@ -7862,7 +8055,7 @@ paths:
                       type: string
                     is_custom:
                       type: boolean
-                  required: &ref_425
+                  required: &ref_427
                     - name
                     - value
                     - description
@@ -8049,12 +8242,12 @@ paths:
                   description: >-
                     A workspace protection rule defining restrictions and bypass
                     permissions
-                  required: &ref_566
+                  required: &ref_568
                     - name
                     - rules
                     - bypass_groups
                     - bypass_users
-                  properties: &ref_567
+                  properties: &ref_569
                     name:
                       type: string
                       description: Unique name for the protection rule
@@ -8066,7 +8259,7 @@ paths:
                       description: Configuration of protection restrictions
                       items: &ref_64
                         type: string
-                        enum: &ref_568
+                        enum: &ref_570
                           - DisableDirectDeployment
                           - DisableWorkspaceForking
                           - RestrictDeployToDeployers
@@ -8227,11 +8420,11 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_569
+                  required: &ref_571
                     - username
                     - email
                     - is_admin
-                  properties: &ref_570
+                  properties: &ref_572
                     username:
                       type: string
                     email:
@@ -8286,10 +8479,10 @@ paths:
                         type: array
                         items:
                           type: object
-                          required: &ref_571
+                          required: &ref_573
                             - username
                             - email
-                          properties: &ref_572
+                          properties: &ref_574
                             username:
                               type: string
                             email:
@@ -8918,6 +9111,13 @@ paths:
                     substituted into the fixed-host registry template
                     server-side (client_credentials flow only). The token URL is
                     never caller-supplied.
+                cc_token_url:
+                  type: string
+                  description: >-
+                    Bring-your-own token endpoint override (client_credentials
+                    flow only). Only honored together with
+                    cc_client_id/cc_client_secret and mutually exclusive with
+                    cc_instance; ignored/rejected on the shared-instance path.
                 mcp_server_url:
                   type: string
                   description: MCP server URL for MCP OAuth token refresh
@@ -8985,6 +9185,13 @@ paths:
                     client-credentials token URL is instance-templated;
                     substituted into the fixed-host registry template
                     server-side. The token URL is never caller-supplied.
+                cc_token_url:
+                  type: string
+                  description: >-
+                    Bring-your-own token endpoint override. Only honored
+                    together with cc_client_id/cc_client_secret and mutually
+                    exclusive with cc_instance; rejected on the shared-instance
+                    path.
       responses:
         '200':
           description: OAuth token response
@@ -9241,7 +9448,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_433
+              properties: &ref_435
                 path:
                   type: string
                   description: The path to the resource
@@ -9258,7 +9465,7 @@ paths:
                     type: string
                 ws_specific:
                   type: boolean
-              required: &ref_434
+              required: &ref_436
                 - path
                 - value
                 - resource_type
@@ -9349,7 +9556,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_435
+              properties: &ref_437
                 path:
                   type: string
                   description: The path to the resource
@@ -9802,7 +10009,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: &ref_278
+          schema: &ref_280
             type: string
       responses:
         '200':
@@ -9935,7 +10142,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_436
+              properties: &ref_438
                 schema: {}
                 description:
                   type: string
@@ -10312,7 +10519,7 @@ paths:
                     description: >-
                       Top-level flow definition containing metadata,
                       configuration, and the flow structure
-                    properties: &ref_124
+                    properties: &ref_125
                       summary:
                         type: string
                         description: Short description of what this flow does
@@ -10324,7 +10531,7 @@ paths:
                         description: >-
                           The flow structure containing modules and optional
                           preprocessor/failure handlers
-                        properties: &ref_611
+                        properties: &ref_613
                           modules:
                             type: array
                             description: >-
@@ -10356,7 +10563,7 @@ paths:
                                         in the flow. Use 'bun' as default
                                         language if unspecified. The script
                                         receives arguments from input_transforms
-                                      properties: &ref_328
+                                      properties: &ref_330
                                         input_transforms:
                                           type: object
                                           description: >-
@@ -10377,7 +10584,7 @@ paths:
                                                   step. Use for hardcoded values or
                                                   resource references like
                                                   '$res:path/to/resource'
-                                                properties: &ref_140
+                                                properties: &ref_142
                                                   value:
                                                     description: >-
                                                       The static value. For resources, use
@@ -10386,7 +10593,7 @@ paths:
                                                     type: string
                                                     enum:
                                                       - static
-                                                required: &ref_141
+                                                required: &ref_143
                                                   - type
                                               - type: object
                                                 description: >-
@@ -10534,7 +10741,7 @@ paths:
                                                   - r
                                                   - w
                                                   - rw
-                                      required: &ref_329
+                                      required: &ref_331
                                         - type
                                         - content
                                         - language
@@ -10544,7 +10751,7 @@ paths:
                                         Reference to an existing script by path.
                                         Use this when calling a previously saved
                                         script instead of writing inline code
-                                      properties: &ref_330
+                                      properties: &ref_332
                                         input_transforms:
                                           type: object
                                           description: >-
@@ -10584,7 +10791,7 @@ paths:
                                           description: >-
                                             If true, this script is a trigger that
                                             can start the flow
-                                      required: &ref_331
+                                      required: &ref_333
                                         - type
                                         - path
                                         - input_transforms
@@ -10593,7 +10800,7 @@ paths:
                                         Reference to an existing flow by path.
                                         Use this to call another flow as a
                                         subflow
-                                      properties: &ref_332
+                                      properties: &ref_334
                                         input_transforms:
                                           type: object
                                           description: >-
@@ -10618,7 +10825,7 @@ paths:
                                           type: string
                                           enum:
                                             - flow
-                                      required: &ref_333
+                                      required: &ref_335
                                         - type
                                         - path
                                         - input_transforms
@@ -10631,7 +10838,7 @@ paths:
                                         'flow_input.iter.index' for the index.
                                         Supports parallel execution for better
                                         performance on I/O-bound operations
-                                      properties: &ref_334
+                                      properties: &ref_336
                                         modules:
                                           type: array
                                           description: >-
@@ -10680,7 +10887,7 @@ paths:
                                           discriminator: *ref_86
                                         squash:
                                           type: boolean
-                                      required: &ref_335
+                                      required: &ref_337
                                         - modules
                                         - iterator
                                         - skip_failures
@@ -10692,7 +10899,7 @@ paths:
                                         condition after each iteration. Use
                                         stop_after_if on modules to control loop
                                         termination
-                                      properties: &ref_336
+                                      properties: &ref_338
                                         modules:
                                           type: array
                                           description: >-
@@ -10730,7 +10937,7 @@ paths:
                                           discriminator: *ref_86
                                         squash:
                                           type: boolean
-                                      required: &ref_337
+                                      required: &ref_339
                                         - modules
                                         - skip_failures
                                         - type
@@ -10742,7 +10949,7 @@ paths:
                                         one with a true expression runs. If no
                                         branches match, the default branch
                                         executes
-                                      properties: &ref_338
+                                      properties: &ref_340
                                         branches:
                                           type: array
                                           description: >-
@@ -10794,7 +11001,7 @@ paths:
                                           type: string
                                           enum:
                                             - branchone
-                                      required: &ref_339
+                                      required: &ref_341
                                         - branches
                                         - default
                                         - type
@@ -10805,7 +11012,7 @@ paths:
                                         BranchOne, all branches run regardless
                                         of conditions. Useful for executing
                                         independent tasks concurrently
-                                      properties: &ref_340
+                                      properties: &ref_342
                                         branches:
                                           type: array
                                           description: >-
@@ -10846,7 +11053,7 @@ paths:
                                             If true, all branches execute
                                             concurrently. If false, they execute
                                             sequentially
-                                      required: &ref_341
+                                      required: &ref_343
                                         - branches
                                         - type
                                     - type: object
@@ -10854,7 +11061,7 @@ paths:
                                         Pass-through module that returns its
                                         input unchanged. Useful for flow
                                         structure or as a placeholder
-                                      properties: &ref_342
+                                      properties: &ref_344
                                         type:
                                           type: string
                                           enum:
@@ -10864,7 +11071,7 @@ paths:
                                           description: >-
                                             If true, marks this as a flow identity
                                             (special handling)
-                                      required: &ref_343
+                                      required: &ref_345
                                         - type
                                     - type: object
                                       description: >-
@@ -10872,7 +11079,7 @@ paths:
                                         accomplish tasks. The agent receives
                                         inputs and can call any of its
                                         configured tools to complete the task
-                                      properties: &ref_344
+                                      properties: &ref_346
                                         input_transforms:
                                           type: object
                                           description: >-
@@ -10884,22 +11091,22 @@ paths:
                                                 Provider configuration - can be static
                                                 (ProviderConfig), JavaScript expression,
                                                 or AI-determined
-                                              oneOf: &ref_346
+                                              oneOf: &ref_348
                                                 - type: object
                                                   description: >-
                                                     Static provider configuration passed
                                                     directly to the AI agent
-                                                  properties: &ref_596
+                                                  properties: &ref_598
                                                     value:
                                                       type: object
                                                       description: >-
                                                         Complete AI provider configuration with
                                                         resource reference and model selection
-                                                      properties: &ref_594
+                                                      properties: &ref_596
                                                         kind:
                                                           type: string
                                                           description: Supported AI provider types
-                                                          enum: &ref_321
+                                                          enum: &ref_323
                                                             - openai
                                                             - azure_openai
                                                             - anthropic
@@ -10922,7 +11129,7 @@ paths:
                                                           description: >-
                                                             Model identifier (e.g., 'gpt-4',
                                                             'claude-3-opus-20240229', 'gemini-pro')
-                                                      required: &ref_595
+                                                      required: &ref_597
                                                         - kind
                                                         - resource
                                                         - model
@@ -10930,7 +11137,7 @@ paths:
                                                       type: string
                                                       enum:
                                                         - static
-                                                  required: &ref_597
+                                                  required: &ref_599
                                                     - type
                                                     - value
                                                 - type: object
@@ -10950,7 +11157,7 @@ paths:
                                                     satisfy the parameter.
                                                   properties: *ref_91
                                                   required: *ref_92
-                                              discriminator: &ref_347
+                                              discriminator: &ref_349
                                                 propertyName: type
                                                 mapping:
                                                   static: >-
@@ -11020,27 +11227,27 @@ paths:
                                                 Memory configuration - can be static
                                                 (MemoryConfig), JavaScript expression,
                                                 or AI-determined
-                                              oneOf: &ref_348
+                                              oneOf: &ref_350
                                                 - type: object
                                                   description: >-
                                                     Static memory configuration passed
                                                     directly to the AI agent
-                                                  properties: &ref_602
+                                                  properties: &ref_604
                                                     value:
                                                       description: Conversation memory configuration
-                                                      oneOf: &ref_600
+                                                      oneOf: &ref_602
                                                         - type: object
                                                           description: No conversation memory/context
-                                                          properties: &ref_322
+                                                          properties: &ref_324
                                                             kind:
                                                               type: string
                                                               enum:
                                                                 - 'off'
-                                                          required: &ref_323
+                                                          required: &ref_325
                                                             - kind
                                                         - type: object
                                                           description: Automatic context management
-                                                          properties: &ref_324
+                                                          properties: &ref_326
                                                             kind:
                                                               type: string
                                                               enum:
@@ -11055,11 +11262,11 @@ paths:
                                                               description: >-
                                                                 Identifier for persistent memory across
                                                                 agent invocations
-                                                          required: &ref_325
+                                                          required: &ref_327
                                                             - kind
                                                         - type: object
                                                           description: Explicit message history
-                                                          properties: &ref_326
+                                                          properties: &ref_328
                                                             kind:
                                                               type: string
                                                               enum:
@@ -11069,7 +11276,7 @@ paths:
                                                               items:
                                                                 type: object
                                                                 description: A single message in conversation history
-                                                                properties: &ref_598
+                                                                properties: &ref_600
                                                                   role:
                                                                     type: string
                                                                     enum:
@@ -11078,13 +11285,13 @@ paths:
                                                                       - system
                                                                   content:
                                                                     type: string
-                                                                required: &ref_599
+                                                                required: &ref_601
                                                                   - role
                                                                   - content
-                                                          required: &ref_327
+                                                          required: &ref_329
                                                             - kind
                                                             - messages
-                                                      discriminator: &ref_601
+                                                      discriminator: &ref_603
                                                         propertyName: kind
                                                         mapping:
                                                           'off': '#/components/schemas/MemoryOff'
@@ -11094,7 +11301,7 @@ paths:
                                                       type: string
                                                       enum:
                                                         - static
-                                                  required: &ref_603
+                                                  required: &ref_605
                                                     - type
                                                     - value
                                                 - type: object
@@ -11114,7 +11321,7 @@ paths:
                                                     satisfy the parameter.
                                                   properties: *ref_91
                                                   required: *ref_92
-                                              discriminator: &ref_349
+                                              discriminator: &ref_351
                                                 propertyName: type
                                                 mapping:
                                                   static: >-
@@ -11227,7 +11434,7 @@ paths:
                                               A tool available to an AI agent. Can be
                                               a flow module or an external MCP (Model
                                               Context Protocol) tool
-                                            properties: &ref_350
+                                            properties: &ref_352
                                               id:
                                                 type: string
                                                 description: >-
@@ -11245,12 +11452,12 @@ paths:
                                                   The implementation of a tool. Can be a
                                                   flow module (script/flow) or an MCP tool
                                                   reference
-                                                oneOf: &ref_609
+                                                oneOf: &ref_611
                                                   - description: >-
                                                       A tool implemented as a flow module
                                                       (script, flow, etc.). The AI can call
                                                       this like any other flow module
-                                                    allOf: &ref_604
+                                                    allOf: &ref_606
                                                       - type: object
                                                         properties:
                                                           tool_type:
@@ -11283,7 +11490,7 @@ paths:
                                                       Reference to an external MCP (Model
                                                       Context Protocol) tool. The AI can call
                                                       tools from MCP servers
-                                                    properties: &ref_605
+                                                    properties: &ref_607
                                                       tool_type:
                                                         type: string
                                                         enum:
@@ -11307,7 +11514,7 @@ paths:
                                                           MCP server
                                                         items:
                                                           type: string
-                                                    required: &ref_606
+                                                    required: &ref_608
                                                       - tool_type
                                                       - resource_path
                                                   - type: object
@@ -11315,20 +11522,20 @@ paths:
                                                       A tool implemented as a websearch tool.
                                                       The AI can call this like any other
                                                       websearch tool
-                                                    properties: &ref_607
+                                                    properties: &ref_609
                                                       tool_type:
                                                         type: string
                                                         enum:
                                                           - websearch
-                                                    required: &ref_608
+                                                    required: &ref_610
                                                       - tool_type
-                                                discriminator: &ref_610
+                                                discriminator: &ref_612
                                                   propertyName: tool_type
                                                   mapping:
                                                     flowmodule: '#/components/schemas/FlowModuleTool'
                                                     mcp: '#/components/schemas/McpToolValue'
                                                     websearch: '#/components/schemas/WebsearchToolValue'
-                                            required: &ref_351
+                                            required: &ref_353
                                               - id
                                               - value
                                         type:
@@ -11354,7 +11561,7 @@ paths:
                                           description: >-
                                             If true, the agent can execute multiple
                                             tool calls in parallel
-                                      required: &ref_345
+                                      required: &ref_347
                                         - tools
                                         - type
                                         - input_transforms
@@ -11527,7 +11734,7 @@ paths:
                                     Retry configuration for failed module
                                     executions
                                   type: object
-                                  properties: &ref_320
+                                  properties: &ref_322
                                     constant:
                                       type: object
                                       description: >-
@@ -11568,14 +11775,14 @@ paths:
                                       description: >-
                                         Conditional retry based on error or
                                         result
-                                      properties: &ref_199
+                                      properties: &ref_201
                                         expr:
                                           type: string
                                           description: >-
                                             JavaScript expression that returns true
                                             to retry. Has access to 'result' and
                                             'error' variables
-                                      required: &ref_200
+                                      required: &ref_202
                                         - expr
                                 debouncing:
                                   description: >-
@@ -11716,7 +11923,7 @@ paths:
                               description: >-
                                 A sticky note attached to a flow for
                                 documentation and annotation
-                              properties: &ref_149
+                              properties: &ref_151
                                 id:
                                   type: string
                                   description: Unique identifier for the note
@@ -11775,7 +11982,7 @@ paths:
                                   description: >-
                                     For group notes, the IDs of nodes contained
                                     within this group
-                              required: &ref_150
+                              required: &ref_152
                                 - id
                                 - text
                                 - color
@@ -11795,7 +12002,7 @@ paths:
                                 collapsibility in the editor. Members are
                                 computed dynamically from all nodes on paths
                                 between start_id and end_id.
-                              properties: &ref_151
+                              properties: &ref_153
                                 summary:
                                   type: string
                                   description: Display name for this group
@@ -11821,10 +12028,10 @@ paths:
                                 color:
                                   type: string
                                   description: Color for the group in the flow editor
-                              required: &ref_152
+                              required: &ref_154
                                 - start_id
                                 - end_id
-                        required: &ref_612
+                        required: &ref_614
                           - modules
                       schema:
                         type: object
@@ -11838,7 +12045,7 @@ paths:
                         description: >-
                           The flow will be run with the permissions of the user
                           with this email.
-                    required: &ref_125
+                    required: &ref_126
                       - summary
                       - value
   /apps/hub/list:
@@ -11951,7 +12158,7 @@ paths:
         - name: custom_path
           in: path
           required: true
-          schema: &ref_137
+          schema: &ref_97
             type: string
       responses:
         '200':
@@ -11961,7 +12168,7 @@ paths:
               schema:
                 allOf:
                   - type: object
-                    properties: &ref_132
+                    properties: &ref_133
                       id:
                         type: integer
                       workspace_id:
@@ -11982,7 +12189,7 @@ paths:
                       value: {}
                       policy:
                         type: object
-                        properties: &ref_131
+                        properties: &ref_132
                           triggerables:
                             type: object
                             additionalProperties:
@@ -12014,6 +12221,14 @@ paths:
                             type: string
                           on_behalf_of_email:
                             type: string
+                          sandbox:
+                            type: boolean
+                            description: >
+                              Publisher opt-in to app sandbox isolation (alpha).
+                              When true the app is isolated from each viewer's
+                              Windmill session. When false/absent the app runs
+                              same-origin with the viewer's full session (the
+                              default, pre-isolation behavior).
                       execution_mode:
                         type: string
                         enum:
@@ -12035,7 +12250,7 @@ paths:
                         items:
                           type: string
                         default: []
-                    required: &ref_133
+                    required: &ref_134
                       - id
                       - workspace_id
                       - path
@@ -12052,6 +12267,64 @@ paths:
                     properties:
                       workspace_id:
                         type: string
+  /apps_u/embed_token_by_custom_path/{custom_path}:
+    get:
+      summary: get app embed token by custom path
+      operationId: getAppEmbedTokenByCustomPath
+      tags:
+        - app
+      parameters:
+        - name: custom_path
+          in: path
+          required: true
+          schema: *ref_97
+      responses:
+        '200':
+          description: embed token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: &ref_135
+                  token:
+                    type: string
+                    nullable: true
+                    description: >-
+                      Narrowly-scoped embed token for the iframe. Absent for
+                      fully anonymous or raw apps, which load without a scoped
+                      token.
+                  expiration:
+                    type: string
+                    format: date-time
+                    nullable: true
+                    description: Expiration of the embed token.
+                  raw_app:
+                    type: boolean
+                    description: >-
+                      Raw apps render single-iframe and skip the opaque-viewer
+                      indirection and the embed token entirely.
+                  sandbox:
+                    type: boolean
+                    description: >-
+                      Publisher opted this app into sandbox isolation. When
+                      false the viewer runs the app same-origin with its full
+                      session.
+                  app_path:
+                    type: string
+                    nullable: true
+                    description: >-
+                      The resolved app path; the embedder uses it to scope the
+                      app's backing localStorage per app.
+                  workspace_id:
+                    type: string
+                    nullable: true
+                    description: >-
+                      The resolved workspace; pairs with app_path so apps at the
+                      same path in different workspaces don't share a
+                      localStorage store.
+                required: &ref_136
+                  - raw_app
+                  - sandbox
   /scripts/hub/get/{path}:
     get:
       summary: get hub script content by path
@@ -12062,7 +12335,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: &ref_97
+          schema: &ref_98
             type: string
       responses:
         '200':
@@ -12081,7 +12354,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script details
@@ -12112,7 +12385,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script pick recorded
@@ -12175,7 +12448,7 @@ paths:
                           type: number
                         kind:
                           type: string
-                          enum: &ref_98
+                          enum: &ref_99
                             - script
                             - failure
                             - trigger
@@ -12246,7 +12519,7 @@ paths:
                       type: string
                     kind:
                       type: string
-                      enum: *ref_98
+                      enum: *ref_99
                     score:
                       type: number
                   required:
@@ -12308,7 +12581,7 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: &ref_122
+          schema: &ref_123
             type: boolean
         - name: created_by
           description: >-
@@ -12316,7 +12589,7 @@ paths:
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: &ref_123
+          schema: &ref_124
             type: string
         - name: path_start
           description: mask to filter matching starting path
@@ -12458,7 +12731,7 @@ paths:
                 items:
                   allOf:
                     - type: object
-                      properties: &ref_105
+                      properties: &ref_106
                         workspace_id:
                           type: string
                         hash:
@@ -12501,7 +12774,7 @@ paths:
                           type: string
                         language:
                           type: string
-                          enum: &ref_99
+                          enum: &ref_100
                             - python3
                             - deno
                             - go
@@ -12599,20 +12872,20 @@ paths:
                           additionalProperties:
                             type: object
                             description: An additional module file associated with a script
-                            properties: &ref_101
+                            properties: &ref_102
                               content:
                                 type: string
                                 description: The source code content of this module
                               language:
                                 type: string
-                                enum: *ref_99
+                                enum: *ref_100
                               lock:
                                 type: string
                                 nullable: true
                                 description: >-
                                   Lock file content for this module's
                                   dependencies
-                            required: &ref_102
+                            required: &ref_103
                               - content
                               - language
                         labels:
@@ -12627,7 +12900,7 @@ paths:
                           description: >
                             Labels inherited from the parent folder, computed at
                             read time. Read-only — edit them on the folder.
-                      required: &ref_106
+                      required: &ref_107
                         - hash
                         - path
                         - summary
@@ -12708,6 +12981,14 @@ paths:
           in: path
           required: true
           schema: *ref_4
+        - name: all_users
+          in: query
+          description: >-
+            List every draft in the workspace (all users), not just the current
+            user's own + legacy rows. Other users' rows come back with
+            `mine=false` (view-only).
+          schema:
+            type: boolean
       responses:
         '200':
           description: the user's drafts
@@ -12726,7 +13007,7 @@ paths:
 
                         Postgres `DRAFT_KIND` enum and the backend
                         `UserDraftItemKind`.
-                      enum: &ref_100
+                      enum: &ref_101
                         - script
                         - flow
                         - app
@@ -12751,6 +13032,7 @@ paths:
                         - trigger_nextcloud
                         - trigger_google
                         - trigger_github
+                        - data_pipeline
                     path:
                       type: string
                     summary:
@@ -12779,12 +13061,43 @@ paths:
                     created_at:
                       type: string
                       format: date-time
+                    can_write:
+                      type: boolean
+                      description: >-
+                        Whether the current user may deploy/discard this draft
+                        (same check the deploy/discard endpoints enforce).
+                    mine:
+                      type: boolean
+                      description: >-
+                        The row belongs to the current user (own draft or the
+                        legacy no-owner row) and is therefore actionable. Always
+                        true in the default listing; with `all_users=true`,
+                        other users' rows are false (view-only).
+                    draft_users:
+                      description: >
+                        Draft authors at this (path, kind) — the legacy
+                        NULL-email row surfaced as a null username.
+
+                        Populated only for the shared full-page-editor kinds
+                        (script/flow/app/raw_app); omitted for
+
+                        drawer kinds, which keep their drafts private. Feeds the
+                        Draft badge's owner-avatar circles.
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          username:
+                            type: string
+                            nullable: true
                   required:
                     - kind
                     - path
                     - draft_only
                     - legacy_draft
                     - created_at
+                    - can_write
+                    - mine
   /w/{workspace}/drafts/get/{kind}/{path}:
     get:
       summary: >-
@@ -12808,11 +13121,11 @@ paths:
               the
 
               Postgres `DRAFT_KIND` enum and the backend `UserDraftItemKind`.
-            enum: *ref_100
+            enum: *ref_101
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: username
           in: query
           required: false
@@ -12838,6 +13151,48 @@ paths:
                   - created_at
         '404':
           description: no draft for that owner at that path
+  /w/{workspace}/drafts/get_own/{kind}/{path}:
+    get:
+      summary: fetch the current user's own draft content at a path (any kind)
+      operationId: getOwnDraft
+      tags:
+        - draft
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: kind
+          in: path
+          required: true
+          schema:
+            type: string
+            description: >
+              Closed set of item kinds a user can autosave as a draft. Mirrors
+              the
+
+              Postgres `DRAFT_KIND` enum and the backend `UserDraftItemKind`.
+            enum: *ref_101
+        - name: path
+          in: path
+          required: true
+          schema: *ref_98
+      responses:
+        '200':
+          description: the user's draft content, or null when none exists
+          content:
+            application/json:
+              schema:
+                nullable: true
+                type: object
+                properties:
+                  value: {}
+                  created_at:
+                    type: string
+                    format: date-time
+                required:
+                  - value
+                  - created_at
   /w/{workspace}/drafts/update/{kind}/{path}:
     post:
       summary: upsert (or clear) the current user's draft at a path
@@ -12859,11 +13214,11 @@ paths:
               the
 
               Postgres `DRAFT_KIND` enum and the backend `UserDraftItemKind`.
-            enum: *ref_100
+            enum: *ref_101
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         required: true
         content:
@@ -12891,6 +13246,14 @@ paths:
                     Delete-only. Target the legacy workspace-level row (email
                     NULL) instead of the current user's row. Used to discard a
                     legacy draft from the review page.
+                created_at:
+                  type: string
+                  format: date-time
+                  description: >-
+                    Upsert-only override for the stored creation timestamp.
+                    Normal saves omit it (stamped server-side); the
+                    localStorage→DB migration passes the draft's original write
+                    time so migrated drafts keep their age.
       responses:
         '200':
           description: save result
@@ -12910,6 +13273,57 @@ paths:
                 required:
                   - status
                   - current_timestamp
+  /w/{workspace}/drafts/migrate_legacy/{kind}/{path}:
+    post:
+      summary: resolve a legacy (workspace-level) draft (admin only)
+      description: >-
+        Delete a legacy draft (email NULL) or assign it to the authed admin as a
+        per-user draft. Workspace admins / superadmins only.
+      operationId: migrateLegacyDraft
+      tags:
+        - draft
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: kind
+          in: path
+          required: true
+          schema:
+            type: string
+            description: >
+              Closed set of item kinds a user can autosave as a draft. Mirrors
+              the
+
+              Postgres `DRAFT_KIND` enum and the backend `UserDraftItemKind`.
+            enum: *ref_101
+        - name: path
+          in: path
+          required: true
+          schema: *ref_98
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                action:
+                  type: string
+                  enum:
+                    - delete
+                    - assign_to_self
+                  description: delete the legacy draft, or take ownership of it.
+              required:
+                - action
+      responses:
+        '200':
+          description: migration result
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/scripts/create:
     post:
       summary: create script
@@ -12953,11 +13367,18 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_392
+              properties: &ref_394
                 path:
                   type: string
                 parent_hash:
                   type: string
+                auto_parent:
+                  type: boolean
+                  description: >-
+                    When true, the backend resolves the parent to the current
+                    deployed head for this path within the transaction (ignoring
+                    parent_hash), instead of failing with a "lineage must be
+                    linear" error when the supplied parent_hash is stale.
                 summary:
                   type: string
                 description:
@@ -12972,7 +13393,7 @@ paths:
                   type: string
                 language:
                   type: string
-                  enum: *ref_99
+                  enum: *ref_100
                 kind:
                   type: string
                   enum:
@@ -13055,7 +13476,7 @@ paths:
                         type: string
                       kind:
                         type: string
-                        enum: &ref_306
+                        enum: &ref_308
                           - s3object
                           - resource
                           - ducklake
@@ -13080,8 +13501,8 @@ paths:
                   additionalProperties:
                     type: object
                     description: An additional module file associated with a script
-                    properties: *ref_101
-                    required: *ref_102
+                    properties: *ref_102
+                    required: *ref_103
                 labels:
                   type: array
                   items:
@@ -13091,7 +13512,7 @@ paths:
                   description: >-
                     When true (set by the CLI / git sync), deploying this script
                     does not delete an existing user draft at the same path.
-              required: &ref_393
+              required: &ref_395
                 - path
                 - summary
                 - content
@@ -13117,7 +13538,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: Workspace error handler enabled
         required: true
@@ -13224,19 +13645,19 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_390
+              properties: &ref_392
                 workspace_id:
                   type: string
                 language:
                   type: string
-                  enum: *ref_99
+                  enum: *ref_100
                 name:
                   type: string
                 description:
                   type: string
                 content:
                   type: string
-              required: &ref_391
+              required: &ref_393
                 - workspace_id
                 - language
                 - content
@@ -13263,7 +13684,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_99
+            enum: *ref_100
         - name: name
           in: query
           required: false
@@ -13291,7 +13712,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_99
+            enum: *ref_100
         - name: name
           in: query
           required: false
@@ -13323,7 +13744,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_103
+                  properties: &ref_104
                     id:
                       type: integer
                     archived:
@@ -13336,13 +13757,13 @@ paths:
                       type: string
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                     workspace_id:
                       type: string
                     created_at:
                       type: string
                       format: date-time
-                  required: &ref_104
+                  required: &ref_105
                     - workspace_id
                     - language
                     - created_at
@@ -13365,7 +13786,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_99
+            enum: *ref_100
         - name: name
           in: query
           required: false
@@ -13378,8 +13799,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_103
-                required: *ref_104
+                properties: *ref_104
+                required: *ref_105
   /w/{workspace}/scripts/archive/p/{path}:
     post:
       summary: archive script by path
@@ -13394,7 +13815,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script archived
@@ -13416,7 +13837,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: &ref_107
+          schema: &ref_108
             type: string
       responses:
         '200':
@@ -13425,8 +13846,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_105
-                required: *ref_106
+                properties: *ref_106
+                required: *ref_107
   /w/{workspace}/scripts/delete/h/{hash}:
     post:
       summary: delete script by hash (erase content but keep hash, require admin)
@@ -13442,7 +13863,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_107
+          schema: *ref_108
       responses:
         '200':
           description: script details
@@ -13450,8 +13871,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_105
-                required: *ref_106
+                properties: *ref_106
+                required: *ref_107
   /w/{workspace}/scripts/delete/p/{path}:
     post:
       summary: delete script at a given path (require admin)
@@ -13467,7 +13888,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: keep_captures
           description: keep captures
           in: query
@@ -13529,7 +13950,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: with_starred_info
           in: query
           schema:
@@ -13549,8 +13970,8 @@ paths:
               schema:
                 allOf:
                   - type: object
-                    properties: *ref_105
-                    required: *ref_106
+                    properties: *ref_106
+                    required: *ref_107
                   - type: object
                     description: >
                       Overlay fields added to every "get by path" response that
@@ -13600,7 +14021,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: triggers count
@@ -13608,7 +14029,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_129
+                properties: &ref_130
                   primary_schedule:
                     type: object
                     properties:
@@ -13660,7 +14081,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: tokens list
@@ -13670,8 +14091,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_108
-                  required: *ref_109
+                  properties: *ref_109
+                  required: *ref_110
   /w/{workspace}/scripts/history/p/{path}:
     get:
       summary: get history of a script by path
@@ -13686,7 +14107,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script history
@@ -13696,12 +14117,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_110
+                  properties: &ref_111
                     script_hash:
                       type: string
                     deployment_msg:
                       type: string
-                  required: &ref_111
+                  required: &ref_112
                     - script_hash
   /w/{workspace}/scripts/list_paths_from_workspace_runnable/{path}:
     get:
@@ -13717,7 +14138,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: list of script paths
@@ -13739,7 +14160,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       tags:
         - script
       responses:
@@ -13749,8 +14170,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_110
-                required: *ref_111
+                properties: *ref_111
+                required: *ref_112
   /w/{workspace}/scripts/history_update/h/{hash}/p/{path}:
     post:
       summary: update history of a script
@@ -13765,11 +14186,11 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_107
+          schema: *ref_108
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: Script deployment message
         required: true
@@ -13857,7 +14278,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script content
@@ -13881,12 +14302,12 @@ paths:
         - name: token
           in: path
           required: true
-          schema: &ref_310
+          schema: &ref_312
             type: string
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script content
@@ -13908,7 +14329,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: does it exists
@@ -13930,7 +14351,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_107
+          schema: *ref_108
         - name: with_starred_info
           in: query
           schema:
@@ -13946,8 +14367,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_105
-                required: *ref_106
+                properties: *ref_106
+                required: *ref_107
   /w/{workspace}/scripts/raw/h/{path}:
     get:
       summary: raw script by hash
@@ -13962,7 +14383,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: script content
@@ -13984,7 +14405,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_107
+          schema: *ref_108
       responses:
         '200':
           description: script details
@@ -14034,7 +14455,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_112
+                  properties: &ref_113
                     test_script_path:
                       type: string
                     job_id:
@@ -14048,7 +14469,7 @@ paths:
                       type: string
                       format: date-time
                       nullable: true
-                  required: &ref_113
+                  required: &ref_114
                     - test_script_path
   /w/{workspace}/scripts/ci_test_results_batch:
     post:
@@ -14097,8 +14518,8 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: *ref_112
-                    required: *ref_113
+                    properties: *ref_113
+                    required: *ref_114
   /w/{workspace}/scripts/raw_temp/store:
     post:
       summary: store raw script content temporarily for CLI lock generation
@@ -14165,7 +14586,7 @@ paths:
                         type: string
                       language:
                         type: string
-                        enum: *ref_99
+                        enum: *ref_100
                       name:
                         description: named workspace dependency (null for default)
                         type: string
@@ -14262,7 +14683,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -14284,20 +14705,20 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: &ref_114
+          schema: &ref_115
             type: string
             format: uuid
         - name: tag
           description: Override the tag to use
           in: query
-          schema: &ref_115
+          schema: &ref_116
             type: string
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: &ref_116
+          schema: &ref_117
             type: string
         - name: job_id
           description: >-
@@ -14306,7 +14727,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: &ref_117
+          schema: &ref_118
             type: string
             format: uuid
         - name: invisible_to_owner
@@ -14345,23 +14766,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14369,7 +14790,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -14378,19 +14799,19 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: &ref_118
+          schema: &ref_119
             type: string
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: &ref_119
+          schema: &ref_120
             type: string
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: &ref_120
+          schema: &ref_121
             type: boolean
       requestBody:
         description: script args
@@ -14420,23 +14841,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14444,7 +14865,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -14453,13 +14874,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -14467,12 +14888,12 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: &ref_121
+          schema: &ref_122
             type: string
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
       responses:
         '200':
           description: job result
@@ -14493,7 +14914,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -14502,13 +14923,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14516,11 +14937,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14568,13 +14989,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14582,11 +15003,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14633,13 +15054,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -14647,7 +15068,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_121
+          schema: *ref_122
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14655,11 +15076,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14686,7 +15107,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -14695,13 +15116,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14709,11 +15130,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14755,7 +15176,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -14764,13 +15185,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -14778,7 +15199,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_121
+          schema: *ref_122
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14786,11 +15207,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14836,13 +15257,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14850,11 +15271,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14908,13 +15329,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -14922,7 +15343,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_121
+          schema: *ref_122
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14930,11 +15351,11 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -14968,23 +15389,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -14992,7 +15413,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -15001,17 +15422,17 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: poll_delay_ms
           description: delay between polling for job updates in milliseconds
           in: query
@@ -15047,23 +15468,23 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -15071,7 +15492,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -15080,13 +15501,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -15094,11 +15515,11 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_121
+          schema: *ref_122
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: poll_delay_ms
           description: delay between polling for job updates in milliseconds
           in: query
@@ -15133,17 +15554,17 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -15151,7 +15572,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -15160,17 +15581,17 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: poll_delay_ms
           description: delay between polling for job updates in milliseconds
           in: query
@@ -15213,17 +15634,17 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -15231,7 +15652,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -15240,13 +15661,13 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: queue_limit
           description: >
             The maximum size of the queue for which the request would get
             rejected if that job would push it above that limit
           in: query
-          schema: *ref_119
+          schema: *ref_120
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -15254,11 +15675,11 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_121
+          schema: *ref_122
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: poll_delay_ms
           description: delay between polling for job updates in milliseconds
           in: query
@@ -15398,14 +15819,14 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_122
+          schema: *ref_123
         - name: created_by
           description: >-
             filter by exact matching user creator. Supports comma-separated list
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -15480,15 +15901,15 @@ paths:
                 type: array
                 items:
                   allOf:
-                    - allOf: &ref_128
+                    - allOf: &ref_129
                         - type: object
                           description: >-
                             Top-level flow definition containing metadata,
                             configuration, and the flow structure
-                          properties: *ref_124
-                          required: *ref_125
+                          properties: *ref_125
+                          required: *ref_126
                         - type: object
-                          properties: &ref_514
+                          properties: &ref_516
                             workspace_id:
                               type: string
                             path:
@@ -15502,7 +15923,7 @@ paths:
                               type: boolean
                             extra_perms:
                               type: object
-                              additionalProperties: &ref_513
+                              additionalProperties: &ref_515
                                 type: boolean
                             starred:
                               type: boolean
@@ -15535,7 +15956,7 @@ paths:
                                 Labels inherited from the parent folder,
                                 computed at read time. Read-only — edit them on
                                 the folder.
-                          required: &ref_515
+                          required: &ref_517
                             - path
                             - edited_by
                             - edited_at
@@ -15595,7 +16016,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       tags:
         - flow
       responses:
@@ -15607,7 +16028,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_126
+                  properties: &ref_127
                     id:
                       type: integer
                     created_at:
@@ -15615,7 +16036,7 @@ paths:
                       format: date-time
                     deployment_msg:
                       type: string
-                  required: &ref_127
+                  required: &ref_128
                     - id
                     - created_at
   /w/{workspace}/flows/get_latest_version/{path}:
@@ -15630,7 +16051,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       tags:
         - flow
       responses:
@@ -15640,8 +16061,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_126
-                required: *ref_127
+                properties: *ref_127
+                required: *ref_128
   /w/{workspace}/flows/list_paths_from_workspace_runnable/{runnable_kind}/{path}:
     get:
       summary: list flow paths from workspace runnable
@@ -15656,7 +16077,7 @@ paths:
         - name: runnable_kind
           in: path
           required: true
-          schema: &ref_136
+          schema: &ref_139
             type: string
             enum:
               - script
@@ -15664,7 +16085,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: match_path_start
           in: query
           schema:
@@ -15700,7 +16121,7 @@ paths:
           content:
             application/json:
               schema:
-                allOf: *ref_128
+                allOf: *ref_129
   /w/{workspace}/flows/history_update/v/{version}:
     post:
       summary: update flow history
@@ -15751,7 +16172,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: with_starred_info
           in: query
           schema:
@@ -15770,7 +16191,7 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: *ref_128
+                  - allOf: *ref_129
                   - type: object
                     description: >
                       Overlay fields added to every "get by path" response that
@@ -15820,7 +16241,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: flow status
@@ -15848,7 +16269,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: triggers count
@@ -15856,7 +16277,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_129
+                properties: *ref_130
   /w/{workspace}/flows/list_tokens/{path}:
     get:
       summary: get tokens with flow scope
@@ -15871,7 +16292,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: tokens list
@@ -15881,8 +16302,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_108
-                  required: *ref_109
+                  properties: *ref_109
+                  required: *ref_110
   /w/{workspace}/flows/toggle_workspace_error_handler/{path}:
     post:
       summary: Toggle ON and OFF the workspace error handler for a given flow
@@ -15897,7 +16318,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: Workspace error handler enabled
         required: true
@@ -15929,7 +16350,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: flow details
@@ -15967,13 +16388,13 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: &ref_130
+                - allOf: &ref_131
                     - type: object
                       description: >-
                         Top-level flow definition containing metadata,
                         configuration, and the flow structure
-                      properties: *ref_124
-                      required: *ref_125
+                      properties: *ref_125
+                      required: *ref_126
                     - type: object
                       properties:
                         path:
@@ -16047,7 +16468,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: Partially filled flow
         required: true
@@ -16055,7 +16476,7 @@ paths:
           application/json:
             schema:
               allOf:
-                - allOf: *ref_130
+                - allOf: *ref_131
                 - type: object
                   properties:
                     deployment_message:
@@ -16087,7 +16508,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: archiveFlow
         required: true
@@ -16120,7 +16541,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: keep_captures
           description: keep captures
           in: query
@@ -16166,14 +16587,14 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_377
+                  required: &ref_379
                     - id
                     - workspace_id
                     - flow_path
                     - created_at
                     - updated_at
                     - created_by
-                  properties: &ref_378
+                  properties: &ref_380
                     id:
                       type: string
                       format: uuid
@@ -16266,14 +16687,14 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_379
+                  required: &ref_381
                     - id
                     - conversation_id
                     - message_type
                     - content
                     - created_at
                     - created_seq
-                  properties: &ref_380
+                  properties: &ref_382
                     id:
                       type: string
                       format: uuid
@@ -16379,14 +16800,14 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_122
+          schema: *ref_123
         - name: created_by
           description: >-
             filter by exact matching user creator. Supports comma-separated list
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -16419,7 +16840,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: &ref_212
+          schema: &ref_214
             type: boolean
       responses:
         '200':
@@ -16430,7 +16851,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_522
+                  properties: &ref_524
                     workspace_id:
                       type: string
                     path:
@@ -16460,7 +16881,7 @@ paths:
                       description: >
                         Labels inherited from the parent folder, computed at
                         read time. Read-only — edit them on the folder.
-                  required: &ref_523
+                  required: &ref_525
                     - workspace_id
                     - path
                     - summary
@@ -16600,6 +17021,141 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/ai_skills/list:
+    get:
+      summary: list the workspace AI chat skills (name + description only)
+      operationId: listAiSkills
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+      responses:
+        '200':
+          description: skill listing
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  required:
+                    - name
+                    - description
+                  properties:
+                    name:
+                      type: string
+                    description:
+                      type: string
+  /w/{workspace}/ai_skills/get/{name}:
+    get:
+      summary: get a workspace AI chat skill including its instructions
+      operationId: getAiSkill
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: skill
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - name
+                  - description
+                  - instructions
+                properties:
+                  name:
+                    type: string
+                  description:
+                    type: string
+                  instructions:
+                    type: string
+  /w/{workspace}/ai_skills/upload:
+    post:
+      summary: upsert workspace AI chat skills (admin only)
+      operationId: uploadAiSkills
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - skills
+              properties:
+                skills:
+                  type: array
+                  maxItems: 50
+                  items:
+                    type: object
+                    required:
+                      - name
+                      - description
+                      - instructions
+                    properties:
+                      name:
+                        type: string
+                        minLength: 1
+                        maxLength: 64
+                        pattern: ^[a-z0-9-]+$
+                      description:
+                        type: string
+                        minLength: 1
+                        maxLength: 1024
+                      instructions:
+                        type: string
+                        minLength: 1
+                        maxLength: 65536
+      responses:
+        '200':
+          description: uploaded
+          content:
+            text/plain:
+              schema:
+                type: string
+  /w/{workspace}/ai_skills/delete/{name}:
+    delete:
+      summary: delete a workspace AI chat skill (admin only)
+      operationId: deleteAiSkill
+      tags:
+        - workspace
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: deleted
+          content:
+            text/plain:
+              schema:
+                type: string
   /w/{workspace}/apps/get_data/v/{secretWithExtension}:
     get:
       summary: get raw app data by
@@ -16614,6 +17170,10 @@ paths:
         - name: secretWithExtension
           in: path
           required: true
+          description: >-
+            App version secret suffixed with the requested file type extension.
+            Supported extensions are `.js` (JavaScript bundle), `.css`
+            (stylesheet), and `.html` (sandboxed wrapper document).
           schema:
             type: string
       responses:
@@ -16623,6 +17183,12 @@ paths:
             text/javascript:
               schema:
                 type: string
+            text/css:
+              schema:
+                type: string
+            text/html:
+              schema:
+                type: string
   /w/{workspace}/apps/list_search:
     get:
       summary: list apps for search
@@ -16672,14 +17238,14 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_122
+          schema: *ref_123
         - name: created_by
           description: >-
             filter by exact matching user creator. Supports comma-separated list
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: path_start
           description: mask to filter matching starting path
           in: query
@@ -16726,7 +17292,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_516
+                  properties: &ref_518
                     id:
                       type: integer
                     workspace_id:
@@ -16813,7 +17379,7 @@ paths:
                       description: >
                         Labels inherited from the parent folder, computed at
                         read time. Read-only — edit them on the folder.
-                  required: &ref_517
+                  required: &ref_519
                     - id
                     - workspace_id
                     - path
@@ -16858,7 +17424,7 @@ paths:
                   type: string
                 policy:
                   type: object
-                  properties: *ref_131
+                  properties: *ref_132
                 deployment_message:
                   type: string
                 custom_path:
@@ -16919,7 +17485,7 @@ paths:
                       type: string
                     policy:
                       type: object
-                      properties: *ref_131
+                      properties: *ref_132
                     deployment_message:
                       type: string
                     custom_path:
@@ -16993,7 +17559,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: with_starred_info
           in: query
           schema:
@@ -17021,8 +17587,8 @@ paths:
               schema:
                 allOf:
                   - type: object
-                    properties: *ref_132
-                    required: *ref_133
+                    properties: *ref_133
+                    required: *ref_134
                   - type: object
                     description: >
                       Overlay fields added to every "get by path" response that
@@ -17058,6 +17624,30 @@ paths:
                       "diff vs deployed" UI in that case.
                     properties: *ref_78
                     required: *ref_79
+  /w/{workspace}/apps/embed_token/p/{path}:
+    get:
+      summary: get app embed token by path
+      operationId: getAppEmbedTokenByPath
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: path
+          in: path
+          required: true
+          schema: *ref_98
+      responses:
+        '200':
+          description: embed token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: *ref_135
+                required: *ref_136
   /w/{workspace}/apps/get/lite/{path}:
     get:
       summary: get app lite by path
@@ -17072,7 +17662,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: app lite details
@@ -17080,8 +17670,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_132
-                required: *ref_133
+                properties: *ref_133
+                required: *ref_134
   /w/{workspace}/apps/history/p/{path}:
     get:
       summary: get app history by path
@@ -17096,7 +17686,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: app history
@@ -17106,12 +17696,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_134
+                  properties: &ref_137
                     version:
                       type: integer
                     deployment_msg:
                       type: string
-                  required: &ref_135
+                  required: &ref_138
                     - version
   /w/{workspace}/apps/get_latest_version/{path}:
     get:
@@ -17125,7 +17715,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       tags:
         - app
       responses:
@@ -17135,8 +17725,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_134
-                required: *ref_135
+                properties: *ref_137
+                required: *ref_138
   /w/{workspace}/apps/list_paths_from_workspace_runnable/{runnable_kind}/{path}:
     get:
       summary: list app paths from workspace runnable
@@ -17151,11 +17741,11 @@ paths:
         - name: runnable_kind
           in: path
           required: true
-          schema: *ref_136
+          schema: *ref_139
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       responses:
         '200':
           description: list of app paths
@@ -17183,7 +17773,7 @@ paths:
         - name: version
           in: path
           required: true
-          schema: &ref_311
+          schema: &ref_313
             type: integer
       requestBody:
         description: App deployment message
@@ -17224,8 +17814,33 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_132
-                required: *ref_133
+                properties: *ref_133
+                required: *ref_134
+  /w/{workspace}/apps_u/embed_token/{secret}:
+    get:
+      summary: get app embed token by secret
+      operationId: getAppEmbedTokenBySecret
+      tags:
+        - app
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: secret
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: embed token
+          content:
+            application/json:
+              schema:
+                type: object
+                properties: *ref_135
+                required: *ref_136
   /w/{workspace}/apps_u/public_resource/{path}:
     get:
       summary: get public resource
@@ -17313,8 +17928,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_132
-                required: *ref_133
+                properties: *ref_133
+                required: *ref_134
   /w/{workspace}/apps/delete/{path}:
     delete:
       summary: delete app
@@ -17361,7 +17976,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: update app
         required: true
@@ -17377,7 +17992,7 @@ paths:
                 value: {}
                 policy:
                   type: object
-                  properties: *ref_131
+                  properties: *ref_132
                 deployment_message:
                   type: string
                 custom_path:
@@ -17418,7 +18033,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: update app
         required: true
@@ -17437,7 +18052,7 @@ paths:
                     value: {}
                     policy:
                       type: object
-                      properties: *ref_131
+                      properties: *ref_132
                     deployment_message:
                       type: string
                     custom_path:
@@ -17484,7 +18099,7 @@ paths:
         - name: custom_path
           in: path
           required: true
-          schema: *ref_137
+          schema: *ref_97
       responses:
         '200':
           description: custom path exists
@@ -17515,7 +18130,7 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_138
+                    properties: &ref_140
                       s3:
                         type: string
                       filename:
@@ -17524,7 +18139,7 @@ paths:
                         type: string
                       presigned:
                         type: string
-                    required: &ref_139
+                    required: &ref_141
                       - s3
               required:
                 - s3_objects
@@ -17537,8 +18152,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_138
-                  required: *ref_139
+                  properties: *ref_140
+                  required: *ref_141
   /w/{workspace}/apps_u/execute_component/{path}:
     post:
       summary: executeComponent
@@ -17553,7 +18168,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: update app
         required: true
@@ -17738,7 +18353,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -17753,17 +18368,17 @@ paths:
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -17771,7 +18386,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -17780,7 +18395,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -17841,17 +18456,17 @@ paths:
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -17859,7 +18474,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -17868,7 +18483,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -17936,14 +18551,14 @@ paths:
                             Maps input parameters for a step. Can be a static
                             value or a JavaScript expression that references
                             previous results or flow inputs
-                          oneOf: &ref_142
+                          oneOf: &ref_144
                             - type: object
                               description: >-
                                 Static value passed directly to the step. Use
                                 for hardcoded values or resource references like
                                 '$res:path/to/resource'
-                              properties: *ref_140
-                              required: *ref_141
+                              properties: *ref_142
+                              required: *ref_143
                             - type: object
                               description: >-
                                 JavaScript expression evaluated at runtime. Can
@@ -17961,7 +18576,7 @@ paths:
                                 parameter.
                               properties: *ref_91
                               required: *ref_92
-                          discriminator: &ref_143
+                          discriminator: &ref_145
                             propertyName: type
                             mapping:
                               static: '#/components/schemas/schemas-StaticTransform'
@@ -17981,8 +18596,8 @@ paths:
                             Maps input parameters for a step. Can be a static
                             value or a JavaScript expression that references
                             previous results or flow inputs
-                          oneOf: *ref_142
-                          discriminator: *ref_143
+                          oneOf: *ref_144
+                          discriminator: *ref_145
                       use_latest_version:
                         type: boolean
       responses:
@@ -18008,7 +18623,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_176
+          schema: &ref_178
             type: string
             format: uuid
         - name: scheduled_for
@@ -18027,11 +18642,11 @@ paths:
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -18039,7 +18654,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -18048,7 +18663,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: invisible_to_owner
           description: make the run invisible to the the flow owner (default false)
           in: query
@@ -18122,7 +18737,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_107
+          schema: *ref_108
         - name: scheduled_for
           description: when to schedule this job (leave empty for immediate run)
           in: query
@@ -18137,23 +18752,23 @@ paths:
         - name: skip_preprocessor
           description: skip the preprocessor
           in: query
-          schema: *ref_120
+          schema: *ref_121
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: tag
           description: Override the tag to use
           in: query
-          schema: *ref_115
+          schema: *ref_116
         - name: cache_ttl
           description: >-
             Override the cache time to live (in seconds). Can not be used to
             disable caching, only override with a new cache ttl
           in: query
-          schema: *ref_116
+          schema: *ref_117
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -18161,7 +18776,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: include_header
           description: >
             List of headers's keys (separated with ',') whove value are added to
@@ -18170,7 +18785,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -18210,12 +18825,17 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
           schema:
             type: boolean
+        - name: timeout
+          description: custom timeout in seconds for this preview run
+          in: query
+          schema:
+            type: integer
         - name: job_id
           description: >-
             The job id to assign to the created job. if missing, job is chosen
@@ -18223,7 +18843,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
       requestBody:
         description: preview
         required: true
@@ -18231,7 +18851,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_145
+              properties: &ref_147
                 content:
                   type: string
                   description: The code to run
@@ -18247,7 +18867,7 @@ paths:
                   additionalProperties: true
                 language:
                   type: string
-                  enum: *ref_99
+                  enum: *ref_100
                 tag:
                   type: string
                 kind:
@@ -18269,8 +18889,8 @@ paths:
                   additionalProperties:
                     type: object
                     description: An additional module file associated with a script
-                    properties: *ref_101
-                    required: *ref_102
+                    properties: *ref_102
+                    required: *ref_103
                 temp_script_refs:
                   type: object
                   nullable: true
@@ -18280,7 +18900,7 @@ paths:
                     local content instead of the deployed script
                   additionalProperties:
                     type: string
-              required: &ref_146
+              required: &ref_148
                 - args
       responses:
         '201':
@@ -18308,7 +18928,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_429
+              properties: &ref_431
                 content:
                   type: string
                   description: The code to run
@@ -18318,8 +18938,8 @@ paths:
                   additionalProperties: true
                 language:
                   type: string
-                  enum: *ref_99
-              required: &ref_430
+                  enum: *ref_100
+              required: &ref_432
                 - content
                 - args
                 - language
@@ -18343,7 +18963,7 @@ paths:
         - name: path
           in: path
           required: true
-          schema: *ref_97
+          schema: *ref_98
       requestBody:
         description: script args
         required: true
@@ -18351,7 +18971,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_144
+              properties: &ref_146
                 args:
                   type: object
                   description: The arguments to pass to the script or flow
@@ -18376,7 +18996,7 @@ paths:
         - name: hash
           in: path
           required: true
-          schema: *ref_107
+          schema: *ref_108
       requestBody:
         description: script args
         required: true
@@ -18384,7 +19004,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_144
+              properties: *ref_146
       responses:
         '200':
           description: script result
@@ -18418,8 +19038,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_145
-              required: *ref_146
+              properties: *ref_147
+              required: *ref_148
       responses:
         '200':
           description: job result
@@ -18454,12 +19074,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_431
+              properties: &ref_433
                 args:
                   type: object
                   description: The arguments to pass to the script or flow
                   additionalProperties: true
-              required: &ref_432
+              required: &ref_434
                 - args
       responses:
         '201':
@@ -18492,15 +19112,15 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_147
+                    properties: &ref_149
                       raw_code:
                         type: string
                       path:
                         type: string
                       language:
                         type: string
-                        enum: *ref_99
-                    required: &ref_148
+                        enum: *ref_100
+                    required: &ref_150
                       - raw_code
                       - path
                       - language
@@ -18544,8 +19164,8 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: *ref_147
-                    required: *ref_148
+                    properties: *ref_149
+                    required: *ref_150
                 entrypoint:
                   type: string
               required:
@@ -18585,7 +19205,7 @@ paths:
                   description: >-
                     The flow structure containing modules and optional
                     preprocessor/failure handlers
-                  properties: &ref_153
+                  properties: &ref_155
                     modules:
                       type: array
                       description: >-
@@ -18694,8 +19314,8 @@ paths:
                         description: >-
                           A sticky note attached to a flow for documentation and
                           annotation
-                        properties: *ref_149
-                        required: *ref_150
+                        properties: *ref_151
+                        required: *ref_152
                     groups:
                       type: array
                       description: Semantic groups of modules for organizational purposes
@@ -18708,9 +19328,9 @@ paths:
                           naming and collapsibility in the editor. Members are
                           computed dynamically from all nodes on paths between
                           start_id and end_id.
-                        properties: *ref_151
-                        required: *ref_152
-                  required: &ref_154
+                        properties: *ref_153
+                        required: *ref_154
+                  required: &ref_156
                     - modules
               required:
                 - path
@@ -18742,7 +19362,7 @@ paths:
             Header's key lowercased and '-'' replaced to '_' such that
             'Content-Type' becomes the 'content_type' arg key
           in: query
-          schema: *ref_118
+          schema: *ref_119
         - name: invisible_to_owner
           description: make the run invisible to the the script owner (default false)
           in: query
@@ -18755,7 +19375,7 @@ paths:
             queue or as a completed job, the request to create one will fail
             (Bad Request)
           in: query
-          schema: *ref_117
+          schema: *ref_118
         - name: memory_id
           description: memory ID for chat-enabled flows
           in: query
@@ -18769,14 +19389,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_156
+              properties: &ref_158
                 value:
                   type: object
                   description: >-
                     The flow structure containing modules and optional
                     preprocessor/failure handlers
-                  properties: *ref_153
-                  required: *ref_154
+                  properties: *ref_155
+                  required: *ref_156
                 path:
                   type: string
                 args:
@@ -18787,7 +19407,7 @@ paths:
                   type: string
                 restarted_from:
                   type: object
-                  properties: &ref_155
+                  properties: &ref_157
                     flow_job_id:
                       type: string
                       format: uuid
@@ -18820,7 +19440,7 @@ paths:
                         `RestartedFlow` against `nested.flow_job_id` instead of
                         fresh-launching it.
                       type: object
-                      properties: *ref_155
+                      properties: *ref_157
                 temp_script_refs:
                   type: object
                   nullable: true
@@ -18831,7 +19451,7 @@ paths:
                     of the deployed script
                   additionalProperties:
                     type: string
-              required: &ref_157
+              required: &ref_159
                 - value
                 - content
                 - args
@@ -18867,8 +19487,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_156
-              required: *ref_157
+              properties: *ref_158
+              required: *ref_159
       responses:
         '200':
           description: job result
@@ -18893,7 +19513,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_530
+              properties: &ref_532
                 entrypoint_function:
                   type: string
                   description: Name of the function to execute for dynamic select
@@ -18914,7 +19534,7 @@ paths:
                           description: Path to the deployed script or flow
                         runnable_kind:
                           type: string
-                          enum: &ref_204
+                          enum: &ref_206
                             - script
                             - flow
                       required:
@@ -18932,11 +19552,11 @@ paths:
                           description: Code content for inline execution
                         language:
                           type: string
-                          enum: *ref_99
+                          enum: *ref_100
                       required:
                         - source
                         - code
-              required: &ref_531
+              required: &ref_533
                 - entrypoint_function
                 - runnable_ref
       responses:
@@ -18962,27 +19582,27 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_122
+          schema: *ref_123
         - name: created_by
           description: >-
             filter by exact matching user creator. Supports comma-separated list
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: worker
           description: >-
             filter by worker this job ran on. Supports comma-separated list
             (e.g. 'worker-1,worker-2') and negation by prefixing all values with
             '!' (e.g. '!worker-1,!worker-2')
           in: query
-          schema: &ref_160
+          schema: &ref_162
             type: string
         - name: script_path_exact
           description: >-
@@ -18990,7 +19610,7 @@ paths:
             (e.g. 'f/script1,f/script2') and negation by prefixing all values
             with '!' (e.g. '!f/script1,!f/script2')
           in: query
-          schema: &ref_161
+          schema: &ref_163
             type: string
         - name: script_path_start
           description: >-
@@ -18998,12 +19618,12 @@ paths:
             'f/folder1,f/folder2') and negation by prefixing all values with '!'
             (e.g. '!f/folder1,!f/folder2')
           in: query
-          schema: &ref_162
+          schema: &ref_164
             type: string
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: &ref_163
+          schema: &ref_165
             type: string
         - name: trigger_path
           description: >-
@@ -19011,7 +19631,7 @@ paths:
             'f/trigger1,f/trigger2') and negation by prefixing all values with
             '!' (e.g. '!f/trigger1,!f/trigger2')
           in: query
-          schema: &ref_312
+          schema: &ref_314
             type: string
         - name: trigger_kind
           description: >-
@@ -19020,34 +19640,34 @@ paths:
             (e.g. '!schedule,!webhook')
           in: query
           x-go-name: JobTriggerKindParam
-          schema: &ref_192
+          schema: &ref_194
             type: string
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: &ref_164
+          schema: &ref_166
             type: string
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_165
+          schema: &ref_167
             type: string
             format: date-time
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: &ref_166
+          schema: &ref_168
             type: string
             format: date-time
         - name: success
           description: filter on successful jobs
           in: query
-          schema: &ref_174
+          schema: &ref_176
             type: boolean
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: &ref_168
+          schema: &ref_170
             type: boolean
         - name: job_kinds
           description: >-
@@ -19055,36 +19675,36 @@ paths:
             ('preview', 'script', 'dependencies', 'flow') and negation by
             prefixing all values with '!' (e.g. '!preview,!dependencies')
           in: query
-          schema: &ref_169
+          schema: &ref_171
             type: string
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: &ref_170
+          schema: &ref_172
             type: boolean
         - name: running
           description: filter on running jobs
           in: query
-          schema: &ref_167
+          schema: &ref_169
             type: boolean
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_171
+          schema: &ref_173
             type: string
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: &ref_173
+          schema: &ref_175
             type: string
         - name: allow_wildcards
           description: allow wildcards (*) in the filter of label, tag, worker
           in: query
-          schema: &ref_175
+          schema: &ref_177
             type: boolean
         - name: tag
           description: >-
@@ -19092,7 +19712,7 @@ paths:
             'gpu,highmem') and negation by prefixing all values with '!' (e.g.
             '!gpu,!highmem')
           in: query
-          schema: &ref_172
+          schema: &ref_174
             type: string
         - name: page
           description: which page to return (start at 1, default 1)
@@ -19123,7 +19743,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_195
+                  properties: &ref_197
                     workspace_id:
                       type: string
                     id:
@@ -19198,14 +19818,14 @@ paths:
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: &ref_179
+                      properties: &ref_181
                         step:
                           type: integer
                         modules:
                           type: array
                           items:
                             type: object
-                            properties: &ref_158
+                            properties: &ref_160
                               type:
                                 type: string
                                 enum:
@@ -19359,20 +19979,20 @@ paths:
                                 type: array
                                 items:
                                   type: boolean
-                            required: &ref_159
+                            required: &ref_161
                               - type
                         user_states:
                           additionalProperties: true
                         preprocessor_module:
                           allOf:
                             - type: object
-                              properties: *ref_158
-                              required: *ref_159
+                              properties: *ref_160
+                              required: *ref_161
                         failure_module:
                           allOf:
                             - type: object
-                              properties: *ref_158
-                              required: *ref_159
+                              properties: *ref_160
+                              required: *ref_161
                             - type: object
                               properties:
                                 parent_module:
@@ -19387,13 +20007,13 @@ paths:
                               items:
                                 type: string
                                 format: uuid
-                      required: &ref_180
+                      required: &ref_182
                         - step
                         - modules
                         - failure_module
                     workflow_as_code_status:
                       type: object
-                      properties: &ref_181
+                      properties: &ref_183
                         scheduled_for:
                           type: string
                           format: date-time
@@ -19409,13 +20029,13 @@ paths:
                       description: >-
                         The flow structure containing modules and optional
                         preprocessor/failure handlers
-                      properties: *ref_153
-                      required: *ref_154
+                      properties: *ref_155
+                      required: *ref_156
                     is_flow_step:
                       type: boolean
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                     email:
                       type: string
                     visible_to_owner:
@@ -19434,9 +20054,11 @@ paths:
                       type: number
                     preprocessed:
                       type: boolean
+                    is_retry:
+                      type: boolean
                     worker:
                       type: string
-                  required: &ref_196
+                  required: &ref_198
                     - id
                     - running
                     - canceled
@@ -19552,14 +20174,14 @@ paths:
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: label
           description: >-
             filter by exact matching job label. Supports comma-separated list
             (e.g. 'deploy,release') and negation by prefixing all values with
             '!' (e.g. '!deploy,!release')
           in: query
-          schema: &ref_178
+          schema: &ref_180
             type: string
         - name: worker
           description: >-
@@ -19567,117 +20189,117 @@ paths:
             (e.g. 'worker-1,worker-2') and negation by prefixing all values with
             '!' (e.g. '!worker-1,!worker-2')
           in: query
-          schema: *ref_160
+          schema: *ref_162
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: script_path_exact
           description: >-
             filter by exact matching script path. Supports comma-separated list
             (e.g. 'f/script1,f/script2') and negation by prefixing all values
             with '!' (e.g. '!f/script1,!f/script2')
           in: query
-          schema: *ref_161
+          schema: *ref_163
         - name: script_path_start
           description: >-
             filter by script path prefix. Supports comma-separated list (e.g.
             'f/folder1,f/folder2') and negation by prefixing all values with '!'
             (e.g. '!f/folder1,!f/folder2')
           in: query
-          schema: *ref_162
+          schema: *ref_164
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_163
+          schema: *ref_165
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_164
+          schema: *ref_166
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_165
+          schema: *ref_167
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_166
+          schema: *ref_168
         - name: created_before
           description: filter on created before (inclusive) timestamp
           in: query
-          schema: &ref_186
+          schema: &ref_188
             type: string
             format: date-time
         - name: created_after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: &ref_187
+          schema: &ref_189
             type: string
             format: date-time
         - name: completed_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: &ref_188
+          schema: &ref_190
             type: string
             format: date-time
         - name: completed_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: &ref_189
+          schema: &ref_191
             type: string
             format: date-time
         - name: created_before_queue
           description: filter on jobs created before X for jobs in the queue only
           in: query
-          schema: &ref_190
+          schema: &ref_192
             type: string
             format: date-time
         - name: created_after_queue
           description: filter on jobs created after X for jobs in the queue only
           in: query
-          schema: &ref_191
+          schema: &ref_193
             type: string
             format: date-time
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_167
+          schema: *ref_169
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_168
+          schema: *ref_170
         - name: job_kinds
           description: >-
             filter by job kind. Supports comma-separated list of values
             ('preview', 'script', 'dependencies', 'flow') and negation by
             prefixing all values with '!' (e.g. '!preview,!dependencies')
           in: query
-          schema: *ref_169
+          schema: *ref_171
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_170
+          schema: *ref_172
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: tag
           description: >-
             filter by tag/worker group. Supports comma-separated list (e.g.
             'gpu,highmem') and negation by prefixing all values with '!' (e.g.
             '!gpu,!highmem')
           in: query
-          schema: *ref_172
+          schema: *ref_174
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_173
+          schema: *ref_175
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -19754,96 +20376,96 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_122
+          schema: *ref_123
         - name: created_by
           description: >-
             filter by exact matching user creator. Supports comma-separated list
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: script_path_exact
           description: >-
             filter by exact matching script path. Supports comma-separated list
             (e.g. 'f/script1,f/script2') and negation by prefixing all values
             with '!' (e.g. '!f/script1,!f/script2')
           in: query
-          schema: *ref_161
+          schema: *ref_163
         - name: script_path_start
           description: >-
             filter by script path prefix. Supports comma-separated list (e.g.
             'f/folder1,f/folder2') and negation by prefixing all values with '!'
             (e.g. '!f/folder1,!f/folder2')
           in: query
-          schema: *ref_162
+          schema: *ref_164
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_163
+          schema: *ref_165
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_164
+          schema: *ref_166
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_165
+          schema: *ref_167
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_166
+          schema: *ref_168
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_174
+          schema: *ref_176
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_168
+          schema: *ref_170
         - name: job_kinds
           description: >-
             filter by job kind. Supports comma-separated list of values
             ('preview', 'script', 'dependencies', 'flow') and negation by
             prefixing all values with '!' (e.g. '!preview,!dependencies')
           in: query
-          schema: *ref_169
+          schema: *ref_171
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_170
+          schema: *ref_172
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_167
+          schema: *ref_169
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_173
+          schema: *ref_175
         - name: allow_wildcards
           description: allow wildcards (*) in the filter of label, tag, worker
           in: query
-          schema: *ref_175
+          schema: *ref_177
         - name: tag
           description: >-
             filter by tag/worker group. Supports comma-separated list (e.g.
             'gpu,highmem') and negation by prefixing all values with '!' (e.g.
             '!gpu,!highmem')
           in: query
-          schema: *ref_172
+          schema: *ref_174
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -19929,7 +20551,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: list of OTEL Span objects (compatible with OpenTelemetry Span proto)
@@ -19957,7 +20579,7 @@ paths:
           schema:
             description: job trigger kind (schedule, http, websocket...)
             type: string
-            enum: &ref_177
+            enum: &ref_179
               - webhook
               - default_email
               - email
@@ -19973,6 +20595,7 @@ paths:
               - azure
               - google
               - github
+              - asset
         - name: trigger_path
           description: The path of the trigger (can contain forward slashes)
           in: path
@@ -20023,7 +20646,7 @@ paths:
           schema:
             description: job trigger kind (schedule, http, websocket...)
             type: string
-            enum: *ref_177
+            enum: *ref_179
         - name: trigger_path
           description: The path of the trigger (can contain forward slashes)
           in: path
@@ -20070,68 +20693,68 @@ paths:
         - name: order_desc
           description: order by desc order (default true)
           in: query
-          schema: *ref_122
+          schema: *ref_123
         - name: created_by
           description: >-
             filter by exact matching user creator. Supports comma-separated list
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: label
           description: >-
             filter by exact matching job label. Supports comma-separated list
             (e.g. 'deploy,release') and negation by prefixing all values with
             '!' (e.g. '!deploy,!release')
           in: query
-          schema: *ref_178
+          schema: *ref_180
         - name: worker
           description: >-
             filter by worker this job ran on. Supports comma-separated list
             (e.g. 'worker-1,worker-2') and negation by prefixing all values with
             '!' (e.g. '!worker-1,!worker-2')
           in: query
-          schema: *ref_160
+          schema: *ref_162
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: script_path_exact
           description: >-
             filter by exact matching script path. Supports comma-separated list
             (e.g. 'f/script1,f/script2') and negation by prefixing all values
             with '!' (e.g. '!f/script1,!f/script2')
           in: query
-          schema: *ref_161
+          schema: *ref_163
         - name: script_path_start
           description: >-
             filter by script path prefix. Supports comma-separated list (e.g.
             'f/folder1,f/folder2') and negation by prefixing all values with '!'
             (e.g. '!f/folder1,!f/folder2')
           in: query
-          schema: *ref_162
+          schema: *ref_164
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_163
+          schema: *ref_165
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_164
+          schema: *ref_166
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_165
+          schema: *ref_167
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_166
+          schema: *ref_168
         - name: success
           description: filter on successful jobs
           in: query
-          schema: *ref_174
+          schema: *ref_176
         - name: status
           description: >-
             filter on the exact completed job status. Unlike `success=true`
@@ -20151,30 +20774,30 @@ paths:
             ('preview', 'script', 'dependencies', 'flow') and negation by
             prefixing all values with '!' (e.g. '!preview,!dependencies')
           in: query
-          schema: *ref_169
+          schema: *ref_171
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_173
+          schema: *ref_175
         - name: allow_wildcards
           description: allow wildcards (*) in the filter of label, tag, worker
           in: query
-          schema: *ref_175
+          schema: *ref_177
         - name: tag
           description: >-
             filter by tag/worker group. Supports comma-separated list (e.g.
             'gpu,highmem') and negation by prefixing all values with '!' (e.g.
             '!gpu,!highmem')
           in: query
-          schema: *ref_172
+          schema: *ref_174
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -20212,7 +20835,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_193
+                  properties: &ref_195
                     workspace_id:
                       type: string
                     id:
@@ -20289,23 +20912,23 @@ paths:
                         by extension its DT_TOKEN.
                     flow_status:
                       type: object
-                      properties: *ref_179
-                      required: *ref_180
+                      properties: *ref_181
+                      required: *ref_182
                     workflow_as_code_status:
                       type: object
-                      properties: *ref_181
+                      properties: *ref_183
                     raw_flow:
                       type: object
                       description: >-
                         The flow structure containing modules and optional
                         preprocessor/failure handlers
-                      properties: *ref_153
-                      required: *ref_154
+                      properties: *ref_155
+                      required: *ref_156
                     is_flow_step:
                       type: boolean
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                     is_skipped:
                       type: boolean
                     email:
@@ -20328,9 +20951,11 @@ paths:
                       type: number
                     preprocessed:
                       type: boolean
+                    is_retry:
+                      type: boolean
                     worker:
                       type: string
-                  required: &ref_194
+                  required: &ref_196
                     - id
                     - created_by
                     - duration_ms
@@ -20374,7 +20999,7 @@ paths:
                 items:
                   type: object
                   description: Completed job with full data for export/import operations
-                  properties: &ref_182
+                  properties: &ref_184
                     id:
                       type: string
                       format: uuid
@@ -20469,7 +21094,7 @@ paths:
                       type: boolean
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                     is_skipped:
                       type: boolean
                     email:
@@ -20512,7 +21137,7 @@ paths:
                     status:
                       type: string
                       description: Actual job status from database
-                  required: &ref_183
+                  required: &ref_185
                     - id
                     - created_by
                     - created_at
@@ -20540,8 +21165,8 @@ paths:
               items:
                 type: object
                 description: Completed job with full data for export/import operations
-                properties: *ref_182
-                required: *ref_183
+                properties: *ref_184
+                required: *ref_185
       responses:
         '200':
           description: Successfully imported completed jobs
@@ -20578,7 +21203,7 @@ paths:
                 items:
                   type: object
                   description: Queued job with full data for export/import operations
-                  properties: &ref_184
+                  properties: &ref_186
                     id:
                       type: string
                       format: uuid
@@ -20668,7 +21293,7 @@ paths:
                       type: boolean
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                     email:
                       type: string
                     visible_to_owner:
@@ -20709,7 +21334,7 @@ paths:
                     suspend_until:
                       type: string
                       format: date-time
-                  required: &ref_185
+                  required: &ref_187
                     - id
                     - created_by
                     - created_at
@@ -20737,8 +21362,8 @@ paths:
               items:
                 type: object
                 description: Queued job with full data for export/import operations
-                properties: *ref_184
-                required: *ref_185
+                properties: *ref_186
+                required: *ref_187
       responses:
         '200':
           description: Successfully imported queued jobs
@@ -20793,123 +21418,123 @@ paths:
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: label
           description: >-
             filter by exact matching job label. Supports comma-separated list
             (e.g. 'deploy,release') and negation by prefixing all values with
             '!' (e.g. '!deploy,!release')
           in: query
-          schema: *ref_178
+          schema: *ref_180
         - name: worker
           description: >-
             filter by worker this job ran on. Supports comma-separated list
             (e.g. 'worker-1,worker-2') and negation by prefixing all values with
             '!' (e.g. '!worker-1,!worker-2')
           in: query
-          schema: *ref_160
+          schema: *ref_162
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: script_path_exact
           description: >-
             filter by exact matching script path. Supports comma-separated list
             (e.g. 'f/script1,f/script2') and negation by prefixing all values
             with '!' (e.g. '!f/script1,!f/script2')
           in: query
-          schema: *ref_161
+          schema: *ref_163
         - name: script_path_start
           description: >-
             filter by script path prefix. Supports comma-separated list (e.g.
             'f/folder1,f/folder2') and negation by prefixing all values with '!'
             (e.g. '!f/folder1,!f/folder2')
           in: query
-          schema: *ref_162
+          schema: *ref_164
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_163
+          schema: *ref_165
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_164
+          schema: *ref_166
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_165
+          schema: *ref_167
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_166
+          schema: *ref_168
         - name: created_before
           description: filter on created before (inclusive) timestamp
           in: query
-          schema: *ref_186
+          schema: *ref_188
         - name: created_after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: *ref_187
+          schema: *ref_189
         - name: completed_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_188
+          schema: *ref_190
         - name: completed_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_189
+          schema: *ref_191
         - name: created_before_queue
           description: filter on jobs created before X for jobs in the queue only
           in: query
-          schema: *ref_190
+          schema: *ref_192
         - name: created_after_queue
           description: filter on jobs created after X for jobs in the queue only
           in: query
-          schema: *ref_191
+          schema: *ref_193
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_167
+          schema: *ref_169
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_168
+          schema: *ref_170
         - name: job_kinds
           description: >-
             filter by job kind. Supports comma-separated list of values
             ('preview', 'script', 'dependencies', 'flow') and negation by
             prefixing all values with '!' (e.g. '!preview,!dependencies')
           in: query
-          schema: *ref_169
+          schema: *ref_171
         - name: suspended
           description: filter on suspended jobs
           in: query
-          schema: *ref_170
+          schema: *ref_172
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: tag
           description: >-
             filter by tag/worker group. Supports comma-separated list (e.g.
             'gpu,highmem') and negation by prefixing all values with '!' (e.g.
             '!gpu,!highmem')
           in: query
-          schema: *ref_172
+          schema: *ref_174
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_173
+          schema: *ref_175
         - name: allow_wildcards
           description: allow wildcards (*) in the filter of label, tag, worker
           in: query
-          schema: *ref_175
+          schema: *ref_177
         - name: per_page
           description: number of items to return for a given page (default 30, max 100)
           in: query
@@ -20921,7 +21546,7 @@ paths:
             (e.g. '!schedule,!webhook')
           in: query
           x-go-name: JobTriggerKindParam
-          schema: *ref_192
+          schema: *ref_194
         - name: is_skipped
           description: is the job skipped
           in: query
@@ -20989,28 +21614,28 @@ paths:
               schema:
                 type: array
                 items:
-                  oneOf: &ref_197
-                    - allOf:
-                        - type: object
-                          properties: *ref_193
-                          required: *ref_194
-                        - type: object
-                          properties:
-                            type:
-                              type: string
-                              enum:
-                                - CompletedJob
+                  oneOf: &ref_199
                     - allOf:
                         - type: object
                           properties: *ref_195
                           required: *ref_196
+                        - type: object
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - CompletedJob
+                    - allOf:
+                        - type: object
+                          properties: *ref_197
+                          required: *ref_198
                         - type: object
                           properties:
                             type:
                               type: string
                               enum:
                                 - QueuedJob
-                  discriminator: &ref_198
+                  discriminator: &ref_200
                     propertyName: type
   /jobs/db_clock:
     get:
@@ -21078,7 +21703,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: no_logs
           in: query
           schema:
@@ -21101,8 +21726,8 @@ paths:
           content:
             application/json:
               schema:
-                oneOf: *ref_197
-                discriminator: *ref_198
+                oneOf: *ref_199
+                discriminator: *ref_200
   /w/{workspace}/jobs_u/get_root_job_id/{id}:
     get:
       summary: get root job id
@@ -21117,7 +21742,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: get root job id
@@ -21140,7 +21765,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: remove_ansi_warnings
           in: query
           schema:
@@ -21166,7 +21791,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: concatenated logs of all flow steps
@@ -21174,6 +21799,73 @@ paths:
             text/plain:
               schema:
                 type: string
+  /w/{workspace}/jobs_u/get_flow_all_logs_structured/{id}:
+    get:
+      summary: get all logs for a flow job in a structured format
+      operationId: getFlowAllLogsStructured
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: id
+          in: path
+          required: true
+          schema: *ref_178
+      responses:
+        '200':
+          description: structured logs of all flow steps, one entry per job
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    job_id:
+                      type: string
+                    label:
+                      type: string
+                      description: >-
+                        human-readable label describing the job's position in
+                        the flow tree
+                    kind:
+                      type: string
+                      description: job kind (script, flow, forloopflow, ...)
+                    flow_step_id:
+                      type: string
+                      nullable: true
+                    step_path:
+                      type: string
+                      nullable: true
+                      description: materialized step path (e.g. "a/b")
+                    depth:
+                      type: integer
+                      description: depth in the flow tree (0 for the root flow job)
+                    parent_module_type:
+                      type: string
+                      nullable: true
+                      description: parent module type (forloopflow, branchall, ...)
+                    sibling_index:
+                      type: integer
+                      description: >-
+                        1-based index of this job among siblings sharing the
+                        same step
+                    sibling_count:
+                      type: integer
+                      description: total number of siblings sharing the same step
+                    logs:
+                      type: string
+                  required:
+                    - job_id
+                    - label
+                    - kind
+                    - depth
+                    - sibling_index
+                    - sibling_count
+                    - logs
   /w/{workspace}/jobs_u/get_completed_logs_tail/{id}:
     get:
       summary: get completed job logs tail
@@ -21188,7 +21880,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: completed job logs tail
@@ -21210,7 +21902,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: job args
@@ -21261,7 +21953,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: running
           in: query
           schema:
@@ -21308,11 +22000,11 @@ paths:
                     type: string
                   flow_status:
                     type: object
-                    properties: *ref_179
-                    required: *ref_180
+                    properties: *ref_181
+                    required: *ref_182
                   workflow_as_code_status:
                     type: object
-                    properties: *ref_181
+                    properties: *ref_183
   /w/{workspace}/jobs_u/getupdate_sse/{id}:
     get:
       summary: get job updates via server-sent events
@@ -21327,7 +22019,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: running
           in: query
           schema:
@@ -21400,7 +22092,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: flow debug info details
@@ -21421,7 +22113,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: job details
@@ -21429,8 +22121,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_193
-                required: *ref_194
+                properties: *ref_195
+                required: *ref_196
   /w/{workspace}/jobs_u/completed/get_result/{id}:
     get:
       summary: get completed job result
@@ -21445,7 +22137,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: suspended_job
           in: query
           schema:
@@ -21482,10 +22174,10 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: get_started
           in: query
-          schema: &ref_318
+          schema: &ref_320
             type: boolean
       responses:
         '200':
@@ -21519,7 +22211,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: job timing details
@@ -21538,6 +22230,154 @@ paths:
                     type: integer
                 required:
                   - created_at
+  /w/{workspace}/jobs_u/dispatch_events/{id}:
+    get:
+      summary: list asset-trigger dispatch events for a producer job
+      description: >
+        Returns the chronological log of decisions the asset-trigger dispatcher
+        made after this producer job completed. Each row is one (subscriber,
+        asset write) decision: `dispatched` (with `child_job_id`),
+        `join_pending` (with `received_inputs` / `required_inputs` /
+        `partition`), or `skipped` (with `reason`). Rows are reaped
+        automatically when the producer's `v2_job` row is deleted by the
+        retention sweep.
+      operationId: listDispatchEvents
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: id
+          in: path
+          required: true
+          schema: *ref_178
+      responses:
+        '200':
+          description: dispatch events for this producer job
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    subscriber_path:
+                      type: string
+                    asset_kind:
+                      type: string
+                      enum:
+                        - s3object
+                        - resource
+                        - variable
+                        - ducklake
+                        - datatable
+                        - volume
+                    asset_path:
+                      type: string
+                    outcome:
+                      type: string
+                      enum:
+                        - dispatched
+                        - join_pending
+                        - skipped
+                    child_job_id:
+                      type: string
+                      format: uuid
+                    partition:
+                      type: string
+                    received_inputs:
+                      type: integer
+                    required_inputs:
+                      type: integer
+                    debounce_s:
+                      type: integer
+                    reason:
+                      type: string
+                    created_at:
+                      type: string
+                      format: date-time
+                  required:
+                    - subscriber_path
+                    - asset_kind
+                    - asset_path
+                    - outcome
+                    - created_at
+  /w/{workspace}/jobs/asset_dispatch_edges:
+    get:
+      summary: list asset-cascade producer→child job edges for a folder
+      description: >
+        Returns the `dispatched` asset-trigger edges (producer job → child job)
+        whose subscriber lives under `path_start`. Lets a pipeline view
+        reconstruct the cascade tree of a folder by job id and group connected
+        runs. Visibility follows the producer job's RLS.
+      operationId: listAssetDispatchEdges
+      tags:
+        - job
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: path_start
+          in: query
+          required: true
+          description: Folder path prefix the children live under, e.g. `f/orders/`.
+          schema:
+            type: string
+        - name: created_after
+          in: query
+          required: false
+          description: Only edges dispatched at/after this instant.
+          schema:
+            type: string
+            format: date-time
+      responses:
+        '200':
+          description: asset-cascade edges for the folder
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    producer_job_id:
+                      type: string
+                      format: uuid
+                    child_job_id:
+                      type: string
+                      format: uuid
+                      description: Set for `dispatched`; absent for `join_pending` inputs.
+                    subscriber_path:
+                      type: string
+                    outcome:
+                      type: string
+                      enum:
+                        - dispatched
+                        - join_pending
+                    asset_kind:
+                      type: string
+                      enum:
+                        - s3object
+                        - resource
+                        - variable
+                        - ducklake
+                        - datatable
+                        - volume
+                    asset_path:
+                      type: string
+                    created_at:
+                      type: string
+                      format: date-time
+                  required:
+                    - producer_job_id
+                    - subscriber_path
+                    - outcome
+                    - asset_kind
+                    - asset_path
+                    - created_at
   /w/{workspace}/jobs/completed/delete/{id}:
     post:
       summary: delete completed job (erase content but keep run id)
@@ -21552,7 +22392,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: job details
@@ -21560,8 +22400,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_193
-                required: *ref_194
+                properties: *ref_195
+                required: *ref_196
   /w/{workspace}/jobs_u/queue/cancel/{id}:
     post:
       summary: cancel queued or running job
@@ -21576,7 +22416,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       requestBody:
         description: reason
         required: true
@@ -21640,7 +22480,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       requestBody:
         description: reason
         required: true
@@ -21702,7 +22542,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: scheduled for timestamp
@@ -21724,7 +22564,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: resume_id
           in: path
           required: true
@@ -21755,7 +22595,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: resume_id
           in: path
           required: true
@@ -21805,7 +22645,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: approver
           in: query
           schema:
@@ -21866,7 +22706,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: approver
           in: query
           schema:
@@ -22040,6 +22880,13 @@ paths:
                           type: integer
                         approver:
                           type: string
+                  view_token:
+                    type: string
+                    description: >-
+                      Share-read-link token for the flow. An authenticated
+                      workspace member can append it as a `view_token` query
+                      param on the run page to read a flow they don't otherwise
+                      have access to.
   /w/{workspace}/jobs_u/resume/{id}/{resume_id}/{signature}:
     get:
       summary: resume a job for a suspended flow
@@ -22054,7 +22901,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: payload
           description: >
             The base64 encoded payload that has been encoded as a JSON. e.g how
@@ -22062,7 +22909,7 @@ paths:
 
             `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
           in: query
-          schema: *ref_121
+          schema: *ref_122
         - name: resume_id
           in: path
           required: true
@@ -22097,7 +22944,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: resume_id
           in: path
           required: true
@@ -22139,7 +22986,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: key
           in: path
           required: true
@@ -22171,7 +23018,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: key
           in: path
           required: true
@@ -22197,7 +23044,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       requestBody:
         required: true
         content:
@@ -22225,7 +23072,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: resume_id
           in: path
           required: true
@@ -22260,7 +23107,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: resume_id
           in: path
           required: true
@@ -22302,7 +23149,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
         - name: resume_id
           in: path
           required: true
@@ -22326,8 +23173,8 @@ paths:
                 type: object
                 properties:
                   job:
-                    oneOf: *ref_197
-                    discriminator: *ref_198
+                    oneOf: *ref_199
+                    discriminator: *ref_200
                   approvers:
                     type: array
                     items:
@@ -22340,6 +23187,13 @@ paths:
                       required:
                         - resume_id
                         - approver
+                  view_token:
+                    type: string
+                    description: >-
+                      Share-read-link token for the parent flow. An
+                      authenticated workspace member can append it as a
+                      `view_token` query param on the run page to read a flow
+                      they don't otherwise have access to.
                 required:
                   - job
                   - approvers
@@ -22402,7 +23256,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_438
+              properties: &ref_440
                 path:
                   type: string
                   description: >-
@@ -22495,7 +23349,7 @@ paths:
                   nullable: true
                   type: object
                   description: Retry configuration for failed module executions
-                  properties: &ref_201
+                  properties: &ref_203
                     constant:
                       type: object
                       description: Retry with constant delay between attempts
@@ -22530,8 +23384,8 @@ paths:
                     retry_if:
                       type: object
                       description: Conditional retry based on error or result
-                      properties: *ref_199
-                      required: *ref_200
+                      properties: *ref_201
+                      required: *ref_202
                 no_flow_overlap:
                   type: boolean
                   description: >-
@@ -22584,7 +23438,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_439
+              required: &ref_441
                 - path
                 - schedule
                 - timezone
@@ -22628,7 +23482,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_440
+              properties: &ref_442
                 schedule:
                   type: string
                   description: >-
@@ -22703,7 +23557,7 @@ paths:
                   nullable: true
                   type: object
                   description: Retry configuration for failed module executions
-                  properties: *ref_201
+                  properties: *ref_203
                 no_flow_overlap:
                   type: boolean
                   description: >-
@@ -22759,7 +23613,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_441
+              required: &ref_443
                 - schedule
                 - timezone
                 - args
@@ -22863,7 +23717,7 @@ paths:
               schema:
                 allOf:
                   - type: object
-                    properties: &ref_202
+                    properties: &ref_204
                       path:
                         type: string
                         description: >-
@@ -22984,7 +23838,7 @@ paths:
                         nullable: true
                         type: object
                         description: Retry configuration for failed module executions
-                        properties: *ref_201
+                        properties: *ref_203
                       summary:
                         type: string
                         nullable: true
@@ -23052,7 +23906,7 @@ paths:
                         description: >
                           Labels inherited from the parent folder, computed at
                           read time. Read-only — edit them on the folder.
-                    required: &ref_203
+                    required: &ref_205
                       - path
                       - edited_by
                       - edited_at
@@ -23146,7 +24000,7 @@ paths:
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: path
           description: filter by path (script path)
           in: query
@@ -23208,8 +24062,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_202
-                  required: *ref_203
+                  properties: *ref_204
+                  required: *ref_205
   /w/{workspace}/schedules/list_with_jobs:
     get:
       summary: list schedules with last 20 jobs
@@ -23237,10 +24091,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: &ref_437
+                  allOf: &ref_439
                     - type: object
-                      properties: *ref_202
-                      required: *ref_203
+                      properties: *ref_204
+                      required: *ref_205
                     - type: object
                       properties:
                         jobs:
@@ -23318,10 +24172,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_205
+              properties: &ref_207
                 info:
                   type: object
-                  properties: &ref_447
+                  properties: &ref_449
                     title:
                       type: string
                     version:
@@ -23350,28 +24204,28 @@ paths:
                           type: string
                       required:
                         - name
-                  required: &ref_448
+                  required: &ref_450
                     - title
                     - version
                 url:
                   type: string
                 openapi_spec_format:
                   type: string
-                  enum: &ref_442
+                  enum: &ref_444
                     - yaml
                     - json
                 http_route_filters:
                   type: array
                   items:
                     type: object
-                    properties: &ref_443
+                    properties: &ref_445
                       folder_regex:
                         type: string
                       path_regex:
                         type: string
                       route_path_regex:
                         type: string
-                    required: &ref_444
+                    required: &ref_446
                       - folder_regex
                       - path_regex
                       - route_path_regex
@@ -23379,7 +24233,7 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_445
+                    properties: &ref_447
                       user_or_folder_regex:
                         type: string
                         enum:
@@ -23392,8 +24246,8 @@ paths:
                         type: string
                       runnable_kind:
                         type: string
-                        enum: *ref_204
-                    required: &ref_446
+                        enum: *ref_206
+                    required: &ref_448
                       - user_or_folder_regex
                       - user_or_folder_regex_value
                       - path
@@ -23422,7 +24276,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_205
+              properties: *ref_207
       responses:
         '200':
           description: Downloaded OpenAPI spec
@@ -23451,7 +24305,7 @@ paths:
               type: array
               items:
                 type: object
-                properties: &ref_206
+                properties: &ref_208
                   path:
                     type: string
                     description: >-
@@ -23505,7 +24359,7 @@ paths:
                       HTTP method (get, post, put, delete, patch) that triggers
                       this endpoint
                     type: string
-                    enum: &ref_208
+                    enum: &ref_210
                       - get
                       - post
                       - put
@@ -23527,7 +24381,7 @@ paths:
                       'async' returns job ID immediately, 'sync_sse' streams
                       results via Server-Sent Events
                     type: string
-                    enum: &ref_209
+                    enum: &ref_211
                       - sync
                       - async
                       - sync_sse
@@ -23537,7 +24391,7 @@ paths:
                       'windmill' (Windmill token), 'api_key', 'basic_http',
                       'custom_script', 'signature'
                     type: string
-                    enum: &ref_210
+                    enum: &ref_212
                       - none
                       - windmill
                       - api_key
@@ -23555,7 +24409,7 @@ paths:
                   mode:
                     description: job trigger mode
                     type: string
-                    enum: &ref_211
+                    enum: &ref_213
                       - enabled
                       - disabled
                       - suspended
@@ -23576,7 +24430,7 @@ paths:
                   retry:
                     description: Retry configuration for failed module executions
                     type: object
-                    properties: *ref_201
+                    properties: *ref_203
                   permissioned_as:
                     type: string
                     description: >-
@@ -23592,7 +24446,7 @@ paths:
                     type: array
                     items:
                       type: string
-                required: &ref_207
+                required: &ref_209
                   - path
                   - script_path
                   - route_path
@@ -23625,8 +24479,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_206
-              required: *ref_207
+              properties: *ref_208
+              required: *ref_209
       responses:
         '201':
           description: http trigger created
@@ -23656,7 +24510,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_449
+              properties: &ref_451
                 path:
                   type: string
                   description: >-
@@ -23716,7 +24570,7 @@ paths:
                     HTTP method (get, post, put, delete, patch) that triggers
                     this endpoint
                   type: string
-                  enum: *ref_208
+                  enum: *ref_210
                 is_async:
                   type: boolean
                   description: Deprecated, use request_type instead
@@ -23726,14 +24580,14 @@ paths:
                     'async' returns job ID immediately, 'sync_sse' streams
                     results via Server-Sent Events
                   type: string
-                  enum: *ref_209
+                  enum: *ref_211
                 authentication_method:
                   description: >-
                     How requests are authenticated - 'none' (public), 'windmill'
                     (Windmill token), 'api_key', 'basic_http', 'custom_script',
                     'signature'
                   type: string
-                  enum: *ref_210
+                  enum: *ref_212
                 is_static_website:
                   type: boolean
                   description: >-
@@ -23757,7 +24611,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -23773,7 +24627,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_450
+              required: &ref_452
                 - path
                 - script_path
                 - is_flow
@@ -23839,9 +24693,9 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_213
+                  - allOf: &ref_215
                       - type: object
-                        properties: &ref_219
+                        properties: &ref_221
                           path:
                             type: string
                             description: >-
@@ -23884,7 +24738,7 @@ paths:
                           mode:
                             description: job trigger mode
                             type: string
-                            enum: *ref_211
+                            enum: *ref_213
                           labels:
                             type: array
                             items:
@@ -23913,7 +24767,7 @@ paths:
 
                               Frontend appends a `*` to the displayed name.
                             type: boolean
-                        required: &ref_220
+                        required: &ref_222
                           - path
                           - script_path
                           - permissioned_as
@@ -23924,7 +24778,7 @@ paths:
                           - is_flow
                           - mode
                     type: object
-                    properties: &ref_214
+                    properties: &ref_216
                       route_path:
                         type: string
                         description: >-
@@ -23953,7 +24807,7 @@ paths:
                           HTTP method (get, post, put, delete, patch) that
                           triggers this endpoint
                         type: string
-                        enum: *ref_208
+                        enum: *ref_210
                       authentication_resource_path:
                         type: string
                         nullable: true
@@ -23975,14 +24829,14 @@ paths:
                           'async' returns job ID immediately, 'sync_sse' streams
                           results via Server-Sent Events
                         type: string
-                        enum: *ref_209
+                        enum: *ref_211
                       authentication_method:
                         description: >-
                           How requests are authenticated - 'none' (public),
                           'windmill' (Windmill token), 'api_key', 'basic_http',
                           'custom_script', 'signature'
                         type: string
-                        enum: *ref_210
+                        enum: *ref_212
                       is_static_website:
                         type: boolean
                         description: >-
@@ -24013,8 +24867,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_215
+                        properties: *ref_203
+                    required: &ref_217
                       - route_path
                       - request_type
                       - authentication_method
@@ -24105,7 +24959,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: http trigger list
@@ -24114,10 +24968,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_213
+                  allOf: *ref_215
                   type: object
-                  properties: *ref_214
-                  required: *ref_215
+                  properties: *ref_216
+                  required: *ref_217
   /w/{workspace}/http_triggers/exists/{path}:
     get:
       summary: does http trigger exists
@@ -24163,7 +25017,7 @@ paths:
                   type: string
                 http_method:
                   type: string
-                  enum: *ref_208
+                  enum: *ref_210
                 trigger_path:
                   type: string
                 workspaced_route:
@@ -24203,7 +25057,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -24236,7 +25090,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_451
+              properties: &ref_453
                 path:
                   type: string
                   description: >-
@@ -24261,7 +25115,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 filters:
                   type: array
                   description: >-
@@ -24292,7 +25146,7 @@ paths:
                     Messages to send immediately after connecting (can be raw
                     strings or computed by runnables)
                   items:
-                    anyOf: &ref_216
+                    anyOf: &ref_218
                       - type: object
                         properties:
                           raw_message:
@@ -24335,7 +25189,7 @@ paths:
                   nullable: true
                   description: Optional periodic heartbeat message configuration
                   type: object
-                  properties: &ref_217
+                  properties: &ref_219
                     interval_secs:
                       type: integer
                       minimum: 1
@@ -24352,7 +25206,7 @@ paths:
                         Optional. Top-level JSON field to extract from incoming
                         messages. The extracted value replaces {{state}} in the
                         heartbeat message.
-                  required: &ref_218
+                  required: &ref_220
                     - interval_secs
                     - message
                 error_handler_path:
@@ -24365,7 +25219,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -24381,7 +25235,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_452
+              required: &ref_454
                 - path
                 - script_path
                 - url
@@ -24418,7 +25272,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_453
+              properties: &ref_455
                 url:
                   type: string
                   description: >-
@@ -24470,7 +25324,7 @@ paths:
                     Messages to send immediately after connecting (can be raw
                     strings or computed by runnables)
                   items:
-                    anyOf: *ref_216
+                    anyOf: *ref_218
                 url_runnable_args:
                   description: The arguments to pass to the script or flow
                   nullable: true
@@ -24488,8 +25342,8 @@ paths:
                   nullable: true
                   description: Optional periodic heartbeat message configuration
                   type: object
-                  properties: *ref_217
-                  required: *ref_218
+                  properties: *ref_219
+                  required: *ref_220
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -24500,7 +25354,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -24516,7 +25370,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_454
+              required: &ref_456
                 - path
                 - script_path
                 - url
@@ -24582,12 +25436,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_221
+                  - allOf: &ref_223
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_222
+                    properties: &ref_224
                       url:
                         type: string
                         description: >-
@@ -24636,7 +25490,7 @@ paths:
                           Messages to send immediately after connecting (can be
                           raw strings or computed by runnables)
                         items:
-                          anyOf: *ref_216
+                          anyOf: *ref_218
                       url_runnable_args:
                         description: The arguments to pass to the script or flow
                         nullable: true
@@ -24656,8 +25510,8 @@ paths:
                         nullable: true
                         description: Optional periodic heartbeat message configuration
                         type: object
-                        properties: *ref_217
-                        required: *ref_218
+                        properties: *ref_219
+                        required: *ref_220
                       error_handler_path:
                         type: string
                         description: >-
@@ -24670,8 +25524,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_223
+                        properties: *ref_203
+                    required: &ref_225
                       - url
                       - filters
                       - can_return_message
@@ -24758,7 +25612,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: websocket trigger list
@@ -24767,10 +25621,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_221
+                  allOf: *ref_223
                   type: object
-                  properties: *ref_222
-                  required: *ref_223
+                  properties: *ref_224
+                  required: *ref_225
   /w/{workspace}/websocket_triggers/exists/{path}:
     get:
       summary: does websocket trigger exists
@@ -24819,7 +25673,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -24889,7 +25743,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_486
+              properties: &ref_488
                 path:
                   type: string
                   description: >-
@@ -24958,7 +25812,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -24969,7 +25823,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -24985,7 +25839,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_487
+              required: &ref_489
                 - path
                 - script_path
                 - is_flow
@@ -25022,7 +25876,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_488
+              properties: &ref_490
                 kafka_resource_path:
                   type: string
                   description: >-
@@ -25098,7 +25952,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -25114,7 +25968,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_489
+              required: &ref_491
                 - path
                 - script_path
                 - kafka_resource_path
@@ -25180,12 +26034,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_224
+                  - allOf: &ref_226
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_225
+                    properties: &ref_227
                       kafka_resource_path:
                         type: string
                         description: >-
@@ -25262,8 +26116,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_226
+                        properties: *ref_203
+                    required: &ref_228
                       - kafka_resource_path
                       - group_id
                       - topics
@@ -25350,7 +26204,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: kafka trigger list
@@ -25359,10 +26213,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_224
+                  allOf: *ref_226
                   type: object
-                  properties: *ref_225
-                  required: *ref_226
+                  properties: *ref_227
+                  required: *ref_228
   /w/{workspace}/kafka_triggers/exists/{path}:
     get:
       summary: does kafka trigger exists
@@ -25411,7 +26265,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -25530,7 +26384,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_490
+              properties: &ref_492
                 path:
                   type: string
                   description: >-
@@ -25573,7 +26427,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -25584,7 +26438,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -25600,7 +26454,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_491
+              required: &ref_493
                 - path
                 - script_path
                 - is_flow
@@ -25636,7 +26490,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_492
+              properties: &ref_494
                 nats_resource_path:
                   type: string
                   description: >-
@@ -25686,7 +26540,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -25702,7 +26556,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_493
+              required: &ref_495
                 - path
                 - script_path
                 - nats_resource_path
@@ -25767,12 +26621,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_227
+                  - allOf: &ref_229
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_228
+                    properties: &ref_230
                       nats_resource_path:
                         type: string
                         description: >-
@@ -25824,8 +26678,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_229
+                        properties: *ref_203
+                    required: &ref_231
                       - nats_resource_path
                       - use_jetstream
                       - subjects
@@ -25911,7 +26765,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: nats trigger list
@@ -25920,10 +26774,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_227
+                  allOf: *ref_229
                   type: object
-                  properties: *ref_228
-                  required: *ref_229
+                  properties: *ref_230
+                  required: *ref_231
   /w/{workspace}/nats_triggers/exists/{path}:
     get:
       summary: does nats trigger exists
@@ -25972,7 +26826,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -26035,7 +26889,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_473
+              properties: &ref_475
                 queue_url:
                   type: string
                   description: The full URL of the AWS SQS queue to poll for messages
@@ -26044,7 +26898,7 @@ paths:
                     Authentication type - 'credentials' for access key/secret,
                     'oidc' for OpenID Connect
                   type: string
-                  enum: &ref_230
+                  enum: &ref_232
                     - oidc
                     - credentials
                 aws_resource_path:
@@ -26079,7 +26933,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -26090,7 +26944,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -26106,7 +26960,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_474
+              required: &ref_476
                 - queue_url
                 - aws_resource_path
                 - path
@@ -26142,7 +26996,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_475
+              properties: &ref_477
                 queue_url:
                   type: string
                   description: The full URL of the AWS SQS queue to poll for messages
@@ -26151,7 +27005,7 @@ paths:
                     Authentication type - 'credentials' for access key/secret,
                     'oidc' for OpenID Connect
                   type: string
-                  enum: *ref_230
+                  enum: *ref_232
                 aws_resource_path:
                   type: string
                   description: >-
@@ -26184,7 +27038,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -26195,7 +27049,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -26211,7 +27065,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_476
+              required: &ref_478
                 - queue_url
                 - aws_resource_path
                 - path
@@ -26277,12 +27131,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_231
+                  - allOf: &ref_233
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_232
+                    properties: &ref_234
                       queue_url:
                         type: string
                         description: The full URL of the AWS SQS queue to poll for messages
@@ -26291,7 +27145,7 @@ paths:
                           Authentication type - 'credentials' for access
                           key/secret, 'oidc' for OpenID Connect
                         type: string
-                        enum: *ref_230
+                        enum: *ref_232
                       aws_resource_path:
                         type: string
                         description: >-
@@ -26329,8 +27183,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_233
+                        properties: *ref_203
+                    required: &ref_235
                       - queue_url
                       - aws_resource_path
                       - aws_auth_resource_type
@@ -26416,7 +27270,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: sqs trigger list
@@ -26425,10 +27279,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_231
+                  allOf: *ref_233
                   type: object
-                  properties: *ref_232
-                  required: *ref_233
+                  properties: *ref_234
+                  required: *ref_235
   /w/{workspace}/sqs_triggers/exists/{path}:
     get:
       summary: does sqs trigger exists
@@ -26477,7 +27331,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -26542,17 +27396,17 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_577
+                  properties: &ref_579
                     service_name:
                       type: string
-                      enum: &ref_234
+                      enum: &ref_236
                         - nextcloud
                         - google
                         - github
                     oauth_data:
                       nullable: true
                       type: object
-                      properties: &ref_235
+                      properties: &ref_237
                         client_id:
                           type: string
                           description: The OAuth client ID for the workspace
@@ -26567,7 +27421,7 @@ paths:
                           type: string
                           format: uri
                           description: The OAuth redirect URI
-                      required: &ref_236
+                      required: &ref_238
                         - client_id
                         - client_secret
                         - base_url
@@ -26576,7 +27430,7 @@ paths:
                       type: string
                       nullable: true
                       description: Path to the resource storing the OAuth token
-                  required: &ref_578
+                  required: &ref_580
                     - service_name
   /w/{workspace}/native_triggers/integrations/{service_name}/exists:
     get:
@@ -26594,7 +27448,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       responses:
         '200':
           description: integration exists
@@ -26618,7 +27472,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       requestBody:
         description: new native trigger service
         required: true
@@ -26626,8 +27480,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_235
-              required: *ref_236
+              properties: *ref_237
+              required: *ref_238
       responses:
         '201':
           description: native trigger service created
@@ -26651,7 +27505,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       requestBody:
         description: redirect_uri
         required: true
@@ -26659,10 +27513,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_237
+              properties: &ref_239
                 redirect_uri:
                   type: string
-              required: &ref_238
+              required: &ref_240
                 - redirect_uri
       responses:
         '200':
@@ -26687,7 +27541,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       responses:
         '200':
           description: whether instance sharing is available
@@ -26711,7 +27565,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       requestBody:
         description: redirect_uri
         required: true
@@ -26719,8 +27573,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_237
-              required: *ref_238
+              properties: *ref_239
+              required: *ref_240
       responses:
         '200':
           description: authorization URL using instance credentials
@@ -26744,7 +27598,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       responses:
         '200':
           description: native trigger service deleted
@@ -26768,7 +27622,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       requestBody:
         description: OAuth callback data
         required: true
@@ -26817,7 +27671,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       requestBody:
         description: new native trigger configuration
         required: true
@@ -26826,7 +27680,7 @@ paths:
             schema:
               type: object
               description: Data for creating or updating a native trigger
-              properties: &ref_239
+              properties: &ref_241
                 script_path:
                   type: string
                   description: The path to the script or flow that will be triggered
@@ -26843,7 +27697,7 @@ paths:
                   type: string
                   nullable: true
                   description: Short summary to be displayed when listed
-              required: &ref_240
+              required: &ref_242
                 - script_path
                 - is_flow
                 - service_config
@@ -26855,13 +27709,13 @@ paths:
               schema:
                 type: object
                 description: Response returned when a native trigger is created
-                properties: &ref_580
+                properties: &ref_582
                   external_id:
                     type: string
                     description: >-
                       The external ID of the created trigger from the external
                       service
-                required: &ref_581
+                required: &ref_583
                   - external_id
   /w/{workspace}/native_triggers/{service_name}/update/{external_id}:
     post:
@@ -26884,7 +27738,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
         - name: external_id
           in: path
           required: true
@@ -26899,8 +27753,8 @@ paths:
             schema:
               type: object
               description: Data for creating or updating a native trigger
-              properties: *ref_239
-              required: *ref_240
+              properties: *ref_241
+              required: *ref_242
       responses:
         '200':
           description: native trigger updated
@@ -26929,7 +27783,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
         - name: external_id
           in: path
           required: true
@@ -26946,7 +27800,7 @@ paths:
                 description: >-
                   Full trigger response containing both Windmill data and
                   external service data
-                properties: &ref_575
+                properties: &ref_577
                   external_id:
                     type: string
                     description: The unique identifier from the external service
@@ -26955,7 +27809,7 @@ paths:
                     description: The workspace this trigger belongs to
                   service_name:
                     type: string
-                    enum: *ref_234
+                    enum: *ref_236
                   script_path:
                     type: string
                     description: The path to the script or flow that will be triggered
@@ -26982,7 +27836,7 @@ paths:
                     type: object
                     description: Configuration data from the external service
                     additionalProperties: true
-                required: &ref_576
+                required: &ref_578
                   - external_id
                   - workspace_id
                   - service_name
@@ -27011,7 +27865,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
         - name: external_id
           in: path
           required: true
@@ -27042,7 +27896,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -27076,7 +27930,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: native triggers list
@@ -27087,7 +27941,7 @@ paths:
                 items:
                   type: object
                   description: A native trigger stored in Windmill
-                  properties: &ref_573
+                  properties: &ref_575
                     external_id:
                       type: string
                       description: The unique identifier from the external service
@@ -27096,7 +27950,7 @@ paths:
                       description: The workspace this trigger belongs to
                     service_name:
                       type: string
-                      enum: *ref_234
+                      enum: *ref_236
                     script_path:
                       type: string
                       description: The path to the script or flow that will be triggered
@@ -27119,7 +27973,7 @@ paths:
                       type: string
                       nullable: true
                       description: Short summary to be displayed when listed
-                  required: &ref_574
+                  required: &ref_576
                     - external_id
                     - workspace_id
                     - service_name
@@ -27143,7 +27997,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
         - name: external_id
           in: path
           required: true
@@ -27173,7 +28027,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
       responses:
         '200':
           description: sync completed successfully
@@ -27198,7 +28052,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_582
+                  properties: &ref_584
                     id:
                       type: string
                     name:
@@ -27209,7 +28063,7 @@ paths:
                       type: string
                     path:
                       type: string
-                  required: &ref_583
+                  required: &ref_585
                     - id
                     - name
                     - path
@@ -27234,7 +28088,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_584
+                  properties: &ref_586
                     id:
                       type: string
                     summary:
@@ -27242,7 +28096,7 @@ paths:
                     primary:
                       type: boolean
                       default: false
-                  required: &ref_585
+                  required: &ref_587
                     - id
                     - summary
   /w/{workspace}/native_triggers/google/drive/files:
@@ -27285,12 +28139,12 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_588
+                properties: &ref_590
                   files:
                     type: array
                     items:
                       type: object
-                      properties: &ref_586
+                      properties: &ref_588
                         id:
                           type: string
                         name:
@@ -27300,13 +28154,13 @@ paths:
                         is_folder:
                           type: boolean
                           default: false
-                      required: &ref_587
+                      required: &ref_589
                         - id
                         - name
                         - mime_type
                   next_page_token:
                     type: string
-                required: &ref_589
+                required: &ref_591
                   - files
   /w/{workspace}/native_triggers/google/drive/shared_drives:
     get:
@@ -27329,12 +28183,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_590
+                  properties: &ref_592
                     id:
                       type: string
                     name:
                       type: string
-                  required: &ref_591
+                  required: &ref_593
                     - id
                     - name
   /w/{workspace}/native_triggers/github/repos:
@@ -27358,7 +28212,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_592
+                  properties: &ref_594
                     full_name:
                       type: string
                     name:
@@ -27367,7 +28221,7 @@ paths:
                       type: string
                     private:
                       type: boolean
-                  required: &ref_593
+                  required: &ref_595
                     - full_name
                     - name
                     - owner
@@ -27384,7 +28238,7 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_234
+            enum: *ref_236
         - name: workspace_id
           in: path
           required: true
@@ -27433,7 +28287,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_456
+              properties: &ref_458
                 mqtt_resource_path:
                   type: string
                   description: >-
@@ -27443,16 +28297,16 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: &ref_241
+                    properties: &ref_243
                       qos:
                         type: string
-                        enum: &ref_455
+                        enum: &ref_457
                           - qos0
                           - qos1
                           - qos2
                       topic:
                         type: string
-                    required: &ref_242
+                    required: &ref_244
                       - qos
                       - topic
                   description: >-
@@ -27466,7 +28320,7 @@ paths:
                   nullable: true
                   description: MQTT v3 specific configuration (clean_session)
                   type: object
-                  properties: &ref_243
+                  properties: &ref_245
                     clean_session:
                       type: boolean
                 v5_config:
@@ -27475,7 +28329,7 @@ paths:
                     MQTT v5 specific configuration (clean_start,
                     topic_alias_maximum, session_expiry_interval)
                   type: object
-                  properties: &ref_244
+                  properties: &ref_246
                     clean_start:
                       type: boolean
                     topic_alias_maximum:
@@ -27486,7 +28340,7 @@ paths:
                   nullable: true
                   description: MQTT protocol version ('v3' or 'v5')
                   type: string
-                  enum: &ref_245
+                  enum: &ref_247
                     - v3
                     - v5
                 path:
@@ -27508,7 +28362,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -27519,7 +28373,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -27535,7 +28389,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_457
+              required: &ref_459
                 - path
                 - script_path
                 - is_flow
@@ -27570,7 +28424,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_458
+              properties: &ref_460
                 mqtt_resource_path:
                   type: string
                   description: >-
@@ -27580,8 +28434,8 @@ paths:
                   type: array
                   items:
                     type: object
-                    properties: *ref_241
-                    required: *ref_242
+                    properties: *ref_243
+                    required: *ref_244
                   description: >-
                     Array of MQTT topics to subscribe to, each with topic name
                     and QoS level
@@ -27593,19 +28447,19 @@ paths:
                   nullable: true
                   description: MQTT v3 specific configuration (clean_session)
                   type: object
-                  properties: *ref_243
+                  properties: *ref_245
                 v5_config:
                   nullable: true
                   description: >-
                     MQTT v5 specific configuration (clean_start,
                     topic_alias_maximum, session_expiry_interval)
                   type: object
-                  properties: *ref_244
+                  properties: *ref_246
                 client_version:
                   nullable: true
                   description: MQTT protocol version ('v3' or 'v5')
                   type: string
-                  enum: *ref_245
+                  enum: *ref_247
                 path:
                   type: string
                   description: >-
@@ -27625,7 +28479,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -27636,7 +28490,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -27652,7 +28506,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_459
+              required: &ref_461
                 - path
                 - script_path
                 - is_flow
@@ -27717,12 +28571,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_246
+                  - allOf: &ref_248
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_247
+                    properties: &ref_249
                       mqtt_resource_path:
                         type: string
                         description: >-
@@ -27732,8 +28586,8 @@ paths:
                         type: array
                         items:
                           type: object
-                          properties: *ref_241
-                          required: *ref_242
+                          properties: *ref_243
+                          required: *ref_244
                         description: >-
                           Array of MQTT topics to subscribe to, each with topic
                           name and QoS level
@@ -27741,14 +28595,14 @@ paths:
                         nullable: true
                         description: MQTT v3 specific configuration (clean_session)
                         type: object
-                        properties: *ref_243
+                        properties: *ref_245
                       v5_config:
                         nullable: true
                         description: >-
                           MQTT v5 specific configuration (clean_start,
                           topic_alias_maximum, session_expiry_interval)
                         type: object
-                        properties: *ref_244
+                        properties: *ref_246
                       client_id:
                         type: string
                         nullable: true
@@ -27757,7 +28611,7 @@ paths:
                         nullable: true
                         description: MQTT protocol version ('v3' or 'v5')
                         type: string
-                        enum: *ref_245
+                        enum: *ref_247
                       server_id:
                         type: string
                         description: >-
@@ -27782,8 +28636,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_248
+                        properties: *ref_203
+                    required: &ref_250
                       - subscribe_topics
                       - mqtt_resource_path
                   - type: object
@@ -27868,7 +28722,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: mqtt trigger list
@@ -27877,10 +28731,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_246
+                  allOf: *ref_248
                   type: object
-                  properties: *ref_247
-                  required: *ref_248
+                  properties: *ref_249
+                  required: *ref_250
   /w/{workspace}/mqtt_triggers/exists/{path}:
     get:
       summary: does mqtt trigger exists
@@ -27929,7 +28783,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -27993,7 +28847,7 @@ paths:
             schema:
               type: object
               description: Data for creating or updating a Google Cloud Pub/Sub trigger.
-              properties: &ref_249
+              properties: &ref_251
                 gcp_resource_path:
                   type: string
                   description: >-
@@ -28001,7 +28855,7 @@ paths:
                     credentials for authentication.
                 subscription_mode:
                   type: string
-                  enum: &ref_254
+                  enum: &ref_256
                     - existing
                     - create_update
                   description: >-
@@ -28019,7 +28873,7 @@ paths:
                   description: Base URL for push delivery endpoint.
                 delivery_type:
                   type: string
-                  enum: &ref_251
+                  enum: &ref_253
                     - push
                     - pull
                   description: >-
@@ -28030,7 +28884,7 @@ paths:
                   nullable: true
                   type: object
                   description: Configuration for push delivery mode.
-                  properties: &ref_252
+                  properties: &ref_254
                     audience:
                       type: string
                       description: >-
@@ -28041,7 +28895,7 @@ paths:
                       description: >-
                         If true, push messages will include OIDC authentication
                         tokens.
-                  required: &ref_253
+                  required: &ref_255
                     - authenticate
                     - base_endpoint
                 path:
@@ -28063,7 +28917,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 auto_acknowledge_msg:
                   type: boolean
                   description: >-
@@ -28090,7 +28944,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -28106,7 +28960,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_250
+              required: &ref_252
                 - path
                 - script_path
                 - is_flow
@@ -28143,8 +28997,8 @@ paths:
             schema:
               type: object
               description: Data for creating or updating a Google Cloud Pub/Sub trigger.
-              properties: *ref_249
-              required: *ref_250
+              properties: *ref_251
+              required: *ref_252
       responses:
         '200':
           description: gcp trigger updated
@@ -28203,15 +29057,15 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_255
+                  - allOf: &ref_257
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
                     description: >-
                       A Google Cloud Pub/Sub trigger that executes a script or
                       flow when messages are received.
-                    properties: &ref_256
+                    properties: &ref_258
                       gcp_resource_path:
                         type: string
                         description: >-
@@ -28230,7 +29084,7 @@ paths:
                           (internal use).
                       delivery_type:
                         type: string
-                        enum: *ref_251
+                        enum: *ref_253
                         description: >-
                           Delivery mode for messages. 'push' for HTTP push
                           delivery where messages are sent to a webhook
@@ -28240,11 +29094,11 @@ paths:
                         nullable: true
                         type: object
                         description: Configuration for push delivery mode.
-                        properties: *ref_252
-                        required: *ref_253
+                        properties: *ref_254
+                        required: *ref_255
                       subscription_mode:
                         type: string
-                        enum: *ref_254
+                        enum: *ref_256
                         description: >-
                           The mode of subscription. 'existing' means using an
                           existing GCP subscription, while 'create_update'
@@ -28268,8 +29122,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_257
+                        properties: *ref_203
+                    required: &ref_259
                       - gcp_resource_path
                       - topic_id
                       - subscription_id
@@ -28357,7 +29211,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: gcp trigger list
@@ -28366,13 +29220,13 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_255
+                  allOf: *ref_257
                   type: object
                   description: >-
                     A Google Cloud Pub/Sub trigger that executes a script or
                     flow when messages are received.
-                  properties: *ref_256
-                  required: *ref_257
+                  properties: *ref_258
+                  required: *ref_259
   /w/{workspace}/gcp_triggers/exists/{path}:
     get:
       summary: does gcp trigger exists
@@ -28421,7 +29275,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -28488,10 +29342,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_462
+              properties: &ref_464
                 subscription_id:
                   type: string
-              required: &ref_463
+              required: &ref_465
                 - subscription_id
       responses:
         '200':
@@ -28546,10 +29400,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_460
+              properties: &ref_462
                 topic_id:
                   type: string
-              required: &ref_461
+              required: &ref_463
                 - topic_id
       responses:
         '200':
@@ -28578,12 +29432,12 @@ paths:
             schema:
               type: object
               description: Data for creating or updating an Azure Event Grid trigger.
-              properties: &ref_258
+              properties: &ref_260
                 azure_resource_path:
                   type: string
                 azure_mode:
                   type: string
-                  enum: &ref_260
+                  enum: &ref_262
                     - basic_push
                     - namespace_push
                     - namespace_pull
@@ -28615,7 +29469,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 error_handler_path:
                   type: string
                 error_handler_args:
@@ -28625,7 +29479,7 @@ paths:
                 retry:
                   type: object
                   description: Retry configuration for failed module executions
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                 preserve_permissioned_as:
@@ -28634,7 +29488,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_259
+              required: &ref_261
                 - path
                 - script_path
                 - is_flow
@@ -28671,8 +29525,8 @@ paths:
             schema:
               type: object
               description: Data for creating or updating an Azure Event Grid trigger.
-              properties: *ref_258
-              required: *ref_259
+              properties: *ref_260
+              required: *ref_261
       responses:
         '200':
           description: azure trigger updated
@@ -28731,20 +29585,20 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_261
+                  - allOf: &ref_263
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
                     description: >-
                       An Azure Event Grid trigger that executes a script or flow
                       when events arrive.
-                    properties: &ref_262
+                    properties: &ref_264
                       azure_resource_path:
                         type: string
                       azure_mode:
                         type: string
-                        enum: *ref_260
+                        enum: *ref_262
                         description: Azure Event Grid trigger mode.
                       scope_resource_id:
                         type: string
@@ -28780,8 +29634,8 @@ paths:
                       retry:
                         type: object
                         description: Retry configuration for failed module executions
-                        properties: *ref_201
-                    required: &ref_263
+                        properties: *ref_203
+                    required: &ref_265
                       - azure_resource_path
                       - azure_mode
                       - scope_resource_id
@@ -28862,7 +29716,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: azure trigger list
@@ -28871,13 +29725,13 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_261
+                  allOf: *ref_263
                   type: object
                   description: >-
                     An Azure Event Grid trigger that executes a script or flow
                     when events arrive.
-                  properties: *ref_262
-                  required: *ref_263
+                  properties: *ref_264
+                  required: *ref_265
   /w/{workspace}/azure_triggers/exists/{path}:
     get:
       summary: check whether an azure trigger exists
@@ -28925,7 +29779,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -28957,10 +29811,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_466
+              properties: &ref_468
                 azure_resource_path:
                   type: string
-              required: &ref_467
+              required: &ref_469
                 - azure_resource_path
       responses:
         '200':
@@ -28990,10 +29844,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_468
+              properties: &ref_470
                 scope_resource_id:
                   type: string
-              required: &ref_469
+              required: &ref_471
                 - scope_resource_id
       responses:
         '200':
@@ -29025,12 +29879,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_470
+              properties: &ref_472
                 scope_resource_id:
                   type: string
                 topic_name:
                   type: string
-              required: &ref_471
+              required: &ref_473
                 - scope_resource_id
                 - topic_name
       responses:
@@ -29063,10 +29917,10 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_464
+              properties: &ref_466
                 azure_mode:
                   type: string
-                  enum: *ref_260
+                  enum: *ref_262
                   description: Azure Event Grid trigger mode.
                 scope_resource_id:
                   type: string
@@ -29075,7 +29929,7 @@ paths:
                   nullable: true
                 subscription_name:
                   type: string
-              required: &ref_465
+              required: &ref_467
                 - azure_mode
                 - scope_resource_id
                 - subscription_name
@@ -29111,7 +29965,7 @@ paths:
                 items:
                   type: object
                   description: An ARM resource the service principal can see.
-                  properties: &ref_264
+                  properties: &ref_266
                     id:
                       type: string
                     name:
@@ -29120,7 +29974,7 @@ paths:
                       type: string
                     type:
                       type: string
-                  required: &ref_265
+                  required: &ref_267
                     - id
                     - name
                     - type
@@ -29151,8 +30005,8 @@ paths:
                 items:
                   type: object
                   description: An ARM resource the service principal can see.
-                  properties: *ref_264
-                  required: *ref_265
+                  properties: *ref_266
+                  required: *ref_267
   /w/{workspace}/postgres_triggers/postgres/version/{path}:
     get:
       summary: get postgres version
@@ -29215,19 +30069,19 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_480
+              properties: &ref_482
                 postgres_resource_path:
                   type: string
                 relations:
                   type: array
                   items:
                     type: object
-                    properties: &ref_267
+                    properties: &ref_269
                       schema_name:
                         type: string
                       table_to_track:
                         type: array
-                        items: &ref_478
+                        items: &ref_480
                           type: object
                           properties:
                             table_name:
@@ -29240,14 +30094,14 @@ paths:
                               type: string
                           required:
                             - table_name
-                    required: &ref_268
+                    required: &ref_270
                       - schema_name
                       - table_to_track
                 language:
                   type: string
-                  enum: &ref_479
+                  enum: &ref_481
                     - Typescript
-              required: &ref_481
+              required: &ref_483
                 - postgres_resource_path
                 - relations
                 - language
@@ -29272,7 +30126,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: &ref_309
+          schema: &ref_311
             type: string
       responses:
         '200':
@@ -29305,7 +30159,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_477
+                  properties: &ref_479
                     slot_name:
                       type: string
                     active:
@@ -29332,7 +30186,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_266
+              properties: &ref_268
                 name:
                   type: string
       responses:
@@ -29364,7 +30218,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_266
+              properties: *ref_268
       responses:
         '200':
           description: postgres replication slot deleted
@@ -29415,7 +30269,7 @@ paths:
           in: path
           required: true
           description: The name of the publication
-          schema: &ref_269
+          schema: &ref_271
             type: string
       responses:
         '200':
@@ -29424,18 +30278,18 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_270
+                properties: &ref_272
                   table_to_track:
                     type: array
                     items:
                       type: object
-                      properties: *ref_267
-                      required: *ref_268
+                      properties: *ref_269
+                      required: *ref_270
                   transaction_to_track:
                     type: array
                     items:
                       type: string
-                required: &ref_271
+                required: &ref_273
                   - transaction_to_track
   /w/{workspace}/postgres_triggers/publication/create/{publication}/{path}:
     post:
@@ -29456,7 +30310,7 @@ paths:
           in: path
           required: true
           description: The name of the publication
-          schema: *ref_269
+          schema: *ref_271
       requestBody:
         description: new publication for postgres
         required: true
@@ -29464,8 +30318,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_270
-              required: *ref_271
+              properties: *ref_272
+              required: *ref_273
       responses:
         '201':
           description: publication created
@@ -29492,7 +30346,7 @@ paths:
           in: path
           required: true
           description: The name of the publication
-          schema: *ref_269
+          schema: *ref_271
       requestBody:
         description: update publication for postgres
         required: true
@@ -29500,8 +30354,8 @@ paths:
           application/json:
             schema:
               type: object
-              properties: *ref_270
-              required: *ref_271
+              properties: *ref_272
+              required: *ref_273
       responses:
         '201':
           description: publication updated
@@ -29528,7 +30382,7 @@ paths:
           in: path
           required: true
           description: The name of the publication
-          schema: *ref_269
+          schema: *ref_271
       responses:
         '200':
           description: postgres publication deleted
@@ -29554,7 +30408,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_482
+              properties: &ref_484
                 replication_slot_name:
                   type: string
                   description: Name of the PostgreSQL logical replication slot to use
@@ -29582,7 +30436,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 postgres_resource_path:
                   type: string
                   description: >-
@@ -29593,8 +30447,8 @@ paths:
                     Configuration for creating/managing the publication (tables,
                     operations)
                   type: object
-                  properties: *ref_270
-                  required: *ref_271
+                  properties: *ref_272
+                  required: *ref_273
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -29605,7 +30459,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -29621,7 +30475,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_483
+              required: &ref_485
                 - path
                 - script_path
                 - is_flow
@@ -29656,7 +30510,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_484
+              properties: &ref_486
                 replication_slot_name:
                   type: string
                   description: Name of the PostgreSQL logical replication slot to use
@@ -29684,7 +30538,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 postgres_resource_path:
                   type: string
                   description: >-
@@ -29695,8 +30549,8 @@ paths:
                     Configuration for creating/managing the publication (tables,
                     operations)
                   type: object
-                  properties: *ref_270
-                  required: *ref_271
+                  properties: *ref_272
+                  required: *ref_273
                 error_handler_path:
                   type: string
                   description: Path to a script or flow to run when the triggered job fails
@@ -29707,7 +30561,7 @@ paths:
                 retry:
                   description: Retry configuration for failed module executions
                   type: object
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -29723,7 +30577,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_485
+              required: &ref_487
                 - path
                 - script_path
                 - is_flow
@@ -29789,12 +30643,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_272
+                  - allOf: &ref_274
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_273
+                    properties: &ref_275
                       postgres_resource_path:
                         type: string
                         description: >-
@@ -29832,8 +30686,8 @@ paths:
                       retry:
                         description: Retry configuration for failed module executions
                         type: object
-                        properties: *ref_201
-                    required: &ref_274
+                        properties: *ref_203
+                    required: &ref_276
                       - postgres_resource_path
                       - replication_slot_name
                       - publication_name
@@ -29919,7 +30773,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: postgres trigger list
@@ -29928,10 +30782,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_272
+                  allOf: *ref_274
                   type: object
-                  properties: *ref_273
-                  required: *ref_274
+                  properties: *ref_275
+                  required: *ref_276
   /w/{workspace}/postgres_triggers/exists/{path}:
     get:
       summary: does postgres trigger exists
@@ -29980,7 +30834,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -30043,7 +30897,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_494
+              properties: &ref_496
                 path:
                   type: string
                 script_path:
@@ -30063,11 +30917,11 @@ paths:
                 retry:
                   type: object
                   description: Retry configuration for failed module executions
-                  properties: *ref_201
+                  properties: *ref_203
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 permissioned_as:
                   type: string
                   description: >-
@@ -30083,7 +30937,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_495
+              required: &ref_497
                 - path
                 - script_path
                 - local_part
@@ -30117,7 +30971,7 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_496
+              properties: &ref_498
                 path:
                   type: string
                 script_path:
@@ -30137,7 +30991,7 @@ paths:
                 retry:
                   type: object
                   description: Retry configuration for failed module executions
-                  properties: *ref_201
+                  properties: *ref_203
                 permissioned_as:
                   type: string
                   description: >-
@@ -30153,7 +31007,7 @@ paths:
                   type: array
                   items:
                     type: string
-              required: &ref_497
+              required: &ref_499
                 - path
                 - script_path
                 - is_flow
@@ -30215,12 +31069,12 @@ paths:
             application/json:
               schema:
                 allOf:
-                  - allOf: &ref_275
+                  - allOf: &ref_277
                       - type: object
-                        properties: *ref_219
-                        required: *ref_220
+                        properties: *ref_221
+                        required: *ref_222
                     type: object
-                    properties: &ref_276
+                    properties: &ref_278
                       local_part:
                         type: string
                       workspaced_local_part:
@@ -30234,8 +31088,8 @@ paths:
                       retry:
                         type: object
                         description: Retry configuration for failed module executions
-                        properties: *ref_201
-                    required: &ref_277
+                        properties: *ref_203
+                    required: &ref_279
                       - local_part
                   - type: object
                     description: >
@@ -30319,7 +31173,7 @@ paths:
             so the home page can render a "Draft" badge. Gated to
             non-operators + page 0 + no narrowing filters on the backend so
             picker callers stay deployed-only and pagination stays clean.
-          schema: *ref_212
+          schema: *ref_214
       responses:
         '200':
           description: email trigger list
@@ -30328,10 +31182,10 @@ paths:
               schema:
                 type: array
                 items:
-                  allOf: *ref_275
+                  allOf: *ref_277
                   type: object
-                  properties: *ref_276
-                  required: *ref_277
+                  properties: *ref_278
+                  required: *ref_279
   /w/{workspace}/email_triggers/exists/{path}:
     get:
       summary: does email trigger exists
@@ -30413,7 +31267,7 @@ paths:
                 mode:
                   description: job trigger mode
                   type: string
-                  enum: *ref_211
+                  enum: *ref_213
                 force:
                   type: boolean
                   description: >
@@ -30443,9 +31297,9 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_498
+                  required: &ref_500
                     - name
-                  properties: &ref_499
+                  properties: &ref_501
                     name:
                       type: string
                     summary:
@@ -30475,9 +31329,9 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_279
+                  required: &ref_281
                     - name
-                  properties: &ref_280
+                  properties: &ref_282
                     name:
                       type: string
                     summary:
@@ -30496,14 +31350,14 @@ paths:
                       type: array
                       items:
                         type: object
-                        properties: &ref_500
+                        properties: &ref_502
                           workspace_id:
                             type: string
                           workspace_name:
                             type: string
                           role:
                             type: string
-                        required: &ref_501
+                        required: &ref_503
                           - name
   /groups/get/{name}:
     get:
@@ -30515,7 +31369,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: instance group
@@ -30523,8 +31377,8 @@ paths:
             application/json:
               schema:
                 type: object
-                required: *ref_279
-                properties: *ref_280
+                required: *ref_281
+                properties: *ref_282
   /groups/create:
     post:
       summary: create instance group
@@ -30562,7 +31416,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: update instance group
         required: true
@@ -30598,7 +31452,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: instance group deleted
@@ -30616,7 +31470,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: user to add to instance group
         required: true
@@ -30646,7 +31500,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: user to remove from instance group
         required: true
@@ -30681,7 +31535,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_281
+                  properties: &ref_283
                     name:
                       type: string
                     summary:
@@ -30702,7 +31556,7 @@ paths:
                       enum:
                         - superadmin
                         - devops
-                  required: &ref_282
+                  required: &ref_284
                     - name
   /groups/overwrite:
     post:
@@ -30719,8 +31573,8 @@ paths:
               type: array
               items:
                 type: object
-                properties: *ref_281
-                required: *ref_282
+                properties: *ref_283
+                required: *ref_284
       responses:
         '200':
           description: success message
@@ -30756,7 +31610,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_283
+                  properties: &ref_285
                     name:
                       type: string
                     summary:
@@ -30769,7 +31623,7 @@ paths:
                       type: object
                       additionalProperties:
                         type: boolean
-                  required: &ref_284
+                  required: &ref_286
                     - name
   /w/{workspace}/groups/listnames:
     get:
@@ -30842,7 +31696,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: updated group
         required: true
@@ -30874,7 +31728,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: group deleted
@@ -30896,7 +31750,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: group
@@ -30904,8 +31758,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_283
-                required: *ref_284
+                properties: *ref_285
+                required: *ref_286
   /w/{workspace}/groups/adduser/{name}:
     post:
       summary: add user to group
@@ -30920,7 +31774,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: added user to group
         required: true
@@ -30952,7 +31806,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: added user to group
         required: true
@@ -30984,7 +31838,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -31043,7 +31897,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_286
+                  properties: &ref_288
                     name:
                       type: string
                     owners:
@@ -31069,7 +31923,7 @@ paths:
                         (relative to the folder root) wins, and its
                         `permissioned_as` is used as the default.
                       type: array
-                      items: &ref_285
+                      items: &ref_287
                         type: object
                         required:
                           - path_glob
@@ -31098,7 +31952,7 @@ paths:
                         Labels set on the folder. Items inside the folder
                         inherit them, exposed as `inherited_labels` on scripts
                         and flows and stamped into job labels at run time.
-                  required: &ref_287
+                  required: &ref_289
                     - name
                     - owners
                     - extra_perms
@@ -31165,7 +32019,7 @@ paths:
                     to the folder root) wins, and its `permissioned_as` is used
                     as the default.
                   type: array
-                  items: *ref_285
+                  items: *ref_287
                 labels:
                   type: array
                   items:
@@ -31193,7 +32047,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: update folder
         required: true
@@ -31219,7 +32073,7 @@ paths:
                     to the folder root) wins, and its `permissioned_as` is used
                     as the default.
                   type: array
-                  items: *ref_285
+                  items: *ref_287
                 labels:
                   type: array
                   items:
@@ -31245,7 +32099,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: folder deleted
@@ -31267,7 +32121,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: folder
@@ -31275,8 +32129,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_286
-                required: *ref_287
+                properties: *ref_288
+                required: *ref_289
   /w/{workspace}/folders/exists/{name}:
     get:
       summary: exists folder
@@ -31291,7 +32145,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: folder exists
@@ -31313,7 +32167,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: folder
@@ -31355,7 +32209,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: owner user to folder
         required: true
@@ -31389,7 +32243,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: added owner to folder
         required: true
@@ -31425,7 +32279,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -31489,7 +32343,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_502
+                  properties: &ref_504
                     worker:
                       type: string
                     worker_instance:
@@ -31535,7 +32389,7 @@ paths:
                       type: string
                     native_mode:
                       type: boolean
-                  required: &ref_503
+                  required: &ref_505
                     - worker
                     - worker_instance
                     - ping_at
@@ -31700,7 +32554,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: a config
@@ -31709,12 +32563,12 @@ paths:
               schema:
                 type: object
                 nullable: true
-                properties: &ref_389
+                properties: &ref_391
                   alerts:
                     type: array
                     items:
                       type: object
-                      properties: &ref_387
+                      properties: &ref_389
                         name:
                           type: string
                         tags_to_monitor:
@@ -31727,7 +32581,7 @@ paths:
                           type: integer
                         alert_time_threshold_seconds:
                           type: integer
-                      required: &ref_388
+                      required: &ref_390
                         - name
                         - tags_to_monitor
                         - jobs_num_threshold
@@ -31743,7 +32597,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       requestBody:
         description: worker group
         required: true
@@ -31766,7 +32620,7 @@ paths:
         - name: name
           in: path
           required: true
-          schema: *ref_278
+          schema: *ref_280
       responses:
         '200':
           description: Delete config
@@ -31789,12 +32643,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_548
+                  properties: &ref_550
                     name:
                       type: string
                     config:
                       type: object
-                  required: &ref_549
+                  required: &ref_551
                     - name
   /configs/list_autoscaling_events/{worker_group}:
     get:
@@ -31825,7 +32679,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_552
+                  properties: &ref_554
                     id:
                       type: integer
                       format: int64
@@ -31892,7 +32746,7 @@ paths:
                       type: string
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                   required:
                     - workspace_id
                     - language
@@ -31918,7 +32772,7 @@ paths:
                       type: string
                     language:
                       type: string
-                      enum: *ref_99
+                      enum: *ref_100
                     workspace_dep_names:
                       type: array
                       items:
@@ -32258,7 +33112,7 @@ paths:
               properties:
                 trigger_kind:
                   type: string
-                  enum: &ref_288
+                  enum: &ref_290
                     - webhook
                     - http
                     - websocket
@@ -32304,11 +33158,11 @@ paths:
           required: true
           schema:
             type: string
-            enum: *ref_288
+            enum: *ref_290
         - name: runnable_kind
           in: path
           required: true
-          schema: *ref_136
+          schema: *ref_139
         - name: path
           in: path
           required: true
@@ -32330,7 +33184,7 @@ paths:
         - name: runnable_kind
           in: path
           required: true
-          schema: *ref_136
+          schema: *ref_139
         - name: path
           in: path
           required: true
@@ -32344,17 +33198,17 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_553
+                  properties: &ref_555
                     trigger_config: {}
                     trigger_kind:
                       type: string
-                      enum: *ref_288
+                      enum: *ref_290
                     error:
                       type: string
                     last_server_ping:
                       type: string
                       format: date-time
-                  required: &ref_554
+                  required: &ref_556
                     - trigger_kind
   /w/{workspace}/capture/list/{runnable_kind}/{path}:
     get:
@@ -32370,7 +33224,7 @@ paths:
         - name: runnable_kind
           in: path
           required: true
-          schema: *ref_136
+          schema: *ref_139
         - name: path
           in: path
           required: true
@@ -32379,7 +33233,7 @@ paths:
           in: query
           schema:
             type: string
-            enum: *ref_288
+            enum: *ref_290
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -32397,10 +33251,10 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_289
+                  properties: &ref_291
                     trigger_kind:
                       type: string
-                      enum: *ref_288
+                      enum: *ref_290
                     main_args: {}
                     preprocessor_args: {}
                     id:
@@ -32408,7 +33262,7 @@ paths:
                     created_at:
                       type: string
                       format: date-time
-                  required: &ref_290
+                  required: &ref_292
                     - trigger_kind
                     - main_args
                     - preprocessor_args
@@ -32428,7 +33282,7 @@ paths:
         - name: runnable_kind
           in: path
           required: true
-          schema: *ref_136
+          schema: *ref_139
         - name: path
           in: path
           required: true
@@ -32473,8 +33327,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_289
-                required: *ref_290
+                properties: *ref_291
+                required: *ref_292
     delete:
       summary: delete a capture
       operationId: deleteCapture
@@ -32566,13 +33420,13 @@ paths:
           schema: *ref_4
         - name: runnable_id
           in: query
-          schema: &ref_291
+          schema: &ref_293
             type: string
         - name: runnable_type
           in: query
-          schema: &ref_292
+          schema: &ref_294
             type: string
-            enum: &ref_398
+            enum: &ref_400
               - ScriptHash
               - ScriptPath
               - FlowPath
@@ -32589,7 +33443,7 @@ paths:
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: include_preview
           in: query
           schema:
@@ -32603,7 +33457,7 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_293
+                  properties: &ref_295
                     id:
                       type: string
                     name:
@@ -32617,7 +33471,7 @@ paths:
                       type: boolean
                     success:
                       type: boolean
-                  required: &ref_294
+                  required: &ref_296
                     - id
                     - name
                     - args
@@ -32667,10 +33521,10 @@ paths:
           schema: *ref_4
         - name: runnable_id
           in: query
-          schema: *ref_291
+          schema: *ref_293
         - name: runnable_type
           in: query
-          schema: *ref_292
+          schema: *ref_294
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -32688,8 +33542,8 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: *ref_293
-                  required: *ref_294
+                  properties: *ref_295
+                  required: *ref_296
   /w/{workspace}/inputs/create:
     post:
       summary: Create an Input for future use in a script or flow
@@ -32703,10 +33557,10 @@ paths:
           schema: *ref_4
         - name: runnable_id
           in: query
-          schema: *ref_291
+          schema: *ref_293
         - name: runnable_type
           in: query
-          schema: *ref_292
+          schema: *ref_294
       requestBody:
         description: Input
         required: true
@@ -32714,12 +33568,12 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_394
+              properties: &ref_396
                 name:
                   type: string
                 args:
                   type: object
-              required: &ref_395
+              required: &ref_397
                 - name
                 - args
                 - created_by
@@ -32749,14 +33603,14 @@ paths:
           application/json:
             schema:
               type: object
-              properties: &ref_396
+              properties: &ref_398
                 id:
                   type: string
                 name:
                   type: string
                 is_public:
                   type: boolean
-              required: &ref_397
+              required: &ref_399
                 - id
                 - name
                 - is_public
@@ -32782,7 +33636,7 @@ paths:
         - name: input
           in: path
           required: true
-          schema: &ref_317
+          schema: &ref_319
             type: string
       responses:
         '200':
@@ -32815,7 +33669,7 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: &ref_295
+                  properties: &ref_297
                     bucket:
                       type: string
                     region:
@@ -32830,7 +33684,7 @@ paths:
                       type: string
                     pathStyle:
                       type: boolean
-                  required: &ref_296
+                  required: &ref_298
                     - bucket
                     - region
                     - endPoint
@@ -32908,8 +33762,8 @@ paths:
               properties:
                 s3_resource:
                   type: object
-                  properties: *ref_295
-                  required: *ref_296
+                  properties: *ref_297
+                  required: *ref_298
       responses:
         '200':
           description: Connection settings
@@ -32930,10 +33784,10 @@ paths:
                     type: boolean
                   client_kwargs:
                     type: object
-                    properties: &ref_297
+                    properties: &ref_299
                       region_name:
                         type: string
-                    required: &ref_298
+                    required: &ref_300
                       - region_name
                 required:
                   - endpoint_url
@@ -32988,8 +33842,8 @@ paths:
                         type: boolean
                       client_kwargs:
                         type: object
-                        properties: *ref_297
-                        required: *ref_298
+                        properties: *ref_299
+                        required: *ref_300
                     required:
                       - endpoint_url
                       - use_ssl
@@ -33047,8 +33901,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_295
-                required: *ref_296
+                properties: *ref_297
+                required: *ref_298
   /w/{workspace}/job_helpers/test_connection:
     get:
       summary: Test connection to the workspace object storage
@@ -33112,10 +33966,10 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_299
+                      properties: &ref_301
                         s3:
                           type: string
-                      required: &ref_300
+                      required: &ref_302
                         - s3
                   restricted_access:
                     type: boolean
@@ -33148,7 +34002,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_303
+                properties: &ref_305
                   mime_type:
                     type: string
                   size_in_bytes:
@@ -33212,7 +34066,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_301
+                properties: &ref_303
                   msg:
                     type: string
                   content:
@@ -33224,7 +34078,7 @@ paths:
                       - Csv
                       - Parquet
                       - Unknown
-                required: &ref_302
+                required: &ref_304
                   - content_type
   /w/{workspace}/job_helpers/list_git_repo_files:
     get:
@@ -33272,8 +34126,8 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: *ref_299
-                      required: *ref_300
+                      properties: *ref_301
+                      required: *ref_302
                   restricted_access:
                     type: boolean
                 required:
@@ -33332,8 +34186,8 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_301
-                required: *ref_302
+                properties: *ref_303
+                required: *ref_304
   /w/{workspace}/job_helpers/load_git_repo_file_metadata:
     get:
       summary: >-
@@ -33364,7 +34218,7 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: *ref_303
+                properties: *ref_305
   /w/{workspace}/job_helpers/check_s3_folder_exists:
     get:
       summary: Check if S3 path exists and is a folder
@@ -33815,7 +34669,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -33844,46 +34698,46 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_534
+                      properties: &ref_536
                         id:
                           type: string
                         name:
                           type: string
-                      required: &ref_535
-                        - id
-                  scalar_metrics:
-                    type: array
-                    items:
-                      type: object
-                      properties: &ref_536
-                        metric_id:
-                          type: string
-                        value:
-                          type: number
                       required: &ref_537
                         - id
-                        - value
-                  timeseries_metrics:
+                  scalar_metrics:
                     type: array
                     items:
                       type: object
                       properties: &ref_538
+                        metric_id:
+                          type: string
+                        value:
+                          type: number
+                      required: &ref_539
+                        - id
+                        - value
+                  timeseries_metrics:
+                    type: array
+                    items:
+                      type: object
+                      properties: &ref_540
                         metric_id:
                           type: string
                         values:
                           type: array
                           items:
                             type: object
-                            properties: &ref_540
+                            properties: &ref_542
                               timestamp:
                                 type: string
                                 format: date-time
                               value:
                                 type: number
-                            required: &ref_541
+                            required: &ref_543
                               - timestamp
                               - value
-                      required: &ref_539
+                      required: &ref_541
                         - id
                         - values
   /w/{workspace}/job_metrics/set_progress/{id}:
@@ -33900,7 +34754,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       requestBody:
         description: parameters for statistics retrieval
         required: true
@@ -33934,7 +34788,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: job progress between 0 and 99
@@ -33952,11 +34806,11 @@ paths:
         - name: before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_304
+          schema: *ref_306
         - name: after
           description: filter on created after (exclusive) timestamp
           in: query
-          schema: *ref_305
+          schema: *ref_307
         - name: with_error
           in: query
           required: false
@@ -34028,12 +34882,12 @@ paths:
                 type: array
                 items:
                   type: object
-                  properties: &ref_542
+                  properties: &ref_544
                     concurrency_key:
                       type: string
                     total_running:
                       type: number
-                  required: &ref_543
+                  required: &ref_545
                     - concurrency_key
                     - total_running
   /concurrency_groups/prune/{concurrency_id}:
@@ -34046,7 +34900,7 @@ paths:
         - name: concurrency_id
           in: path
           required: true
-          schema: &ref_319
+          schema: &ref_321
             type: string
       responses:
         '200':
@@ -34066,7 +34920,7 @@ paths:
         - name: id
           in: path
           required: true
-          schema: *ref_176
+          schema: *ref_178
       responses:
         '200':
           description: concurrency key for given job
@@ -34102,104 +34956,104 @@ paths:
             (e.g. 'alice,bob') and negation by prefixing all values with '!'
             (e.g. '!alice,!bob')
           in: query
-          schema: *ref_123
+          schema: *ref_124
         - name: label
           description: >-
             filter by exact matching job label. Supports comma-separated list
             (e.g. 'deploy,release') and negation by prefixing all values with
             '!' (e.g. '!deploy,!release')
           in: query
-          schema: *ref_178
+          schema: *ref_180
         - name: parent_job
           description: >-
             The parent job that is at the origin and responsible for the
             execution of this script if any
           in: query
-          schema: *ref_114
+          schema: *ref_115
         - name: script_path_exact
           description: >-
             filter by exact matching script path. Supports comma-separated list
             (e.g. 'f/script1,f/script2') and negation by prefixing all values
             with '!' (e.g. '!f/script1,!f/script2')
           in: query
-          schema: *ref_161
+          schema: *ref_163
         - name: script_path_start
           description: >-
             filter by script path prefix. Supports comma-separated list (e.g.
             'f/folder1,f/folder2') and negation by prefixing all values with '!'
             (e.g. '!f/folder1,!f/folder2')
           in: query
-          schema: *ref_162
+          schema: *ref_164
         - name: schedule_path
           description: mask to filter by schedule path
           in: query
-          schema: *ref_163
+          schema: *ref_165
         - name: script_hash
           description: mask to filter exact matching path
           in: query
-          schema: *ref_164
+          schema: *ref_166
         - name: started_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_165
+          schema: *ref_167
         - name: started_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_166
+          schema: *ref_168
         - name: running
           description: filter on running jobs
           in: query
-          schema: *ref_167
+          schema: *ref_169
         - name: scheduled_for_before_now
           description: filter on jobs scheduled_for before now (hence waitinf for a worker)
           in: query
-          schema: *ref_168
+          schema: *ref_170
         - name: completed_before
           description: filter on started before (inclusive) timestamp
           in: query
-          schema: *ref_188
+          schema: *ref_190
         - name: completed_after
           description: filter on started after (exclusive) timestamp
           in: query
-          schema: *ref_189
+          schema: *ref_191
         - name: created_before_queue
           description: filter on jobs created before X for jobs in the queue only
           in: query
-          schema: *ref_190
+          schema: *ref_192
         - name: created_after_queue
           description: filter on jobs created after X for jobs in the queue only
           in: query
-          schema: *ref_191
+          schema: *ref_193
         - name: job_kinds
           description: >-
             filter by job kind. Supports comma-separated list of values
             ('preview', 'script', 'dependencies', 'flow') and negation by
             prefixing all values with '!' (e.g. '!preview,!dependencies')
           in: query
-          schema: *ref_169
+          schema: *ref_171
         - name: args
           description: >-
             filter on jobs containing those args as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_171
+          schema: *ref_173
         - name: tag
           description: >-
             filter by tag/worker group. Supports comma-separated list (e.g.
             'gpu,highmem') and negation by prefixing all values with '!' (e.g.
             '!gpu,!highmem')
           in: query
-          schema: *ref_172
+          schema: *ref_174
         - name: result
           description: >-
             filter on jobs containing those result as a json subset (@> in
             postgres)
           in: query
-          schema: *ref_173
+          schema: *ref_175
         - name: allow_wildcards
           description: allow wildcards (*) in the filter of label, tag, worker
           in: query
-          schema: *ref_175
+          schema: *ref_177
         - name: page
           description: which page to return (start at 1, default 1)
           in: query
@@ -34215,7 +35069,7 @@ paths:
             (e.g. '!schedule,!webhook')
           in: query
           x-go-name: JobTriggerKindParam
-          schema: *ref_192
+          schema: *ref_194
         - name: is_skipped
           description: is the job skipped
           in: query
@@ -34268,17 +35122,17 @@ paths:
             application/json:
               schema:
                 type: object
-                properties: &ref_544
+                properties: &ref_546
                   jobs:
                     type: array
                     items:
-                      oneOf: *ref_197
-                      discriminator: *ref_198
+                      oneOf: *ref_199
+                      discriminator: *ref_200
                   obscured_jobs:
                     type: array
                     items:
                       type: object
-                      properties: &ref_399
+                      properties: &ref_401
                         typ:
                           type: string
                         started_at:
@@ -34291,7 +35145,7 @@ paths:
                       Obscured jobs omitted for security because of too specific
                       filtering
                     type: boolean
-                required: &ref_545
+                required: &ref_547
                   - jobs
                   - obscured_jobs
   /srch/w/{workspace}/index/search/job:
@@ -34335,7 +35189,7 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_550
+                      properties: &ref_552
                         dancer:
                           type: string
                   hit_count:
@@ -34414,7 +35268,7 @@ paths:
                     type: array
                     items:
                       type: object
-                      properties: &ref_551
+                      properties: &ref_553
                         dancer:
                           type: string
   /srch/index/search/count_service_logs:
@@ -34689,7 +35543,7 @@ paths:
                           type: string
                         kind:
                           type: string
-                          enum: *ref_306
+                          enum: *ref_308
                         usages:
                           type: array
                           items:
@@ -34702,13 +35556,13 @@ paths:
                                 type: string
                               kind:
                                 type: string
-                                enum: &ref_308
+                                enum: &ref_310
                                   - script
                                   - flow
                                   - job
                               access_type:
                                 type: string
-                                enum: &ref_307
+                                enum: &ref_309
                                   - r
                                   - w
                                   - rw
@@ -34718,7 +35572,7 @@ paths:
                                 description: The columns used (for tables)
                                 additionalProperties:
                                   type: string
-                                  enum: *ref_307
+                                  enum: *ref_309
                                   nullable: true
                               created_at:
                                 type: string
@@ -34791,7 +35645,7 @@ paths:
                         type: string
                       kind:
                         type: string
-                        enum: *ref_308
+                        enum: *ref_310
       responses:
         '200':
           description: all assets used by the given usage paths, in the same order
@@ -34811,10 +35665,10 @@ paths:
                         type: string
                       kind:
                         type: string
-                        enum: *ref_306
+                        enum: *ref_308
                       access_type:
                         type: string
-                        enum: *ref_307
+                        enum: *ref_309
                         nullable: true
   /w/{workspace}/assets/list_favorites:
     get:
@@ -34842,6 +35696,181 @@ paths:
                     path:
                       type: string
                       description: The asset path
+  /w/{workspace}/assets/graph:
+    get:
+      summary: Get the workspace-wide asset <-> runnable graph
+      operationId: getAssetsGraph
+      tags:
+        - asset
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+        - name: asset_kinds
+          in: query
+          description: Filter by asset kinds (comma-separated list)
+          schema:
+            type: string
+        - name: folder
+          in: query
+          description: Scope the graph to runnables in a single folder
+          schema:
+            type: string
+      responses:
+        '200':
+          description: asset graph nodes, lineage edges and trigger edges
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - assets
+                  - runnables
+                  - edges
+                  - triggers
+                properties:
+                  assets:
+                    type: array
+                    items:
+                      type: object
+                      required:
+                        - kind
+                        - path
+                      properties:
+                        kind:
+                          type: string
+                          enum: *ref_308
+                        path:
+                          type: string
+                  runnables:
+                    type: array
+                    items:
+                      type: object
+                      required:
+                        - path
+                        - usage_kind
+                      properties:
+                        path:
+                          type: string
+                        usage_kind:
+                          type: string
+                          enum: *ref_310
+                        in_pipeline:
+                          type: boolean
+                          description: >-
+                            True iff the script is a pipeline member (deployed
+                            with `// pipeline`). Omitted when false.
+                  edges:
+                    type: array
+                    items:
+                      type: object
+                      required:
+                        - runnable_path
+                        - runnable_kind
+                        - asset_kind
+                        - asset_path
+                      properties:
+                        runnable_path:
+                          type: string
+                        runnable_kind:
+                          type: string
+                          enum: *ref_310
+                        asset_kind:
+                          type: string
+                          enum: *ref_308
+                        asset_path:
+                          type: string
+                        access_type:
+                          type: string
+                          enum: *ref_309
+                          nullable: true
+                  triggers:
+                    type: array
+                    items:
+                      oneOf:
+                        - type: object
+                          description: Asset trigger edge (`// on <asset>`)
+                          required:
+                            - trigger_kind
+                            - asset_kind
+                            - asset_path
+                            - runnable_kind
+                            - runnable_path
+                          properties:
+                            trigger_kind:
+                              type: string
+                              enum:
+                                - asset
+                            asset_kind:
+                              type: string
+                              enum: *ref_308
+                            asset_path:
+                              type: string
+                            runnable_kind:
+                              type: string
+                              enum: *ref_310
+                            runnable_path:
+                              type: string
+                        - type: object
+                          description: >-
+                            Native trigger edge (schedule, email, kafka, ...).
+                            `path` is the trigger row's path.
+                          required:
+                            - trigger_kind
+                            - path
+                            - runnable_kind
+                            - runnable_path
+                          properties:
+                            trigger_kind:
+                              type: string
+                              enum:
+                                - schedule
+                                - email
+                                - kafka
+                                - mqtt
+                                - nats
+                                - postgres
+                                - sqs
+                                - gcp
+                            path:
+                              type: string
+                            runnable_kind:
+                              type: string
+                              enum: *ref_310
+                            runnable_path:
+                              type: string
+  /w/{workspace}/assets/pipelines:
+    get:
+      summary: List folders that contain at least one pipeline-member script
+      operationId: listPipelineFolders
+      tags:
+        - asset
+      parameters:
+        - name: workspace
+          in: path
+          required: true
+          schema: *ref_4
+      responses:
+        '200':
+          description: folders containing pipeline scripts, with their script counts
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  required:
+                    - folder
+                    - script_count
+                  properties:
+                    folder:
+                      type: string
+                      description: The folder name (without the `f/` prefix)
+                    script_count:
+                      type: integer
+                      format: int64
+                      description: Number of pipeline-member scripts in the folder
   /w/{workspace}/volumes/list:
     get:
       summary: List all volumes in the workspace
@@ -34862,13 +35891,13 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_564
+                  required: &ref_566
                     - name
                     - size_bytes
                     - file_count
                     - created_at
                     - created_by
-                  properties: &ref_565
+                  properties: &ref_567
                     name:
                       type: string
                     size_bytes:
@@ -34983,13 +36012,13 @@ paths:
                 type: array
                 items:
                   type: object
-                  required: &ref_381
+                  required: &ref_383
                     - name
                     - description
                     - instructions
                     - path
                     - method
-                  properties: &ref_382
+                  properties: &ref_384
                     name:
                       type: string
                       description: The tool name/operation ID
@@ -35140,12 +36169,12 @@ components:
         so the home page can render a "Draft" badge. Gated to
         non-operators + page 0 + no narrowing filters on the backend so
         picker callers stay deployed-only and pagination stays clean.
-      schema: *ref_212
+      schema: *ref_214
     Id:
       name: id
       in: path
       required: true
-      schema: *ref_309
+      schema: *ref_311
     Key:
       name: key
       in: path
@@ -35161,7 +36190,7 @@ components:
       in: path
       required: true
       description: The name of the publication
-      schema: *ref_269
+      schema: *ref_271
     VersionId:
       name: version
       in: path
@@ -35172,7 +36201,7 @@ components:
       name: token
       in: path
       required: true
-      schema: *ref_310
+      schema: *ref_312
     AccountId:
       name: id
       in: path
@@ -35187,17 +36216,17 @@ components:
       name: path
       in: path
       required: true
-      schema: *ref_97
+      schema: *ref_98
     ScriptHash:
       name: hash
       in: path
       required: true
-      schema: *ref_107
+      schema: *ref_108
     JobId:
       name: id
       in: path
       required: true
-      schema: *ref_176
+      schema: *ref_178
     Path:
       name: path
       in: path
@@ -35207,7 +36236,7 @@ components:
       name: custom_path
       in: path
       required: true
-      schema: *ref_137
+      schema: *ref_97
     PathId:
       name: id
       in: path
@@ -35217,12 +36246,12 @@ components:
       name: version
       in: path
       required: true
-      schema: *ref_311
+      schema: *ref_313
     Name:
       name: name
       in: path
       required: true
-      schema: *ref_278
+      schema: *ref_280
     Page:
       name: page
       description: which page to return (start at 1, default 1)
@@ -35241,12 +36270,12 @@ components:
         '!schedule,!webhook')
       in: query
       x-go-name: JobTriggerKindParam
-      schema: *ref_192
+      schema: *ref_194
     OrderDesc:
       name: order_desc
       description: order by desc order (default true)
       in: query
-      schema: *ref_122
+      schema: *ref_123
     CreatedBy:
       name: created_by
       description: >-
@@ -35254,7 +36283,7 @@ components:
         (e.g. 'alice,bob') and negation by prefixing all values with '!' (e.g.
         '!alice,!bob')
       in: query
-      schema: *ref_123
+      schema: *ref_124
     Label:
       name: label
       description: >-
@@ -35262,7 +36291,7 @@ components:
         'deploy,release') and negation by prefixing all values with '!' (e.g.
         '!deploy,!release')
       in: query
-      schema: *ref_178
+      schema: *ref_180
     Worker:
       name: worker
       description: >-
@@ -35270,26 +36299,26 @@ components:
         'worker-1,worker-2') and negation by prefixing all values with '!' (e.g.
         '!worker-1,!worker-2')
       in: query
-      schema: *ref_160
+      schema: *ref_162
     ParentJob:
       name: parent_job
       description: >-
         The parent job that is at the origin and responsible for the execution
         of this script if any
       in: query
-      schema: *ref_114
+      schema: *ref_115
     WorkerTag:
       name: tag
       description: Override the tag to use
       in: query
-      schema: *ref_115
+      schema: *ref_116
     CacheTtl:
       name: cache_ttl
       description: >-
         Override the cache time to live (in seconds). Can not be used to disable
         caching, only override with a new cache ttl
       in: query
-      schema: *ref_116
+      schema: *ref_117
     NewJobId:
       name: job_id
       description: >-
@@ -35297,7 +36326,7 @@ components:
         randomly using the ULID scheme. If a job id already exists in the queue
         or as a completed job, the request to create one will fail (Bad Request)
       in: query
-      schema: *ref_117
+      schema: *ref_118
     IncludeHeader:
       name: include_header
       description: >
@@ -35307,19 +36336,19 @@ components:
         Header's key lowercased and '-'' replaced to '_' such that
         'Content-Type' becomes the 'content_type' arg key
       in: query
-      schema: *ref_118
+      schema: *ref_119
     QueueLimit:
       name: queue_limit
       description: >
         The maximum size of the queue for which the request would get rejected
         if that job would push it above that limit
       in: query
-      schema: *ref_119
+      schema: *ref_120
     SkipPreprocessor:
       name: skip_preprocessor
       description: skip the preprocessor
       in: query
-      schema: *ref_120
+      schema: *ref_121
     Payload:
       name: payload
       description: >
@@ -35328,7 +36357,7 @@ components:
 
         `encodeURIComponent(btoa(JSON.stringify({a: 2})))`
       in: query
-      schema: *ref_121
+      schema: *ref_122
     ScriptStartPath:
       name: script_path_start
       description: >-
@@ -35336,12 +36365,12 @@ components:
         'f/folder1,f/folder2') and negation by prefixing all values with '!'
         (e.g. '!f/folder1,!f/folder2')
       in: query
-      schema: *ref_162
+      schema: *ref_164
     SchedulePath:
       name: schedule_path
       description: mask to filter by schedule path
       in: query
-      schema: *ref_163
+      schema: *ref_165
     TriggerPath:
       name: trigger_path
       description: >-
@@ -35349,7 +36378,7 @@ components:
         'f/trigger1,f/trigger2') and negation by prefixing all values with '!'
         (e.g. '!f/trigger1,!f/trigger2')
       in: query
-      schema: *ref_312
+      schema: *ref_314
     ScriptExactPath:
       name: script_path_exact
       description: >-
@@ -35357,87 +36386,87 @@ components:
         (e.g. 'f/script1,f/script2') and negation by prefixing all values with
         '!' (e.g. '!f/script1,!f/script2')
       in: query
-      schema: *ref_161
+      schema: *ref_163
     ScriptExactHash:
       name: script_hash
       description: mask to filter exact matching path
       in: query
-      schema: *ref_164
+      schema: *ref_166
     CreatedBefore:
       name: created_before
       description: filter on created before (inclusive) timestamp
       in: query
-      schema: *ref_186
+      schema: *ref_188
     CreatedAfter:
       name: created_after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_187
+      schema: *ref_189
     StartedBefore:
       name: started_before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_165
+      schema: *ref_167
     StartedAfter:
       name: started_after
       description: filter on started after (exclusive) timestamp
       in: query
-      schema: *ref_166
+      schema: *ref_168
     Before:
       name: before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_304
+      schema: *ref_306
     CompletedBefore:
       name: completed_before
       description: filter on started before (inclusive) timestamp
       in: query
-      schema: *ref_188
+      schema: *ref_190
     CompletedAfter:
       name: completed_after
       description: filter on started after (exclusive) timestamp
       in: query
-      schema: *ref_189
+      schema: *ref_191
     CreatedAfterQueue:
       name: created_after_queue
       description: filter on jobs created after X for jobs in the queue only
       in: query
-      schema: *ref_191
+      schema: *ref_193
     CreatedBeforeQueue:
       name: created_before_queue
       description: filter on jobs created before X for jobs in the queue only
       in: query
-      schema: *ref_190
+      schema: *ref_192
     Success:
       name: success
       description: filter on successful jobs
       in: query
-      schema: *ref_174
+      schema: *ref_176
     ScheduledForBeforeNow:
       name: scheduled_for_before_now
       description: filter on jobs scheduled_for before now (hence waitinf for a worker)
       in: query
-      schema: *ref_168
+      schema: *ref_170
     Suspended:
       name: suspended
       description: filter on suspended jobs
       in: query
-      schema: *ref_170
+      schema: *ref_172
     Running:
       name: running
       description: filter on running jobs
       in: query
-      schema: *ref_167
+      schema: *ref_169
     AllowWildcards:
       name: allow_wildcards
       description: allow wildcards (*) in the filter of label, tag, worker
       in: query
-      schema: *ref_175
+      schema: *ref_177
     ArgsFilter:
       name: args
       description: filter on jobs containing those args as a json subset (@> in postgres)
       in: query
-      schema: *ref_171
+      schema: *ref_173
     Tag:
       name: tag
       description: >-
@@ -35445,37 +36474,37 @@ components:
         'gpu,highmem') and negation by prefixing all values with '!' (e.g.
         '!gpu,!highmem')
       in: query
-      schema: *ref_172
+      schema: *ref_174
     ResultFilter:
       name: result
       description: filter on jobs containing those result as a json subset (@> in postgres)
       in: query
-      schema: *ref_173
+      schema: *ref_175
     After:
       name: after
       description: filter on created after (exclusive) timestamp
       in: query
-      schema: *ref_305
+      schema: *ref_307
     Username:
       name: username
       description: filter on exact username of user
       in: query
-      schema: *ref_313
+      schema: *ref_315
     Operation:
       name: operation
       description: filter on exact or prefix name of operation
       in: query
-      schema: *ref_314
+      schema: *ref_316
     ResourceName:
       name: resource
       description: filter on exact or prefix name of resource
       in: query
-      schema: *ref_315
+      schema: *ref_317
     ActionKind:
       name: action_kind
       description: filter on type of operation
       in: query
-      schema: *ref_316
+      schema: *ref_318
     JobKinds:
       name: job_kinds
       description: >-
@@ -35483,34 +36512,34 @@ components:
         'script', 'dependencies', 'flow') and negation by prefixing all values
         with '!' (e.g. '!preview,!dependencies')
       in: query
-      schema: *ref_169
+      schema: *ref_171
     RunnableId:
       name: runnable_id
       in: query
-      schema: *ref_291
+      schema: *ref_293
     RunnableTypeQuery:
       name: runnable_type
       in: query
-      schema: *ref_292
+      schema: *ref_294
     InputId:
       name: input
       in: path
       required: true
-      schema: *ref_317
+      schema: *ref_319
     GetStarted:
       name: get_started
       in: query
-      schema: *ref_318
+      schema: *ref_320
     ConcurrencyId:
       name: concurrency_id
       in: path
       required: true
-      schema: *ref_319
+      schema: *ref_321
     RunnableKind:
       name: runnable_kind
       in: path
       required: true
-      schema: *ref_136
+      schema: *ref_139
   schemas:
     UserDraftOverlay:
       type: object
@@ -35534,25 +36563,25 @@ components:
       description: |
         Closed set of item kinds a user can autosave as a draft. Mirrors the
         Postgres `DRAFT_KIND` enum and the backend `UserDraftItemKind`.
-      enum: *ref_100
+      enum: *ref_101
     OpenFlow:
       type: object
       description: >-
         Top-level flow definition containing metadata, configuration, and the
         flow structure
-      properties: *ref_124
-      required: *ref_125
+      properties: *ref_125
+      required: *ref_126
     FlowValue:
       type: object
       description: >-
         The flow structure containing modules and optional preprocessor/failure
         handlers
-      properties: *ref_153
-      required: *ref_154
+      properties: *ref_155
+      required: *ref_156
     Retry:
       type: object
       description: Retry configuration for failed module executions
-      properties: *ref_201
+      properties: *ref_203
     StopAfterIf:
       type: object
       description: Early termination condition for a module
@@ -35702,7 +36731,7 @@ components:
         retry:
           description: Retry configuration for failed module executions
           type: object
-          properties: *ref_320
+          properties: *ref_322
         debouncing:
           description: Debounce configuration for this step (EE only)
           type: object
@@ -35735,8 +36764,8 @@ components:
       description: >-
         Maps input parameters for a step. Can be a static value or a JavaScript
         expression that references previous results or flow inputs
-      oneOf: *ref_142
-      discriminator: *ref_143
+      oneOf: *ref_144
+      discriminator: *ref_145
     StaticTransform:
       type: object
       description: >-
@@ -35793,7 +36822,7 @@ components:
         kind:
           type: string
           description: Supported AI provider types
-          enum: *ref_321
+          enum: *ref_323
         resource:
           type: string
           description: >-
@@ -35813,16 +36842,16 @@ components:
       oneOf:
         - type: object
           description: No conversation memory/context
-          properties: *ref_322
-          required: *ref_323
-        - type: object
-          description: Automatic context management
           properties: *ref_324
           required: *ref_325
         - type: object
-          description: Explicit message history
+          description: Automatic context management
           properties: *ref_326
           required: *ref_327
+        - type: object
+          description: Explicit message history
+          properties: *ref_328
+          required: *ref_329
       discriminator:
         propertyName: kind
         mapping:
@@ -35839,62 +36868,62 @@ components:
             Inline script with code defined directly in the flow. Use 'bun' as
             default language if unspecified. The script receives arguments from
             input_transforms
-          properties: *ref_328
-          required: *ref_329
-        - type: object
-          description: >-
-            Reference to an existing script by path. Use this when calling a
-            previously saved script instead of writing inline code
           properties: *ref_330
           required: *ref_331
         - type: object
           description: >-
-            Reference to an existing flow by path. Use this to call another flow
-            as a subflow
+            Reference to an existing script by path. Use this when calling a
+            previously saved script instead of writing inline code
           properties: *ref_332
           required: *ref_333
+        - type: object
+          description: >-
+            Reference to an existing flow by path. Use this to call another flow
+            as a subflow
+          properties: *ref_334
+          required: *ref_335
         - type: object
           description: >-
             Executes nested modules in a loop over an iterator. Inside the loop,
             use 'flow_input.iter.value' to access the current iteration value,
             and 'flow_input.iter.index' for the index. Supports parallel
             execution for better performance on I/O-bound operations
-          properties: *ref_334
-          required: *ref_335
+          properties: *ref_336
+          required: *ref_337
         - type: object
           description: >-
             Executes nested modules repeatedly while a condition is true. The
             loop checks the condition after each iteration. Use stop_after_if on
             modules to control loop termination
-          properties: *ref_336
-          required: *ref_337
+          properties: *ref_338
+          required: *ref_339
         - type: object
           description: >-
             Conditional branching where only the first matching branch executes.
             Branches are evaluated in order, and the first one with a true
             expression runs. If no branches match, the default branch executes
-          properties: *ref_338
-          required: *ref_339
+          properties: *ref_340
+          required: *ref_341
         - type: object
           description: >-
             Parallel branching where all branches execute simultaneously. Unlike
             BranchOne, all branches run regardless of conditions. Useful for
             executing independent tasks concurrently
-          properties: *ref_340
-          required: *ref_341
+          properties: *ref_342
+          required: *ref_343
         - type: object
           description: >-
             Pass-through module that returns its input unchanged. Useful for
             flow structure or as a placeholder
-          properties: *ref_342
-          required: *ref_343
+          properties: *ref_344
+          required: *ref_345
         - type: object
           description: >-
             AI agent step that can use tools to accomplish tasks. The agent
             receives inputs and can call any of its configured tools to complete
             the task
-          properties: *ref_344
-          required: *ref_345
+          properties: *ref_346
+          required: *ref_347
       discriminator:
         propertyName: type
         mapping:
@@ -36300,8 +37329,8 @@ components:
               description: >-
                 Provider configuration - can be static (ProviderConfig),
                 JavaScript expression, or AI-determined
-              oneOf: *ref_346
-              discriminator: *ref_347
+              oneOf: *ref_348
+              discriminator: *ref_349
             output_type:
               allOf:
                 - description: >-
@@ -36354,8 +37383,8 @@ components:
               description: >-
                 Memory configuration - can be static (MemoryConfig), JavaScript
                 expression, or AI-determined
-              oneOf: *ref_348
-              discriminator: *ref_349
+              oneOf: *ref_350
+              discriminator: *ref_351
             output_schema:
               allOf:
                 - description: >-
@@ -36444,8 +37473,8 @@ components:
             description: >-
               A tool available to an AI agent. Can be a flow module or an
               external MCP (Model Context Protocol) tool
-            properties: *ref_350
-            required: *ref_351
+            properties: *ref_352
+            required: *ref_353
         type:
           type: string
           enum:
@@ -36485,8 +37514,8 @@ components:
         - type
     FlowStatus:
       type: object
-      properties: *ref_179
-      required: *ref_180
+      properties: *ref_181
+      required: *ref_182
     FlowStatusModule:
       type: object
       properties:
@@ -36708,8 +37737,8 @@ components:
         - type
     CiTestResult:
       type: object
-      properties: *ref_112
-      required: *ref_113
+      properties: *ref_113
+      required: *ref_114
     HealthStatusResponse:
       type: object
       description: Health status response (cached with 5s TTL)
@@ -36723,75 +37752,75 @@ components:
     HealthChecks:
       type: object
       description: Detailed health checks
-      required: *ref_352
-      properties: *ref_353
+      required: *ref_354
+      properties: *ref_355
     DatabaseHealth:
       type: object
       description: Database health status
-      required: *ref_354
-      properties: *ref_355
+      required: *ref_356
+      properties: *ref_357
     PoolStats:
       type: object
       description: Database connection pool statistics
-      required: *ref_356
-      properties: *ref_357
+      required: *ref_358
+      properties: *ref_359
     WorkersHealth:
       type: object
       description: Workers health status
-      required: *ref_358
-      properties: *ref_359
+      required: *ref_360
+      properties: *ref_361
     QueueHealth:
       type: object
       description: Job queue status
-      required: *ref_360
-      properties: *ref_361
+      required: *ref_362
+      properties: *ref_363
     ReadinessHealth:
       type: object
       description: Server readiness status
-      required: *ref_362
-      properties: *ref_363
+      required: *ref_364
+      properties: *ref_365
     AutoInviteConfig:
       type: object
       description: Configuration for auto-inviting users to the workspace
-      properties: *ref_364
+      properties: *ref_366
     ErrorHandlerConfig:
       type: object
       description: Configuration for the workspace error handler
-      properties: *ref_365
+      properties: *ref_367
     SuccessHandlerConfig:
       type: object
       description: Configuration for the workspace success handler
-      properties: *ref_366
+      properties: *ref_368
     EditErrorHandler:
       description: >-
         Request body for editing the workspace error handler. Accepts both new
         grouped format and legacy flat format for backward compatibility.
-      oneOf: *ref_367
+      oneOf: *ref_369
     EditErrorHandlerNew:
       type: object
       description: New grouped format for editing error handler
-      properties: *ref_368
+      properties: *ref_370
     EditErrorHandlerLegacy:
       type: object
       description: >-
         Legacy flat format for editing error handler (deprecated, use new
         format)
-      properties: *ref_369
+      properties: *ref_371
     EditSuccessHandler:
       description: >-
         Request body for editing the workspace success handler. Accepts both new
         grouped format and legacy flat format for backward compatibility.
-      oneOf: *ref_370
+      oneOf: *ref_372
     EditSuccessHandlerNew:
       type: object
       description: New grouped format for editing success handler
-      properties: *ref_371
+      properties: *ref_373
     EditSuccessHandlerLegacy:
       type: object
       description: >-
         Legacy flat format for editing success handler (deprecated, use new
         format)
-      properties: *ref_372
+      properties: *ref_374
     VaultSettings:
       type: object
       required: *ref_27
@@ -36806,28 +37835,28 @@ components:
       properties: *ref_34
     SecretMigrationFailure:
       type: object
-      required: *ref_373
-      properties: *ref_374
+      required: *ref_375
+      properties: *ref_376
     SecretMigrationReport:
       type: object
       required: *ref_29
       properties: *ref_30
     JwksResponse:
-      type: object
-      required: *ref_375
-      properties: *ref_376
-    FlowConversation:
       type: object
       required: *ref_377
       properties: *ref_378
-    FlowConversationMessage:
+    FlowConversation:
       type: object
       required: *ref_379
       properties: *ref_380
-    EndpointTool:
+    FlowConversationMessage:
       type: object
       required: *ref_381
       properties: *ref_382
+    EndpointTool:
+      type: object
+      required: *ref_383
+      properties: *ref_384
     AIProvider:
       type: string
       enum: *ref_51
@@ -36840,112 +37869,112 @@ components:
       required: *ref_44
     AIProviderConfig:
       type: object
-      properties: *ref_383
-      required: *ref_384
+      properties: *ref_385
+      required: *ref_386
     AIConfig:
       type: object
       properties: *ref_50
     InstanceAIProviderSummary:
       type: object
-      properties: *ref_385
-      required: *ref_386
+      properties: *ref_387
+      required: *ref_388
     InstanceAISummary:
       type: object
       properties: *ref_52
       required: *ref_53
     Alert:
       type: object
-      properties: *ref_387
-      required: *ref_388
+      properties: *ref_389
+      required: *ref_390
     Configs:
       type: object
       nullable: true
-      properties: *ref_389
+      properties: *ref_391
     WorkspaceDependencies:
       type: object
-      properties: *ref_103
-      required: *ref_104
+      properties: *ref_104
+      required: *ref_105
     NewWorkspaceDependencies:
-      type: object
-      properties: *ref_390
-      required: *ref_391
-    Script:
-      type: object
-      properties: *ref_105
-      required: *ref_106
-    NewScript:
       type: object
       properties: *ref_392
       required: *ref_393
+    Script:
+      type: object
+      properties: *ref_106
+      required: *ref_107
+    NewScript:
+      type: object
+      properties: *ref_394
+      required: *ref_395
     ScriptHistory:
       type: object
-      properties: *ref_110
-      required: *ref_111
+      properties: *ref_111
+      required: *ref_112
     ScriptArgs:
       type: object
       description: The arguments to pass to the script or flow
       additionalProperties: true
     Input:
       type: object
-      properties: *ref_293
-      required: *ref_294
+      properties: *ref_295
+      required: *ref_296
     CreateInput:
-      type: object
-      properties: *ref_394
-      required: *ref_395
-    UpdateInput:
       type: object
       properties: *ref_396
       required: *ref_397
+    UpdateInput:
+      type: object
+      properties: *ref_398
+      required: *ref_399
     RunnableType:
       type: string
-      enum: *ref_398
+      enum: *ref_400
     QueuedJob:
+      type: object
+      properties: *ref_197
+      required: *ref_198
+    CompletedJob:
       type: object
       properties: *ref_195
       required: *ref_196
-    CompletedJob:
-      type: object
-      properties: *ref_193
-      required: *ref_194
     ExportableCompletedJob:
       type: object
       description: Completed job with full data for export/import operations
-      properties: *ref_182
-      required: *ref_183
+      properties: *ref_184
+      required: *ref_185
     ExportableQueuedJob:
       type: object
       description: Queued job with full data for export/import operations
-      properties: *ref_184
-      required: *ref_185
+      properties: *ref_186
+      required: *ref_187
     ObscuredJob:
       type: object
-      properties: *ref_399
+      properties: *ref_401
     Job:
-      oneOf: *ref_197
-      discriminator: *ref_198
+      oneOf: *ref_199
+      discriminator: *ref_200
     User:
       type: object
       properties: *ref_35
       required: *ref_36
     UserSource:
       type: object
-      properties: *ref_400
-      required: *ref_401
+      properties: *ref_402
+      required: *ref_403
     UserUsage:
       type: object
-      properties: *ref_402
+      properties: *ref_404
     Login:
       type: object
-      properties: *ref_403
-      required: *ref_404
+      properties: *ref_405
+      required: *ref_406
     PasswordResetResponse:
       type: object
       properties: *ref_7
       required: *ref_8
     EditWorkspaceUser:
       type: object
-      properties: *ref_405
+      properties: *ref_407
     OffboardAffectedPaths:
       type: object
       properties: *ref_11
@@ -36954,65 +37983,65 @@ components:
       properties: *ref_12
       required: *ref_13
     OffboardTokenInfo:
-      type: object
-      properties: *ref_406
-      required: *ref_407
-    OffboardRequest:
       type: object
       properties: *ref_408
       required: *ref_409
+    OffboardRequest:
+      type: object
+      properties: *ref_410
+      required: *ref_411
     OffboardResponse:
       type: object
       properties: *ref_14
     OffboardSummary:
-      type: object
-      properties: *ref_410
-      required: *ref_411
-    GlobalOffboardPreview:
       type: object
       properties: *ref_412
       required: *ref_413
-    WorkspaceOffboardPreview:
+    GlobalOffboardPreview:
       type: object
       properties: *ref_414
       required: *ref_415
-    GlobalOffboardRequest:
+    WorkspaceOffboardPreview:
       type: object
       properties: *ref_416
+      required: *ref_417
+    GlobalOffboardRequest:
+      type: object
+      properties: *ref_418
     WorkspaceReassignment:
-      type: object
-      properties: *ref_417
-      required: *ref_418
-    TruncatedToken:
-      type: object
-      properties: *ref_108
-      required: *ref_109
-    ExternalJwtToken:
       type: object
       properties: *ref_419
       required: *ref_420
-    NewToken:
+    TruncatedToken:
+      type: object
+      properties: *ref_109
+      required: *ref_110
+    ExternalJwtToken:
       type: object
       properties: *ref_421
+      required: *ref_422
+    NewToken:
+      type: object
+      properties: *ref_423
     NewTokenImpersonate:
       type: object
-      properties: *ref_422
-      required: *ref_423
+      properties: *ref_424
+      required: *ref_425
     ListableVariable:
       type: object
       properties: *ref_61
       required: *ref_62
     ContextualVariable:
-      type: object
-      properties: *ref_424
-      required: *ref_425
-    CreateVariable:
       type: object
       properties: *ref_426
       required: *ref_427
-    EditVariable:
+    CreateVariable:
       type: object
       properties: *ref_428
+      required: *ref_429
+    EditVariable:
+      type: object
+      properties: *ref_430
     AuditLog:
       type: object
       properties: *ref_5
@@ -37149,42 +38178,42 @@ components:
         - has_preprocessor
     ScriptLang:
       type: string
-      enum: *ref_99
+      enum: *ref_100
     ScriptModule:
       type: object
       description: An additional module file associated with a script
-      properties: *ref_101
-      required: *ref_102
+      properties: *ref_102
+      required: *ref_103
     Preview:
       type: object
-      properties: *ref_145
-      required: *ref_146
+      properties: *ref_147
+      required: *ref_148
     PreviewInline:
-      type: object
-      properties: *ref_429
-      required: *ref_430
-    InlineScriptArgs:
-      type: object
-      properties: *ref_144
-    WorkflowTask:
       type: object
       properties: *ref_431
       required: *ref_432
+    InlineScriptArgs:
+      type: object
+      properties: *ref_146
+    WorkflowTask:
+      type: object
+      properties: *ref_433
+      required: *ref_434
     WorkflowStatusRecord:
       type: object
       additionalProperties:
         type: object
-        properties: *ref_181
+        properties: *ref_183
     WorkflowStatus:
       type: object
-      properties: *ref_181
+      properties: *ref_183
     CreateResource:
       type: object
-      properties: *ref_433
-      required: *ref_434
+      properties: *ref_435
+      required: *ref_436
     EditResource:
       type: object
-      properties: *ref_435
+      properties: *ref_437
     Resource:
       type: object
       properties:
@@ -37235,13 +38264,13 @@ components:
       required: *ref_83
     EditResourceType:
       type: object
-      properties: *ref_436
+      properties: *ref_438
     Schedule:
       type: object
-      properties: *ref_202
-      required: *ref_203
+      properties: *ref_204
+      required: *ref_205
     ScheduleWJobs:
-      allOf: *ref_437
+      allOf: *ref_439
     ErrorHandler:
       type: string
       enum:
@@ -37250,122 +38279,122 @@ components:
         - teams
         - email
     NewSchedule:
-      type: object
-      properties: *ref_438
-      required: *ref_439
-    EditSchedule:
       type: object
       properties: *ref_440
       required: *ref_441
+    EditSchedule:
+      type: object
+      properties: *ref_442
+      required: *ref_443
     JobTriggerKind:
       description: job trigger kind (schedule, http, websocket...)
       type: string
-      enum: *ref_177
+      enum: *ref_179
     TriggerMode:
       description: job trigger mode
       type: string
-      enum: *ref_211
+      enum: *ref_213
     TriggerExtraProperty:
       type: object
-      properties: *ref_219
-      required: *ref_220
+      properties: *ref_221
+      required: *ref_222
     AuthenticationMethod:
       type: string
-      enum: *ref_210
+      enum: *ref_212
     RunnableKind:
       type: string
-      enum: *ref_204
+      enum: *ref_206
     OpenapiSpecFormat:
       type: string
-      enum: *ref_442
+      enum: *ref_444
     OpenapiHttpRouteFilters:
-      type: object
-      properties: *ref_443
-      required: *ref_444
-    WebhookFilters:
       type: object
       properties: *ref_445
       required: *ref_446
-    OpenapiV3Info:
+    WebhookFilters:
       type: object
       properties: *ref_447
       required: *ref_448
-    GenerateOpenapiSpec:
-      type: object
-      properties: *ref_205
-    HttpMethod:
-      type: string
-      enum: *ref_208
-    HttpRequestType:
-      type: string
-      enum: *ref_209
-    HttpTrigger:
-      allOf: *ref_213
-      type: object
-      properties: *ref_214
-      required: *ref_215
-    NewHttpTrigger:
-      type: object
-      properties: *ref_206
-      required: *ref_207
-    EditHttpTrigger:
+    OpenapiV3Info:
       type: object
       properties: *ref_449
       required: *ref_450
-    TriggersCount:
+    GenerateOpenapiSpec:
       type: object
-      properties: *ref_129
-    WebsocketHeartbeat:
+      properties: *ref_207
+    HttpMethod:
+      type: string
+      enum: *ref_210
+    HttpRequestType:
+      type: string
+      enum: *ref_211
+    HttpTrigger:
+      allOf: *ref_215
       type: object
-      properties: *ref_217
-      required: *ref_218
-    WebsocketTrigger:
-      allOf: *ref_221
+      properties: *ref_216
+      required: *ref_217
+    NewHttpTrigger:
       type: object
-      properties: *ref_222
-      required: *ref_223
-    NewWebsocketTrigger:
+      properties: *ref_208
+      required: *ref_209
+    EditHttpTrigger:
       type: object
       properties: *ref_451
       required: *ref_452
-    EditWebsocketTrigger:
+    TriggersCount:
+      type: object
+      properties: *ref_130
+    WebsocketHeartbeat:
+      type: object
+      properties: *ref_219
+      required: *ref_220
+    WebsocketTrigger:
+      allOf: *ref_223
+      type: object
+      properties: *ref_224
+      required: *ref_225
+    NewWebsocketTrigger:
       type: object
       properties: *ref_453
       required: *ref_454
+    EditWebsocketTrigger:
+      type: object
+      properties: *ref_455
+      required: *ref_456
     WebsocketTriggerInitialMessage:
-      anyOf: *ref_216
+      anyOf: *ref_218
     MqttQoS:
       type: string
-      enum: *ref_455
+      enum: *ref_457
     MqttV3Config:
       type: object
-      properties: *ref_243
+      properties: *ref_245
     MqttV5Config:
       type: object
-      properties: *ref_244
+      properties: *ref_246
     MqttSubscribeTopic:
       type: object
-      properties: *ref_241
-      required: *ref_242
+      properties: *ref_243
+      required: *ref_244
     MqttClientVersion:
       type: string
-      enum: *ref_245
+      enum: *ref_247
     MqttTrigger:
-      allOf: *ref_246
+      allOf: *ref_248
       type: object
-      properties: *ref_247
-      required: *ref_248
+      properties: *ref_249
+      required: *ref_250
     NewMqttTrigger:
-      type: object
-      properties: *ref_456
-      required: *ref_457
-    EditMqttTrigger:
       type: object
       properties: *ref_458
       required: *ref_459
+    EditMqttTrigger:
+      type: object
+      properties: *ref_460
+      required: *ref_461
     DeliveryType:
       type: string
-      enum: *ref_251
+      enum: *ref_253
       description: >-
         Delivery mode for messages. 'push' for HTTP push delivery where messages
         are sent to a webhook endpoint, 'pull' for polling where the trigger
@@ -37373,19 +38402,19 @@ components:
     PushConfig:
       type: object
       description: Configuration for push delivery mode.
-      properties: *ref_252
-      required: *ref_253
+      properties: *ref_254
+      required: *ref_255
     GcpTrigger:
-      allOf: *ref_255
+      allOf: *ref_257
       type: object
       description: >-
         A Google Cloud Pub/Sub trigger that executes a script or flow when
         messages are received.
-      properties: *ref_256
-      required: *ref_257
+      properties: *ref_258
+      required: *ref_259
     SubscriptionMode:
       type: string
-      enum: *ref_254
+      enum: *ref_256
       description: >-
         The mode of subscription. 'existing' means using an existing GCP
         subscription, while 'create_update' involves creating or updating a new
@@ -37393,68 +38422,68 @@ components:
     GcpTriggerData:
       type: object
       description: Data for creating or updating a Google Cloud Pub/Sub trigger.
-      properties: *ref_249
-      required: *ref_250
+      properties: *ref_251
+      required: *ref_252
     GetAllTopicSubscription:
-      type: object
-      properties: *ref_460
-      required: *ref_461
-    DeleteGcpSubscription:
       type: object
       properties: *ref_462
       required: *ref_463
+    DeleteGcpSubscription:
+      type: object
+      properties: *ref_464
+      required: *ref_465
     AzureMode:
       type: string
-      enum: *ref_260
+      enum: *ref_262
       description: Azure Event Grid trigger mode.
     AzureArmResource:
       type: object
       description: An ARM resource the service principal can see.
-      properties: *ref_264
-      required: *ref_265
+      properties: *ref_266
+      required: *ref_267
     AzureDeleteSubscription:
       type: object
-      properties: *ref_464
-      required: *ref_465
+      properties: *ref_466
+      required: *ref_467
     AzureTrigger:
-      allOf: *ref_261
+      allOf: *ref_263
       type: object
       description: >-
         An Azure Event Grid trigger that executes a script or flow when events
         arrive.
-      properties: *ref_262
-      required: *ref_263
+      properties: *ref_264
+      required: *ref_265
     AzureTriggerData:
       type: object
       description: Data for creating or updating an Azure Event Grid trigger.
-      properties: *ref_258
-      required: *ref_259
+      properties: *ref_260
+      required: *ref_261
     TestAzureConnection:
-      type: object
-      properties: *ref_466
-      required: *ref_467
-    AzureListTopics:
       type: object
       properties: *ref_468
       required: *ref_469
-    AzureListSubscriptions:
+    AzureListTopics:
       type: object
       properties: *ref_470
       required: *ref_471
+    AzureListSubscriptions:
+      type: object
+      properties: *ref_472
+      required: *ref_473
     AwsAuthResourceType:
       type: string
-      enum: *ref_230
+      enum: *ref_232
     SqsTrigger:
-      allOf: *ref_231
+      allOf: *ref_233
       type: object
-      properties: *ref_232
-      required: *ref_233
+      properties: *ref_234
+      required: *ref_235
     LoggedWizardStatus:
       type: string
       enum: *ref_21
     CustomInstanceDbLogs:
       type: object
-      properties: *ref_472
+      properties: *ref_474
     CustomInstanceDbTag:
       type: string
       enum: *ref_22
@@ -37463,109 +38492,109 @@ components:
       required: *ref_23
       properties: *ref_24
     NewSqsTrigger:
-      type: object
-      properties: *ref_473
-      required: *ref_474
-    EditSqsTrigger:
       type: object
       properties: *ref_475
       required: *ref_476
-    Slot:
-      type: object
-      properties: *ref_266
-    SlotList:
+    EditSqsTrigger:
       type: object
       properties: *ref_477
+      required: *ref_478
+    Slot:
+      type: object
+      properties: *ref_268
+    SlotList:
+      type: object
+      properties: *ref_479
     PublicationData:
       type: object
-      properties: *ref_270
-      required: *ref_271
+      properties: *ref_272
+      required: *ref_273
     TableToTrack:
       type: array
-      items: *ref_478
+      items: *ref_480
     Relations:
       type: object
-      properties: *ref_267
-      required: *ref_268
+      properties: *ref_269
+      required: *ref_270
     Language:
       type: string
-      enum: *ref_479
+      enum: *ref_481
     TemplateScript:
-      type: object
-      properties: *ref_480
-      required: *ref_481
-    PostgresTrigger:
-      allOf: *ref_272
-      type: object
-      properties: *ref_273
-      required: *ref_274
-    NewPostgresTrigger:
       type: object
       properties: *ref_482
       required: *ref_483
-    EditPostgresTrigger:
+    PostgresTrigger:
+      allOf: *ref_274
+      type: object
+      properties: *ref_275
+      required: *ref_276
+    NewPostgresTrigger:
       type: object
       properties: *ref_484
       required: *ref_485
-    KafkaTrigger:
-      allOf: *ref_224
-      type: object
-      properties: *ref_225
-      required: *ref_226
-    NewKafkaTrigger:
+    EditPostgresTrigger:
       type: object
       properties: *ref_486
       required: *ref_487
-    EditKafkaTrigger:
+    KafkaTrigger:
+      allOf: *ref_226
+      type: object
+      properties: *ref_227
+      required: *ref_228
+    NewKafkaTrigger:
       type: object
       properties: *ref_488
       required: *ref_489
-    NatsTrigger:
-      allOf: *ref_227
-      type: object
-      properties: *ref_228
-      required: *ref_229
-    NewNatsTrigger:
+    EditKafkaTrigger:
       type: object
       properties: *ref_490
       required: *ref_491
-    EditNatsTrigger:
+    NatsTrigger:
+      allOf: *ref_229
+      type: object
+      properties: *ref_230
+      required: *ref_231
+    NewNatsTrigger:
       type: object
       properties: *ref_492
       required: *ref_493
-    EmailTrigger:
-      allOf: *ref_275
-      type: object
-      properties: *ref_276
-      required: *ref_277
-    NewEmailTrigger:
+    EditNatsTrigger:
       type: object
       properties: *ref_494
       required: *ref_495
-    EditEmailTrigger:
+    EmailTrigger:
+      allOf: *ref_277
+      type: object
+      properties: *ref_278
+      required: *ref_279
+    NewEmailTrigger:
       type: object
       properties: *ref_496
       required: *ref_497
+    EditEmailTrigger:
+      type: object
+      properties: *ref_498
+      required: *ref_499
     Group:
       type: object
-      properties: *ref_283
-      required: *ref_284
+      properties: *ref_285
+      required: *ref_286
     InstanceGroup:
       type: object
-      required: *ref_498
-      properties: *ref_499
+      required: *ref_500
+      properties: *ref_501
     InstanceGroupWithWorkspaces:
       type: object
-      required: *ref_279
-      properties: *ref_280
+      required: *ref_281
+      properties: *ref_282
     WorkspaceInfo:
       type: object
-      properties: *ref_500
-      required: *ref_501
+      properties: *ref_502
+      required: *ref_503
     Folder:
       type: object
-      properties: *ref_286
-      required: *ref_287
+      properties: *ref_288
+      required: *ref_289
     FolderDefaultPermissionedAs:
       description: >
         Ordered list of rules applied at create-time when admins or
@@ -37573,19 +38602,19 @@ components:
         `path_glob` matches the item path (relative to the folder root) wins,
         and its `permissioned_as` is used as the default.
       type: array
-      items: *ref_285
+      items: *ref_287
     WorkerPing:
-      type: object
-      properties: *ref_502
-      required: *ref_503
-    UserWorkspaceList:
       type: object
       properties: *ref_504
       required: *ref_505
-    CreateWorkspace:
+    UserWorkspaceList:
       type: object
       properties: *ref_506
       required: *ref_507
+    CreateWorkspace:
+      type: object
+      properties: *ref_508
+      required: *ref_509
     CreateWorkspaceFork:
       type: object
       properties: *ref_19
@@ -37596,15 +38625,15 @@ components:
       required: *ref_16
     DependencyMap:
       type: object
-      properties: *ref_508
+      properties: *ref_510
     DependencyDependent:
-      type: object
-      properties: *ref_509
-      required: *ref_510
-    DependentsAmount:
       type: object
       properties: *ref_511
       required: *ref_512
+    DependentsAmount:
+      type: object
+      properties: *ref_513
+      required: *ref_514
     WorkspaceInvite:
       type: object
       properties: *ref_41
@@ -37614,54 +38643,58 @@ components:
       properties: *ref_39
       required: *ref_40
     Flow:
-      allOf: *ref_128
+      allOf: *ref_129
     ExtraPerms:
       type: object
-      additionalProperties: *ref_513
+      additionalProperties: *ref_515
     FlowMetadata:
-      type: object
-      properties: *ref_514
-      required: *ref_515
-    OpenFlowWPath:
-      allOf: *ref_130
-    FlowPreview:
-      type: object
-      properties: *ref_156
-      required: *ref_157
-    RestartedFrom:
-      type: object
-      properties: *ref_155
-    Policy:
-      type: object
-      properties: *ref_131
-    ListableApp:
       type: object
       properties: *ref_516
       required: *ref_517
-    ScopeDefinition:
+    OpenFlowWPath:
+      allOf: *ref_131
+    FlowPreview:
+      type: object
+      properties: *ref_158
+      required: *ref_159
+    RestartedFrom:
+      type: object
+      properties: *ref_157
+    Policy:
+      type: object
+      properties: *ref_132
+    ListableApp:
       type: object
       properties: *ref_518
       required: *ref_519
-    ScopeDomain:
+    ScopeDefinition:
       type: object
       properties: *ref_520
       required: *ref_521
-    ListableRawApp:
+    ScopeDomain:
       type: object
       properties: *ref_522
       required: *ref_523
+    ListableRawApp:
+      type: object
+      properties: *ref_524
+      required: *ref_525
     AppWithLastVersion:
       type: object
-      properties: *ref_132
-      required: *ref_133
+      properties: *ref_133
+      required: *ref_134
     AppHistory:
       type: object
-      properties: *ref_134
-      required: *ref_135
+      properties: *ref_137
+      required: *ref_138
+    EmbedTokenResponse:
+      type: object
+      properties: *ref_135
+      required: *ref_136
     FlowVersion:
       type: object
-      properties: *ref_126
-      required: *ref_127
+      properties: *ref_127
+      required: *ref_128
     SlackToken:
       type: object
       properties:
@@ -37685,11 +38718,11 @@ components:
       required: *ref_75
     HubScriptKind:
       type: string
-      enum: *ref_98
+      enum: *ref_99
     PolarsClientKwargs:
       type: object
-      properties: *ref_297
-      required: *ref_298
+      properties: *ref_299
+      required: *ref_300
     LargeFileStorage:
       type: object
       properties: *ref_45
@@ -37702,36 +38735,36 @@ components:
       required: *ref_46
       properties: *ref_47
     DataTableSchema:
-      type: object
-      required: *ref_524
-      properties: *ref_525
-    DataTableTables:
       type: object
       required: *ref_526
       properties: *ref_527
-    DataTableTableSchema:
+    DataTableTables:
       type: object
       required: *ref_528
       properties: *ref_529
+    DataTableTableSchema:
+      type: object
+      required: *ref_530
+      properties: *ref_531
     DynamicInputData:
       type: object
-      properties: *ref_530
-      required: *ref_531
+      properties: *ref_532
+      required: *ref_533
     WindmillLargeFile:
-      type: object
-      properties: *ref_299
-      required: *ref_300
-    WindmillFileMetadata:
-      type: object
-      properties: *ref_303
-    WindmillFilePreview:
       type: object
       properties: *ref_301
       required: *ref_302
+    WindmillFileMetadata:
+      type: object
+      properties: *ref_305
+    WindmillFilePreview:
+      type: object
+      properties: *ref_303
+      required: *ref_304
     S3Resource:
       type: object
-      properties: *ref_295
-      required: *ref_296
+      properties: *ref_297
+      required: *ref_298
     WorkspaceGitSyncSettings:
       type: object
       properties: *ref_56
@@ -37743,48 +38776,48 @@ components:
       properties: *ref_59
     S3PermissionRule:
       type: object
-      properties: *ref_532
-      required: *ref_533
+      properties: *ref_534
+      required: *ref_535
     GitRepositorySettings:
       type: object
       properties: *ref_57
       required: *ref_58
     MetricMetadata:
-      type: object
-      properties: *ref_534
-      required: *ref_535
-    ScalarMetric:
       type: object
       properties: *ref_536
       required: *ref_537
-    TimeseriesMetric:
+    ScalarMetric:
       type: object
       properties: *ref_538
       required: *ref_539
-    MetricDataPoint:
+    TimeseriesMetric:
       type: object
       properties: *ref_540
       required: *ref_541
-    RawScriptForDependencies:
-      type: object
-      properties: *ref_147
-      required: *ref_148
-    ConcurrencyGroup:
+    MetricDataPoint:
       type: object
       properties: *ref_542
       required: *ref_543
-    ExtendedJobs:
+    RawScriptForDependencies:
+      type: object
+      properties: *ref_149
+      required: *ref_150
+    ConcurrencyGroup:
       type: object
       properties: *ref_544
       required: *ref_545
+    ExtendedJobs:
+      type: object
+      properties: *ref_546
+      required: *ref_547
     ExportedUser:
       type: object
       properties: *ref_9
       required: *ref_10
     GlobalSetting:
       type: object
-      properties: *ref_546
-      required: *ref_547
+      properties: *ref_548
+      required: *ref_549
     InstanceConfig:
       type: object
       description: >-
@@ -37793,52 +38826,52 @@ components:
       properties: *ref_26
     Config:
       type: object
-      properties: *ref_548
-      required: *ref_549
+      properties: *ref_550
+      required: *ref_551
     ExportedInstanceGroup:
       type: object
-      properties: *ref_281
-      required: *ref_282
+      properties: *ref_283
+      required: *ref_284
     JobSearchHit:
       type: object
-      properties: *ref_550
+      properties: *ref_552
     LogSearchHit:
       type: object
-      properties: *ref_551
+      properties: *ref_553
     AutoscalingEvent:
       type: object
-      properties: *ref_552
+      properties: *ref_554
     CriticalAlert:
       type: object
       properties: *ref_63
     CaptureTriggerKind:
       type: string
-      enum: *ref_288
+      enum: *ref_290
     Capture:
       type: object
-      properties: *ref_289
-      required: *ref_290
+      properties: *ref_291
+      required: *ref_292
     CaptureConfig:
       type: object
-      properties: *ref_553
-      required: *ref_554
+      properties: *ref_555
+      required: *ref_556
     OperatorSettings:
       nullable: true
       type: object
       required: *ref_37
       properties: *ref_38
     WorkspaceComparison:
-      type: object
-      required: *ref_555
-      properties: *ref_556
-    WorkspaceItemDiff:
       type: object
       required: *ref_557
       properties: *ref_558
-    CompareSummary:
+    WorkspaceItemDiff:
       type: object
       required: *ref_559
       properties: *ref_560
+    CompareSummary:
+      type: object
+      required: *ref_561
+      properties: *ref_562
     TeamInfo:
       type: object
       required:
@@ -37859,12 +38892,12 @@ components:
           description: List of channels within the team
           items:
             type: object
-            required: &ref_561
+            required: &ref_563
               - channel_id
               - channel_name
               - tenant_id
               - service_url
-            properties: &ref_562
+            properties: &ref_564
               channel_id:
                 type: string
                 description: The unique identifier of the channel
@@ -37884,11 +38917,11 @@ components:
                   https://smba.trafficmanager.net/amer/12345678-1234-1234-1234-123456789012/
     ChannelInfo:
       type: object
-      required: *ref_561
-      properties: *ref_562
+      required: *ref_563
+      properties: *ref_564
     GithubInstallations:
       type: array
-      items: *ref_563
+      items: *ref_565
     WorkspaceGithubInstallation:
       type: object
       properties:
@@ -37901,8 +38934,8 @@ components:
         - installation_id
     S3Object:
       type: object
-      properties: *ref_138
-      required: *ref_139
+      properties: *ref_140
+      required: *ref_141
     TeamsChannel:
       type: object
       required:
@@ -37929,14 +38962,14 @@ components:
           minLength: 1
     AssetUsageKind:
       type: string
-      enum: *ref_308
+      enum: *ref_310
     AssetUsageAccessType:
       type: string
-      enum: *ref_307
+      enum: *ref_309
       nullable: true
     AssetKind:
       type: string
-      enum: *ref_306
+      enum: *ref_308
     Asset:
       type: object
       properties:
@@ -37944,26 +38977,26 @@ components:
           type: string
         kind:
           type: string
-          enum: *ref_306
+          enum: *ref_308
       required:
         - path
         - kind
     Volume:
       type: object
-      required: *ref_564
-      properties: *ref_565
+      required: *ref_566
+      properties: *ref_567
     ProtectionRuleset:
       type: object
       description: A workspace protection rule defining restrictions and bypass permissions
-      required: *ref_566
-      properties: *ref_567
+      required: *ref_568
+      properties: *ref_569
     ProtectionRules:
       type: array
       description: Configuration of protection restrictions
       items: *ref_64
     ProtectionRuleKind:
       type: string
-      enum: *ref_568
+      enum: *ref_570
     RuleBypasserGroups:
       type: array
       description: Groups that can bypass this ruleset
@@ -37973,13 +39006,13 @@ components:
       description: Users that can bypass this ruleset
       items: *ref_66
     DeploymentRequestEligibleDeployer:
-      type: object
-      required: *ref_569
-      properties: *ref_570
-    DeploymentRequestAssignee:
       type: object
       required: *ref_571
       properties: *ref_572
+    DeploymentRequestAssignee:
+      type: object
+      required: *ref_573
+      properties: *ref_574
     DeploymentRequestComment:
       type: object
       required: *ref_69
@@ -37994,27 +39027,27 @@ components:
       required: *ref_72
     NativeServiceName:
       type: string
-      enum: *ref_234
+      enum: *ref_236
     NativeTrigger:
       type: object
       description: A native trigger stored in Windmill
-      properties: *ref_573
-      required: *ref_574
+      properties: *ref_575
+      required: *ref_576
     NativeTriggerWithExternal:
       type: object
       description: >-
         Full trigger response containing both Windmill data and external service
         data
-      properties: *ref_575
-      required: *ref_576
-    WorkspaceIntegrations:
-      type: object
       properties: *ref_577
       required: *ref_578
+    WorkspaceIntegrations:
+      type: object
+      properties: *ref_579
+      required: *ref_580
     WorkspaceOAuthConfig:
       type: object
-      properties: *ref_235
-      required: *ref_236
+      properties: *ref_237
+      required: *ref_238
     WebhookEvent:
       type: object
       properties:
@@ -38025,7 +39058,7 @@ components:
         request_type:
           type: string
           description: The type of webhook request (define possible values here)
-          enum: &ref_579
+          enum: &ref_581
             - async
             - sync
       required:
@@ -38034,21 +39067,21 @@ components:
     WebhookRequestType:
       type: string
       description: The type of webhook request (define possible values here)
-      enum: *ref_579
+      enum: *ref_581
     RedirectUri:
       type: object
-      properties: *ref_237
-      required: *ref_238
+      properties: *ref_239
+      required: *ref_240
     NativeTriggerData:
       type: object
       description: Data for creating or updating a native trigger
-      properties: *ref_239
-      required: *ref_240
+      properties: *ref_241
+      required: *ref_242
     CreateTriggerResponse:
       type: object
       description: Response returned when a native trigger is created
-      properties: *ref_580
-      required: *ref_581
+      properties: *ref_582
+      required: *ref_583
     SyncResult:
       type: object
       properties:
@@ -38071,36 +39104,36 @@ components:
         - total_external
         - total_windmill
     NextCloudEventType:
-      type: object
-      properties: *ref_582
-      required: *ref_583
-    GoogleCalendarEntry:
       type: object
       properties: *ref_584
       required: *ref_585
-    GoogleDriveFile:
+    GoogleCalendarEntry:
       type: object
       properties: *ref_586
       required: *ref_587
-    GoogleDriveFilesResponse:
+    GoogleDriveFile:
       type: object
       properties: *ref_588
       required: *ref_589
-    SharedDriveEntry:
+    GoogleDriveFilesResponse:
       type: object
       properties: *ref_590
       required: *ref_591
-    GithubRepoEntry:
+    SharedDriveEntry:
       type: object
       properties: *ref_592
       required: *ref_593
+    GithubRepoEntry:
+      type: object
+      properties: *ref_594
+      required: *ref_595
     schemas-StaticTransform:
       type: object
       description: >-
         Static value passed directly to the step. Use for hardcoded values or
         resource references like '$res:path/to/resource'
-      properties: *ref_140
-      required: *ref_141
+      properties: *ref_142
+      required: *ref_143
     schemas-JavascriptTransform:
       type: object
       description: >-
@@ -38129,22 +39162,22 @@ components:
         Inline script with code defined directly in the flow. Use 'bun' as
         default language if unspecified. The script receives arguments from
         input_transforms
-      properties: *ref_328
-      required: *ref_329
+      properties: *ref_330
+      required: *ref_331
     schemas-PathScript:
       type: object
       description: >-
         Reference to an existing script by path. Use this when calling a
         previously saved script instead of writing inline code
-      properties: *ref_330
-      required: *ref_331
+      properties: *ref_332
+      required: *ref_333
     schemas-PathFlow:
       type: object
       description: >-
         Reference to an existing flow by path. Use this to call another flow as
         a subflow
-      properties: *ref_332
-      required: *ref_333
+      properties: *ref_334
+      required: *ref_335
     schemas-FlowModule:
       type: object
       description: A single step in a flow. Can be a script, subflow, loop, or branch
@@ -38157,96 +39190,96 @@ components:
         'flow_input.iter.value' to access the current iteration value, and
         'flow_input.iter.index' for the index. Supports parallel execution for
         better performance on I/O-bound operations
-      properties: *ref_334
-      required: *ref_335
+      properties: *ref_336
+      required: *ref_337
     schemas-WhileloopFlow:
       type: object
       description: >-
         Executes nested modules repeatedly while a condition is true. The loop
         checks the condition after each iteration. Use stop_after_if on modules
         to control loop termination
-      properties: *ref_336
-      required: *ref_337
+      properties: *ref_338
+      required: *ref_339
     schemas-BranchOne:
       type: object
       description: >-
         Conditional branching where only the first matching branch executes.
         Branches are evaluated in order, and the first one with a true
         expression runs. If no branches match, the default branch executes
-      properties: *ref_338
-      required: *ref_339
+      properties: *ref_340
+      required: *ref_341
     schemas-BranchAll:
       type: object
       description: >-
         Parallel branching where all branches execute simultaneously. Unlike
         BranchOne, all branches run regardless of conditions. Useful for
         executing independent tasks concurrently
-      properties: *ref_340
-      required: *ref_341
+      properties: *ref_342
+      required: *ref_343
     schemas-Identity:
       type: object
       description: >-
         Pass-through module that returns its input unchanged. Useful for flow
         structure or as a placeholder
-      properties: *ref_342
-      required: *ref_343
+      properties: *ref_344
+      required: *ref_345
     AIProviderKind:
       type: string
       description: Supported AI provider types
-      enum: *ref_321
+      enum: *ref_323
     schemas-ProviderConfig:
       type: object
       description: >-
         Complete AI provider configuration with resource reference and model
         selection
-      properties: *ref_594
-      required: *ref_595
+      properties: *ref_596
+      required: *ref_597
     StaticProviderTransform:
       type: object
       description: Static provider configuration passed directly to the AI agent
-      properties: *ref_596
-      required: *ref_597
+      properties: *ref_598
+      required: *ref_599
     ProviderTransform:
       description: >-
         Provider configuration - can be static (ProviderConfig), JavaScript
         expression, or AI-determined
-      oneOf: *ref_346
-      discriminator: *ref_347
+      oneOf: *ref_348
+      discriminator: *ref_349
     MemoryOff:
       type: object
       description: No conversation memory/context
-      properties: *ref_322
-      required: *ref_323
+      properties: *ref_324
+      required: *ref_325
     MemoryAuto:
       type: object
       description: Automatic context management
-      properties: *ref_324
-      required: *ref_325
+      properties: *ref_326
+      required: *ref_327
     MemoryMessage:
       type: object
       description: A single message in conversation history
-      properties: *ref_598
-      required: *ref_599
+      properties: *ref_600
+      required: *ref_601
     MemoryManual:
       type: object
       description: Explicit message history
-      properties: *ref_326
-      required: *ref_327
+      properties: *ref_328
+      required: *ref_329
     schemas-MemoryConfig:
       description: Conversation memory configuration
-      oneOf: *ref_600
-      discriminator: *ref_601
+      oneOf: *ref_602
+      discriminator: *ref_603
     StaticMemoryTransform:
       type: object
       description: Static memory configuration passed directly to the AI agent
-      properties: *ref_602
-      required: *ref_603
+      properties: *ref_604
+      required: *ref_605
     MemoryTransform:
       description: >-
         Memory configuration - can be static (MemoryConfig), JavaScript
         expression, or AI-determined
-      oneOf: *ref_348
-      discriminator: *ref_349
+      oneOf: *ref_350
+      discriminator: *ref_351
     schemas-FlowModuleValue:
       description: >-
         The actual implementation of a flow step. Can be a script (inline or
@@ -38257,41 +39290,41 @@ components:
       description: >-
         A tool implemented as a flow module (script, flow, etc.). The AI can
         call this like any other flow module
-      allOf: *ref_604
+      allOf: *ref_606
     McpToolValue:
       type: object
       description: >-
         Reference to an external MCP (Model Context Protocol) tool. The AI can
         call tools from MCP servers
-      properties: *ref_605
-      required: *ref_606
+      properties: *ref_607
+      required: *ref_608
     WebsearchToolValue:
       type: object
       description: >-
         A tool implemented as a websearch tool. The AI can call this like any
         other websearch tool
-      properties: *ref_607
-      required: *ref_608
+      properties: *ref_609
+      required: *ref_610
     ToolValue:
       description: >-
         The implementation of a tool. Can be a flow module (script/flow) or an
         MCP tool reference
-      oneOf: *ref_609
-      discriminator: *ref_610
+      oneOf: *ref_611
+      discriminator: *ref_612
     AgentTool:
       type: object
       description: >-
         A tool available to an AI agent. Can be a flow module or an external MCP
         (Model Context Protocol) tool
-      properties: *ref_350
-      required: *ref_351
+      properties: *ref_352
+      required: *ref_353
     schemas-AiAgent:
       type: object
       description: >-
         AI agent step that can use tools to accomplish tasks. The agent receives
         inputs and can call any of its configured tools to complete the task
-      properties: *ref_344
-      required: *ref_345
+      properties: *ref_346
+      required: *ref_347
     schemas-StopAfterIf:
       type: object
       description: Early termination condition for a module
@@ -38300,17 +39333,17 @@ components:
     RetryIf:
       type: object
       description: Conditional retry based on error or result
-      properties: *ref_199
-      required: *ref_200
+      properties: *ref_201
+      required: *ref_202
     schemas-Retry:
       type: object
       description: Retry configuration for failed module executions
-      properties: *ref_320
+      properties: *ref_322
     schemas-FlowNote:
       type: object
       description: A sticky note attached to a flow for documentation and annotation
-      properties: *ref_149
-      required: *ref_150
+      properties: *ref_151
+      required: *ref_152
     FlowGroup:
       type: object
       description: >-
@@ -38319,16 +39352,16 @@ components:
         flow. Groups provide naming and collapsibility in the editor. Members
         are computed dynamically from all nodes on paths between start_id and
         end_id.
-      properties: *ref_151
-      required: *ref_152
+      properties: *ref_153
+      required: *ref_154
     schemas-FlowValue:
       type: object
       description: >-
         The flow structure containing modules and optional preprocessor/failure
         handlers
-      properties: *ref_611
-      required: *ref_612
+      properties: *ref_613
+      required: *ref_614
     schemas-FlowStatusModule:
       type: object
-      properties: *ref_158
-      required: *ref_159
+      properties: *ref_160
+      required: *ref_161
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 1e0e3cef92..b6b254e0ec 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.733.1
+  version: 1.753.0
   title: Windmill API
 
   contact:
@@ -127,40 +127,89 @@ paths:
               schema:
                 type: string
 
-  /inkeep:
-    post:
-      summary: query Windmill AI documentation assistant (EE only)
-      operationId: queryDocumentation
+  /docs/search:
+    get:
+      summary: "Full-text search across the entire Windmill documentation. Provide one or more keywords; returns the most relevant docs pages, each with its Source URL and short matching snippets. Use this FIRST to find relevant pages by their content (a flag, function, error message, config key or concept). If the snippets answer the question, answer directly; otherwise call readDocsPage with a returned Source URL to read more."
+      operationId: searchDocs
       x-mcp-tool: true
       tags:
         - documentation
-      requestBody:
-        description: query to send to the AI documentation assistant
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                query:
-                  type: string
-                  description: The documentation query to send to the AI assistant
-              required:
-                - query
+      parameters:
+        - name: query
+          description: 'Keywords to search for in the documentation body, e.g. "chromium worker tag" or "retry exponential backoff". Fewer, more distinctive words match better.'
+          in: query
+          required: true
+          schema:
+            type: string
       responses:
         "200":
-          description: AI documentation assistant response
+          description: matching documentation pages
           content:
             application/json:
               schema:
                 type: object
-                description: Response from Inkeep service
-        "403":
-          description: Enterprise Edition required
+                properties:
+                  text:
+                    type: string
+                    description: Model-ready rendering of the results
+                  results:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        url:
+                          type: string
+                        title:
+                          type: string
+                        score:
+                          type: integer
+                        snippets:
+                          type: array
+                          items:
+                            type: string
+                      required:
+                        - url
+                        - title
+                        - score
+                        - snippets
+                required:
+                  - text
+                  - results
+
+  /docs/page:
+    get:
+      summary: "Fetch the markdown of a single Windmill documentation page. Provide the `url` of a page found via searchDocs (its Source URL). If the page is large, this returns its list of section headings instead of the full content; call again with the `section` argument set to one of those headings to read that section."
+      operationId: readDocsPage
+      x-mcp-tool: true
+      tags:
+        - documentation
+      parameters:
+        - name: url
+          description: "The docs page to read, as a Source URL returned by searchDocs (e.g. https://www.windmill.dev/docs/core_concepts/jobs). A bare path (e.g. /docs/core_concepts/jobs) is also accepted."
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: section
+          description: "Optional. A heading title from the page outline to read just that section instead of the full page."
+          in: query
+          schema:
+            type: string
+      responses:
+        "200":
+          description: documentation page content
           content:
-            text/plain:
+            application/json:
               schema:
-                type: string
+                type: object
+                properties:
+                  text:
+                    type: string
+                  source_url:
+                    type: string
+                required:
+                  - text
+                  - source_url
 
   /openapi.yaml:
     get:
@@ -997,6 +1046,39 @@ paths:
               schema:
                 $ref: "#/components/schemas/UserWorkspaceList"
 
+  /workspaces/session_workspace_status:
+    post:
+      summary: get the lifecycle status of workspaces referenced by client-side sessions
+      operationId: getSessionWorkspaceStatus
+      tags:
+        - workspace
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                workspace_ids:
+                  type: array
+                  items:
+                    type: string
+              required:
+                - workspace_ids
+      responses:
+        "200":
+          description: map of workspace id to status (active, archived, or deleted)
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: string
+                  enum:
+                    - active
+                    - archived
+                    - deleted
+
   /w/{workspace}/workspaces/get_as_superadmin:
     get:
       summary: get workspace as super admin (require to be super admin)
@@ -1102,6 +1184,122 @@ paths:
               schema:
                 type: string
 
+  /w/{workspace}/workspaces/attach_dev_workspace:
+    post:
+      summary: attach an existing workspace as the dev workspace of this (prod) workspace
+      operationId: attachDevWorkspace
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                dev_workspace_id:
+                  type: string
+                lock_prod_deploy:
+                  type: boolean
+                lock_prod_forking:
+                  type: boolean
+                dev_workspace_label:
+                  type: string
+                  enum: [dev, staging]
+              required:
+                - dev_workspace_id
+      responses:
+        "200":
+          description: dev workspace attached
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/workspaces/detach_dev_workspace:
+    post:
+      summary: detach the dev workspace from this (prod) workspace
+      operationId: detachDevWorkspace
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                dev_workspace_id:
+                  type: string
+              required:
+                - dev_workspace_id
+      responses:
+        "200":
+          description: dev workspace detached
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/workspaces/get_dev_workspace:
+    get:
+      summary: this workspace's active canonical dev workspace, if any
+      operationId: getDevWorkspace
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      responses:
+        "200":
+          description: the dev workspace, or null if none
+          content:
+            application/json:
+              schema:
+                nullable: true
+                type: object
+                properties:
+                  id:
+                    type: string
+                  name:
+                    type: string
+                  dev_workspace_label:
+                    type: string
+                    nullable: true
+                    description: "Cosmetic display label ('dev' | 'staging'); null defaults to 'dev'"
+                required:
+                  - id
+                  - name
+
+  /w/{workspace}/workspaces/set_dev_workspace_label:
+    post:
+      summary: set the cosmetic display label (dev/staging) of this dev workspace
+      operationId: setDevWorkspaceLabel
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                dev_workspace_label:
+                  type: string
+                  enum: [dev, staging]
+      responses:
+        "200":
+          description: dev workspace label updated
+          content:
+            text/plain:
+              schema:
+                type: string
+
   /workspaces/exists:
     post:
       summary: exists workspace
@@ -1655,6 +1853,9 @@ paths:
                   s3_deleted:
                     type: integer
                     format: int64
+                  s3_not_found:
+                    type: integer
+                    format: int64
                   orphans_scanned:
                     type: integer
                     format: int64
@@ -1727,6 +1928,92 @@ paths:
                   - last_run_exported
                   - updated_at
 
+  /settings/audit_logs_s3_backfill:
+    post:
+      summary: start an opt-in historical backfill of audit logs to object storage
+      operationId: runAuditLogsS3Backfill
+      tags:
+        - setting
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                from:
+                  type: string
+                  format: date-time
+                  description: inclusive lower bound of the window to export
+                to:
+                  type: string
+                  format: date-time
+                  description: exclusive upper bound of the window to export
+              required:
+                - from
+                - to
+      responses:
+        "202":
+          description: backfill started
+
+  /settings/audit_logs_s3_backfill_status:
+    get:
+      summary: get status of the audit-log object-store historical backfill
+      operationId: getAuditLogsS3BackfillStatus
+      tags:
+        - setting
+      responses:
+        "200":
+          description: current backfill status (null if never run)
+          content:
+            application/json:
+              schema:
+                nullable: true
+                type: object
+                properties:
+                  running:
+                    type: boolean
+                  started_at:
+                    type: string
+                    format: date-time
+                  finished_at:
+                    type: string
+                    format: date-time
+                    nullable: true
+                  phase:
+                    type: string
+                  from:
+                    type: string
+                    format: date-time
+                  to:
+                    type: string
+                    format: date-time
+                  rows_written:
+                    type: integer
+                    format: int64
+                  objects_written:
+                    type: integer
+                    format: int64
+                  last_ts:
+                    type: string
+                    format: date-time
+                    nullable: true
+                  errors:
+                    type: integer
+                    format: int64
+                  last_error:
+                    type: string
+                    nullable: true
+                required:
+                  - running
+                  - started_at
+                  - phase
+                  - from
+                  - to
+                  - rows_written
+                  - objects_written
+                  - errors
+
   /settings/send_stats:
     post:
       summary: send stats
@@ -4344,6 +4631,22 @@ paths:
               properties:
                 settings:
                   $ref: "#/components/schemas/DataTableSettings"
+                renames:
+                  description: data tables renamed in this save, so their migrations cascade
+                  type: array
+                  items:
+                    type: object
+                    required: [from, to]
+                    properties:
+                      from:
+                        type: string
+                      to:
+                        type: string
+                deleted_datatables:
+                  description: data tables removed in this save, so their migrations are deleted
+                  type: array
+                  items:
+                    type: string
       responses:
         "200":
           description: status
@@ -4351,6 +4654,307 @@ paths:
             application/json:
               schema: {}
 
+  /w/{workspace}/workspaces/run_datatable_migrations/{datatable_name}:
+    post:
+      summary: run pending datatable migrations against a datatable
+      operationId: runDatatableMigrations
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: up_to
+          in: query
+          required: false
+          description: only apply pending migrations up to and including this version
+          schema:
+            type: integer
+            format: int64
+        - name: only
+          in: query
+          required: false
+          description: apply only this specific migration version, ignoring others
+          schema:
+            type: integer
+            format: int64
+      responses:
+        "200":
+          description: applied migrations
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [applied]
+                properties:
+                  applied:
+                    type: array
+                    items:
+                      type: object
+                      required: [version, name]
+                      properties:
+                        version:
+                          type: integer
+                          format: int64
+                        name:
+                          type: string
+
+  /w/{workspace}/workspaces/rollback_datatable_migrations/{datatable_name}:
+    post:
+      summary: roll back the most recently applied migration on a datatable
+      operationId: rollbackDatatableMigrations
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: only
+          in: query
+          required: false
+          description: roll back this specific applied migration version instead of the latest
+          schema:
+            type: integer
+            format: int64
+      responses:
+        "200":
+          description: rolled back migrations
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [rolled_back]
+                properties:
+                  rolled_back:
+                    type: array
+                    items:
+                      type: object
+                      required: [version, name]
+                      properties:
+                        version:
+                          type: integer
+                          format: int64
+                        name:
+                          type: string
+
+  /w/{workspace}/workspaces/list_datatable_migrations:
+    get:
+      summary: list datatable migrations for a workspace
+      operationId: listDatatableMigrations
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      responses:
+        "200":
+          description: datatable migrations
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/DatatableMigration"
+
+  /w/{workspace}/workspaces/datatable_migrations_status/{datatable_name}:
+    get:
+      summary: list a datatable's migrations with their applied status
+      operationId: getDatatableMigrationsStatus
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: migrations with status
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [enabled, migrations]
+                properties:
+                  enabled:
+                    type: boolean
+                  migrations:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/DatatableMigrationWithStatus"
+                  error:
+                    type: string
+
+  /w/{workspace}/workspaces/enable_datatable_migrations/{datatable_name}:
+    post:
+      summary: opt a datatable in to migrations (admins / super admins only)
+      operationId: enableDatatableMigrations
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/workspaces/disable_datatable_migrations/{datatable_name}:
+    post:
+      summary: opt a datatable out of migrations, deleting all of them (admins / super admins only)
+      operationId: disableDatatableMigrations
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/workspaces/create_datatable_migration/{datatable_name}:
+    post:
+      summary: create a single datatable migration (version generated server-side)
+      operationId: createDatatableMigration
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required: [name, code_up]
+              properties:
+                name:
+                  type: string
+                code_up:
+                  type: string
+                code_down:
+                  type: string
+      responses:
+        "200":
+          description: created migration
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DatatableMigration"
+
+  /w/{workspace}/workspaces/delete_datatable_migration/{datatable_name}/{timestamp}:
+    delete:
+      summary: delete a single datatable migration definition
+      operationId: deleteDatatableMigration
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: timestamp
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        "200":
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/workspaces/upsert_datatable_migration/{datatable_name}:
+    post:
+      summary: insert or update a single datatable migration at an explicit version
+      operationId: upsertDatatableMigration
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required: [timestamp, name, code_up]
+              properties:
+                timestamp:
+                  type: integer
+                  format: int64
+                name:
+                  type: string
+                code_up:
+                  type: string
+                code_down:
+                  type: string
+      responses:
+        "200":
+          description: status
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/workspaces/generate_initial_datatable_migration/{datatable_name}:
+    post:
+      summary: snapshot the current schema as an already-installed initial migration
+      operationId: generateInitialDatatableMigration
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: datatable_name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: created migration
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DatatableMigration"
+
   /w/{workspace}/workspaces/create_pg_database:
     post:
       summary: create a new PostgreSQL database for a datatable
@@ -4412,6 +5016,24 @@ paths:
                 items:
                   type: string
 
+  /w/{workspace}/workspaces/drop_forked_ducklake_namespaces:
+    post:
+      summary: drop this fork workspace's ducklake namespaces (catalog metadata schemas + data files)
+      operationId: dropForkedDucklakeNamespaces
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      responses:
+        "200":
+          description: list of errors (empty if all succeeded)
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: string
+
   /w/{workspace}/workspaces/import_pg_database:
     post:
       summary: import a PostgreSQL database from source to target via pg_dump
@@ -5967,12 +6589,15 @@ paths:
                     $ref: "#/components/schemas/QuotaInfo"
                   resources:
                     $ref: "#/components/schemas/QuotaInfo"
+                  forks:
+                    $ref: "#/components/schemas/QuotaInfo"
                 required:
                   - scripts
                   - flows
                   - apps
                   - variables
                   - resources
+                  - forks
 
   /w/{workspace}/workspaces/prune_versions:
     post:
@@ -6067,6 +6692,42 @@ paths:
                 items:
                   type: string
 
+  /w/{workspace}/workspaces/set_ws_specific:
+    post:
+      summary: mark or unmark an item as workspace-specific
+      operationId: setWsSpecific
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                item_kind:
+                  type: string
+                  enum:
+                    - resource
+                    - variable
+                path:
+                  type: string
+                value:
+                  type: boolean
+              required:
+                - item_kind
+                - path
+                - value
+      responses:
+        "200":
+          description: workspace-specific flag updated
+          content:
+            text/plain:
+              schema:
+                type: string
+
   /w/{workspace}/workspaces/public_app_rate_limit:
     post:
       summary: Set public app rate limit for this workspace
@@ -6291,6 +6952,9 @@ paths:
                 cc_instance:
                   type: string
                   description: "Instance name for built-in providers whose client-credentials token URL is instance-templated; substituted into the fixed-host registry template server-side (client_credentials flow only). The token URL is never caller-supplied."
+                cc_token_url:
+                  type: string
+                  description: "Bring-your-own token endpoint override (client_credentials flow only). Only honored together with cc_client_id/cc_client_secret and mutually exclusive with cc_instance; ignored/rejected on the shared-instance path."
                 mcp_server_url:
                   type: string
                   description: "MCP server URL for MCP OAuth token refresh"
@@ -6346,6 +7010,9 @@ paths:
                 cc_instance:
                   type: string
                   description: "Instance name for built-in providers whose client-credentials token URL is instance-templated; substituted into the fixed-host registry template server-side. The token URL is never caller-supplied."
+                cc_token_url:
+                  type: string
+                  description: "Bring-your-own token endpoint override. Only honored together with cc_client_id/cc_client_secret and mutually exclusive with cc_instance; rejected on the shared-instance path."
       responses:
         "200":
           description: OAuth token response
@@ -7492,6 +8159,22 @@ paths:
                       workspace_id:
                         type: string
 
+  /apps_u/embed_token_by_custom_path/{custom_path}:
+    get:
+      summary: get app embed token by custom path
+      operationId: getAppEmbedTokenByCustomPath
+      tags:
+        - app
+      parameters:
+        - $ref: "#/components/parameters/CustomPath"
+      responses:
+        "200":
+          description: embed token
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/EmbedTokenResponse"
+
   /scripts/hub/get/{path}:
     get:
       summary: get hub script content by path
@@ -8872,6 +9555,50 @@ paths:
                   items:
                     $ref: "#/components/schemas/CiTestResult"
 
+  /w/{workspace}/scripts/check_schema_contracts:
+    post:
+      summary: check a script's asset references against captured producer schemas
+      description: |
+        Save-time schema-contract check for data pipelines: validates the given
+        script content's asset references (body column reads, `// column` lineage,
+        `// data_test relationships`) against the latest captured producer schemas
+        and returns warnings. Warnings never block a save/deploy; an asset whose
+        producer declares `on_schema_change=ignore` is suppressed to a single
+        informational entry.
+      operationId: checkSchemaContracts
+      tags:
+        - script
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - language
+                - content
+              properties:
+                language:
+                  $ref: "#/components/schemas/ScriptLang"
+                content:
+                  type: string
+      responses:
+        "200":
+          description: contract warnings (empty when all references match)
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - warnings
+                properties:
+                  warnings:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/ContractWarning"
+
   /w/{workspace}/scripts/raw_temp/store:
     post:
       summary: store raw script content temporarily for CLI lock generation
@@ -10422,6 +11149,133 @@ paths:
               schema:
                 type: string
 
+  /w/{workspace}/ai_skills/list:
+    get:
+      summary: list the workspace AI chat skills (name + description only)
+      operationId: listAiSkills
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      responses:
+        "200":
+          description: skill listing
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  required:
+                    - name
+                    - description
+                  properties:
+                    name:
+                      type: string
+                    description:
+                      type: string
+
+  /w/{workspace}/ai_skills/get/{name}:
+    get:
+      summary: get a workspace AI chat skill including its instructions
+      operationId: getAiSkill
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: skill
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - name
+                  - description
+                  - instructions
+                properties:
+                  name:
+                    type: string
+                  description:
+                    type: string
+                  instructions:
+                    type: string
+
+  /w/{workspace}/ai_skills/upload:
+    post:
+      summary: upsert workspace AI chat skills (admin only)
+      operationId: uploadAiSkills
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - skills
+              properties:
+                skills:
+                  type: array
+                  maxItems: 50
+                  items:
+                    type: object
+                    required:
+                      - name
+                      - description
+                      - instructions
+                    properties:
+                      name:
+                        type: string
+                        minLength: 1
+                        maxLength: 64
+                        pattern: "^[a-z0-9-]+$"
+                      description:
+                        type: string
+                        minLength: 1
+                        maxLength: 1024
+                      instructions:
+                        type: string
+                        minLength: 1
+                        maxLength: 65536
+      responses:
+        "200":
+          description: uploaded
+          content:
+            text/plain:
+              schema:
+                type: string
+
+  /w/{workspace}/ai_skills/delete/{name}:
+    delete:
+      summary: delete a workspace AI chat skill (admin only)
+      operationId: deleteAiSkill
+      tags:
+        - workspace
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: name
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: deleted
+          content:
+            text/plain:
+              schema:
+                type: string
+
   /w/{workspace}/apps/get_data/v/{secretWithExtension}:
     get:
       summary: get raw app data by
@@ -10433,6 +11287,10 @@ paths:
         - name: secretWithExtension
           in: path
           required: true
+          description: >-
+            App version secret suffixed with the requested file type extension.
+            Supported extensions are `.js` (JavaScript bundle), `.css`
+            (stylesheet), and `.html` (sandboxed wrapper document).
           schema:
             type: string
       responses:
@@ -10442,6 +11300,12 @@ paths:
             text/javascript:
               schema:
                 type: string
+            text/css:
+              schema:
+                type: string
+            text/html:
+              schema:
+                type: string
 
   /w/{workspace}/apps/list_search:
     get:
@@ -10693,6 +11557,23 @@ paths:
                   - $ref: "#/components/schemas/AppWithLastVersion"
                   - $ref: "#/components/schemas/UserDraftOverlay"
 
+  /w/{workspace}/apps/embed_token/p/{path}:
+    get:
+      summary: get app embed token by path
+      operationId: getAppEmbedTokenByPath
+      tags:
+        - app
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/ScriptPath"
+      responses:
+        "200":
+          description: embed token
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/EmbedTokenResponse"
+
   /w/{workspace}/apps/get/lite/{path}:
     get:
       summary: get app lite by path
@@ -10810,6 +11691,27 @@ paths:
               schema:
                 $ref: "#/components/schemas/AppWithLastVersion"
 
+  /w/{workspace}/apps_u/embed_token/{secret}:
+    get:
+      summary: get app embed token by secret
+      operationId: getAppEmbedTokenBySecret
+      tags:
+        - app
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: secret
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: embed token
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/EmbedTokenResponse"
+
   /w/{workspace}/apps_u/public_resource/{path}:
     get:
       summary: get public resource
@@ -11518,6 +12420,11 @@ paths:
           in: query
           schema:
             type: boolean
+        - name: timeout
+          description: custom timeout in seconds for this preview run
+          in: query
+          schema:
+            type: integer
         - $ref: "#/components/parameters/NewJobId"
 
       requestBody:
@@ -12701,6 +13608,64 @@ paths:
               schema:
                 type: string
 
+  /w/{workspace}/jobs_u/get_flow_all_logs_structured/{id}:
+    get:
+      summary: get all logs for a flow job in a structured format
+      operationId: getFlowAllLogsStructured
+      tags:
+        - job
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/JobId"
+      responses:
+        "200":
+          description: structured logs of all flow steps, one entry per job
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    job_id:
+                      type: string
+                    label:
+                      type: string
+                      description: human-readable label describing the job's position in the flow tree
+                    kind:
+                      type: string
+                      description: job kind (script, flow, forloopflow, ...)
+                    flow_step_id:
+                      type: string
+                      nullable: true
+                    step_path:
+                      type: string
+                      nullable: true
+                      description: materialized step path (e.g. "a/b")
+                    depth:
+                      type: integer
+                      description: depth in the flow tree (0 for the root flow job)
+                    parent_module_type:
+                      type: string
+                      nullable: true
+                      description: parent module type (forloopflow, branchall, ...)
+                    sibling_index:
+                      type: integer
+                      description: 1-based index of this job among siblings sharing the same step
+                    sibling_count:
+                      type: integer
+                      description: total number of siblings sharing the same step
+                    logs:
+                      type: string
+                  required:
+                    - job_id
+                    - label
+                    - kind
+                    - depth
+                    - sibling_index
+                    - sibling_count
+                    - logs
+
   /w/{workspace}/jobs_u/get_completed_logs_tail/{id}:
     get:
       summary: get completed job logs tail
@@ -19348,6 +20313,55 @@ paths:
             application/json:
               schema: {}
 
+  /w/{workspace}/job_helpers/storage_usage:
+    get:
+      summary: Get the storage usage of the workspace object storage, per configured storage. On Community Edition, also returns the workspace storage quota.
+      operationId: getStorageUsage
+      tags:
+        - helpers
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: refresh
+          in: query
+          description: recount usage by listing the storage instead of returning cached values
+          schema:
+            type: boolean
+      responses:
+        "200":
+          description: Storage usage
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  total_bytes:
+                    type: integer
+                    format: int64
+                  quota_bytes:
+                    type: integer
+                    format: int64
+                    description: only present on Community Edition, where workspace storage is capped
+                  storages:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        storage:
+                          type: string
+                        bytes:
+                          type: integer
+                          format: int64
+                        computed_at:
+                          type: string
+                          format: date-time
+                      required:
+                        - storage
+                        - bytes
+                        - computed_at
+                required:
+                  - total_bytes
+                  - storages
+
   /w/{workspace}/job_helpers/list_stored_files:
     get:
       summary: List the file keys available in a workspace object storage
@@ -20818,6 +21832,10 @@ paths:
                           $ref: "#/components/schemas/AssetKind"
                         path:
                           type: string
+                        fork_materialization:
+                          type: string
+                          enum: [fork, deferred]
+                          description: Fork workspaces only — 'fork' when this ducklake asset was materialized in the fork itself, 'deferred' when reads fall back to the parent workspace's current table via a defer view. Omitted otherwise.
                   runnables:
                     type: array
                     items:
@@ -20831,6 +21849,20 @@ paths:
                         in_pipeline:
                           type: boolean
                           description: True iff the script is a pipeline member (deployed with `// pipeline`). Omitted when false.
+                        macros:
+                          type: array
+                          description: Macros this script provides to the workspace registry (deployed `// macros` library). Omitted when empty.
+                          items:
+                            type: object
+                            required: [name, params, is_table]
+                            properties:
+                              name:
+                                type: string
+                              params:
+                                type: string
+                                description: verbatim parameter list
+                              is_table:
+                                type: boolean
                   edges:
                     type: array
                     items:
@@ -20896,6 +21928,88 @@ paths:
                               $ref: "#/components/schemas/AssetUsageKind"
                             runnable_path:
                               type: string
+                  macro_edges:
+                    type: array
+                    description: Macro-library → consumer edges (deploy-recorded call detection plus `// use`). Omitted when empty.
+                    items:
+                      type: object
+                      required: [lib_path, consumer_path, macro_names, via_use]
+                      properties:
+                        lib_path:
+                          type: string
+                        consumer_path:
+                          type: string
+                        macro_names:
+                          type: array
+                          items:
+                            type: string
+                        via_use:
+                          type: boolean
+                  test_edges:
+                    type: array
+                    description: >-
+                      Ordering-only "must-run-after" edges — a `// data_test relationships`
+                      (or custom test reading a pipeline asset) requires the referenced
+                      asset's producer to run before the tested script. Not a data-consumption
+                      edge; fed into the cascade topo-sort so cold runs order correctly.
+                      Omitted when empty.
+                    items:
+                      type: object
+                      required:
+                        [
+                          producer_kind,
+                          producer_path,
+                          runnable_kind,
+                          runnable_path,
+                          asset_kind,
+                          asset_path,
+                        ]
+                      properties:
+                        producer_kind:
+                          $ref: "#/components/schemas/AssetUsageKind"
+                        producer_path:
+                          type: string
+                        runnable_kind:
+                          $ref: "#/components/schemas/AssetUsageKind"
+                        runnable_path:
+                          type: string
+                        asset_kind:
+                          $ref: "#/components/schemas/AssetKind"
+                        asset_path:
+                          type: string
+
+  /w/{workspace}/assets/macros:
+    get:
+      summary: List every workspace DuckDB macro (deployed `// macros` libraries)
+      operationId: listWorkspaceMacros
+      tags:
+        - asset
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+      responses:
+        "200":
+          description: all registry macros, ordered by provider then name
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  required: [name, params, body, is_table, provider_path]
+                  properties:
+                    name:
+                      type: string
+                    params:
+                      type: string
+                      description: verbatim parameter list
+                    body:
+                      type: string
+                      description: verbatim body after AS [TABLE]
+                    is_table:
+                      type: boolean
+                    provider_path:
+                      type: string
+                      description: path of the `// macros` library script
 
   /w/{workspace}/assets/pipelines:
     get:
@@ -20924,6 +22038,90 @@ paths:
                       format: int64
                       description: Number of pipeline-member scripts in the folder
 
+  /w/{workspace}/assets/partitions:
+    get:
+      summary: List materialized partitions for a ducklake asset
+      operationId: listAssetPartitions
+      tags:
+        - asset
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: path
+          in: query
+          required: true
+          description: The materialized ducklake asset path (`<ducklake>/<table>`)
+          schema:
+            type: string
+      responses:
+        "200":
+          description: per-partition materialization status
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/MaterializedPartition"
+
+  /w/{workspace}/assets/partitions_in_range:
+    get:
+      summary: List expected partitions of a ducklake asset in a date range with their materialization status (enterprise)
+      operationId: listAssetPartitionsInRange
+      tags:
+        - asset
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: path
+          in: query
+          required: true
+          description: The materialized ducklake asset path (`<ducklake>/<table>`)
+          schema:
+            type: string
+        - name: from
+          in: query
+          required: true
+          description: Inclusive range start (YYYY-MM-DD), local to the producer's partition tz
+          schema:
+            type: string
+            format: date
+        - name: to
+          in: query
+          required: true
+          description: Inclusive range end (YYYY-MM-DD), local to the producer's partition tz
+          schema:
+            type: string
+            format: date
+      responses:
+        "200":
+          description: expected partitions in range with per-slice status — the missing/failed subset is the backfill worklist
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/PartitionsInRange"
+
+  /w/{workspace}/assets/asset_schemas:
+    get:
+      summary: List captured output-schema versions for a ducklake asset
+      operationId: listAssetSchemas
+      tags:
+        - asset
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - name: path
+          in: query
+          required: true
+          description: The materialized ducklake asset path (`<ducklake>/<table>`)
+          schema:
+            type: string
+      responses:
+        "200":
+          description: captured schema versions, newest first
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/AssetSchemaVersion"
+
   /w/{workspace}/volumes/list:
     get:
       summary: List all volumes in the workspace
@@ -22246,6 +23444,7 @@ components:
         [
           openai,
           azure_openai,
+          azure_foundry,
           anthropic,
           mistral,
           deepseek,
@@ -22576,6 +23775,13 @@ components:
           type: string
         parent_hash:
           type: string
+        auto_parent:
+          type: boolean
+          description: >-
+            When true, the backend resolves the parent to the current deployed
+            head for this path within the transaction (ignoring parent_hash),
+            instead of failing with a "lineage must be linear" error when the
+            supplied parent_hash is stale.
         summary:
           type: string
         description:
@@ -22857,6 +24063,8 @@ components:
           type: number
         preprocessed:
           type: boolean
+        is_retry:
+          type: boolean
         worker:
           type: string
       required:
@@ -22977,6 +24185,8 @@ components:
           type: number
         preprocessed:
           type: boolean
+        is_retry:
+          type: boolean
         worker:
           type: string
       required:
@@ -23351,6 +24561,10 @@ components:
           type: array
           items:
             type: string
+        folders_read:
+          type: array
+          items:
+            type: string
         folders_owners:
           type: array
           items:
@@ -23361,6 +24575,9 @@ components:
             - $ref: "#/components/schemas/UserSource"
         is_service_account:
           type: boolean
+        non_member:
+          type: boolean
+          description: "True when this is a superadmin viewing a workspace they are not a member of (is_admin/role reflect the superadmin fallback, not an actual membership)."
       required:
         - email
         - username
@@ -23370,6 +24587,7 @@ components:
         - operator
         - disabled
         - folders
+        - folders_read
         - folders_owners
 
     UserSource:
@@ -24822,6 +26040,7 @@ components:
         - google
         - github
         - asset
+        - freshness
 
     TriggerMode:
       description: job trigger mode
@@ -27309,6 +28528,12 @@ components:
               parent_workspace_id:
                 type: string
                 nullable: true
+              is_dev_workspace:
+                type: boolean
+              dev_workspace_label:
+                type: string
+                nullable: true
+                description: "Cosmetic display label of the dev workspace ('dev' | 'staging'); null defaults to 'dev'"
               created_by:
                 type: string
                 nullable: true
@@ -27319,6 +28544,7 @@ components:
               - name
               - username
               - color
+              - is_dev_workspace
               - disabled
       required:
         - email
@@ -27360,6 +28586,27 @@ components:
               new_dbname:
                 type: string
                 description: "New database name for the fork"
+        shared_ducklakes:
+          type: array
+          items:
+            type: string
+          description: "Lake names the fork SHARES with the parent (reads and writes the parent's lake directly). Every lake not listed gets the default isolated fork namespace with read-defer to the parent."
+        is_dev_workspace:
+          type: boolean
+          description: "Create the fork as a persistent dev workspace (id not required to carry the wm-fork- prefix; at most one per parent)"
+        lock_prod_deploy:
+          type: boolean
+          description: "When creating a dev workspace, lock the parent (prod) against direct deployment"
+        lock_prod_forking:
+          type: boolean
+          description: "When creating a dev workspace, prevent forking the parent (prod)"
+        copy_members:
+          type: boolean
+          description: "Copy the parent's members (users + group memberships) into the fork so the team can work in it"
+        dev_workspace_label:
+          type: string
+          enum: [dev, staging]
+          description: "Cosmetic display label for the dev workspace (badge text + wording only); ignored for non-dev forks"
       required:
         - id
         - name
@@ -27685,6 +28932,13 @@ components:
           type: string
         on_behalf_of_email:
           type: string
+        sandbox:
+          type: boolean
+          description: >
+            Publisher opt-in to app sandbox isolation (alpha). When true the app
+            is isolated from each viewer's Windmill session. When false/absent
+            the app runs same-origin with the viewer's full session (the
+            default, pre-isolation behavior).
 
     ListableApp:
       type: object
@@ -27904,6 +29158,36 @@ components:
       required:
         - version
 
+    EmbedTokenResponse:
+      type: object
+      properties:
+        token:
+          type: string
+          nullable: true
+          description: Narrowly-scoped embed token for the iframe. Absent for fully anonymous or raw apps, which load without a scoped token.
+        expiration:
+          type: string
+          format: date-time
+          nullable: true
+          description: Expiration of the embed token.
+        raw_app:
+          type: boolean
+          description: Raw apps render single-iframe and skip the opaque-viewer indirection and the embed token entirely.
+        sandbox:
+          type: boolean
+          description: Publisher opted this app into sandbox isolation. When false the viewer runs the app same-origin with its full session.
+        app_path:
+          type: string
+          nullable: true
+          description: The resolved app path; the embedder uses it to scope the app's backing localStorage per app.
+        workspace_id:
+          type: string
+          nullable: true
+          description: The resolved workspace; pairs with app_path so apps at the same path in different workspaces don't share a localStorage store.
+      required:
+        - raw_app
+        - sandbox
+
     FlowVersion:
       type: object
       properties:
@@ -28050,6 +29334,33 @@ components:
                   - path
               extra_args:
                 type: string
+              fork_behavior:
+                type: string
+                enum: [isolated, shared]
+                description:
+                  Fork workspaces only - how this lake behaves in the fork, stamped at fork
+                  creation. Absent = isolated (fork-scoped namespace + read-defer to parent).
+              maintenance:
+                type: object
+                description:
+                  Scheduled maintenance (enterprise) - snapshot expiry, adjacent-file
+                  compaction and orphaned-file cleanup, run as a managed per-lake schedule
+                required: [enabled]
+                properties:
+                  enabled:
+                    type: boolean
+                  schedule:
+                    type: string
+                    description: cron cadence (v2, UTC); defaults to daily at 03h with a per-lake minute offset
+                  retention_days:
+                    type: integer
+                    description: snapshot retention window in days (default 7); time-travel older than this stops working
+                  compaction:
+                    type: boolean
+                    description: merge adjacent small parquet files (default true)
+                  orphan_cleanup:
+                    type: boolean
+                    description: delete orphaned files older than max(retention, 1 day) (default true)
 
     DataTableSettings:
       type: object
@@ -28073,6 +29384,9 @@ components:
                     type: string
                 required:
                   - resource_type
+              migrations_enabled:
+                type: boolean
+                description: Whether the SQL migrations feature is opted in for this data table
               forked_from:
                 type: object
                 description: Fork origin info with schema snapshot
@@ -28081,6 +29395,40 @@ components:
                     type: object
                     description: Schema snapshot at fork time
                     additionalProperties: true
+    DatatableMigration:
+      type: object
+      required: [datatable, timestamp, name, code_up]
+      properties:
+        datatable:
+          type: string
+        timestamp:
+          type: integer
+          format: int64
+        name:
+          type: string
+        code_up:
+          type: string
+        code_down:
+          type: string
+    DatatableMigrationWithStatus:
+      type: object
+      required: [timestamp, name, code_up, status]
+      properties:
+        timestamp:
+          type: integer
+          format: int64
+        name:
+          type: string
+        code_up:
+          type: string
+        code_down:
+          type: string
+        status:
+          type: string
+          enum:
+            - ran
+            - not_run
+            - unknown
     DataTableSchema:
       type: object
       required: [datatable_name, schemas]
@@ -28661,6 +30009,8 @@ components:
         - skipped_comparison
         - diffs
         - summary
+        - hidden_ahead
+        - hidden_behind
       properties:
         all_ahead_items_visible:
           type: boolean
@@ -28679,6 +30029,46 @@ components:
         summary:
           $ref: "#/components/schemas/CompareSummary"
           description: Summary statistics of the comparison
+        hidden_ahead:
+          $ref: "#/components/schemas/HiddenItemsSummary"
+          description: Ahead items excluded from `diffs` because they are not visible to the caller
+        hidden_behind:
+          $ref: "#/components/schemas/HiddenItemsSummary"
+          description: Behind items excluded from `diffs` because they are not visible to the caller
+
+    HiddenItemsSummary:
+      type: object
+      required:
+        - total
+        - by_kind
+        - items
+      properties:
+        total:
+          type: integer
+          description: Total number of hidden items on this side
+        by_kind:
+          type: object
+          additionalProperties:
+            type: integer
+          description: Count of hidden items keyed by item kind (always populated)
+        items:
+          type: array
+          description: Kind and path of each hidden item; only populated when the caller is an admin of the relevant side (empty otherwise)
+          items:
+            $ref: "#/components/schemas/HiddenItem"
+
+    HiddenItem:
+      type: object
+      required:
+        - kind
+        - path
+      properties:
+        kind:
+          type: string
+          description: Type of the hidden item
+        path:
+          type: string
+          description: Path of the hidden item
 
     WorkspaceItemDiff:
       type: object
@@ -28750,6 +30140,7 @@ components:
         - folders_changed
         - schedules_changed
         - triggers_changed
+        - datatable_migrations_changed
         - conflicts
       properties:
         total_diffs:
@@ -28788,6 +30179,9 @@ components:
         triggers_changed:
           type: integer
           description: Number of triggers with differences (sum across all trigger kinds)
+        datatable_migrations_changed:
+          type: integer
+          description: Number of data table migrations with differences
         conflicts:
           type: integer
           description: Number of items that are both ahead and behind (conflicts)
@@ -28950,6 +30344,86 @@ components:
         - ducklake
         - datatable
         - volume
+    MaterializedPartition:
+      type: object
+      required: [asset_kind, asset_path, partition, status, materialized_at]
+      properties:
+        asset_kind:
+          $ref: "#/components/schemas/AssetKind"
+        asset_path:
+          type: string
+        partition:
+          type: string
+        status:
+          type: string
+          enum: [running, materialized, failed]
+        snapshot_id:
+          type: integer
+          format: int64
+          nullable: true
+        row_count:
+          type: integer
+          format: int64
+          nullable: true
+        job_id:
+          type: string
+          format: uuid
+          nullable: true
+        materialized_at:
+          type: string
+          format: date-time
+        error:
+          type: string
+          nullable: true
+    PartitionsInRange:
+      type: object
+      required: [producer_path, partition_kind, partitions]
+      properties:
+        producer_path:
+          type: string
+          description: the pipeline script that materializes the asset (managed `// materialize` target, or a partitioned writer using the SDK helpers) — the runnable a backfill launches
+        partition_kind:
+          type: string
+          enum: [daily, hourly, weekly, monthly, dynamic]
+        partitions:
+          type: array
+          items:
+            type: object
+            required: [partition, status]
+            properties:
+              partition:
+                type: string
+              status:
+                type: string
+                enum: [missing, running, materialized, failed]
+    AssetSchemaVersion:
+      type: object
+      required: [version, columns, captured_at]
+      properties:
+        version:
+          type: integer
+          format: int64
+        columns:
+          type: array
+          items:
+            type: object
+            required: [name, type]
+            properties:
+              name:
+                type: string
+              type:
+                type: string
+        snapshot_id:
+          type: integer
+          format: int64
+          nullable: true
+        job_id:
+          type: string
+          format: uuid
+          nullable: true
+        captured_at:
+          type: string
+          format: date-time
     Asset:
       type: object
       properties:
@@ -28958,6 +30432,39 @@ components:
         kind:
           $ref: "#/components/schemas/AssetKind"
       required: [path, kind]
+    ContractWarning:
+      description: |
+        One save-time schema-contract warning: a consumer reference that does
+        not match the referenced asset's latest captured schema.
+        `schema_version`/`captured_at` identify the capture the check ran
+        against (as-of the producer's last run, not its latest save).
+      type: object
+      required: [kind, asset_path, message]
+      properties:
+        kind:
+          type: string
+          enum:
+            - missing_column
+            - missing_lineage_source
+            - missing_relationship_column
+            - relationship_type_mismatch
+            - suppressed
+        asset_path:
+          type: string
+        column:
+          type: string
+        expected_type:
+          type: string
+        found_type:
+          type: string
+        schema_version:
+          type: integer
+          format: int64
+        captured_at:
+          type: string
+          format: date-time
+        message:
+          type: string
     Volume:
       type: object
       required:
diff --git a/backend/windmill-api/src/ai.rs b/backend/windmill-api/src/ai.rs
index b7a21627e1..0276efcd1a 100644
--- a/backend/windmill-api/src/ai.rs
+++ b/backend/windmill-api/src/ai.rs
@@ -571,7 +571,10 @@ async fn global_proxy(
 
     let request = match proxy_mode {
         ProxyExecutionMode::HttpForward => {
-            let query_builder = create_query_builder(&credentials);
+            // Azure AI Foundry routes Claude deployments through the Anthropic
+            // Messages API, so the builder is chosen from the request's model.
+            let model = AIProvider::extract_model_from_body(&body).unwrap_or_default();
+            let query_builder = create_query_builder(&credentials, &model);
             let proxy_request = query_builder.build_proxy_request(&ProxyBuildArgs {
                 method: &method,
                 path: &ai_path,
@@ -902,7 +905,10 @@ async fn proxy(
 
     let request = match proxy_mode {
         ProxyExecutionMode::HttpForward => {
-            let query_builder = create_query_builder(&credentials);
+            // Azure AI Foundry routes Claude deployments through the Anthropic
+            // Messages API, so the builder is chosen from the request's model.
+            let model = AIProvider::extract_model_from_body(&body).unwrap_or_default();
+            let query_builder = create_query_builder(&credentials, &model);
             let proxy_request = query_builder.build_proxy_request(&ProxyBuildArgs {
                 method: &method,
                 path: &ai_path,
diff --git a/backend/windmill-api/src/ai_skills.rs b/backend/windmill-api/src/ai_skills.rs
new file mode 100644
index 0000000000..6deb8dc58f
--- /dev/null
+++ b/backend/windmill-api/src/ai_skills.rs
@@ -0,0 +1,394 @@
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2026
+ * This file and its contents are licensed under the AGPLv3 License.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-AGPL for a copy of the license.
+ */
+
+use crate::db::{ApiAuthed, DB};
+use std::collections::HashSet;
+use axum::{
+    extract::{Extension, Json, Path},
+    routing::{delete, get, post},
+    Router,
+};
+use serde::{Deserialize, Serialize};
+use windmill_audit::audit_oss::audit_log;
+use windmill_audit::ActionKind;
+use windmill_common::{
+    db::UserDB,
+    error::{Error, JsonResult, Result},
+    utils::require_admin,
+};
+
+pub fn workspaced_service() -> Router {
+    Router::new()
+        .route("/list", get(list_skills))
+        .route("/get/{name}", get(get_skill))
+        .route("/upload", post(upload_skills))
+        .route("/delete/{name}", delete(delete_skill))
+}
+
+/// Cheap listing surfaced in the AI chat system prompt — no `instructions` body.
+#[derive(Serialize)]
+pub struct SkillListItem {
+    pub name: String,
+    pub description: String,
+}
+
+/// Full skill, including the SKILL.md body, fetched on demand by `read_skill`.
+#[derive(Serialize)]
+pub struct Skill {
+    pub name: String,
+    pub description: String,
+    pub instructions: String,
+}
+
+#[derive(Deserialize)]
+pub struct UploadSkills {
+    pub skills: Vec<SkillUpload>,
+}
+
+#[derive(Deserialize)]
+pub struct SkillUpload {
+    pub name: String,
+    pub description: String,
+    pub instructions: String,
+}
+
+const MAX_SKILLS_PER_UPLOAD: usize = 50;
+// Every stored skill's name + description is advertised in the global AI chat
+// system prompt, so bound the total a workspace can accumulate across uploads.
+const MAX_SKILLS_PER_WORKSPACE: usize = 100;
+// `name` and `description` follow the Claude SKILL.md spec
+// (https://platform.claude.com/docs/en/agents-and-tools/agent-skills): both are
+// loaded into the AI chat system prompt and `name` is the model-facing skill id,
+// so matching the upstream limits keeps skills portable with Claude Code.
+const MAX_SKILL_NAME_CHARS: usize = 64;
+const MAX_SKILL_DESCRIPTION_CHARS: usize = 1_024;
+// Not a spec field — a payload bound on the SKILL.md body, so measured in bytes.
+const MAX_SKILL_INSTRUCTIONS_BYTES: usize = 64 * 1024;
+
+fn validate_skill(skill: &SkillUpload) -> Result<()> {
+    let name = skill.name.trim();
+    if name.is_empty() || name.chars().count() > MAX_SKILL_NAME_CHARS {
+        return Err(Error::BadRequest(format!(
+            "skill name must be between 1 and {MAX_SKILL_NAME_CHARS} characters, got {:?}",
+            skill.name
+        )));
+    }
+    if !name
+        .chars()
+        .all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '-')
+    {
+        return Err(Error::BadRequest(format!(
+            "skill name {name:?} must only contain lowercase letters, digits or '-'"
+        )));
+    }
+    if skill.description.trim().is_empty() {
+        return Err(Error::BadRequest(format!(
+            "skill {name:?} is missing a description (the SKILL.md frontmatter `description`)"
+        )));
+    }
+    if skill.description.chars().count() > MAX_SKILL_DESCRIPTION_CHARS {
+        return Err(Error::BadRequest(format!(
+            "skill {name:?} description must be at most {MAX_SKILL_DESCRIPTION_CHARS} characters"
+        )));
+    }
+    if skill.instructions.trim().is_empty() {
+        return Err(Error::BadRequest(format!(
+            "skill {name:?} has an empty SKILL.md body"
+        )));
+    }
+    if skill.instructions.len() > MAX_SKILL_INSTRUCTIONS_BYTES {
+        return Err(Error::BadRequest(format!(
+            "skill {name:?} instructions must be at most {MAX_SKILL_INSTRUCTIONS_BYTES} bytes"
+        )));
+    }
+    Ok(())
+}
+
+/// Collect the trimmed skill names, rejecting duplicates within a single upload.
+/// The insert upserts by name, so a duplicate would silently keep only the last
+/// and make the reported/audited count wrong.
+fn collect_upload_names(skills: &[SkillUpload]) -> Result<Vec<String>> {
+    let mut names = Vec::with_capacity(skills.len());
+    let mut seen = HashSet::with_capacity(skills.len());
+    for skill in skills {
+        let name = skill.name.trim().to_string();
+        if !seen.insert(name.clone()) {
+            return Err(Error::BadRequest(format!(
+                "duplicate skill name {name:?} in upload"
+            )));
+        }
+        names.push(name);
+    }
+    Ok(names)
+}
+
+/// Reject an upload that would push the workspace past `MAX_SKILLS_PER_WORKSPACE`.
+/// Uploads upsert, so names already present (`replacing`) don't count as new.
+fn check_workspace_skill_capacity(
+    existing_total: i64,
+    replacing: i64,
+    upload_count: usize,
+) -> Result<()> {
+    let new_count = upload_count as i64 - replacing;
+    if existing_total + new_count > MAX_SKILLS_PER_WORKSPACE as i64 {
+        return Err(Error::BadRequest(format!(
+            "workspace cannot store more than {MAX_SKILLS_PER_WORKSPACE} skills"
+        )));
+    }
+    Ok(())
+}
+
+async fn list_skills(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path(w_id): Path<String>,
+) -> JsonResult<Vec<SkillListItem>> {
+    let mut tx = user_db.begin(&authed).await?;
+    let rows = sqlx::query!(
+        "SELECT name, description FROM ai_skill WHERE workspace_id = $1 ORDER BY name",
+        &w_id
+    )
+    .fetch_all(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    Ok(Json(
+        rows.into_iter()
+            .map(|r| SkillListItem { name: r.name, description: r.description })
+            .collect(),
+    ))
+}
+
+async fn get_skill(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, name)): Path<(String, String)>,
+) -> JsonResult<Skill> {
+    let mut tx = user_db.begin(&authed).await?;
+    let row = sqlx::query!(
+        "SELECT name, description, instructions FROM ai_skill WHERE workspace_id = $1 AND name = $2",
+        &w_id,
+        &name
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    tx.commit().await?;
+
+    row.map(|r| {
+        Json(Skill { name: r.name, description: r.description, instructions: r.instructions })
+    })
+    .ok_or_else(|| Error::NotFound(format!("no skill named {name:?} in workspace {w_id}")))
+}
+
+/// Bulk upsert the uploaded skills by name. Existing skills not in the payload
+/// are left untouched — removal goes through `delete_skill`.
+async fn upload_skills(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path(w_id): Path<String>,
+    Json(payload): Json<UploadSkills>,
+) -> Result<String> {
+    require_admin(authed.is_admin, &authed.username)?;
+
+    if payload.skills.is_empty() {
+        return Err(Error::BadRequest("no skills to upload".to_string()));
+    }
+    if payload.skills.len() > MAX_SKILLS_PER_UPLOAD {
+        return Err(Error::BadRequest(format!(
+            "cannot upload more than {MAX_SKILLS_PER_UPLOAD} skills at a time"
+        )));
+    }
+    for skill in &payload.skills {
+        validate_skill(skill)?;
+    }
+    let names = collect_upload_names(&payload.skills)?;
+
+    let mut tx = db.begin().await?;
+    let counts = sqlx::query!(
+        r#"SELECT
+               COUNT(*)::bigint AS "total!",
+               COUNT(*) FILTER (WHERE name = ANY($2::text[]))::bigint AS "replacing!"
+           FROM ai_skill
+           WHERE workspace_id = $1"#,
+        &w_id,
+        &names
+    )
+    .fetch_one(&mut *tx)
+    .await?;
+    check_workspace_skill_capacity(counts.total, counts.replacing, names.len())?;
+
+    for (skill, name) in payload.skills.iter().zip(names.iter()) {
+        sqlx::query!(
+            r#"INSERT INTO ai_skill (workspace_id, name, description, instructions, edited_at, edited_by)
+               VALUES ($1, $2, $3, $4, now(), $5)
+               ON CONFLICT (workspace_id, name) DO UPDATE
+               SET description = EXCLUDED.description,
+                   instructions = EXCLUDED.instructions,
+                   edited_at = now(),
+                   edited_by = EXCLUDED.edited_by"#,
+            &w_id,
+            name,
+            skill.description,
+            skill.instructions,
+            &authed.username,
+        )
+        .execute(&mut *tx)
+        .await?;
+    }
+
+    let audit_resource = names.join(",");
+    audit_log(
+        &mut *tx,
+        &authed,
+        "ai_skills.upload",
+        ActionKind::Update,
+        &w_id,
+        Some(&audit_resource),
+        Some([("skill_count", &names.len().to_string()[..])].into()),
+    )
+    .await?;
+    tx.commit().await?;
+
+    Ok(format!(
+        "Uploaded {} skill(s) to workspace {}",
+        payload.skills.len(),
+        &w_id
+    ))
+}
+
+async fn delete_skill(
+    authed: ApiAuthed,
+    Extension(db): Extension<DB>,
+    Path((w_id, name)): Path<(String, String)>,
+) -> Result<String> {
+    require_admin(authed.is_admin, &authed.username)?;
+
+    let mut tx = db.begin().await?;
+    let deleted = sqlx::query_scalar!(
+        "DELETE FROM ai_skill WHERE workspace_id = $1 AND name = $2 RETURNING name",
+        &w_id,
+        &name
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+
+    if deleted.is_none() {
+        tx.commit().await?;
+        return Err(Error::NotFound(format!(
+            "no skill named {name:?} in workspace {w_id}"
+        )));
+    }
+
+    audit_log(
+        &mut *tx,
+        &authed,
+        "ai_skills.delete",
+        ActionKind::Delete,
+        &w_id,
+        Some(&name),
+        None,
+    )
+    .await?;
+    tx.commit().await?;
+
+    Ok(format!("Deleted skill {name} from workspace {w_id}"))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn skill() -> SkillUpload {
+        SkillUpload {
+            name: "test-skill".to_string(),
+            description: "Useful for tests".to_string(),
+            instructions: "# Test\n\nDo the thing.".to_string(),
+        }
+    }
+
+    #[test]
+    fn validate_skill_rejects_oversized_description() {
+        let mut skill = skill();
+        skill.description = "x".repeat(MAX_SKILL_DESCRIPTION_CHARS + 1);
+
+        assert!(matches!(validate_skill(&skill), Err(Error::BadRequest(_))));
+    }
+
+    #[test]
+    fn validate_skill_rejects_oversized_instructions() {
+        let mut skill = skill();
+        skill.instructions = "x".repeat(MAX_SKILL_INSTRUCTIONS_BYTES + 1);
+
+        assert!(matches!(validate_skill(&skill), Err(Error::BadRequest(_))));
+    }
+
+    #[test]
+    fn validate_skill_rejects_oversized_name() {
+        let mut skill = skill();
+        skill.name = "a".repeat(MAX_SKILL_NAME_CHARS + 1);
+
+        assert!(matches!(validate_skill(&skill), Err(Error::BadRequest(_))));
+    }
+
+    #[test]
+    fn validate_skill_rejects_non_slug_name() {
+        // Uppercase, underscore, space and punctuation are all outside the
+        // Claude SKILL.md `[a-z0-9-]` name charset.
+        for bad in ["My-Skill", "my_skill", "my skill", "skill!"] {
+            let mut skill = skill();
+            skill.name = bad.to_string();
+
+            assert!(
+                matches!(validate_skill(&skill), Err(Error::BadRequest(_))),
+                "{bad:?} should be rejected"
+            );
+        }
+    }
+
+    #[test]
+    fn validate_skill_counts_description_in_characters() {
+        // 1024 two-byte chars exceed the byte limit but sit exactly on the
+        // character limit, so they must be accepted.
+        let mut skill = skill();
+        skill.description = "é".repeat(MAX_SKILL_DESCRIPTION_CHARS);
+
+        assert!(validate_skill(&skill).is_ok());
+    }
+
+    #[test]
+    fn workspace_capacity_allows_replacement_at_cap() {
+        // Already at the cap, but the upload only replaces an existing skill.
+        let at_cap = MAX_SKILLS_PER_WORKSPACE as i64;
+        assert!(check_workspace_skill_capacity(at_cap, 1, 1).is_ok());
+    }
+
+    #[test]
+    fn workspace_capacity_rejects_new_skill_over_cap() {
+        let at_cap = MAX_SKILLS_PER_WORKSPACE as i64;
+        assert!(matches!(
+            check_workspace_skill_capacity(at_cap, 0, 1),
+            Err(Error::BadRequest(_))
+        ));
+    }
+
+    #[test]
+    fn collect_upload_names_trims_and_collects() {
+        let names = collect_upload_names(&[skill()]).unwrap();
+        assert_eq!(names, vec!["test-skill".to_string()]);
+    }
+
+    #[test]
+    fn collect_upload_names_rejects_duplicates() {
+        // Names are compared after trimming, so whitespace can't smuggle a dup in.
+        let dup = SkillUpload { name: " test-skill ".to_string(), ..skill() };
+        assert!(matches!(
+            collect_upload_names(&[skill(), dup]),
+            Err(Error::BadRequest(_))
+        ));
+    }
+}
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index 0615735081..a2ad8f3c3e 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, sync::Arc};
+use std::{borrow::Cow, collections::HashMap, sync::Arc};
 
 /*
  * Author: Ruben Fiszel
@@ -7,6 +7,11 @@ use std::{collections::HashMap, sync::Arc};
  * Please see the included NOTICE for copyright information and
  * LICENSE-AGPL for a copy of the license.
  */
+#[cfg(all(feature = "parquet", not(feature = "enterprise")))]
+use crate::job_helpers_oss::{
+    bump_storage_usage, ce_upload_budget, reject_reserved_volume_key,
+    spawn_storage_usage_recount_floored,
+};
 use crate::{
     auth::{get_end_user_email, OptTokened},
     db::{ApiAuthed, DB},
@@ -75,6 +80,7 @@ use windmill_common::{
 use windmill_object_store::object_store_reexports::{Attribute, Attributes};
 use windmill_store::resources::get_resource_value_interpolated_internal;
 
+use windmill_api_auth::{create_token_internal, ensure_scopes_within_caller, NewToken};
 use windmill_git_sync::{handle_deployment_metadata, DeployedObject};
 use windmill_queue::{push, PushArgs, PushArgsOwned, PushIsolationLevel};
 
@@ -90,6 +96,7 @@ pub fn workspaced_service(raw_app_body_limit: usize) -> Router {
         .route("/list", get(list_apps))
         .route("/list_search", get(list_search_apps))
         .route("/get/p/{*path}", get(get_app))
+        .route("/embed_token/p/{*path}", get(get_app_embed_token_for_path))
         .route("/get/lite/{*path}", get(get_app_lite))
         .route("/secret_of/{*path}", get(get_secret_id))
         .route(
@@ -134,6 +141,7 @@ pub fn unauthed_service() -> Router {
         .route("/delete_s3_file", delete(delete_s3_file_from_app))
         .route("/download_s3_file/{*path}", get(download_s3_file_from_app))
         .route("/public_app/{secret}", get(get_public_app_by_secret))
+        .route("/embed_token/{secret}", get(get_app_embed_token))
         .route("/public_resource/{*path}", get(get_public_resource))
         .route("/get_data/v/{*id}", get(get_raw_app_data))
 }
@@ -300,6 +308,13 @@ pub struct Policy {
     pub execution_mode: ExecutionMode,
     pub s3_inputs: Option<Vec<S3Input>>,
     pub allowed_s3_keys: Option<Vec<S3Key>>,
+    // WIN-2006: publisher opt-in to iframe sandbox isolation (alpha). When true the
+    // app is isolated from each viewer's Windmill session: low-code renders in an
+    // opaque-origin iframe with a scoped embed token, raw renders its bundle in an
+    // opaque iframe. Default/absent means unsandboxed — the app runs same-origin
+    // with the viewer's full session, the pre-isolation behavior.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sandbox: Option<bool>,
 }
 
 #[derive(Deserialize)]
@@ -348,6 +363,12 @@ async fn list_search_apps(
     Path(w_id): Path<String>,
     Extension(user_db): Extension<UserDB>,
 ) -> JsonResult<Vec<SearchApp>> {
+    // Require domain-level read: this returns every visible app's full value (code).
+    // The route layer treats `apps:run` as satisfying read, so without this handler
+    // check a scoped embed token (apps:run + apps:read:<one path>) could read all
+    // apps' definitions. `check_scopes` uses ScopeDefinition::includes, where run
+    // does NOT include read, so it correctly denies such tokens.
+    check_scopes(&authed, || "apps:read".to_string())?;
     #[cfg(feature = "enterprise")]
     let n = 1000;
 
@@ -379,6 +400,9 @@ async fn list_apps(
     Query(pagination): Query<Pagination>,
     Query(lq): Query<ListAppQuery>,
 ) -> JsonResult<Vec<ListableApp>> {
+    // Domain-level read (see list_search_apps): keeps a scoped embed token, whose
+    // `apps:run` only satisfies read at the route layer, from listing all apps.
+    check_scopes(&authed, || "apps:read".to_string())?;
     let (per_page, offset) = paginate(pagination);
 
     let mut sqlb = SqlBuilder::select_from("app")
@@ -396,13 +420,14 @@ async fn list_apps(
             "app.labels",
             "draft.path IS NOT NULL as is_draft",
             // Per-path draft owners as a JSON array; see scripts.rs for the rationale
-            // (admins-workspace identity fallback, legacy NULL-email row).
+            // (non-member superadmin identity fallback via `password`, legacy NULL-email row).
             // `app`/`raw_app` are separate draft kinds over one `app` table — match
             // either (like the `is_draft` join below), else a deployed raw app's draft
             // owners are dropped and the row shows "Draft" with no user badge.
-            "(SELECT json_agg(json_build_object('username', COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END)) ORDER BY COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END) NULLS LAST) \
+            "(SELECT json_agg(json_build_object('username', COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END)) ORDER BY COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END) NULLS LAST) \
               FROM draft d \
               LEFT JOIN usr u ON u.workspace_id = d.workspace_id AND u.email = d.email \
+              LEFT JOIN password p ON p.email = d.email AND p.super_admin = true \
               WHERE d.workspace_id = app.workspace_id AND d.path = app.path AND d.typ IN ('app', 'raw_app')) as draft_users",
             "folder_labels(app.workspace_id, app.path) as inherited_labels",
         ])
@@ -553,6 +578,7 @@ async fn list_apps(
 
 async fn get_raw_app_data(
     Path((w_id, secret_with_ext)): Path<(String, String)>,
+    Query(query): Query<std::collections::HashMap<String, String>>,
     Extension(db): Extension<DB>,
 ) -> Result<Response> {
     #[cfg(all(feature = "enterprise", feature = "parquet"))]
@@ -575,13 +601,52 @@ async fn get_raw_app_data(
     .await?;
 
     let file_type = splitted.next().unwrap_or("");
+
+    // Sandboxed wrapper document that hosts the bundle. Served from a real URL
+    // (not blob:/srcdoc) so we can attach `CSP: sandbox` as a response header,
+    // which forces an opaque origin even on direct navigation — a raw-app
+    // bundle can then never reach the authenticated Windmill origin (WIN-2006).
+    // The `.js`/`.css` are loaded as same-path subresources by this document.
+    if file_type == "html" {
+        // ALWAYS served with `CSP: sandbox`, which forces an opaque origin even on
+        // direct top-level navigation — so this real-origin URL can never be used
+        // to run a raw-app bundle with the viewer's session (WIN-2006). The
+        // unsandboxed (default) render is NOT applied here: it is handled entirely
+        // on the viewer side, which builds its own same-origin wrapper. Relaxing
+        // this header from a policy flag would let anyone with the share secret
+        // hand a logged-in victim a same-origin URL that runs the bundle with
+        // their session — so the standalone document stays sandboxed no matter how
+        // it is reached.
+        let html = raw_app_wrapper_html(secret_id);
+        let mut builder = Response::builder()
+            .header(http::header::CONTENT_TYPE, "text/html; charset=utf-8")
+            .header("X-Content-Type-Options", "nosniff")
+            .header("Cross-Origin-Resource-Policy", "cross-origin")
+            .header(
+                http::header::CONTENT_SECURITY_POLICY,
+                "sandbox allow-scripts allow-forms allow-popups \
+                 allow-popups-to-escape-sandbox allow-downloads allow-modals \
+                 allow-top-navigation",
+            );
+        // When the public app page is embedded in a cross-origin-isolated page
+        // (`wm_coep` opt-in, COEP `require-corp`), this nested wrapper document
+        // must itself assert COEP to be allowed to load. Opt-in only — COEP
+        // restricts the bundle's own subresources to CORP'd/same-origin ones
+        // (e.g. external images would break), so it must not be always-on. The
+        // viewer propagates the flag from the page URL (see RawAppPreview).
+        if query.contains_key("wm_coep") {
+            builder = builder.header("Cross-Origin-Embedder-Policy", "require-corp");
+        }
+        return Ok(builder.body(Body::from(html)).unwrap());
+    }
+
     let file_type = if file_type == "css" {
         "css"
     } else if file_type == "js" {
         "js"
     } else {
         return Err(Error::BadRequest(
-            "Invalid file type, only .css and .js are supported".to_string(),
+            "Invalid file type, only .css, .js and .html are supported".to_string(),
         ));
     };
     // tracing::info!("file_type: {}", file_type);
@@ -632,20 +697,128 @@ async fn get_raw_app_data(
 
     if let Some(body) = body {
         // let stream = tokio_util::io::ReaderStream::new(file);
-        let res = Response::builder().header(
-            http::header::CONTENT_TYPE,
-            if file_type == "css" {
-                "text/css"
-            } else {
-                "text/javascript"
-            },
-        );
+        let res = Response::builder()
+            .header(
+                http::header::CONTENT_TYPE,
+                if file_type == "css" {
+                    "text/css"
+                } else {
+                    "text/javascript"
+                },
+            )
+            // nosniff + CORP so the bundle loads correctly as a subresource of
+            // the opaque, sandboxed wrapper (incl. under a cross-origin-isolated
+            // / COEP `require-corp` embedder).
+            .header("X-Content-Type-Options", "nosniff")
+            .header("Cross-Origin-Resource-Policy", "cross-origin");
         Ok(res.body(body).unwrap())
     } else {
         return Err(Error::NotFound("File not found".to_string()));
     }
 }
 
+/// HTML wrapper that hosts a raw-app bundle inside a sandboxed, opaque-origin
+/// iframe. Served by [`get_raw_app_data`] for the `.html` "file type". It loads
+/// the bundle `.js`/`.css` as same-path subresources, shims web storage (which
+/// an opaque origin disallows), and waits for the embedder to hand it the user
+/// context via `postMessage` before evaluating the bundle — so the bundle never
+/// receives a credential and `window.ctx` is set synchronously when it runs.
+fn raw_app_wrapper_html(secret: &str) -> String {
+    const TEMPLATE: &str = r##"<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8" />
+<title>App</title>
+<link rel="stylesheet" href="./__SECRET__.css" />
+<script>
+(function () {
+  // Storage shim: an opaque-origin (sandboxed) document has no localStorage and
+  // accessing it throws. Provide an in-memory implementation so apps that use
+  // web storage keep working within the session.
+  try {
+    window.localStorage.getItem('__wm_probe__');
+  } catch (e) {
+    function makeShim(onOp) {
+      var mem = {};
+      return {
+        getItem: function (k) { k = String(k); return Object.prototype.hasOwnProperty.call(mem, k) ? mem[k] : null; },
+        setItem: function (k, v) { mem[String(k)] = String(v); if (onOp) onOp({ op: 'set', key: String(k), value: String(v) }); },
+        removeItem: function (k) { delete mem[String(k)]; if (onOp) onOp({ op: 'remove', key: String(k) }); },
+        clear: function () { for (var k in mem) { delete mem[k]; } if (onOp) onOp({ op: 'clear' }); },
+        key: function (i) { var ks = Object.keys(mem); return i < ks.length ? ks[i] : null; },
+        get length() { return Object.keys(mem).length; },
+        __hydrate: function (obj) { if (obj) { for (var k in obj) { mem[k] = String(obj[k]); } } }
+      };
+    }
+    // localStorage relays each mutation up to the parent (RawAppPreview), which
+    // backs a single store shared across all apps; sessionStorage stays session-only.
+    function relayOp(o) { try { window.parent.postMessage({ type: 'wm_ls_op', op: o.op, key: o.key, value: o.value }, '*'); } catch (_) {} }
+    var ls = makeShim(relayOp);
+    var ss = makeShim(null);
+    try { Object.defineProperty(window, 'localStorage', { value: ls, configurable: true }); } catch (_) {}
+    try { Object.defineProperty(window, 'sessionStorage', { value: ss, configurable: true }); } catch (_) {}
+    window.__wmStorageShim = { local: ls, session: ss };
+    // document.cookie also throws in an opaque origin; back it with an in-memory
+    // jar so reads don't crash apps. This is NOT the real session cookie (which
+    // is unreachable here) — just an isolated client-side store.
+    try {
+      var jar = {};
+      Object.defineProperty(Document.prototype, 'cookie', {
+        configurable: true,
+        get: function () { return Object.keys(jar).map(function (k) { return k + '=' + jar[k]; }).join('; '); },
+        set: function (v) { var p = String(v).split(';')[0]; var i = p.indexOf('='); if (i > -1) { jar[p.slice(0, i).trim()] = p.slice(i + 1).trim(); } }
+      });
+    } catch (_) {}
+  }
+
+  // Keep the iframe hash in sync with the parent so app URLs stay shareable.
+  function notifyParent() {
+    try { if (window.parent !== window) { window.parent.postMessage({ type: 'windmill:hashchange', hash: window.location.hash }, '*'); } } catch (_) {}
+  }
+  window.addEventListener('hashchange', notifyParent);
+  var _ps = history.pushState, _rs = history.replaceState;
+  history.pushState = function () { _ps.apply(this, arguments); notifyParent(); };
+  history.replaceState = function () { _rs.apply(this, arguments); notifyParent(); };
+
+  // ctx handshake: the embedding parent hands us the user context (and any
+  // persisted storage) before we evaluate the bundle, so `window.ctx` is set
+  // synchronously when the bundle runs. The bundle <script> is injected only
+  // after this, never inline, so it always observes a ready context.
+  var loaded = false;
+  function loadBundle() {
+    if (loaded) return; loaded = true;
+    var s = document.createElement('script');
+    s.src = './__SECRET__.js';
+    document.body.appendChild(s);
+  }
+  window.addEventListener('message', function (e) {
+    var d = e.data || {};
+    if (d.type === 'windmill:ctx') {
+      window.ctx = d.ctx;
+      if (window.__wmStorageShim && d.storage) {
+        window.__wmStorageShim.local.__hydrate(d.storage.local);
+        window.__wmStorageShim.session.__hydrate(d.storage.session);
+      }
+      if (d.initialHash && d.initialHash !== '#' && !window.location.hash) {
+        try { history.replaceState(null, '', d.initialHash); } catch (_) {}
+      }
+      loadBundle();
+    }
+  });
+  try { window.parent.postMessage({ type: 'windmill:ready' }, '*'); } catch (_) {}
+  // Fallback for contexts that never send ctx (e.g. ctx-less rendering).
+  setTimeout(loadBundle, 1500);
+})();
+</script>
+</head>
+<body>
+<div id="root"></div>
+</body>
+</html>
+"##;
+    TEMPLATE.replace("__SECRET__", secret)
+}
+
 // async fn get_app_version(
 //     authed: ApiAuthed,
 //     Extension(user_db): Extension<UserDB>,
@@ -937,6 +1110,17 @@ async fn get_public_app_by_secret(
 
     let mut app = not_found_if_none(app_o, "App", id.to_string())?;
 
+    // Confine the app embed token (the only credential handed to untrusted app JS,
+    // carrying the viewer's identity + `apps:read:<own path>`) to the app the secret
+    // resolves to: without this, app JS could reuse the viewer's identity to read any
+    // app it can see by secret via the RLS check below. Scoped to embed tokens only —
+    // other callers (anonymous, cookie, plain external JWT) keep their existing access.
+    if let Some(authed) = opt_authed.as_ref() {
+        if windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref()) {
+            check_scopes(authed, || format!("apps:read:{}", app.path))?;
+        }
+    }
+
     let policy = serde_json::from_str::<Policy>(app.policy.0.get()).map_err(to_anyhow)?;
 
     if !matches!(policy.execution_mode, ExecutionMode::Anonymous) {
@@ -971,6 +1155,300 @@ async fn get_public_app_by_secret(
     Ok(Json(app))
 }
 
+/// Scopes granted to a short-lived "app embed token". This is the token the
+/// app-embedder page hands the (opaque-origin) app iframe at startup so the app
+/// never receives the viewer's session cookie. Instead of restricting which
+/// routes a *domain* may hit, we restrict which routes the *token* may hit, so
+/// that even a malicious or compromised app document can only reach the
+/// endpoints an app legitimately needs. The `app_embed` sentinel turns each of
+/// these into a strict route allowlist (`app_embed_route_denied`):
+/// - `jobs:read`     → by-id job poll/cancel only; enumeration, counts, exports,
+///                      and `job_signature`/`resume_urls` are denied, and by-id
+///                      reads are confined to the app's own runs.
+/// - `app_embed`     → sentinel tagging this as an app embed token (grants nothing).
+/// - `resources:run` → resource metadata only (pickers, type schemas), never values.
+/// - `users:read`    → `users/whoami` only.
+/// - `folders:read`  → `folders/listnames` only.
+/// Plus two path-scoped scopes minted per app (see `mint_app_embed_token`):
+/// - `apps:read:<path>` → the app's own definition (`apps/get/p/<path>`); no
+///                      `apps:write`, so management routes are unreachable.
+/// - `apps:run:<path>`  → run THIS app's components (`execute_component`, which
+///                      re-checks the path); `apps_u/*` public-serving routes.
+pub const APP_EMBED_SCOPES: [&str; 5] = [
+    "jobs:read",
+    windmill_api_auth::scopes::APP_EMBED_SENTINEL,
+    "resources:run",
+    "users:read",
+    "folders:read",
+];
+
+/// How long an app embed token stays valid. The embedder re-mints on demand
+/// (e.g. after a `401` from the iframe) so this can stay short.
+const APP_EMBED_TOKEN_VALIDITY_HOURS: i64 = 12;
+
+#[derive(Serialize)]
+pub struct EmbedTokenResponse {
+    /// Narrowly-scoped token for the iframe. `None` for fully anonymous access
+    /// (the iframe then calls the public endpoints anonymously).
+    pub token: Option<String>,
+    pub expiration: Option<chrono::DateTime<chrono::Utc>>,
+    /// WIN-2006: raw apps render single-iframe (the bundle is already isolated in
+    /// its own opaque iframe), so the viewer skips the opaque-viewer indirection
+    /// and the embed token entirely — it loads the app with the page credential.
+    #[serde(default)]
+    pub raw_app: bool,
+    /// WIN-2006: publisher opted this app into sandbox isolation. When false the
+    /// viewer runs the app same-origin with its full session (the default,
+    /// pre-isolation behavior).
+    #[serde(default)]
+    pub sandbox: bool,
+    /// WIN-2006: the resolved app path. The embedder uses it (together with
+    /// `workspace_id`) to scope the app's backing `localStorage` per app (so
+    /// sandboxed apps don't share one store). Not a new disclosure — the viewer
+    /// already receives `path` when it loads the app (e.g. `get_public_app_by_secret`).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub app_path: Option<String>,
+    /// WIN-2006: the resolved workspace. Pairs with `app_path` for the per-app
+    /// `localStorage` key so two apps at the same path in different workspaces don't
+    /// share a store. For custom-path apps the viewer can't derive this itself.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub workspace_id: Option<String>,
+}
+
+/// Mint a short-lived, narrowly-scoped embed token for `app_path` when a caller
+/// is authenticated. When `opt_authed` is `None` (anonymous access to an
+/// anonymous app) no token is minted and the iframe relies on the public
+/// endpoints.
+///
+/// The CALLER MUST verify the viewer's access to `app_path` before calling: this
+/// mints a token on behalf of `opt_authed` unconditionally (DB access remains
+/// gated by the viewer's own RLS, but the token's existence is not access-checked
+/// here). All current call sites (`get_app_embed_token`,
+/// `get_app_embed_token_for_path`, and the EE custom-path variant) do this.
+///
+/// Scope confinement IS enforced here: the minted scopes must be within the
+/// caller's own (`ensure_scopes_within_caller`), so a scope-restricted bearer
+/// token cannot bootstrap a broader-scoped embed token. For the normal caller —
+/// an unscoped browser session — this is a no-op and the mint is purely
+/// narrowing.
+pub async fn mint_app_embed_token(
+    db: &DB,
+    w_id: &str,
+    app_path: &str,
+    opt_authed: Option<&ApiAuthed>,
+) -> Result<EmbedTokenResponse> {
+    let token_and_exp = if let Some(authed) = opt_authed {
+        // An app embed token represents untrusted app JS in the sandboxed iframe; it
+        // must never reach this mint path to renew itself. The 12h expiry is the
+        // blast-radius cap on a leaked embed token, and `ensure_scopes_within_caller`
+        // below would pass a same-scoped renewal (the requested scopes equal the
+        // caller's own), making the credential indefinitely self-renewable. Refresh
+        // minting is the trusted embedder session/JWT's job.
+        if windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref()) {
+            return Err(Error::NotAuthorized(
+                "App embed tokens cannot mint or renew embed tokens".to_string(),
+            ));
+        }
+        let expiration =
+            chrono::Utc::now() + chrono::Duration::hours(APP_EMBED_TOKEN_VALIDITY_HOURS);
+        let mut scopes: Vec<String> = APP_EMBED_SCOPES.iter().map(|s| s.to_string()).collect();
+        // Path-scoped read so the app can fetch its OWN definition (apps/get/p,
+        // which the in-workspace sandboxed viewer uses) — but no other app's. The
+        // public viewer fetches via apps_u/public_app and doesn't rely on this.
+        scopes.push(format!("apps:read:{app_path}"));
+        // Path-scoped run (NOT unqualified `apps:run`) so the token can only execute
+        // THIS app's components: `execute_component` re-checks `apps:run:<path>` for
+        // the requested app, so the token can't drive another app's runnables.
+        scopes.push(format!("apps:run:{app_path}"));
+        // A scope-restricted caller token must not bootstrap a broader-scoped
+        // embed token (`create_token_internal` deliberately does not check this
+        // itself). No-op for unscoped sessions — the normal embed flow.
+        ensure_scopes_within_caller(authed, Some(&scopes))?;
+        let token_config = NewToken::new(
+            Some(format!("embed_app:{app_path}")),
+            Some(expiration),
+            None,
+            Some(scopes),
+            Some(w_id.to_string()),
+            // Never let an embed token gain write capability the caller's own
+            // session lacks.
+            Some(authed.read_only),
+        );
+        let mut tx = db.begin().await?;
+        let token = create_token_internal(&mut *tx, db, authed, token_config).await?;
+        tx.commit().await?;
+        Some((token, expiration))
+    } else {
+        None
+    };
+
+    Ok(EmbedTokenResponse {
+        token: token_and_exp.as_ref().map(|(t, _)| t.clone()),
+        expiration: token_and_exp.map(|(_, e)| e),
+        raw_app: false,
+        sandbox: false,
+        app_path: Some(app_path.to_string()),
+        workspace_id: Some(w_id.to_string()),
+    })
+}
+
+/// Issue an embed token for a public app addressed by its (secret) share id.
+/// Mirrors the access check in [`get_public_app_by_secret`]: anonymous apps are
+/// reachable without auth, otherwise the caller must be logged in and have read
+/// access to the app.
+async fn get_app_embed_token(
+    OptAuthed(opt_authed): OptAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Extension(db): Extension<DB>,
+    Path((w_id, secret)): Path<(String, String)>,
+) -> JsonResult<EmbedTokenResponse> {
+    let id = get_id_from_secret(&db, &w_id, secret, None).await?;
+
+    let app = sqlx::query!(
+        "SELECT a.path, a.policy::text as policy, a.versions[array_upper(a.versions, 1)] as version, av.raw_app as raw_app
+         FROM app a JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]
+         WHERE a.id = $1 AND a.workspace_id = $2",
+        id,
+        &w_id
+    )
+    .fetch_optional(&db)
+    .await?;
+    let app = not_found_if_none(app, "App", id.to_string())?;
+    let raw_app = app.raw_app;
+    let policy_str = app
+        .policy
+        .ok_or_else(|| Error::internal_err("App policy missing".to_string()))?;
+    // Lenient field-level read instead of a strict `Policy` parse: a legacy app
+    // whose stored policy predates newer required fields must still resolve to
+    // its (unsandboxed) render here rather than erroring out of the viewer.
+    let policy = parse_embed_policy(&policy_str)?;
+
+    let authed_for_token = if policy.anonymous_execution {
+        // Anonymous app: still mint a scoped token if the viewer happens to be
+        // logged in (so the app sees their identity), otherwise stay anonymous.
+        opt_authed
+    } else {
+        let authed = opt_authed.ok_or_else(|| {
+            Error::NotAuthorized(
+                "App visibility does not allow public access and you are not logged in".to_string(),
+            )
+        })?;
+        let mut tx = user_db.begin(&authed).await?;
+        let is_visible = sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM app WHERE id = $1 AND workspace_id = $2)",
+            id,
+            &w_id
+        )
+        .fetch_one(&mut *tx)
+        .await?;
+        tx.commit().await?;
+        if !is_visible.unwrap_or(false) {
+            return Err(Error::NotAuthorized(
+                "App visibility does not allow public access and you are logged in but you have no read-access to that app".to_string(),
+            ));
+        }
+        Some(authed)
+    };
+
+    // The token is only consumed by the sandboxed low-code render. Raw apps
+    // render single-iframe with the page credential (WIN-2006 Variant A), and
+    // unsandboxed apps render same-origin with the viewer's own session — minting
+    // for those would write a useless token row per view and, worse, could fail
+    // the whole render for a scope-restricted caller (`ensure_scopes_within_caller`)
+    // even though no token is needed. The access check above still gates
+    // visibility in every case.
+    let mut resp = if raw_app || !policy.sandbox {
+        EmbedTokenResponse {
+            token: None,
+            expiration: None,
+            raw_app,
+            sandbox: policy.sandbox,
+            app_path: None,
+            workspace_id: None,
+        }
+    } else {
+        mint_app_embed_token(&db, &w_id, &app.path, authed_for_token.as_ref()).await?
+    };
+    resp.raw_app = raw_app;
+    resp.sandbox = policy.sandbox;
+    resp.app_path = Some(app.path);
+    resp.workspace_id = Some(w_id.to_string());
+    Ok(Json(resp))
+}
+
+/// Minimal, lenient view of an app policy for the embed-token endpoints
+/// (WIN-2006). Reads only the fields the sandbox decision needs, via
+/// `serde_json::Value`, so a legacy policy that no longer satisfies the strict
+/// [`Policy`] struct (e.g. `triggerables_v2` entries predating now-required
+/// fields) still renders instead of failing the viewer with "Not found".
+/// A missing/unknown `execution_mode` is treated as NOT anonymous — the
+/// strictest access interpretation.
+pub struct EmbedPolicyView {
+    pub anonymous_execution: bool,
+    pub sandbox: bool,
+}
+
+pub fn parse_embed_policy(policy_str: &str) -> Result<EmbedPolicyView> {
+    let v: serde_json::Value = serde_json::from_str(policy_str).map_err(to_anyhow)?;
+    Ok(EmbedPolicyView {
+        anonymous_execution: v.get("execution_mode").and_then(|m| m.as_str()) == Some("anonymous"),
+        sandbox: v.get("sandbox").and_then(|b| b.as_bool()).unwrap_or(false),
+    })
+}
+
+/// Authenticated, path-based embed token for the in-workspace app viewer
+/// (WIN-2006). Mirrors [`get_app_embed_token`] but keyed by app path and gated by
+/// the caller's read access (RLS), so the logged-in `/apps/get` viewer can render
+/// the app sandboxed — isolated from the member's full session — using the same
+/// scoped token. Raw apps get no token (single-iframe with the page credential).
+async fn get_app_embed_token_for_path(
+    authed: ApiAuthed,
+    Extension(user_db): Extension<UserDB>,
+    Extension(db): Extension<DB>,
+    Path((w_id, path)): Path<(String, StripPath)>,
+) -> JsonResult<EmbedTokenResponse> {
+    let path = path.to_path();
+    check_scopes(&authed, || format!("apps:read:{}", path))?;
+    // RLS: the caller must have read access to this app, otherwise it's not found.
+    let mut tx = user_db.begin(&authed).await?;
+    let app = sqlx::query!(
+        "SELECT a.policy::text as policy, a.versions[array_upper(a.versions, 1)] as version, av.raw_app as raw_app
+         FROM app a JOIN app_version av ON av.id = a.versions[array_upper(a.versions, 1)]
+         WHERE a.path = $1 AND a.workspace_id = $2",
+        path,
+        &w_id
+    )
+    .fetch_optional(&mut *tx)
+    .await?;
+    tx.commit().await?;
+    let app = not_found_if_none(app, "App", path)?;
+    let raw_app = app.raw_app;
+    let policy_str = app
+        .policy
+        .ok_or_else(|| Error::internal_err("App policy missing".to_string()))?;
+    // Lenient parse + mint only for the sandboxed low-code render — see
+    // [`get_app_embed_token`] for the rationale (identical here).
+    let policy = parse_embed_policy(&policy_str)?;
+
+    let mut resp = if raw_app || !policy.sandbox {
+        EmbedTokenResponse {
+            token: None,
+            expiration: None,
+            raw_app,
+            sandbox: policy.sandbox,
+            app_path: None,
+            workspace_id: None,
+        }
+    } else {
+        mint_app_embed_token(&db, &w_id, path, Some(&authed)).await?
+    };
+    resp.raw_app = raw_app;
+    resp.sandbox = policy.sandbox;
+    resp.app_path = Some(path.to_string());
+    resp.workspace_id = Some(w_id.to_string());
+    Ok(Json(resp))
+}
+
 async fn get_id_from_secret(
     db: &DB,
     w_id: &str,
@@ -1245,8 +1723,6 @@ async fn create_app_raw<'a>(
     )
     .await?;
 
-    check_scopes(&authed, || format!("apps:write:{}", path))?;
-
     webhook.send_message(
         w_id.clone(),
         WebhookMessage::CreateApp { workspace: w_id, path: path.clone() },
@@ -1290,7 +1766,6 @@ async fn create_app(
         ));
     }
     let path = app.path.clone();
-    check_scopes(&authed, || format!("apps:write:{}", &path))?;
 
     if let RuleCheckResult::Blocked(msg) = check_deploy_rules(
         &w_id,
@@ -1304,6 +1779,7 @@ async fn create_app(
         return Err(Error::PermissionDenied(msg));
     }
 
+    // scope is enforced inside create_app_internal, before any persistence.
     let (new_tx, _path, _id) = create_app_internal(authed, db, user_db, &w_id, false, app).await?;
 
     new_tx.commit().await?;
@@ -1342,6 +1818,50 @@ fn custom_path_conflict_error(
     }
 }
 
+/// App values live in a `json` column, which — unlike `jsonb` — accepts the
+/// `\u0000` escape. Any later `json`→`jsonb` conversion (a workspace fork's
+/// `clone_apps`, search indexing, …) then aborts with "unsupported Unicode
+/// escape sequence". Strip genuine NULs so the value is jsonb-safe before it
+/// lands in the DB; the usual source is a binary file such as `.DS_Store`
+/// accidentally bundled into a raw app's file map. A real NUL is unstorable
+/// either way, and frontend code that needs the character writes it as the
+/// source escape `\u0000`, which JSON-encodes to `\\u0000` (an escaped
+/// backslash — the even-parity case below) and is left untouched.
+///
+/// Returns `Cow::Borrowed` (no allocation) when the value is already clean.
+fn strip_null_chars(raw: &str) -> Cow<'_, str> {
+    let bytes = raw.as_bytes();
+    let mut out: Option<String> = None;
+    let mut copied_to = 0;
+    let mut search_from = 0;
+    // A genuine NUL is `\u0000`: a `u0000` introduced by an *odd* run of
+    // backslashes. An even run (`\\u0000`) is an escaped backslash then the
+    // literal text "u0000" (common in minified JS regexes) and is preserved.
+    while let Some(rel) = raw[search_from..].find("u0000") {
+        let at = search_from + rel;
+        let mut backslashes = 0;
+        let mut j = at;
+        while j > 0 && bytes[j - 1] == b'\\' {
+            backslashes += 1;
+            j -= 1;
+        }
+        if backslashes % 2 == 1 {
+            // Drop the escaping backslash + `u0000` — the 6 chars in [at-1, at+5).
+            let out = out.get_or_insert_with(String::new);
+            out.push_str(&raw[copied_to..at - 1]);
+            copied_to = at + 5;
+        }
+        search_from = at + 5;
+    }
+    match out {
+        Some(mut out) => {
+            out.push_str(&raw[copied_to..]);
+            Cow::Owned(out)
+        }
+        None => Cow::Borrowed(raw),
+    }
+}
+
 async fn create_app_internal<'a>(
     authed: ApiAuthed,
     db: sqlx::Pool<sqlx::Postgres>,
@@ -1350,6 +1870,10 @@ async fn create_app_internal<'a>(
     raw_app: bool,
     mut app: CreateApp,
 ) -> Result<(sqlx::Transaction<'a, sqlx::Postgres>, String, i64)> {
+    // Enforce scope before any persistence: the raw-app create path commits
+    // inside process_app_multipart!, so checking after this call would leave a
+    // denied app committed in the DB.
+    check_scopes(&authed, || format!("apps:write:{}", &app.path))?;
     if *CLOUD_HOSTED {
         let nb_apps =
             sqlx::query_scalar!("SELECT COUNT(*) FROM app WHERE workspace_id = $1", &w_id)
@@ -1367,7 +1891,9 @@ async fn create_app_internal<'a>(
             ));
         }
     }
-    let mut tx = user_db.clone().begin(&authed).await?;
+    // Resolve the on-behalf-of defaults on the (non-RLS) pool *before* opening
+    // the RLS transaction below: doing these lookups mid-transaction would hold
+    // a second simultaneous connection while `tx` is still checked out.
     let should_preserve = app.preserve_on_behalf_of.unwrap_or(false)
         && windmill_common::can_preserve_on_behalf_of(&authed)
         && app.policy.on_behalf_of.is_some();
@@ -1393,6 +1919,8 @@ async fn create_app_internal<'a>(
             app.policy.on_behalf_of_email = Some(authed.email.clone());
         }
     }
+
+    let mut tx = user_db.clone().begin(&authed).await?;
     let path = app.path.clone();
     if &app.path == "" {
         return Err(Error::BadRequest("App path cannot be empty".to_string()));
@@ -1477,13 +2005,18 @@ async fn create_app_internal<'a>(
     )
     .fetch_one(&mut *tx)
     .await?;
+    // `.get()` keeps the raw text (and thus key order); strip any NUL so the
+    // `json`→`jsonb` conversion downstream (fork, indexing) can't choke on it.
+    let value = strip_null_chars(app.value.0.get());
+    if matches!(value, Cow::Owned(_)) {
+        tracing::warn!(path = %app.path, "stripped NUL character(s) from app value on create");
+    }
     let v_id = sqlx::query_scalar!(
         "INSERT INTO app_version
             (app_id, value, created_by, raw_app)
             VALUES ($1, $2::text::json, $3, $4) RETURNING id",
         id,
-        //to preserve key orders
-        serde_json::to_string(&app.value).unwrap(),
+        value.as_ref(),
         authed.username,
         raw_app
     )
@@ -1891,6 +2424,13 @@ async fn update_app_internal<'a>(
     ns: EditApp,
 ) -> Result<(sqlx::Transaction<'a, sqlx::Postgres>, String, i64)> {
     use sql_builder::prelude::*;
+
+    // A rename moves the app to ns.path, so the destination must also be within
+    // the token's write scope, not just the source path.
+    if let Some(npath) = ns.path.as_deref() {
+        check_scopes(&authed, || format!("apps:write:{}", npath))?;
+    }
+
     let mut tx = user_db.clone().begin(&authed).await?;
 
     let mut preserved_on_behalf_of: Option<String> = None;
@@ -2050,13 +2590,18 @@ async fn update_app_internal<'a>(
         .fetch_one(&mut *tx)
         .await?;
 
+        // `.get()` keeps the raw text (and thus key order); strip any NUL so the
+        // `json`→`jsonb` conversion downstream (fork, indexing) can't choke on it.
+        let value = strip_null_chars(nvalue.0.get());
+        if matches!(value, Cow::Owned(_)) {
+            tracing::warn!(path = %npath, "stripped NUL character(s) from app value on update");
+        }
         let v_id = sqlx::query_scalar!(
             "INSERT INTO app_version
                 (app_id, value, created_by, raw_app)
                 VALUES ($1, $2::text::json, $3, $4) RETURNING id",
             app_id,
-            //to preserve key orders
-            serde_json::to_string(&nvalue).unwrap(),
+            value.as_ref(),
             authed.username,
             raw_app
         )
@@ -2276,6 +2821,17 @@ async fn execute_component(
     Path((w_id, path)): Path<(String, StripPath)>,
     Json(mut payload): Json<ExecuteApp>,
 ) -> Result<String> {
+    let path = path.to_path();
+    // Authorize FIRST, before touching the payload: confine the app embed token (the
+    // only credential handed to untrusted app JS, carrying `apps:run:<own path>`) to
+    // the app it was minted for. The route layer can't path-check the apps domain, so
+    // enforce it here. Scoped to embed tokens only — other callers (anonymous, cookie,
+    // plain external JWT) keep their existing access; the run is still policy-gated.
+    if let Some(authed) = opt_authed.as_ref() {
+        if windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref()) {
+            check_scopes(authed, || format!("apps:run:{}", path))?;
+        }
+    }
     // Only honor temp_script_refs for the inline-script preview path:
     // preview/editor mode (force_viewer_static_fields set, == `is_preview`),
     // raw_code present, and no deployed app_script id — i.e. `wmill app dev`.
@@ -2298,7 +2854,6 @@ async fn execute_component(
         _ => {}
     };
 
-    let path = path.to_path();
     let (arc_policy, policy): (Arc<Policy>, Policy);
     let policy_triggerables_default = Default::default();
     // Preview mode means the request was issued from the editor; the editing
@@ -2762,6 +3317,15 @@ async fn upload_s3_file_from_app(
     Query(query): Query<UploadFileToS3Query>,
     request: axum::extract::Request,
 ) -> JsonResult<AppUploadFileResponse> {
+    // Confine an app embed token (untrusted app JS) to uploading for its OWN app.
+    // The route is reachable with `apps:run` (RUN_PATH_ACTIONS), so without this a
+    // token minted for app A could drive app B's upload policy. Mirrors
+    // execute_component / download_s3_file; other callers are unaffected.
+    if let Some(authed) = opt_authed.as_ref() {
+        if windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref()) {
+            check_scopes(authed, || format!("apps:run:{}", path.to_path()))?;
+        }
+    }
     let policy = if let Some(file_key_regex) = query.force_viewer_file_key_regex {
         // `force_viewer_*` lets the caller supply a synthetic upload policy that
         // bypasses the deployed app's file_key_regex / resource restrictions.
@@ -2796,6 +3360,7 @@ async fn upload_s3_file_from_app(
                     .unwrap_or_default(),
             }]),
             allowed_s3_keys: None,
+            sandbox: None,
         })
     } else {
         let policy_o = sqlx::query_scalar!(
@@ -3038,7 +3603,49 @@ async fn upload_s3_file_from_app(
     ])
     .into();
 
-    let _put_result = upload_file_from_req(s3_client, &file_key, request, options).await?;
+    // Only workspace storage is quota-metered; a custom-resource upload lands in
+    // the user's own bucket and is neither capped nor counted. An overwrite of an
+    // existing key only spends the difference over its current size.
+    let _is_workspace_storage = query.s3_resource_path.is_none();
+    #[cfg(all(feature = "parquet", not(feature = "enterprise")))]
+    if _is_workspace_storage {
+        reject_reserved_volume_key(&file_key)?;
+    }
+    #[cfg(all(feature = "parquet", not(feature = "enterprise")))]
+    let (max_size, _existing_size) = if _is_workspace_storage {
+        let content_length = request
+            .headers()
+            .get(http::header::CONTENT_LENGTH)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse::<i64>().ok());
+        let budget = ce_upload_budget(&db, &w_id, &s3_client, &file_key, content_length).await?;
+        (Some(budget.max_size), budget.existing_size)
+    } else {
+        (None, 0)
+    };
+    #[cfg(any(not(feature = "parquet"), feature = "enterprise"))]
+    let max_size: Option<usize> = None;
+
+    match upload_file_from_req(s3_client, &file_key, request, options, max_size).await {
+        Ok((_, _size)) =>
+        {
+            #[cfg(all(feature = "parquet", not(feature = "enterprise")))]
+            if _is_workspace_storage {
+                bump_storage_usage(
+                    &db,
+                    &w_id,
+                    windmill_object_store::DEFAULT_STORAGE,
+                    _size as i64 - _existing_size,
+                )
+                .await;
+            }
+        }
+        Err(e) => {
+            #[cfg(all(feature = "parquet", not(feature = "enterprise")))]
+            spawn_storage_usage_recount_floored(&db, &w_id);
+            return Err(e);
+        }
+    }
 
     let delete_token = jwt::encode_with_internal_secret(S3DeleteTokenClaims {
         file_key: file_key.clone(),
@@ -3155,6 +3762,7 @@ async fn get_on_behalf_authed_from_app(
             on_behalf_of_email: None,
             s3_inputs: None,
             allowed_s3_keys: Some(force_allowed_s3_keys),
+            sandbox: None,
         }
     } else {
         // TODO: improve db query to not return uneeded fields
@@ -3177,6 +3785,7 @@ async fn get_on_behalf_authed_from_app(
                 on_behalf_of_email: None,
                 s3_inputs: None,
                 allowed_s3_keys: None,
+                sandbox: None,
             })
     };
 
@@ -3220,34 +3829,46 @@ async fn check_if_allowed_to_access_s3_file_from_app(
         return Err(Error::InternalErr(
             "Internal error: signature validation is not supported in open source mode".to_string(),
         ));
-    } else if opt_authed.is_some() {
+    } else if opt_authed.as_ref().is_some_and(|authed| {
+        !windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref())
+    }) {
+        // A normal logged-in caller (editor / full session) may fetch any file they
+        // can reach. An app embed token also carries an identity but represents
+        // untrusted app JS, so it falls through to the allowlist below instead of
+        // this bypass — otherwise the app could read arbitrary S3 keys the
+        // viewer/on-behalf identity can see, beyond its own declared keys/outputs.
         Ok(())
     } else {
-        let allowed = policy
-            .allowed_s3_keys
+        // Anonymous viewer, or an app embed token: confine to the app's declared S3
+        // keys, or files produced by THIS app's own component runs. The producing
+        // identity is the embed viewer for a token, else `anonymous`.
+        let creator = opt_authed
             .as_ref()
-            .unwrap()
-            .iter()
-            .any(|key| key.s3_path == file_query.s3 && key.storage == file_query.storage)
-            || {
-                sqlx::query_scalar!(
-                    r#"SELECT EXISTS (
+            .map(|authed| authed.username.clone())
+            .unwrap_or_else(|| "anonymous".to_string());
+        let allowed = policy.allowed_s3_keys.as_ref().is_some_and(|keys| {
+            keys.iter()
+                .any(|key| key.s3_path == file_query.s3 && key.storage == file_query.storage)
+        }) || {
+            sqlx::query_scalar!(
+                r#"SELECT EXISTS (
                 SELECT 1 FROM v2_job_completed c JOIN v2_job j USING (id)
                 WHERE j.workspace_id = $2
                     AND (j.kind = 'appscript' OR j.kind = 'preview')
-                    AND j.created_by = 'anonymous'
+                    AND j.created_by = $4
                     AND c.started_at > now() - interval '3 hours'
                     AND j.runnable_path LIKE $3 || '/%'
                     AND c.result @> ('{"s3":"' || $1 ||  '"}')::jsonb
             )"#,
-                    file_query.s3,
-                    w_id,
-                    path,
-                )
-                .fetch_one(db)
-                .await?
-                .unwrap_or(false)
-            };
+                file_query.s3,
+                w_id,
+                path,
+                creator,
+            )
+            .fetch_one(db)
+            .await?
+            .unwrap_or(false)
+        };
 
         if !allowed {
             Err(Error::BadRequest("File restricted".to_string()))
@@ -3286,6 +3907,15 @@ async fn download_s3_file_from_app(
 
     let path = path.to_path();
 
+    // Authorize the app path first: a scoped caller (notably an app embed token,
+    // which carries `apps:read:<own path>`) may only download files for the app it
+    // was minted for — otherwise it could read another app's S3 files via that app's
+    // on-behalf policy. Unscoped sessions / anonymous callers pass through (the
+    // latter still gated by the policy allowlist in `check_if_allowed_...`).
+    if let Some(authed) = opt_authed.as_ref() {
+        check_scopes(authed, || format!("apps:read:{}", path))?;
+    }
+
     let force_viewer_allowed_s3_keys = if let Some(force_viewer_allowed_s3_keys) =
         query.force_viewer_allowed_s3_keys.clone()
     {
@@ -3562,3 +4192,312 @@ async fn build_args(
         job_id,
     ))
 }
+
+#[cfg(test)]
+mod embed_token_tests {
+    use super::APP_EMBED_SCOPES;
+    use windmill_api_auth::scopes::check_scopes_for_route;
+
+    /// The embed token must reach exactly the endpoints an app needs and nothing
+    /// else. This locks the allow/deny matrix that confines a malicious or
+    /// compromised app to app-only routes (WIN-2006).
+    #[test]
+    fn embed_scopes_allow_app_routes_and_deny_the_rest() {
+        let mut scopes: Vec<String> = APP_EMBED_SCOPES.iter().map(|s| s.to_string()).collect();
+        // Mirror mint_app_embed_token: the per-app path-scoped read + run.
+        scopes.push("apps:read:u/admin/app".to_string());
+        scopes.push("apps:run:u/admin/app".to_string());
+        let scopes = Some(scopes.as_slice());
+
+        // Allowed: the routes a running app legitimately calls.
+        let allowed = [
+            // Own definition + the public app-serving / execution endpoints.
+            ("/api/w/test/apps/get/p/u/admin/app", "GET"),
+            ("/api/w/test/apps_u/public_app/secret", "GET"),
+            ("/api/w/test/apps_u/get_data/v/secret.js", "GET"),
+            ("/api/w/test/apps_u/public_resource/f/app_themes/t", "GET"),
+            ("/api/w/test/apps_u/execute_component/u/admin/app", "POST"),
+            // S3 file upload from the app's S3 File Input component: a `run` action
+            // (RUN_PATH_ACTIONS) so the embed token reaches it; the handler re-checks
+            // `apps:run:<path>` to confine it to this app, like execute_component.
+            ("/api/w/test/apps_u/upload_s3_file/u/admin/app", "POST"),
+            // By-id job poll routes (the JobLoader surface) stay allowed.
+            ("/api/w/test/jobs_u/get/some-uuid", "GET"),
+            ("/api/w/test/jobs_u/getupdate/some-uuid", "GET"),
+            ("/api/w/test/jobs_u/getupdate_sse/some-uuid", "GET"),
+            ("/api/w/test/jobs_u/completed/get_result/some-uuid", "GET"),
+            ("/api/w/test/jobs_u/completed/get_timing/some-uuid", "GET"),
+            // By-id cancel (POST): permitted at the route layer; the handler confines
+            // it to the app's own jobs (created_by == viewer).
+            ("/api/w/test/jobs_u/queue/cancel/some-uuid", "POST"),
+            ("/api/w/test/users/whoami", "GET"),
+            // Resource METADATA only (picker list + type schemas) — never values.
+            ("/api/w/test/resources/list", "GET"),
+            ("/api/w/test/resources/exists/u/admin/r", "GET"),
+            ("/api/w/test/resources/type/list", "GET"),
+            ("/api/w/test/folders/listnames", "GET"),
+        ];
+        for (path, method) in allowed {
+            assert!(
+                check_scopes_for_route(scopes, path, method).is_ok(),
+                "embed token should allow {method} {path}"
+            );
+        }
+
+        // Denied: anything outside what an app needs, including app management
+        // (apps:write is intentionally withheld), resource VALUE reads (which can
+        // hold credentials), and other workspace domains.
+        let denied = [
+            ("/api/w/test/apps/update/u/admin/app", "POST"),
+            ("/api/w/test/apps/delete/u/admin/app", "DELETE"),
+            // Workspace app inventory must NOT be reachable (Apps domain is
+            // default-denied for the embed sentinel; only own-def + apps_u/* allowed).
+            ("/api/w/test/apps/exists/u/admin/app", "GET"),
+            ("/api/w/test/apps/custom_path_exists/foo", "GET"),
+            (
+                "/api/w/test/apps/list_paths_from_workspace_runnable/script/u/admin/x",
+                "GET",
+            ),
+            ("/api/w/test/apps/list", "GET"),
+            // The embed-token MINT endpoints are public app routes (`apps_u/`) but
+            // create credentials — denied so a captured embed token can't renew
+            // itself indefinitely past the 12h expiry (refresh is the embedder's job).
+            ("/api/w/test/apps_u/embed_token/secret", "GET"),
+            ("/api/w/test/apps_u/embed_token_by_custom_path/foo", "GET"),
+            ("/api/w/test/scripts/list", "GET"),
+            ("/api/w/test/variables/list", "GET"),
+            ("/api/w/test/resources/update/u/admin/r", "POST"),
+            // Resource value reads must NOT be reachable with the embed token.
+            ("/api/w/test/resources/get/u/admin/r", "GET"),
+            ("/api/w/test/resources/get_value/u/admin/r", "GET"),
+            (
+                "/api/w/test/resources/get_value_interpolated/u/admin/r",
+                "GET",
+            ),
+            ("/api/w/test/resources/list_search", "GET"),
+            // Workspace-wide job enumeration/export must NOT be reachable — an app
+            // reads only jobs it launched, by id (blocked via the app_embed sentinel).
+            ("/api/w/test/jobs/list", "GET"),
+            ("/api/w/test/jobs/list_filtered_uuids", "GET"),
+            ("/api/w/test/jobs/completed/list", "GET"),
+            ("/api/w/test/jobs/completed/export", "GET"),
+            ("/api/w/test/jobs/queue/list", "GET"),
+            ("/api/w/test/jobs/queue/list_filtered_uuids", "GET"),
+            ("/api/w/test/jobs/queue/export", "GET"),
+            // Job counts (workspace-wide aggregates) and the capability-minting
+            // routes (signed resume/approval URLs) are NOT by-id polling — denied.
+            ("/api/w/test/jobs/completed/count", "GET"),
+            ("/api/w/test/jobs/completed/count_jobs", "GET"),
+            ("/api/w/test/jobs/queue/count", "GET"),
+            ("/api/w/test/jobs/job_signature/some-uuid/some-rid", "GET"),
+            ("/api/w/test/jobs/resume_urls/some-uuid/some-rid", "GET"),
+            // get_root_job_id has no access check in its handler and the app never
+            // calls it — denied so the token can't probe foreign jobs' flow lineage.
+            ("/api/w/test/jobs_u/get_root_job_id/some-uuid", "GET"),
+            // `users:read`/`folders:read` exist only for whoami/listnames — every
+            // other route in those domains is denied via the app_embed sentinel
+            // (the whole /users and /folders routers are CORS-enabled for the iframe).
+            ("/api/w/test/users/list", "GET"),
+            ("/api/w/test/users/list_usage", "GET"),
+            ("/api/w/test/users/username_to_email/admin", "GET"),
+            ("/api/w/test/folders/list", "GET"),
+            ("/api/w/test/folders/get/myfolder", "GET"),
+            ("/api/w/test/folders/getusage/myfolder", "GET"),
+        ];
+        for (path, method) in denied {
+            assert!(
+                check_scopes_for_route(scopes, path, method).is_err(),
+                "embed token should deny {method} {path}"
+            );
+        }
+    }
+
+    /// `apps:run` satisfies read at the route layer, so `apps/list` / `apps/list_search`
+    /// pass the route check — that's why those handlers ALSO call
+    /// `check_scopes(apps:read)`, which uses `ScopeDefinition::includes` (where run
+    /// does NOT include read). Lock that: no embed scope, including the
+    /// dynamically-minted path-scoped read, satisfies a domain-level `apps:read`, so
+    /// the token cannot list all apps' definitions (their full `value`/code).
+    #[test]
+    fn embed_scopes_cannot_satisfy_domain_app_read() {
+        use windmill_api_auth::scopes::ScopeDefinition;
+        let mut scopes: Vec<String> = APP_EMBED_SCOPES.iter().map(|s| s.to_string()).collect();
+        // mint_app_embed_token also grants read scoped to the single app path:
+        scopes.push("apps:read:u/admin/app".to_string());
+        let required = ScopeDefinition::from_scope_string("apps:read").unwrap();
+        for s in &scopes {
+            // The `app_embed` sentinel intentionally doesn't parse as a domain:action
+            // scope (it grants nothing; it only drives the job-enumeration deny).
+            let Ok(def) = ScopeDefinition::from_scope_string(s) else {
+                continue;
+            };
+            assert!(
+                !def.includes(&required),
+                "embed scope {s} must not satisfy domain-level apps:read (would leak apps/list[_search])"
+            );
+        }
+        // Sanity: a genuine domain-level apps:read token does satisfy it.
+        assert!(ScopeDefinition::from_scope_string("apps:read")
+            .unwrap()
+            .includes(&required));
+    }
+
+    /// The token carries path-scoped `apps:run:<own path>` and `apps:read:<own path>`
+    /// (NOT unqualified `apps:run`). Every handler that resolves an app and acts on
+    /// its behalf re-checks the requested path via `ScopeDefinition::includes`, so the
+    /// token is confined to its OWN app:
+    /// - `apps:run:<path>` — `execute_component`.
+    /// - `apps:read:<path>` — `get_app` (apps/get/p), `get_public_app_by_secret`,
+    ///   the EE custom-path `get_public_app_by_custom_path`, and
+    ///   `download_s3_file_from_app`.
+    /// This blocks cross-app execution, definition reads (by secret / custom path),
+    /// and S3 file reads through another app's on-behalf policy.
+    #[test]
+    fn embed_run_scope_is_path_scoped_to_its_app() {
+        use windmill_api_auth::scopes::ScopeDefinition;
+        // The mint must not grant unqualified run (which would include any path).
+        assert!(
+            !APP_EMBED_SCOPES.contains(&"apps:run"),
+            "embed scopes must not include unqualified apps:run"
+        );
+        for action in ["run", "read"] {
+            let own =
+                ScopeDefinition::from_scope_string(&format!("apps:{action}:u/admin/app")).unwrap();
+            assert!(
+                own.includes(
+                    &ScopeDefinition::from_scope_string(&format!("apps:{action}:u/admin/app"))
+                        .unwrap()
+                ),
+                "apps:{action} must grant its own app"
+            );
+            assert!(
+                !own.includes(
+                    &ScopeDefinition::from_scope_string(&format!("apps:{action}:u/admin/other"))
+                        .unwrap()
+                ),
+                "apps:{action} must NOT grant another app (cross-app)"
+            );
+        }
+    }
+
+    /// `mint_app_embed_token` guards its `create_token_internal` call with
+    /// `ensure_scopes_within_caller`, so a scope-restricted bearer token cannot
+    /// bootstrap the broader embed-scope set. Lock that boundary on the exact
+    /// scope vec the mint builds: rejected for a path-scoped caller, no-op for
+    /// the unscoped browser session that is the normal embed flow.
+    #[test]
+    fn embed_token_mint_is_scope_bounded() {
+        use windmill_api_auth::{ensure_scopes_within_caller, ApiAuthed};
+
+        // Same scope set mint_app_embed_token assembles for an app.
+        let mut minted: Vec<String> = APP_EMBED_SCOPES.iter().map(|s| s.to_string()).collect();
+        minted.push("apps:read:u/admin/app".to_string());
+
+        // A caller restricted to a single app read must not widen to the full
+        // embed set (apps:run, jobs:read, resources:read, ...).
+        let restricted = ApiAuthed {
+            scopes: Some(vec!["apps:read:u/admin/app".to_string()]),
+            ..Default::default()
+        };
+        assert!(
+            ensure_scopes_within_caller(&restricted, Some(&minted)).is_err(),
+            "a path-scoped caller must not mint the broader embed-scope set"
+        );
+
+        // An unscoped session (the normal embed flow) passes — the mint only
+        // narrows.
+        let unscoped = ApiAuthed { scopes: None, ..Default::default() };
+        assert!(ensure_scopes_within_caller(&unscoped, Some(&minted)).is_ok());
+    }
+
+    /// The embed-token endpoints must keep working for legacy apps whose stored
+    /// policy no longer satisfies the strict `Policy` struct (pre-dating
+    /// now-required fields): `parse_embed_policy` reads only the sandbox-decision
+    /// fields, leniently, and treats a missing/unknown `execution_mode` as NOT
+    /// anonymous (the strictest access interpretation).
+    #[test]
+    fn embed_policy_parse_is_lenient() {
+        use super::parse_embed_policy;
+
+        // Quirky legacy policy: triggerables_v2 entry missing required fields,
+        // no execution_mode at all — must still parse, and absent `sandbox`
+        // resolves to the unsandboxed default.
+        let p = parse_embed_policy(r#"{"triggerables_v2": {"x": {}}}"#).unwrap();
+        assert!(!p.sandbox);
+        assert!(
+            !p.anonymous_execution,
+            "missing execution_mode must not grant anonymous access"
+        );
+
+        // Normal policies map field-for-field.
+        let p = parse_embed_policy(r#"{"execution_mode": "anonymous", "sandbox": true}"#).unwrap();
+        assert!(p.anonymous_execution);
+        assert!(p.sandbox);
+
+        // Unknown execution_mode value: lenient parse, but not anonymous.
+        let p = parse_embed_policy(r#"{"execution_mode": "weird"}"#).unwrap();
+        assert!(!p.anonymous_execution);
+
+        // Invalid JSON still errors.
+        assert!(parse_embed_policy("not json").is_err());
+    }
+}
+
+#[cfg(test)]
+mod strip_null_chars_tests {
+    use super::strip_null_chars;
+    use std::borrow::Cow;
+
+    // Build `{"k":"<n backslashes>u0000"}` without writing the escape literally
+    // (a real NUL can't live in Rust source). Odd n => the trailing `u0000` is a
+    // genuine NUL escape; even n => an escaped backslash then the text "u0000".
+    fn doc(backslashes: usize) -> String {
+        format!(r#"{{"k":"{}u0000"}}"#, "\\".repeat(backslashes))
+    }
+
+    #[test]
+    fn strips_genuine_null_escape() {
+        // 1 backslash: the NUL escape is dropped, the string value becomes "".
+        assert_eq!(strip_null_chars(&doc(1)).as_ref(), r#"{"k":""}"#);
+        // 3 backslashes: escaped backslash + NUL -> keep the escaped backslash.
+        let three = doc(3);
+        let out = strip_null_chars(&three);
+        assert_eq!(out.as_ref(), r#"{"k":"\\"}"#);
+        // Result is now valid, NUL-free JSON (i.e. jsonb-safe).
+        let v: serde_json::Value = serde_json::from_str(out.as_ref()).unwrap();
+        assert!(!v["k"].as_str().unwrap().as_bytes().contains(&0u8));
+    }
+
+    #[test]
+    fn preserves_escaped_backslash_then_literal_u0000() {
+        // Even runs are the literal text "u0000" (e.g. a minified JS regex char
+        // class) and must be returned untouched, with no allocation.
+        for n in [2usize, 4] {
+            let s = doc(n);
+            let out = strip_null_chars(&s);
+            assert_eq!(out.as_ref(), s.as_str());
+            assert!(matches!(out, Cow::Borrowed(_)), "n={n} should be borrowed");
+        }
+    }
+
+    #[test]
+    fn preserves_clean_values() {
+        // Plain value, and the bare token "u0000" with no preceding backslash.
+        for s in [r#"{"files":{"/index.tsx":"hello"}}"#, r#"{"k":"u0000"}"#] {
+            let out = strip_null_chars(s);
+            assert_eq!(out.as_ref(), s);
+            assert!(matches!(out, Cow::Borrowed(_)));
+        }
+        // The escape for a literal backslash char (`u005c`) then text "u0000":
+        // the only "u0000" match is preceded by `c` (0 backslashes) -> no NUL.
+        let s = format!(r#"{{"k":"{}u005cu0000"}}"#, "\\");
+        assert!(matches!(strip_null_chars(&s), Cow::Borrowed(_)));
+    }
+
+    #[test]
+    fn strips_multiple_and_preserves_surrounding() {
+        // Mirrors the .DS_Store case: several NULs interleaved with real text.
+        let s = format!(r#"{{"a":"x{b}u0000{b}u0000y","b":"ok"}}"#, b = "\\");
+        assert_eq!(strip_null_chars(&s).as_ref(), r#"{"a":"xy","b":"ok"}"#);
+    }
+}
diff --git a/backend/windmill-api/src/args.rs b/backend/windmill-api/src/args.rs
index 3793e94b02..dc8b36fbaf 100644
--- a/backend/windmill-api/src/args.rs
+++ b/backend/windmill-api/src/args.rs
@@ -90,6 +90,10 @@ impl RawWebhookArgs {
         db: &DB,
         w_id: &str,
     ) -> Result<HashMap<String, Box<RawValue>>, Error> {
+        #[cfg(not(feature = "enterprise"))]
+        use crate::job_helpers_oss::{
+            bump_storage_usage, ce_storage_quota_remaining, spawn_storage_usage_recount_floored,
+        };
         use crate::job_helpers_oss::{
             get_random_file_name, get_workspace_s3_resource, upload_file_internal,
         };
@@ -139,8 +143,38 @@ impl RawWebhookArgs {
                             .into_stream()
                             .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err));
 
-                        upload_file_internal(s3_client.clone(), &file_key, bytes_stream, options)
-                            .await?;
+                        // file_key is always freshly random here, so this never
+                        // overwrites an existing object; the full size is the delta.
+                        #[cfg(not(feature = "enterprise"))]
+                        let max_size = Some(ce_storage_quota_remaining(db, w_id, None).await? as usize);
+                        #[cfg(feature = "enterprise")]
+                        let max_size: Option<usize> = None;
+
+                        match upload_file_internal(
+                            s3_client.clone(),
+                            &file_key,
+                            bytes_stream,
+                            options,
+                            max_size,
+                        )
+                        .await
+                        {
+                            Ok((_, _size)) => {
+                                #[cfg(not(feature = "enterprise"))]
+                                bump_storage_usage(
+                                    db,
+                                    w_id,
+                                    windmill_object_store::DEFAULT_STORAGE,
+                                    _size as i64,
+                                )
+                                .await;
+                            }
+                            Err(e) => {
+                                #[cfg(not(feature = "enterprise"))]
+                                spawn_storage_usage_recount_floored(db, w_id);
+                                return Err(e);
+                            }
+                        }
 
                         files.entry(name).or_insert(vec![]).push(serde_json::json!({
                             "s3": &file_key
diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index 7b8d468da8..8b9489263b 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -84,12 +84,26 @@ lazy_static::lazy_static! {
                     (20260228000000, include_str!(
                         "../../migrations/20260228000000_v2_job_completed_failure_index.up.sql"
                     ).replace("CREATE INDEX", "CREATE INDEX CONCURRENTLY")),
+                    (20260610151334, include_str!(
+                        "../../migrations/20260610151334_folder_labels.up.sql"
+                    ).replace("SET search_path = public", "SET search_path FROM CURRENT").to_string()),
+                    (20260614075900, include_str!(
+                        "../../migrations/20260614075900_dedup_folder_labels.up.sql"
+                    ).replace("SET search_path = public", "SET search_path FROM CURRENT").to_string()),
                     ].into_iter().collect();
 }
 
 pub struct CustomMigrator {
     inner: PoolConnection<Postgres>,
 }
+impl CustomMigrator {
+    /// The connection the migrator already holds (with the migration advisory lock).
+    /// Migration housekeeping runs on it instead of re-acquiring: a second connection
+    /// while this one is held deadlocks a single-connection backend (e.g. embedded pglite).
+    pub fn connection(&mut self) -> &mut PgConnection {
+        &mut *self.inner
+    }
+}
 impl Migrate for CustomMigrator {
     fn ensure_migrations_table(
         &mut self,
@@ -266,7 +280,7 @@ pub async fn migrate(
         version=20250131115248 OR version=20250902085503 OR version=20250201145630 OR
         version=20250201145631 OR version=20250201145632 OR version=20251006143821"
     )
-    .execute(db)
+    .execute(custom_migrator.connection())
     .await
     {
         tracing::info!("Could not remove sqlx migrations: {err:#}");
@@ -288,6 +302,12 @@ pub async fn migrate(
         // idempotent, so re-applying on an already-migrated DB is a no-op.
         20260423050000,
         20260523055641,
+        // Reworked to stop reading pg_authid (via pg_has_role) from an elevated
+        // context, which managed providers (e.g. Cloud SQL) forbid — the original
+        // aborted startup. The new file is idempotent (CREATE OR REPLACE + an
+        // epoch-guarded UPDATE that no-ops once anchored), so re-applying on an
+        // already-migrated DB is safe.
+        20260626132251,
     ];
     for m in migrator.migrations.iter() {
         if m.migration_type.is_down_migration() {
@@ -298,7 +318,7 @@ pub async fn migrate(
                 sqlx::query("DELETE FROM _sqlx_migrations WHERE version = $1 AND checksum != $2")
                     .bind(m.version)
                     .bind(&*m.checksum)
-                    .execute(db)
+                    .execute(custom_migrator.connection())
                     .await
             {
                 tracing::info!("Could not clean up stale migration {}: {err:#}", m.version);
@@ -328,7 +348,7 @@ pub async fn migrate(
         }
     }
 
-    crate::live_migrations::custom_migrations(&mut custom_migrator, db).await?;
+    crate::live_migrations::custom_migrations(&mut custom_migrator).await?;
     Ok(None)
 }
 
diff --git a/backend/windmill-api/src/db_health.rs b/backend/windmill-api/src/db_health.rs
index 412c126dec..c487d29da9 100644
--- a/backend/windmill-api/src/db_health.rs
+++ b/backend/windmill-api/src/db_health.rs
@@ -96,8 +96,35 @@ pub struct ConnectionPoolInfo {
     pub pg_total_connections: i64,
     pub pg_active_connections: i64,
     pub pg_idle_connections: i64,
+    pub pg_superuser_reserved_connections: i64,
     pub status: HealthLevel,
     pub message: String,
+    /// Connection sizing guidance derived from the live Windmill fleet.
+    pub sizing: ConnectionSizingInfo,
+}
+
+#[derive(Serialize)]
+pub struct ConnectionSizingInfo {
+    /// Live DB-connected worker processes (distinct worker_instance pinged recently).
+    pub live_worker_instances: i64,
+    /// Live individual DB-connected workers across all instances.
+    pub live_workers: i64,
+    /// Live agent workers (HTTP-only, hold no postgres connections; excluded from the estimate).
+    pub live_agent_workers: i64,
+    /// Effective per-server pool ceiling: DATABASE_CONNECTIONS if set, else DEFAULT_MAX_CONNECTIONS_SERVER.
+    pub server_pool_size: i64,
+    /// Effective per-worker-instance pool ceiling (single-worker baseline; grows +1 per extra worker unless DATABASE_CONNECTIONS is set).
+    pub worker_pool_size: i64,
+    /// The DATABASE_CONNECTIONS override, if this server has one set (caps every process's pool).
+    pub database_connections_override: Option<i64>,
+    /// Estimated peak connections opened by all live worker instances.
+    pub estimated_worker_connections: i64,
+    /// Recommended max_connections floor (workers + one server + headroom).
+    pub recommended_max_connections: i64,
+    /// Per-additional-server increment to add to the recommendation.
+    pub per_server_increment: i64,
+    /// Human-readable sizing explanation.
+    pub message: String,
 }
 
 #[derive(Serialize)]
@@ -379,6 +406,13 @@ async fn fetch_connection_pool(db: &DB) -> windmill_common::error::Result<Connec
     .fetch_one(db)
     .await?;
 
+    let reserved = sqlx::query_scalar!(
+        r#"SELECT setting::bigint as "v!" FROM pg_settings WHERE name = 'superuser_reserved_connections'"#
+    )
+    .fetch_one(db)
+    .await
+    .unwrap_or(0);
+
     let stats_row = sqlx::query!(
         r#"SELECT
             COUNT(*) as "total!",
@@ -390,6 +424,41 @@ async fn fetch_connection_pool(db: &DB) -> windmill_common::error::Result<Connec
     .fetch_one(db)
     .await?;
 
+    // Live Windmill worker fleet: each worker pings worker_ping every ~5s; a
+    // window of 30s tolerates a missed ping without counting dead workers.
+    // Agent workers (name prefix "ag-") talk to the API over HTTP and hold no
+    // postgres pool, so they're excluded from the connection estimate and only
+    // reported for context; regular DB-connected workers use the "wk-" prefix.
+    let db_worker_pattern = format!("{}-%", windmill_common::utils::WORKER_NAME_PREFIX);
+    let agent_worker_pattern = format!("{}-%", windmill_common::utils::AGENT_WORKER_NAME_PREFIX);
+    let fleet = sqlx::query!(
+        r#"SELECT
+            COUNT(*) FILTER (WHERE worker LIKE $1) as "live_workers!",
+            COUNT(DISTINCT worker_instance) FILTER (WHERE worker LIKE $1) as "live_instances!",
+            COUNT(*) FILTER (WHERE worker LIKE $2) as "live_agent_workers!"
+        FROM worker_ping
+        WHERE ping_at > now() - interval '30 seconds'"#,
+        db_worker_pattern,
+        agent_worker_pattern,
+    )
+    .fetch_one(db)
+    .await?;
+
+    // Matches how db_connect.rs reads it: when DATABASE_CONNECTIONS is set it caps
+    // every process's pool (server, indexer, worker) regardless of worker count.
+    let database_connections_override = std::env::var("DATABASE_CONNECTIONS")
+        .ok()
+        .and_then(|n| n.parse::<i64>().ok())
+        .filter(|n| *n > 0);
+
+    let sizing = compute_connection_sizing(
+        fleet.live_workers,
+        fleet.live_instances,
+        fleet.live_agent_workers,
+        reserved,
+        database_connections_override,
+    );
+
     let pg_max = max_row;
     let pg_total = stats_row.total;
     let pg_active = stats_row.active;
@@ -438,11 +507,105 @@ async fn fetch_connection_pool(db: &DB) -> windmill_common::error::Result<Connec
         pg_total_connections: pg_total,
         pg_active_connections: pg_active,
         pg_idle_connections: pg_idle,
+        pg_superuser_reserved_connections: reserved,
         status,
         message,
+        sizing,
     })
 }
 
+/// Estimate how many postgres connections the live Windmill fleet can open and
+/// derive a recommended `max_connections` floor.
+///
+/// Pool sizing mirrors `db_connect.rs`: when `DATABASE_CONNECTIONS` is set it
+/// caps *every* process's pool (server, indexer, worker) at that value, so each
+/// worker instance opens up to that many connections. Otherwise each worker
+/// instance shares a pool of `DEFAULT_MAX_CONNECTIONS_WORKER + (workers - 1)`
+/// (fleet ceiling `(worker_pool - 1) * instances + workers`) and each server
+/// opens up to `DEFAULT_MAX_CONNECTIONS_SERVER`.
+///
+/// `database_connections_override` is this server's `DATABASE_CONNECTIONS`, our
+/// best proxy for the fleet's config. Servers do not ping `worker_ping`, so we
+/// can't count them — the recommendation assumes one server and exposes the
+/// per-server increment so the operator can add capacity for the rest.
+///
+/// `live_agent_workers` is reported for context only: agent workers reach the
+/// API over HTTP and open no postgres connections, so they never contribute to
+/// the estimate.
+fn compute_connection_sizing(
+    live_workers: i64,
+    live_instances: i64,
+    live_agent_workers: i64,
+    reserved: i64,
+    database_connections_override: Option<i64>,
+) -> ConnectionSizingInfo {
+    // Never recommend below this floor: postgres defaults to 100 and headroom
+    // for growth/bursts/psql is cheap, so 200 is a safe baseline for any fleet.
+    const MIN_RECOMMENDED_MAX_CONNECTIONS: i64 = 200;
+
+    let default_server_pool = windmill_common::DEFAULT_MAX_CONNECTIONS_SERVER as i64;
+    let default_worker_pool = windmill_common::DEFAULT_MAX_CONNECTIONS_WORKER as i64;
+
+    let (server_pool, worker_pool_size, estimated_worker_connections) =
+        match database_connections_override {
+            // Override caps every process identically; per-instance pool is the override.
+            Some(n) => (n, n, n * live_instances),
+            None => (
+                default_server_pool,
+                default_worker_pool,
+                (default_worker_pool - 1) * live_instances + live_workers,
+            ),
+        };
+
+    // Workers + one server, plus 20% headroom and the superuser reserve, so the
+    // recommendation leaves room for psql/monitoring sessions and bursts, then
+    // floored at MIN_RECOMMENDED_MAX_CONNECTIONS.
+    let base = estimated_worker_connections + server_pool;
+    let recommended = ((((base as f64) * 1.20).ceil() as i64) + reserved.max(3))
+        .max(MIN_RECOMMENDED_MAX_CONNECTIONS);
+
+    let pool_source = if database_connections_override.is_some() {
+        format!("DATABASE_CONNECTIONS={server_pool}")
+    } else {
+        "defaults, configurable via DATABASE_CONNECTIONS".to_string()
+    };
+
+    let message = if live_instances == 0 {
+        format!(
+            "No live workers detected. Each Windmill server and worker instance opens up to {server_pool} connections ({pool_source}). Size max_connections as (servers + worker instances) × {server_pool} + ~20% headroom, and at least {MIN_RECOMMENDED_MAX_CONNECTIONS}."
+        )
+    } else {
+        let per_instance = if database_connections_override.is_some() {
+            format!("each instance up to {worker_pool_size}")
+        } else {
+            format!("each instance up to {worker_pool_size}, +1 per extra worker")
+        };
+        let agent_note = if live_agent_workers > 0 {
+            format!(
+                " ({live_agent_workers} agent worker(s) excluded — they use HTTP, not postgres connections.)"
+            )
+        } else {
+            String::new()
+        };
+        format!(
+            "{live_workers} live worker(s) across {live_instances} instance(s) can open up to ~{estimated_worker_connections} connections ({per_instance}; {pool_source}). Each Windmill server adds up to {server_pool}. Recommended max_connections ≥ {recommended} for a single server; add {server_pool} per additional server.{agent_note}"
+        )
+    };
+
+    ConnectionSizingInfo {
+        live_worker_instances: live_instances,
+        live_workers,
+        live_agent_workers,
+        server_pool_size: server_pool,
+        worker_pool_size,
+        database_connections_override,
+        estimated_worker_connections,
+        recommended_max_connections: recommended,
+        per_server_increment: server_pool,
+        message,
+    }
+}
+
 async fn fetch_table_maintenance(
     db: &DB,
 ) -> windmill_common::error::Result<Vec<TableMaintenanceInfo>> {
@@ -638,3 +801,91 @@ async fn fetch_datatables(db: &DB) -> windmill_common::error::Result<Vec<Datatab
     result.sort_by(|a, b| b.size_bytes.cmp(&a.size_bytes));
     Ok(result)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::compute_connection_sizing;
+
+    #[test]
+    fn no_workers_reports_defaults_and_floors_at_200() {
+        let s = compute_connection_sizing(0, 0, 0, 3, None);
+        assert_eq!(s.live_workers, 0);
+        assert_eq!(s.live_worker_instances, 0);
+        assert_eq!(s.live_agent_workers, 0);
+        assert_eq!(s.estimated_worker_connections, 0);
+        assert_eq!(s.server_pool_size, 50);
+        assert_eq!(s.worker_pool_size, 5);
+        assert_eq!(s.database_connections_override, None);
+        assert_eq!(s.per_server_increment, 50);
+        // ceil((0 + 50) * 1.20) + 3 = 63, floored up to 200.
+        assert_eq!(s.recommended_max_connections, 200);
+        assert!(s.message.contains("No live workers"));
+    }
+
+    #[test]
+    fn single_worker_single_instance_floors_at_200() {
+        let s = compute_connection_sizing(1, 1, 0, 3, None);
+        // (5 - 1) * 1 instance + 1 worker = 5
+        assert_eq!(s.estimated_worker_connections, 5);
+        // ceil((5 + 50) * 1.20) + 3 = 66 + 3 = 69, floored up to 200.
+        assert_eq!(s.recommended_max_connections, 200);
+    }
+
+    #[test]
+    fn multi_worker_instances_sum_per_instance_pools() {
+        // Two instances, 5 workers total: pools are (4 + w_i) summed = 4*2 + 5 = 13.
+        let s = compute_connection_sizing(5, 2, 0, 3, None);
+        assert_eq!(s.estimated_worker_connections, 13);
+    }
+
+    #[test]
+    fn large_fleet_exceeds_floor_with_margin_and_reserve() {
+        // 300 workers across 10 instances: (5-1)*10 + 300 = 340 worker connections.
+        let s = compute_connection_sizing(300, 10, 0, 3, None);
+        assert_eq!(s.estimated_worker_connections, 340);
+        // ceil((340 + 50) * 1.20) + 3 = ceil(468.0) + 3 = 471, above the 200 floor.
+        assert_eq!(s.recommended_max_connections, 471);
+    }
+
+    #[test]
+    fn reserved_above_default_widens_recommendation() {
+        // Big enough fleet that the floor doesn't mask the reserved contribution.
+        let base = compute_connection_sizing(300, 10, 0, 3, None);
+        let high = compute_connection_sizing(300, 10, 0, 20, None);
+        assert_eq!(
+            high.recommended_max_connections - base.recommended_max_connections,
+            17
+        );
+    }
+
+    #[test]
+    fn database_connections_override_caps_every_process() {
+        // DATABASE_CONNECTIONS=100 means each instance opens up to 100, not the
+        // default 5-based estimate. 5 instances -> 500 worker connections.
+        let s = compute_connection_sizing(20, 5, 0, 3, Some(100));
+        assert_eq!(s.server_pool_size, 100);
+        assert_eq!(s.worker_pool_size, 100);
+        assert_eq!(s.database_connections_override, Some(100));
+        assert_eq!(s.estimated_worker_connections, 500);
+        assert_eq!(s.per_server_increment, 100);
+        // ceil((500 + 100) * 1.20) + 3 = 720 + 3 = 723.
+        assert_eq!(s.recommended_max_connections, 723);
+        assert!(s.message.contains("DATABASE_CONNECTIONS=100"));
+    }
+
+    #[test]
+    fn agent_workers_are_excluded_from_the_estimate() {
+        // 50 agent workers alongside 2 DB workers/2 instances: only the DB
+        // workers count toward connections; the agent count is reported.
+        let s = compute_connection_sizing(2, 2, 50, 3, None);
+        assert_eq!(s.live_agent_workers, 50);
+        // (5 - 1) * 2 + 2 = 10, agent workers contribute nothing.
+        assert_eq!(s.estimated_worker_connections, 10);
+        let without_agents = compute_connection_sizing(2, 2, 0, 3, None);
+        assert_eq!(
+            s.recommended_max_connections,
+            without_agents.recommended_max_connections
+        );
+        assert!(s.message.contains("50 agent worker(s) excluded"));
+    }
+}
diff --git a/backend/windmill-api/src/docs/corpus.rs b/backend/windmill-api/src/docs/corpus.rs
new file mode 100644
index 0000000000..a797879cfe
--- /dev/null
+++ b/backend/windmill-api/src/docs/corpus.rs
@@ -0,0 +1,86 @@
+//! The vendored documentation snapshot, embedded into the binary and parsed once.
+//!
+//! `docs_snapshot/*.gz` are refreshed by `docs_snapshot/fetch.sh`. Embedding them
+//! lets docs search work with no runtime egress (including air-gapped instances).
+
+use std::io::Read;
+use std::sync::OnceLock;
+
+use flate2::read::GzDecoder;
+
+use super::search::{
+    canonical_docs_page_url, canonical_search_url, parse_docs_full_text, parse_docs_index,
+    DocsFullPage, DocsIndexEntry,
+};
+
+const LLMS_FULL_GZ: &[u8] =
+    include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/docs_snapshot/llms-full.txt.gz"));
+const LLMS_INDEX_GZ: &[u8] =
+    include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/docs_snapshot/llms.txt.gz"));
+
+pub struct DocsCorpus {
+    /// Every docs page, keyed by its `Source:` URL (from llms-full.txt).
+    pub pages: Vec<DocsFullPage>,
+    /// The curated page index with one-line descriptions (from llms.txt).
+    pub index: Vec<DocsIndexEntry>,
+}
+
+impl DocsCorpus {
+    /// Finds the page whose `Source:` URL matches a model/CLI-supplied path or URL
+    /// after canonicalization (origin re-anchored, `.md` and ordering prefixes
+    /// stripped).
+    pub fn find_page(&self, path: &str) -> Option<&DocsFullPage> {
+        let key = canonical_search_url(&canonical_docs_page_url(path));
+        self.pages.iter().find(|p| canonical_search_url(&p.url) == key)
+    }
+}
+
+static CORPUS: OnceLock<DocsCorpus> = OnceLock::new();
+
+fn decompress(bytes: &[u8]) -> String {
+    let mut out = String::new();
+    if let Err(e) = GzDecoder::new(bytes).read_to_string(&mut out) {
+        // The embedded snapshot is valid gzip text; a decode failure is a
+        // build-time packaging error, so failing closed to an empty corpus
+        // (docs search returns "no matches") is acceptable.
+        tracing::error!("failed to decompress embedded docs snapshot: {e}");
+        return String::new();
+    }
+    out
+}
+
+/// Returns the parsed docs corpus, decompressing and parsing the embedded
+/// snapshot once on first access.
+pub fn corpus() -> &'static DocsCorpus {
+    CORPUS.get_or_init(|| {
+        let pages = parse_docs_full_text(&decompress(LLMS_FULL_GZ));
+        let index = parse_docs_index(&decompress(LLMS_INDEX_GZ));
+        DocsCorpus { pages, index }
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn embedded_corpus_parses_to_non_empty() {
+        let corpus = corpus();
+        assert!(corpus.pages.len() > 50, "expected many pages, got {}", corpus.pages.len());
+        assert!(corpus.index.len() > 50, "expected many index entries, got {}", corpus.index.len());
+        assert!(corpus
+            .pages
+            .iter()
+            .all(|p| p.url.starts_with("https://www.windmill.dev/docs/") && !p.body.is_empty()));
+    }
+
+    #[test]
+    fn find_page_matches_by_canonical_url() {
+        let corpus = corpus();
+        // A page that is expected to exist in the published docs.
+        let by_path = corpus.find_page("/docs/core_concepts/worker_groups");
+        let by_url = corpus.find_page("https://www.windmill.dev/docs/core_concepts/worker_groups.md");
+        assert!(by_path.is_some());
+        assert_eq!(by_path.map(|p| &p.url), by_url.map(|p| &p.url));
+    }
+}
diff --git a/backend/windmill-api/src/docs/mod.rs b/backend/windmill-api/src/docs/mod.rs
new file mode 100644
index 0000000000..cd903e593f
--- /dev/null
+++ b/backend/windmill-api/src/docs/mod.rs
@@ -0,0 +1,124 @@
+//! Self-hosted documentation search.
+//!
+//! The backend embeds a vendored docs snapshot (see [`corpus`]) and exposes two
+//! read-only endpoints over it, so docs search works with no runtime egress:
+//!   - `GET /api/docs/search?query=...`  — full-text + index search
+//!   - `GET /api/docs/page?url=...&section=...` — read one page (or a section)
+//!
+//! These back the AI chat `search_docs`/`read_docs_page` tools, the MCP
+//! `searchDocs`/`readDocsPage` tools, and the `wmill docs` CLI. The routes are
+//! nested behind the global authed service in `lib.rs`, so a valid token is
+//! required but no workspace.
+
+mod corpus;
+mod search;
+
+use axum::{extract::Query, routing::get, Json, Router};
+use serde::{Deserialize, Serialize};
+use windmill_common::error::JsonResult;
+
+use search::DocsSearchResult;
+
+pub fn global_service() -> Router {
+    Router::new()
+        .route("/search", get(search_docs))
+        .route("/page", get(read_docs_page))
+}
+
+#[derive(Deserialize)]
+struct SearchQuery {
+    query: String,
+}
+
+#[derive(Serialize)]
+struct SearchResponse {
+    /// Model-ready rendering of the results (the exact string the AI/MCP tool
+    /// returns). Built once here so every consumer is identical.
+    text: String,
+    /// Structured results for non-AI consumers (e.g. the CLI's pretty/`--json`).
+    results: Vec<DocsSearchResult>,
+}
+
+#[derive(Deserialize)]
+struct PageQuery {
+    /// A page's `Source` URL (as returned by the docs search tool); a bare `/docs/...`
+    /// path is also accepted and canonicalized before lookup.
+    url: String,
+    section: Option<String>,
+}
+
+#[derive(Serialize)]
+struct PageResponse {
+    text: String,
+    source_url: String,
+}
+
+async fn search_docs(Query(q): Query<SearchQuery>) -> JsonResult<SearchResponse> {
+    let query = q.query.trim().to_string();
+    if query.is_empty() {
+        return Ok(Json(SearchResponse {
+            text: "No search query was provided. Provide a `query` of one or more keywords."
+                .to_string(),
+            results: Vec::new(),
+        }));
+    }
+
+    // Lazy corpus init (gzip decompress + parse) and the per-query full-corpus scan
+    // are CPU-bound; keep them off the async runtime.
+    let (text, results) = tokio::task::spawn_blocking(move || {
+        let corpus = corpus::corpus();
+        // Body grep first (concrete content hits), then index titles/descriptions to
+        // surface named features body grep misses; merge dedupes by canonical URL.
+        let body = search::search_docs_pages(&corpus.pages, &query, 5);
+        let index = search::search_docs_index(&corpus.index, &query, 4);
+        let results = search::merge_docs_search_results(body, index, search::SEARCH_MAX_PAGES);
+        let text = search::format_docs_search_results(&query, &results);
+        (text, results)
+    })
+    .await
+    .map_err(|e| windmill_common::error::Error::InternalErr(format!("docs search task: {e}")))?;
+
+    Ok(Json(SearchResponse { text, results }))
+}
+
+async fn read_docs_page(Query(q): Query<PageQuery>) -> JsonResult<PageResponse> {
+    let url = q.url.trim();
+    if url.is_empty() {
+        return Ok(Json(PageResponse {
+            text: "No documentation page URL was provided. Provide a `url` — e.g. a `Source` URL returned by the docs search tool.".to_string(),
+            source_url: String::new(),
+        }));
+    }
+
+    let url = url.to_string();
+    let section = q.section.filter(|s| !s.trim().is_empty());
+
+    // Corpus init + page sanitize/render are CPU-bound; keep them off the runtime.
+    let resp = tokio::task::spawn_blocking(move || {
+        let corpus = corpus::corpus();
+        match corpus.find_page(&url) {
+            Some(page) => {
+                // Rewrite docusaurus source-file links to canonical published URLs
+                // so the model never echoes a broken `.mdx` path.
+                let sanitized = search::sanitize_docs_markdown_links(&page.body, &page.url);
+                let rendered = search::render_docs_page_result(&sanitized, section.as_deref());
+                let text = format!(
+                    "Source page — cite this URL when referencing this page: {}\n\n{}",
+                    page.url, rendered
+                );
+                PageResponse { text, source_url: page.url.clone() }
+            }
+            None => PageResponse {
+                text: format!(
+                    "No documentation page found for \"{}\". Use the docs search tool to find the correct Source URL first.",
+                    url
+                ),
+                source_url: search::canonical_docs_page_url(&url),
+            },
+        }
+    })
+    .await
+    .map_err(|e| windmill_common::error::Error::InternalErr(format!("docs page task: {e}")))?;
+
+    Ok(Json(resp))
+}
diff --git a/backend/windmill-api/src/docs/search.rs b/backend/windmill-api/src/docs/search.rs
new file mode 100644
index 0000000000..733558ceb4
--- /dev/null
+++ b/backend/windmill-api/src/docs/search.rs
@@ -0,0 +1,729 @@
+//! Documentation search & page rendering.
+//!
+//! Direct port of the pure functions in the frontend's
+//! `copilot/chat/docs/core.ts`, so the AI chat, the MCP `searchDocs`/`readDocsPage`
+//! tools and the `wmill docs` CLI all return identical results from one place.
+//! Operates over the vendored corpus parsed in [`super::corpus`].
+
+use lazy_static::lazy_static;
+use regex::Regex;
+use serde::Serialize;
+use std::collections::HashSet;
+
+pub const DOCS_ORIGIN: &str = "https://www.windmill.dev";
+
+// Above this size, return an outline of the page's headings instead of the full
+// content, prompting the model to request a specific section.
+const FULL_PAGE_CHAR_LIMIT: usize = 20_000;
+
+// search result caps — keep the returned payload small (the whole point of search
+// vs. dumping the index or full pages is token economy).
+pub const SEARCH_MAX_PAGES: usize = 8;
+const SEARCH_MAX_SNIPPETS_PER_PAGE: usize = 3;
+const SEARCH_MAX_SNIPPET_CHARS: usize = 200;
+// Each distinct query term triggers a full-corpus scan; cap it so a long,
+// caller-controlled query can't multiply the scan cost without bound. Real
+// queries are a handful of keywords, so this never truncates a useful search.
+const MAX_QUERY_TERMS: usize = 24;
+
+// ---------------------------------------------------------------------------
+// Corpus record types
+// ---------------------------------------------------------------------------
+
+/// A single page extracted from llms-full.txt, keyed by its `Source:` URL.
+pub struct DocsFullPage {
+    pub url: String,
+    pub title: String,
+    pub body: String,
+    /// `body` lowercased once at parse time, so the per-query full-corpus scan
+    /// doesn't re-allocate a lowercase copy of every page on each request.
+    pub body_lower: String,
+}
+
+/// A line of the llms.txt index: title, URL and one-line description.
+pub struct DocsIndexEntry {
+    pub title: String,
+    pub url: String,
+    pub description: String,
+    /// `title`/`description` lowercased once at parse time (same rationale as
+    /// `DocsFullPage::body_lower`).
+    pub title_lower: String,
+    pub description_lower: String,
+}
+
+#[derive(Serialize, Clone)]
+pub struct DocsSearchResult {
+    pub url: String,
+    pub title: String,
+    /// Higher = more relevant. Distinct query terms matched dominate raw occurrences.
+    pub score: i64,
+    pub snippets: Vec<String>,
+}
+
+// ---------------------------------------------------------------------------
+// Corpus parsing
+// ---------------------------------------------------------------------------
+
+lazy_static! {
+    // In llms-full.txt every page's `Source:` line is preceded by a category-header
+    // lead-in: `...page body...\n\n---\n\n## <Category>\n\nSource: <url>`. Splitting
+    // on `Source:` lines leaves that lead-in on the *previous* page, so strip a
+    // trailing `---` + level-2-heading block to avoid mis-attributing the next
+    // page's category title to the previous page.
+    static ref TRAILING_LEAD_IN_RE: Regex =
+        Regex::new(r"\n+-{3,}[ \t]*\n+#{2}[ \t]+.*[ \t]*\n*$").unwrap();
+    // A line in llms.txt: `- [Title](https://.../page.md): question-phrased description`.
+    static ref INDEX_ENTRY_RE: Regex =
+        Regex::new(r"^\s*-\s*\[([^\]]+)\]\(([^)\s]+)\)\s*:?\s*(.*)$").unwrap();
+    static ref ORDERING_PREFIX_RE: Regex = Regex::new(r"^\d+[_-]").unwrap();
+    // Markdown inline link `](target "optional title")`.
+    static ref MD_LINK_RE: Regex = Regex::new(r#"\]\(([^)\s]+?)(\s+"[^"]*")?\)"#).unwrap();
+}
+
+/// `^Source:\s*(\S+)\s*$` — returns the single non-whitespace URL token.
+fn parse_source_line(line: &str) -> Option<&str> {
+    let rest = line.strip_prefix("Source:")?;
+    let trimmed = rest.trim();
+    if trimmed.is_empty() || trimmed.contains(char::is_whitespace) {
+        return None;
+    }
+    Some(trimmed)
+}
+
+/// Splits the llms-full.txt corpus into per-page records keyed by the `Source:`
+/// URL. Content before the first `Source:` line (the corpus preamble) is dropped.
+pub fn parse_docs_full_text(full_text: &str) -> Vec<DocsFullPage> {
+    let mut pages = Vec::new();
+    let mut url: Option<String> = None;
+    let mut buffer: Vec<&str> = Vec::new();
+
+    for line in full_text.split('\n') {
+        if let Some(u) = parse_source_line(line) {
+            flush_page(&mut pages, &url, &buffer);
+            url = Some(u.to_string());
+            buffer.clear();
+            continue;
+        }
+        if url.is_some() {
+            buffer.push(line);
+        }
+    }
+    flush_page(&mut pages, &url, &buffer);
+    pages
+}
+
+fn flush_page(pages: &mut Vec<DocsFullPage>, url: &Option<String>, buffer: &[&str]) {
+    let Some(url) = url else {
+        return;
+    };
+    let joined = buffer.join("\n");
+    let body = TRAILING_LEAD_IN_RE.replace(&joined, "");
+    let body = body.trim();
+    if !body.is_empty() {
+        let title = first_heading(body).unwrap_or_else(|| url.clone());
+        let body = body.to_string();
+        let body_lower = body.to_lowercase();
+        pages.push(DocsFullPage { url: url.clone(), title, body, body_lower });
+    }
+}
+
+fn first_heading(body: &str) -> Option<String> {
+    for line in body.split('\n') {
+        if let Some((_, title)) = parse_heading_line(line, 6) {
+            return Some(title);
+        }
+    }
+    None
+}
+
+/// Parses the llms.txt index into per-page entries (title, URL, description).
+pub fn parse_docs_index(index_text: &str) -> Vec<DocsIndexEntry> {
+    let mut entries = Vec::new();
+    for line in index_text.split('\n') {
+        if let Some(caps) = INDEX_ENTRY_RE.captures(line) {
+            let url = caps[2].trim();
+            if !url.contains("/docs/") {
+                continue;
+            }
+            let title = caps[1].trim().to_string();
+            let description = caps[3].trim().to_string();
+            entries.push(DocsIndexEntry {
+                title_lower: title.to_lowercase(),
+                description_lower: description.to_lowercase(),
+                title,
+                url: url.to_string(),
+                description,
+            });
+        }
+    }
+    entries
+}
+
+// ---------------------------------------------------------------------------
+// Headings, outline, section extraction
+// ---------------------------------------------------------------------------
+
+pub struct DocsHeading {
+    pub level: usize,
+    pub title: String,
+    /// Byte offset of the start of the heading line within the document.
+    pub start_index: usize,
+}
+
+/// `^(#{1,max_level})\s+(.*\S)\s*$` — heading level and trimmed title.
+fn parse_heading_line(line: &str, max_level: usize) -> Option<(usize, String)> {
+    let hashes = line.bytes().take_while(|&b| b == b'#').count();
+    if hashes < 1 || hashes > max_level {
+        return None;
+    }
+    let rest = &line[hashes..];
+    // require at least one whitespace after the hashes (\s+)
+    if !rest.starts_with(|c: char| c.is_whitespace()) {
+        return None;
+    }
+    let title = rest.trim();
+    if title.is_empty() {
+        return None;
+    }
+    Some((hashes, title.to_string()))
+}
+
+fn match_fence(line: &str) -> Option<String> {
+    let trimmed = line.trim_start();
+    let first = trimmed.chars().next()?;
+    if first != '`' && first != '~' {
+        return None;
+    }
+    let count = trimmed.chars().take_while(|&c| c == first).count();
+    if count >= 3 {
+        Some(std::iter::repeat(first).take(count).collect())
+    } else {
+        None
+    }
+}
+
+/// Parses the markdown headings (`#`–`####`) of a docs page, ignoring any
+/// heading-like lines inside fenced code blocks (which are common in samples).
+pub fn parse_docs_headings(content: &str) -> Vec<DocsHeading> {
+    let mut headings = Vec::new();
+    let mut offset = 0usize;
+    let mut fence_marker: Option<String> = None;
+
+    for line in content.split('\n') {
+        if let Some(fence) = match_fence(line) {
+            match &fence_marker {
+                None => fence_marker = Some(fence),
+                Some(marker) if line.trim_start().starts_with(marker.as_str()) => {
+                    fence_marker = None;
+                }
+                _ => {}
+            }
+            offset += line.len() + 1;
+            continue;
+        }
+
+        if fence_marker.is_none() {
+            if let Some((level, title)) = parse_heading_line(line, 4) {
+                headings.push(DocsHeading { level, title, start_index: offset });
+            }
+        }
+        offset += line.len() + 1;
+    }
+    headings
+}
+
+fn section_end_index(content: &str, headings: &[DocsHeading], index: usize) -> usize {
+    let level = headings[index].level;
+    // A section ends at the next heading of the same or higher (shallower) level.
+    for h in &headings[index + 1..] {
+        if h.level <= level {
+            return h.start_index;
+        }
+    }
+    content.len()
+}
+
+/// Builds a human-readable outline of a page's headings, with an approximate
+/// size for each section. Used when a page is too large to return whole.
+pub fn build_docs_outline(content: &str) -> String {
+    let headings = parse_docs_headings(content);
+    if headings.is_empty() {
+        return "(no markdown headings found on this page)".to_string();
+    }
+    headings
+        .iter()
+        .enumerate()
+        .map(|(i, h)| {
+            let end = section_end_index(content, &headings, i);
+            let approx = end.saturating_sub(h.start_index);
+            let indent = "  ".repeat(h.level.saturating_sub(1));
+            format!("{}- {} (~{} chars)", indent, h.title, approx)
+        })
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
+/// Normalizes a heading title for tolerant, case/punctuation-insensitive matching.
+fn normalize_heading_title(title: &str) -> String {
+    // toLowerCase, replace /[^a-z0-9]+/g with ' ', trim
+    let mut out = String::new();
+    let mut prev_space = false;
+    for ch in title.to_lowercase().chars() {
+        if ch.is_ascii_alphanumeric() {
+            out.push(ch);
+            prev_space = false;
+        } else if !prev_space {
+            out.push(' ');
+            prev_space = true;
+        }
+    }
+    out.trim().to_string()
+}
+
+/// Extracts the content of the section whose heading matches `section` (from the
+/// heading up to the next heading of the same/higher level). Case-insensitive and
+/// tolerant of minor punctuation differences. `None` when no heading matches.
+pub fn extract_docs_section(content: &str, section: &str) -> Option<String> {
+    let headings = parse_docs_headings(content);
+    let target = normalize_heading_title(section);
+    if target.is_empty() {
+        return None;
+    }
+    let match_index = headings
+        .iter()
+        .position(|h| normalize_heading_title(&h.title) == target)
+        .or_else(|| {
+            // Fall back to a contains match so "Result streaming" matches "Result".
+            headings
+                .iter()
+                .position(|h| normalize_heading_title(&h.title).contains(&target))
+        })?;
+
+    let start = headings[match_index].start_index;
+    let end = section_end_index(content, &headings, match_index);
+    Some(content[start..end].trim().to_string())
+}
+
+/// Decides what to return for read_docs_page: a requested section, the full page,
+/// or an outline asking the model to pick a section.
+pub fn render_docs_page_result(content: &str, section: Option<&str>) -> String {
+    if let Some(section) = section {
+        if let Some(extracted) = extract_docs_section(content, section) {
+            return extracted;
+        }
+        return format!(
+            "No section matching \"{}\" was found on this page. Available sections:\n\n{}",
+            section,
+            build_docs_outline(content)
+        );
+    }
+
+    if content.len() <= FULL_PAGE_CHAR_LIMIT {
+        return content.to_string();
+    }
+
+    format!(
+        "This documentation page is large. Below is its list of sections with approximate sizes.\n\
+         Call the docs page-reading tool again with the same `url` argument and a `section` set to one of these headings to read that section.\n\n{}",
+        build_docs_outline(content)
+    )
+}
+
+// ---------------------------------------------------------------------------
+// Ranking
+// ---------------------------------------------------------------------------
+
+/// Splits a query into distinct, lowercased, non-empty terms (insertion order),
+/// capped at `MAX_QUERY_TERMS`.
+fn tokenize_query(query: &str) -> Vec<String> {
+    let mut seen = HashSet::new();
+    let mut out = Vec::new();
+    for term in query.to_lowercase().split_whitespace() {
+        if seen.insert(term.to_string()) {
+            out.push(term.to_string());
+            if out.len() >= MAX_QUERY_TERMS {
+                break;
+            }
+        }
+    }
+    out
+}
+
+fn count_occurrences(haystack: &str, needle: &str) -> usize {
+    if needle.is_empty() {
+        return 0;
+    }
+    haystack.matches(needle).count()
+}
+
+struct Scored {
+    res: DocsSearchResult,
+    distinct_terms: usize,
+    order: usize,
+}
+
+/// Prefer pages that cover every query term; sort by score desc then input order;
+/// take the top `max_pages`.
+fn finalize_pool(mut scored: Vec<Scored>, term_count: usize, max_pages: usize) -> Vec<DocsSearchResult> {
+    let has_full = scored.iter().any(|s| s.distinct_terms == term_count);
+    if has_full {
+        scored.retain(|s| s.distinct_terms == term_count);
+    }
+    scored.sort_by(|a, b| b.res.score.cmp(&a.res.score).then(a.order.cmp(&b.order)));
+    scored.into_iter().take(max_pages).map(|s| s.res).collect()
+}
+
+/// Ranks docs pages for a keyword query. Score is `distinctTermsMatched`
+/// (dominant) then total occurrences. Each result carries up to
+/// `SEARCH_MAX_SNIPPETS_PER_PAGE` of its most term-dense lines.
+pub fn search_docs_pages(pages: &[DocsFullPage], query: &str, max_pages: usize) -> Vec<DocsSearchResult> {
+    let terms = tokenize_query(query);
+    if terms.is_empty() {
+        return Vec::new();
+    }
+
+    let mut scored = Vec::new();
+    for (order, page) in pages.iter().enumerate() {
+        let mut distinct = 0usize;
+        let mut occurrences = 0usize;
+        for term in &terms {
+            let count = count_occurrences(&page.body_lower, term);
+            if count > 0 {
+                distinct += 1;
+                occurrences += count;
+            }
+        }
+        if distinct == 0 {
+            continue;
+        }
+        scored.push(Scored {
+            res: DocsSearchResult {
+                url: page.url.clone(),
+                title: page.title.clone(),
+                // distinctTerms dominates so a page matching all terms always
+                // outranks one matching fewer, regardless of raw occurrences.
+                score: distinct as i64 * 1_000_000 + occurrences as i64,
+                snippets: select_snippets(
+                    &page.body,
+                    &terms,
+                    SEARCH_MAX_SNIPPETS_PER_PAGE,
+                    SEARCH_MAX_SNIPPET_CHARS,
+                ),
+            },
+            distinct_terms: distinct,
+            order,
+        });
+    }
+    finalize_pool(scored, terms.len(), max_pages)
+}
+
+/// Ranks index entries by matching query terms against each entry's title and
+/// description (title matches weigh more). The description becomes the result's
+/// single snippet. Recovers "named feature" discovery that full-text grep misses.
+pub fn search_docs_index(entries: &[DocsIndexEntry], query: &str, max_pages: usize) -> Vec<DocsSearchResult> {
+    let terms = tokenize_query(query);
+    if terms.is_empty() {
+        return Vec::new();
+    }
+
+    let mut scored = Vec::new();
+    for (order, entry) in entries.iter().enumerate() {
+        let mut distinct = 0usize;
+        let mut score = 0i64;
+        for term in &terms {
+            let in_title = entry.title_lower.contains(term.as_str());
+            let in_desc = entry.description_lower.contains(term.as_str());
+            if in_title || in_desc {
+                distinct += 1;
+                score += if in_title { 5 } else { 0 } + if in_desc { 1 } else { 0 };
+            }
+        }
+        if distinct == 0 {
+            continue;
+        }
+        scored.push(Scored {
+            res: DocsSearchResult {
+                url: entry.url.clone(),
+                title: entry.title.clone(),
+                score: distinct as i64 * 1_000_000 + score,
+                snippets: if entry.description.is_empty() {
+                    Vec::new()
+                } else {
+                    vec![entry.description.clone()]
+                },
+            },
+            distinct_terms: distinct,
+            order,
+        });
+    }
+    finalize_pool(scored, terms.len(), max_pages)
+}
+
+/// Picks the most term-dense lines of a page body as snippets, in document order,
+/// deduped, each trimmed to `max_chars` around the first matched term.
+fn select_snippets(body: &str, terms: &[String], max_snippets: usize, max_chars: usize) -> Vec<String> {
+    struct LineHit {
+        text: String,
+        distinct: usize,
+        order: usize,
+    }
+    let mut hits = Vec::new();
+    for (order, line) in body.split('\n').enumerate() {
+        let lower = line.to_lowercase();
+        let distinct = terms.iter().filter(|t| lower.contains(t.as_str())).count();
+        if distinct == 0 {
+            continue;
+        }
+        let text = make_snippet(line, terms, max_chars);
+        if !text.is_empty() {
+            hits.push(LineHit { text, distinct, order });
+        }
+    }
+    hits.sort_by(|a, b| b.distinct.cmp(&a.distinct).then(a.order.cmp(&b.order)));
+
+    let mut seen = HashSet::new();
+    let mut result = Vec::new();
+    for hit in hits {
+        if !seen.insert(hit.text.clone()) {
+            continue;
+        }
+        result.push(hit.text);
+        if result.len() >= max_snippets {
+            break;
+        }
+    }
+    result
+}
+
+/// Collapses a matched line to a single-line snippet of at most `max_chars`,
+/// windowed around the first matched term (with ellipses) when the line is long.
+/// Operates on `char`s so multibyte content can't split mid-codepoint.
+fn make_snippet(line: &str, terms: &[String], max_chars: usize) -> String {
+    let collapsed = line.split_whitespace().collect::<Vec<_>>().join(" ");
+    let chars: Vec<char> = collapsed.chars().collect();
+    if chars.len() <= max_chars {
+        return collapsed;
+    }
+
+    let lower = collapsed.to_lowercase();
+    let mut first_index: Option<usize> = None;
+    for term in terms {
+        if let Some(byte_idx) = lower.find(term.as_str()) {
+            let char_idx = lower[..byte_idx].chars().count();
+            first_index = Some(first_index.map_or(char_idx, |f| f.min(char_idx)));
+        }
+    }
+
+    let total = chars.len();
+    match first_index {
+        None => {
+            let slice: String = chars[..max_chars].iter().collect();
+            format!("{}…", slice.trim_end())
+        }
+        Some(fi) => {
+            let start = fi.saturating_sub(max_chars / 3);
+            let end = (start + max_chars).min(total);
+            let prefix = if start > 0 { "…" } else { "" };
+            let suffix = if end < total { "…" } else { "" };
+            let slice: String = chars[start..end].iter().collect();
+            format!("{}{}{}", prefix, slice.trim(), suffix)
+        }
+    }
+}
+
+/// Strips the `.md` suffix and trailing slash so index/body URLs dedupe.
+pub fn canonical_search_url(url: &str) -> String {
+    let stripped = strip_md_suffix(url);
+    stripped.strip_suffix('/').unwrap_or(stripped).to_string()
+}
+
+fn strip_md_suffix(s: &str) -> &str {
+    if s.len() >= 3 && s[s.len() - 3..].eq_ignore_ascii_case(".md") {
+        &s[..s.len() - 3]
+    } else {
+        s
+    }
+}
+
+/// Merges full-text (body) results with index-description results. Body matches
+/// come first; index-only matches fill remaining slots — so a named feature
+/// surfaced only by its index entry still appears even when body grep missed it.
+pub fn merge_docs_search_results(
+    body_results: Vec<DocsSearchResult>,
+    index_results: Vec<DocsSearchResult>,
+    max_pages: usize,
+) -> Vec<DocsSearchResult> {
+    let mut seen: HashSet<String> =
+        body_results.iter().map(|r| canonical_search_url(&r.url)).collect();
+    let mut merged = body_results;
+    for entry in index_results {
+        let key = canonical_search_url(&entry.url);
+        if seen.insert(key) {
+            merged.push(entry);
+        }
+    }
+    merged.truncate(max_pages);
+    merged
+}
+
+/// Renders search results as the string returned to the model.
+pub fn format_docs_search_results(query: &str, results: &[DocsSearchResult]) -> String {
+    if results.is_empty() {
+        return format!(
+            "No documentation pages matched \"{}\". Try fewer or more general keywords (a single distinctive term often works best).",
+            query
+        );
+    }
+
+    let blocks = results
+        .iter()
+        .map(|r| {
+            let mut lines = vec![format!("## {}", r.title), format!("Source: {}", r.url)];
+            for snippet in &r.snippets {
+                lines.push(format!("  - {}", snippet));
+            }
+            lines.join("\n")
+        })
+        .collect::<Vec<_>>()
+        .join("\n\n");
+
+    format!(
+        "Found {} documentation page(s) matching \"{}\", most relevant first:\n\n{}\n\n\
+         Cite the exact \"Source\" URL when referencing a page. If these snippets are not enough, call the docs page-reading tool with a Source URL as its `url` argument to read the full page or a section.",
+        results.len(),
+        query,
+        blocks
+    )
+}
+
+// ---------------------------------------------------------------------------
+// URL normalization & link sanitization
+// ---------------------------------------------------------------------------
+
+/// Strips docusaurus numeric ordering prefixes (`13_`, `8-`) from each path
+/// segment so it matches the published route.
+fn strip_docs_path_prefixes(path: &str) -> String {
+    path.split('/')
+        .map(|seg| ORDERING_PREFIX_RE.replace(seg, "").into_owned())
+        .collect::<Vec<_>>()
+        .join("/")
+}
+
+/// Normalizes a user/model-supplied docs reference to a fully-qualified `.md` URL
+/// on the docs origin. Accepts a full URL, `/docs/...`, or `docs/...`.
+pub fn normalize_docs_url(input: &str) -> String {
+    let mut value = input.trim().to_string();
+
+    if is_http_url(&value) {
+        // Strip the origin so we re-anchor to DOCS_ORIGIN and normalize the path.
+        if let Ok(parsed) = url::Url::parse(&value) {
+            value = parsed.path().to_string();
+        }
+    }
+
+    // Drop any query string or hash fragment.
+    value = value.split('#').next().unwrap().split('?').next().unwrap().to_string();
+
+    if !value.starts_with('/') {
+        value = format!("/{}", value);
+    }
+    // Strip a trailing slash (but keep the leading one).
+    if value.len() > 1 && value.ends_with('/') {
+        value.pop();
+    }
+
+    value = strip_docs_path_prefixes(&value);
+    if let Some(stripped) = value.strip_suffix(".mdx") {
+        value = format!("{}.md", stripped);
+    }
+    if !value.ends_with(".md") {
+        value = format!("{}.md", value);
+    }
+
+    format!("{}{}", DOCS_ORIGIN, value)
+}
+
+/// The canonical published URL a model should cite for a docs page (the `.md`
+/// fetch URL without the suffix).
+pub fn canonical_docs_page_url(path: &str) -> String {
+    strip_md_suffix(&normalize_docs_url(path)).to_string()
+}
+
+fn is_http_url(s: &str) -> bool {
+    let lower = s.to_ascii_lowercase();
+    lower.starts_with("http://") || lower.starts_with("https://")
+}
+
+/// Rewrites relative/source-file doc links inside raw page markdown to canonical
+/// published URLs, so the model never echoes a docusaurus source path into its
+/// answer as a broken link. Non-doc links (external, images, anchors) and `../`
+/// cross-directory links are left untouched.
+pub fn sanitize_docs_markdown_links(content: &str, page_url: &str) -> String {
+    let base = url::Url::parse(page_url).ok();
+    MD_LINK_RE
+        .replace_all(content, |caps: &regex::Captures| {
+            let whole = caps.get(0).unwrap().as_str();
+            let target = &caps[1];
+            let title = caps.get(2).map(|m| m.as_str()).unwrap_or("");
+
+            // Only rewrite links to docusaurus source files (.md/.mdx); leave
+            // images, external URLs and bare anchors untouched.
+            if !is_md_target(target) {
+                return whole.to_string();
+            }
+            // `../` cross-directory links are authored against the docusaurus
+            // source tree, whose depth differs from the published URL, so strict
+            // resolution is unreliable. Leave them for the canonical-URL header.
+            if has_parent_traversal(target) {
+                return whole.to_string();
+            }
+            let Some(base) = &base else {
+                return whole.to_string();
+            };
+            let Ok(resolved) = base.join(target) else {
+                return whole.to_string();
+            };
+            if resolved.scheme() != "https"
+                || resolved.host_str() != Some("www.windmill.dev")
+                || !resolved.path().starts_with("/docs/")
+            {
+                return whole.to_string();
+            }
+            let pathname = strip_docs_path_prefixes(resolved.path());
+            let pathname = strip_md_or_mdx(&pathname);
+            let hash = resolved.fragment().map(|f| format!("#{}", f)).unwrap_or_default();
+            format!("]({}{}{}{})", DOCS_ORIGIN, pathname, hash, title)
+        })
+        .into_owned()
+}
+
+/// `\.mdx?($|[#?])` — the target points at a markdown source file.
+fn is_md_target(target: &str) -> bool {
+    for marker in [".md", ".mdx"] {
+        if let Some(idx) = target.to_ascii_lowercase().find(marker) {
+            let after = &target[idx + marker.len()..];
+            // `.md` must not be a prefix of `.mdx` here: only accept when the
+            // extension is followed by end / `#` / `?`.
+            if after.is_empty() || after.starts_with('#') || after.starts_with('?') {
+                return true;
+            }
+        }
+    }
+    false
+}
+
+/// `(^|/)\.\./` — the target contains a parent-directory traversal segment.
+fn has_parent_traversal(target: &str) -> bool {
+    target == ".." || target.starts_with("../") || target.contains("/../")
+}
+
+fn strip_md_or_mdx(path: &str) -> &str {
+    if let Some(stripped) = path.strip_suffix(".mdx") {
+        stripped
+    } else {
+        strip_md_suffix(path)
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/backend/windmill-api/src/docs/search/tests.rs b/backend/windmill-api/src/docs/search/tests.rs
new file mode 100644
index 0000000000..84c422aa73
--- /dev/null
+++ b/backend/windmill-api/src/docs/search/tests.rs
@@ -0,0 +1,267 @@
+//! Parity tests ported from the frontend `copilot/chat/docs/core.test.ts`.
+
+use super::*;
+
+const SAMPLE: &str = "# Jobs\n\nIntro text about jobs.\n\n## Job kinds\n\nSome kinds.\n\n## Result\n\n### Result of jobs that failed\n\n```\n{ \"error\": \"boom\" }\n```\n\n### Result streaming\n\n#### Returning a stream directly\n\n```python\n# Returning a stream directly is a comment heading that must be ignored\ndef main():\n    pass\n```\n\n## Retention policy\n\nFinal section.\n";
+
+// Mirrors the llms-full.txt layout: a corpus preamble, then per-page blocks each
+// introduced by a `---` + `## <Category>` lead-in followed by a `Source:` line.
+const SAMPLE_FULL: &str = "# Windmill\n\n> Preamble blurb that precedes the first Source line and must be ignored.\n\n## Browser automation\n\nSource: https://www.windmill.dev/docs/advanced/browser_automation\n\n# Browser automation\n\nBy default, a worker group named `reports` handles jobs with the `chromium` tag.\nThe chromium binary will be available on these workers at /usr/bin/chromium.\nYou can disable the sandbox by passing the --no-sandbox flag.\n\n---\n\n## Worker groups\n\nSource: https://www.windmill.dev/docs/core_concepts/worker_groups\n\n# Worker groups\n\nWorker groups let you assign tags to workers.\nSet the chromium tag on a worker so it can run browser jobs.\n\n---\n\n## Scheduling\n\nSource: https://www.windmill.dev/docs/core_concepts/scheduling\n\n# Scheduling\n\nUse cron expressions to schedule scripts and flows.\n";
+
+#[test]
+fn parses_headings_and_ignores_fenced_blocks() {
+    let titles: Vec<String> = parse_docs_headings(SAMPLE)
+        .iter()
+        .map(|h| format!("{}:{}", h.level, h.title))
+        .collect();
+    assert_eq!(
+        titles,
+        vec![
+            "1:Jobs",
+            "2:Job kinds",
+            "2:Result",
+            "3:Result of jobs that failed",
+            "3:Result streaming",
+            "4:Returning a stream directly",
+            "2:Retention policy",
+        ]
+    );
+}
+
+#[test]
+fn heading_start_index_points_at_the_heading_line() {
+    for h in parse_docs_headings(SAMPLE) {
+        let at = &SAMPLE[h.start_index..];
+        assert!(at.starts_with(&"#".repeat(h.level)));
+        assert!(at[h.level..].trim_start().starts_with(&h.title));
+    }
+}
+
+#[test]
+fn handles_tilde_fences() {
+    let content = "# Title\n\n~~~\n# not a heading\n~~~\n\n## Real\n";
+    let titles: Vec<String> = parse_docs_headings(content).iter().map(|h| h.title.clone()).collect();
+    assert_eq!(titles, vec!["Title", "Real"]);
+}
+
+#[test]
+fn extracts_section_up_to_next_same_or_higher_heading() {
+    let section = extract_docs_section(SAMPLE, "Result").unwrap();
+    assert!(section.contains("## Result"));
+    assert!(section.contains("### Result of jobs that failed"));
+    assert!(section.contains("### Result streaming"));
+    assert!(!section.contains("## Retention policy"));
+}
+
+#[test]
+fn extract_section_is_case_and_punctuation_tolerant() {
+    let section = extract_docs_section(SAMPLE, "retention-policy!").unwrap();
+    assert!(section.contains("## Retention policy"));
+    assert!(section.contains("Final section."));
+}
+
+#[test]
+fn extract_section_returns_none_when_missing() {
+    assert!(extract_docs_section(SAMPLE, "Nonexistent section").is_none());
+}
+
+#[test]
+fn build_outline_lists_headings_with_indent() {
+    let outline = build_docs_outline(SAMPLE);
+    assert!(outline.contains("- Jobs (~"));
+    assert!(outline.contains("  - Job kinds (~"));
+    assert!(outline.contains("    - Result of jobs that failed (~"));
+}
+
+#[test]
+fn build_outline_handles_no_headings() {
+    assert_eq!(
+        build_docs_outline("just some text\nwith no headings"),
+        "(no markdown headings found on this page)"
+    );
+}
+
+#[test]
+fn render_page_returns_whole_small_page() {
+    assert_eq!(render_docs_page_result(SAMPLE, None), SAMPLE);
+}
+
+#[test]
+fn render_page_returns_outline_for_large_page() {
+    let large = format!("# Big\n\n{}\n\n## Tail\n\nmore", "x".repeat(25_000));
+    let result = render_docs_page_result(&large, None);
+    assert!(result.contains("This documentation page is large"));
+    assert!(result.contains("same `url` argument"));
+    assert!(!result.contains("same path"));
+    assert!(!result.contains("read_docs_page"));
+    assert!(result.contains("- Big (~"));
+    assert!(result.contains("- Tail (~"));
+}
+
+#[test]
+fn render_page_returns_requested_section() {
+    let result = render_docs_page_result(SAMPLE, Some("Job kinds"));
+    assert!(result.contains("## Job kinds"));
+    assert!(result.contains("Some kinds."));
+}
+
+#[test]
+fn render_page_missing_section_returns_outline_note() {
+    let result = render_docs_page_result(SAMPLE, Some("Does not exist"));
+    assert!(result.contains("No section matching \"Does not exist\" was found"));
+    assert!(result.contains("- Jobs (~"));
+}
+
+#[test]
+fn normalize_docs_url_cases() {
+    assert_eq!(normalize_docs_url("/docs/core_concepts/jobs"), "https://www.windmill.dev/docs/core_concepts/jobs.md");
+    assert_eq!(normalize_docs_url("docs/core_concepts/jobs"), "https://www.windmill.dev/docs/core_concepts/jobs.md");
+    assert_eq!(
+        normalize_docs_url("https://www.windmill.dev/docs/core_concepts/jobs#result?foo=bar"),
+        "https://www.windmill.dev/docs/core_concepts/jobs.md"
+    );
+    assert_eq!(normalize_docs_url("/docs/core_concepts/jobs.md"), "https://www.windmill.dev/docs/core_concepts/jobs.md");
+    assert_eq!(normalize_docs_url("/docs/core_concepts/jobs/"), "https://www.windmill.dev/docs/core_concepts/jobs.md");
+    assert_eq!(normalize_docs_url("/docs/flows/13_flow_branches"), "https://www.windmill.dev/docs/flows/flow_branches.md");
+    assert_eq!(normalize_docs_url("/docs/flows/13_flow_branches.mdx"), "https://www.windmill.dev/docs/flows/flow_branches.md");
+}
+
+#[test]
+fn canonical_docs_page_url_cases() {
+    assert_eq!(canonical_docs_page_url("/docs/flows/flow_editor"), "https://www.windmill.dev/docs/flows/flow_editor");
+    assert_eq!(canonical_docs_page_url("/docs/flows/14_retries.md"), "https://www.windmill.dev/docs/flows/retries");
+}
+
+#[test]
+fn sanitize_markdown_links_cases() {
+    let page = "https://www.windmill.dev/docs/flows/flow_editor.md";
+    assert_eq!(
+        sanitize_docs_markdown_links("See [retries](./14_retries.mdx) for more.", page),
+        "See [retries](https://www.windmill.dev/docs/flows/retries) for more."
+    );
+    assert_eq!(
+        sanitize_docs_markdown_links("[handling](./8_error_handling.mdx)", page),
+        "[handling](https://www.windmill.dev/docs/flows/error_handling)"
+    );
+    assert_eq!(
+        sanitize_docs_markdown_links("[branch all](./13_flow_branches.mdx#branch-all)", page),
+        "[branch all](https://www.windmill.dev/docs/flows/flow_branches#branch-all)"
+    );
+    // images & external links untouched
+    let external = "![diagram](./assets/flow_example.png) and [site](https://example.com/page.md)";
+    assert_eq!(sanitize_docs_markdown_links(external, page), external);
+    // bare anchor untouched
+    assert_eq!(sanitize_docs_markdown_links("[top](#introduction)", page), "[top](#introduction)");
+    // ../ cross-directory links untouched
+    let parent = "[handling](../core_concepts/8_error_handling.mdx)";
+    assert_eq!(sanitize_docs_markdown_links(parent, page), parent);
+    let parent2 = "[retries](../../flows/14_retries.md)";
+    assert_eq!(sanitize_docs_markdown_links(parent2, page), parent2);
+}
+
+#[test]
+fn parse_full_text_splits_pages_and_drops_preamble() {
+    let pages = parse_docs_full_text(SAMPLE_FULL);
+    assert_eq!(
+        pages.iter().map(|p| p.url.clone()).collect::<Vec<_>>(),
+        vec![
+            "https://www.windmill.dev/docs/advanced/browser_automation",
+            "https://www.windmill.dev/docs/core_concepts/worker_groups",
+            "https://www.windmill.dev/docs/core_concepts/scheduling",
+        ]
+    );
+    assert_eq!(
+        pages.iter().map(|p| p.title.clone()).collect::<Vec<_>>(),
+        vec!["Browser automation", "Worker groups", "Scheduling"]
+    );
+    // The next page's "## Worker groups" lead-in must not leak into this body.
+    let browser = pages.iter().find(|p| p.url.ends_with("/browser_automation")).unwrap();
+    assert!(!browser.body.contains("Worker groups"));
+    assert!(!browser.body.contains("---"));
+}
+
+#[test]
+fn search_pages_ranks_more_occurrences_first() {
+    let pages = parse_docs_full_text(SAMPLE_FULL);
+    let results = search_docs_pages(&pages, "chromium", 5);
+    assert_eq!(
+        results.iter().map(|r| r.url.clone()).collect::<Vec<_>>(),
+        vec![
+            "https://www.windmill.dev/docs/advanced/browser_automation",
+            "https://www.windmill.dev/docs/core_concepts/worker_groups",
+        ]
+    );
+    assert!(!results[0].snippets.is_empty());
+    assert!(results[0].snippets.join("\n").contains("chromium"));
+}
+
+#[test]
+fn search_prefers_pages_covering_all_terms() {
+    let pages = parse_docs_full_text(SAMPLE_FULL);
+    // Only browser_automation contains "sandbox"; worker_groups has "chromium" but
+    // not "sandbox". A full-coverage page exists, so partial matches are dropped.
+    let results = search_docs_pages(&pages, "chromium sandbox", 5);
+    assert_eq!(
+        results.iter().map(|r| r.url.clone()).collect::<Vec<_>>(),
+        vec!["https://www.windmill.dev/docs/advanced/browser_automation"]
+    );
+}
+
+#[test]
+fn merge_dedupes_index_against_body_by_canonical_url() {
+    let body = vec![DocsSearchResult {
+        url: "https://www.windmill.dev/docs/a".to_string(),
+        title: "A".to_string(),
+        score: 10,
+        snippets: vec![],
+    }];
+    let index = vec![
+        DocsSearchResult {
+            url: "https://www.windmill.dev/docs/a.md".to_string(),
+            title: "A".to_string(),
+            score: 5,
+            snippets: vec![],
+        },
+        DocsSearchResult {
+            url: "https://www.windmill.dev/docs/b.md".to_string(),
+            title: "B".to_string(),
+            score: 5,
+            snippets: vec![],
+        },
+    ];
+    let merged = merge_docs_search_results(body, index, SEARCH_MAX_PAGES);
+    assert_eq!(
+        merged.iter().map(|r| r.url.clone()).collect::<Vec<_>>(),
+        vec!["https://www.windmill.dev/docs/a", "https://www.windmill.dev/docs/b.md"]
+    );
+}
+
+#[test]
+fn empty_query_returns_no_results() {
+    let pages = parse_docs_full_text(SAMPLE_FULL);
+    assert!(search_docs_pages(&pages, "   ", 5).is_empty());
+}
+
+#[test]
+fn format_search_results_no_matches() {
+    let out = format_docs_search_results("zzz", &[]);
+    assert!(out.contains("No documentation pages matched \"zzz\""));
+}
+
+#[test]
+fn format_search_results_uses_caller_neutral_followup_guidance() {
+    let out = format_docs_search_results(
+        "jobs",
+        &[DocsSearchResult {
+            url: "https://www.windmill.dev/docs/core_concepts/jobs".to_string(),
+            title: "Jobs".to_string(),
+            score: 1,
+            snippets: vec!["Jobs run scripts and flows.".to_string()],
+        }],
+    );
+
+    assert!(out.contains("Source: https://www.windmill.dev/docs/core_concepts/jobs"));
+    assert!(out.contains("Source URL as its `url` argument"));
+    assert!(!out.contains("read_docs_page"));
+    assert!(!out.contains("readDocsPage"));
+}
diff --git a/backend/windmill-api/src/drafts.rs b/backend/windmill-api/src/drafts.rs
index 9d4976489b..72791de78f 100644
--- a/backend/windmill-api/src/drafts.rs
+++ b/backend/windmill-api/src/drafts.rs
@@ -18,6 +18,7 @@ use windmill_common::{
     db::UserDB,
     error::{Error, Result},
     user_drafts::{DraftUserRef, UserDraftItemKind, ENCRYPTED_DRAFT_PREFIX},
+    users::resolve_username_to_email,
     variables::{build_crypt, encrypt},
 };
 
@@ -171,11 +172,16 @@ fn list_drafts_query(all_users: bool) -> String {
     // draft author at this (path, kind), legacy NULL-email row surfaced as a
     // null username. Restricted to the shared full-page-editor kinds — drawer
     // kinds keep their drafts private, so we never reveal their authors.
+    // A superadmin authoring in a workspace they are not a member of has no `usr`
+    // row: fall back to their instance-derived username (`password.username`), or
+    // their email when derivation is disabled (`password.username` is NULL). This
+    // keeps the raw email out of the payload whenever a derived username exists.
     let draft_users = r#"CASE WHEN d.typ::text IN ('script', 'flow', 'app', 'raw_app') THEN (
-                      SELECT json_agg(json_build_object('username', COALESCE(u.username, CASE WHEN du.workspace_id = 'admins' THEN du.email END))
-                                      ORDER BY COALESCE(u.username, CASE WHEN du.workspace_id = 'admins' THEN du.email END) NULLS LAST)
+                      SELECT json_agg(json_build_object('username', COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN du.email END))
+                                      ORDER BY COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN du.email END) NULLS LAST)
                       FROM draft du
                       LEFT JOIN usr u ON u.workspace_id = du.workspace_id AND u.email = du.email
+                      LEFT JOIN password p ON p.email = du.email AND p.super_admin = true
                       WHERE du.workspace_id = d.workspace_id AND du.path = d.path AND du.typ = d.typ
                     ) ELSE NULL END"#;
     // Default lists the user's own drafts AND the legacy NULL-email rows; with
@@ -578,20 +584,12 @@ async fn get_draft_for_user(
 
     // Username -> email, scoped to the workspace. None signals "fetch the
     // legacy NULL-email row" (distinct from a username with no draft, which
-    // 404s below).
+    // 404s below). Resolution falls back to the instance `password` table so a
+    // superadmin's draft (they are not a `usr` member of the workspace, and
+    // their username is their instance-derived one) still resolves.
     let owner_email: Option<String> = if let Some(username) = &query.username {
-        let email = sqlx::query_scalar!(
-            r#"SELECT email FROM usr WHERE workspace_id = $1 AND username = $2"#,
-            &w_id,
-            username,
-        )
-        .fetch_optional(&db)
-        .await?;
-        match email {
+        match resolve_username_to_email(&w_id, username, &db).await? {
             Some(e) => Some(e),
-            // The `admins` workspace has no `usr` rows (username IS the email
-            // there), so accept it as the owner email directly.
-            None if w_id == "admins" => Some(username.clone()),
             None => {
                 return Err(Error::NotFound(format!(
                     "no user with username {username} in workspace"
@@ -805,7 +803,6 @@ async fn require_can_read_path(
     Err(Error::NotFound(format!("no draft visible at {path}")))
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::strip_json_nul;
@@ -841,7 +838,9 @@ mod tests {
         // "a" carries a real NUL; "b" carries the literal text backslash-u0000.
         // The value walk strips the former and leaves the latter intact — the
         // pathological case that needed a fallback in SQL is trivial in Rust.
-        let v = parsed(strip_json_nul(r#"{"a":"x\u0000y","b":"p\\u0000q"}"#.to_string()));
+        let v = parsed(strip_json_nul(
+            r#"{"a":"x\u0000y","b":"p\\u0000q"}"#.to_string(),
+        ));
         assert_eq!(v["a"], "xy");
         assert_eq!(v["b"], "p\\u0000q");
     }
diff --git a/backend/windmill-api/src/health.rs b/backend/windmill-api/src/health.rs
index fab9979c12..4dc8947de6 100644
--- a/backend/windmill-api/src/health.rs
+++ b/backend/windmill-api/src/health.rs
@@ -219,12 +219,16 @@ struct DatabaseCheckResult {
 
 async fn check_database_with_latency(db: &DB) -> DatabaseCheckResult {
     let start = std::time::Instant::now();
+    // `pg_is_in_recovery()` is true on standbys/read-only replicas, so a primary
+    // returns true here. A read-only replica (e.g. after a failover where the
+    // primary became a secondary) reports unhealthy, letting liveness probes
+    // restart the pod instead of silently failing all writes.
     let healthy = tokio::time::timeout(
         HEALTH_CHECK_TIMEOUT,
-        sqlx::query_scalar!("SELECT 1").fetch_one(db),
+        sqlx::query_scalar!("SELECT NOT pg_is_in_recovery()").fetch_one(db),
     )
     .await
-    .map(|r| r.is_ok())
+    .map(|r| matches!(r, Ok(Some(true))))
     .unwrap_or(false);
     let latency_ms = start.elapsed().as_millis() as i64;
 
diff --git a/backend/windmill-api/src/inkeep_oss.rs b/backend/windmill-api/src/inkeep_oss.rs
deleted file mode 100644
index a34ea91435..0000000000
--- a/backend/windmill-api/src/inkeep_oss.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#[cfg(feature = "private")]
-#[allow(unused)]
-pub use crate::inkeep_ee::*;
-
-#[cfg(not(feature = "private"))]
-use axum::{routing::post, Router};
-
-#[cfg(not(feature = "private"))]
-use windmill_common::error::Error;
-
-#[cfg(not(feature = "private"))]
-pub fn global_service() -> Router {
-    Router::new().route("/", post(inkeep_not_available))
-}
-
-#[cfg(not(feature = "private"))]
-async fn inkeep_not_available() -> windmill_common::error::Result<()> {
-    Err(Error::Generic(
-        http::StatusCode::FORBIDDEN,
-        "Inkeep AI documentation assistant is only available in Windmill Enterprise Edition"
-            .to_string(),
-    ))
-}
diff --git a/backend/windmill-api/src/job_helpers_oss.rs b/backend/windmill-api/src/job_helpers_oss.rs
index 23f20459c3..c6d8e397f2 100644
--- a/backend/windmill-api/src/job_helpers_oss.rs
+++ b/backend/windmill-api/src/job_helpers_oss.rs
@@ -87,7 +87,8 @@ pub async fn upload_file_from_req(
     _file_key: &str,
     _req: axum::extract::Request,
     _options: PutMultipartOpts,
-) -> error::Result<PutResult> {
+    _max_size: Option<usize>,
+) -> error::Result<(PutResult, usize)> {
     Err(error::Error::internal_err(
         "Not implemented in Windmill's Open Source repository".to_string(),
     ))
@@ -99,12 +100,77 @@ pub async fn upload_file_internal(
     _file_key: &str,
     _stream: impl Stream<Item = Result<Bytes, std::io::Error>> + Unpin,
     _options: PutMultipartOpts,
-) -> error::Result<()> {
+    _max_size: Option<usize>,
+) -> error::Result<(PutResult, usize)> {
     Err(error::Error::internal_err(
         "Not implemented in Windmill's Open Source repository".to_string(),
     ))
 }
 
+// These stubs stand in for the CE quota helpers in a pure-OSS build; their only
+// callers (apps.rs / args.rs uploads) are `not(enterprise)`, so gate them the
+// same way — an enterprise-without-private build compiles neither.
+#[cfg(all(
+    feature = "parquet",
+    not(feature = "private"),
+    not(feature = "enterprise")
+))]
+pub async fn ce_storage_quota_remaining(
+    _db: &DB,
+    _w_id: &str,
+    _exclude_upload_id: Option<&str>,
+) -> error::Result<i64> {
+    Ok(i64::MAX)
+}
+
+#[cfg(all(
+    feature = "parquet",
+    not(feature = "private"),
+    not(feature = "enterprise")
+))]
+pub fn reject_reserved_volume_key(_file_key: &str) -> error::Result<()> {
+    Ok(())
+}
+
+#[cfg(all(
+    feature = "parquet",
+    not(feature = "private"),
+    not(feature = "enterprise")
+))]
+pub struct CeUploadBudget {
+    pub max_size: usize,
+    pub existing_size: i64,
+}
+
+#[cfg(all(
+    feature = "parquet",
+    not(feature = "private"),
+    not(feature = "enterprise")
+))]
+pub async fn ce_upload_budget(
+    _db: &DB,
+    _w_id: &str,
+    _s3_client: &Arc<dyn ObjectStore>,
+    _file_key: &str,
+    _content_length: Option<i64>,
+) -> error::Result<CeUploadBudget> {
+    Ok(CeUploadBudget { max_size: usize::MAX, existing_size: 0 })
+}
+
+#[cfg(all(
+    feature = "parquet",
+    not(feature = "private"),
+    not(feature = "enterprise")
+))]
+pub async fn bump_storage_usage(_db: &DB, _w_id: &str, _storage: &str, _delta: i64) {}
+
+#[cfg(all(
+    feature = "parquet",
+    not(feature = "private"),
+    not(feature = "enterprise")
+))]
+pub fn spawn_storage_usage_recount_floored(_db: &DB, _w_id: &str) {}
+
 #[cfg(all(feature = "parquet", not(feature = "private")))]
 pub async fn download_s3_file_internal(
     _authed: OptJobAuthed,
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index c6d978e0d6..14cbb76c91 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -390,6 +390,10 @@ pub fn workspace_unauthed_service() -> Router {
         .route("/get/{id}", get(get_job))
         .route("/get_logs/{id}", get(get_job_logs))
         .route("/get_flow_all_logs/{id}", get(get_flow_all_logs))
+        .route(
+            "/get_flow_all_logs_structured/{id}",
+            get(get_flow_all_logs_structured),
+        )
         .route(
             "/get_completed_logs_tail/{id}",
             get(get_completed_job_logs_tail),
@@ -513,6 +517,26 @@ async fn cancel_job_api(
     Path((w_id, id)): Path<(String, Uuid)>,
     Json(CancelJob { reason }): Json<CancelJob>,
 ) -> error::Result<String> {
+    // App embed tokens (the sandboxed app iframe) may cancel ONLY jobs they launched
+    // — their app's component runs, stamped created_by == viewer. cancel_job_api has
+    // no other per-job ownership check, so without this an embed token (which carries
+    // the viewer's identity) could cancel any job by id. NotFound (not 403) so the
+    // untrusted app can't probe job existence.
+    if let Some(authed) = opt_authed.as_ref() {
+        if windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref()) {
+            let created_by = sqlx::query_scalar!(
+                "SELECT created_by FROM v2_job WHERE id = $1 AND workspace_id = $2",
+                id,
+                &w_id
+            )
+            .fetch_optional(&db)
+            .await?;
+            if created_by.as_deref() != Some(authed.username.as_str()) {
+                return Err(Error::NotFound(format!("Job {id} not found")));
+            }
+        }
+    }
+
     let tx = db.begin().await?;
 
     let audit_author: AuditAuthor = match opt_authed.as_ref() {
@@ -1007,6 +1031,17 @@ async fn require_job_read_access(
         return Ok(());
     }
 
+    // App embed tokens (the sandboxed app iframe) carry the viewer's identity so the
+    // app can read its own component runs — which are stamped `created_by == viewer`
+    // and so already returned above. They must NOT inherit the viewer's *broader*
+    // job access (share links, folder ACLs, admin RLS): user-authored app JS holds
+    // this token, and letting it reach any job merely visible to the viewer would
+    // expose unrelated runs' results/logs. Stop at the launched-by-viewer grant.
+    // NotFound (not PermissionDenied) so the untrusted app can't probe job existence.
+    if windmill_api_auth::scopes::has_app_embed_sentinel(authed.scopes.as_deref()) {
+        return Err(Error::NotFound(format!("Job {job_id} not found")));
+    }
+
     // `username_override` is derived from the token *label* (`username_override_from_label`),
     // which is fully user-controlled with no uniqueness/ownership check (webhook-/http-/
     // email-/ws- trigger tokens, `ephemeral-script-end-user-*`, and the generic `label-*`
@@ -1388,6 +1423,7 @@ macro_rules! get_job_query {
             @impl "v2_job_completed", ($($opts)*),
             "v2_job_completed.duration_ms, v2_job_completed.completed_at, CASE WHEN status = 'success' OR status = 'skipped' THEN true ELSE false END as success, result_columns, deleted, status = 'skipped' as is_skipped, \
             v2_job.labels, \
+            EXISTS(SELECT 1 FROM native_retry_attempt WHERE job_id = v2_job.id) as is_retry, \
             CASE WHEN result is null or pg_column_size(result) < 90000 THEN result ELSE '\"WINDMILL_TOO_BIG\"'::jsonb END as result",
             "",
         )
@@ -1397,7 +1433,8 @@ macro_rules! get_job_query {
             @impl "v2_job_queue", ($($opts)*),
             "scheduled_for, running, ping as last_ping, suspend, suspend_until, same_worker, pre_run_error, visible_to_owner, \
             flow_innermost_root_job  AS root_job, flow_leaf_jobs AS leaf_jobs, concurrent_limit, concurrency_time_window_s, timeout, flow_step_id, cache_ttl, cache_ignore_s3_path, runnable_settings_handle, \
-            script_entrypoint_override, v2_job.labels",
+            script_entrypoint_override, v2_job.labels, \
+            EXISTS(SELECT 1 FROM native_retry_attempt WHERE job_id = v2_job.id) as is_retry",
             "LEFT JOIN v2_job_runtime ON v2_job_runtime.id = v2_job_queue.id LEFT JOIN v2_job_status ON v2_job_status.id = v2_job_queue.id",
         )
     };
@@ -2177,14 +2214,40 @@ async fn resolve_logs_to_string(
     logs.to_string()
 }
 
-async fn get_flow_all_logs(
-    OptViewToken(view_token): OptViewToken,
-    OptAuthed(opt_authed): OptAuthed,
+/// A single job in a flow's execution tree, with its resolved logs and a
+/// human-readable label describing its position (iteration, branch, subflow…).
+#[derive(Serialize)]
+struct FlowLogEntry {
+    job_id: String,
+    /// Human-readable label, e.g. "Step a (iteration 2/3)" or "Flow".
+    label: String,
+    /// Job kind (script, flow, forloopflow, …).
+    kind: String,
+    /// The flow step id this job corresponds to, if any.
+    flow_step_id: Option<String>,
+    /// Materialized step path (e.g. "a/b") used to locate the step in the flow.
+    step_path: Option<String>,
+    /// Depth in the flow tree (0 for the root flow job).
+    depth: i32,
+    /// The parent module type (forloopflow, branchall, …), if any.
+    parent_module_type: Option<String>,
+    /// 1-based index of this job among its siblings sharing the same step.
+    sibling_index: i32,
+    /// Total number of siblings sharing the same step.
+    sibling_count: i32,
+    /// Resolved logs for this job (pulled from disk/object store as needed).
+    logs: String,
+}
+
+async fn collect_flow_log_entries(
+    view_token: Option<String>,
+    opt_authed: Option<ApiAuthed>,
     opt_tokened: OptTokened,
-    Extension(db): Extension<DB>,
-    Extension(user_db): Extension<UserDB>,
-    Path((w_id, id)): Path<(String, Uuid)>,
-) -> error::Result<Response> {
+    db: &DB,
+    user_db: &UserDB,
+    w_id: &str,
+    id: Uuid,
+) -> error::Result<Vec<FlowLogEntry>> {
     let tags = opt_authed
         .as_ref()
         .map(|authed| get_scope_tags(authed).map(|v| v.iter().map(|s| s.to_string()).collect_vec()))
@@ -2197,17 +2260,17 @@ async fn get_flow_all_logs(
         w_id,
         tags.as_ref().map(|v| v.as_slice())
     )
-    .fetch_optional(&db)
+    .fetch_optional(db)
     .await?;
 
     let root_job = not_found_if_none(root_job, "Job", id.to_string())?;
 
     if let Some(authed) = opt_authed.as_ref() {
         require_job_read_access(
-            &db,
-            &user_db,
+            db,
+            user_db,
             authed,
-            &w_id,
+            w_id,
             &id,
             &root_job.created_by,
             view_token.as_deref(),
@@ -2220,10 +2283,10 @@ async fn get_flow_all_logs(
     }
 
     log_job_view(
-        &db,
+        db,
         opt_authed.as_ref(),
         opt_tokened.token.as_deref(),
-        &w_id,
+        w_id,
         &id,
     )
     .await?;
@@ -2290,10 +2353,10 @@ async fn get_flow_all_logs(
         w_id,
         id,
     )
-    .fetch_all(&db)
+    .fetch_all(db)
     .await?;
 
-    let mut all_logs = String::new();
+    let mut entries = Vec::with_capacity(records.len());
 
     for record in &records {
         let kind = record.kind.as_deref().unwrap_or("");
@@ -2356,18 +2419,89 @@ async fn get_flow_all_logs(
         };
 
         let job_id = record.id.map(|u| u.to_string()).unwrap_or_default();
-        all_logs.push_str(&format!("\n=== {} (Job: {}) ===\n", label, job_id));
         let logs = record.logs.as_deref().unwrap_or("");
         let resolved =
             resolve_logs_to_string(record.log_offset.unwrap_or(0), logs, &record.log_file_index)
                 .await;
-        all_logs.push_str(&resolved);
+
+        entries.push(FlowLogEntry {
+            job_id,
+            label,
+            kind: kind.to_string(),
+            flow_step_id: record.flow_step_id.clone(),
+            step_path: record.path_label.clone(),
+            depth,
+            parent_module_type: if parent_module_type.is_empty() {
+                None
+            } else {
+                Some(parent_module_type.to_string())
+            },
+            sibling_index,
+            sibling_count,
+            logs: resolved,
+        });
+    }
+
+    Ok(entries)
+}
+
+async fn get_flow_all_logs(
+    OptViewToken(view_token): OptViewToken,
+    OptAuthed(opt_authed): OptAuthed,
+    opt_tokened: OptTokened,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, id)): Path<(String, Uuid)>,
+) -> error::Result<Response> {
+    let entries = collect_flow_log_entries(
+        view_token,
+        opt_authed,
+        opt_tokened,
+        &db,
+        &user_db,
+        &w_id,
+        id,
+    )
+    .await?;
+
+    let mut all_logs = String::new();
+    for entry in &entries {
+        all_logs.push_str(&format!(
+            "\n=== {} (Job: {}) ===\n",
+            entry.label, entry.job_id
+        ));
+        all_logs.push_str(&entry.logs);
         all_logs.push('\n');
     }
 
     Ok(content_plain(Body::from(all_logs)))
 }
 
+/// Structured alternative to `get_flow_all_logs`: returns the same flow log
+/// tree as a JSON array of entries (one per job) instead of a flat text blob,
+/// so callers can render or process logs per-step without parsing delimiters.
+async fn get_flow_all_logs_structured(
+    OptViewToken(view_token): OptViewToken,
+    OptAuthed(opt_authed): OptAuthed,
+    opt_tokened: OptTokened,
+    Extension(db): Extension<DB>,
+    Extension(user_db): Extension<UserDB>,
+    Path((w_id, id)): Path<(String, Uuid)>,
+) -> JsonResult<Vec<FlowLogEntry>> {
+    let entries = collect_flow_log_entries(
+        view_token,
+        opt_authed,
+        opt_tokened,
+        &db,
+        &user_db,
+        &w_id,
+        id,
+    )
+    .await?;
+
+    Ok(Json(entries))
+}
+
 async fn get_args(
     OptViewToken(view_token): OptViewToken,
     OptAuthed(opt_authed): OptAuthed,
@@ -4022,11 +4156,17 @@ fn conditionally_require_authed_user(
 }
 
 pub async fn create_job_signature(
-    _authed: ApiAuthed,
+    authed: ApiAuthed,
     Extension(db): Extension<DB>,
     Path((w_id, job_id, resume_id)): Path<(String, Uuid, u32)>,
     Query(approver): Query<QueryApprover>,
 ) -> error::Result<String> {
+    // The HMAC is treated as full authority by the resume endpoints, so minting
+    // it requires run scope on the suspended job's flow — not merely any
+    // jobs:run scope. No-op for unscoped tokens (incl. the in-flow substep token
+    // used by wmill.get_resume_urls()).
+    let flow_path = resume_target_flow_path(&db, &w_id, job_id).await?;
+    check_scopes(&authed, || format!("jobs:run:flows:{}", flow_path))?;
     let key = get_workspace_key(&w_id, &db).await?;
     create_signature(key, job_id, resume_id, approver.approver)
 }
@@ -4109,11 +4249,17 @@ fn build_resume_url(
 }
 
 pub async fn get_resume_urls(
-    _authed: ApiAuthed,
+    authed: ApiAuthed,
     Extension(db): Extension<DB>,
     Path((w_id, job_id, resume_id)): Path<(String, Uuid, u32)>,
     Query(approver): Query<QueryApprover>,
 ) -> error::JsonResult<ResumeUrls> {
+    // These URLs embed a resume signature (full resume capability), so a scoped
+    // token must hold run scope on the suspended job's flow. No-op for unscoped
+    // tokens (incl. the in-flow substep token). Trusted internal callers use
+    // get_resume_urls_internal directly and are unaffected.
+    let flow_path = resume_target_flow_path(&db, &w_id, job_id).await?;
+    check_scopes(&authed, || format!("jobs:run:flows:{}", flow_path))?;
     get_resume_urls_internal(
         Extension(db),
         Path((w_id, job_id, resume_id)),
@@ -4180,6 +4326,46 @@ pub async fn get_resume_urls_internal(
     Ok(Json(res))
 }
 
+/// Resolve the runnable path of the flow a (possibly step) job belongs to, used
+/// to scope-check resume-signature minting against `jobs:run:flows:<path>`.
+/// Returns an empty string when the path can't be resolved (e.g. previews or an
+/// unknown job); an empty path only matters for path-restricted tokens, which
+/// would not be running such a flow. Never hard-fails, so it can't break resume
+/// for unscoped tokens (the in-flow `get_resume_urls()` path).
+async fn resume_target_flow_path(db: &DB, w_id: &str, job_id: Uuid) -> error::Result<String> {
+    let job = sqlx::query!(
+        r#"SELECT kind::text as "kind!", parent_job, runnable_path
+           FROM v2_job WHERE id = $1 AND workspace_id = $2"#,
+        job_id,
+        w_id
+    )
+    .fetch_optional(db)
+    .await?;
+    let Some(job) = job else {
+        return Ok(String::new());
+    };
+    // All flow kinds: the job itself is the flow whose path scopes the resume.
+    if matches!(
+        job.kind.as_str(),
+        "flow" | "flowpreview" | "flownode" | "singlestepflow"
+    ) {
+        return Ok(job.runnable_path.unwrap_or_default());
+    }
+    // Otherwise it's a step; its parent is the flow.
+    if let Some(parent) = job.parent_job {
+        return Ok(sqlx::query_scalar!(
+            "SELECT runnable_path FROM v2_job WHERE id = $1 AND workspace_id = $2",
+            parent,
+            w_id
+        )
+        .fetch_optional(db)
+        .await?
+        .flatten()
+        .unwrap_or_default());
+    }
+    Ok(job.runnable_path.unwrap_or_default())
+}
+
 /// Get the flow ID for a job. If the job is a flow, returns the job_id.
 /// If the job is a step in a flow, returns the parent flow ID.
 async fn get_flow_id_for_job(db: &DB, job_id: Uuid) -> error::Result<Uuid> {
@@ -7416,26 +7602,32 @@ async fn run_dynamic_select(
         ));
     }
 
+    if !is_valid_entrypoint_name(&request.entrypoint_function) {
+        return Err(error::Error::BadRequest(format!(
+            "Invalid entrypoint_function {:?}: must match \
+             ^[A-Za-z_][A-Za-z0-9_]*$ (letters, digits and underscores, \
+             not starting with a digit)",
+            request.entrypoint_function
+        )));
+    }
+
+    // Deployed scripts keep their normal deployed-run path (a `script` job, resolved below by
+    // push_script_job_by_path_into_queue). Deployed flows and inline snippets have no deployed
+    // runnable, so they run their dyn-select code as a `preview`; the flow carries its path and
+    // worker tag so its option-fetching job lines up with the script run.
     let dynamic_input: DynamicInput;
+    let runnable_path: Option<String>;
+    let mut tag: Option<String> = None;
 
     match request.runnable_ref {
         DynamicSelectRunnableRef::Deployed { path, runnable_kind } => match runnable_kind {
             RunnableKind::Script => {
-                if !is_valid_entrypoint_name(&request.entrypoint_function) {
-                    return Err(error::Error::BadRequest(format!(
-                        "Invalid entrypoint_function {:?}: must match \
-                         ^[A-Za-z_][A-Za-z0-9_]*$ (letters, digits and underscores, \
-                         not starting with a digit)",
-                        request.entrypoint_function
-                    )));
-                }
                 let mut script_args = request.args.unwrap_or_default();
                 script_args.insert(
-                    "_ENTRYPOINT_OVERRIDE".to_string(),
+                    ENTRYPOINT_OVERRIDE.to_string(),
                     serde_json::value::to_raw_value(&request.entrypoint_function)?,
                 );
-
-                let push_args = PushArgsOwned { extra: None, args: script_args.clone() };
+                let push_args = PushArgsOwned { extra: None, args: script_args };
 
                 let (uuid, _, _) = push_script_job_by_path_into_queue(
                     authed.clone(),
@@ -7445,7 +7637,7 @@ async fn run_dynamic_select(
                     w_id.clone(),
                     StripPath(path),
                     run_query.clone(),
-                    push_args.clone(),
+                    push_args,
                     None,
                 )
                 .await?;
@@ -7453,13 +7645,40 @@ async fn run_dynamic_select(
                 return Ok((StatusCode::CREATED, uuid.to_string()).into_response());
             }
             RunnableKind::Flow => {
-                // Runs the deployed flow's dynamic-select code. Enforce the same
-                // path-scoped check the script branch gets via
-                // push_script_job_by_path_into_queue, so a token not scoped to this
-                // flow cannot trigger its code through dynamic select.
+                // Runs the deployed flow's dynamic-select code. Path-scoped so a token not
+                // scoped to this flow cannot trigger its code through dynamic select.
                 check_scopes(&authed, || format!("jobs:run:flows:{path}"))?;
                 let mut conn = user_db.clone().begin(&authed).await?;
 
+                // Read the flow's tag under RLS. This runs on every request (including the
+                // cache hit below), so it doubles as the access check and routes the
+                // option-fetching preview to the flow's worker group, matching the script branch.
+                let Some(flow_tag) = sqlx::query_scalar!(
+                    "SELECT tag FROM flow WHERE workspace_id = $1 AND path = $2",
+                    &w_id,
+                    &path
+                )
+                .fetch_optional(&mut *conn)
+                .await?
+                else {
+                    conn.commit().await?;
+                    let exists = sqlx::query_scalar!(
+                        "SELECT 1 FROM flow WHERE workspace_id = $1 AND path = $2 LIMIT 1",
+                        &w_id,
+                        &path
+                    )
+                    .fetch_optional(&db)
+                    .await?
+                    .is_some();
+                    if exists {
+                        return Err(error::Error::NotAuthorized(format!(
+                            "You are not authorized to access this flow: {path}"
+                        )));
+                    }
+                    return Err(Error::NotFound(format!("Flow not found at path {path}")));
+                };
+                tag = flow_tag;
+
                 let dynamic_input_res = match DYNAMIC_INPUT_CACHE.get(&format!("{}:{}", w_id, path))
                 {
                     Some(cached) => cached.as_ref().clone(),
@@ -7502,21 +7721,34 @@ async fn run_dynamic_select(
                 conn.commit().await?;
 
                 dynamic_input = dynamic_input_res;
+                runnable_path = Some(path);
             }
         },
         DynamicSelectRunnableRef::Inline { code, lang: language } => {
             // Inline dynamic select runs arbitrary, request-supplied code; require the broad
             // jobs:run scope so a narrowly-scoped token cannot escape its scope. The Deployed
-            // branches are path-scoped instead (scripts via push_script_job_by_path_into_queue,
-            // flows via the check_scopes above).
+            // branches are path-scoped instead.
             check_scopes(&authed, || format!("jobs:run"))?;
             dynamic_input = DynamicInput {
                 x_windmill_dyn_select_code: code,
                 x_windmill_dyn_select_lang: language.unwrap_or_default(),
             };
+            runnable_path = None;
         }
     }
 
+    // Same tag-permission gate a normal run gets (run_flow / push_script_job_by_path_into_queue):
+    // a caller allowed to read the flow must still be allowed to use its worker tag. No-op for
+    // inline (tag is None); the script branch checked this inside its helper and returned above.
+    check_tag_available_for_workspace(&db, &w_id, &tag, &authed).await?;
+
+    // Invoke the dyn-select entrypoint instead of `main`.
+    let mut args = request.args.unwrap_or_default();
+    args.insert(
+        ENTRYPOINT_OVERRIDE.to_string(),
+        serde_json::value::to_raw_value(&request.entrypoint_function)?,
+    );
+
     let scheduled_for = run_query.get_scheduled_for(&db).await?;
     let tx = PushIsolationLevel::Isolated(user_db.clone(), authed.clone().into());
 
@@ -7527,7 +7759,7 @@ async fn run_dynamic_select(
         JobPayload::Code(RawCode {
             hash: None,
             content: dynamic_input.x_windmill_dyn_select_code,
-            path: None,
+            path: runnable_path,
             language: dynamic_input.x_windmill_dyn_select_lang,
             lock: None,
             cache_ttl: None,
@@ -7536,9 +7768,11 @@ async fn run_dynamic_select(
             concurrency_settings: ConcurrencySettings::default().into(),
             debouncing_settings: DebouncingSettings::default(),
             modules: None,
+            // RawCode.tag is ignored by the queue path (`JobPayload::Code` destructures it as
+            // `tag: _`); the effective tag is the `tag` argument to `push` below.
             tag: None,
         }),
-        PushArgs::from(&request.args.unwrap_or_default()),
+        PushArgs::from(&args),
         authed.display_username(),
         &authed.email,
         username_to_permissioned_as(&authed.username),
@@ -7553,7 +7787,8 @@ async fn run_dynamic_select(
         false,
         None,
         true,
-        None,
+        // Deployed flow → the flow's worker tag; inline → `None` (language default).
+        tag,
         run_query.timeout,
         None,
         None,
@@ -9488,16 +9723,31 @@ mod approval_view_gate_tests {
     fn anonymous_cannot_view_when_auth_required() {
         // The regression: an unauthenticated holder of the approval token must see nothing.
         let c = Some(conds(true, vec![]));
-        assert!(!can_view(&None, &c, Some("f/team/flow"), "trigger@example.com"));
+        assert!(!can_view(
+            &None,
+            &c,
+            Some("f/team/flow"),
+            "trigger@example.com"
+        ));
     }
 
     #[test]
     fn anonymous_can_view_when_no_auth_required() {
         // Unchanged behaviour: token alone is sufficient when auth isn't required.
         let c = Some(conds(false, vec![]));
-        assert!(can_view(&None, &c, Some("f/team/flow"), "trigger@example.com"));
+        assert!(can_view(
+            &None,
+            &c,
+            Some("f/team/flow"),
+            "trigger@example.com"
+        ));
         // No approval conditions at all also allows token-only view.
-        assert!(can_view(&None, &None, Some("f/team/flow"), "trigger@example.com"));
+        assert!(can_view(
+            &None,
+            &None,
+            Some("f/team/flow"),
+            "trigger@example.com"
+        ));
     }
 
     #[test]
@@ -9522,7 +9772,17 @@ mod approval_view_gate_tests {
         let member = Some(authed("carol", false, vec!["approvers".to_string()]));
         let outsider = Some(authed("dave", false, vec!["other".to_string()]));
         // Use a non-owned folder path so ownership doesn't short-circuit the check.
-        assert!(can_view(&member, &c, Some("f/team/flow"), "trigger@example.com"));
-        assert!(!can_view(&outsider, &c, Some("f/team/flow"), "trigger@example.com"));
+        assert!(can_view(
+            &member,
+            &c,
+            Some("f/team/flow"),
+            "trigger@example.com"
+        ));
+        assert!(!can_view(
+            &outsider,
+            &c,
+            Some("f/team/flow"),
+            "trigger@example.com"
+        ));
     }
 }
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index c34a153619..73593c595a 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -69,6 +69,7 @@ mod ai;
 #[cfg(feature = "private")]
 mod ai_free_tier_ee;
 mod ai_free_tier_oss;
+mod ai_skills;
 mod apps;
 pub mod args;
 mod audit;
@@ -80,6 +81,7 @@ mod capture;
 mod concurrency_groups;
 mod db;
 mod db_health;
+mod docs;
 mod drafts;
 
 #[cfg(feature = "private")]
@@ -97,9 +99,6 @@ mod health;
 #[cfg(feature = "private")]
 pub mod indexer_ee;
 mod indexer_oss;
-#[cfg(feature = "private")]
-mod inkeep_ee;
-mod inkeep_oss;
 mod integration;
 mod internal_db;
 mod live_migrations;
@@ -548,7 +547,15 @@ pub async fn run_server(
                     Router::new()
                         // Reordered alphabetically
                         .nest("/acls", granular_acls::workspaced_service())
-                        .nest("/apps", apps::workspaced_service(request_size_limit * 5))
+                        // CORS so the opaque-origin in-workspace app viewer (WIN-2006,
+                        // sandboxed /apps/get) can read the app definition by path
+                        // (apps/get/p, apps/embed_token/p) with a scoped embed token.
+                        // Bearer-token-only (no cookies), consistent with the other
+                        // workspaced services the iframe calls.
+                        .nest(
+                            "/apps",
+                            apps::workspaced_service(request_size_limit * 5).layer(cors.clone()),
+                        )
                         .nest("/assets", windmill_api_assets::workspaced_service())
                         .nest("/audit", audit::workspaced_service())
                         .nest("/capture", capture::workspaced_service())
@@ -568,7 +575,13 @@ pub async fn run_server(
                             "/flow_conversations",
                             windmill_api_flow_conversations::workspaced_service(),
                         )
-                        .nest("/folders", folders::workspaced_service())
+                        // CORS so an opaque-origin app iframe (WIN-2006 embed,
+                        // no separate domain) can read folders/listnames with a
+                        // scoped embed token. Consistent with apps_u/jobs_u cors.
+                        .nest(
+                            "/folders",
+                            folders::workspaced_service().layer(cors.clone()),
+                        )
                         .nest("/folders_history", folder_history::workspaced_service())
                         .nest("/groups", groups::workspaced_service())
                         .nest("/groups_history", group_history::workspaced_service())
@@ -611,20 +624,30 @@ pub async fn run_server(
                             Router::new()
                         })
                         .nest("/ai", ai::workspaced_service())
+                        .nest("/ai_skills", ai_skills::workspaced_service())
                         .nest("/npm_proxy", windmill_api_npm_proxy::workspaced_service())
                         .nest(
                             "/path_autocomplete",
                             path_autocomplete::workspaced_service(),
                         )
                         .nest("/raw_apps", raw_apps::workspaced_service())
-                        .nest("/resources", resources::workspaced_service())
+                        // CORS so the opaque-origin app iframe can read
+                        // resources/list, resources/type/* with a scoped token.
+                        .nest(
+                            "/resources",
+                            resources::workspaced_service().layer(cors.clone()),
+                        )
                         .nest("/shared_ui", workspace_shared_ui::workspaced_service())
                         .nest("/schedules", windmill_api_schedule::workspaced_service())
                         .nest("/scripts", scripts::workspaced_service())
                         .nest("/trash", trash::workspaced_service())
                         .nest(
                             "/users",
-                            users::workspaced_service().layer(Extension(argon2.clone())),
+                            // CORS so the opaque-origin app iframe can read
+                            // users/whoami with a scoped embed token.
+                            users::workspaced_service()
+                                .layer(Extension(argon2.clone()))
+                                .layer(cors.clone()),
                         )
                         .nest("/variables", variables::workspaced_service())
                         .nest("/volumes", volumes_oss::workspaced_service())
@@ -665,7 +688,7 @@ pub async fn run_server(
                 .nest("/schedules", windmill_api_schedule::global_service())
                 .nest("/embeddings", embeddings::global_service())
                 .nest("/ai", ai::global_service())
-                .nest("/inkeep", inkeep_oss::global_service())
+                .nest("/docs", docs::global_service())
                 .nest("/indexer", indexer_oss::management_service())
                 .nest("/mcp/w/{workspace_id}/list_tools", mcp_list_tools_service)
                 .nest("/db_health", db_health::global_service())
@@ -730,7 +753,11 @@ pub async fn run_server(
                 .nest("/apps_u", {
                     #[cfg(feature = "enterprise")]
                     {
-                        apps_oss::global_unauthed_service()
+                        // CORS so the opaque-origin app viewer (WIN-2006 embed, no
+                        // separate domain) can load a custom-path public app via
+                        // public_app_by_custom_path cross-origin. Consistent with
+                        // the workspaced /w/{workspace_id}/apps_u mount below.
+                        apps_oss::global_unauthed_service().layer(cors.clone())
                     }
 
                     #[cfg(not(feature = "enterprise"))]
diff --git a/backend/windmill-api/src/live_migrations.rs b/backend/windmill-api/src/live_migrations.rs
index e7fa3eb13f..d5c759fc18 100644
--- a/backend/windmill-api/src/live_migrations.rs
+++ b/backend/windmill-api/src/live_migrations.rs
@@ -9,26 +9,26 @@
 use sqlx::Postgres;
 use windmill_common::error::Error;
 
-use crate::db::{CustomMigrator, DB};
+use crate::db::CustomMigrator;
 use sqlx::migrate::Migrate;
+use sqlx::Acquire;
 use sqlx::Executor;
 
-pub async fn custom_migrations(migrator: &mut CustomMigrator, db: &DB) -> Result<(), Error> {
-    if let Err(err) = fix_flow_versioning_migration(migrator, db).await {
+pub async fn custom_migrations(migrator: &mut CustomMigrator) -> Result<(), Error> {
+    if let Err(err) = fix_flow_versioning_migration(migrator).await {
         tracing::error!("Could not apply flow versioning fix migration: {err:#}");
     }
 
     Ok(())
 }
 
-async fn fix_flow_versioning_migration(
-    migrator: &mut CustomMigrator,
-    db: &DB,
-) -> Result<(), Error> {
+// Runs on the migrator's held connection (see CustomMigrator::connection): re-acquiring
+// from the pool here would deadlock a single-connection backend.
+async fn fix_flow_versioning_migration(migrator: &mut CustomMigrator) -> Result<(), Error> {
     let has_done_migration = sqlx::query_scalar!(
         "SELECT EXISTS(SELECT name FROM windmill_migrations WHERE name = 'fix_flow_versioning_2')",
     )
-    .fetch_one(db)
+    .fetch_one(migrator.connection())
     .await?
     .unwrap_or(false);
 
@@ -44,14 +44,14 @@ async fn fix_flow_versioning_migration(
             let has_done_migration = sqlx::query_scalar!(
                 "SELECT EXISTS(SELECT name FROM windmill_migrations WHERE name = 'fix_flow_versioning_2')",
             )
-            .fetch_one(db)
+            .fetch_one(migrator.connection())
             .await?
             .unwrap_or(false);
 
             if !has_done_migration {
                 let query = include_str!("../../custom_migrations/fix_flow_versioning_2.sql");
                 tracing::info!("Applying fix_flow_versioning_2.sql");
-                let mut tx: sqlx::Transaction<'_, Postgres> = db.begin().await?;
+                let mut tx: sqlx::Transaction<'_, Postgres> = migrator.connection().begin().await?;
                 tx.execute(query).await?;
                 tracing::info!("Applied fix_flow_versioning_2.sql");
                 sqlx::query!(
diff --git a/backend/windmill-api/src/mcp/auto_generated_endpoints.rs b/backend/windmill-api/src/mcp/auto_generated_endpoints.rs
index 2e9b5babe7..d44484f9db 100644
--- a/backend/windmill-api/src/mcp/auto_generated_endpoints.rs
+++ b/backend/windmill-api/src/mcp/auto_generated_endpoints.rs
@@ -7,25 +7,53 @@ use windmill_mcp::server::EndpointTool;
 pub fn all_tools() -> Vec<EndpointTool> {
     vec![
     EndpointTool {
-        name: Cow::Borrowed("queryDocumentation"),
-        description: Cow::Borrowed("query Windmill AI documentation assistant (EE only)"),
+        name: Cow::Borrowed("searchDocs"),
+        description: Cow::Borrowed("Full-text search across the entire Windmill documentation. Provide one or more keywords; returns the most relevant docs pages, each with its Source URL and short matching snippets. Use this FIRST to find relevant pages by their content (a flag, function, error message, config key or concept). If the snippets answer the question, answer directly; otherwise call readDocsPage with a returned Source URL to read more."),
         instructions: Cow::Borrowed(""),
-        path: Cow::Borrowed("/inkeep"),
-        method: Cow::Borrowed("POST"),
+        path: Cow::Borrowed("/docs/search"),
+        method: Cow::Borrowed("GET"),
         path_params_schema: None,
-        query_params_schema: None,
-        body_schema: Some(serde_json::json!({
+        query_params_schema: Some(serde_json::json!({
         "type": "object",
         "properties": {
                 "query": {
                         "type": "string",
-                        "description": "The documentation query to send to the AI assistant"
+                        "description": "Keywords to search for in the documentation body, e.g. \"chromium worker tag\" or \"retry exponential backoff\". Fewer, more distinctive words match better."
                 }
         },
         "required": [
                 "query"
         ]
 })),
+        body_schema: None,
+        path_field_renames: None,
+        query_field_renames: None,
+        body_field_renames: None,
+    },
+    EndpointTool {
+        name: Cow::Borrowed("readDocsPage"),
+        description: Cow::Borrowed("Fetch the markdown of a single Windmill documentation page. Provide the `url` of a page found via searchDocs (its Source URL). If the page is large, this returns its list of section headings instead of the full content; call again with the `section` argument set to one of those headings to read that section."),
+        instructions: Cow::Borrowed(""),
+        path: Cow::Borrowed("/docs/page"),
+        method: Cow::Borrowed("GET"),
+        path_params_schema: None,
+        query_params_schema: Some(serde_json::json!({
+        "type": "object",
+        "properties": {
+                "url": {
+                        "type": "string",
+                        "description": "The docs page to read, as a Source URL returned by searchDocs (e.g. https://www.windmill.dev/docs/core_concepts/jobs). A bare path (e.g. /docs/core_concepts/jobs) is also accepted."
+                },
+                "section": {
+                        "type": "string",
+                        "description": "Optional. A heading title from the page outline to read just that section instead of the full page."
+                }
+        },
+        "required": [
+                "url"
+        ]
+})),
+        body_schema: None,
         path_field_renames: None,
         query_field_renames: None,
         body_field_renames: None,
@@ -84,6 +112,9 @@ pub fn all_tools() -> Vec<EndpointTool> {
                         "items": {
                                 "type": "string"
                         }
+                },
+                "ws_specific": {
+                        "type": "boolean"
                 }
         },
         "required": [
@@ -169,6 +200,9 @@ pub fn all_tools() -> Vec<EndpointTool> {
                                 "type": "string"
                         }
                 },
+                "ws_specific": {
+                        "type": "boolean"
+                },
                 "path__body": {
                         "type": "string",
                         "description": "The path to the variable (body parameter)"
@@ -210,6 +244,10 @@ pub fn all_tools() -> Vec<EndpointTool> {
                 "include_encrypted": {
                         "type": "boolean",
                         "description": "ask to include the encrypted value if secret and decrypt secret is not true (default: false)\n"
+                },
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
                 }
         },
         "required": []
@@ -260,6 +298,10 @@ pub fn all_tools() -> Vec<EndpointTool> {
                 "label": {
                         "type": "string",
                         "description": "Filter by label"
+                },
+                "include_draft_only": {
+                        "type": "boolean",
+                        "description": "When true, append per-user draft variables whose path has no\ndeployed variable. Synthesized rows carry `draft_only: true`\nso the home page can render a \"Draft\" badge.\n"
                 }
         },
         "required": []
@@ -309,6 +351,9 @@ pub fn all_tools() -> Vec<EndpointTool> {
                         "items": {
                                 "type": "string"
                         }
+                },
+                "ws_specific": {
+                        "type": "boolean"
                 }
         },
         "required": [
@@ -383,6 +428,9 @@ pub fn all_tools() -> Vec<EndpointTool> {
                                 "type": "string"
                         }
                 },
+                "ws_specific": {
+                        "type": "boolean"
+                },
                 "path__body": {
                         "type": "string",
                         "description": "The path to the resource (body parameter)"
@@ -414,7 +462,16 @@ pub fn all_tools() -> Vec<EndpointTool> {
                 "path"
         ]
 })),
-        query_params_schema: None,
+        query_params_schema: Some(serde_json::json!({
+        "type": "object",
+        "properties": {
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
+                }
+        },
+        "required": []
+})),
         body_schema: None,
         path_field_renames: None,
         query_field_renames: None,
@@ -469,6 +526,10 @@ pub fn all_tools() -> Vec<EndpointTool> {
                 "label": {
                         "type": "string",
                         "description": "Filter by label"
+                },
+                "include_draft_only": {
+                        "type": "boolean",
+                        "description": "When true, append per-user draft resources whose path has\nno deployed resource. Synthesized rows carry\n`draft_only: true`.\n"
                 }
         },
         "required": []
@@ -719,6 +780,10 @@ Creates a new version of an existing script when called with the same path and t
         "properties": {
                 "with_starred_info": {
                         "type": "boolean"
+                },
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
                 }
         },
         "required": []
@@ -847,6 +912,10 @@ Creates a new version of an existing script when called with the same path and t
         "properties": {
                 "with_starred_info": {
                         "type": "boolean"
+                },
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
                 }
         },
         "required": []
@@ -1184,6 +1253,14 @@ Creates a new version of an existing script when called with the same path and t
                                         "language"
                                 ]
                         }
+                },
+                "temp_script_refs": {
+                        "type": "object",
+                        "nullable": true,
+                        "description": "Map of relative-import script path -> temp storage hash so the preview job resolves those imports from not-yet-deployed local content instead of the deployed script",
+                        "additionalProperties": {
+                                "type": "string"
+                        }
                 }
         },
         "required": [
@@ -1456,6 +1533,10 @@ Creates a new version of an existing script when called with the same path and t
                         "type": "boolean",
                         "description": "filter on successful jobs"
                 },
+                "status": {
+                        "type": "string",
+                        "description": "filter on the exact completed job status. Unlike `success=true` (which also matches `skipped`), `status=success` matches only `success`.. Possible values: success, failure, canceled, skipped"
+                },
                 "all_workspaces": {
                         "type": "boolean",
                         "description": "get jobs from all workspaces (only valid if request come from the `admins` workspace)"
@@ -1464,6 +1545,10 @@ Creates a new version of an existing script when called with the same path and t
                         "type": "boolean",
                         "description": "is not a scheduled job"
                 },
+                "excludes_entrypoint_override": {
+                        "type": "boolean",
+                        "description": "exclude jobs that were started with a `_ENTRYPOINT_OVERRIDE` arg (e.g. dynamic-select helper runs and preprocessor previews)"
+                },
                 "broad_filter": {
                         "type": "string",
                         "description": "broad search across multiple fields (case-insensitive substring match on path, tag, schedule path, trigger kind, label)"
@@ -1502,6 +1587,10 @@ Creates a new version of an existing script when called with the same path and t
                 },
                 "no_code": {
                         "type": "boolean"
+                },
+                "approval_token": {
+                        "type": "string",
+                        "description": "Approval token granting read access to the job when not logged in. The token must be the one issued for this job's flow (i.e. the flow id used when generating the approval URL)."
                 }
         },
         "required": []
@@ -1559,7 +1648,7 @@ You should get the schema of the script or flow before creating the schedule to
         "properties": {
                 "path": {
                         "type": "string",
-                        "description": "The unique path identifier for this schedule"
+                        "description": "The unique Windmill path for this schedule. Must be of the form `u/<user>/<path>` or `f/<folder>/<path>`."
                 },
                 "schedule": {
                         "type": "string",
@@ -2002,7 +2091,16 @@ You should get the schema of the script or flow before updating the schedule to
                 "path"
         ]
 })),
-        query_params_schema: None,
+        query_params_schema: Some(serde_json::json!({
+        "type": "object",
+        "properties": {
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
+                }
+        },
+        "required": []
+})),
         body_schema: None,
         path_field_renames: None,
         query_field_renames: None,
@@ -2061,6 +2159,10 @@ You should get the schema of the script or flow before updating the schedule to
                 "label": {
                         "type": "string",
                         "description": "Filter by label"
+                },
+                "include_draft_only": {
+                        "type": "boolean",
+                        "description": "When true, append per-user draft schedules whose path has\nno deployed schedule. Synthesized rows carry\n`draft_only: true`.\n"
                 }
         },
         "required": []
diff --git a/backend/windmill-api/src/mcp/oauth_server.rs b/backend/windmill-api/src/mcp/oauth_server.rs
index 7cfabd2319..c5142c3031 100644
--- a/backend/windmill-api/src/mcp/oauth_server.rs
+++ b/backend/windmill-api/src/mcp/oauth_server.rs
@@ -18,6 +18,7 @@ use windmill_common::{
 };
 
 use crate::db::ApiAuthed;
+use windmill_mcp::parse_mcp_scopes;
 
 /// Token expiration for MCP OAuth tokens (1 week in seconds)
 const MCP_OAUTH_TOKEN_EXPIRATION_SECS: u64 = 7 * 24 * 60 * 60;
@@ -585,6 +586,8 @@ async fn handle_refresh_token_grant(
         Some(&new_access_token)
     };
     let new_refresh_token = rd_string(32);
+    // Re-issues the already-approved (hence already-contained) scopes verbatim;
+    // containment is enforced once at approval time, so no re-check here.
     let scopes = token_row.scopes;
 
     // Create new access token (rejects archived workspaces inline)
@@ -820,6 +823,40 @@ async fn oauth_approve_inner(
         .map(|s| s.to_string())
         .collect();
 
+    // The approver's own token bounds what it may grant: a scope-restricted MCP
+    // token must not approve a broader one (e.g. mcp:scripts:f/x -> mcp:all). An
+    // unrestricted approver (interactive session, scopes None) grants freely,
+    // which is the normal consent flow. This is the legitimate MCP-narrowing
+    // path, so it uses MCP-pattern containment rather than the byte-identical
+    // rule ensure_scopes_within_caller applies on the generic token endpoints.
+    let caller_restricted = authed
+        .scopes
+        .as_deref()
+        .is_some_and(|s| s.iter().any(|x| !x.starts_with("if_jobs:filter_tags:")));
+    if caller_restricted {
+        // An empty grant would mint a token the auth layer treats as unscoped
+        // (full privileges), so a restricted approver must not produce one.
+        if scopes.is_empty() {
+            return Err(Error::NotAuthorized(
+                "A scope-restricted token cannot approve an empty scope grant".to_string(),
+            ));
+        }
+        if scopes.iter().any(|s| !s.starts_with("mcp:")) {
+            return Err(Error::NotAuthorized(
+                "A scope-restricted token can only approve MCP (mcp:*) scopes".to_string(),
+            ));
+        }
+        let caller_config = parse_mcp_scopes(authed.scopes.as_deref().unwrap_or(&[]))
+            .map_err(|e| Error::InternalErr(format!("Failed to parse caller MCP scopes: {e}")))?;
+        let requested_config = parse_mcp_scopes(&scopes)
+            .map_err(|e| Error::BadRequest(format!("Failed to parse requested MCP scopes: {e}")))?;
+        if !caller_config.contains(&requested_config) {
+            return Err(Error::NotAuthorized(
+                "Requested scopes exceed the approving token's own MCP scopes".to_string(),
+            ));
+        }
+    }
+
     sqlx::query!(
         "INSERT INTO mcp_oauth_server_code
          (code, client_id, user_email, workspace_id, scopes, redirect_uri, code_challenge, code_challenge_method)
diff --git a/backend/windmill-api/src/mcp/utils.rs b/backend/windmill-api/src/mcp/utils.rs
index 4073758ba9..2184c1548f 100644
--- a/backend/windmill-api/src/mcp/utils.rs
+++ b/backend/windmill-api/src/mcp/utils.rs
@@ -382,12 +382,18 @@ pub fn build_query_string(
                 .map(|value| {
                     // Use the original name for the query parameter key
                     let original_name = get_original_name(param_name, query_field_renames);
-                    let value_str = value.to_string();
-                    let str_val = value_str.trim_matches('"');
+                    // For string values, use the raw content: to_string() would JSON-encode
+                    // it, and stripping the outer quotes leaves inner quotes backslash-escaped
+                    // (e.g. `{\"k\":\"v\"}`), which breaks downstream JSON parsing of params
+                    // like `args`/`result`. Non-string values keep their JSON serialization.
+                    let str_val = value
+                        .as_str()
+                        .map(|s| s.to_string())
+                        .unwrap_or_else(|| value.to_string());
                     format!(
                         "{}={}",
                         urlencoding::encode(&original_name),
-                        urlencoding::encode(str_val)
+                        urlencoding::encode(&str_val)
                     )
                 })
         })
@@ -455,9 +461,35 @@ pub async fn create_http_request(
         }
     };
 
+    // Bound the minted JWT to exactly this proxied route so a scope-restricted
+    // MCP token can't be widened into a full-privilege blank check. The
+    // endpoint-name gate (in the MCP runner) already authorized *which* endpoint
+    // may be called; this constrains what the resulting request can do. Unscoped
+    // callers (cookie / full-privilege tokens) keep an unscoped JWT to preserve
+    // existing behavior. A scope-restricted caller whose route can't be resolved
+    // fails closed.
+    let caller_restricted = api_authed
+        .scopes
+        .as_deref()
+        .is_some_and(|s| s.iter().any(|x| !x.starts_with("if_jobs:filter_tags:")));
+    let scopes = if caller_restricted {
+        let parsed = reqwest::Url::parse(url)
+            .map_err(|e| ErrorData::internal_error(format!("Invalid proxied URL: {}", e), None))?;
+        let scope =
+            windmill_api_auth::scopes::scope_for_route(method, parsed.path()).ok_or_else(|| {
+                ErrorData::internal_error(
+                    "Could not derive route scope for proxied MCP endpoint".to_string(),
+                    None,
+                )
+            })?;
+        Some(vec![scope])
+    } else {
+        None
+    };
+
     // Add authorization header
     let authed = Authed::from(api_authed.clone());
-    let token = create_jwt_token(authed, workspace_id, 3600, None, None, None, None)
+    let token = create_jwt_token(authed, workspace_id, 3600, None, None, None, scopes)
         .await
         .map_err(|e| ErrorData::internal_error(e.to_string(), None))?;
     request_builder = request_builder.header("Authorization", format!("Bearer {}", token));
@@ -598,4 +630,55 @@ mod tests {
         .expect("legitimate path should substitute");
         assert_eq!(result, "/w/dev/scripts/get/p/u/alice/my_script");
     }
+
+    fn single_query_schema(param: &str) -> Option<Value> {
+        Some(json!({
+            "type": "object",
+            "properties": { param: { "type": "string" } }
+        }))
+    }
+
+    #[test]
+    fn build_query_string_preserves_json_string_content() {
+        // A string param carrying JSON (e.g. the `args` filter on listJobs) must be
+        // emitted as its raw content so the backend can `serde_json::from_str` it.
+        let mut args = serde_json::Map::new();
+        args.insert("args".to_string(), json!("{\"key\":\"val\"}"));
+
+        let qs = build_query_string(&args, &single_query_schema("args"), &None);
+
+        // No backslash escaping: %5C must not appear; the encoded braces/quotes are exact.
+        assert_eq!(qs, "?args=%7B%22key%22%3A%22val%22%7D");
+        assert!(
+            !qs.contains("%5C"),
+            "must not contain backslash escapes: {qs}"
+        );
+    }
+
+    #[test]
+    fn build_query_string_keeps_non_string_serialization() {
+        let mut args = serde_json::Map::new();
+        args.insert("per_page".to_string(), json!(42));
+        assert_eq!(
+            build_query_string(&args, &single_query_schema("per_page"), &None),
+            "?per_page=42"
+        );
+
+        let mut args = serde_json::Map::new();
+        args.insert("running".to_string(), json!(true));
+        assert_eq!(
+            build_query_string(&args, &single_query_schema("running"), &None),
+            "?running=true"
+        );
+    }
+
+    #[test]
+    fn build_query_string_encodes_plain_string() {
+        let mut args = serde_json::Map::new();
+        args.insert("path".to_string(), json!("u/alice/my script"));
+        assert_eq!(
+            build_query_string(&args, &single_query_schema("path"), &None),
+            "?path=u%2Falice%2Fmy%20script"
+        );
+    }
 }
diff --git a/backend/windmill-api/src/offboarding.rs b/backend/windmill-api/src/offboarding.rs
index 3d5342e3a5..24b6d3f10d 100644
--- a/backend/windmill-api/src/offboarding.rs
+++ b/backend/windmill-api/src/offboarding.rs
@@ -1,13 +1,13 @@
 use std::collections::HashMap;
 
-use crate::db::ApiAuthed;
+use crate::db::{ApiAuthed, OptJobAuthed};
 use crate::secret_backend_ext::rename_vault_secrets_with_prefix;
 use axum::{
     extract::{Extension, Path},
     Json,
 };
 use serde::{Deserialize, Serialize};
-use windmill_api_auth::require_super_admin;
+use windmill_api_auth::{forbid_superadmin_job_token, require_super_admin};
 use windmill_api_users::users::delete_workspace_user_internal;
 use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
@@ -483,11 +483,13 @@ pub(crate) async fn global_offboard_preview(
 
 pub(crate) async fn offboard_global_user(
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Extension(db): Extension<DB>,
     Path(email): Path<String>,
     Json(req): Json<GlobalOffboardRequest>,
 ) -> Result<Json<OffboardResponse>> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
 
     let workspaces = sqlx::query!(
         "SELECT workspace_id, username FROM usr WHERE email = $1",
diff --git a/backend/windmill-api/src/secret_backend_ext.rs b/backend/windmill-api/src/secret_backend_ext.rs
index f76ba0ba64..fd17b8271e 100644
--- a/backend/windmill-api/src/secret_backend_ext.rs
+++ b/backend/windmill-api/src/secret_backend_ext.rs
@@ -8,245 +8,24 @@
 
 //! Secret backend extension for the API layer
 //!
-//! This module provides helper functions for integrating the SecretBackend
-//! trait with variable operations in the API.
+//! Backend resolution and read helpers live in
+//! `windmill_common::secret_backend`; this module keeps the API-specific bulk
+//! rename helper used when renaming users.
 //!
 //! Note: HashiCorp Vault integration requires Enterprise Edition.
 //! The OSS version only supports the database backend.
 
-#[cfg(all(feature = "private", feature = "enterprise"))]
-use std::sync::Arc;
-
 use windmill_common::{db::DB, error::Result};
 
-#[cfg(all(feature = "private", feature = "enterprise"))]
-use windmill_common::error::Error;
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-use windmill_common::secret_backend::{database::DatabaseBackend, SecretBackend};
-
 #[cfg(all(feature = "private", feature = "enterprise"))]
 use windmill_common::{
-    global_settings::{load_value_from_global_settings, SECRET_BACKEND_SETTING},
+    error::Error,
     secret_backend::{
-        AwsSecretsManagerBackend, AwsSecretsManagerSettings, AzureKeyVaultBackend,
-        AzureKeyVaultSettings, SecretBackendConfig, VaultBackend, VaultSettings,
+        get_secret_backend, is_aws_sm_stored_value, is_azure_kv_stored_value,
+        is_external_stored_value, is_vault_backend_configured,
     },
 };
 
-#[cfg(all(feature = "private", feature = "enterprise"))]
-use tokio::sync::RwLock;
-
-// Cached Vault backend to avoid recreating it for every request
-// This enables connection pooling and avoids repeated setup overhead
-#[cfg(all(feature = "private", feature = "enterprise"))]
-struct CachedVaultBackend {
-    backend: Arc<dyn SecretBackend>,
-    settings: VaultSettings,
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-lazy_static::lazy_static! {
-    static ref VAULT_BACKEND_CACHE: RwLock<Option<CachedVaultBackend>> = RwLock::new(None);
-}
-
-// Cached Azure Key Vault backend
-#[cfg(all(feature = "private", feature = "enterprise"))]
-struct CachedAzureKvBackend {
-    backend: Arc<dyn SecretBackend>,
-    settings: AzureKeyVaultSettings,
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-lazy_static::lazy_static! {
-    static ref AZURE_KV_BACKEND_CACHE: RwLock<Option<CachedAzureKvBackend>> = RwLock::new(None);
-}
-
-// Cached AWS Secrets Manager backend
-#[cfg(all(feature = "private", feature = "enterprise"))]
-struct CachedAwsSmBackend {
-    backend: Arc<dyn SecretBackend>,
-    settings: AwsSecretsManagerSettings,
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-lazy_static::lazy_static! {
-    static ref AWS_SM_BACKEND_CACHE: RwLock<Option<CachedAwsSmBackend>> = RwLock::new(None);
-}
-
-/// Get the current secret backend based on global settings (EE only)
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_secret_backend(db: &DB) -> Result<Arc<dyn SecretBackend>> {
-    let config = match load_value_from_global_settings(db, SECRET_BACKEND_SETTING).await? {
-        Some(value) => serde_json::from_value::<SecretBackendConfig>(value).unwrap_or_default(),
-        None => SecretBackendConfig::default(),
-    };
-
-    match config {
-        SecretBackendConfig::Database => Ok(Arc::new(DatabaseBackend::new(db.clone()))),
-        SecretBackendConfig::HashiCorpVault(settings) => {
-            get_or_create_vault_backend(db, settings).await
-        }
-        SecretBackendConfig::AzureKeyVault(settings) => {
-            get_or_create_azure_kv_backend(db, settings).await
-        }
-        SecretBackendConfig::AwsSecretsManager(settings) => {
-            get_or_create_aws_sm_backend(db, settings).await
-        }
-    }
-}
-
-/// Get a cached Vault backend or create a new one if settings changed
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_or_create_vault_backend(
-    _db: &DB,
-    settings: VaultSettings,
-) -> Result<Arc<dyn SecretBackend>> {
-    // Check if we have a cached backend with matching settings (read lock)
-    {
-        let cache = VAULT_BACKEND_CACHE.read().await;
-        if let Some(ref cached) = *cache {
-            if cached.settings == settings {
-                return Ok(cached.backend.clone());
-            }
-        }
-    }
-
-    // Need to create a new backend - acquire write lock
-    let mut cache = VAULT_BACKEND_CACHE.write().await;
-
-    // Double-check (another task may have created it while we waited)
-    if let Some(ref cached) = *cache {
-        if cached.settings == settings {
-            return Ok(cached.backend.clone());
-        }
-    }
-
-    // Create new backend
-    let backend: Arc<dyn SecretBackend> = {
-        #[cfg(feature = "openidconnect")]
-        if settings.token.is_none() {
-            Arc::new(VaultBackend::new_with_db(settings.clone(), _db.clone()))
-        } else {
-            Arc::new(VaultBackend::new(settings.clone()))
-        }
-
-        #[cfg(not(feature = "openidconnect"))]
-        Arc::new(VaultBackend::new(settings.clone()))
-    };
-
-    // Cache it
-    *cache = Some(CachedVaultBackend { backend: backend.clone(), settings });
-
-    Ok(backend)
-}
-
-/// Get a cached Azure Key Vault backend or create a new one if settings changed
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_or_create_azure_kv_backend(
-    _db: &DB,
-    settings: AzureKeyVaultSettings,
-) -> Result<Arc<dyn SecretBackend>> {
-    // Check if we have a cached backend with matching settings (read lock)
-    {
-        let cache = AZURE_KV_BACKEND_CACHE.read().await;
-        if let Some(ref cached) = *cache {
-            if cached.settings == settings {
-                return Ok(cached.backend.clone());
-            }
-        }
-    }
-
-    // Need to create a new backend - acquire write lock
-    let mut cache = AZURE_KV_BACKEND_CACHE.write().await;
-
-    // Double-check (another task may have created it while we waited)
-    if let Some(ref cached) = *cache {
-        if cached.settings == settings {
-            return Ok(cached.backend.clone());
-        }
-    }
-
-    // Create new backend
-    let backend: Arc<dyn SecretBackend> = Arc::new(AzureKeyVaultBackend::new(settings.clone()));
-
-    // Cache it
-    *cache = Some(CachedAzureKvBackend { backend: backend.clone(), settings });
-
-    Ok(backend)
-}
-
-/// Get a cached AWS SM backend or create a new one if settings changed
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_or_create_aws_sm_backend(
-    _db: &DB,
-    settings: AwsSecretsManagerSettings,
-) -> Result<Arc<dyn SecretBackend>> {
-    {
-        let cache = AWS_SM_BACKEND_CACHE.read().await;
-        if let Some(ref cached) = *cache {
-            if cached.settings == settings {
-                return Ok(cached.backend.clone());
-            }
-        }
-    }
-
-    let mut cache = AWS_SM_BACKEND_CACHE.write().await;
-
-    if let Some(ref cached) = *cache {
-        if cached.settings == settings {
-            return Ok(cached.backend.clone());
-        }
-    }
-
-    let backend: Arc<dyn SecretBackend> =
-        Arc::new(AwsSecretsManagerBackend::new_with_client(settings.clone()).await?);
-
-    *cache = Some(CachedAwsSmBackend { backend: backend.clone(), settings });
-
-    Ok(backend)
-}
-
-/// Check if an external secret backend is currently configured (EE only)
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn is_vault_backend_configured(db: &DB) -> Result<bool> {
-    let config = match load_value_from_global_settings(db, SECRET_BACKEND_SETTING).await? {
-        Some(value) => serde_json::from_value::<SecretBackendConfig>(value).unwrap_or_default(),
-        None => SecretBackendConfig::default(),
-    };
-
-    Ok(matches!(
-        config,
-        SecretBackendConfig::HashiCorpVault(_)
-            | SecretBackendConfig::AzureKeyVault(_)
-            | SecretBackendConfig::AwsSecretsManager(_)
-    ))
-}
-
-/// Check if a value is stored in Vault (indicated by the $vault: prefix)
-#[cfg(all(feature = "private", feature = "enterprise"))]
-fn is_vault_stored_value(value: &str) -> bool {
-    value.starts_with("$vault:")
-}
-
-/// Check if a value is stored in Azure Key Vault (indicated by the $azure_kv: prefix)
-#[cfg(all(feature = "private", feature = "enterprise"))]
-fn is_azure_kv_stored_value(value: &str) -> bool {
-    value.starts_with("$azure_kv:")
-}
-
-/// Check if a value is stored in AWS Secrets Manager
-#[cfg(all(feature = "private", feature = "enterprise"))]
-fn is_aws_sm_stored_value(value: &str) -> bool {
-    value.starts_with("$aws_sm:")
-}
-
-/// Check if a value is stored in any external secret backend
-#[cfg(all(feature = "private", feature = "enterprise"))]
-fn is_external_stored_value(value: &str) -> bool {
-    is_vault_stored_value(value) || is_azure_kv_stored_value(value) || is_aws_sm_stored_value(value)
-}
-
 /// Bulk rename secrets in Vault when a path prefix changes (e.g., user rename)
 /// EE only feature.
 ///
diff --git a/backend/windmill-api/src/token.rs b/backend/windmill-api/src/token.rs
index ac4da6497e..7a4a4887f8 100644
--- a/backend/windmill-api/src/token.rs
+++ b/backend/windmill-api/src/token.rs
@@ -98,6 +98,7 @@ fn build_standard_scope_domains() -> Vec<ScopeDomain> {
         ("configs", "Configs", "Configuration management", false),
         ("oauth", "OAuth", "OAuth management", false),
         ("ai", "AI", "AI feature management", false),
+        ("ai_skills", "AI Skills", "AI skill management", false),
         (
             "agent_workers",
             "Agent Workers",
@@ -193,6 +194,19 @@ lazy_static! {
             ],
         }];
 
+        // Read-only: `/api/docs/*` exposes only GET routes, so there is no
+        // `docs:write`. Kept out of build_standard_scope_domains (which mints a
+        // read+write pair) for that reason.
+        groups.push(ScopeDomain {
+            name: "Documentation".to_string(),
+            description: Some("Read-only documentation search".to_string()),
+            scopes: vec![ScopeOption {
+                value: "docs:read".to_string(),
+                label: "Read".to_string(),
+                requires_resource_path: false,
+            }],
+        });
+
         groups.extend(build_standard_scope_domains());
         groups.extend(build_trigger_scope_domains());
 
@@ -207,3 +221,21 @@ pub fn global_service() -> Router {
 async fn get_all_available_scopes() -> JsonResult<Vec<ScopeDomain>> {
     Ok(Json(ALL_SCOPES.clone()))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// The token-scope picker is driven by this catalog, so a scope that is
+    /// enforced but absent here can't be granted through the supported UI.
+    #[test]
+    fn docs_read_scope_is_exposed_read_only() {
+        let values: Vec<&str> = ALL_SCOPES
+            .iter()
+            .flat_map(|d| d.scopes.iter())
+            .map(|s| s.value.as_str())
+            .collect();
+        assert!(values.contains(&"docs:read"), "docs:read must be selectable");
+        assert!(!values.contains(&"docs:write"), "docs has no write surface");
+    }
+}
diff --git a/backend/windmill-api/src/triggers/http/handler.rs b/backend/windmill-api/src/triggers/http/handler.rs
index 0fd7717582..0508586182 100644
--- a/backend/windmill-api/src/triggers/http/handler.rs
+++ b/backend/windmill-api/src/triggers/http/handler.rs
@@ -216,7 +216,7 @@ async fn get_http_route_trigger(
     let email = windmill_common::users::get_email_from_permissioned_as(
         &trigger.permissioned_as,
         &trigger.workspace_id,
-        &db,
+        db,
     )
     .await?;
     let authed = windmill_api_auth::fetch_api_authed_from_permissioned_as(
diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
index 0da987e675..36b0d6c734 100644
--- a/backend/windmill-api/src/users.rs
+++ b/backend/windmill-api/src/users.rs
@@ -11,7 +11,7 @@ pub use windmill_api_users::users::*;
 
 use std::sync::Arc;
 
-use crate::db::ApiAuthed;
+use crate::db::{ApiAuthed, OptJobAuthed};
 use crate::secret_backend_ext::rename_vault_secrets_with_prefix;
 use argon2::Argon2;
 use axum::{
@@ -21,7 +21,7 @@ use axum::{
 };
 use hyper::StatusCode;
 use serde::Deserialize;
-use windmill_api_auth::require_super_admin;
+use windmill_api_auth::{forbid_superadmin_job_token, require_super_admin};
 use windmill_audit::audit_oss::audit_log;
 use windmill_audit::ActionKind;
 use windmill_common::audit::AuditAuthor;
@@ -71,11 +71,13 @@ pub fn make_unauthed_service() -> Router {
 
 async fn create_user(
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Extension(db): Extension<DB>,
     Extension(webhook): Extension<windmill_common::webhook::WebhookShared>,
     Extension(argon2): Extension<Arc<Argon2<'_>>>,
     Json(nu): Json<NewUser>,
 ) -> Result<(StatusCode, String)> {
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     crate::users_oss::create_user(authed, db, webhook, argon2, nu).await
 }
 
@@ -141,8 +143,10 @@ async fn set_password(
     Extension(db): Extension<DB>,
     Extension(argon2): Extension<Arc<Argon2<'_>>>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Json(ep): Json<EditPassword>,
 ) -> Result<String> {
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     let email = authed.email.clone();
     crate::users_oss::set_password(db, argon2, authed, &email, ep).await
 }
@@ -152,9 +156,11 @@ async fn set_password_of_user(
     Extension(argon2): Extension<Arc<Argon2<'_>>>,
     Path(email): Path<String>,
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Json(ep): Json<EditPassword>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
     crate::users_oss::set_password(db, argon2, authed, &email, ep).await
 }
 
@@ -165,11 +171,13 @@ struct RenameUser {
 
 async fn rename_user(
     authed: ApiAuthed,
+    OptJobAuthed { job_id, .. }: OptJobAuthed,
     Path(user_email): Path<String>,
     Extension(db): Extension<DB>,
     Json(ru): Json<RenameUser>,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
+    forbid_superadmin_job_token(&db, &authed.email, job_id).await?;
 
     let mut tx = db.begin().await?;
 
diff --git a/backend/windmill-api/src/workspaces_export.rs b/backend/windmill-api/src/workspaces_export.rs
index dae1be0614..839057b4b9 100644
--- a/backend/windmill-api/src/workspaces_export.rs
+++ b/backend/windmill-api/src/workspaces_export.rs
@@ -12,6 +12,8 @@ use crate::db::ApiAuthed;
 
 use crate::{apps::AppWithLastVersion, db::DB, folders::Folder};
 
+use windmill_api_auth::check_scopes;
+
 #[cfg(any(
     feature = "http_trigger",
     feature = "websocket",
@@ -582,6 +584,18 @@ pub(crate) async fn tarball_workspace(
         skip_resources
     );
 
+    // The route is gated by workspaces:read, but exporting DECRYPTED secrets is a
+    // variable-read capability beyond workspace metadata. Require variables:read
+    // only on the plaintext-secret path: ordinary tarball pulls (structure and
+    // encrypted-only values) keep working with workspaces:read, and the workspace
+    // key itself stays admin-only (include_key). No-op for unscoped tokens.
+    if plain_secret.or(plain_secrets).unwrap_or(false)
+        && !skip_secrets.unwrap_or(false)
+        && !skip_variables.unwrap_or(false)
+    {
+        check_scopes(&authed, || "variables:read".to_string())?;
+    }
+
     // Opt-in behavior for surfacing per-resource ACLs on flow/app rows.
     // Folder and group rows have always carried `extra_perms` in source and
     // continue to do so unconditionally (`KeepEvenEmpty`) so existing
@@ -592,8 +606,37 @@ pub(crate) async fn tarball_workspace(
         ExtraPermsBehavior::Drop
     };
 
+    // Resolve workspace dependencies on the pool *before* opening the RLS
+    // transaction: fetching them mid-transaction would hold a second
+    // simultaneous connection while `tx` is still checked out.
+    let workspace_dependencies = if include_workspace_dependencies.unwrap_or(false)
+        && require_admin(authed.is_admin, &authed.username).is_ok()
+    {
+        Some(WorkspaceDependencies::list(&w_id, &db).await?)
+    } else {
+        None
+    };
+
     let mut tx = user_db.begin(&authed).await?;
 
+    // Exporting decrypted secrets in bulk is the same capability as a per-item
+    // secret read, so record it for parity with variables.decrypt_secret.
+    if plain_secret.or(plain_secrets).unwrap_or(false)
+        && !skip_variables.unwrap_or(false)
+        && !skip_secrets.unwrap_or(false)
+    {
+        windmill_audit::audit_oss::audit_log(
+            &mut *tx,
+            &authed,
+            "variables.decrypt_secret",
+            windmill_audit::ActionKind::Execute,
+            &w_id,
+            Some("workspace_tarball_export"),
+            None,
+        )
+        .await?;
+    }
+
     // Source-of-truth for fork-ness: the workspace's parent_workspace_id column.
     // The wm-fork-* prefix is a creation-time naming convention that could in
     // principle drift (rename, manual SQL); the column is the contract that
@@ -851,11 +894,8 @@ pub(crate) async fn tarball_workspace(
         }
     }
 
-    if include_workspace_dependencies.unwrap_or(false)
-        && require_admin(authed.is_admin, &authed.username).is_ok()
-    {
+    if let Some(workspace_dependencies) = workspace_dependencies {
         tracing::info!("Including workspace dependencies in tarball export");
-        let workspace_dependencies = WorkspaceDependencies::list(&w_id, &db).await?;
         tracing::info!(
             "Found {} workspace dependencies",
             workspace_dependencies.len()
@@ -879,11 +919,16 @@ pub(crate) async fn tarball_workspace(
     }
 
     if include_schedules.unwrap_or(false) {
+        // Managed ducklake-maintenance schedules are excluded: they are
+        // derived from the workspace ducklake settings (and admins bypass the
+        // RLS that hides them), so exporting them would drag unsyncable rows
+        // into git.
         let schedules = sqlx::query_as::<_, Schedule>(
             "SELECT workspace_id, path, edited_by, edited_at, schedule, timezone, enabled, script_path, is_flow, args, extra_perms, email, permissioned_as, error, on_failure, on_failure_times, on_failure_exact, on_failure_extra_args, on_recovery, on_recovery_times, on_recovery_extra_args, on_success, on_success_extra_args, ws_error_handler_muted, retry, no_flow_overlap, summary, description, tag, paused_until, cron_version, dynamic_skip, labels FROM schedule
-             WHERE workspace_id = $1",
+             WHERE workspace_id = $1 AND NOT starts_with(path, $2)",
         )
         .bind(&w_id)
+        .bind(windmill_common::workspaces::DUCKLAKE_MAINTENANCE_PATH_PREFIX)
         .fetch_all(&mut *tx)
         .await?;
 
@@ -1501,6 +1546,34 @@ pub(crate) async fn tarball_workspace(
             .await?;
     }
 
+    {
+        // Data table migrations live in the `datatable_migrations` table; surface
+        // them in the export as `migrations/datatable/<datatable>/<version>_<name>`
+        // .up.sql (and .down.sql when present) so `wmill sync` treats them like any
+        // other workspace item.
+        let migrations = sqlx::query!(
+            "SELECT datatable, timestamp, name, code_up, code_down FROM datatable_migrations \
+             WHERE workspace_id = $1 ORDER BY datatable, timestamp",
+            &w_id
+        )
+        .fetch_all(&mut *tx)
+        .await?;
+        for m in migrations {
+            let base = format!(
+                "migrations/datatable/{}/{}_{}",
+                m.datatable, m.timestamp, m.name
+            );
+            archive
+                .write_to_archive(&m.code_up, &format!("{base}.up.sql"))
+                .await?;
+            if let Some(code_down) = m.code_down {
+                archive
+                    .write_to_archive(&code_down, &format!("{base}.down.sql"))
+                    .await?;
+            }
+        }
+    }
+
     archive.finish().await?;
 
     let file = tokio::fs::File::open(&file_path).await?;
diff --git a/backend/windmill-common/src/assets.rs b/backend/windmill-common/src/assets.rs
index 2b70227454..62f6d32070 100644
--- a/backend/windmill-common/src/assets.rs
+++ b/backend/windmill-common/src/assets.rs
@@ -4,9 +4,47 @@ use sqlx::{PgExecutor, Postgres, Transaction};
 
 use crate::{error, scripts::ScriptHash};
 
-pub use windmill_parser::asset_parser::{parse_pipeline_annotations, TriggerSpec, PARTITION_TOKEN};
+pub use windmill_parser::asset_parser::{
+    merge_column_lineage, parse_pipeline_annotations, ColumnLineage, ColumnRef, DataTest,
+    OnSchemaChange, PartitionKind, PipelineAnnotations, RetrySpec, TriggerSpec, PARTITION_TOKEN,
+};
 pub use windmill_types::assets::*;
 
+// --- Workspace DuckDB macro registry cache (worker hot path) ---
+// Every DuckDB job reads the `macro_definition` registry; cascades can run
+// many jobs per second. Primary invalidation is the
+// `notify_macro_registry_change` event, emitted transactionally with every
+// registry mutation and dispatched to this cache in main.rs — the TTL is a
+// backstop for mutation paths that don't emit (manual SQL edits).
+
+#[derive(Clone, Debug, sqlx::FromRow)]
+pub struct MacroRegistryEntry {
+    pub name: String,
+    pub params: String,
+    pub body: String,
+    pub is_table_macro: bool,
+    pub provider_path: String,
+}
+
+#[derive(Clone)]
+pub struct ExpiringMacroRegistry {
+    pub rows: std::sync::Arc<Vec<MacroRegistryEntry>>,
+    pub expires_at: std::time::Instant,
+}
+
+pub const MACRO_REGISTRY_TTL: std::time::Duration = std::time::Duration::from_secs(60);
+
+// Tests sharing one process across several databases must disable the cache:
+// it is keyed by workspace id alone, and a notify from one DB can't evict
+// entries populated from another (same hazard as DEPLOYED_SCRIPT_CACHE_DISABLED).
+pub static MACRO_REGISTRY_CACHE_DISABLED: std::sync::atomic::AtomicBool =
+    std::sync::atomic::AtomicBool::new(false);
+
+lazy_static::lazy_static! {
+    pub static ref MACRO_REGISTRY_CACHE: quick_cache::sync::Cache<String, ExpiringMacroRegistry> =
+        quick_cache::sync::Cache::new(1000);
+}
+
 #[derive(sqlx::Type, Debug, Clone, Copy, PartialEq)]
 #[sqlx(type_name = "SCRIPT_TRIGGER_KIND", rename_all = "lowercase")]
 pub enum ScriptTriggerKind {
@@ -131,6 +169,68 @@ fn is_write_access(access: Option<AssetUsageAccessType>) -> bool {
     )
 }
 
+/// Kinds whose *read* usage auto-derives a cascade trigger edge inside a
+/// `// pipeline`. Scoped to the two intra-pipeline data kinds — a ducklake
+/// table read (the core case) and an s3 object read (file-ingestion
+/// producers). Resource / datatable / volume reads stay explicit-`// on`:
+/// a config/lookup read cascading is more often surprising than wanted.
+fn is_auto_trigger_kind(kind: AssetKind) -> bool {
+    matches!(kind, AssetKind::Ducklake | AssetKind::S3Object)
+}
+
+/// Trigger refs auto-derived from a pipeline script's inferred reads, so the
+/// FROM clause alone wires the cascade edge (no redundant `// on <asset>`).
+///
+/// Included: an input read read-*only* (`R`) of a supported kind
+/// ([`is_auto_trigger_kind`]). The effective access type is
+/// `access_type.or(alt_access_type)` — same precedence as the persisted
+/// `asset.usage_access_type` and the frontend mirror's `access_type ??
+/// alt_access_type`, so a manual read override on an ambiguous parse still
+/// derives an edge (and the live canvas and the deployed graph agree).
+/// Excluded, each for a reason:
+/// - `RW` / `W` — the script also writes the asset; an edge would be a
+///   self-triggering loop.
+/// - `None` access — usage is ambiguous (poisoned merge) with no override;
+///   can't confirm a read, so fail safe and don't cascade.
+/// - already in `explicit_refs` — the author wrote `// on <asset>`, which
+///   wins (it carries the per-edge debounce/opts).
+/// - in `muted_refs` — a `// mute <asset>` opt-out (lookup / SCD input).
+///
+/// `mute_all` (from `// mute all`) short-circuits to no derivation, leaving
+/// only the explicit `// on` edges. Returns canonical refs (e.g.
+/// `ducklake://main.orders`), deduped, in input order.
+pub fn derive_pipeline_asset_trigger_refs(
+    assets: &[AssetWithAltAccessType],
+    explicit_refs: &HashSet<String>,
+    muted_refs: &HashSet<String>,
+    mute_all: bool,
+) -> Vec<String> {
+    if mute_all {
+        return vec![];
+    }
+    let mut out = vec![];
+    let mut seen = HashSet::new();
+    for a in assets {
+        // Effective access mirrors the persisted `usage_access_type` and the
+        // frontend derivation: an explicit parse wins, else the manual override.
+        let access = a.access_type.or(a.alt_access_type);
+        if access != Some(AssetUsageAccessType::R) || !is_auto_trigger_kind(a.kind) {
+            continue;
+        }
+        let Some(prefix) = a.kind.canonical_prefix() else {
+            continue;
+        };
+        let r = format!("{}{}", prefix, a.path);
+        if explicit_refs.contains(&r) || muted_refs.contains(&r) {
+            continue;
+        }
+        if seen.insert(r.clone()) {
+            out.push(r);
+        }
+    }
+    out
+}
+
 /// Clear and reinsert the full static-asset usage set of a script in one tx,
 /// invalidating the producer-writes cache at most once and only on a real
 /// change. The cache (asset_dispatch::ASSET_PRODUCER_WRITES_CACHE) keys a
@@ -314,6 +414,10 @@ mod debounce_duration_tests {
         assert_eq!(parse_duration_secs("5m"), Some(300));
         assert_eq!(parse_duration_secs("2h"), Some(7200));
         assert_eq!(parse_duration_secs(" 1d "), Some(86400));
+        // Explicit plus sign comes free with i64 parsing; the TS mirror
+        // (parseDurationSecs) matches it — keep the two in lockstep.
+        assert_eq!(parse_duration_secs("+5m"), Some(300));
+        assert_eq!(parse_duration_secs("+45"), Some(45));
     }
 
     #[test]
@@ -327,6 +431,173 @@ mod debounce_duration_tests {
     }
 }
 
+#[cfg(test)]
+mod derive_trigger_tests {
+    use super::{derive_pipeline_asset_trigger_refs, AssetKind, AssetUsageAccessType};
+    use std::collections::HashSet;
+    use windmill_types::assets::AssetWithAltAccessType;
+
+    fn asset(
+        kind: AssetKind,
+        path: &str,
+        at: Option<AssetUsageAccessType>,
+    ) -> AssetWithAltAccessType {
+        AssetWithAltAccessType {
+            path: path.to_string(),
+            kind,
+            access_type: at,
+            alt_access_type: None,
+            columns: None,
+        }
+    }
+
+    fn derive(assets: &[AssetWithAltAccessType]) -> Vec<String> {
+        derive_pipeline_asset_trigger_refs(assets, &HashSet::new(), &HashSet::new(), false)
+    }
+
+    #[test]
+    fn read_only_ducklake_and_s3_derive_an_edge() {
+        use AssetUsageAccessType::R;
+        let a = [
+            asset(AssetKind::Ducklake, "main.orders", Some(R)),
+            asset(AssetKind::S3Object, "raw/events", Some(R)),
+        ];
+        assert_eq!(
+            derive(&a),
+            vec![
+                "ducklake://main.orders".to_string(),
+                "s3://raw/events".to_string()
+            ]
+        );
+    }
+
+    #[test]
+    fn writes_and_rw_are_skipped_to_avoid_self_edges() {
+        use AssetUsageAccessType::*;
+        // W (pure producer) and RW (reads *and* writes the same table — a
+        // self-cascade if edged) both derive nothing.
+        let a = [
+            asset(AssetKind::Ducklake, "main.out", Some(W)),
+            asset(AssetKind::Ducklake, "main.self", Some(RW)),
+        ];
+        assert!(derive(&a).is_empty());
+    }
+
+    #[test]
+    fn ambiguous_access_and_unsupported_kinds_are_skipped() {
+        use AssetUsageAccessType::R;
+        let a = [
+            asset(AssetKind::Ducklake, "main.ambiguous", None), // poisoned merge
+            asset(AssetKind::Resource, "f/db", Some(R)),        // out of scope
+            asset(AssetKind::DataTable, "main.dt", Some(R)),    // out of scope
+        ];
+        assert!(derive(&a).is_empty());
+    }
+
+    #[test]
+    fn manual_read_override_on_ambiguous_parse_derives_an_edge() {
+        use AssetUsageAccessType::{R, W};
+        // Parser can't confirm access (`access_type: None`) but the user manually
+        // overrode it. Effective access = `access_type.or(alt_access_type)`, the
+        // same value persisted to `asset.usage_access_type` and used by the
+        // frontend canvas — so a read override derives an edge (parity, no
+        // silently-vanishing edge on deploy) and a write override does not.
+        let read_override = AssetWithAltAccessType {
+            path: "main.override_r".to_string(),
+            kind: AssetKind::Ducklake,
+            access_type: None,
+            alt_access_type: Some(R),
+            columns: None,
+        };
+        let write_override = AssetWithAltAccessType {
+            path: "main.override_w".to_string(),
+            kind: AssetKind::Ducklake,
+            access_type: None,
+            alt_access_type: Some(W),
+            columns: None,
+        };
+        assert_eq!(
+            derive(&[read_override, write_override]),
+            vec!["ducklake://main.override_r".to_string()]
+        );
+    }
+
+    #[test]
+    fn explicit_and_muted_refs_are_excluded() {
+        use AssetUsageAccessType::R;
+        let a = [
+            asset(AssetKind::Ducklake, "main.explicit", Some(R)),
+            asset(AssetKind::Ducklake, "main.muted", Some(R)),
+            asset(AssetKind::Ducklake, "main.keep", Some(R)),
+        ];
+        let explicit: HashSet<String> = ["ducklake://main.explicit".to_string()].into();
+        let muted: HashSet<String> = ["ducklake://main.muted".to_string()].into();
+        assert_eq!(
+            derive_pipeline_asset_trigger_refs(&a, &explicit, &muted, false),
+            vec!["ducklake://main.keep".to_string()]
+        );
+    }
+
+    #[test]
+    fn mute_all_derives_nothing() {
+        use AssetUsageAccessType::R;
+        let a = [asset(AssetKind::Ducklake, "main.orders", Some(R))];
+        assert!(
+            derive_pipeline_asset_trigger_refs(&a, &HashSet::new(), &HashSet::new(), true)
+                .is_empty()
+        );
+    }
+
+    #[test]
+    fn duplicate_reads_dedup() {
+        use AssetUsageAccessType::R;
+        let a = [
+            asset(AssetKind::Ducklake, "main.orders", Some(R)),
+            asset(AssetKind::Ducklake, "main.orders", Some(R)),
+        ];
+        assert_eq!(derive(&a), vec!["ducklake://main.orders".to_string()]);
+    }
+}
+
+#[cfg(test)]
+mod trigger_ref_roundtrip_tests {
+    use super::{parse_asset_trigger_ref, trigger_spec_to_row, AssetKind, ScriptTriggerKind};
+    use windmill_parser::asset_parser::{parse_asset_syntax, AssetKind as PAssetKind, TriggerSpec};
+
+    // `trigger_spec_to_row` rebuilds a stored ref as `s3://<path>`, and
+    // `parse_asset_trigger_ref` parses it back. The two must be inverse for
+    // every S3 URI form, or a consumer's `// on` trigger lands on a different
+    // graph node than the producer's inferred write. Because `parse_asset_syntax`
+    // strips ALL leading slashes, a canonical path never starts with `/`, so the
+    // naive `prefix + path` rebuild round-trips — including the `S3Object(s3="/x")`
+    // quad-slash case that previously desynced (path `/x` rebuilt to `s3:///x`,
+    // which re-parsed to `x`).
+    fn roundtrip(uri: &str) -> String {
+        let (pkind, path) = parse_asset_syntax(uri, false).expect("parse uri");
+        assert_eq!(pkind, PAssetKind::S3Object);
+        let spec = TriggerSpec::Asset { asset_kind: pkind, path: path.to_string(), debounce: None };
+        let (kind, stored) = trigger_spec_to_row(&spec).expect("to row");
+        assert_eq!(kind, ScriptTriggerKind::Asset);
+        let (rkind, rpath) = parse_asset_trigger_ref(&stored).expect("parse ref");
+        assert_eq!(rkind, AssetKind::S3Object);
+        // The producer path and the round-tripped consumer path must match.
+        assert_eq!(
+            rpath, path,
+            "round-trip diverged for {uri} (stored {stored})"
+        );
+        rpath
+    }
+
+    #[test]
+    fn s3_trigger_ref_roundtrips_for_every_uri_form() {
+        assert_eq!(roundtrip("s3:///exports/x"), "exports/x"); // SDK default storage
+        assert_eq!(roundtrip("s3://exports/x"), "exports/x"); // DuckDB / bare
+        assert_eq!(roundtrip("s3://mybucket/exports/x"), "mybucket/exports/x"); // explicit
+        assert_eq!(roundtrip("s3:////x"), "x"); // S3Object(s3="/x") quad-slash
+        assert_eq!(roundtrip("s3:///y=2024/f.parquet"), "y=2024/f.parquet"); // Hive
+    }
+}
+
 // Inverse of trigger_spec_to_row for the Asset variant: parses a stored
 // trigger_ref (e.g. `s3://foo`, `$res:bar`) back into the (kind, path) pair
 // used as a graph node id. Returns None for refs that don't match any known
diff --git a/backend/windmill-common/src/auth.rs b/backend/windmill-common/src/auth.rs
index 7fc6a0825a..bd6bf1ef9d 100644
--- a/backend/windmill-common/src/auth.rs
+++ b/backend/windmill-common/src/auth.rs
@@ -287,7 +287,7 @@ impl From<JobPerms> for Authed {
     }
 }
 
-pub async fn is_super_admin_email(db: &DB, email: &str) -> Result<bool> {
+pub async fn is_super_admin_email<'c>(db: impl sqlx::PgExecutor<'c>, email: &str) -> Result<bool> {
     if email == SUPERADMIN_SECRET_EMAIL || email == SUPERADMIN_NOTIFICATION_EMAIL {
         return Ok(true);
     }
@@ -413,9 +413,18 @@ async fn fetch_authed_from_permissioned_as_inner(
             })
         }
     } else {
+        // Bare (no `u/`|`g/` prefix) permissioned_as is reached for superadmins
+        // whose identifier is their email (they are not a workspace member). Use
+        // the instance-derived username when available so no email leaks
+        // downstream as the acting username.
+        let username = if is_super_admin && permissioned_as == email {
+            crate::usernames::get_instance_username_or_fallback_to_email(&mut *conn, email).await?
+        } else {
+            permissioned_as.to_string()
+        };
         Ok(Authed {
             email: email.to_string(),
-            username: permissioned_as.to_string(),
+            username,
             is_admin: is_super_admin,
             is_operator: true,
             groups: vec![],
diff --git a/backend/windmill-common/src/bench.rs b/backend/windmill-common/src/bench.rs
index 1ed2b9aa56..68c3cb5a31 100644
--- a/backend/windmill-common/src/bench.rs
+++ b/backend/windmill-common/src/bench.rs
@@ -258,6 +258,8 @@ pub async fn benchmark_init(benchmark_jobs: i32, db: &DB) {
             .execute(db)
             .await
             .unwrap_or_else(|e| panic!("failed to clean up concurrency_counter: {e:#}"));
+        // Benchmark jobs never produce dispatch_event / flow_conversation_message /
+        // zombie_job_counter rows, so this cleanup needs no side-table deletes (cf. delete_jobs).
         sqlx::query!("DELETE FROM v2_job WHERE workspace_id = 'admins'")
             .execute(db)
             .await
diff --git a/backend/windmill-common/src/cache.rs b/backend/windmill-common/src/cache.rs
index e39fd6ea43..6c34db8169 100644
--- a/backend/windmill-common/src/cache.rs
+++ b/backend/windmill-common/src/cache.rs
@@ -1189,11 +1189,25 @@ const _: () = {
             use std::fs::OpenOptions;
             use std::io::Write;
 
+            // Atomic write: truncate+write a uniquely-named temp file (UUID, not pid — pids
+            // collide across container PID namespaces on a shared cache volume), fsync, then
+            // rename(2) over the target. Without this a shorter overwrite leaves a stale tail
+            // and concurrent writers tear the file — a corrupt entry a reader would import.
+            let final_path = item.path(self);
+            let tmp_path = final_path.with_extension(format!("tmp.{}", Uuid::new_v4()));
             OpenOptions::new()
                 .write(true)
                 .create(true)
-                .open(item.path(self))
-                .and_then(|mut file| file.write_all(data.as_ref()))
+                .truncate(true)
+                .open(&tmp_path)
+                .and_then(|mut file| {
+                    file.write_all(data.as_ref())?;
+                    file.sync_all()
+                })
+                .and_then(|()| std::fs::rename(&tmp_path, &final_path))
+                .inspect_err(|_| {
+                    let _ = std::fs::remove_file(&tmp_path);
+                })
         }
     }
 
@@ -1237,6 +1251,33 @@ mod tests {
     use super::*;
     use serde_json::json;
 
+    #[test]
+    fn fs_cache_put_overwrites_without_stale_tail() {
+        // Regression for the non-truncating, non-atomic `put`: overwriting a value with a
+        // shorter one must not leave stale trailing bytes (which imported as corrupt/wrong
+        // content — the #9751 worker-cache hazard).
+        let dir = tempfile::tempdir().unwrap();
+        let root = dir.path();
+
+        root.put("k", b"a-long-cached-value-0123456789").unwrap();
+        assert_eq!(root.get("k").unwrap(), b"a-long-cached-value-0123456789");
+
+        root.put("k", b"short").unwrap();
+        assert_eq!(
+            root.get("k").unwrap(),
+            b"short",
+            "shorter overwrite must fully replace, no stale tail"
+        );
+
+        // No temp files left behind after a successful write.
+        let leftover: Vec<_> = std::fs::read_dir(root)
+            .unwrap()
+            .filter_map(|e| e.ok())
+            .filter(|e| e.file_name().to_string_lossy().contains(".tmp."))
+            .collect();
+        assert!(leftover.is_empty(), "temp files must be renamed/cleaned up");
+    }
+
     #[test]
     fn flow_data_extras_preserves_notes_and_groups() {
         let raw = serde_json::value::to_raw_value(&json!({
diff --git a/backend/windmill-common/src/ee_oss.rs b/backend/windmill-common/src/ee_oss.rs
index e68bc00c6e..26b9c87b7e 100644
--- a/backend/windmill-common/src/ee_oss.rs
+++ b/backend/windmill-common/src/ee_oss.rs
@@ -20,6 +20,7 @@ lazy_static::lazy_static! {
   pub static ref LICENSE_KEY: arc_swap::ArcSwap<String> = arc_swap::ArcSwap::from_pointee("".to_string());
   pub static ref LICENSE_OFFLINE_METADATA: arc_swap::ArcSwap<Option<OfflineMetadata>> = arc_swap::ArcSwap::from_pointee(None);
   pub static ref LICENSE_OFFLINE_OVER_CU_CAP: AtomicBool = AtomicBool::new(false);
+  pub static ref LICENSE_OFFLINE_OVER_SEAT_CAP: AtomicBool = AtomicBool::new(false);
   pub static ref LICENSE_OFFLINE_LAST_STATUS: arc_swap::ArcSwap<Option<OfflineCapStatus>> = arc_swap::ArcSwap::from_pointee(None);
   pub static ref LICENSE_OFFLINE_LAST_CHECKED_AT: arc_swap::ArcSwap<Option<chrono::DateTime<chrono::Utc>>> = arc_swap::ArcSwap::from_pointee(None);
 }
@@ -62,6 +63,14 @@ pub async fn check_seat_cap_for_new_user(
     Ok(None)
 }
 
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
+pub async fn check_seat_cap_for_reactivation(
+    _db: &DB,
+    _email: &str,
+) -> anyhow::Result<Option<String>> {
+    Ok(None)
+}
+
 #[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub async fn compute_instance_hash(_db: &DB) -> anyhow::Result<Option<String>> {
     // Implementation is not open source
diff --git a/backend/windmill-common/src/git_sync_oss.rs b/backend/windmill-common/src/git_sync_oss.rs
index 4cd7a7c3d1..1e17532ec7 100644
--- a/backend/windmill-common/src/git_sync_oss.rs
+++ b/backend/windmill-common/src/git_sync_oss.rs
@@ -15,6 +15,29 @@ pub async fn get_github_app_token_internal(
     ));
 }
 
+lazy_static::lazy_static! {
+    /// Matches a `user:password@` (or `user@`) userinfo component right after the URL scheme.
+    static ref GIT_URL_USERINFO_RE: regex::Regex =
+        regex::Regex::new(r"://[^/@]+@").unwrap();
+}
+
+/// Strip embedded credentials (the `user:password@` userinfo component) from a git URL so it can be
+/// safely included in error messages and logs. Falls back to a regex when the URL does not parse.
+pub fn sanitize_git_url(url: &str) -> String {
+    if let Ok(mut parsed) = Url::parse(url) {
+        if !parsed.username().is_empty() || parsed.password().is_some() {
+            // These setters only fail for cannot-be-a-base URLs, in which case we keep the parsed
+            // string as-is and let the regex fallback below handle stripping.
+            let _ = parsed.set_username("");
+            let _ = parsed.set_password(None);
+        }
+        return GIT_URL_USERINFO_RE
+            .replace(parsed.as_str(), "://***@")
+            .into_owned();
+    }
+    GIT_URL_USERINFO_RE.replace(url, "://***@").into_owned()
+}
+
 pub fn prepend_token_to_github_url(
     github_url: &str,
     installation_token: &str,
@@ -32,3 +55,41 @@ pub fn prepend_token_to_github_url(
         url.path()
     ))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::sanitize_git_url;
+
+    #[test]
+    fn strips_username_and_password() {
+        assert_eq!(
+            sanitize_git_url("https://user:p4ssw0rd@github.com/org/repo.git"),
+            "https://github.com/org/repo.git"
+        );
+    }
+
+    #[test]
+    fn strips_token_only_userinfo() {
+        assert_eq!(
+            sanitize_git_url("https://ghp_secrettoken@github.com/org/repo.git"),
+            "https://github.com/org/repo.git"
+        );
+    }
+
+    #[test]
+    fn leaves_credential_free_url_untouched() {
+        assert_eq!(
+            sanitize_git_url("https://github.com/org/repo.git"),
+            "https://github.com/org/repo.git"
+        );
+    }
+
+    #[test]
+    fn strips_credentials_from_unparseable_url() {
+        // scp-like syntax that `url::Url` cannot parse
+        assert_eq!(
+            sanitize_git_url("not a url://user:secret@host/repo"),
+            "not a url://***@host/repo"
+        );
+    }
+}
diff --git a/backend/windmill-common/src/jobs.rs b/backend/windmill-common/src/jobs.rs
index 78f5a6ee5a..2178d9a023 100644
--- a/backend/windmill-common/src/jobs.rs
+++ b/backend/windmill-common/src/jobs.rs
@@ -343,8 +343,8 @@ lazy_static::lazy_static! {
     ).unwrap_or(false);
 }
 
-pub async fn check_tag_available_for_workspace_internal(
-    db: &DB,
+pub async fn check_tag_available_for_workspace_internal<'c>(
+    db: impl sqlx::PgExecutor<'c>,
     w_id: &str,
     tag: &str,
     email: &str,
@@ -458,6 +458,47 @@ pub struct WorkerInternalServerInlineUtils {
 pub static WORKER_INTERNAL_SERVER_INLINE_UTILS: OnceCell<WorkerInternalServerInlineUtils> =
     OnceCell::new();
 
+/// Deletes the given jobs from `v2_job` together with the side tables that reference it
+/// without an `ON DELETE CASCADE` foreign key.
+///
+/// **Authorization contract:** this helper does NO authorization and NO workspace scoping —
+/// it deletes exactly the `ids` passed, regardless of which workspace they belong to. Callers
+/// MUST ensure `ids` only contains jobs the caller is allowed to delete (either a trusted
+/// internal id set, e.g. a retention batch, or ids already filtered by `workspace_id`).
+/// Passing user-supplied, unvalidated ids would reintroduce the cross-workspace side-row
+/// deletion this centralizes. It is deliberately not workspace-scoped at the signature level
+/// because its primary caller — retention — deletes expired jobs across every workspace at
+/// once; a `workspace_id` parameter cannot express that. (This is the same trust model as the
+/// `ON DELETE CASCADE` FK it replaces: given a job id, the row and its side rows go.)
+///
+/// Those FKs were removed (migration `drop_v2_job_side_table_cascades`) because they turned
+/// every bulk retention delete into a per-row RI trigger; for the unindexed
+/// `flow_conversation_message.job_id` that was a sequential scan per deleted row. The
+/// set-based deletes below cost one scan per table per call instead. Because the cascade no
+/// longer fires, every code path that deletes from `v2_job` by id must go through this helper
+/// (or delete these tables itself) or it will leave orphan rows behind.
+pub async fn delete_jobs(conn: &mut sqlx::PgConnection, ids: &[uuid::Uuid]) -> error::Result<()> {
+    sqlx::query!(
+        "DELETE FROM dispatch_event WHERE producer_job_id = ANY($1)",
+        ids
+    )
+    .execute(&mut *conn)
+    .await?;
+    sqlx::query!(
+        "DELETE FROM flow_conversation_message WHERE job_id = ANY($1)",
+        ids
+    )
+    .execute(&mut *conn)
+    .await?;
+    sqlx::query!("DELETE FROM zombie_job_counter WHERE job_id = ANY($1)", ids)
+        .execute(&mut *conn)
+        .await?;
+    sqlx::query!("DELETE FROM v2_job WHERE id = ANY($1)", ids)
+        .execute(&mut *conn)
+        .await?;
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
     use super::is_safe_log_file_path;
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index c501bbed6e..acf97734d8 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -61,9 +61,11 @@ pub mod indexer;
 pub mod instance_config;
 pub mod job_metrics;
 pub mod log_context;
+pub mod materialization;
 pub mod min_version;
 pub mod notify_events;
 pub mod runtime_assets;
+pub mod schema_contracts;
 pub mod workspace_dependencies;
 
 #[cfg(feature = "private")]
@@ -267,6 +269,10 @@ lazy_static::lazy_static! {
     pub static ref INSTANCE_NAME: String = rd_string(5);
 
     pub static ref DEPLOYED_SCRIPT_HASH_CACHE: Cache<(String, String), ExpiringLatestVersionId> = Cache::new(1000);
+    // Latest non-archived version per (workspace, path) for bundle cache keying —
+    // looser predicate than DEPLOYED_SCRIPT_HASH_CACHE (no lock requirement), so
+    // the two must not share entries. See get_latest_script_hash_for_import_cached.
+    pub static ref IMPORTED_SCRIPT_HASH_CACHE: Cache<(String, String), ExpiringLatestVersionId> = Cache::new(1000);
     pub static ref FLOW_VERSION_CACHE: Cache<(String, String), ExpiringLatestVersionId> = Cache::new(1000);
     pub static ref DYNAMIC_INPUT_CACHE: Cache<String, Arc<jobs::DynamicInput>> = Cache::new(1000);
     pub static ref DEPLOYED_SCRIPT_INFO_CACHE: Cache<(String, i64), ScriptHashInfo<ScriptRunnableSettingsHandle>> = Cache::new(1000);
@@ -284,6 +290,16 @@ lazy_static::lazy_static! {
 
 const LATEST_VERSION_ID_CACHE_TTL: std::time::Duration = std::time::Duration::from_secs(60);
 
+/// Test hook: disables the process-global deployed-script hash/info caches so
+/// every resolution reads the current DB. Integration tests use `#[sqlx::test]`
+/// isolated DBs that share one workspace id and reuse script paths, so a cache
+/// keyed by `(workspace, path)`/`(workspace, hash)` resolves a path to a hash
+/// that lives in a *different* test's DB — and when the info cache misses for
+/// that foreign hash the lookup 404s in the wrong DB. Always `false` in
+/// production (the caches are TTL/LRU-bounded against real deploys).
+pub static DEPLOYED_SCRIPT_CACHE_DISABLED: std::sync::atomic::AtomicBool =
+    std::sync::atomic::AtomicBool::new(false);
+
 pub async fn shutdown_signal(
     tx: KillpillSender,
     mut rx: tokio::sync::broadcast::Receiver<()>,
@@ -528,6 +544,157 @@ mod classify_python_logging_line_tests {
     }
 }
 
+#[cfg(test)]
+mod validate_dbname_tests {
+    use super::validate_dbname;
+
+    #[test]
+    fn accepts_letters_digits_underscores_and_hyphens() {
+        assert!(validate_dbname("mydb").is_ok());
+        assert!(validate_dbname("my_db").is_ok());
+        assert!(validate_dbname("my-database").is_ok());
+        assert!(validate_dbname("My-Db_1").is_ok());
+    }
+
+    #[test]
+    fn rejects_invalid_names() {
+        // Must start with a letter (hyphen/digit/underscore leads are rejected).
+        assert!(validate_dbname("-db").is_err());
+        assert!(validate_dbname("1db").is_err());
+        assert!(validate_dbname("_db").is_err());
+        // No other special characters or whitespace.
+        assert!(validate_dbname("my db").is_err());
+        assert!(validate_dbname("my;db").is_err());
+        assert!(validate_dbname("").is_err());
+    }
+}
+
+#[cfg(test)]
+mod pg_tls_tests {
+    use super::PgDatabase;
+
+    // A syntactically valid (self-signed) certificate, used only to exercise the
+    // "root certificate supplied" branch — its contents are never validated here.
+    const VALID_PEM: &str = "-----BEGIN CERTIFICATE-----\n\
+MIIDETCCAfmgAwIBAgIUX/yHsMoWBljFzJr5Xh7V2I6ykMEwDQYJKoZIhvcNAQEL\n\
+BQAwGDEWMBQGA1UEAwwNd2luZG1pbGwtdGVzdDAeFw0yNjA2MjkwOTUwNTlaFw0z\n\
+NjA2MjYwOTUwNTlaMBgxFjAUBgNVBAMMDXdpbmRtaWxsLXRlc3QwggEiMA0GCSqG\n\
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvF2hMw8adQGG6EnDk8GsOIoHT+kLN1W0F\n\
+yYFwH1wGVmzVP1YNfUts8aQfMtl/ZjW7SQlvKeK+18id4fVNYvZpbFhj66IsKMOU\n\
+MnJHcC6X/IAdhANyhM1fcrS6YupanAKOhLPk4HYRD5tGI4Y1vzTnQKGffIZ0bof7\n\
+3GtCiJLv8wrJKszeoKPtdFazdW+CYePbFq3Owc7HMo8CwA7A5TsgcowELhCfYwZv\n\
+Pn/9v+NDHQO0jJclH7qK221RkbqZGD+nPJ4rUm7oRi0vfApBQZ0FFJZjiki/Kg2+\n\
+RACb6Ud/LOeRBerKQHbN8KeYnGafCaIC4s/XytVwxAz+kgK1qyl7AgMBAAGjUzBR\n\
+MB0GA1UdDgQWBBRo2Jby4SZlrwMNbhA4bswZcBNRyjAfBgNVHSMEGDAWgBRo2Jby\n\
+4SZlrwMNbhA4bswZcBNRyjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA\n\
+A4IBAQBlED+FQW3GB3Wa1NdVN252vihuFNnbq81yvhf4T7dfAxwkxI9jiM+ZWCw2\n\
+g59FbLupj8Rwun5gE2H/9M8ZunISdlwaMH5nyDJlbRjttPfY1cEoyGEY+UXIslfg\n\
+BoiI5rOtz9R2qurxEic1VtEVfXhEuWwCG86vCBDdHrL/qqqUJEx/P8qyC7uVc8XC\n\
+uclnJVL7x1ax0jTmEPur9K+DQn2ws01mzpq2QwSunibpDL5D5xM1oYekv0tQFEkT\n\
+ta9ELulniZau8zUAtwqwecxodzl+KO8NYj0a9PGgAM64dMqkRtRA8P4UP350Nag3\n\
++hOq1qpWD7yPVyycx/KCilICOKVf\n\
+-----END CERTIFICATE-----\n";
+
+    fn pg(sslmode: Option<&str>, root_cert: Option<&str>) -> PgDatabase {
+        PgDatabase {
+            host: "db.example.com".to_string(),
+            user: Some("u".to_string()),
+            password: Some("p".to_string()),
+            port: Some(5432),
+            sslmode: sslmode.map(|s| s.to_string()),
+            dbname: "mydb".to_string(),
+            root_certificate_pem: root_cert.map(|s| s.to_string()),
+            accept_invalid_certs: None,
+            use_iam_auth: None,
+            region: None,
+        }
+    }
+
+    /// Whether the connector enforces certificate verification for the given config.
+    fn verifies(
+        sslmode: Option<&str>,
+        root_cert: Option<&str>,
+        accept_invalid_certs: Option<bool>,
+    ) -> bool {
+        let mut builder = native_tls::TlsConnector::builder();
+        PgDatabase::configure_pg_tls_verification(
+            &mut builder,
+            sslmode,
+            root_cert,
+            accept_invalid_certs,
+        )
+        .unwrap()
+    }
+
+    #[test]
+    fn verify_modes_enforce_verification_when_explicitly_requested() {
+        // accept_invalid_certs=Some(false) is what newly created resources carry: it
+        // verifies even with no custom cert (against the OS trust store).
+        assert!(verifies(Some("verify-full"), None, Some(false)));
+        assert!(verifies(Some("verify-ca"), None, Some(false)));
+        assert!(verifies(Some("verify-full"), Some(""), Some(false)));
+        assert!(verifies(Some("verify-full"), Some(VALID_PEM), Some(false)));
+        assert!(verifies(Some("verify-ca"), Some(VALID_PEM), Some(false)));
+    }
+
+    #[test]
+    fn verify_modes_unset_fall_back_to_legacy_behavior() {
+        // Unset (None): verify iff a root cert is present — preserves the behavior of
+        // resources that predate the flag (incl. git-synced), so upgrades don't break.
+        assert!(!verifies(Some("verify-full"), None, None));
+        assert!(!verifies(Some("verify-ca"), None, None));
+        assert!(!verifies(Some("verify-full"), Some(""), None));
+        assert!(verifies(Some("verify-full"), Some(VALID_PEM), None));
+        assert!(verifies(Some("verify-ca"), Some(VALID_PEM), None));
+    }
+
+    #[test]
+    fn accept_invalid_certs_true_disables_verification_for_verify_modes() {
+        assert!(!verifies(Some("verify-full"), Some(VALID_PEM), Some(true)));
+        assert!(!verifies(Some("verify-ca"), None, Some(true)));
+    }
+
+    #[test]
+    fn accept_invalid_certs_is_ignored_outside_verify_modes() {
+        // require never consults the flag: it verifies iff a cert is present, and
+        // encrypts-without-verifying otherwise, regardless of accept_invalid_certs.
+        assert!(!verifies(Some("require"), None, Some(false)));
+        assert!(!verifies(Some("require"), None, Some(true)));
+        assert!(!verifies(None, None, Some(true)));
+        assert!(verifies(Some("require"), Some(VALID_PEM), Some(true)));
+        assert!(verifies(Some("require"), Some(VALID_PEM), None));
+    }
+
+    #[test]
+    fn invalid_pem_is_rejected() {
+        let mut builder = native_tls::TlsConnector::builder();
+        let err = PgDatabase::configure_pg_tls_verification(
+            &mut builder,
+            Some("verify-full"),
+            Some("not a certificate"),
+            Some(false),
+        );
+        assert!(err.is_err());
+    }
+
+    #[test]
+    fn to_uri_collapses_verify_modes_for_tokio_postgres() {
+        // to_uri() feeds tokio-postgres, which only parses disable/prefer/require;
+        // verify-* therefore map to require there (verification is connector-driven).
+        for mode in ["require", "verify-ca", "verify-full"] {
+            assert!(
+                pg(Some(mode), None).to_uri().contains("sslmode=require"),
+                "{mode} should map to sslmode=require in to_uri()"
+            );
+        }
+        assert!(pg(Some("disable"), None)
+            .to_uri()
+            .contains("sslmode=disable"));
+        assert!(pg(Some("allow"), None).to_uri().contains("sslmode=prefer"));
+        assert!(pg(None, None).to_uri().contains("sslmode=prefer"));
+    }
+}
+
 #[derive(Serialize, Debug)]
 pub struct PrepareQueryColumnInfo {
     pub name: String,
@@ -552,6 +719,12 @@ pub struct PgDatabase {
     pub sslmode: Option<String>,
     pub dbname: String,
     pub root_certificate_pem: Option<String>,
+    /// Only meaningful for sslmode verify-ca/verify-full. `Some(true)` accepts any
+    /// server certificate (no chain or hostname check); `Some(false)` enforces
+    /// verification. `None` falls back to legacy behavior — verify only when a root
+    /// certificate is present — so resources that predate this flag (including
+    /// git-synced ones, whose source never sets it) keep working unchanged.
+    pub accept_invalid_certs: Option<bool>,
     pub use_iam_auth: Option<bool>,
     pub region: Option<String>,
 }
@@ -640,10 +813,94 @@ impl PgDatabase {
         }
     }
 
+    /// True when sslmode requests verification (verify-ca/verify-full) but the
+    /// effective configuration disables it, so the server's identity is not
+    /// checked. Mirrors the verify-* decision in `configure_pg_tls_verification`.
+    pub fn verify_mode_skips_verification(&self) -> bool {
+        matches!(
+            self.sslmode.as_deref(),
+            Some("verify-ca") | Some("verify-full")
+        ) && self.accept_invalid_certs.unwrap_or(
+            self.root_certificate_pem
+                .as_deref()
+                .unwrap_or("")
+                .is_empty(),
+        )
+    }
+
+    /// Configure certificate and hostname verification on a native-tls connector
+    /// according to the requested Postgres `sslmode`. The crates.io tokio-postgres
+    /// build only parses disable/prefer/require, so verify-ca and verify-full are
+    /// enforced here, on the connector, rather than through the connection URI.
+    ///
+    ///   verify-full — verify the certificate chain AND that it matches the host.
+    ///   verify-ca   — verify the chain only; libpq does not check the hostname.
+    ///   require / other — encrypt without verifying identity, unless a root
+    ///                     certificate is supplied (then verify the chain).
+    ///
+    /// `accept_invalid_certs` only applies to verify-ca/verify-full: `Some(true)`
+    /// accepts any certificate, `Some(false)` enforces verification, and `None`
+    /// falls back to the legacy behavior — verify only when a root certificate is
+    /// present — so resources predating the flag (including git-synced ones, whose
+    /// source never sets it) keep working unchanged. Verification uses the OS trust
+    /// store plus any supplied root certificate. Returns false when the connector
+    /// was set to accept any certificate, so callers can surface that an unverified
+    /// connection is being made.
+    fn configure_pg_tls_verification(
+        builder: &mut native_tls::TlsConnectorBuilder,
+        sslmode: Option<&str>,
+        root_certificate_pem: Option<&str>,
+        accept_invalid_certs: Option<bool>,
+    ) -> Result<bool, error::Error> {
+        use native_tls::Certificate;
+
+        let custom_root = match root_certificate_pem {
+            Some(pem) if !pem.is_empty() => Some(
+                Certificate::from_pem(pem.as_bytes())
+                    .map_err(|e| error::Error::BadConfig(format!("Invalid Certs: {e:#}")))?,
+            ),
+            _ => None,
+        };
+
+        match sslmode {
+            Some("verify-full") | Some("verify-ca") => {
+                // Unset falls back to the legacy behavior: verify iff a cert is present.
+                if accept_invalid_certs.unwrap_or(custom_root.is_none()) {
+                    builder
+                        .danger_accept_invalid_certs(true)
+                        .danger_accept_invalid_hostnames(true);
+                    return Ok(false);
+                }
+                if let Some(cert) = custom_root {
+                    builder.add_root_certificate(cert);
+                }
+                if sslmode == Some("verify-ca") {
+                    // verify-ca verifies the chain but, per libpq, not the hostname.
+                    builder.danger_accept_invalid_hostnames(true);
+                }
+                Ok(true)
+            }
+            _ => {
+                // "require": accept_invalid_certs does not apply. Encrypt but do not
+                // verify identity, unless an explicit root certificate was supplied
+                // (then verify the chain).
+                if let Some(cert) = custom_root {
+                    builder.add_root_certificate(cert);
+                    Ok(true)
+                } else {
+                    builder
+                        .danger_accept_invalid_certs(true)
+                        .danger_accept_invalid_hostnames(true);
+                    Ok(false)
+                }
+            }
+        }
+    }
+
     async fn connect_inner(
         &self,
     ) -> Result<(tokio_postgres::Client, TokioPgConnection), error::Error> {
-        use native_tls::{Certificate, TlsConnector};
+        use native_tls::TlsConnector;
         use postgres_native_tls::MakeTlsConnector;
         use tokio_postgres::tls::NoTls;
         let ssl_mode_is_require = matches!(
@@ -654,21 +911,17 @@ impl PgDatabase {
         if ssl_mode_is_require {
             tracing::info!("Creating new connection");
             let mut connector = TlsConnector::builder();
-            if let Some(root_certificate_pem) = &self.root_certificate_pem {
-                if !root_certificate_pem.is_empty() {
-                    connector.add_root_certificate(
-                        Certificate::from_pem(root_certificate_pem.as_bytes()).map_err(|e| {
-                            error::Error::BadConfig(format!("Invalid Certs: {e:#}"))
-                        })?,
-                    );
-                } else {
-                    connector.danger_accept_invalid_certs(true);
-                    connector.danger_accept_invalid_hostnames(true);
-                }
-            } else {
-                connector
-                    .danger_accept_invalid_certs(true)
-                    .danger_accept_invalid_hostnames(true);
+            Self::configure_pg_tls_verification(
+                &mut connector,
+                self.sslmode.as_deref(),
+                self.root_certificate_pem.as_deref(),
+                self.accept_invalid_certs,
+            )?;
+            if self.verify_mode_skips_verification() {
+                tracing::warn!(
+                    "Postgres connection with sslmode={} is not verifying the server certificate (accept_invalid_certs is set, or no root certificate is configured and the resource predates that flag). Set accept_invalid_certs=false or provide root_certificate_pem to enforce verification.",
+                    self.sslmode.as_deref().unwrap_or("")
+                );
             }
 
             let (client, connection) = tokio::time::timeout(
@@ -723,23 +976,16 @@ impl PgDatabase {
                 error::Error::InternalErr(format!("IAM token generation failed: {e:#}"))
             })?;
 
-        // RDS IAM auth requires SSL
+        // RDS IAM auth requires SSL.
         let mut connector = TlsConnector::builder();
-        if let Some(root_certificate_pem) = &self.root_certificate_pem {
-            if !root_certificate_pem.is_empty() {
-                connector.add_root_certificate(
-                    native_tls::Certificate::from_pem(root_certificate_pem.as_bytes())
-                        .map_err(|e| error::Error::BadConfig(format!("Invalid Certs: {e:#}")))?,
-                );
-            } else {
-                connector.danger_accept_invalid_certs(true);
-                connector.danger_accept_invalid_hostnames(true);
-            }
-        } else {
-            tracing::warn!("IAM RDS auth without root certificate: TLS certificate verification is disabled. Consider providing root_certificate_pem for production use.");
-            connector
-                .danger_accept_invalid_certs(true)
-                .danger_accept_invalid_hostnames(true);
+        let verified = Self::configure_pg_tls_verification(
+            &mut connector,
+            self.sslmode.as_deref(),
+            self.root_certificate_pem.as_deref(),
+            self.accept_invalid_certs,
+        )?;
+        if !verified {
+            tracing::warn!("IAM RDS auth without certificate verification: TLS certificate verification is disabled. Provide root_certificate_pem (and set sslmode=verify-full) to enforce verification.");
         }
 
         tracing::info!("Creating new IAM RDS connection to {}", &self.host);
@@ -804,6 +1050,7 @@ impl PgDatabase {
             dbname,
             sslmode,
             root_certificate_pem: None,
+            accept_invalid_certs: None,
             use_iam_auth: None,
             region: None,
         })
@@ -811,7 +1058,7 @@ impl PgDatabase {
 }
 
 /// Validate a database name to prevent SQL injection.
-/// Must start with a letter, contain only alphanumeric characters or underscores, and be <= 63 chars.
+/// Must start with a letter, contain only alphanumeric characters, underscores, or hyphens, and be <= 63 chars.
 pub fn validate_dbname(dbname: &str) -> error::Result<()> {
     let dbname = dbname.trim();
     if dbname.is_empty() {
@@ -835,10 +1082,11 @@ pub fn validate_dbname(dbname: &str) -> error::Result<()> {
     }
     if !dbname
         .chars()
-        .all(|c| c.is_ascii_alphanumeric() || c == '_')
+        .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
     {
         return Err(error::Error::BadRequest(
-            "Database name must contain only alphanumeric characters or underscores".to_string(),
+            "Database name must contain only alphanumeric characters, underscores, or hyphens"
+                .to_string(),
         ));
     }
     Ok(())
@@ -1278,8 +1526,12 @@ pub fn get_latest_deployed_hash_for_path<'e>(
 ) -> impl Future<Output = error::Result<ScriptHashInfo<ScriptRunnableSettingsHandle>>> + Send + 'e {
     async move {
         let cache_key = (w_id.to_string(), script_path.to_string());
+        let use_cache = !DEPLOYED_SCRIPT_CACHE_DISABLED.load(std::sync::atomic::Ordering::Relaxed);
         let mut computed_hash = None;
-        let hash = match DEPLOYED_SCRIPT_HASH_CACHE.get(&cache_key) {
+        let hash = match DEPLOYED_SCRIPT_HASH_CACHE
+            .get(&cache_key)
+            .filter(|_| use_cache)
+        {
             Some(cached_hash)
                 if cached_hash.expires_at > std::time::Instant::now()
                     && db.as_ref().is_none_or(|x| {
@@ -1322,13 +1574,15 @@ pub fn get_latest_deployed_hash_for_path<'e>(
                 };
 
                 let hash = utils::not_found_if_none(hash, "script", script_path)?;
-                DEPLOYED_SCRIPT_HASH_CACHE.insert(
-                    cache_key,
-                    ExpiringLatestVersionId {
-                        id: hash,
-                        expires_at: std::time::Instant::now() + LATEST_VERSION_ID_CACHE_TTL,
-                    },
-                );
+                if use_cache {
+                    DEPLOYED_SCRIPT_HASH_CACHE.insert(
+                        cache_key,
+                        ExpiringLatestVersionId {
+                            id: hash,
+                            expires_at: std::time::Instant::now() + LATEST_VERSION_ID_CACHE_TTL,
+                        },
+                    );
+                }
 
                 hash
             }
@@ -1353,6 +1607,46 @@ pub async fn get_latest_script_hash<'e, E: sqlx::PgExecutor<'e>>(
     return Ok(hash);
 }
 
+/// Latest non-archived hash for an imported `path`, for bundle cache keying.
+/// MUST select the same row as the bundler's content endpoint
+/// (`raw_script_by_path_internal`: `archived = false ORDER BY created_at DESC`,
+/// no lock predicate) — a stricter filter here would let the key point at an
+/// older version than the content that gets inlined. Cached with the same
+/// freshness contract as that endpoint's `RAW_SCRIPT_LATEST_HASH_CACHE`:
+/// evicted by `notify_runnable_version_change` events, 60s TTL fallback.
+pub async fn get_latest_script_hash_for_import_cached(
+    db: &DB,
+    w_id: &str,
+    script_path: &str,
+) -> error::Result<Option<i64>> {
+    let use_cache = !DEPLOYED_SCRIPT_CACHE_DISABLED.load(std::sync::atomic::Ordering::Relaxed);
+    let cache_key = (w_id.to_string(), script_path.to_string());
+    if use_cache {
+        if let Some(cached) = IMPORTED_SCRIPT_HASH_CACHE.get(&cache_key) {
+            if cached.expires_at > std::time::Instant::now() {
+                return Ok(Some(cached.id));
+            }
+        }
+    }
+    let hash = sqlx::query_scalar!(
+        "SELECT hash FROM script WHERE path = $1 AND workspace_id = $2 AND archived = false ORDER BY created_at DESC LIMIT 1",
+        script_path,
+        w_id
+    )
+    .fetch_optional(db)
+    .await?;
+    if let (true, Some(hash)) = (use_cache, hash) {
+        IMPORTED_SCRIPT_HASH_CACHE.insert(
+            cache_key,
+            ExpiringLatestVersionId {
+                id: hash,
+                expires_at: std::time::Instant::now() + LATEST_VERSION_ID_CACHE_TTL,
+            },
+        );
+    }
+    Ok(hash)
+}
+
 pub async fn get_script_info_for_hash<'e, E: sqlx::PgExecutor<'e>>(
     db_authed: Option<UserDbWithAuthed<'e, AuthedRef<'e>>>,
     db: E,
@@ -1360,9 +1654,10 @@ pub async fn get_script_info_for_hash<'e, E: sqlx::PgExecutor<'e>>(
     hash: i64,
 ) -> error::Result<ScriptHashInfo<ScriptRunnableSettingsHandle>> {
     let key = (w_id.to_string(), hash);
+    let use_cache = !DEPLOYED_SCRIPT_CACHE_DISABLED.load(std::sync::atomic::Ordering::Relaxed);
 
     let mut computed_hash = None;
-    match DEPLOYED_SCRIPT_INFO_CACHE.get(&key) {
+    match DEPLOYED_SCRIPT_INFO_CACHE.get(&key).filter(|_| use_cache) {
         Some(info)
             if db_authed.as_ref().is_none_or(|x| {
                 let r = HASH_PERMS_CACHE.check_perms_in_cache(x.authed, scripts::ScriptHash(hash));
@@ -1391,7 +1686,9 @@ pub async fn get_script_info_for_hash<'e, E: sqlx::PgExecutor<'e>>(
 
             let info = utils::not_found_if_none(info, "script", &hash.to_string())?;
 
-            DEPLOYED_SCRIPT_INFO_CACHE.insert(key, info.clone());
+            if use_cache {
+                DEPLOYED_SCRIPT_INFO_CACHE.insert(key, info.clone());
+            }
 
             Ok(info)
         }
diff --git a/backend/windmill-common/src/materialization.rs b/backend/windmill-common/src/materialization.rs
new file mode 100644
index 0000000000..236a71c855
--- /dev/null
+++ b/backend/windmill-common/src/materialization.rs
@@ -0,0 +1,380 @@
+//! CE materialization state — the per-partition status recorded by the managed
+//! `// materialize` write (in windmill-worker), read by the partition-status
+//! grid and by the EE backfill worklist.
+//!
+//! The write engine and this state are CE; only automatic partition
+//! *resolution* (`partition_ee`) and *backfill* orchestration
+//! (`pipeline_advanced_ee`) are enterprise. This module is the shared seam:
+//! the EE backfill enumerates the partitions in a range, diffs them against
+//! these rows to find the missing/failed set, and pushes one CE materialization
+//! job per gap (with an explicit `partition` arg — which runs idempotently and
+//! upserts the row here). Nothing about that orchestration lives in this file;
+//! it only needs the rows to exist, which is why recording is CE.
+
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::types::Json;
+use sqlx::{PgExecutor, Postgres, Transaction};
+use uuid::Uuid;
+
+use crate::assets::AssetKind;
+use crate::error::Result;
+
+/// Sentinel `partition` value for an unpartitioned (whole-table)
+/// materialization — partition is part of the primary key and cannot be NULL.
+pub const UNPARTITIONED: &str = "";
+
+/// Mirrors the `MATERIALIZATION_STATUS` pg enum (see migration
+/// `20260619170118_add_materialized_partition`).
+#[derive(sqlx::Type, Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[sqlx(type_name = "MATERIALIZATION_STATUS", rename_all = "lowercase")]
+#[serde(rename_all = "lowercase")]
+pub enum MaterializationStatus {
+    Running,
+    Materialized,
+    Failed,
+}
+
+/// One column of a captured asset output schema: its name and substrate type
+/// (e.g. `{"name": "order_id", "type": "BIGINT"}`). `type` is the substrate's
+/// own type spelling (DuckDB for ducklake) — kept verbatim so #2b can compare
+/// declared vs. captured without a lossy normalization step.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct SchemaColumn {
+    pub name: String,
+    #[serde(rename = "type")]
+    pub data_type: String,
+}
+
+/// The materialization outcome an agent worker (`Connection::Http`, no direct
+/// DB) sends to the API to be recorded. Mirrors the `record_materialization`
+/// args; the API handler unpacks it and calls that function with its own DB.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RecordMaterializationRequest {
+    pub asset_kind: AssetKind,
+    pub asset_path: String,
+    pub partition: String,
+    pub status: MaterializationStatus,
+    pub snapshot_id: Option<i64>,
+    pub row_count: Option<i64>,
+    pub job_id: Option<Uuid>,
+    pub error: Option<String>,
+    /// Captured output schema of the materialized asset (`None` when the
+    /// substrate/run produced no schema, e.g. a failed run or a polyglot helper
+    /// that doesn't DESCRIBE). When present, the recorder also upserts a
+    /// `materialized_asset_schema` version. Defaults to `None` so older agents
+    /// stay wire-compatible.
+    #[serde(default)]
+    pub schema: Option<Vec<SchemaColumn>>,
+}
+
+/// Upsert the latest materialization state for one (asset, partition) slice.
+/// The worker records the terminal outcome once the write finishes:
+/// `Materialized` (with the DuckLake `snapshot_id` + `row_count`) or `Failed`
+/// (with `error`). `Running` mirrors the pg enum but has no writer in this flow.
+/// Idempotent: re-running the same partition overwrites the row — exactly the
+/// backfill / failure-recovery contract.
+#[allow(clippy::too_many_arguments)]
+pub async fn record_materialization<'e>(
+    executor: impl PgExecutor<'e>,
+    workspace_id: &str,
+    asset_kind: AssetKind,
+    asset_path: &str,
+    partition: &str,
+    status: MaterializationStatus,
+    snapshot_id: Option<i64>,
+    row_count: Option<i64>,
+    job_id: Option<Uuid>,
+    error: Option<&str>,
+) -> Result<()> {
+    sqlx::query!(
+        "INSERT INTO materialized_partition
+           (workspace_id, asset_kind, asset_path, partition, status,
+            snapshot_id, row_count, job_id, materialized_at, error)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, now(), $9)
+         ON CONFLICT (workspace_id, asset_kind, asset_path, partition)
+         DO UPDATE SET status = EXCLUDED.status,
+                       -- A failed run records no snapshot, but must not erase the last
+                       -- committed one: a physical table from an earlier commit (or from a
+                       -- committed write whose data tests then failed) still exists, and
+                       -- fork defer/graph state keys on that evidence.
+                       snapshot_id = COALESCE(EXCLUDED.snapshot_id, materialized_partition.snapshot_id),
+                       row_count = EXCLUDED.row_count,
+                       job_id = EXCLUDED.job_id,
+                       materialized_at = now(),
+                       error = EXCLUDED.error",
+        workspace_id,
+        asset_kind as AssetKind,
+        asset_path,
+        partition,
+        status as MaterializationStatus,
+        snapshot_id,
+        row_count,
+        job_id,
+        error,
+    )
+    .execute(executor)
+    .await?;
+    Ok(())
+}
+
+/// One materialized-partition row, for the status grid / backfill diff.
+#[derive(sqlx::FromRow, Debug, Clone, Serialize)]
+pub struct MaterializedPartition {
+    pub asset_kind: AssetKind,
+    pub asset_path: String,
+    pub partition: String,
+    pub status: MaterializationStatus,
+    pub snapshot_id: Option<i64>,
+    pub row_count: Option<i64>,
+    pub job_id: Option<Uuid>,
+    pub materialized_at: DateTime<Utc>,
+    pub error: Option<String>,
+}
+
+/// All recorded partitions for one asset, newest first — the grid's data and
+/// the backfill worklist's "what already exists" set.
+pub async fn list_materialized_partitions<'e>(
+    executor: impl PgExecutor<'e>,
+    workspace_id: &str,
+    asset_kind: AssetKind,
+    asset_path: &str,
+) -> Result<Vec<MaterializedPartition>> {
+    let rows = sqlx::query_as!(
+        MaterializedPartition,
+        r#"SELECT asset_kind AS "asset_kind: AssetKind", asset_path, partition,
+                  status AS "status: MaterializationStatus", snapshot_id,
+                  row_count, job_id, materialized_at, error
+             FROM materialized_partition
+            WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3
+            ORDER BY partition DESC"#,
+        workspace_id,
+        asset_kind as AssetKind,
+        asset_path,
+    )
+    .fetch_all(executor)
+    .await?;
+    Ok(rows)
+}
+
+/// One captured schema version of an asset, newest first — the schema-evolution
+/// history surfaced on the asset node and read by #2b contract enforcement.
+#[derive(sqlx::FromRow, Debug, Clone, Serialize)]
+pub struct AssetSchemaVersion {
+    pub version: i64,
+    pub columns: Json<Vec<SchemaColumn>>,
+    pub snapshot_id: Option<i64>,
+    pub job_id: Option<Uuid>,
+    pub captured_at: DateTime<Utc>,
+}
+
+/// Record the captured output schema of a freshly-materialized asset.
+///
+/// **Authorization:** like the sibling `record_materialization`, this performs
+/// no access control of its own — it writes the row for whatever `workspace_id`
+/// it is given. Callers MUST pass a workspace-authorized executor and a
+/// `workspace_id` the caller is allowed to write: an RLS-scoped `user_db`
+/// transaction for API / agent-worker entry points, or the trusted worker DB
+/// pool for the in-worker recorder. Do not expose it to an unauthenticated path.
+///
+/// Versioning across re-materializations: a new `version` row is inserted only
+/// when `columns` differs from the latest stored version; an unchanged
+/// re-materialize re-affirms the latest row in place (updates its
+/// `snapshot_id`/`job_id`/`captured_at`). The result is a compact
+/// schema-evolution history where `MAX(version)` is the current contract.
+///
+/// Runs in a transaction guarded by a per-asset advisory lock so two concurrent
+/// materializations of the same asset can't both insert the same next version
+/// or interleave a stale comparison. Returns `true` if a new version was
+/// inserted (the schema changed), `false` if the latest was re-affirmed.
+pub async fn record_asset_schema(
+    tx: &mut Transaction<'_, Postgres>,
+    workspace_id: &str,
+    asset_kind: AssetKind,
+    asset_path: &str,
+    columns: &[SchemaColumn],
+    snapshot_id: Option<i64>,
+    job_id: Option<Uuid>,
+) -> Result<bool> {
+    // Serialize concurrent captures of the *same* asset; the lock auto-releases
+    // at tx end. Hash the identity into the bigint advisory-lock key space.
+    sqlx::query!(
+        "SELECT pg_advisory_xact_lock(hashtextextended($1, 0::int8))",
+        format!("materialized_asset_schema:{workspace_id}:{asset_kind:?}:{asset_path}"),
+    )
+    .fetch_one(&mut **tx)
+    .await?;
+
+    let latest = sqlx::query!(
+        r#"SELECT version, columns AS "columns: Json<Vec<SchemaColumn>>"
+             FROM materialized_asset_schema
+            WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3
+            ORDER BY version DESC
+            LIMIT 1"#,
+        workspace_id,
+        asset_kind as AssetKind,
+        asset_path,
+    )
+    .fetch_optional(&mut **tx)
+    .await?;
+
+    let columns_json = Json(columns.to_vec());
+    let next_version = match latest {
+        Some(latest) if latest.columns.0.as_slice() == columns => {
+            // Unchanged schema — re-affirm the latest version in place.
+            sqlx::query!(
+                "UPDATE materialized_asset_schema
+                    SET snapshot_id = $5, job_id = $6, captured_at = now()
+                  WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3
+                    AND version = $4",
+                workspace_id,
+                asset_kind as AssetKind,
+                asset_path,
+                latest.version,
+                snapshot_id,
+                job_id,
+            )
+            .execute(&mut **tx)
+            .await?;
+            return Ok(false);
+        }
+        Some(latest) => latest.version + 1,
+        None => 1,
+    };
+    sqlx::query!(
+        "INSERT INTO materialized_asset_schema
+           (workspace_id, asset_kind, asset_path, version, columns,
+            snapshot_id, job_id, captured_at)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, now())",
+        workspace_id,
+        asset_kind as AssetKind,
+        asset_path,
+        next_version,
+        columns_json as Json<Vec<SchemaColumn>>,
+        snapshot_id,
+        job_id,
+    )
+    .execute(&mut **tx)
+    .await?;
+    Ok(true)
+}
+
+/// One table a fork workspace should read from an ancestor through a defer view.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ForkDeferTable {
+    /// Lake-internal table name: the `asset_path` minus its `<lake>/` prefix (may itself be
+    /// `schema.table`).
+    pub table: String,
+    /// The owning ancestor's latest captured schema carries the SCD2 marker column
+    /// (`is_current`), so that lake also holds a managed `<table>_current` companion view
+    /// that consumers read — defer it alongside the table.
+    #[serde(default)]
+    pub with_current_view: bool,
+    /// Index into `DucklakeForkDefer.ancestors` (nearest-first) of the NEAREST ancestor that
+    /// materialized this table — the defer view must target that ancestor's namespace. In a
+    /// `fork → parent → root` chain where only root materialized a table, the parent has no
+    /// physical copy (it defers too), so a view over the parent would not bind. Defaults to 0
+    /// (the direct parent) for wire compatibility with agents that predate the field.
+    #[serde(default)]
+    pub ancestor_idx: u32,
+}
+
+/// Tables of lake `lake_name` materialized somewhere in the fork's ancestor chain
+/// (nearest-first) but not (yet) in the fork — the fork's read-defer set, each mapped to the
+/// nearest ancestor that owns a physical copy. Only `Materialized` rows count on every side: a
+/// deferred table must physically exist in the targeted ancestor (defer views bind at CREATE
+/// and would otherwise fail the whole job), and any successful fork materialization makes the
+/// fork's own table authoritative.
+///
+/// **Authorization:** performs no access control; trusted server-side callers only. It reads
+/// ancestor workspaces' rows on behalf of a fork — acceptable because defer itself exposes
+/// the ancestors' table contents to fork members.
+pub async fn list_fork_defer_tables<'e>(
+    executor: impl PgExecutor<'e>,
+    ancestor_workspace_ids: &[String],
+    fork_workspace_id: &str,
+    lake_name: &str,
+) -> Result<Vec<ForkDeferTable>> {
+    let rows = sqlx::query!(
+        r#"
+        WITH ancestor AS (
+            SELECT wid, ord FROM unnest($1::text[]) WITH ORDINALITY AS a(wid, ord)
+        ), anc_mat AS (
+            -- Per table, the nearest ancestor (lowest ord) that materialized it.
+            SELECT DISTINCT ON (mp.asset_path) mp.asset_path, a.wid, a.ord
+            FROM materialized_partition mp
+            JOIN ancestor a ON a.wid = mp.workspace_id
+            WHERE mp.asset_kind = 'ducklake' AND mp.status = 'materialized'
+              AND split_part(mp.asset_path, '/', 1) = $3 AND mp.asset_path LIKE '%/%'
+            ORDER BY mp.asset_path, a.ord
+        ), fork_mat AS (
+            -- Fork-OWNED assets: anything whose physical table exists in the fork
+            -- namespace, not just clean materializations. A committed write whose data
+            -- tests failed afterwards records status='failed' WITH a snapshot — its table
+            -- is real, and a defer view emitted over it would silently yield to it
+            -- (CREATE VIEW IF NOT EXISTS) while claiming the read defers to the parent.
+            SELECT DISTINCT asset_path FROM materialized_partition
+            WHERE workspace_id = $2 AND asset_kind = 'ducklake'
+              AND (status = 'materialized' OR snapshot_id IS NOT NULL)
+        ), latest_schema AS (
+            SELECT DISTINCT ON (workspace_id, asset_path) workspace_id, asset_path, columns
+            FROM materialized_asset_schema
+            WHERE workspace_id = ANY($1) AND asset_kind = 'ducklake'
+            ORDER BY workspace_id, asset_path, version DESC
+        )
+        SELECT am.asset_path AS "asset_path!",
+               am.ord AS "ord!",
+               COALESCE(EXISTS (
+                   SELECT 1 FROM jsonb_array_elements(ls.columns) e
+                   WHERE e->>'name' = 'is_current'
+               ), false) AS "has_current!"
+        FROM anc_mat am
+        LEFT JOIN latest_schema ls
+               ON ls.asset_path = am.asset_path AND ls.workspace_id = am.wid
+        WHERE am.asset_path NOT IN (SELECT asset_path FROM fork_mat)
+        ORDER BY am.asset_path
+        "#,
+        ancestor_workspace_ids,
+        fork_workspace_id,
+        lake_name,
+    )
+    .fetch_all(executor)
+    .await?;
+    Ok(rows
+        .into_iter()
+        .map(|r| ForkDeferTable {
+            table: r.asset_path[lake_name.len() + 1..].to_string(),
+            with_current_view: r.has_current,
+            // WITH ORDINALITY is 1-based; ancestors vec is 0-based.
+            ancestor_idx: (r.ord - 1).max(0) as u32,
+        })
+        .collect())
+}
+
+/// All captured schema versions for one asset, newest version first.
+///
+/// **Authorization:** performs no access control (mirrors
+/// `list_materialized_partitions`); the caller must pass a workspace-authorized
+/// executor (an RLS-scoped `user_db` transaction on the API read path) and a
+/// `workspace_id` it is allowed to read.
+pub async fn list_asset_schemas<'e>(
+    executor: impl PgExecutor<'e>,
+    workspace_id: &str,
+    asset_kind: AssetKind,
+    asset_path: &str,
+) -> Result<Vec<AssetSchemaVersion>> {
+    let rows = sqlx::query_as!(
+        AssetSchemaVersion,
+        r#"SELECT version, columns AS "columns: Json<Vec<SchemaColumn>>",
+                  snapshot_id, job_id, captured_at
+             FROM materialized_asset_schema
+            WHERE workspace_id = $1 AND asset_kind = $2 AND asset_path = $3
+            ORDER BY version DESC"#,
+        workspace_id,
+        asset_kind as AssetKind,
+        asset_path,
+    )
+    .fetch_all(executor)
+    .await?;
+    Ok(rows)
+}
diff --git a/backend/windmill-common/src/oidc_oss.rs b/backend/windmill-common/src/oidc_oss.rs
index e212558377..60a09ce9b7 100644
--- a/backend/windmill-common/src/oidc_oss.rs
+++ b/backend/windmill-common/src/oidc_oss.rs
@@ -61,6 +61,8 @@ pub struct JobClaim {
     pub email: String,
     pub workspace: String,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub fork_parent_workspace: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub end_user_email: Option<String>,
 }
 
diff --git a/backend/windmill-common/src/pipeline_advanced_oss.rs b/backend/windmill-common/src/pipeline_advanced_oss.rs
index 009e783bd5..3220b251a0 100644
--- a/backend/windmill-common/src/pipeline_advanced_oss.rs
+++ b/backend/windmill-common/src/pipeline_advanced_oss.rs
@@ -1,16 +1,27 @@
-//! OSS fallback: pipeline freshness/SLA enforcement and partition backfills
-//! are enterprise features; their implementations live in windmill-ee-private
-//! (see `pipeline_advanced_ee`). In the public build the entry points report
-//! that the enterprise edition is required.
+//! OSS fallback for enterprise pipeline features (implementations in
+//! windmill-ee-private, see `pipeline_advanced_ee`): partition backfill
+//! reports that the enterprise edition is required, and materialization-plan
+//! assembly runs the plan verbatim — dbt-like commit-then-test instead of the
+//! enterprise write-audit-publish. (Freshness lives elsewhere: the fresh/stale
+//! badge is CE in the assets API, the active watchdog is windmill-queue's
+//! `freshness_watchdog`.)
 
 use crate::error::Error;
 
-pub fn freshness_enforcement_todo() -> Error {
-    Error::internal_err(
-        "Pipeline freshness/SLA enforcement requires the enterprise edition".to_string(),
-    )
-}
-
 pub fn backfill_todo() -> Error {
     Error::internal_err("Pipeline partition backfill requires the enterprise edition".to_string())
 }
+
+/// Assemble a materialization plan into the statement list the DuckDB executor
+/// runs. The public build executes the plan verbatim — dbt-like
+/// commit-then-test: a failing `// data_test` still fails the run and stops
+/// the cascade, but the written slice stays live. The enterprise
+/// implementation (`pipeline_advanced_ee`) instead restructures the plan into
+/// write-audit-publish, where a failing test rolls the whole write back before
+/// anything is published.
+pub fn finalize_materialize_query(
+    plan: windmill_parser::sql_materialize::MaterializePlan,
+    _asset_path: &str,
+) -> Vec<String> {
+    plan.stmts.into_iter().map(|s| s.sql).collect()
+}
diff --git a/backend/windmill-common/src/query_builders.rs b/backend/windmill-common/src/query_builders.rs
index 2c168cd433..ce7dbc2533 100644
--- a/backend/windmill-common/src/query_builders.rs
+++ b/backend/windmill-common/src/query_builders.rs
@@ -172,6 +172,19 @@ pub struct SimpleColumn {
 pub struct SelectOptions {
     pub limit: Option<i64>,
     pub offset: Option<i64>,
+    /// DuckLake time-travel: when set (DuckDB only), the read is pinned to this
+    /// catalog snapshot via `AT (VERSION => n)`. Ignored for other db types.
+    pub version: Option<i64>,
+}
+
+/// DuckLake time-travel suffix appended after a table name in a FROM clause.
+/// `n` is a server-controlled `i64` (a snapshot id), so inlining it is
+/// injection-safe. Empty string when unpinned (reads the latest snapshot).
+fn duckdb_version_suffix(version: Option<i64>) -> String {
+    match version {
+        Some(v) => format!(" AT (VERSION => {})", v),
+        None => String::new(),
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -190,6 +203,8 @@ struct SelectPayload {
     #[serde(rename = "fixPgIntTypes")]
     fix_pg_int_types: Option<bool>,
     ducklake: Option<String>,
+    /// DuckLake snapshot to time-travel the read to (DuckDB only).
+    version: Option<i64>,
 }
 
 #[derive(Deserialize)]
@@ -200,6 +215,21 @@ struct CountPayload {
     #[serde(rename = "whereClause")]
     where_clause: Option<String>,
     ducklake: Option<String>,
+    /// DuckLake snapshot to time-travel the count to (DuckDB only).
+    version: Option<i64>,
+}
+
+/// `WM_INTERNAL_DB_DUCKLAKE_SNAPSHOTS` payload — lists the time-travel history
+/// of a ducklake table. DuckLake snapshots are catalog-wide commits, so without
+/// a `table` this lists every commit; with one it is scoped to snapshots where
+/// that table exists (see `expand_ducklake_snapshots`).
+#[derive(Deserialize)]
+struct DucklakeSnapshotsPayload {
+    ducklake: String,
+    /// Schema-qualified table name (e.g. `main.events_daily`) to scope the
+    /// history to. Snapshots predating the table's creation are excluded — a
+    /// time-travel read can't target a version where the table didn't exist.
+    table: Option<String>,
 }
 
 #[derive(Deserialize)]
@@ -304,6 +334,10 @@ pub fn try_expand_internal_db_query(
             expand_primary_key_constraint(json_str, db_type).map(ExpandedQuery::sql)
         }
         "SNOWFLAKE_PRIMARY_KEYS" => expand_snowflake_primary_keys(json_str).map(ExpandedQuery::sql),
+        // DuckLake time-travel: list a ducklake's snapshot history
+        "DUCKLAKE_SNAPSHOTS" => {
+            expand_ducklake_snapshots(json_str, db_type).map(ExpandedQuery::sql)
+        }
         _ => Err(format!("Unknown WM_INTERNAL_DB operation: {}", op)),
     };
 
@@ -324,7 +358,8 @@ fn expand_select(json_str: &str, db_type: DbType) -> Result<String, String> {
     let payload: SelectPayload =
         serde_json::from_str(json_str).map_err(|e| format!("Invalid SELECT payload: {}", e))?;
 
-    let options = SelectOptions { limit: payload.limit, offset: payload.offset };
+    let options =
+        SelectOptions { limit: payload.limit, offset: payload.offset, version: payload.version };
     let breaking = payload
         .fix_pg_int_types
         .map(|v| BreakingFeatures { fix_pg_int_types: v });
@@ -350,11 +385,47 @@ fn expand_count(json_str: &str, db_type: DbType) -> Result<String, String> {
         &payload.table,
         payload.where_clause.as_deref(),
         &payload.column_defs,
+        payload.version,
     )?;
 
     Ok(maybe_wrap_ducklake(query, payload.ducklake.as_deref()))
 }
 
+/// Expand `DUCKLAKE_SNAPSHOTS` into the catalog's time-travel history. DuckLake
+/// snapshots are catalog-wide commits, so `ducklake_snapshots('dl')` (the alias
+/// `maybe_wrap_ducklake` attaches) lists every version any `AT (VERSION => n)`
+/// read can target, newest first.
+fn expand_ducklake_snapshots(json_str: &str, db_type: DbType) -> Result<String, String> {
+    if db_type != DbType::Duckdb {
+        return Err("DUCKLAKE_SNAPSHOTS is only supported for DuckDB".to_string());
+    }
+    let payload: DucklakeSnapshotsPayload = serde_json::from_str(json_str)
+        .map_err(|e| format!("Invalid DUCKLAKE_SNAPSHOTS payload: {}", e))?;
+    // `dl` is the alias `wrap_ducklake_query` attaches and `USE`s below.
+    let query = match &payload.table {
+        // Scope to snapshots from the table's first creation onward. A DuckLake
+        // table created at snapshot N can't be read before N (the catalog-wide
+        // list would otherwise offer impossible versions). The creation snapshot
+        // is the earliest whose `changes.tables_created` names the table;
+        // COALESCE to 0 (show all) if it is never found.
+        Some(table) => {
+            let table = escape_sql_literal(table);
+            format!(
+                "SELECT snapshot_id, snapshot_time FROM ducklake_snapshots('dl') \
+                 WHERE snapshot_id >= COALESCE((\
+                   SELECT min(snapshot_id) FROM ducklake_snapshots('dl') \
+                   WHERE list_contains(changes.tables_created, '{table}')), 0) \
+                 ORDER BY snapshot_id DESC"
+            )
+        }
+        None => {
+            "SELECT snapshot_id, snapshot_time FROM ducklake_snapshots('dl') ORDER BY snapshot_id DESC"
+                .to_string()
+        }
+    };
+    Ok(maybe_wrap_ducklake(query, Some(&payload.ducklake)))
+}
+
 /// Filter columns to primary keys only; fall back to all columns if none are marked.
 fn pk_columns_or_all(columns: &[ColumnDef]) -> Vec<ColumnDef> {
     let pks: Vec<ColumnDef> = columns.iter().filter(|c| c.isprimarykey).cloned().collect();
@@ -950,9 +1021,10 @@ pub fn make_select_query(
             );
 
             query.push_str(&format!(
-                "SELECT {} FROM {}\n",
+                "SELECT {} FROM {}{}\n",
                 filtered_columns.join(", "),
-                quote_table_name(table, db_type)
+                quote_table_name(table, db_type),
+                duckdb_version_suffix(options.and_then(|o| o.version))
             ));
             query.push_str(&format!(
                 " WHERE {} {}\n",
@@ -977,6 +1049,8 @@ pub fn make_count_query(
     table: &str,
     where_clause: Option<&str>,
     column_defs: &[ColumnDef],
+    // DuckLake time-travel snapshot (DuckDB only); `None` counts the latest.
+    version: Option<i64>,
 ) -> Result<String, String> {
     let where_prefix = " WHERE ";
     let and_condition = " AND ";
@@ -1118,8 +1192,9 @@ pub fn make_count_query(
                 quicksearch_condition.push_str(" ($quicksearch = '' OR 1 = 1)");
             }
             query.push_str(&format!(
-                "SELECT COUNT(*) as count FROM {}",
-                quote_table_name(table, db_type)
+                "SELECT COUNT(*) as count FROM {}{}",
+                quote_table_name(table, db_type),
+                duckdb_version_suffix(version)
             ));
         }
     }
@@ -2998,7 +3073,7 @@ mod tests {
     #[test]
     fn test_select_snowflake_custom_limit() {
         let cols = vec![col("id", "int")];
-        let opts = SelectOptions { limit: Some(50), offset: Some(10) };
+        let opts = SelectOptions { limit: Some(50), offset: Some(10), version: None };
         let result = make_select_query(
             "my_table",
             &cols,
@@ -3072,7 +3147,7 @@ mod tests {
     #[test]
     fn test_count_postgresql_basic() {
         let cols = vec![col("id", "int4"), col("name", "text")];
-        let result = make_count_query(DbType::Postgresql, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Postgresql, "my_table", None, &cols, None).unwrap();
 
         assert!(result.contains("-- $1 quicksearch (text)"));
         assert!(result.contains("SELECT COUNT(*) as count FROM \"my_table\""));
@@ -3090,6 +3165,7 @@ mod tests {
             "my_table",
             Some("status = 'active'"),
             &cols,
+            None,
         )
         .unwrap();
 
@@ -3105,7 +3181,7 @@ mod tests {
             c.ignored = Some(true);
             c
         }];
-        let result = make_count_query(DbType::Postgresql, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Postgresql, "my_table", None, &cols, None).unwrap();
         assert!(result.contains("($1 = '' OR 1 = 1)"));
     }
 
@@ -3116,7 +3192,7 @@ mod tests {
     #[test]
     fn test_count_mysql_basic() {
         let cols = vec![col("id", "int"), col("name", "varchar")];
-        let result = make_count_query(DbType::Mysql, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Mysql, "my_table", None, &cols, None).unwrap();
 
         assert!(result.contains("-- :quicksearch (text)"));
         assert!(result.contains("SELECT COUNT(*) as count FROM `my_table`"));
@@ -3130,7 +3206,7 @@ mod tests {
     #[test]
     fn test_count_mssql_basic() {
         let cols = vec![col("id", "int"), col("name", "nvarchar")];
-        let result = make_count_query(DbType::MsSqlServer, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::MsSqlServer, "my_table", None, &cols, None).unwrap();
 
         assert!(result.contains("SELECT COUNT(*) as count FROM [my_table]"));
         assert!(result.contains("(@p1 = '' OR CONCAT([id], [name]) LIKE '%' + @p1 + '%')"));
@@ -3143,7 +3219,7 @@ mod tests {
     #[test]
     fn test_count_snowflake_basic() {
         let cols = vec![col("id", "int"), col("name", "text")];
-        let result = make_count_query(DbType::Snowflake, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Snowflake, "my_table", None, &cols, None).unwrap();
 
         // Two quicksearch params for snowflake with visible columns
         assert!(result.contains("-- ? quicksearch (text)\n-- ? quicksearch (text)"));
@@ -3158,7 +3234,7 @@ mod tests {
             c.ignored = Some(true);
             c
         }];
-        let result = make_count_query(DbType::Snowflake, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Snowflake, "my_table", None, &cols, None).unwrap();
         // One quicksearch param
         let param_lines: Vec<&str> = result.lines().filter(|l| l.starts_with("-- ?")).collect();
         assert_eq!(param_lines.len(), 1);
@@ -3172,7 +3248,7 @@ mod tests {
     #[test]
     fn test_count_bigquery_basic() {
         let cols = vec![col("id", "INTEGER"), col("name", "STRING")];
-        let result = make_count_query(DbType::Bigquery, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Bigquery, "my_table", None, &cols, None).unwrap();
 
         assert!(result.contains("-- @quicksearch (string)"));
         assert!(result.contains("SELECT COUNT(*) as count FROM `my_table`"));
@@ -3182,7 +3258,7 @@ mod tests {
     #[test]
     fn test_count_bigquery_json_type() {
         let cols = vec![col("id", "INTEGER"), col("data", "JSON")];
-        let result = make_count_query(DbType::Bigquery, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Bigquery, "my_table", None, &cols, None).unwrap();
         assert!(result.contains("TO_JSON_STRING(`data`)"));
     }
 
@@ -3193,7 +3269,7 @@ mod tests {
     #[test]
     fn test_count_duckdb_basic() {
         let cols = vec![col("id", "int"), col("name", "text")];
-        let result = make_count_query(DbType::Duckdb, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Duckdb, "my_table", None, &cols, None).unwrap();
 
         assert!(result.contains("-- $quicksearch (text)"));
         assert!(result.contains("SELECT COUNT(*) as count FROM \"my_table\""));
@@ -3202,6 +3278,74 @@ mod tests {
         );
     }
 
+    // -----------------------------------------------------------------------
+    // DuckLake time-travel (AT VERSION) + snapshot history
+    // -----------------------------------------------------------------------
+
+    #[test]
+    fn test_select_duckdb_time_travel() {
+        let cols = vec![col("id", "int"), col("name", "text")];
+        let opts = SelectOptions { limit: None, offset: None, version: Some(42) };
+        let result =
+            make_select_query("orders", &cols, None, DbType::Duckdb, Some(&opts), None).unwrap();
+        // Read is pinned to the catalog snapshot via AT (VERSION => n).
+        assert!(result.contains("FROM \"orders\" AT (VERSION => 42)\n"));
+    }
+
+    #[test]
+    fn test_select_duckdb_no_version_unpinned() {
+        let cols = vec![col("id", "int")];
+        let result = make_select_query("orders", &cols, None, DbType::Duckdb, None, None).unwrap();
+        // Without a version the read targets the latest snapshot — no AT clause.
+        assert!(result.contains("FROM \"orders\"\n"));
+        assert!(!result.contains("AT (VERSION"));
+    }
+
+    #[test]
+    fn test_count_duckdb_time_travel() {
+        let cols = vec![col("id", "int")];
+        let result = make_count_query(DbType::Duckdb, "orders", None, &cols, Some(7)).unwrap();
+        assert!(result.contains("FROM \"orders\" AT (VERSION => 7)"));
+    }
+
+    #[test]
+    fn test_version_ignored_for_non_duckdb() {
+        // AT (VERSION) is DuckLake-only; other dialects must never emit it even
+        // if a version is somehow passed through.
+        let cols = vec![col("id", "int4")];
+        let opts = SelectOptions { limit: None, offset: None, version: Some(5) };
+        let result =
+            make_select_query("orders", &cols, None, DbType::Postgresql, Some(&opts), None)
+                .unwrap();
+        assert!(!result.contains("AT (VERSION"));
+    }
+
+    #[test]
+    fn test_expand_ducklake_snapshots() {
+        let json = r#"{"ducklake": "analytics"}"#;
+        let result = expand_ducklake_snapshots(json, DbType::Duckdb).unwrap();
+        assert!(result.contains("ATTACH 'ducklake://analytics' AS dl;USE dl;"));
+        assert!(result.contains("ducklake_snapshots('dl')"));
+        assert!(result.contains("ORDER BY snapshot_id DESC"));
+        // Unscoped: no per-table existence filter.
+        assert!(!result.contains("tables_created"));
+    }
+
+    #[test]
+    fn test_expand_ducklake_snapshots_scoped_to_table() {
+        let json = r#"{"ducklake": "analytics", "table": "main.events_daily"}"#;
+        let result = expand_ducklake_snapshots(json, DbType::Duckdb).unwrap();
+        // Scoped to snapshots from the table's first creation onward.
+        assert!(result.contains("list_contains(changes.tables_created, 'main.events_daily')"));
+        assert!(result.contains("snapshot_id >= COALESCE"));
+    }
+
+    #[test]
+    fn test_expand_ducklake_snapshots_non_duckdb_errors() {
+        let json = r#"{"ducklake": "analytics"}"#;
+        assert!(expand_ducklake_snapshots(json, DbType::Postgresql).is_err());
+    }
+
     // -----------------------------------------------------------------------
     // DELETE - all DB types
     // -----------------------------------------------------------------------
@@ -3500,7 +3644,7 @@ mod tests {
     #[test]
     fn test_count_mssql_no_where() {
         let cols = vec![col("id", "int")];
-        let result = make_count_query(DbType::MsSqlServer, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::MsSqlServer, "my_table", None, &cols, None).unwrap();
         // MSSQL uses WHERE directly (no AND replacement)
         assert!(result.contains("SELECT COUNT(*) as count FROM [my_table] WHERE "));
     }
@@ -3508,7 +3652,7 @@ mod tests {
     #[test]
     fn test_count_mysql_no_where_uses_where_keyword() {
         let cols = vec![col("id", "int")];
-        let result = make_count_query(DbType::Mysql, "my_table", None, &cols).unwrap();
+        let result = make_count_query(DbType::Mysql, "my_table", None, &cols, None).unwrap();
         // The AND should be replaced with WHERE
         assert!(result.contains("FROM `my_table` WHERE "));
         assert!(!result.contains("FROM `my_table` AND "));
diff --git a/backend/windmill-common/src/runnable_settings/mod.rs b/backend/windmill-common/src/runnable_settings/mod.rs
index c5692d40bd..33d4c1a039 100644
--- a/backend/windmill-common/src/runnable_settings/mod.rs
+++ b/backend/windmill-common/src/runnable_settings/mod.rs
@@ -52,13 +52,10 @@ pub trait RunnableSettingsTrait:
 
     /// get [[Self]] from cache or fetch from db
     /// if not found, returns Error
-    fn get<'a>(
+    fn get<'e>(
         hash: i64,
-        db: &'a Pool<Postgres>,
-    ) -> impl Future<Output = Result<Self, error::Error>>
-    where
-        Self: 'a,
-    {
+        db: impl sqlx::PgExecutor<'e>,
+    ) -> impl Future<Output = Result<Self, error::Error>> {
         async move {
             let v = RUNNABLE_INDIVIDUAL_SETTINGS
                 .get_or_insert_async(hash, async {
diff --git a/backend/windmill-common/src/runnable_settings/settings.rs b/backend/windmill-common/src/runnable_settings/settings.rs
index 04b62fbaab..b814646553 100644
--- a/backend/windmill-common/src/runnable_settings/settings.rs
+++ b/backend/windmill-common/src/runnable_settings/settings.rs
@@ -1,5 +1,3 @@
-use std::future::Future;
-
 use sqlx::{Pool, Postgres};
 
 use crate::{
@@ -38,29 +36,63 @@ pub async fn prefetch_cached_from_handle(
     prefetch_cached(&rs, db).await
 }
 
+/// Like [`prefetch_cached`], but reuses a held transaction's connection instead
+/// of checking out a second one from the pool. Use this on paths that already
+/// hold an open `tx` to avoid dual-connection pool contention.
+pub async fn prefetch_cached_tx(
+    rs: &RunnableSettings,
+    tx: &mut sqlx::Transaction<'_, Postgres>,
+) -> error::Result<(DebouncingSettings, ConcurrencySettings)> {
+    Ok((
+        if let Some(hash) = rs.debouncing_settings {
+            DebouncingSettings::get(hash, &mut **tx).await?
+        } else {
+            Default::default()
+        },
+        if let Some(hash) = rs.concurrency_settings {
+            ConcurrencySettings::get(hash, &mut **tx).await?
+        } else {
+            Default::default()
+        },
+    ))
+}
+
+/// Resolve the retry policy (if any) for a job from its `runnable_settings_handle`.
+/// Returns `None` when the job carries no retry policy. Read lazily on the
+/// failure path only — never on the hot job-pull path.
+pub async fn prefetch_retry_from_handle(
+    hash: Option<i64>,
+    db: &DB,
+) -> error::Result<Option<RetrySettings>> {
+    let rs = from_handle(hash, db).await?;
+    Ok(if let Some(hash) = rs.retry_settings {
+        Some(RetrySettings::get(hash, db).await?)
+    } else {
+        None
+    })
+}
+
 /// Returns error if provided `hash` has no corresponding entry in db
 /// If `hash` is None, returns Default
-pub fn from_handle<'a>(
+pub async fn from_handle<'e>(
     hash: Option<i64>,
-    db: &'a DB,
-) -> impl Future<Output = error::Result<RunnableSettings>> + 'a {
-    async move {
-        if let Some(hash) = hash {
-            super::RUNNABLE_SETTINGS_REFERENCES
-                .get_or_insert_async(hash, async {
-                    sqlx::query_as!(
-                        RunnableSettings,
-                        r#"SELECT concurrency_settings, debouncing_settings FROM runnable_settings WHERE hash = $1"#,
-                        hash
-                    )
-                    .fetch_one(db)
-                    .await
-                    .map_err(error::Error::from)
-                })
+    db: impl sqlx::PgExecutor<'e>,
+) -> error::Result<RunnableSettings> {
+    if let Some(hash) = hash {
+        super::RUNNABLE_SETTINGS_REFERENCES
+            .get_or_insert_async(hash, async {
+                sqlx::query_as!(
+                    RunnableSettings,
+                    r#"SELECT concurrency_settings, debouncing_settings, retry_settings FROM runnable_settings WHERE hash = $1"#,
+                    hash
+                )
+                .fetch_one(db)
                 .await
-        } else {
-            Ok(RunnableSettings::default())
-        }
+                .map_err(error::Error::from)
+            })
+            .await
+    } else {
+        Ok(RunnableSettings::default())
     }
 }
 
@@ -68,7 +100,9 @@ pub async fn insert_rs(rs: RunnableSettings, db: &Pool<Postgres>) -> error::Resu
     use std::hash::{Hash, Hasher};
 
     if !min_version_supports_runnable_settings_v0().await
-        || (rs.debouncing_settings.is_none() && rs.concurrency_settings.is_none())
+        || (rs.debouncing_settings.is_none()
+            && rs.concurrency_settings.is_none()
+            && rs.retry_settings.is_none())
     {
         return Ok(None);
     }
@@ -82,13 +116,14 @@ pub async fn insert_rs(rs: RunnableSettings, db: &Pool<Postgres>) -> error::Resu
     super::RUNNABLE_SETTINGS_REFERENCES
         .get_or_insert_async(hash, async {
             sqlx::query!(
-                "INSERT INTO runnable_settings (hash, debouncing_settings, concurrency_settings)
-                VALUES ($1, $2, $3)
+                "INSERT INTO runnable_settings (hash, debouncing_settings, concurrency_settings, retry_settings)
+                VALUES ($1, $2, $3, $4)
                 ON CONFLICT (hash)
                 DO NOTHING",
                 hash,
                 rs.debouncing_settings,
-                rs.concurrency_settings
+                rs.concurrency_settings,
+                rs.retry_settings
             )
             .execute(db)
             .await?;
@@ -132,3 +167,25 @@ impl super::private_mod::RunnableSettingsTraitInternal for ConcurrencySettings {
     }
 }
 impl super::RunnableSettingsTrait for ConcurrencySettings {}
+impl super::private_mod::RunnableSettingsTraitInternal for RetrySettings {
+    const SETTINGS_NAME: &str = "retry_settings";
+    const INCLUDE_FIELDS: &[&str] = &[
+        "constant_attempts",
+        "constant_seconds",
+        "exponential_attempts",
+        "exponential_multiplier",
+        "exponential_seconds",
+        "exponential_random_factor",
+        "retry_if_expr",
+    ];
+    fn bind_arguments<'a>(&'a self, q: Q<'a>) -> Q<'a> {
+        q.bind(&self.constant_attempts)
+            .bind(&self.constant_seconds)
+            .bind(&self.exponential_attempts)
+            .bind(&self.exponential_multiplier)
+            .bind(&self.exponential_seconds)
+            .bind(&self.exponential_random_factor)
+            .bind(&self.retry_if_expr)
+    }
+}
+impl super::RunnableSettingsTrait for RetrySettings {}
diff --git a/backend/windmill-common/src/schema_contracts.rs b/backend/windmill-common/src/schema_contracts.rs
new file mode 100644
index 0000000000..b605aae33b
--- /dev/null
+++ b/backend/windmill-common/src/schema_contracts.rs
@@ -0,0 +1,614 @@
+//! Save-time schema-contract check (pipelines gap #2b): validate a consumer
+//! script's asset references against the latest *captured* producer schema
+//! (`materialized_asset_schema`, written post-materialize by #2a) and return
+//! WARNINGS — never errors. A deliberate upstream reshape must not fail every
+//! consumer save; blocking (`on_schema_change=fail`) is deliberately not
+//! offered in v1.
+//!
+//! Ducklake-only: `// materialize` targets are ducklake-only in v1, so nothing
+//! else has a captured schema to check against; an asset with no captured
+//! schema produces no warnings (first deploy, datatable, external tables).
+//!
+//! The comparison itself (`diff_contract`) is pure so it can be unit-tested
+//! and mirrored 1:1 by the editor-side TS check
+//! (frontend/src/lib/components/assets/AssetGraph/schemaContracts.ts); the
+//! async wrapper owns the DB reads (schemas + producer resolution) and runs on
+//! the caller's RLS-scoped transaction.
+
+use std::collections::{HashMap, HashSet};
+
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::types::Json;
+use sqlx::{Postgres, Transaction};
+use windmill_parser::asset_parser::{
+    ColumnLineage, DataTest, MaterializeSpec, OnSchemaChange, PARTITION_TOKEN,
+};
+use windmill_types::assets::{AssetKind, AssetWithAltAccessType};
+
+use crate::error::Result;
+use crate::materialization::SchemaColumn;
+
+/// Columns the materialize engine adds/manages; never part of the captured
+/// schema, so consumer reads of them must not warn (`_wm_partition` is
+/// filtered out of the DESCRIBE capture on purpose).
+const RESERVED_COLUMNS: &[&str] = &["_wm_partition"];
+
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum ContractWarningKind {
+    /// A column the body reads/writes is absent from the captured schema.
+    MissingColumn,
+    /// A `// column … <- <asset>.<col>` source column is absent.
+    MissingLineageSource,
+    /// A `// data_test relationships … -> <asset>.<col>` ref column is absent.
+    MissingRelationshipColumn,
+    /// Relationship join columns have different captured types (may still
+    /// coerce at run time — phrased as "differs", not "will fail").
+    RelationshipTypeMismatch,
+    /// Warnings for this asset were suppressed by the producer's
+    /// `on_schema_change=ignore` (one informational entry per asset).
+    Suppressed,
+}
+
+/// One save-time contract warning. `schema_version`/`captured_at` identify the
+/// capture the check ran against, so a stale-capture warning is
+/// self-explaining (the schema is as-of the producer's last run, not its
+/// latest save).
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub struct ContractWarning {
+    pub kind: ContractWarningKind,
+    /// Normalized ducklake asset path (`<lake>/<table>`).
+    pub asset_path: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub column: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expected_type: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub found_type: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub schema_version: Option<i64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub captured_at: Option<DateTime<Utc>>,
+    pub message: String,
+}
+
+/// The latest captured schema of one asset, as loaded by the wrapper.
+#[derive(Debug, Clone)]
+pub struct CapturedSchema {
+    pub columns: Vec<SchemaColumn>,
+    pub version: i64,
+    pub captured_at: DateTime<Utc>,
+}
+
+impl CapturedSchema {
+    /// Case-insensitive column lookup — DuckDB matches unquoted identifiers
+    /// case-insensitively, and the body parser preserves source casing while
+    /// DESCRIBE returns stored casing.
+    fn find(&self, name: &str) -> Option<&SchemaColumn> {
+        self.columns
+            .iter()
+            .find(|c| c.name.eq_ignore_ascii_case(name))
+    }
+}
+
+fn is_reserved(name: &str) -> bool {
+    RESERVED_COLUMNS
+        .iter()
+        .any(|r| r.eq_ignore_ascii_case(name))
+}
+
+/// Strip the `{partition}` token a declared URI may carry (`// on
+/// ducklake://lake/t/{partition}` or pasted refs) so lookups hit the captured
+/// path. Body-inferred paths never carry it, but annotation refs can.
+pub fn normalize_asset_path(path: &str) -> String {
+    path.replace(&format!("/{}", PARTITION_TOKEN), "")
+        .replace(PARTITION_TOKEN, "")
+        .trim_end_matches('/')
+        .to_string()
+}
+
+fn column_list(schema: &CapturedSchema) -> String {
+    schema
+        .columns
+        .iter()
+        .map(|c| c.name.as_str())
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
+/// Pure comparison: consumer refs vs captured schemas. `schemas` is keyed by
+/// normalized ducklake path (the `_current` → base-table fallback is resolved
+/// by the wrapper before this runs); `ignored` holds paths whose producer
+/// declared `on_schema_change=ignore`.
+pub fn diff_contract(
+    assets: &[AssetWithAltAccessType],
+    column_lineage: &[ColumnLineage],
+    data_tests: &[DataTest],
+    materialize: Option<&MaterializeSpec>,
+    schemas: &HashMap<String, CapturedSchema>,
+    ignored: &HashSet<String>,
+) -> Vec<ContractWarning> {
+    let mut warnings: Vec<ContractWarning> = vec![];
+
+    // W1 — body-read/written columns missing from the captured schema. Assets
+    // whose column set the parser could not derive (`columns: None`, e.g.
+    // wildcard SELECT or non-SQL access) are skipped fail-safe; a literal "*"
+    // key is skipped defensively for the same reason.
+    for a in assets {
+        if a.kind != AssetKind::Ducklake {
+            continue;
+        }
+        let Some(columns) = a.columns.as_ref() else {
+            continue;
+        };
+        let path = normalize_asset_path(&a.path);
+        let Some(schema) = schemas.get(&path) else {
+            continue;
+        };
+        for col in columns.keys() {
+            if col == "*" || is_reserved(col) {
+                continue;
+            }
+            if schema.find(col).is_none() {
+                warnings.push(ContractWarning {
+                    kind: ContractWarningKind::MissingColumn,
+                    asset_path: path.clone(),
+                    column: Some(col.clone()),
+                    expected_type: None,
+                    found_type: None,
+                    schema_version: Some(schema.version),
+                    captured_at: Some(schema.captured_at),
+                    message: format!(
+                        "column `{col}` of ducklake://{path} is not in its captured schema \
+                         (v{}, columns: {})",
+                        schema.version,
+                        column_list(schema)
+                    ),
+                });
+            }
+        }
+    }
+
+    // W2 — `// column` lineage source refs. Only annotation-declared lineage
+    // reaches this fn (AST-inferred lineage is redundant with W1 and can
+    // mis-attribute aliases).
+    for cl in column_lineage {
+        for input in &cl.inputs {
+            if input.from_kind != windmill_parser::asset_parser::AssetKind::Ducklake {
+                continue;
+            }
+            let path = normalize_asset_path(&input.from_path);
+            let Some(schema) = schemas.get(&path) else {
+                continue;
+            };
+            if is_reserved(&input.from_column) {
+                continue;
+            }
+            if schema.find(&input.from_column).is_none() {
+                warnings.push(ContractWarning {
+                    kind: ContractWarningKind::MissingLineageSource,
+                    asset_path: path.clone(),
+                    column: Some(input.from_column.clone()),
+                    expected_type: None,
+                    found_type: None,
+                    schema_version: Some(schema.version),
+                    captured_at: Some(schema.captured_at),
+                    message: format!(
+                        "`// column {}` reads `{}` from ducklake://{path}, which is not in \
+                         its captured schema (v{})",
+                        cl.column, input.from_column, schema.version
+                    ),
+                });
+            }
+        }
+    }
+
+    // W3 — relationships data-test refs: the referenced column must exist;
+    // when both sides have captured types, flag a difference. Types come from
+    // DuckDB DESCRIBE on both sides so verbatim spellings are comparable; the
+    // runtime probe's IN-subquery still coerces, so a difference is "differs",
+    // never "will fail".
+    let own_schema = materialize
+        .filter(|m| m.target_kind == windmill_parser::asset_parser::AssetKind::Ducklake)
+        .and_then(|m| schemas.get(&normalize_asset_path(&m.target_path)));
+    for dt in data_tests {
+        let DataTest::Relationships { column, to_kind, to_path, to_column } = dt else {
+            continue;
+        };
+        if *to_kind != windmill_parser::asset_parser::AssetKind::Ducklake {
+            continue;
+        }
+        let path = normalize_asset_path(to_path);
+        let Some(schema) = schemas.get(&path) else {
+            continue;
+        };
+        match schema.find(to_column) {
+            None => {
+                warnings.push(ContractWarning {
+                    kind: ContractWarningKind::MissingRelationshipColumn,
+                    asset_path: path.clone(),
+                    column: Some(to_column.clone()),
+                    expected_type: None,
+                    found_type: None,
+                    schema_version: Some(schema.version),
+                    captured_at: Some(schema.captured_at),
+                    message: format!(
+                        "`// data_test relationships {column}` references \
+                         ducklake://{path}.{to_column}, which is not in its captured schema \
+                         (v{})",
+                        schema.version
+                    ),
+                });
+            }
+            Some(ref_col) => {
+                if let Some(own_col) = own_schema.and_then(|s| s.find(column)) {
+                    if !own_col.data_type.eq_ignore_ascii_case(&ref_col.data_type) {
+                        warnings.push(ContractWarning {
+                            kind: ContractWarningKind::RelationshipTypeMismatch,
+                            asset_path: path.clone(),
+                            column: Some(to_column.clone()),
+                            expected_type: Some(own_col.data_type.clone()),
+                            found_type: Some(ref_col.data_type.clone()),
+                            schema_version: Some(schema.version),
+                            captured_at: Some(schema.captured_at),
+                            message: format!(
+                                "`// data_test relationships {column}` joins `{}` ({}) to \
+                                 ducklake://{path}.{to_column} ({}) — captured types differ",
+                                column, own_col.data_type, ref_col.data_type
+                            ),
+                        });
+                    }
+                }
+            }
+        }
+    }
+
+    // W4 — producer opted the asset out (`on_schema_change=ignore`): drop its
+    // warnings, leaving one informational entry per suppressed asset so the
+    // response still records that a mismatch exists but was muted upstream.
+    if !ignored.is_empty() {
+        let mut suppressed_assets: Vec<String> = vec![];
+        warnings.retain(|w| {
+            if ignored.contains(&w.asset_path) {
+                if !suppressed_assets.contains(&w.asset_path) {
+                    suppressed_assets.push(w.asset_path.clone());
+                }
+                false
+            } else {
+                true
+            }
+        });
+        for path in suppressed_assets {
+            warnings.push(ContractWarning {
+                kind: ContractWarningKind::Suppressed,
+                asset_path: path.clone(),
+                column: None,
+                expected_type: None,
+                found_type: None,
+                schema_version: None,
+                captured_at: None,
+                message: format!(
+                    "schema mismatches on ducklake://{path} suppressed by its producer's \
+                     `on_schema_change=ignore`"
+                ),
+            });
+        }
+    }
+
+    warnings
+}
+
+/// Load captured schemas + producer modes and run the contract check for one
+/// consumer script's parsed refs.
+///
+/// Runs on the caller's RLS-scoped transaction (`user_db`), consistent with
+/// the `listAssetSchemas` read path: a producer script the caller cannot read
+/// simply stays unresolved and keeps the default `warn` behavior. Draft-only
+/// producers have no `asset` write edges yet and likewise default to `warn`.
+pub async fn check_schema_contracts(
+    tx: &mut Transaction<'_, Postgres>,
+    workspace_id: &str,
+    assets: &[AssetWithAltAccessType],
+    column_lineage: &[ColumnLineage],
+    data_tests: &[DataTest],
+    materialize: Option<&MaterializeSpec>,
+) -> Result<Vec<ContractWarning>> {
+    // Referenced ducklake paths (normalized) across every ref family the diff
+    // inspects — plus the consumer's own materialize target (for W3 types).
+    let mut paths: HashSet<String> = HashSet::new();
+    for a in assets {
+        if a.kind == AssetKind::Ducklake && a.columns.is_some() {
+            paths.insert(normalize_asset_path(&a.path));
+        }
+    }
+    for cl in column_lineage {
+        for input in &cl.inputs {
+            if input.from_kind == windmill_parser::asset_parser::AssetKind::Ducklake {
+                paths.insert(normalize_asset_path(&input.from_path));
+            }
+        }
+    }
+    for dt in data_tests {
+        if let DataTest::Relationships { to_kind, to_path, .. } = dt {
+            if *to_kind == windmill_parser::asset_parser::AssetKind::Ducklake {
+                paths.insert(normalize_asset_path(to_path));
+            }
+        }
+    }
+    if let Some(m) = materialize {
+        if m.target_kind == windmill_parser::asset_parser::AssetKind::Ducklake {
+            paths.insert(normalize_asset_path(&m.target_path));
+        }
+    }
+    if paths.is_empty() {
+        return Ok(vec![]);
+    }
+
+    // A managed scd2 producer (re)creates a `<dim>_current` view with the base
+    // table's columns; only the base table's schema is captured. Include the
+    // base path in the lookup so `_current` readers can fall back to it (the
+    // fallback itself is gated on the producer's spec below).
+    let mut lookup_paths: HashSet<String> = paths.clone();
+    for p in &paths {
+        if let Some(base) = p.strip_suffix("_current") {
+            if !base.is_empty() {
+                lookup_paths.insert(base.to_string());
+            }
+        }
+    }
+    let lookup_vec: Vec<String> = lookup_paths.into_iter().collect();
+
+    let schema_rows = sqlx::query!(
+        r#"SELECT DISTINCT ON (asset_path)
+                  asset_path, version, columns AS "columns: Json<Vec<SchemaColumn>>", captured_at
+             FROM materialized_asset_schema
+            WHERE workspace_id = $1 AND asset_kind = 'ducklake' AND asset_path = ANY($2)
+            ORDER BY asset_path, version DESC"#,
+        workspace_id,
+        &lookup_vec,
+    )
+    .fetch_all(&mut **tx)
+    .await?;
+    let mut schemas: HashMap<String, CapturedSchema> = schema_rows
+        .into_iter()
+        .map(|r| {
+            (
+                r.asset_path,
+                CapturedSchema {
+                    columns: r.columns.0,
+                    version: r.version,
+                    captured_at: r.captured_at,
+                },
+            )
+        })
+        .collect();
+
+    // Producer resolution: write edges on the referenced assets → latest
+    // non-archived producer content → parsed `// materialize` spec. Drives
+    // both the `on_schema_change=ignore` suppression and the `_current`
+    // fallback. Flow writers are excluded — they cannot carry the annotation.
+    let paths_vec: Vec<String> = paths.iter().cloned().collect();
+    let producer_edges = sqlx::query!(
+        r#"SELECT DISTINCT path AS "asset_path!", usage_path AS "producer_path!"
+             FROM asset
+            WHERE workspace_id = $1 AND kind = 'ducklake' AND path = ANY($2)
+              AND usage_kind = 'script' AND usage_access_type IN ('w', 'rw')"#,
+        workspace_id,
+        &paths_vec,
+    )
+    .fetch_all(&mut **tx)
+    .await?;
+
+    let mut ignored: HashSet<String> = HashSet::new();
+    if !producer_edges.is_empty() {
+        let producer_paths: Vec<String> = producer_edges
+            .iter()
+            .map(|e| e.producer_path.clone())
+            .collect::<HashSet<_>>()
+            .into_iter()
+            .collect();
+        // Same latest-content pattern as the asset-graph endpoint; NOT
+        // `get_latest_script_hash`, whose `lock IS NOT NULL` filter transiently
+        // excludes a just-deployed producer pending its dependency job.
+        let producer_rows = sqlx::query!(
+            r#"SELECT DISTINCT ON (path) path, content
+                 FROM script
+                WHERE workspace_id = $1 AND path = ANY($2)
+                  AND archived = false AND deleted = false
+                ORDER BY path, created_at DESC"#,
+            workspace_id,
+            &producer_paths,
+        )
+        .fetch_all(&mut **tx)
+        .await?;
+        let producer_specs: HashMap<String, Option<MaterializeSpec>> = producer_rows
+            .into_iter()
+            .map(|r| {
+                (
+                    r.path,
+                    windmill_parser::asset_parser::parse_pipeline_annotations(&r.content)
+                        .materialize,
+                )
+            })
+            .collect();
+
+        for edge in &producer_edges {
+            let Some(Some(spec)) = producer_specs.get(&edge.producer_path) else {
+                continue;
+            };
+            if spec.target_kind != windmill_parser::asset_parser::AssetKind::Ducklake {
+                continue;
+            }
+            let target = normalize_asset_path(&spec.target_path);
+            // `on_schema_change=ignore` — any producer declaring it wins.
+            if spec.on_schema_change == OnSchemaChange::Ignore
+                && (target == edge.asset_path
+                    || (spec.scd2 && format!("{target}_current") == edge.asset_path))
+            {
+                ignored.insert(edge.asset_path.clone());
+            }
+            // `_current` fallback: a managed scd2 producer's view has exactly
+            // the base table's columns.
+            if spec.scd2
+                && !spec.manual
+                && format!("{target}_current") == edge.asset_path
+                && !schemas.contains_key(&edge.asset_path)
+            {
+                if let Some(base) = schemas.get(&target).cloned() {
+                    schemas.insert(edge.asset_path.clone(), base);
+                }
+            }
+        }
+    }
+
+    Ok(diff_contract(
+        assets,
+        column_lineage,
+        data_tests,
+        materialize,
+        &schemas,
+        &ignored,
+    ))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::collections::BTreeMap;
+    use windmill_parser::asset_parser::{parse_pipeline_annotations, ColumnRef};
+    use windmill_types::assets::AssetUsageAccessType;
+
+    fn schema(cols: &[(&str, &str)]) -> CapturedSchema {
+        CapturedSchema {
+            columns: cols
+                .iter()
+                .map(|(n, t)| SchemaColumn { name: n.to_string(), data_type: t.to_string() })
+                .collect(),
+            version: 2,
+            captured_at: DateTime::<Utc>::MIN_UTC,
+        }
+    }
+
+    fn read_asset(path: &str, cols: &[&str]) -> AssetWithAltAccessType {
+        AssetWithAltAccessType {
+            path: path.to_string(),
+            kind: AssetKind::Ducklake,
+            access_type: Some(AssetUsageAccessType::R),
+            alt_access_type: None,
+            columns: Some(
+                cols.iter()
+                    .map(|c| (c.to_string(), AssetUsageAccessType::R))
+                    .collect::<BTreeMap<_, _>>(),
+            ),
+        }
+    }
+
+    #[test]
+    fn missing_read_column_warns_case_insensitively() {
+        let schemas = HashMap::from([(
+            "lake/orders".to_string(),
+            schema(&[("Order_ID", "BIGINT"), ("amount_usd", "DOUBLE")]),
+        )]);
+        let assets = vec![read_asset("lake/orders", &["order_id", "amount"])];
+        let w = diff_contract(&assets, &[], &[], None, &schemas, &HashSet::new());
+        // order_id matches case-insensitively; amount is gone
+        assert_eq!(w.len(), 1);
+        assert_eq!(w[0].kind, ContractWarningKind::MissingColumn);
+        assert_eq!(w[0].column.as_deref(), Some("amount"));
+        assert_eq!(w[0].schema_version, Some(2));
+    }
+
+    #[test]
+    fn unknown_columns_wildcard_and_reserved_are_skipped() {
+        let schemas = HashMap::from([("lake/orders".to_string(), schema(&[("id", "BIGINT")]))]);
+        // columns: None (wildcard SELECT) — skipped entirely
+        let mut a = read_asset("lake/orders", &[]);
+        a.columns = None;
+        assert!(diff_contract(&[a], &[], &[], None, &schemas, &HashSet::new()).is_empty());
+        // literal "*" and the reserved partition column are skipped
+        let a = read_asset("lake/orders", &["*", "_wm_partition", "id"]);
+        assert!(diff_contract(&[a], &[], &[], None, &schemas, &HashSet::new()).is_empty());
+    }
+
+    #[test]
+    fn asset_without_captured_schema_is_silent() {
+        let assets = vec![read_asset("lake/unknown", &["whatever"])];
+        assert!(
+            diff_contract(&assets, &[], &[], None, &HashMap::new(), &HashSet::new()).is_empty()
+        );
+    }
+
+    #[test]
+    fn partition_token_is_normalized() {
+        let schemas = HashMap::from([("lake/orders".to_string(), schema(&[("id", "BIGINT")]))]);
+        let assets = vec![read_asset("lake/orders/{partition}", &["gone"])];
+        let w = diff_contract(&assets, &[], &[], None, &schemas, &HashSet::new());
+        assert_eq!(w.len(), 1);
+        assert_eq!(w[0].asset_path, "lake/orders");
+    }
+
+    #[test]
+    fn lineage_ref_missing_column_warns() {
+        let schemas = HashMap::from([("lake/orders".to_string(), schema(&[("id", "BIGINT")]))]);
+        let lineage = vec![ColumnLineage {
+            column: "total".to_string(),
+            inputs: vec![ColumnRef {
+                from_kind: windmill_parser::asset_parser::AssetKind::Ducklake,
+                from_path: "lake/orders".to_string(),
+                from_column: "amount".to_string(),
+            }],
+        }];
+        let w = diff_contract(&[], &lineage, &[], None, &schemas, &HashSet::new());
+        assert_eq!(w.len(), 1);
+        assert_eq!(w[0].kind, ContractWarningKind::MissingLineageSource);
+    }
+
+    #[test]
+    fn relationships_missing_and_type_mismatch() {
+        let schemas = HashMap::from([
+            ("lake/customers".to_string(), schema(&[("id", "VARCHAR")])),
+            (
+                "lake/orders".to_string(),
+                schema(&[("customer_id", "BIGINT")]),
+            ),
+        ]);
+        let ann = parse_pipeline_annotations(
+            "// materialize ducklake://lake/orders\n\
+             // data_test relationships customer_id -> ducklake://lake/customers.id\n\
+             // data_test relationships customer_id -> ducklake://lake/customers.uuid\n\
+             SELECT 1;",
+        );
+        let w = diff_contract(
+            &[],
+            &[],
+            &ann.data_tests,
+            ann.materialize.as_ref(),
+            &schemas,
+            &HashSet::new(),
+        );
+        assert_eq!(w.len(), 2);
+        assert!(w
+            .iter()
+            .any(|w| w.kind == ContractWarningKind::RelationshipTypeMismatch
+                && w.expected_type.as_deref() == Some("BIGINT")
+                && w.found_type.as_deref() == Some("VARCHAR")));
+        assert!(w
+            .iter()
+            .any(|w| w.kind == ContractWarningKind::MissingRelationshipColumn
+                && w.column.as_deref() == Some("uuid")));
+    }
+
+    #[test]
+    fn ignored_asset_suppresses_to_single_note() {
+        let schemas = HashMap::from([("lake/orders".to_string(), schema(&[("id", "BIGINT")]))]);
+        let assets = vec![read_asset("lake/orders", &["a", "b"])];
+        let ignored = HashSet::from(["lake/orders".to_string()]);
+        let w = diff_contract(&assets, &[], &[], None, &schemas, &ignored);
+        assert_eq!(w.len(), 1);
+        assert_eq!(w[0].kind, ContractWarningKind::Suppressed);
+        // and nothing at all when there was nothing to suppress
+        let assets = vec![read_asset("lake/orders", &["id"])];
+        assert!(diff_contract(&assets, &[], &[], None, &schemas, &ignored).is_empty());
+    }
+}
diff --git a/backend/windmill-common/src/scripts.rs b/backend/windmill-common/src/scripts.rs
index 0cbcb4a1c1..f3abf14e1c 100644
--- a/backend/windmill-common/src/scripts.rs
+++ b/backend/windmill-common/src/scripts.rs
@@ -345,10 +345,10 @@ pub async fn clone_script<'c>(
         )));
     };
 
-    let rs =
-        runnable_settings::from_handle(s.runnable_settings.runnable_settings_handle, db).await?;
+    let rs = runnable_settings::from_handle(s.runnable_settings.runnable_settings_handle, &mut *tx)
+        .await?;
     let (debouncing_settings, concurrency_settings) =
-        runnable_settings::prefetch_cached(&rs, db).await?;
+        runnable_settings::prefetch_cached_tx(&rs, &mut tx).await?;
 
     let ns = NewScript {
         path: s.path.clone(),
diff --git a/backend/windmill-common/src/secret_backend/mod.rs b/backend/windmill-common/src/secret_backend/mod.rs
index 71fa2ea999..596539cd08 100644
--- a/backend/windmill-common/src/secret_backend/mod.rs
+++ b/backend/windmill-common/src/secret_backend/mod.rs
@@ -13,6 +13,9 @@
 //! vaults like HashiCorp Vault (Enterprise Edition).
 
 pub mod database;
+pub mod resolver;
+
+pub use resolver::*;
 
 #[cfg(feature = "private")]
 pub mod vault_ee;
diff --git a/backend/windmill-common/src/secret_backend/resolver.rs b/backend/windmill-common/src/secret_backend/resolver.rs
new file mode 100644
index 0000000000..949300a3d6
--- /dev/null
+++ b/backend/windmill-common/src/secret_backend/resolver.rs
@@ -0,0 +1,324 @@
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2024
+ * This file and its contents are licensed under the AGPLv3 License.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-AGPL for a copy of the license.
+ */
+
+//! Resolution of the configured secret backend.
+//!
+//! Lives in `windmill-common` (rather than the API/store crates) so that
+//! lower-level helpers such as [`crate::variables::get_variable_or_self`] can
+//! route secret reads through the configured backend. With an external backend
+//! (Vault / Azure Key Vault / AWS Secrets Manager), the `variable.value` column
+//! holds a `$vault:`/`$azure_kv:`/`$aws_sm:` marker rather than base64
+//! ciphertext, so decrypting it directly fails — reads must go through the
+//! backend instead.
+//!
+//! Note: external backends require Enterprise Edition. The OSS version only
+//! supports the database backend.
+
+use std::sync::Arc;
+
+use crate::{
+    db::DB,
+    error::{Error, Result},
+    secret_backend::{database::DatabaseBackend, SecretBackend},
+    variables::{build_crypt, decrypt},
+};
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+use crate::{
+    global_settings::{load_value_from_global_settings, SECRET_BACKEND_SETTING},
+    secret_backend::{
+        AwsSecretsManagerBackend, AwsSecretsManagerSettings, AzureKeyVaultBackend,
+        AzureKeyVaultSettings, SecretBackendConfig, VaultBackend, VaultSettings,
+    },
+};
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+use tokio::sync::RwLock;
+
+// Cached Vault backend to avoid recreating it for every request
+// This enables connection pooling and avoids repeated setup overhead
+#[cfg(all(feature = "private", feature = "enterprise"))]
+struct CachedVaultBackend {
+    backend: Arc<dyn SecretBackend>,
+    settings: VaultSettings,
+}
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+lazy_static::lazy_static! {
+    static ref VAULT_BACKEND_CACHE: RwLock<Option<CachedVaultBackend>> = RwLock::new(None);
+}
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+struct CachedAzureKvBackend {
+    backend: Arc<dyn SecretBackend>,
+    settings: AzureKeyVaultSettings,
+}
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+lazy_static::lazy_static! {
+    static ref AZURE_KV_BACKEND_CACHE: RwLock<Option<CachedAzureKvBackend>> = RwLock::new(None);
+}
+
+// Cached AWS Secrets Manager backend
+#[cfg(all(feature = "private", feature = "enterprise"))]
+struct CachedAwsSmBackend {
+    backend: Arc<dyn SecretBackend>,
+    settings: AwsSecretsManagerSettings,
+}
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+lazy_static::lazy_static! {
+    static ref AWS_SM_BACKEND_CACHE: RwLock<Option<CachedAwsSmBackend>> = RwLock::new(None);
+}
+
+/// Get the current secret backend based on global settings
+///
+/// OSS: Always returns DatabaseBackend
+/// EE: Returns configured backend (Database or Vault)
+#[cfg(not(all(feature = "private", feature = "enterprise")))]
+pub async fn get_secret_backend(db: &DB) -> Result<Arc<dyn SecretBackend>> {
+    Ok(Arc::new(DatabaseBackend::new(db.clone())))
+}
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+pub async fn get_secret_backend(db: &DB) -> Result<Arc<dyn SecretBackend>> {
+    let config = match load_value_from_global_settings(db, SECRET_BACKEND_SETTING).await? {
+        Some(value) => serde_json::from_value::<SecretBackendConfig>(value).unwrap_or_default(),
+        None => SecretBackendConfig::default(),
+    };
+
+    match config {
+        SecretBackendConfig::Database => Ok(Arc::new(DatabaseBackend::new(db.clone()))),
+        SecretBackendConfig::HashiCorpVault(settings) => {
+            get_or_create_vault_backend(db, settings).await
+        }
+        SecretBackendConfig::AzureKeyVault(settings) => {
+            get_or_create_azure_kv_backend(db, settings).await
+        }
+        SecretBackendConfig::AwsSecretsManager(settings) => {
+            get_or_create_aws_sm_backend(db, settings).await
+        }
+    }
+}
+
+/// Get a cached Vault backend or create a new one if settings changed
+#[cfg(all(feature = "private", feature = "enterprise"))]
+async fn get_or_create_vault_backend(
+    _db: &DB,
+    settings: VaultSettings,
+) -> Result<Arc<dyn SecretBackend>> {
+    // Check if we have a cached backend with matching settings (read lock)
+    {
+        let cache = VAULT_BACKEND_CACHE.read().await;
+        if let Some(ref cached) = *cache {
+            if cached.settings == settings {
+                return Ok(cached.backend.clone());
+            }
+        }
+    }
+
+    // Need to create a new backend - acquire write lock
+    let mut cache = VAULT_BACKEND_CACHE.write().await;
+
+    // Double-check (another task may have created it while we waited)
+    if let Some(ref cached) = *cache {
+        if cached.settings == settings {
+            return Ok(cached.backend.clone());
+        }
+    }
+
+    // Create new backend
+    let backend: Arc<dyn SecretBackend> = {
+        #[cfg(feature = "openidconnect")]
+        if settings.token.is_none() {
+            Arc::new(VaultBackend::new_with_db(settings.clone(), _db.clone()))
+        } else {
+            Arc::new(VaultBackend::new(settings.clone()))
+        }
+
+        #[cfg(not(feature = "openidconnect"))]
+        Arc::new(VaultBackend::new(settings.clone()))
+    };
+
+    // Cache it
+    *cache = Some(CachedVaultBackend { backend: backend.clone(), settings });
+
+    Ok(backend)
+}
+
+/// Get a cached Azure Key Vault backend or create a new one if settings changed
+#[cfg(all(feature = "private", feature = "enterprise"))]
+async fn get_or_create_azure_kv_backend(
+    _db: &DB,
+    settings: AzureKeyVaultSettings,
+) -> Result<Arc<dyn SecretBackend>> {
+    // Check if we have a cached backend with matching settings (read lock)
+    {
+        let cache = AZURE_KV_BACKEND_CACHE.read().await;
+        if let Some(ref cached) = *cache {
+            if cached.settings == settings {
+                return Ok(cached.backend.clone());
+            }
+        }
+    }
+
+    // Need to create a new backend - acquire write lock
+    let mut cache = AZURE_KV_BACKEND_CACHE.write().await;
+
+    // Double-check (another task may have created it while we waited)
+    if let Some(ref cached) = *cache {
+        if cached.settings == settings {
+            return Ok(cached.backend.clone());
+        }
+    }
+
+    // Create new backend
+    let backend: Arc<dyn SecretBackend> = Arc::new(AzureKeyVaultBackend::new(settings.clone()));
+
+    // Cache it
+    *cache = Some(CachedAzureKvBackend { backend: backend.clone(), settings });
+
+    Ok(backend)
+}
+
+/// Get a cached AWS SM backend or create a new one if settings changed
+#[cfg(all(feature = "private", feature = "enterprise"))]
+async fn get_or_create_aws_sm_backend(
+    _db: &DB,
+    settings: AwsSecretsManagerSettings,
+) -> Result<Arc<dyn SecretBackend>> {
+    {
+        let cache = AWS_SM_BACKEND_CACHE.read().await;
+        if let Some(ref cached) = *cache {
+            if cached.settings == settings {
+                return Ok(cached.backend.clone());
+            }
+        }
+    }
+
+    let mut cache = AWS_SM_BACKEND_CACHE.write().await;
+
+    if let Some(ref cached) = *cache {
+        if cached.settings == settings {
+            return Ok(cached.backend.clone());
+        }
+    }
+
+    let backend: Arc<dyn SecretBackend> =
+        Arc::new(AwsSecretsManagerBackend::new_with_client(settings.clone()).await?);
+
+    *cache = Some(CachedAwsSmBackend { backend: backend.clone(), settings });
+
+    Ok(backend)
+}
+
+/// Check if a Vault backend is currently configured
+///
+/// OSS: Always returns false
+/// EE: Checks global settings
+#[cfg(not(all(feature = "private", feature = "enterprise")))]
+pub async fn is_vault_backend_configured(_db: &DB) -> Result<bool> {
+    Ok(false)
+}
+
+#[cfg(all(feature = "private", feature = "enterprise"))]
+pub async fn is_vault_backend_configured(db: &DB) -> Result<bool> {
+    let config = match load_value_from_global_settings(db, SECRET_BACKEND_SETTING).await? {
+        Some(value) => serde_json::from_value::<SecretBackendConfig>(value).unwrap_or_default(),
+        None => SecretBackendConfig::default(),
+    };
+
+    Ok(matches!(
+        config,
+        SecretBackendConfig::HashiCorpVault(_)
+            | SecretBackendConfig::AzureKeyVault(_)
+            | SecretBackendConfig::AwsSecretsManager(_)
+    ))
+}
+
+/// Get a secret value using the configured backend
+///
+/// For database backend: decrypts `encrypted_value` using the workspace key
+/// For external backends (EE only): fetches from the backend at `path`,
+/// ignoring `encrypted_value` (which holds only a `$...:` marker)
+pub async fn get_secret_value(
+    db: &DB,
+    workspace_id: &str,
+    path: &str,
+    encrypted_value: &str,
+) -> Result<String> {
+    let backend = get_secret_backend(db).await?;
+
+    match backend.backend_name() {
+        "database" => {
+            // Use existing database decryption
+            let mc = build_crypt(db, workspace_id).await?;
+            decrypt(&mc, encrypted_value.to_string()).map_err(|e| {
+                Error::internal_err(format!("Error decrypting variable {}: {}", path, e))
+            })
+        }
+        "hashicorp_vault" => {
+            // Fetch from Vault directly
+            backend.get_secret(workspace_id, path).await
+        }
+        "azure_key_vault" => backend.get_secret(workspace_id, path).await,
+        "aws_secrets_manager" => backend.get_secret(workspace_id, path).await,
+        _ => Err(Error::internal_err(format!(
+            "Unknown backend: {}",
+            backend.backend_name()
+        ))),
+    }
+}
+
+/// Check if a value is stored in Vault (indicated by the $vault: prefix)
+pub fn is_vault_stored_value(value: &str) -> bool {
+    value.starts_with("$vault:")
+}
+
+/// Check if a value is stored in Azure Key Vault (indicated by the $azure_kv: prefix)
+pub fn is_azure_kv_stored_value(value: &str) -> bool {
+    value.starts_with("$azure_kv:")
+}
+
+/// Check if a value is stored in AWS Secrets Manager (indicated by the $aws_sm: prefix)
+pub fn is_aws_sm_stored_value(value: &str) -> bool {
+    value.starts_with("$aws_sm:")
+}
+
+/// Check if a value is stored in any external secret backend
+pub fn is_external_stored_value(value: &str) -> bool {
+    is_vault_stored_value(value) || is_azure_kv_stored_value(value) || is_aws_sm_stored_value(value)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn external_markers_are_detected() {
+        assert!(is_external_stored_value("$vault:u/admin/secret"));
+        assert!(is_external_stored_value("$azure_kv:u/admin/secret"));
+        assert!(is_external_stored_value("$aws_sm:u/admin/secret"));
+    }
+
+    #[test]
+    fn base64_ciphertext_is_not_treated_as_external() {
+        // A base64 magic_crypt blob must route through `decrypt`, never the
+        // external backend. The leading `$` is what distinguishes a marker from
+        // ciphertext; decrypting a marker fails with "Invalid byte 36" (`$`),
+        // which is the bug this gate prevents.
+        for v in [
+            "bm90LWEtbWFya2Vy",
+            "AAAA1234+/abcd==",
+            "",
+            "$something_else",
+        ] {
+            assert!(!is_external_stored_value(v), "unexpected external: {v:?}");
+        }
+    }
+}
diff --git a/backend/windmill-common/src/user_drafts.rs b/backend/windmill-common/src/user_drafts.rs
index 620cbe2a5f..7e0c1f3f55 100644
--- a/backend/windmill-common/src/user_drafts.rs
+++ b/backend/windmill-common/src/user_drafts.rs
@@ -237,18 +237,22 @@ async fn fetch_other_drafts_users(
     kind: UserDraftItemKind,
     path: &str,
 ) -> Result<Vec<OtherDraftUser>> {
-    // The `admins` workspace has no `usr` rows (username IS the email there),
-    // so fall back to `d.email` when the join misses, else a real teammate's
-    // draft renders as a phantom "Legacy draft". The genuine NULL-email legacy
-    // row keeps `username = None` (its `d.email` is NULL, so the CASE yields NULL).
+    // A superadmin authoring in a workspace they are not a member of has no `usr`
+    // row: fall back to their instance-derived username (`password.username`), or
+    // their email when derivation is disabled. Else a real teammate's draft renders
+    // as a phantom "Legacy draft". The genuine NULL-email legacy row keeps
+    // `username = None` (no `usr`/`password` match and `d.email` is NULL).
     let rows = sqlx::query_as!(
         OtherDraftUser,
-        r#"SELECT COALESCE(u.username, CASE WHEN d.workspace_id = 'admins' THEN d.email END) as "username?",
+        r#"SELECT COALESCE(u.username, p.username, CASE WHEN p.email IS NOT NULL THEN d.email END) as "username?",
                   d.created_at as "draft_saved_at!"
            FROM draft d
            LEFT JOIN usr u
                   ON u.workspace_id = d.workspace_id
                  AND u.email = d.email
+           LEFT JOIN password p
+                  ON p.email = d.email
+                 AND p.super_admin = true
            WHERE d.workspace_id = $1
              AND d.path = $2
              AND d.typ = $3
diff --git a/backend/windmill-common/src/usernames.rs b/backend/windmill-common/src/usernames.rs
index 2501841cac..6fde2a8186 100644
--- a/backend/windmill-common/src/usernames.rs
+++ b/backend/windmill-common/src/usernames.rs
@@ -94,6 +94,38 @@ pub async fn generate_instance_username_for_all_users(db: &DB) -> error::Result<
     Ok(())
 }
 
+/// Resolve the username to use for a user (typically a superadmin) accessing a
+/// workspace they are not a member of. When instance-wide username derivation is
+/// enabled (`automate_username_creation`, the default on almost all instances),
+/// `password.username` is populated, so we return that derived username instead
+/// of leaking the raw email address downstream (as job/script author, audit
+/// actor, etc.). Falls back to the email when no derived username exists (the few
+/// instances that keep `automate_username_creation` disabled).
+///
+/// The hot callers (token auth, `fetch_api_authed`) are already behind their own
+/// 120s auth caches, so this deliberately does not add another email->username
+/// cache (which would only help the cold JWT-mint / job-perms paths while risking
+/// cross-DB contamination in the shared-process integration tests).
+///
+/// A DB error is propagated rather than swallowed into the email fallback: falling
+/// back to the email on a transient failure would reintroduce the very email leak
+/// this path exists to prevent, so callers fail closed instead.
+pub async fn get_instance_username_or_fallback_to_email<'e, E>(
+    db: E,
+    email: &str,
+) -> error::Result<String>
+where
+    E: sqlx::PgExecutor<'e>,
+{
+    let derived = sqlx::query_scalar!("SELECT username FROM password WHERE email = $1", email)
+        .fetch_optional(db)
+        .await?
+        .flatten();
+    // No derived username (automate_username_creation disabled) → fall back to the
+    // email. This is the only legitimate fallback; a query error propagates above.
+    Ok(derived.unwrap_or_else(|| email.to_string()))
+}
+
 pub async fn get_instance_username_or_create_pending<'c>(
     tx: &mut Transaction<'c, Postgres>,
     email: &str,
diff --git a/backend/windmill-common/src/users.rs b/backend/windmill-common/src/users.rs
index f91c21701a..738dc84d14 100644
--- a/backend/windmill-common/src/users.rs
+++ b/backend/windmill-common/src/users.rs
@@ -46,14 +46,40 @@ lazy_static::lazy_static! {
 
 const EMAIL_CACHE_TTL_SECS: u64 = 60;
 
+/// Resolve a workspace-scoped username to its email.
+///
+/// Members are found in `usr`. A superadmin acting in a workspace they are *not*
+/// a member of has no `usr` row; they carry either their instance-derived
+/// username (`password.username`, when `automate_username_creation` is enabled)
+/// or their email (when it is disabled), so fall back to `password` on both,
+/// gated on `super_admin` since only superadmins can act without membership.
+/// Returns `None` when the username resolves to nobody.
+pub async fn resolve_username_to_email<'c>(
+    workspace_id: &str,
+    username: &str,
+    db: impl sqlx::PgExecutor<'c>,
+) -> crate::error::Result<Option<String>> {
+    Ok(sqlx::query_scalar!(
+        "SELECT COALESCE(
+            (SELECT email FROM usr WHERE workspace_id = $1 AND username = $2),
+            (SELECT email FROM password WHERE (username = $2 OR email = $2) AND super_admin = true)
+        )",
+        workspace_id,
+        username
+    )
+    .fetch_optional(db)
+    .await?
+    .flatten())
+}
+
 /// Get email from permissioned_as string.
-/// - "u/{username}" → lookup email from usr table (cached)
+/// - "u/{username}" → resolve via [`resolve_username_to_email`] (cached)
 /// - "g/{group}" → "group-{group}@windmill.dev"
 /// - raw email → return as-is
-pub async fn get_email_from_permissioned_as(
+pub async fn get_email_from_permissioned_as<'c>(
     permissioned_as: &str,
     workspace_id: &str,
-    db: &sqlx::Pool<sqlx::Postgres>,
+    db: impl sqlx::PgExecutor<'c>,
 ) -> crate::error::Result<String> {
     if let Some(username) = permissioned_as.strip_prefix(PERMISSIONED_AS_USER_PREFIX) {
         let lookup = EmailCacheKey(workspace_id, username);
@@ -62,14 +88,9 @@ pub async fn get_email_from_permissioned_as(
                 return Ok(email);
             }
         }
-        let email = sqlx::query_scalar!(
-            "SELECT email FROM usr WHERE username = $1 AND workspace_id = $2",
-            username,
-            workspace_id
-        )
-        .fetch_optional(db)
-        .await?
-        .unwrap_or_else(|| format!("{}@unknown.windmill.dev", username));
+        let email = resolve_username_to_email(workspace_id, username, db)
+            .await?
+            .unwrap_or_else(|| format!("{}@unknown.windmill.dev", username));
         let key = (workspace_id.to_string(), username.to_string());
         EMAIL_CACHE.insert(key, (email.clone(), std::time::Instant::now()));
         Ok(email)
diff --git a/backend/windmill-common/src/variables.rs b/backend/windmill-common/src/variables.rs
index 0d42b95a5a..b43eb07e9c 100644
--- a/backend/windmill-common/src/variables.rs
+++ b/backend/windmill-common/src/variables.rs
@@ -9,6 +9,7 @@
 use crate::db::{Authable, UserDB};
 use crate::error::{self, Error};
 use crate::scripts::ScriptHash;
+use crate::secret_backend::{get_secret_value, is_external_stored_value};
 use crate::utils::WarnAfterExt;
 use crate::worker::Connection;
 use crate::{worker::WORKER_GROUP, BASE_URL, DB};
@@ -234,13 +235,17 @@ pub async fn get_secret_value_as_admin(
     let r = if variable.is_secret {
         let value = variable.value;
         if !value.is_empty() {
-            let mc = build_crypt(db, w_id).await?;
-            decrypt(&mc, value).map_err(|e| {
-                crate::error::Error::internal_err(format!(
-                    "Error decrypting variable {}: {}",
-                    variable.path, e
-                ))
-            })?
+            if is_external_stored_value(&value) {
+                get_secret_value(db, w_id, &variable.path, &value).await?
+            } else {
+                let mc = build_crypt(db, w_id).await?;
+                decrypt(&mc, value).map_err(|e| {
+                    crate::error::Error::internal_err(format!(
+                        "Error decrypting variable {}: {}",
+                        variable.path, e
+                    ))
+                })?
+            }
         } else {
             "".to_string()
         }
@@ -546,10 +551,14 @@ pub async fn get_variable_or_self(
     if let Some(record) = record {
         let mut value = record.value;
         if record.is_secret {
-            let mc = build_crypt(db, w_id).await?;
-            value = decrypt(&mc, value).map_err(|e| {
-                Error::internal_err(format!("Error decrypting variable {}: {}", path, e))
-            })?;
+            if is_external_stored_value(&value) {
+                value = get_secret_value(db, w_id, &path, &value).await?;
+            } else {
+                let mc = build_crypt(db, w_id).await?;
+                value = decrypt(&mc, value).map_err(|e| {
+                    Error::internal_err(format!("Error decrypting variable {}: {}", path, e))
+                })?;
+            }
         }
 
         Ok(value)
@@ -591,10 +600,14 @@ pub async fn get_variable_or_self_as<T: Authable + Sync>(
     if let Some(record) = record {
         let mut value = record.value;
         if record.is_secret {
-            let mc = build_crypt(db, w_id).await?;
-            value = decrypt(&mc, value).map_err(|e| {
-                Error::internal_err(format!("Error decrypting variable {}: {}", var_path, e))
-            })?;
+            if is_external_stored_value(&value) {
+                value = get_secret_value(db, w_id, &var_path, &value).await?;
+            } else {
+                let mc = build_crypt(db, w_id).await?;
+                value = decrypt(&mc, value).map_err(|e| {
+                    Error::internal_err(format!("Error decrypting variable {}: {}", var_path, e))
+                })?;
+            }
         }
 
         Ok(value)
diff --git a/backend/windmill-common/src/worker.rs b/backend/windmill-common/src/worker.rs
index e3bd7ef7ef..ea2b5455f3 100644
--- a/backend/windmill-common/src/worker.rs
+++ b/backend/windmill-common/src/worker.rs
@@ -273,6 +273,14 @@ lazy_static::lazy_static! {
     /// production `app.windmill.dev` cluster, not on staging or self-hosted.
     pub static ref CLOUD_PRODUCTION_HOST: &'static str = "app.windmill.dev";
 
+    /// `--no-auth` mode: when set, every API request is treated as
+    /// authenticated as the `admin@windmill.dev` superadmin and no login is
+    /// ever required. Meant for self-hosted deployments that front Windmill
+    /// with their own authenticating gateway. Never honored on the managed
+    /// cloud (`CLOUD_HOSTED`), which must always enforce real authentication.
+    pub static ref NO_AUTH: bool = !*CLOUD_HOSTED
+        && std::env::var("NO_AUTH").ok().is_some_and(|x| x == "1" || x == "true");
+
     pub static ref CUSTOM_TAGS: Vec<String> = std::env::var("CUSTOM_TAGS")
         .ok()
         .map(|x| x.split(',').map(|x| x.to_string()).collect::<Vec<_>>()).unwrap_or_default();
@@ -693,8 +701,6 @@ pub fn is_allowed_file_location(job_dir: &str, user_defined_path: &str) -> error
 
     let full_path = job_dir.join(&user_path);
 
-    // let normalized_job_dir = std::fs::canonicalize(job_dir)?;
-    // let normalized_full_path = std::fs::canonicalize(&full_path)?;
     let normalized_job_dir = normalize_path(job_dir);
     let normalized_full_path = normalize_path(&full_path);
 
@@ -706,6 +712,36 @@ pub fn is_allowed_file_location(job_dir: &str, user_defined_path: &str) -> error
         .into());
     }
 
+    // The lexical check above cannot see symlinks: a symlink planted inside the
+    // job dir - e.g. by an earlier Ansible `git_repos` clone whose tracked
+    // content includes one - would let a later `git clone` or file write follow
+    // it out of the job dir while still passing the textual `starts_with` check.
+    // Walk the *normalized* relative path (`..`/`.` already collapsed) so each
+    // step matches the real on-disk resolution, and reject any existing component
+    // that is a symlink. Walking the raw user path would drift on an in-bounds
+    // `..` (e.g. `foo/../link`, which normalizes back inside the job dir) and miss
+    // the real symlinked component. Not-yet-existing components are safe: a path
+    // that does not exist cannot itself be a symlink.
+    let relative = normalized_full_path
+        .strip_prefix(&normalized_job_dir)
+        .unwrap_or(&normalized_full_path);
+    let mut current = normalized_job_dir.clone();
+    for component in relative.components() {
+        if let Component::Normal(c) = component {
+            current.push(c);
+            if std::fs::symlink_metadata(&current)
+                .map(|m| m.file_type().is_symlink())
+                .unwrap_or(false)
+            {
+                return Err(std::io::Error::new(
+                    std::io::ErrorKind::PermissionDenied,
+                    "Path traverses a symlink, which is not allowed.",
+                )
+                .into());
+            }
+        }
+    }
+
     Ok(normalized_full_path)
 }
 
@@ -2828,4 +2864,71 @@ mod tests {
 
         let _ = std::fs::remove_dir_all(&base);
     }
+
+    #[test]
+    fn test_is_allowed_file_location_allows_plain_relative() {
+        let base = std::env::temp_dir().join(format!("wm_allowed_loc_ok_{}", uuid::Uuid::new_v4()));
+        let job_dir = base.join("job");
+        std::fs::create_dir_all(&job_dir).unwrap();
+        let job_dir_str = job_dir.to_str().unwrap();
+
+        let out = is_allowed_file_location(job_dir_str, "repo/sub/playbook.yml").unwrap();
+        assert_eq!(out, normalize_path(&job_dir.join("repo/sub/playbook.yml")));
+
+        let _ = std::fs::remove_dir_all(&base);
+    }
+
+    #[test]
+    fn test_is_allowed_file_location_rejects_parent_and_absolute() {
+        let base =
+            std::env::temp_dir().join(format!("wm_allowed_loc_esc_{}", uuid::Uuid::new_v4()));
+        let job_dir = base.join("job");
+        std::fs::create_dir_all(&job_dir).unwrap();
+        let job_dir_str = job_dir.to_str().unwrap();
+
+        assert!(is_allowed_file_location(job_dir_str, "../escape").is_err());
+        assert!(is_allowed_file_location(job_dir_str, "a/../../escape").is_err());
+        assert!(is_allowed_file_location(job_dir_str, "/etc/passwd").is_err());
+
+        let _ = std::fs::remove_dir_all(&base);
+    }
+
+    // Regression for GHSA-v934-cvpf-6fjw: a symlink planted inside the job dir
+    // (e.g. by an earlier `git_repos` clone) must not let a later target traverse
+    // it out of the job dir, even though the lexical path stays "inside".
+    #[cfg(unix)]
+    #[test]
+    fn test_is_allowed_file_location_rejects_symlink_traversal() {
+        let base =
+            std::env::temp_dir().join(format!("wm_allowed_loc_symlink_{}", uuid::Uuid::new_v4()));
+        let job_dir = base.join("job");
+        std::fs::create_dir_all(&job_dir).unwrap();
+        // Stand-in for the shared cache dir living outside the job dir.
+        let outside = base.join("outside");
+        std::fs::create_dir_all(&outside).unwrap();
+        let job_dir_str = job_dir.to_str().unwrap();
+
+        // Plant `job/repo` -> `../outside`, as a malicious first clone would.
+        let planted = job_dir.join("repo");
+        std::os::unix::fs::symlink(&outside, &planted).unwrap();
+
+        // Both the symlink itself and any path traversing it are rejected.
+        assert!(is_allowed_file_location(job_dir_str, "repo").is_err());
+        assert!(is_allowed_file_location(job_dir_str, "repo/payload").is_err());
+        assert!(is_allowed_file_location(job_dir_str, "repo/sub/payload").is_err());
+
+        // An in-bounds `..` must not bypass the check: `foo/../repo/payload`
+        // normalizes back to `repo/payload` and still traverses the symlink.
+        assert!(is_allowed_file_location(job_dir_str, "foo/../repo/payload").is_err());
+        std::fs::create_dir(job_dir.join("real")).unwrap();
+        assert!(is_allowed_file_location(job_dir_str, "real/../repo/payload").is_err());
+
+        // A dangling symlink (target does not exist yet) is still caught:
+        // `symlink_metadata` does not follow the link.
+        let dangling = job_dir.join("dangling");
+        std::os::unix::fs::symlink(base.join("nonexistent"), &dangling).unwrap();
+        assert!(is_allowed_file_location(job_dir_str, "dangling/payload").is_err());
+
+        let _ = std::fs::remove_dir_all(&base);
+    }
 }
diff --git a/backend/windmill-common/src/workspaces.rs b/backend/windmill-common/src/workspaces.rs
index 3d4402decb..a8c6e26f0e 100644
--- a/backend/windmill-common/src/workspaces.rs
+++ b/backend/windmill-common/src/workspaces.rs
@@ -8,6 +8,7 @@ use strum::AsRefStr;
 use crate::{
     error::{self, to_anyhow, Error, Result},
     get_database_url,
+    secret_backend::{get_secret_value, is_external_stored_value},
     utils::get_custom_pg_instance_password,
     variables::{build_crypt, decrypt},
     PgDatabase, DB,
@@ -163,6 +164,7 @@ pub enum ObjectType {
     Settings,
     Key,
     WorkspaceDependencies,
+    DatatableMigration,
 }
 
 pub const LATEST_GIT_SYNC_SCRIPT_PATH: &str = "hub/28719/sync-script-to-git-repo-windmill";
@@ -178,7 +180,37 @@ pub const WM_FORK_PREFIX: &str = "wm-fork-";
 /// layer because the actual branch creation runs in a deferred git-sync worker job — without
 /// this check, the API returns 200 and the failure only surfaces later in the worker.
 pub fn validate_fork_workspace_id(id: &str) -> error::Result<()> {
-    if !id.starts_with(WM_FORK_PREFIX) {
+    validate_workspace_branch_id(id, true)
+}
+
+/// Like [`validate_fork_workspace_id`] but does not require the `wm-fork-` prefix. Used for dev
+/// workspaces, whose id is an ordinary (prefix-less) workspace id but must still be git-branch-safe
+/// because it is interpolated into a `wm-fork/<original_branch>/<id>` branch name like any fork.
+pub fn validate_dev_workspace_id(id: &str) -> error::Result<()> {
+    validate_workspace_branch_id(id, false)
+}
+
+/// The `workspace.name` column is `character varying(50)`, so a name longer than 50 characters
+/// triggers a raw `value too long for type character varying(50)` SQL error on insert. Validate
+/// up front to return a clear message instead.
+pub fn validate_workspace_name(name: &str) -> error::Result<()> {
+    if name.chars().count() > 50 {
+        return Err(Error::BadRequest(format!(
+            "Workspace name is too long ({} chars). Maximum length is 50 characters.",
+            name.chars().count()
+        )));
+    }
+    Ok(())
+}
+
+fn validate_workspace_branch_id(id: &str, require_fork_prefix: bool) -> error::Result<()> {
+    if id.is_empty() {
+        return Err(Error::BadRequest(
+            "Workspace id cannot be empty".to_string(),
+        ));
+    }
+
+    if require_fork_prefix && !id.starts_with(WM_FORK_PREFIX) {
         return Err(Error::BadRequest(format!(
             "The id `{}` is invalid for a forked workspace. It should be prefixed by {}",
             id, WM_FORK_PREFIX
@@ -187,8 +219,9 @@ pub fn validate_fork_workspace_id(id: &str) -> error::Result<()> {
 
     if id.len() > 50 {
         return Err(Error::BadRequest(format!(
-            "Fork workspace id `{}` is too long ({} chars). Maximum length is 50 characters (including the '{}' prefix).",
-            id, id.len(), WM_FORK_PREFIX
+            "Workspace id `{}` is too long ({} chars). Maximum length is 50 characters.",
+            id,
+            id.len()
         )));
     }
 
@@ -315,9 +348,215 @@ lazy_static::lazy_static! {
     pub static ref PUBLIC_APP_RATE_LIMIT_CACHE: Cache<String, (Option<i32>, i64)> = Cache::new(1000);
 }
 
+#[cfg(feature = "cloud")]
+lazy_static::lazy_static! {
+    // Maps a workspace id to its root (billing) ancestor. Value: (root_id, expiry_timestamp).
+    // Reparenting (attach/detach dev) is rare and self-heals via the 60s TTL, so a brief stale
+    // mapping only mis-attributes usage for <60s across other instances.
+    pub static ref BILLING_WORKSPACE_CACHE: Cache<String, (String, i64)> = Cache::new(5000);
+}
+
+/// Resolve the "billing" workspace for `w_id`: the root ancestor of the fork/dev chain (the
+/// workspace whose plan and usage a fork draws from). Returns `w_id` unchanged for a standalone
+/// workspace, an unknown id, or a (malformed) cyclic chain.
+///
+/// Unauthenticated metering helper: it only reads the parent chain and returns another workspace id,
+/// so callers must already be authorized for `w_id` (or run in trusted server-side code); `w_id` is
+/// expected to be a server-side id, not raw user input.
+#[cfg(feature = "cloud")]
+pub async fn get_billing_workspace_id(db: &crate::DB, w_id: &str) -> Result<String> {
+    let now = chrono::Utc::now().timestamp();
+    if let Some((root, expiry)) = BILLING_WORKSPACE_CACHE.get(w_id) {
+        if expiry > now {
+            return Ok(root);
+        }
+    }
+
+    // The depth bound is a cycle-safety backstop kept well above the enforced `MAX_FORK_DEPTH`, so a
+    // truncated (root-not-found) result — which would fall back to `w_id` and mis-attribute billing —
+    // is unreachable for any real hierarchy; only a malformed cycle could hit it.
+    let root = sqlx::query_scalar!(
+        r#"
+            WITH RECURSIVE chain AS (
+                SELECT id, parent_workspace_id, 0 AS depth
+                FROM workspace WHERE id = $1
+                UNION ALL
+                SELECT w.id, w.parent_workspace_id, chain.depth + 1
+                FROM workspace w
+                JOIN chain ON w.id = chain.parent_workspace_id
+                WHERE chain.depth < 20
+            )
+            SELECT id AS "id!" FROM chain WHERE parent_workspace_id IS NULL LIMIT 1
+        "#,
+        w_id
+    )
+    .fetch_optional(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("resolving billing workspace for {w_id}: {e:#}")))?
+    .unwrap_or_else(|| w_id.to_string());
+
+    BILLING_WORKSPACE_CACHE.insert(w_id.to_string(), (root.clone(), now + 60));
+    Ok(root)
+}
+
+/// Invalidate the billing-workspace mapping for a workspace (call after reparenting it).
+#[cfg(feature = "cloud")]
+pub fn invalidate_billing_workspace_cache(w_id: &str) {
+    BILLING_WORKSPACE_CACHE.remove(w_id);
+}
+
+/// Invalidate the cached team-plan (premium/past-due) status for a workspace. `TEAM_PLAN_CACHE` has
+/// no TTL — it's only evicted by the premium-change NOTIFY — so call this when a workspace id is
+/// permanently deleted, otherwise a reused id could inherit the old workspace's premium status.
+#[cfg(feature = "cloud")]
+pub fn invalidate_team_plan_cache(w_id: &str) {
+    TEAM_PLAN_CACHE.remove(w_id);
+}
+
+/// Depth of `w_id` in its fork chain: 0 for a root (no parent), 1 for a direct fork, and so on. Walks
+/// the parent chain up to the root. The recursion bound is a cycle-safety backstop set well above the
+/// enforced `MAX_FORK_DEPTH`; a (malformed) cyclic chain saturates it and so reads as "too deep",
+/// which safely rejects rather than allows.
+///
+/// Unauthenticated helper: reads workspace hierarchy for any `w_id`, so callers must already be
+/// authorized for that workspace (or run in trusted server-side code).
+pub async fn fork_chain_depth(db: &crate::DB, w_id: &str) -> Result<i64> {
+    let depth = sqlx::query_scalar!(
+        r#"
+            WITH RECURSIVE chain AS (
+                SELECT id, parent_workspace_id, 0 AS depth
+                FROM workspace WHERE id = $1
+                UNION ALL
+                SELECT w.id, w.parent_workspace_id, chain.depth + 1
+                FROM workspace w
+                JOIN chain ON w.id = chain.parent_workspace_id
+                WHERE chain.depth < 20
+            )
+            SELECT COALESCE(MAX(depth), 0)::bigint AS "depth!" FROM chain
+        "#,
+        w_id
+    )
+    .fetch_one(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("computing fork depth for {w_id}: {e:#}")))?;
+    Ok(depth)
+}
+
+/// Height of the fork subtree rooted at `w_id`: 0 when it has no live child forks, 1 with direct
+/// children, and so on. Used so that attaching a candidate which already has its own child forks can't
+/// push the family past the depth limit.
+///
+/// Unauthenticated helper: reads workspace hierarchy for any `w_id`, so callers must already be
+/// authorized for that workspace (or run in trusted server-side code).
+pub async fn fork_subtree_height(db: &crate::DB, w_id: &str) -> Result<i64> {
+    // The `deleted` filter is applied in the outer aggregation (not the recursive step, matching
+    // count_workspace_forks) so a live descendant under a soft-deleted intermediate is still measured
+    // at its true depth rather than pruned — otherwise the height could be underestimated and let the
+    // resulting chain exceed the depth limit.
+    let height = sqlx::query_scalar!(
+        r#"
+            WITH RECURSIVE tree AS (
+                SELECT id, deleted, 0 AS depth FROM workspace WHERE id = $1
+                UNION ALL
+                SELECT w.id, w.deleted, tree.depth + 1 FROM workspace w
+                JOIN tree ON w.parent_workspace_id = tree.id
+                WHERE tree.depth < 20
+            )
+            SELECT COALESCE(MAX(depth) FILTER (WHERE NOT deleted), 0)::bigint AS "height!" FROM tree
+        "#,
+        w_id
+    )
+    .fetch_one(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("computing fork subtree height for {w_id}: {e:#}")))?;
+    Ok(height)
+}
+
+/// Ids of every fork/dev workspace anywhere under `w_id` (excludes `w_id` itself), including live
+/// descendants beneath a soft-deleted intermediate. Used to invalidate per-workspace caches for a
+/// whole subtree after its ancestor is reparented.
+///
+/// Unauthenticated helper: reads workspace hierarchy for any `w_id`, so callers must already be
+/// authorized for that workspace (or run in trusted server-side code).
+pub async fn list_fork_descendants(db: &crate::DB, w_id: &str) -> Result<Vec<String>> {
+    let ids = sqlx::query_scalar!(
+        r#"
+            WITH RECURSIVE tree AS (
+                SELECT id, 0 AS depth FROM workspace WHERE id = $1
+                UNION ALL
+                SELECT w.id, tree.depth + 1 FROM workspace w
+                JOIN tree ON w.parent_workspace_id = tree.id
+                WHERE tree.depth < 20
+            )
+            SELECT id AS "id!" FROM tree WHERE id != $1
+        "#,
+        w_id
+    )
+    .fetch_all(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("listing fork descendants of {w_id}: {e:#}")))?;
+    Ok(ids)
+}
+
+/// Count non-deleted fork/dev workspaces anywhere under `root` (excludes `root` itself).
+///
+/// Unauthenticated metering helper: it reads workspace hierarchy for any `root` id, so callers must
+/// already be authorized for that workspace (or run in trusted server-side code). `root` is expected
+/// to be a server-resolved id, never raw user input.
+#[cfg(feature = "cloud")]
+pub async fn count_workspace_forks(db: &crate::DB, root: &str) -> Result<i64> {
+    // The `deleted` filter is on the outer SELECT (not the recursive step) so that a live sub-fork
+    // whose intermediate parent was soft-deleted is still counted rather than pruned with it. The
+    // depth bound is a cycle-safety backstop kept well above the enforced `MAX_FORK_DEPTH`, so
+    // descendants are never silently dropped from the cap count.
+    let count = sqlx::query_scalar!(
+        r#"
+            WITH RECURSIVE tree AS (
+                SELECT id, deleted, 0 AS depth FROM workspace WHERE id = $1
+                UNION ALL
+                SELECT w.id, w.deleted, tree.depth + 1 FROM workspace w
+                JOIN tree ON w.parent_workspace_id = tree.id
+                WHERE tree.depth < 20
+            )
+            SELECT COUNT(DISTINCT id) AS "count!" FROM tree WHERE id != $1 AND NOT deleted
+        "#,
+        root
+    )
+    .fetch_one(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("counting forks of {root}: {e:#}")))?;
+    Ok(count)
+}
+
+/// Approximate paid seats of a workspace as `ceil(developers + operators/2)`, excluding disabled and
+/// service-account members. Reuses billing's author/operator weighting, but counts provisioned
+/// members rather than the active-user population billing meters, so it only ever loosens the fork
+/// cap (never blocks a paid seat) — good enough for a soft guardrail.
+///
+/// Unauthenticated metering helper: reads member counts for any `w_id`, so callers must already be
+/// authorized for that workspace (or run in trusted server-side code).
+#[cfg(feature = "cloud")]
+pub async fn count_paid_seats(db: &crate::DB, w_id: &str) -> Result<i64> {
+    let row = sqlx::query!(
+        r#"SELECT
+            COUNT(*) FILTER (WHERE NOT operator AND NOT disabled AND NOT is_service_account) AS "developers!",
+            COUNT(*) FILTER (WHERE operator AND NOT disabled AND NOT is_service_account) AS "operators!"
+        FROM usr WHERE workspace_id = $1"#,
+        w_id
+    )
+    .fetch_one(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("counting paid seats of {w_id}: {e:#}")))?;
+    Ok(((row.developers as f64) + 0.5 * (row.operators as f64)).ceil() as i64)
+}
+
 #[cfg(feature = "cloud")]
 pub async fn get_team_plan_status(_db: &crate::DB, _w_id: &str) -> Result<TeamPlanStatus> {
-    let cached = TEAM_PLAN_CACHE.get(_w_id);
+    // A fork/dev workspace draws its plan from the root (billing) workspace. Resolve to the root and
+    // key the cache by it: the premium-change NOTIFY is keyed by the workspace whose premium row
+    // changed (the root), so keying by root keeps invalidation correct and lets forks share it.
+    let billing_w_id = get_billing_workspace_id(_db, _w_id).await?;
+    let cached = TEAM_PLAN_CACHE.get(&billing_w_id);
     if let Some(cached) = cached {
         return Ok(cached);
     }
@@ -336,7 +575,7 @@ pub async fn get_team_plan_status(_db: &crate::DB, _w_id: &str) -> Result<TeamPl
                 WHERE
                     w.id = $1
             "#,
-            _w_id
+            billing_w_id
         )
         .fetch_optional(_db)
         .await
@@ -348,13 +587,13 @@ pub async fn get_team_plan_status(_db: &crate::DB, _w_id: &str) -> Result<TeamPl
     )
     .notify(|err, dur| {
         tracing::error!(
-            "Failed to get team plan status for workspace {_w_id} (will retry in {dur:?}): {err:#}"
+            "Failed to get team plan status for workspace {billing_w_id} (will retry in {dur:?}): {err:#}"
         );
     })
     .await
     .map_err(|err| {
         Error::internal_err(format!(
-            "Failed to get team plan status for workspace {_w_id} after 10 retries: {err:#}"
+            "Failed to get team plan status for workspace {billing_w_id} after 10 retries: {err:#}"
         ))
     })?
     .unwrap_or_else(|| TeamPlanStatus {
@@ -363,7 +602,7 @@ pub async fn get_team_plan_status(_db: &crate::DB, _w_id: &str) -> Result<TeamPl
         max_tolerated_executions: None,
     });
 
-    TEAM_PLAN_CACHE.insert(_w_id.to_string(), team_plan_info.clone());
+    TEAM_PLAN_CACHE.insert(billing_w_id, team_plan_info.clone());
 
     Ok(team_plan_info)
 }
@@ -437,6 +676,11 @@ pub enum RuleCheckResult {
 /// - User is not in bypass lists
 ///
 /// Returns `Err` if the rule is not found
+/// Reserved protection-rule name applied to a prod workspace paired with a dev workspace. It carries
+/// `DisableDirectDeployment` + `DisableWorkspaceForking` and is auto-managed by the dev-workspace
+/// feature (applied on pairing, removed on detach).
+pub const DEV_WORKSPACE_LOCK_RULE_NAME: &str = "dev_workspace_lock";
+
 pub async fn check_user_against_rule(
     workspace_id: &str,
     rule: &ProtectionRuleKind,
@@ -528,6 +772,11 @@ pub struct DataTable {
     pub database: DataTableDatabase,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub forked_from: Option<DataTableForkedFrom>,
+    /// Whether the SQL-migrations feature is opted in for this data table.
+    /// Absent on data tables created before the feature: treated as enabled only
+    /// when migrations already exist (see `datatable_migrations_enabled`).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub migrations_enabled: Option<bool>,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -553,25 +802,55 @@ pub enum DataTableCatalogResourceType {
     Instance,
 }
 
+/// Build a self-teaching error for an unresolved `datatable://<name>` reference.
+/// The raw "not found" gives the user no way forward — the datatable substrate has
+/// no auto-provisioning (unlike a DuckLake catalog), so the fix is always to create
+/// one in workspace settings. Surface the available names (to catch typos) and point
+/// at the settings page so the message is actionable wherever it bubbles up
+/// (pipeline `ATTACH`, schema fetch, postgres executor, ...).
+fn datatable_not_found_error(name: &str, datatables: Option<&serde_json::Value>) -> Error {
+    let available: Vec<&str> = datatables
+        .and_then(|d| d.as_object())
+        .map(|o| o.keys().map(String::as_str).collect())
+        .unwrap_or_default();
+
+    let hint = if available.is_empty() {
+        "No data table is configured in this workspace yet.".to_string()
+    } else {
+        format!("Configured data tables: {}.", available.join(", "))
+    };
+
+    Error::NotFound(format!(
+        "Data table '{name}' not found. {hint} \
+         Create one in workspace settings under the \"Data tables\" tab \
+         (/workspace_settings?tab=windmill_data_tables) — the name \"main\" is the default \
+         used by `datatable://main`."
+    ))
+}
+
 pub async fn get_datatable_resource_from_db_unchecked(
     db: &DB,
     w_id: &str,
     name: &str,
 ) -> Result<serde_json::Value> {
-    let datatable = sqlx::query_scalar!(
+    let datatables = sqlx::query_scalar!(
         r#"
-            SELECT ws.datatable->'datatables'->$2 AS config
+            SELECT ws.datatable->'datatables' AS datatables
             FROM workspace_settings ws
             WHERE ws.workspace_id = $1
         "#,
         &w_id,
-        name
     )
     .fetch_one(db)
     .await
-    .map_err(|err| Error::internal_err(format!("getting datatable {name}: {err}")))?
-    .ok_or_else(|| Error::internal_err(format!("datatable {name} not found")))?;
-    let datatable = serde_json::from_value::<DataTable>(datatable)?;
+    .map_err(|err| Error::internal_err(format!("getting datatable {name}: {err}")))?;
+
+    let datatable = datatables
+        .as_ref()
+        .and_then(|d| d.get(name))
+        .filter(|v| !v.is_null())
+        .ok_or_else(|| datatable_not_found_error(name, datatables.as_ref()))?;
+    let datatable = serde_json::from_value::<DataTable>(datatable.clone())?;
 
     let db_resource = if datatable.database.resource_type == DataTableCatalogResourceType::Instance
     {
@@ -599,6 +878,97 @@ pub struct Ducklake {
     pub storage: DucklakeStorage,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub extra_args: Option<String>,
+    /// How this lake behaves when the workspace is a fork/dev workspace. Only meaningful in a
+    /// fork's own settings; stamped at fork creation from the user's per-lake choice. Absent =
+    /// `Isolated` — the safe default, so forks created before this field existed (and API
+    /// callers that omit it) never write the parent's lake.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub fork_behavior: Option<DucklakeForkBehavior>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub maintenance: Option<DucklakeMaintenance>,
+}
+
+/// Per-lake fork data-environment choice, made at fork creation.
+#[derive(Deserialize, Serialize, Debug, Clone, Copy, PartialEq)]
+#[serde(rename_all = "snake_case")]
+pub enum DucklakeForkBehavior {
+    /// Fork-scoped namespace + read-defer to the parent (default).
+    Isolated,
+    /// The fork reads AND WRITES the parent's lake directly — explicit opt-out of isolation
+    /// (e.g. a fork meant to run prod-equivalent backfills).
+    Shared,
+}
+
+/// Scheduled maintenance for a ducklake (enterprise): snapshot expiry,
+/// adjacent-file compaction and orphaned-file cleanup, run as a managed
+/// per-lake schedule. Not mirrored in `instance_config::Ducklake`:
+/// instance-level lakes have no workspace to schedule into.
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct DucklakeMaintenance {
+    pub enabled: bool,
+    /// Cron (v2/croner, seconds optional). None → daily at 03:00 UTC with a
+    /// deterministic per-(workspace, lake) minute offset.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub schedule: Option<String>,
+    /// Snapshot retention window in days (default 7). Snapshots older than
+    /// this are expired: time-travel reads (`AT (VERSION => n)`) older than
+    /// the window stop working. 0 keeps only the current snapshot.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub retention_days: Option<u32>,
+    /// Merge adjacent small parquet files (default true).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub compaction: Option<bool>,
+    /// Delete orphaned files older than max(retention, 1 day) (default true).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub orphan_cleanup: Option<bool>,
+}
+
+impl DucklakeMaintenance {
+    pub const DEFAULT_RETENTION_DAYS: u32 = 7;
+
+    pub fn retention_days(&self) -> u32 {
+        self.retention_days.unwrap_or(Self::DEFAULT_RETENTION_DAYS)
+    }
+    pub fn compaction(&self) -> bool {
+        self.compaction.unwrap_or(true)
+    }
+    pub fn orphan_cleanup(&self) -> bool {
+        self.orphan_cleanup.unwrap_or(true)
+    }
+}
+
+/// Reserved schedule path namespace for managed ducklake maintenance
+/// schedules. Must satisfy the `schedule.path` CHECK constraint
+/// (`^[ufg](\/[\w-]+){2,}$`), hence the `f/` prefix; the folder itself never
+/// exists. The schedule API rejects user mutations under this prefix and the
+/// list/export endpoints filter it out — the lifecycle is owned by the
+/// workspace ducklake settings.
+///
+/// Accepted limitation: a schedule that pre-dated this namespace under a real
+/// `ducklake_maintenance` folder keeps running (tick dispatch falls through
+/// to its script when its path's lake has no enabled maintenance config, and
+/// the settings sync only touches rows derived from config) but stays hidden
+/// from list/export and immutable via the schedule API until renamed out of
+/// the namespace. Judged unlikely enough to not warrant a discriminator
+/// column or a rename migration.
+pub const DUCKLAKE_MAINTENANCE_PATH_PREFIX: &str = "f/ducklake_maintenance/";
+
+pub fn ducklake_maintenance_schedule_path(lake: &str) -> String {
+    format!("{DUCKLAKE_MAINTENANCE_PATH_PREFIX}{lake}")
+}
+
+pub fn lake_from_ducklake_maintenance_path(path: &str) -> Option<&str> {
+    path.strip_prefix(DUCKLAKE_MAINTENANCE_PATH_PREFIX)
+}
+
+/// Lake names are interpolated into `ATTACH 'ducklake://<name>'`, generated
+/// maintenance SQL and the reserved schedule path (CHECK-constrained to
+/// `[\w-]+` segments), so they must stay to this charset.
+pub fn is_valid_ducklake_name(name: &str) -> bool {
+    !name.is_empty()
+        && name
+            .chars()
+            .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
 }
 
 #[derive(Deserialize, Serialize, Debug)]
@@ -632,6 +1002,213 @@ pub struct DucklakeWithConnData {
     pub storage: DucklakeStorage,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub extra_args: Option<String>,
+    /// Present when the resolved workspace is a fork/dev workspace. Carries the read-defer
+    /// context (ancestor namespaces + tables to expose as views over the direct parent). The
+    /// fork *write* redirect is folded into `storage.path`/`extra_args` above, so an agent
+    /// worker that predates this field still writes the fork namespace (it only misses the
+    /// defer views).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub fork_defer: Option<DucklakeForkDefer>,
+}
+
+/// Read-defer context for a fork workspace's ducklake: which ancestor namespaces to attach
+/// read-only, and which tables to expose as views over the direct parent because the fork has
+/// not materialized them yet. `ancestors` is empty when defer is unavailable (an ancestor no
+/// longer defines the lake) — the fork namespace still isolates writes in that case.
+#[derive(Deserialize, Serialize)]
+pub struct DucklakeForkDefer {
+    /// Nearest-first (direct parent … root), each resolved from that workspace's own settings.
+    pub ancestors: Vec<DucklakeAncestorAttach>,
+    pub defer_tables: Vec<crate::materialization::ForkDeferTable>,
+    /// Views currently live in the fork namespace (read from the catalog's `ducklake_view` at
+    /// resolution time, lake-internal names). The worker's view→table transition (DROP VIEW
+    /// before a managed materialize) keys on THIS, not on recorded materialization status:
+    /// after a failed run the status can't distinguish a defer view from a real table, and
+    /// `DROP VIEW` against a table (or `CREATE TABLE` against a view) errors — either guess
+    /// would wedge the asset until manual repair.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub fork_views: Vec<String>,
+}
+
+/// Connection data for one ancestor namespace of a fork's ducklake.
+#[derive(Deserialize, Serialize)]
+pub struct DucklakeAncestorAttach {
+    pub workspace_id: String,
+    /// DuckDB catalog alias this namespace must be attached under. Persisted defer-view SQL
+    /// references it, so it is a pure function of (lake name, ancestor workspace id) and every
+    /// session reading those views attaches the ancestor under this exact alias.
+    pub alias: String,
+    pub catalog: DucklakeCatalog,
+    pub catalog_resource: serde_json::Value,
+    pub storage: DucklakeStorage,
+    /// None = the lake's default metadata schema (the ancestor is a root/non-fork workspace).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub metadata_schema: Option<String>,
+    /// The ancestor config's own non-reserved ATTACH args (e.g. `ENCRYPTED true`), already
+    /// stripped of the fork-owned `METADATA_SCHEMA`/`DATA_PATH`/`OVERRIDE_DATA_PATH` — an
+    /// option-dependent lake would otherwise fail its read-only ancestor attach even though
+    /// the same lake attaches fine everywhere else.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub extra_args: Option<String>,
+}
+
+/// Prefix of fork-scoped ducklake metadata schemas. Cleanup refuses to drop any pg schema not
+/// carrying it, mirroring the `wm_fork_` guard on forked datatable databases.
+pub const FORK_DUCKLAKE_SCHEMA_PREFIX: &str = "wm_fork_";
+
+/// Bucket-root directory holding all fork namespaces' data files: each fork writes under
+/// `{FORK_DUCKLAKE_DATA_DIR}/<fork segment>/<lake path>` where the segment is
+/// [`fork_data_dir_segment`] (see [`fork_data_path`] for why it wraps the lake's path instead
+/// of nesting under it).
+pub const FORK_DUCKLAKE_DATA_DIR: &str = "__wm_forks";
+
+fn mangle_identifier(s: &str, max: usize) -> String {
+    s.chars()
+        .take(max)
+        .map(|c| {
+            let c = c.to_ascii_lowercase();
+            if c.is_ascii_alphanumeric() {
+                c
+            } else {
+                '_'
+            }
+        })
+        .collect()
+}
+
+/// Deterministic, injective pg-schema name for a fork workspace's namespace of ONE lake:
+/// `wm_fork_<mangled wid (≤24)>_<mangled lake (≤16)>_<8-hex sha256>`, ≤58 chars (pg limit 63).
+/// Lake-scoped, not just workspace-scoped: two lakes of one workspace may share a catalog
+/// database, and a per-workspace schema would merge their namespaces in the fork (tables and
+/// snapshots colliding across `ducklake://a/…` and `ducklake://b/…`). The hash keeps distinct
+/// (workspace, lake) pairs distinct after mangling. The registry row records the computed name
+/// for cleanup, but ATTACH recomputes it — so this function must stay stable across releases
+/// or existing forks would silently lose their namespace.
+pub fn fork_ducklake_metadata_schema(w_id: &str, lake_name: &str) -> String {
+    use sha2::{Digest, Sha256};
+    let hash = hex::encode(&Sha256::digest(format!("{w_id}\0{lake_name}").as_bytes())[..4]);
+    format!(
+        "{FORK_DUCKLAKE_SCHEMA_PREFIX}{}_{}_{hash}",
+        mangle_identifier(w_id, 24),
+        mangle_identifier(lake_name, 16)
+    )
+}
+
+/// The `METADATA_SCHEMA '<x>'` value carried in a lake config's `extra_args`, if any — the
+/// schema the lake's OWN catalog namespace lives in (how one catalog database hosts several
+/// lakes). Ancestor read-only attaches must preserve it or they'd bind the wrong namespace.
+pub fn extract_metadata_schema_arg(extra_args: &str) -> Option<String> {
+    lazy_static::lazy_static! {
+        static ref MS: regex::Regex = regex::Regex::new(
+            r"(?i)\bMETADATA_SCHEMA\s*(?:'([^']*)'|([A-Za-z0-9_]+))"
+        )
+        .unwrap();
+    }
+    // Last occurrence wins, matching DuckDB's duplicate-option semantics.
+    MS.captures_iter(extra_args)
+        .last()
+        .and_then(|c| c.get(1).or_else(|| c.get(2)))
+        .map(|m| m.as_str().to_string())
+}
+
+/// Deterministic DuckDB attach alias for an ancestor namespace of a fork's lake. Persisted
+/// defer-view SQL references it (same stability requirement as
+/// [`fork_ducklake_metadata_schema`]).
+pub fn fork_ducklake_ancestor_alias(lake_name: &str, ancestor_w_id: &str) -> String {
+    use sha2::{Digest, Sha256};
+    let hash =
+        hex::encode(&Sha256::digest(format!("{lake_name}\0{ancestor_w_id}").as_bytes())[..4]);
+    format!(
+        "__wm_dl_{}_{}_{hash}",
+        mangle_identifier(lake_name, 20),
+        mangle_identifier(ancestor_w_id, 20)
+    )
+}
+
+/// Strip `METADATA_SCHEMA` / `DATA_PATH` / `OVERRIDE_DATA_PATH` tokens from ducklake ATTACH
+/// extra args. In a fork these options are injected by the fork resolution; a user- or
+/// settings-supplied duplicate silently wins (DuckDB keeps the last occurrence) and would
+/// escape the fork namespace back to the parent's, so they are removed rather than overridden.
+pub fn strip_fork_reserved_attach_args(extra_args: &str) -> String {
+    lazy_static::lazy_static! {
+        static ref RESERVED: regex::Regex = regex::Regex::new(
+            r"(?i)\b(METADATA_SCHEMA|DATA_PATH|OVERRIDE_DATA_PATH)\s*('[^']*'|[A-Za-z0-9_]+)"
+        )
+        .unwrap();
+    }
+    RESERVED
+        .replace_all(extra_args, "")
+        .split(',')
+        .map(str::trim)
+        .filter(|s| !s.is_empty())
+        .collect::<Vec<_>>()
+        .join(", ")
+}
+
+lazy_static::lazy_static! {
+    /// fork workspace id -> (ancestor chain nearest-first, expiry ts). Empty chain = not a fork.
+    /// `parent_workspace_id` only changes on dev-workspace attach/detach, so a short TTL is safe.
+    static ref FORK_ANCESTOR_CHAIN_CACHE: Cache<String, (Vec<String>, i64)> = Cache::new(5000);
+    /// fork workspace id -> (locations recently upserted into `fork_ducklake_namespace`,
+    /// expiry ts), so the registry write doesn't run on every job of a fork. Keyed by
+    /// workspace id so cleanup can drop a fork's whole entry: a same-id fork recreated within
+    /// the TTL must re-register, or its materializations would carry no registry row and leak
+    /// at ITS deletion. TTL'd as a second line of defense for cleanup paths that bypass
+    /// `cleanup_fork_ducklake_namespaces` (e.g. manual registry edits).
+    static ref FORK_DUCKLAKE_REGISTERED: Cache<String, (std::collections::HashSet<String>, i64)> =
+        Cache::new(5000);
+}
+
+/// Drop the "already registered" once-cache for a workspace. MUST be called whenever
+/// `fork_ducklake_namespace` rows for that workspace are deleted (namespace cleanup, workspace
+/// deletion): a surviving entry would make a same-id fork recreated within the TTL skip
+/// re-registration, orphaning its namespace at deletion time.
+pub fn invalidate_fork_ducklake_registration_cache(w_id: &str) {
+    FORK_DUCKLAKE_REGISTERED.remove(w_id);
+}
+
+/// Drop the cached ancestor chain for a workspace. MUST be called wherever
+/// `parent_workspace_id` lineage changes (fork creation, dev-workspace attach, reparenting
+/// rename, deletion): a cached EMPTY chain reads as "not a fork" and would bypass ducklake
+/// fork isolation for the TTL — the first jobs after a dev-workspace attach would write the
+/// shared lake.
+pub fn invalidate_fork_ancestor_chain_cache(w_id: &str) {
+    FORK_ANCESTOR_CHAIN_CACHE.remove(w_id);
+}
+
+/// Ancestors of `w_id`, nearest-first (direct parent … root). Empty for a non-fork workspace or
+/// an unknown id. The depth bound is a cycle-safety backstop, same convention as
+/// [`fork_chain_depth`].
+///
+/// Unauthenticated helper: reads workspace hierarchy for any `w_id`, so callers must already be
+/// authorized for that workspace (or run in trusted server-side code).
+pub async fn fork_ancestor_chain(db: &crate::DB, w_id: &str) -> Result<Vec<String>> {
+    let now = chrono::Utc::now().timestamp();
+    if let Some((chain, expiry)) = FORK_ANCESTOR_CHAIN_CACHE.get(w_id) {
+        if expiry > now {
+            return Ok(chain);
+        }
+    }
+    let chain = sqlx::query_scalar!(
+        r#"
+            WITH RECURSIVE chain AS (
+                SELECT id, parent_workspace_id, 0 AS depth
+                FROM workspace WHERE id = $1
+                UNION ALL
+                SELECT w.id, w.parent_workspace_id, chain.depth + 1
+                FROM workspace w
+                JOIN chain ON w.id = chain.parent_workspace_id
+                WHERE chain.depth < 20
+            )
+            SELECT id AS "id!" FROM chain WHERE depth > 0 ORDER BY depth
+        "#,
+        w_id
+    )
+    .fetch_all(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("resolving fork ancestors of {w_id}: {e:#}")))?;
+    FORK_ANCESTOR_CHAIN_CACHE.insert(w_id.to_string(), (chain.clone(), now + 60));
+    Ok(chain)
 }
 
 pub async fn get_ducklake_from_db_unchecked(
@@ -639,6 +1216,29 @@ pub async fn get_ducklake_from_db_unchecked(
     w_id: &str,
     db: &DB,
 ) -> Result<DucklakeWithConnData> {
+    let (base, fork_behavior) = ducklake_conn_data(name, w_id, db).await?;
+    let chain = fork_ancestor_chain(db, w_id).await?;
+    // `Shared` is the explicit fork-creation opt-out of isolation: the fork reads and writes
+    // the parent's lake through its own (cloned) config, exactly like a non-fork workspace.
+    // An empty chain alone does NOT mean "not a fork": `parent_workspace_id` is ON DELETE SET
+    // NULL, so a `wm-fork-*` workspace can outlive its parent — its cloned config still points
+    // at the shared lake, so the prefix keeps it isolated (mirrors `workspace_is_fork`). No
+    // ancestors ⇒ no defer, write redirect only. Prefix-less dev workspaces can't be orphaned
+    // (deletion of their prod is blocked while attached).
+    if (chain.is_empty() && !w_id.starts_with(WM_FORK_PREFIX))
+        || fork_behavior == Some(DucklakeForkBehavior::Shared)
+    {
+        return Ok(base);
+    }
+    fork_scoped_ducklake(name, w_id, base, chain, db).await
+}
+
+/// Resolve one workspace's own config for lake `name` — no fork awareness.
+async fn ducklake_conn_data(
+    name: &str,
+    w_id: &str,
+    db: &DB,
+) -> Result<(DucklakeWithConnData, Option<DucklakeForkBehavior>)> {
     let ducklake = sqlx::query_scalar!(
         r#"
             SELECT ws.ducklake->'ducklakes'->$2 AS config
@@ -671,13 +1271,447 @@ pub async fn get_ducklake_from_db_unchecked(
             )
             .await?
         };
+    let fork_behavior = ducklake.fork_behavior;
     let ducklake = DucklakeWithConnData {
         catalog_resource,
         catalog: ducklake.catalog,
         storage: ducklake.storage,
         extra_args: ducklake.extra_args,
+        fork_defer: None,
     };
-    Ok(ducklake)
+    Ok((ducklake, fork_behavior))
+}
+
+/// The fork's directory segment under `__wm_forks/`: mangled + hashed into ONE path component
+/// (same recipe and stability requirement as [`fork_ducklake_metadata_schema`]). Fork/dev
+/// workspace ids are only git-branch-safe and may contain `/` (e.g. `wm-fork-a/b`) — used
+/// raw, such an id would nest inside the sibling `wm-fork-a`'s prefix and be swept by ITS
+/// cleanup. The hash keeps distinct ids distinct after mangling.
+pub fn fork_data_dir_segment(fork_w_id: &str) -> String {
+    use sha2::{Digest, Sha256};
+    let hash = hex::encode(&Sha256::digest(fork_w_id.as_bytes())[..4]);
+    format!("{}_{hash}", mangle_identifier(fork_w_id, 40))
+}
+
+/// The fork namespace's data path within the same bucket: a bucket-root
+/// `__wm_forks/<fork segment>/` prefix wrapping the lake's own path, NOT a sub-path under it —
+/// the parent lake's maintenance (snapshot expiry / `ducklake_delete_orphaned_files`) scans
+/// everything under the parent's DATA_PATH and would treat live fork files nested there as
+/// orphans and delete them.
+pub fn fork_data_path(base_path: &str, fork_w_id: &str) -> String {
+    let segment = fork_data_dir_segment(fork_w_id);
+    let base = base_path.trim_matches('/');
+    if base.is_empty() {
+        format!("{FORK_DUCKLAKE_DATA_DIR}/{segment}")
+    } else {
+        format!("{FORK_DUCKLAKE_DATA_DIR}/{segment}/{base}")
+    }
+}
+
+/// Redirect a fork workspace's lake to its fork-scoped namespace (same catalog DB, fork
+/// metadata schema + data sub-path) and assemble the read-defer context over its ancestors.
+async fn fork_scoped_ducklake(
+    name: &str,
+    w_id: &str,
+    mut base: DucklakeWithConnData,
+    chain: Vec<String>,
+    db: &DB,
+) -> Result<DucklakeWithConnData> {
+    if base.catalog.resource_type == DucklakeCatalogResourceType::Mysql {
+        return Err(Error::BadRequest(format!(
+            "ducklake {name}: mysql-catalog lakes are not supported in fork workspaces — \
+             running against the shared catalog would write the parent workspace's data"
+        )));
+    }
+    let metadata_schema = fork_ducklake_metadata_schema(w_id, name);
+    let fork_path = fork_data_path(&base.storage.path, w_id);
+    let catalog_identity = ducklake_catalog_identity(&base.catalog);
+    register_fork_ducklake_namespace(
+        db,
+        w_id,
+        name,
+        &metadata_schema,
+        &catalog_identity,
+        base.storage.storage.as_deref(),
+        &fork_path,
+    )
+    .await?;
+
+    // Ancestor namespaces, nearest-first, each from its own settings so a fork-side settings
+    // edit can't silently repoint what "parent" means. All-or-nothing: a broken link anywhere
+    // in the chain disables defer entirely (a defer view over a missing ancestor attach fails
+    // at bind time and would kill unrelated jobs), but write isolation still applies.
+    let mut ancestors = Vec::with_capacity(chain.len());
+    for (i, ancestor_id) in chain.iter().enumerate() {
+        match ducklake_conn_data(name, ancestor_id, db).await {
+            Ok((mut a, ancestor_behavior)) => {
+                // A fork ancestor lives in its own namespace UNLESS its lake is `Shared` —
+                // then it never redirected and its data sits at its config's default
+                // location, exactly like a root workspace. Chain position alone can't tell
+                // the two apart: an orphaned `wm-fork-*` ancestor (its own parent deleted,
+                // `parent_workspace_id` SET NULL) ends the chain like a root but its data
+                // lives in ITS fork namespace — key on the prefix too, as in resolution.
+                let is_isolated_fork = (i + 1 < chain.len()
+                    || ancestor_id.starts_with(WM_FORK_PREFIX))
+                    && ancestor_behavior != Some(DucklakeForkBehavior::Shared);
+                let metadata_schema = if is_isolated_fork {
+                    a.storage.path = fork_data_path(&a.storage.path, ancestor_id);
+                    Some(fork_ducklake_metadata_schema(ancestor_id, name))
+                } else {
+                    // Root / shared ancestors live in their config's OWN catalog namespace —
+                    // which may be a non-default schema when one catalog database hosts
+                    // several lakes (`extra_args METADATA_SCHEMA '…'`). Preserve it, or the
+                    // read-only attach would bind the wrong (or a nonexistent) lake.
+                    a.extra_args
+                        .as_deref()
+                        .and_then(extract_metadata_schema_arg)
+                };
+                let extra_args = a
+                    .extra_args
+                    .as_deref()
+                    .map(strip_fork_reserved_attach_args)
+                    .filter(|s| !s.is_empty());
+                ancestors.push(DucklakeAncestorAttach {
+                    workspace_id: ancestor_id.clone(),
+                    alias: fork_ducklake_ancestor_alias(name, ancestor_id),
+                    catalog: a.catalog,
+                    catalog_resource: a.catalog_resource,
+                    storage: a.storage,
+                    metadata_schema,
+                    extra_args,
+                });
+            }
+            Err(e) => {
+                tracing::warn!(
+                    "fork {w_id}: ducklake {name} not resolvable in ancestor {ancestor_id} \
+                     ({e:#}); read-defer disabled, fork namespace still isolated"
+                );
+                ancestors.clear();
+                break;
+            }
+        }
+    }
+    // Drop fork ancestors whose namespace was never bootstrapped (e.g. a fresh intermediate
+    // fork that never attached this lake): their READ_ONLY attach would fail the whole job
+    // ("DuckLake does not exist" + creation disabled), and a nonexistent namespace can't own
+    // tables or be referenced by any persisted view. Checked against the fork's catalog DB —
+    // must happen BEFORE defer discovery so `ancestor_idx` values index the filtered list.
+    let (existing_schemas, fork_views, fork_tables) =
+        inspect_fork_catalog(&base, &metadata_schema, &ancestors, db).await?;
+    ancestors.retain(|a| {
+        a.metadata_schema
+            .as_ref()
+            .map_or(true, |s| existing_schemas.contains(s))
+    });
+    let defer_tables = if ancestors.is_empty() {
+        vec![]
+    } else {
+        // Discovery walks the WHOLE chain: a table only a grandparent materialized has no
+        // physical copy in the direct parent (it defers too), so its view must target the
+        // nearest ancestor that owns one.
+        let ancestor_ids: Vec<String> = ancestors.iter().map(|a| a.workspace_id.clone()).collect();
+        let mut tables =
+            crate::materialization::list_fork_defer_tables(db, &ancestor_ids, w_id, name).await?;
+        // Catalog truth beats recorded status: any table live in the fork namespace is
+        // fork-owned, whatever its materialized_partition row says (failed-after-commit,
+        // raw SQL) — a defer view over it would silently yield to it.
+        tables.retain(|t| !fork_tables.contains(&t.table));
+        tables
+    };
+
+    base.storage.path = fork_path;
+    base.extra_args = Some(match base.extra_args.take() {
+        Some(e) => {
+            let sanitized = strip_fork_reserved_attach_args(&e);
+            if sanitized.is_empty() {
+                format!("METADATA_SCHEMA '{metadata_schema}'")
+            } else {
+                format!("{sanitized}, METADATA_SCHEMA '{metadata_schema}'")
+            }
+        }
+        None => format!("METADATA_SCHEMA '{metadata_schema}'"),
+    });
+    base.fork_defer = Some(DucklakeForkDefer { ancestors, defer_tables, fork_views });
+    Ok(base)
+}
+
+/// One round trip to the fork's catalog DB for both namespace introspections: which fork
+/// ancestors' metadata schemas actually exist (a fresh intermediate fork may never have
+/// bootstrapped its namespace), and the views currently live in THIS fork's namespace
+/// (straight from DuckLake's `ducklake_view` metadata — missing metadata tables read as "no
+/// views", correct since nothing can exist there). Each ancestor's schema is checked in the
+/// ancestor's OWN catalog database — a fork whose catalog drifted away from an ancestor's
+/// must not misread that ancestor's (existing, elsewhere) namespace as missing. Ancestors
+/// whose catalog is unreachable read as missing — the safe direction: their defer is skipped
+/// (loud absent-table reads) rather than emitting a READ_ONLY attach that would fail every
+/// job in this fork.
+async fn inspect_fork_catalog(
+    base: &DucklakeWithConnData,
+    metadata_schema: &str,
+    ancestors: &[DucklakeAncestorAttach],
+    db: &DB,
+) -> Result<(
+    std::collections::HashSet<String>,
+    Vec<String>,
+    std::collections::HashSet<String>,
+)> {
+    // Ancestor fork-schemas grouped by which catalog database they live in.
+    let mut groups: std::collections::HashMap<String, (serde_json::Value, Vec<String>)> =
+        std::collections::HashMap::new();
+    for a in ancestors {
+        if let Some(ms) = &a.metadata_schema {
+            groups
+                .entry(ducklake_catalog_identity(&a.catalog))
+                .or_insert_with(|| (a.catalog_resource.clone(), vec![]))
+                .1
+                .push(ms.clone());
+        }
+    }
+
+    async fn query_schemas(
+        client: &tokio_postgres::Client,
+        schemas: Vec<String>,
+    ) -> std::result::Result<Vec<String>, tokio_postgres::Error> {
+        client
+            .query(
+                "SELECT schema_name::text FROM information_schema.schemata
+                 WHERE schema_name = ANY($1)",
+                &[&schemas],
+            )
+            .await
+            .map(|rows| rows.iter().map(|r| r.get::<_, String>(0)).collect())
+    }
+
+    let mut existing_schemas: std::collections::HashSet<String> = Default::default();
+
+    // The fork's own catalog: same-catalog ancestor schemas + this fork's live views.
+    let pg: crate::PgDatabase =
+        serde_json::from_value(base.catalog_resource.clone()).map_err(|e| {
+            Error::internal_err(format!("ducklake catalog resource is not postgres: {e}"))
+        })?;
+    let (client, connection) = pg.connect(Some(db)).await?;
+    let join_handle = tokio::spawn(async move { connection.await });
+    let same_catalog = groups.remove(&ducklake_catalog_identity(&base.catalog));
+    let same_catalog_res = match same_catalog {
+        Some((_, schemas)) => query_schemas(&client, schemas).await.map(Some),
+        None => Ok(None),
+    };
+    // Identifier-quoted schema: the name is server-derived (mangled + hashed) but quote anyway.
+    let q = format!(
+        r#"SELECT CASE WHEN s.schema_name = 'main' THEN v.view_name
+                       ELSE s.schema_name || '.' || v.view_name END AS name
+           FROM "{ms}".ducklake_view v
+           JOIN "{ms}".ducklake_schema s ON s.schema_id = v.schema_id AND s.end_snapshot IS NULL
+           WHERE v.end_snapshot IS NULL"#,
+        ms = metadata_schema.replace('"', "\"\"")
+    );
+    let view_rows = client.query(&q, &[]).await;
+    // Live TABLES in the fork's namespace, same name shape as the views — the defer list is
+    // filtered against them: `CREATE VIEW IF NOT EXISTS` silently yields to an existing
+    // table, so emitting a defer view over one would leave reads on the fork table while
+    // claiming they defer (recorded status can't tell — a committed write whose data tests
+    // failed, or a table left by raw SQL, has no `materialized` row).
+    let qt = format!(
+        r#"SELECT CASE WHEN s.schema_name = 'main' THEN t.table_name
+                       ELSE s.schema_name || '.' || t.table_name END AS name
+           FROM "{ms}".ducklake_table t
+           JOIN "{ms}".ducklake_schema s ON s.schema_id = t.schema_id AND s.end_snapshot IS NULL
+           WHERE t.end_snapshot IS NULL"#,
+        ms = metadata_schema.replace('"', "\"\"")
+    );
+    let table_rows = client.query(&qt, &[]).await;
+    drop(client);
+    let _ = join_handle.await;
+
+    existing_schemas.extend(
+        same_catalog_res
+            .map_err(|e| {
+                Error::internal_err(format!("checking fork ducklake ancestor schemas: {e}"))
+            })?
+            .unwrap_or_default(),
+    );
+    let fork_views = match view_rows {
+        Ok(rows) => rows.iter().map(|r| r.get::<_, String>(0)).collect(),
+        // 42P01 undefined_table / 3F000 invalid_schema_name: namespace not bootstrapped yet.
+        Err(e)
+            if e.code().map_or(false, |c| {
+                c == &tokio_postgres::error::SqlState::UNDEFINED_TABLE
+                    || c == &tokio_postgres::error::SqlState::INVALID_SCHEMA_NAME
+            }) =>
+        {
+            vec![]
+        }
+        Err(e) => {
+            return Err(Error::internal_err(format!(
+                "listing fork ducklake views in {metadata_schema}: {e}"
+            )))
+        }
+    };
+    let fork_tables = match table_rows {
+        Ok(rows) => rows.iter().map(|r| r.get::<_, String>(0)).collect(),
+        Err(e)
+            if e.code().map_or(false, |c| {
+                c == &tokio_postgres::error::SqlState::UNDEFINED_TABLE
+                    || c == &tokio_postgres::error::SqlState::INVALID_SCHEMA_NAME
+            }) =>
+        {
+            Default::default()
+        }
+        Err(e) => {
+            return Err(Error::internal_err(format!(
+                "listing fork ducklake tables in {metadata_schema}: {e}"
+            )))
+        }
+    };
+
+    // Ancestors living in OTHER catalog databases (this fork's catalog drifted after forking):
+    // one connection per distinct catalog, best-effort — an unreachable ancestor catalog only
+    // disables that ancestor's defer.
+    for (identity, (resource, schemas)) in groups {
+        let checked = async {
+            let pg: crate::PgDatabase = serde_json::from_value(resource)
+                .map_err(|e| Error::internal_err(format!("not a postgres resource: {e}")))?;
+            let (client, connection) = pg.connect(Some(db)).await?;
+            let join_handle = tokio::spawn(async move { connection.await });
+            let res = query_schemas(&client, schemas).await;
+            drop(client);
+            let _ = join_handle.await;
+            res.map_err(|e| Error::internal_err(format!("{e}")))
+        }
+        .await;
+        match checked {
+            Ok(found) => existing_schemas.extend(found),
+            Err(e) => {
+                tracing::warn!(
+                    "fork ancestor catalog `{identity}` unreachable while checking ducklake \
+                     namespaces ({e:#}); its ancestors' defer is disabled for this resolution"
+                );
+            }
+        }
+    }
+    Ok((existing_schemas, fork_views, fork_tables))
+}
+
+/// Canonical identity of a lake's catalog database (`<resource_type>:<resource_path>`) — used
+/// for the cleanup registry and for grouping ancestors by which catalog their namespace lives
+/// in. Identifies the database *pointer*, not its (live-resolved) credentials.
+pub fn ducklake_catalog_identity(catalog: &DucklakeCatalog) -> String {
+    format!(
+        "{}:{}",
+        catalog.resource_type.as_ref(),
+        catalog.resource_path
+    )
+}
+
+/// Record that a fork attached this lake at this physical location, so fork deletion knows
+/// exactly which pg metadata schema and which storage prefixes to clean up. One row per
+/// (lake, storage, data path) EVER attached — if the fork's lake settings drift, later
+/// attaches add rows rather than replace them, so cleanup covers every prefix the fork wrote.
+/// The once-cache is keyed on the full location for the same reason. Re-registering an
+/// existing row resets its `schema_dropped` cleanup phase: attaching recreates the metadata
+/// schema, so a stale "already dropped" marker would make the eventual cleanup skip a live
+/// schema.
+async fn register_fork_ducklake_namespace(
+    db: &DB,
+    w_id: &str,
+    name: &str,
+    metadata_schema: &str,
+    catalog: &str,
+    storage: Option<&str>,
+    data_path: &str,
+) -> Result<()> {
+    // '' = default storage (the column is part of the PK, which cannot hold NULL).
+    let storage = storage.unwrap_or("");
+    // Resolve the logical storage name to its identity NOW: cleanup must delete from the
+    // storage that was active when the data was written, not whatever the name points at by
+    // deletion time. '' = unresolvable (no LFS configured — the write itself will fail at the
+    // proxy, so nothing lands anywhere).
+    let storage_ref = fork_storage_ref(db, w_id, storage)
+        .await
+        .unwrap_or_default();
+    let location = format!("{name}\0{catalog}\0{storage}\0{storage_ref}\0{data_path}");
+    let now = chrono::Utc::now().timestamp();
+    if FORK_DUCKLAKE_REGISTERED
+        .get(w_id)
+        .is_some_and(|(locations, exp)| exp > now && locations.contains(&location))
+    {
+        return Ok(());
+    }
+    sqlx::query!(
+        "INSERT INTO fork_ducklake_namespace
+           (workspace_id, ducklake_name, metadata_schema, catalog, storage, storage_ref, data_path)
+         VALUES ($1, $2, $3, $4, $5, $6, $7)
+         ON CONFLICT (workspace_id, ducklake_name, catalog, storage, storage_ref, data_path)
+         DO UPDATE SET schema_dropped = false",
+        w_id,
+        name,
+        metadata_schema,
+        catalog,
+        storage,
+        &storage_ref,
+        data_path,
+    )
+    .execute(db)
+    .await
+    .map_err(|e| Error::internal_err(format!("registering fork ducklake namespace: {e:#}")))?;
+    let mut locations = FORK_DUCKLAKE_REGISTERED
+        .get(w_id)
+        .filter(|(_, exp)| *exp > now)
+        .map(|(locations, _)| locations)
+        .unwrap_or_default();
+    locations.insert(location);
+    FORK_DUCKLAKE_REGISTERED.insert(w_id.to_string(), (locations, now + 60));
+    Ok(())
+}
+
+/// Canonical identity of a workspace storage (`<lfs type>:<resource path or root path>`) as
+/// configured RIGHT NOW — recorded in the fork namespace registry so cleanup targets the
+/// storage the data was actually written to. `storage` = '' for the primary storage, else a
+/// `secondary_storage` name. Returns None when no matching storage is configured.
+async fn fork_storage_ref(db: &DB, w_id: &str, storage: &str) -> Option<String> {
+    let lfs_json = sqlx::query_scalar!(
+        "SELECT large_file_storage FROM workspace_settings WHERE workspace_id = $1",
+        w_id
+    )
+    .fetch_optional(db)
+    .await
+    .ok()
+    .flatten()
+    .flatten()?;
+    let entry = if storage.is_empty() || storage == "_default_" {
+        lfs_json.clone()
+    } else {
+        lfs_json.get("secondary_storage")?.get(storage)?.clone()
+    };
+    lfs_entry_storage_ref(&entry)
+}
+
+/// The pure part of [`fork_storage_ref`]: one `LargeFileStorage` JSON entry → its canonical
+/// `<type>:<path>` descriptor. The `$res:` prefix on resource paths is normalized away (stored
+/// configs are inconsistent about it); cleanup re-adds it when resolving.
+pub fn lfs_entry_storage_ref(entry: &serde_json::Value) -> Option<String> {
+    let typ = entry.get("type")?.as_str()?;
+    let path_field = match typ {
+        "S3Storage" | "S3AwsOidc" => "s3_resource_path",
+        "AzureBlobStorage" | "AzureWorkloadIdentity" => "azure_blob_resource_path",
+        "GoogleCloudStorage" => "gcs_resource_path",
+        "FilesystemStorage" => "root_path",
+        _ => return None,
+    };
+    let path = entry.get(path_field)?.as_str()?;
+    let path = path.strip_prefix("$res:").unwrap_or(path);
+    Some(format!("{typ}:{path}"))
+}
+
+/// Resolve a `$res:`/`$var:` reference tree to its concrete value (recursively, secrets
+/// decrypted). No permission checks — trusted server-side callers only; never echo the result
+/// to a user.
+pub async fn transform_json_value_unchecked(
+    value: &serde_json::Value,
+    w_id: &str,
+    db: &DB,
+) -> Result<serde_json::Value> {
+    transform_json_unchecked(value, w_id, db).await
 }
 
 // This does not check for any permission. Should never be displayed to a user.
@@ -725,10 +1759,14 @@ async fn transform_json_unchecked(
             .await
             .map_err(to_anyhow)?;
             let value = if is_secret {
-                let mc = build_crypt(&db, &w_id).await?;
-                decrypt(&mc, value).map_err(|e| {
-                    Error::internal_err(format!("Error decrypting variable {}: {}", &s, e))
-                })?
+                if is_external_stored_value(&value) {
+                    get_secret_value(db, w_id, &s[5..], &value).await?
+                } else {
+                    let mc = build_crypt(&db, &w_id).await?;
+                    decrypt(&mc, value).map_err(|e| {
+                        Error::internal_err(format!("Error decrypting variable {}: {}", &s, e))
+                    })?
+                }
             } else {
                 value
             };
@@ -790,9 +1828,211 @@ mod tests {
         assert!(validate_fork_workspace_id("wm-fork-foo/bar.lock").is_err());
     }
 
+    #[test]
+    fn test_validate_dev_workspace_id_accepts_prefixless_valid() {
+        // Dev workspaces use ordinary, prefix-less ids but must stay git-branch-safe.
+        validate_dev_workspace_id("dev").unwrap();
+        validate_dev_workspace_id("my-dev-workspace").unwrap();
+        validate_dev_workspace_id("staging.42").unwrap();
+        // The fork prefix is allowed but not required.
+        validate_dev_workspace_id("wm-fork-dev").unwrap();
+    }
+
+    #[test]
+    fn test_validate_dev_workspace_id_rejects_empty_and_git_unsafe() {
+        assert!(validate_dev_workspace_id("").is_err());
+        assert!(validate_dev_workspace_id("dev workspace").is_err());
+        assert!(validate_dev_workspace_id("dev..staging").is_err());
+        assert!(validate_dev_workspace_id("dev/.x").is_err());
+        assert!(validate_dev_workspace_id("dev.lock").is_err());
+    }
+
+    #[test]
+    fn test_validate_fork_workspace_id_rejects_empty() {
+        assert!(validate_fork_workspace_id("").is_err());
+    }
+
     #[test]
     fn test_validate_fork_workspace_id_rejects_too_long() {
         let long_id = format!("wm-fork-{}", "a".repeat(43));
         assert!(validate_fork_workspace_id(&long_id).is_err());
     }
+
+    #[test]
+    fn test_fork_ducklake_metadata_schema_shape() {
+        let s = fork_ducklake_metadata_schema("wm-fork-my-feature-42", "main");
+        assert!(s.starts_with(FORK_DUCKLAKE_SCHEMA_PREFIX), "{s}");
+        assert!(s.len() <= 63, "pg schema name limit: {s}");
+        assert!(
+            s.chars().all(|c| c.is_ascii_alphanumeric() || c == '_'),
+            "{s}"
+        );
+        // Deterministic (persisted view SQL / registry rows depend on it).
+        assert_eq!(
+            s,
+            fork_ducklake_metadata_schema("wm-fork-my-feature-42", "main")
+        );
+    }
+
+    #[test]
+    fn test_fork_ducklake_metadata_schema_injective_after_mangling() {
+        // `-` and `_` mangle to the same char; the hash suffix must keep them distinct.
+        let a = fork_ducklake_metadata_schema("wm-fork-a-b", "main");
+        let b = fork_ducklake_metadata_schema("wm-fork-a_b", "main");
+        assert_ne!(a, b);
+        // Lake-scoped: two lakes of one workspace may share a catalog database, so their fork
+        // namespaces must be distinct schemas.
+        assert_ne!(
+            fork_ducklake_metadata_schema("wm-fork-a-b", "lake_a"),
+            fork_ducklake_metadata_schema("wm-fork-a-b", "lake_b")
+        );
+        // Long ids truncate to the same mangled prefix; hash must still differ.
+        let long_a = fork_ducklake_metadata_schema(&format!("wm-fork-{}x", "a".repeat(40)), "main");
+        let long_b = fork_ducklake_metadata_schema(&format!("wm-fork-{}y", "a".repeat(40)), "main");
+        assert_ne!(long_a, long_b);
+        let long_lake =
+            fork_ducklake_metadata_schema(&format!("wm-fork-{}", "a".repeat(42)), &"l".repeat(40));
+        assert!(long_a.len() <= 63 && long_b.len() <= 63 && long_lake.len() <= 63);
+    }
+
+    #[test]
+    fn test_fork_ducklake_ancestor_alias_valid_identifier() {
+        let a = fork_ducklake_ancestor_alias("analytics", "wm-fork-dev-1");
+        assert!(a.starts_with("__wm_dl_"), "{a}");
+        assert!(
+            a.chars().all(|c| c.is_ascii_alphanumeric() || c == '_'),
+            "{a}"
+        );
+        // Distinct per lake for the same ancestor (a script can attach several lakes).
+        assert_ne!(a, fork_ducklake_ancestor_alias("staging", "wm-fork-dev-1"));
+        assert_ne!(
+            a,
+            fork_ducklake_ancestor_alias("analytics", "wm-fork-dev-2")
+        );
+    }
+
+    #[test]
+    fn test_extract_metadata_schema_arg() {
+        assert_eq!(
+            extract_metadata_schema_arg("METADATA_SCHEMA 'lake_b_ns', ENCRYPTED true"),
+            Some("lake_b_ns".to_string())
+        );
+        assert_eq!(
+            extract_metadata_schema_arg("metadata_schema bare_ident"),
+            Some("bare_ident".to_string())
+        );
+        // Last occurrence wins (DuckDB duplicate-option semantics).
+        assert_eq!(
+            extract_metadata_schema_arg("METADATA_SCHEMA 'a', METADATA_SCHEMA 'b'"),
+            Some("b".to_string())
+        );
+        assert_eq!(extract_metadata_schema_arg("ENCRYPTED true"), None);
+    }
+
+    #[test]
+    fn test_fork_data_path_prefix_isolation() {
+        // Fork/dev ids are git-branch-safe and may contain `/`: `wm-fork-a/b` is a valid id.
+        // Its data prefix must NOT nest inside `wm-fork-a`'s, or deleting `wm-fork-a` would
+        // sweep the sibling's files via the object-store prefix listing.
+        assert!(validate_fork_workspace_id("wm-fork-a/b").is_ok());
+        let a = fork_data_path("lake", "wm-fork-a");
+        let ab = fork_data_path("lake", "wm-fork-a/b");
+        assert!(
+            !format!("{ab}/").starts_with(&format!(
+                "{FORK_DUCKLAKE_DATA_DIR}/{}/",
+                fork_data_dir_segment("wm-fork-a")
+            )),
+            "{ab} nests under {a}'s cleanup prefix"
+        );
+        // Single path component: the segment itself contains no separator.
+        assert!(!fork_data_dir_segment("wm-fork-a/b").contains('/'));
+        // Injective after mangling (`/` and `_` both mangle to `_`).
+        assert_ne!(
+            fork_data_dir_segment("wm-fork-a/b"),
+            fork_data_dir_segment("wm-fork-a_b")
+        );
+        // Deterministic (registry rows + cleanup guard recompute it).
+        assert_eq!(a, fork_data_path("lake", "wm-fork-a"));
+        // Empty base path still yields a well-formed prefix.
+        assert_eq!(
+            fork_data_path("", "wm-fork-a"),
+            format!(
+                "{FORK_DUCKLAKE_DATA_DIR}/{}",
+                fork_data_dir_segment("wm-fork-a")
+            )
+        );
+    }
+
+    #[test]
+    fn test_lfs_entry_storage_ref() {
+        assert_eq!(
+            lfs_entry_storage_ref(&serde_json::json!({
+                "type": "S3Storage", "s3_resource_path": "$res:u/admin/minio"
+            })),
+            Some("S3Storage:u/admin/minio".to_string())
+        );
+        // The `$res:` prefix is optional in stored configs; normalized either way.
+        assert_eq!(
+            lfs_entry_storage_ref(&serde_json::json!({
+                "type": "AzureBlobStorage", "azure_blob_resource_path": "u/admin/az"
+            })),
+            Some("AzureBlobStorage:u/admin/az".to_string())
+        );
+        assert_eq!(
+            lfs_entry_storage_ref(&serde_json::json!({
+                "type": "FilesystemStorage", "root_path": "/data/lfs"
+            })),
+            Some("FilesystemStorage:/data/lfs".to_string())
+        );
+        assert_eq!(
+            lfs_entry_storage_ref(&serde_json::json!({"type": "SomethingNew"})),
+            None
+        );
+        assert_eq!(lfs_entry_storage_ref(&serde_json::json!({})), None);
+    }
+
+    #[test]
+    fn test_strip_fork_reserved_attach_args() {
+        // Reserved options removed wherever they appear, others preserved.
+        assert_eq!(
+            strip_fork_reserved_attach_args("METADATA_SCHEMA 'main', ENCRYPTED true"),
+            "ENCRYPTED true"
+        );
+        assert_eq!(
+            strip_fork_reserved_attach_args(
+                "ENCRYPTED true, DATA_PATH 's3://b/prod', OVERRIDE_DATA_PATH FALSE"
+            ),
+            "ENCRYPTED true"
+        );
+        // Case-insensitive, and quoted values may contain commas/spaces.
+        assert_eq!(
+            strip_fork_reserved_attach_args("data_path 's3://b/x, y', SNAPSHOT_VERSION 3"),
+            "SNAPSHOT_VERSION 3"
+        );
+        assert_eq!(strip_fork_reserved_attach_args(""), "");
+        assert_eq!(
+            strip_fork_reserved_attach_args("METADATA_SCHEMA 'wm_fork_evil'"),
+            ""
+        );
+    }
+
+    #[test]
+    fn test_datatable_not_found_error_no_datatables() {
+        let msg = datatable_not_found_error("main", None).to_string();
+        assert!(msg.contains("'main' not found"), "{msg}");
+        assert!(msg.contains("No data table is configured"), "{msg}");
+        // Always signposts the settings tab so the message is actionable.
+        assert!(msg.contains("tab=windmill_data_tables"), "{msg}");
+    }
+
+    #[test]
+    fn test_datatable_not_found_error_lists_available() {
+        let configured = serde_json::json!({ "analytics": {}, "staging": {} });
+        let msg = datatable_not_found_error("main", Some(&configured)).to_string();
+        assert!(msg.contains("'main' not found"), "{msg}");
+        // Surface configured names to catch typos.
+        assert!(msg.contains("analytics"), "{msg}");
+        assert!(msg.contains("staging"), "{msg}");
+        assert!(msg.contains("tab=windmill_data_tables"), "{msg}");
+    }
 }
diff --git a/backend/windmill-common/tests/asset_schema_capture.rs b/backend/windmill-common/tests/asset_schema_capture.rs
new file mode 100644
index 0000000000..f12ff3cc14
--- /dev/null
+++ b/backend/windmill-common/tests/asset_schema_capture.rs
@@ -0,0 +1,105 @@
+/*!
+ * Tests the schema-capture versioning contract (gap #2a):
+ * `record_asset_schema` inserts a new `materialized_asset_schema` version only
+ * when the captured column set changes, re-affirms the latest row in place when
+ * it doesn't, and `list_asset_schemas` returns the evolution history newest
+ * first.
+ */
+
+use sqlx::{Pool, Postgres};
+use windmill_common::assets::AssetKind;
+use windmill_common::materialization::{list_asset_schemas, record_asset_schema, SchemaColumn};
+
+const WS: &str = "test-workspace";
+const PATH: &str = "analytics/orders";
+
+fn col(name: &str, ty: &str) -> SchemaColumn {
+    SchemaColumn { name: name.to_string(), data_type: ty.to_string() }
+}
+
+async fn record(db: &Pool<Postgres>, cols: &[SchemaColumn], snapshot_id: i64) -> bool {
+    let mut tx = db.begin().await.expect("begin");
+    let inserted = record_asset_schema(
+        &mut tx,
+        WS,
+        AssetKind::Ducklake,
+        PATH,
+        cols,
+        Some(snapshot_id),
+        None,
+    )
+    .await
+    .expect("record asset schema");
+    tx.commit().await.expect("commit");
+    inserted
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn first_capture_inserts_version_one(db: Pool<Postgres>) {
+    let cols = [col("order_id", "BIGINT"), col("status", "VARCHAR")];
+    assert!(
+        record(&db, &cols, 10).await,
+        "first capture inserts a version"
+    );
+
+    let versions = list_asset_schemas(&db, WS, AssetKind::Ducklake, PATH)
+        .await
+        .unwrap();
+    assert_eq!(versions.len(), 1);
+    assert_eq!(versions[0].version, 1);
+    assert_eq!(versions[0].snapshot_id, Some(10));
+    assert_eq!(versions[0].columns.0, cols);
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn unchanged_schema_reaffirms_without_new_version(db: Pool<Postgres>) {
+    let cols = [col("order_id", "BIGINT")];
+    record(&db, &cols, 10).await;
+    // Identical column set on a later snapshot: no new version, but the latest
+    // row's snapshot_id advances.
+    assert!(
+        !record(&db, &cols, 20).await,
+        "unchanged schema must not insert a new version"
+    );
+
+    let versions = list_asset_schemas(&db, WS, AssetKind::Ducklake, PATH)
+        .await
+        .unwrap();
+    assert_eq!(versions.len(), 1, "still a single version");
+    assert_eq!(versions[0].version, 1);
+    assert_eq!(versions[0].snapshot_id, Some(20), "snapshot re-affirmed");
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn changed_schema_bumps_version_newest_first(db: Pool<Postgres>) {
+    record(&db, &[col("order_id", "BIGINT")], 10).await;
+    // A column added → schema changed → new version.
+    let evolved = [col("order_id", "BIGINT"), col("amount", "DOUBLE")];
+    assert!(record(&db, &evolved, 20).await, "changed schema inserts v2");
+
+    let versions = list_asset_schemas(&db, WS, AssetKind::Ducklake, PATH)
+        .await
+        .unwrap();
+    assert_eq!(versions.len(), 2);
+    // Newest first.
+    assert_eq!(versions[0].version, 2);
+    assert_eq!(versions[0].columns.0, evolved);
+    assert_eq!(versions[1].version, 1);
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn column_order_change_is_a_new_version(db: Pool<Postgres>) {
+    let a = [col("a", "BIGINT"), col("b", "VARCHAR")];
+    let reordered = [col("b", "VARCHAR"), col("a", "BIGINT")];
+    record(&db, &a, 10).await;
+    // Same columns, different physical order: the captured list is ordered, so a
+    // reorder is a real schema change (downstream `SELECT *` consumers see it).
+    assert!(
+        record(&db, &reordered, 20).await,
+        "column reorder is a distinct schema version"
+    );
+    let versions = list_asset_schemas(&db, WS, AssetKind::Ducklake, PATH)
+        .await
+        .unwrap();
+    assert_eq!(versions.len(), 2);
+}
diff --git a/backend/windmill-common/tests/billing_workspace.rs b/backend/windmill-common/tests/billing_workspace.rs
new file mode 100644
index 0000000000..1b0186a5cf
--- /dev/null
+++ b/backend/windmill-common/tests/billing_workspace.rs
@@ -0,0 +1,211 @@
+#![cfg(feature = "cloud")]
+//! Tests for the fork/dev "billing workspace" resolution and the fork-cap seat/count helpers.
+
+use sqlx::{Pool, Postgres};
+use windmill_common::workspaces::{
+    count_paid_seats, count_workspace_forks, fork_chain_depth, fork_subtree_height,
+    get_billing_workspace_id, invalidate_billing_workspace_cache, list_fork_descendants,
+};
+
+async fn insert_ws(db: &Pool<Postgres>, id: &str, parent: Option<&str>, deleted: bool) {
+    sqlx::query(
+        "INSERT INTO workspace (id, name, owner, parent_workspace_id, deleted)
+         VALUES ($1, $1, 'test-user', $2, $3)",
+    )
+    .bind(id)
+    .bind(parent)
+    .bind(deleted)
+    .execute(db)
+    .await
+    .expect("insert workspace");
+    // The resolver caches per id (60s TTL) in a process-global cache shared across tests, so drop
+    // any stale mapping for this id before the test reads it.
+    invalidate_billing_workspace_cache(id);
+}
+
+async fn insert_member(
+    db: &Pool<Postgres>,
+    w_id: &str,
+    email: &str,
+    operator: bool,
+    disabled: bool,
+    is_service_account: bool,
+) {
+    // `usr.username` has a `proper_username` check (no `@`), so derive one from the email prefix.
+    let username = email.split('@').next().unwrap();
+    sqlx::query(
+        "INSERT INTO usr (workspace_id, email, username, is_admin, operator, disabled, is_service_account, role)
+         VALUES ($1, $2, $3, false, $4, $5, $6, 'Developer')",
+    )
+    .bind(w_id)
+    .bind(email)
+    .bind(username)
+    .bind(operator)
+    .bind(disabled)
+    .bind(is_service_account)
+    .execute(db)
+    .await
+    .expect("insert usr");
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn billing_workspace_resolves_to_root(db: Pool<Postgres>) {
+    insert_ws(&db, "bwt-root", None, false).await;
+    insert_ws(&db, "bwt-fork", Some("bwt-root"), false).await;
+    insert_ws(&db, "bwt-grandchild", Some("bwt-fork"), false).await;
+
+    assert_eq!(
+        get_billing_workspace_id(&db, "bwt-root").await.unwrap(),
+        "bwt-root"
+    );
+    assert_eq!(
+        get_billing_workspace_id(&db, "bwt-fork").await.unwrap(),
+        "bwt-root"
+    );
+    assert_eq!(
+        get_billing_workspace_id(&db, "bwt-grandchild")
+            .await
+            .unwrap(),
+        "bwt-root"
+    );
+    // Unknown / orphaned ids resolve to themselves.
+    assert_eq!(
+        get_billing_workspace_id(&db, "bwt-missing").await.unwrap(),
+        "bwt-missing"
+    );
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn billing_workspace_survives_cycles(db: Pool<Postgres>) {
+    insert_ws(&db, "bwc-a", None, false).await;
+    insert_ws(&db, "bwc-b", Some("bwc-a"), false).await;
+    // Introduce a cycle a -> b -> a; no row has a NULL parent, so resolution falls back to the input
+    // and the depth guard keeps it from looping forever.
+    sqlx::query("UPDATE workspace SET parent_workspace_id = 'bwc-b' WHERE id = 'bwc-a'")
+        .execute(&db)
+        .await
+        .unwrap();
+    invalidate_billing_workspace_cache("bwc-a");
+    invalidate_billing_workspace_cache("bwc-b");
+
+    assert_eq!(
+        get_billing_workspace_id(&db, "bwc-a").await.unwrap(),
+        "bwc-a"
+    );
+    assert_eq!(
+        get_billing_workspace_id(&db, "bwc-b").await.unwrap(),
+        "bwc-b"
+    );
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn paid_seats_and_fork_count(db: Pool<Postgres>) {
+    insert_ws(&db, "seat-root", None, false).await;
+    // 2 developers + 2 operators counted -> ceil(2 + 0.5*2) = 3.
+    insert_member(&db, "seat-root", "dev1@w.dev", false, false, false).await;
+    insert_member(&db, "seat-root", "dev2@w.dev", false, false, false).await;
+    insert_member(&db, "seat-root", "op1@w.dev", true, false, false).await;
+    insert_member(&db, "seat-root", "op2@w.dev", true, false, false).await;
+    // These must NOT count towards seats.
+    insert_member(&db, "seat-root", "disabled@w.dev", false, true, false).await;
+    insert_member(&db, "seat-root", "svc@w.dev", false, false, true).await;
+
+    assert_eq!(count_paid_seats(&db, "seat-root").await.unwrap(), 3);
+
+    insert_ws(&db, "seat-fork1", Some("seat-root"), false).await;
+    insert_ws(&db, "seat-fork2", Some("seat-root"), false).await;
+    // A deleted fork itself is not counted...
+    insert_ws(&db, "seat-fork-deleted", Some("seat-root"), true).await;
+    // ...but a live sub-fork under it still is (deleted filter is on the outer SELECT, not the walk).
+    insert_ws(&db, "seat-deleted-child", Some("seat-fork-deleted"), false).await;
+    // A grandchild fork still counts.
+    insert_ws(&db, "seat-fork1-child", Some("seat-fork1"), false).await;
+
+    // Live: fork1, fork2, fork1-child, deleted-child -> 4 (seat-fork-deleted excluded).
+    assert_eq!(count_workspace_forks(&db, "seat-root").await.unwrap(), 4);
+    // A standalone workspace has no forks.
+    assert_eq!(count_workspace_forks(&db, "seat-fork2").await.unwrap(), 0);
+
+    // list_fork_descendants returns every descendant id (deleted included, for cache invalidation):
+    // fork1, fork2, fork-deleted, deleted-child, fork1-child -> 5.
+    let mut descendants = list_fork_descendants(&db, "seat-root").await.unwrap();
+    descendants.sort();
+    assert_eq!(
+        descendants,
+        vec![
+            "seat-deleted-child",
+            "seat-fork-deleted",
+            "seat-fork1",
+            "seat-fork1-child",
+            "seat-fork2",
+        ]
+    );
+    assert!(list_fork_descendants(&db, "seat-fork2")
+        .await
+        .unwrap()
+        .is_empty());
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn billing_cache_invalidation_reflects_reparent(db: Pool<Postgres>) {
+    insert_ws(&db, "inv-root-a", None, false).await;
+    insert_ws(&db, "inv-root-b", None, false).await;
+    insert_ws(&db, "inv-fork", Some("inv-root-a"), false).await;
+
+    // Resolve + cache: fork -> root-a.
+    assert_eq!(
+        get_billing_workspace_id(&db, "inv-fork").await.unwrap(),
+        "inv-root-a"
+    );
+
+    // Reparent in the DB, as delete+recreate-under-another-root (or attach) would.
+    sqlx::query("UPDATE workspace SET parent_workspace_id = 'inv-root-b' WHERE id = 'inv-fork'")
+        .execute(&db)
+        .await
+        .unwrap();
+
+    // The cached mapping survives until invalidated (this is the staleness the delete/attach/rename
+    // paths must clear).
+    assert_eq!(
+        get_billing_workspace_id(&db, "inv-fork").await.unwrap(),
+        "inv-root-a"
+    );
+
+    // After invalidation (what delete_workspace / attach_dev_workspace / change_workspace_id now call),
+    // it re-resolves to the new root.
+    invalidate_billing_workspace_cache("inv-fork");
+    assert_eq!(
+        get_billing_workspace_id(&db, "inv-fork").await.unwrap(),
+        "inv-root-b"
+    );
+}
+
+#[sqlx::test(migrations = "../migrations", fixtures("base"))]
+async fn fork_depth_and_subtree_height(db: Pool<Postgres>) {
+    // Chain: root -> f1 -> f2 -> f3
+    insert_ws(&db, "fd-root", None, false).await;
+    insert_ws(&db, "fd-f1", Some("fd-root"), false).await;
+    insert_ws(&db, "fd-f2", Some("fd-f1"), false).await;
+    insert_ws(&db, "fd-f3", Some("fd-f2"), false).await;
+
+    // Depth walks up to the root: root = 0, each fork adds one.
+    assert_eq!(fork_chain_depth(&db, "fd-root").await.unwrap(), 0);
+    assert_eq!(fork_chain_depth(&db, "fd-f1").await.unwrap(), 1);
+    assert_eq!(fork_chain_depth(&db, "fd-f3").await.unwrap(), 3);
+    // An unknown id has no chain, so depth 0 (treated as a root by the guard).
+    assert_eq!(fork_chain_depth(&db, "fd-missing").await.unwrap(), 0);
+
+    // Height walks down: the deepest live descendant below the node.
+    assert_eq!(fork_subtree_height(&db, "fd-root").await.unwrap(), 3);
+    assert_eq!(fork_subtree_height(&db, "fd-f2").await.unwrap(), 1);
+    assert_eq!(fork_subtree_height(&db, "fd-f3").await.unwrap(), 0);
+
+    // A deleted leaf doesn't add to the height.
+    insert_ws(&db, "fd-f3-del", Some("fd-f3"), true).await;
+    assert_eq!(fork_subtree_height(&db, "fd-f3").await.unwrap(), 0);
+
+    // ...but a LIVE descendant below a soft-deleted intermediate still counts at its true depth
+    // (the walk traverses through the deleted node; only the aggregation filters deleted).
+    insert_ws(&db, "fd-f3-live-gc", Some("fd-f3-del"), false).await;
+    assert_eq!(fork_subtree_height(&db, "fd-f3").await.unwrap(), 2);
+}
diff --git a/backend/windmill-duckdb-ffi-internal/.gitignore b/backend/windmill-duckdb-ffi-internal/.gitignore
new file mode 100644
index 0000000000..ea8c4bf7f3
--- /dev/null
+++ b/backend/windmill-duckdb-ffi-internal/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/backend/windmill-duckdb-ffi-internal/build_dev.sh b/backend/windmill-duckdb-ffi-internal/build_dev.sh
index d4ae2b7583..f3ce520c68 100755
--- a/backend/windmill-duckdb-ffi-internal/build_dev.sh
+++ b/backend/windmill-duckdb-ffi-internal/build_dev.sh
@@ -1,3 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+cd "$(dirname "$0")"
+
+# The `duckdb` "bundled" feature compiles the whole DuckDB C++ library from
+# source (~minutes) and dominates this crate's build. The crate changes very
+# rarely, so by default build into a per-user cache shared across worktrees and
+# keyed by the dependency lock: a fresh worktree reuses the already-compiled
+# DuckDB instead of rebuilding it, and distinct DuckDB versions don't collide.
+# Override the cache root with WINDMILL_DUCKDB_FFI_TARGET.
+#
+# If you are actively editing this crate in a worktree, uncommitted changes to
+# its source switch to an isolated per-worktree ./target so your incremental
+# builds neither disturb nor are disturbed by the shared cache.
+
+src_dirty="$(git status --porcelain -- src Cargo.toml Cargo.lock build.rs 2>/dev/null || true)"
+
+if [ -n "$src_dirty" ]; then
+  export CARGO_TARGET_DIR="$PWD/target"
+  echo "duckdb-ffi: local crate changes detected -> isolated target $CARGO_TARGET_DIR"
+else
+  cache_root="${WINDMILL_DUCKDB_FFI_TARGET:-${XDG_CACHE_HOME:-$HOME/.cache}/windmill/duckdb-ffi-target}"
+  if command -v sha256sum >/dev/null 2>&1; then hash_cmd=sha256sum; else hash_cmd="shasum -a 256"; fi
+  key="$(cat Cargo.lock build.rs | $hash_cmd | cut -c1-16)"
+  export CARGO_TARGET_DIR="$cache_root/$key"
+  echo "duckdb-ffi: shared cache $CARGO_TARGET_DIR"
+  # The cache key covers only the dependency inputs (Cargo.lock + build.rs), so
+  # the expensive bundled-DuckDB build is shared even when this crate's own
+  # source differs between checkouts. But the shared dir's uplifted cdylib is a
+  # single fixed-name artifact written by whichever worktree built last. Touch
+  # our sources so cargo re-links THIS checkout's cdylib and re-uplifts it
+  # before we copy — the copied artifact then always matches this worktree,
+  # never a sibling's. The bundled dependency is a separate crate and stays
+  # cached, so this only costs a ~1s relink.
+  find src -type f -exec touch {} +
+fi
+
 CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release -p windmill_duckdb_ffi_internal
 mkdir -p ../target/debug/
-cp target/release/libwindmill_duckdb_ffi_internal.* ../target/debug/
+cp "$CARGO_TARGET_DIR/release/"libwindmill_duckdb_ffi_internal.* ../target/debug/
diff --git a/backend/windmill-duckdb-ffi-internal/src/lib.rs b/backend/windmill-duckdb-ffi-internal/src/lib.rs
index f3ee59cab7..a7543620b6 100644
--- a/backend/windmill-duckdb-ffi-internal/src/lib.rs
+++ b/backend/windmill-duckdb-ffi-internal/src/lib.rs
@@ -148,6 +148,23 @@ fn is_setup_statement(query: &str) -> bool {
         || upper.starts_with("RESET")
         || upper.starts_with("CREATE OR REPLACE SECRET")
         || upper.starts_with("CREATE SECRET")
+        || is_create_temp_macro(&upper)
+}
+
+/// `CREATE [OR REPLACE] TEMP|TEMPORARY MACRO` — a connection-scoped definition
+/// that returns no result set and must be *executed* (not just prepared) during
+/// the prepare/diagnostics pass, so later blocks that call the macro bind
+/// against it instead of failing "function does not exist". Both the materialize
+/// runtime (`wm_partition`) and the workspace-macro splicer inject these ahead
+/// of the query that uses them, so — like ATTACH — they are connection setup,
+/// not user queries (they must not add a `PrepareQueryResult` entry either).
+/// Persistent `CREATE MACRO` (no TEMP) is a real user statement and is excluded.
+fn is_create_temp_macro(upper: &str) -> bool {
+    let norm = upper.split_whitespace().collect::<Vec<_>>().join(" ");
+    norm.starts_with("CREATE TEMP MACRO")
+        || norm.starts_with("CREATE TEMPORARY MACRO")
+        || norm.starts_with("CREATE OR REPLACE TEMP MACRO")
+        || norm.starts_with("CREATE OR REPLACE TEMPORARY MACRO")
 }
 
 /// Returns true if the query is expected to return a result set and can be wrapped with DESCRIBE.
@@ -635,7 +652,9 @@ fn duckdb_value_to_json_value(
                 .ok_or_else(|| "Could not convert to f64".to_string())?,
         ),
         duckdb::types::Value::Decimal(d) => serde_json::Value::String(d.to_string()),
-        duckdb::types::Value::Timestamp(_, ts) => serde_json::Value::String(ts.to_string()),
+        duckdb::types::Value::Timestamp(unit, ts) => {
+            serde_json::Value::String(duckdb_timestamp_to_iso(unit, ts))
+        }
         duckdb::types::Value::Text(s) if type_alias.as_deref().unwrap_or_default() == "JSON" => {
             serde_json::from_str(&s)
                 .map_err(|e| format!("Error parsing JSON text: {}", e.to_string()))?
@@ -646,8 +665,15 @@ fn duckdb_value_to_json_value(
                 .map(|byte| serde_json::Value::Number(byte.into()))
                 .collect(),
         ),
-        duckdb::types::Value::Date32(d) => serde_json::Value::Number(d.into()),
-        duckdb::types::Value::Time64(_, t) => serde_json::Value::String(t.to_string()),
+        duckdb::types::Value::Date32(d) => {
+            match chrono::DateTime::from_timestamp(i64::from(d) * 86_400, 0) {
+                Some(dt) => serde_json::Value::String(dt.date_naive().to_string()),
+                None => serde_json::Value::Number(d.into()),
+            }
+        }
+        duckdb::types::Value::Time64(unit, t) => {
+            serde_json::Value::String(duckdb_time_to_iso(unit, t).unwrap_or_else(|| t.to_string()))
+        }
         duckdb::types::Value::Interval { months, days, nanos } => serde_json::json!({
             "months": months,
             "days": days,
@@ -688,6 +714,413 @@ fn duckdb_value_to_json_value(
     Ok(json_value)
 }
 
+// DuckDB surfaces TIMESTAMP[_S/_MS/_NS] values as a raw count since the epoch;
+// stringifying that count leaks values like "1782974022218435" into job
+// results. Render ISO-8601 instead (the Postgres executor's
+// "2024-01-15T10:30:00" shape); a count outside chrono's representable range
+// falls back to the raw number.
+fn duckdb_timestamp_to_iso(unit: duckdb::types::TimeUnit, ts: i64) -> String {
+    let dt = match unit {
+        duckdb::types::TimeUnit::Second => chrono::DateTime::from_timestamp(ts, 0),
+        duckdb::types::TimeUnit::Millisecond => chrono::DateTime::from_timestamp_millis(ts),
+        duckdb::types::TimeUnit::Microsecond => chrono::DateTime::from_timestamp_micros(ts),
+        duckdb::types::TimeUnit::Nanosecond => Some(chrono::DateTime::from_timestamp_nanos(ts)),
+    };
+    dt.map(|dt| dt.naive_utc().format("%Y-%m-%dT%H:%M:%S%.f").to_string())
+        .unwrap_or_else(|| ts.to_string())
+}
+
+// Same story for TIME: a raw count since midnight. None when out of range
+// (caller falls back to the raw number).
+fn duckdb_time_to_iso(unit: duckdb::types::TimeUnit, t: i64) -> Option<String> {
+    let (secs, nanos) = match unit {
+        duckdb::types::TimeUnit::Second => (t, 0),
+        duckdb::types::TimeUnit::Millisecond => (t / 1_000, (t % 1_000) * 1_000_000),
+        duckdb::types::TimeUnit::Microsecond => (t / 1_000_000, (t % 1_000_000) * 1_000),
+        duckdb::types::TimeUnit::Nanosecond => (t / 1_000_000_000, t % 1_000_000_000),
+    };
+    chrono::NaiveTime::from_num_seconds_from_midnight_opt(
+        u32::try_from(secs).ok()?,
+        u32::try_from(nanos).ok()?,
+    )
+    .map(|t| t.format("%H:%M:%S%.f").to_string())
+}
+
+#[cfg(test)]
+mod temporal_json_tests {
+    use super::*;
+    use duckdb::types::TimeUnit;
+
+    #[test]
+    fn timestamp_micros_renders_iso() {
+        // 2026-07-01 23:13:42.218435 UTC
+        assert_eq!(
+            duckdb_timestamp_to_iso(TimeUnit::Microsecond, 1_782_947_622_218_435),
+            "2026-07-01T23:13:42.218435"
+        );
+    }
+
+    #[test]
+    fn timestamp_seconds_renders_iso_without_subseconds() {
+        assert_eq!(
+            duckdb_timestamp_to_iso(TimeUnit::Second, 1_735_689_600),
+            "2025-01-01T00:00:00"
+        );
+    }
+
+    #[test]
+    fn out_of_range_timestamp_falls_back_to_raw() {
+        assert_eq!(
+            duckdb_timestamp_to_iso(TimeUnit::Second, i64::MAX),
+            i64::MAX.to_string()
+        );
+    }
+
+    #[test]
+    fn time_micros_renders_iso() {
+        assert_eq!(
+            duckdb_time_to_iso(TimeUnit::Microsecond, 37_800_500_000).as_deref(),
+            Some("10:30:00.500")
+        );
+    }
+
+    #[test]
+    fn temporal_values_render_iso_through_real_query() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        let mut stmt = conn
+            .prepare(
+                "SELECT TIMESTAMP '2026-07-01 23:13:42.218435' AS ts,
+                        TIMESTAMPTZ '2026-07-01 23:13:42+00' AS tstz,
+                        TIMESTAMP_NS '2026-07-01 23:13:42.218435678' AS ts_ns,
+                        DATE '2026-07-01' AS d,
+                        TIME '10:30:00' AS t",
+            )
+            .unwrap();
+        let mut rows = stmt.query([]).unwrap();
+        let row = rows.next().unwrap().unwrap();
+        let json_of = |i: usize| {
+            let v: duckdb::types::Value = row.get(i).unwrap();
+            duckdb_value_to_json_value(v, &None).unwrap()
+        };
+        assert_eq!(json_of(0), serde_json::json!("2026-07-01T23:13:42.218435"));
+        assert_eq!(json_of(1), serde_json::json!("2026-07-01T23:13:42"));
+        assert_eq!(
+            json_of(2),
+            serde_json::json!("2026-07-01T23:13:42.218435678")
+        );
+        assert_eq!(json_of(3), serde_json::json!("2026-07-01"));
+        assert_eq!(json_of(4), serde_json::json!("10:30:00"));
+    }
+
+    // The data-test sample probe shape emitted by
+    // `windmill-parser::sql_materialize::build_data_test_checks`: one scan
+    // yielding the violating-row count plus a bounded `to_json` sample of the
+    // rows as a VARCHAR. These tests gate that design against the *bundled*
+    // engine (json extension availability, row-as-struct alias reference,
+    // NULL degrade on zero rows / oversized samples, exotic column types).
+    fn sample_probe_sql(rows_query: &str, max_len: usize) -> String {
+        format!(
+            "SELECT v, CASE WHEN strlen(s_raw) <= {max_len} THEN s_raw END AS s \
+             FROM (SELECT count(*) AS v, \
+                   to_json(list(_wm_v ORDER BY _wm_rn) FILTER (WHERE _wm_rn <= 20))::VARCHAR AS s_raw \
+                   FROM (SELECT _wm_v, row_number() OVER () AS _wm_rn FROM ({rows_query}) _wm_v))"
+        )
+    }
+
+    fn run_sample_probe(
+        conn: &duckdb::Connection,
+        rows_query: &str,
+        max_len: usize,
+    ) -> (i64, Option<String>) {
+        let mut stmt = conn
+            .prepare(&sample_probe_sql(rows_query, max_len))
+            .unwrap();
+        let mut rows = stmt.query([]).unwrap();
+        let row = rows.next().unwrap().unwrap();
+        (row.get(0).unwrap(), row.get(1).unwrap())
+    }
+
+    #[test]
+    fn data_test_sample_probe_counts_and_samples() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        conn.execute_batch(
+            "CREATE TABLE t (id INT, name VARCHAR); \
+             INSERT INTO t VALUES (1, 'a'), (2, NULL), (3, NULL);",
+        )
+        .unwrap();
+        let (v, s) = run_sample_probe(&conn, "SELECT * FROM t WHERE name IS NULL", 51200);
+        assert_eq!(v, 2);
+        let parsed: serde_json::Value = serde_json::from_str(&s.unwrap()).unwrap();
+        assert_eq!(
+            parsed,
+            serde_json::json!([{"id": 2, "name": null}, {"id": 3, "name": null}])
+        );
+    }
+
+    #[test]
+    fn data_test_sample_probe_zero_rows_yields_null_sample() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        conn.execute_batch("CREATE TABLE t (id INT); INSERT INTO t VALUES (1);")
+            .unwrap();
+        let (v, s) = run_sample_probe(&conn, "SELECT * FROM t WHERE id IS NULL", 51200);
+        assert_eq!(v, 0);
+        assert!(s.is_none());
+    }
+
+    #[test]
+    fn data_test_sample_probe_caps_at_20_rows_but_counts_all() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        conn.execute_batch("CREATE TABLE t AS SELECT range AS id FROM range(50);")
+            .unwrap();
+        let (v, s) = run_sample_probe(&conn, "SELECT * FROM t", 51200);
+        assert_eq!(v, 50);
+        let parsed: serde_json::Value = serde_json::from_str(&s.unwrap()).unwrap();
+        assert_eq!(parsed.as_array().unwrap().len(), 20);
+    }
+
+    #[test]
+    fn data_test_sample_probe_oversized_sample_degrades_to_null() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        conn.execute_batch("CREATE TABLE t AS SELECT repeat('x', 1000) AS big FROM range(5);")
+            .unwrap();
+        let (v, s) = run_sample_probe(&conn, "SELECT * FROM t", 100);
+        assert_eq!(v, 5);
+        assert!(s.is_none());
+    }
+
+    #[test]
+    fn data_test_sample_probe_codegen_row_query_shapes() {
+        // The exact rows-query shapes emitted by `build_data_test_checks`:
+        // unique's `{value, count}` grain and the star-EXCLUDE forms used on
+        // partitioned targets (plain and `_wm_src.`-qualified).
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        conn.execute_batch(
+            "CREATE TABLE t (id INT, name VARCHAR, _wm_partition VARCHAR); \
+             INSERT INTO t VALUES (1, 'a', 'p'), (1, 'b', 'p'), (2, NULL, 'p');",
+        )
+        .unwrap();
+        let (v, s) = run_sample_probe(
+            &conn,
+            "SELECT \"id\" AS \"value\", count(*) AS \"count\" FROM t \
+             WHERE \"id\" IS NOT NULL GROUP BY \"id\" HAVING count(*) > 1",
+            51200,
+        );
+        assert_eq!(v, 1);
+        let parsed: serde_json::Value = serde_json::from_str(&s.unwrap()).unwrap();
+        assert_eq!(parsed, serde_json::json!([{"value": 1, "count": 2}]));
+
+        let (v, s) = run_sample_probe(
+            &conn,
+            "SELECT * EXCLUDE (\"_wm_partition\") FROM t WHERE name IS NULL",
+            51200,
+        );
+        assert_eq!(v, 1);
+        assert_eq!(
+            serde_json::from_str::<serde_json::Value>(&s.unwrap()).unwrap(),
+            serde_json::json!([{"id": 2, "name": null}])
+        );
+
+        let (v, s) = run_sample_probe(
+            &conn,
+            "SELECT _wm_src.* EXCLUDE (\"_wm_partition\") FROM t _wm_src WHERE _wm_src.name IS NULL",
+            51200,
+        );
+        assert_eq!(v, 1);
+        assert_eq!(
+            serde_json::from_str::<serde_json::Value>(&s.unwrap()).unwrap(),
+            serde_json::json!([{"id": 2, "name": null}])
+        );
+    }
+
+    #[test]
+    fn data_test_sample_probe_survives_exotic_types() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        conn.execute_batch(
+            "CREATE TABLE t AS SELECT \
+                INTERVAL 3 DAY AS iv, \
+                12345678901234567890123456789::HUGEINT AS hi, \
+                '\\xDE\\xAD'::BLOB AS bl, \
+                [1, 2, 3] AS li, \
+                {'a': 1, 'b': 'x'} AS st, \
+                TIMESTAMPTZ '2026-07-01 23:13:42+00' AS tstz, \
+                DECIMAL '12.34' AS dec;",
+        )
+        .unwrap();
+        let (v, s) = run_sample_probe(&conn, "SELECT * FROM t", 51200);
+        assert_eq!(v, 1);
+        let parsed: serde_json::Value = serde_json::from_str(&s.unwrap()).unwrap();
+        let row = &parsed.as_array().unwrap()[0];
+        // Exact renderings are DuckDB's to_json choices — the gate is only
+        // that every type serializes without error and parses back as JSON.
+        assert!(row.get("iv").is_some());
+        assert!(row.get("hi").is_some());
+        assert!(row.get("bl").is_some());
+        assert_eq!(row["li"], serde_json::json!([1, 2, 3]));
+        assert_eq!(row["st"], serde_json::json!({"a": 1, "b": "x"}));
+        assert!(row.get("tstz").is_some());
+        assert!(row.get("dec").is_some());
+    }
+}
+
+// Cross-engine parity for the `wm_partition` materialize macro. The macro is
+// `strftime(ts, '<fmt>')` where `<fmt>` is single-sourced in windmill-parser's
+// `PartitionKind::default_time_format` — the SAME format the EE resolver
+// (`partition_ee.rs`) uses (via chrono) to stamp the `{partition}` identity.
+// The macro only works if the *bundled* DuckDB engine renders that format
+// byte-for-byte identically to chrono. Weekly `%G-W%V` (ISO year/week) is the
+// one that can diverge at a year boundary, so it's exercised head-on here — a
+// gap a pure-Rust unit test can't reach.
+#[cfg(test)]
+mod wm_partition_parity_tests {
+    use super::*;
+
+    // Mirror of windmill-parser `PartitionKind::default_time_format`.
+    const FORMATS: &[&str] = &["%Y-%m-%d", "%Y-%m-%dT%H", "%G-W%V", "%Y-%m"];
+
+    fn scalar_str(conn: &duckdb::Connection, sql: &str) -> String {
+        let mut stmt = conn.prepare(sql).unwrap();
+        let mut rows = stmt.query([]).unwrap();
+        row_string(rows.next().unwrap().unwrap())
+    }
+    fn row_string(row: &Row) -> String {
+        row.get::<usize, String>(0).unwrap()
+    }
+
+    #[test]
+    fn duckdb_strftime_matches_chrono_for_every_grain_format() {
+        use chrono::NaiveDate;
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        // A normal instant, two same-hour instants, and ISO-week year boundaries
+        // where chrono's and DuckDB's ISO rules must agree: 2026-01-01 (Thu) is
+        // in 2026-W01 and makes 2026 a 53-week ISO year, so 2027-01-01 (Fri)
+        // belongs to 2026-W53; 2023-01-01 (Sun) → 2022-W52; 2021-01-03 (Sun) →
+        // 2020-W53.
+        let instants = [
+            (2026, 7, 5, 23, 10, 0),
+            (2026, 7, 5, 23, 55, 0),
+            (2026, 1, 1, 0, 0, 0),
+            (2027, 1, 1, 0, 0, 0),
+            (2023, 1, 1, 0, 0, 0),
+            (2021, 1, 3, 23, 59, 0),
+            (2020, 12, 31, 12, 0, 0),
+        ];
+        for (y, mo, d, h, mi, s) in instants {
+            let dt = NaiveDate::from_ymd_opt(y, mo, d)
+                .unwrap()
+                .and_hms_opt(h, mi, s)
+                .unwrap();
+            let ts_lit = dt.format("%Y-%m-%d %H:%M:%S").to_string();
+            for fmt in FORMATS {
+                let chrono_val = dt.format(fmt).to_string();
+                let duck = scalar_str(
+                    &conn,
+                    &format!("SELECT strftime(TIMESTAMP '{ts_lit}', '{fmt}')"),
+                );
+                assert_eq!(
+                    duck, chrono_val,
+                    "DuckDB strftime disagrees with chrono for {ts_lit} / {fmt}"
+                );
+            }
+        }
+        // Explicit year-boundary pin: guards against BOTH engines drifting the
+        // same way (2027-01-01 is ISO week 53 of 2026).
+        assert_eq!(
+            scalar_str(&conn, "SELECT strftime(TIMESTAMP '2027-01-01', '%G-W%V')"),
+            "2027-01-01"
+                .parse::<chrono::NaiveDate>()
+                .unwrap()
+                .format("%G-W%V")
+                .to_string()
+        );
+        assert_eq!(
+            scalar_str(&conn, "SELECT strftime(TIMESTAMP '2027-01-01', '%G-W%V')"),
+            "2026-W53"
+        );
+    }
+
+    #[test]
+    fn temp_macro_is_classified_as_setup() {
+        // The macro the executor injects, plus whitespace/keyword variants the
+        // workspace-macro splicer can emit.
+        assert!(is_setup_statement(
+            "CREATE OR REPLACE TEMP MACRO wm_partition(ts) AS strftime(ts, '%Y-%m-%dT%H')"
+        ));
+        assert!(is_setup_statement("  create temp macro foo(x) as x + 1"));
+        assert!(is_setup_statement("CREATE TEMPORARY MACRO foo(x) AS x"));
+        assert!(is_setup_statement(
+            "CREATE OR REPLACE\n  TEMPORARY MACRO foo(x) AS x"
+        ));
+        // Persistent (non-TEMP) macros are real user statements, not setup.
+        assert!(!is_setup_statement(
+            "CREATE OR REPLACE MACRO safe_div(a, b) AS a / b"
+        ));
+        assert!(!is_setup_statement("CREATE MACRO foo(x) AS x"));
+    }
+
+    #[test]
+    fn prepare_pass_binds_consumer_only_when_macro_runs_as_setup() {
+        // Mirror prepare_duckdb_internal's per-block contract: setup statements
+        // are EXECUTED, everything else is only prepared. A block that calls
+        // wm_partition binds at prepare time, so it resolves only if the macro
+        // block already ran as setup.
+        let consumer = "SELECT wm_partition(TIMESTAMP '2026-07-05 23:10:00') AS p";
+        let macro_stmt =
+            "CREATE OR REPLACE TEMP MACRO wm_partition(ts) AS strftime(ts, '%Y-%m-%dT%H')";
+
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        for block in [macro_stmt, consumer] {
+            if is_setup_statement(block) {
+                conn.execute_batch(block).unwrap();
+            } else {
+                conn.prepare(block)
+                    .expect("consumer must prepare once the macro ran as setup");
+            }
+        }
+
+        // Guard: if the macro were NOT setup (the bug), the consumer's prepare
+        // fails "function does not exist" — proving the classification matters.
+        let fresh = duckdb::Connection::open_in_memory().unwrap();
+        assert!(
+            fresh.prepare(consumer).is_err(),
+            "consumer must fail to prepare when wm_partition was never created"
+        );
+    }
+
+    #[test]
+    fn wm_partition_macro_buckets_whole_slice_and_naive_cast_errors() {
+        let conn = duckdb::Connection::open_in_memory().unwrap();
+        // Exactly the statement the executor injects for an hourly materialize.
+        conn.execute_batch(
+            "CREATE OR REPLACE TEMP MACRO wm_partition(ts) AS strftime(ts, '%Y-%m-%dT%H');",
+        )
+        .unwrap();
+        conn.execute_batch(
+            "CREATE TABLE t(ts TIMESTAMP); INSERT INTO t VALUES \
+             (TIMESTAMP '2026-07-05 23:10:00'), (TIMESTAMP '2026-07-05 23:55:00'), \
+             (TIMESTAMP '2026-07-05 22:30:00'), (TIMESTAMP '2026-07-06 00:05:00');",
+        )
+        .unwrap();
+        // Filtering with the injected macro against the identity string selects
+        // the WHOLE hour bucket (both 23:10 and 23:55) — not just the boundary
+        // instant a `= TIMESTAMP {partition}` cast could ever match.
+        let n = scalar_str(
+            &conn,
+            "SELECT count(*)::VARCHAR FROM t WHERE wm_partition(ts) = '2026-07-05T23'",
+        );
+        assert_eq!(n, "2");
+        // The footgun the macro exists to avoid: the weekly/monthly identity
+        // strings are not valid TIMESTAMP literals, so the naive cast errors.
+        assert!(
+            conn.execute_batch("SELECT TIMESTAMP '2026-W27';").is_err(),
+            "expected `TIMESTAMP '2026-W27'` to be a Conversion Error"
+        );
+        assert!(
+            conn.execute_batch("SELECT TIMESTAMP '2026-07';").is_err(),
+            "expected `TIMESTAMP '2026-07'` to be a Conversion Error"
+        );
+    }
+}
+
 fn json_value_to_duckdb_value(
     json_value: &serde_json::Value,
     arg_type: &str,
diff --git a/backend/windmill-git-sync/src/lib.rs b/backend/windmill-git-sync/src/lib.rs
index b10f62e7a5..6c1b9bf89b 100644
--- a/backend/windmill-git-sync/src/lib.rs
+++ b/backend/windmill-git-sync/src/lib.rs
@@ -24,30 +24,102 @@ pub use git_sync_oss::{
 
 #[derive(Clone, Debug)]
 pub enum DeployedObject {
-    Script { hash: ScriptHash, path: String, parent_path: Option<String> },
-    Flow { path: String, parent_path: Option<String>, version: i64 },
-    App { path: String, version: i64, parent_path: Option<String> },
-    RawApp { path: String, version: i64, parent_path: Option<String> },
-    Folder { path: String },
-    Resource { path: String, parent_path: Option<String> },
-    Variable { path: String, parent_path: Option<String> },
-    Schedule { path: String },
-    ResourceType { path: String },
-    User { email: String },
-    Group { name: String },
-    HttpTrigger { path: String, parent_path: Option<String> },
-    WebsocketTrigger { path: String, parent_path: Option<String> },
-    KafkaTrigger { path: String, parent_path: Option<String> },
-    NatsTrigger { path: String, parent_path: Option<String> },
-    PostgresTrigger { path: String, parent_path: Option<String> },
-    MqttTrigger { path: String, parent_path: Option<String> },
-    SqsTrigger { path: String, parent_path: Option<String> },
-    GcpTrigger { path: String, parent_path: Option<String> },
-    AzureTrigger { path: String, parent_path: Option<String> },
-    EmailTrigger { path: String, parent_path: Option<String> },
-    Settings { setting_type: String },
-    Key { key_type: String },
-    WorkspaceDependencies { path: String },
+    Script {
+        hash: ScriptHash,
+        path: String,
+        parent_path: Option<String>,
+    },
+    Flow {
+        path: String,
+        parent_path: Option<String>,
+        version: i64,
+    },
+    App {
+        path: String,
+        version: i64,
+        parent_path: Option<String>,
+    },
+    RawApp {
+        path: String,
+        version: i64,
+        parent_path: Option<String>,
+    },
+    Folder {
+        path: String,
+    },
+    Resource {
+        path: String,
+        parent_path: Option<String>,
+    },
+    Variable {
+        path: String,
+        parent_path: Option<String>,
+    },
+    Schedule {
+        path: String,
+    },
+    ResourceType {
+        path: String,
+    },
+    User {
+        email: String,
+    },
+    Group {
+        name: String,
+    },
+    HttpTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    WebsocketTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    KafkaTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    NatsTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    PostgresTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    MqttTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    SqsTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    GcpTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    AzureTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    EmailTrigger {
+        path: String,
+        parent_path: Option<String>,
+    },
+    Settings {
+        setting_type: String,
+    },
+    Key {
+        key_type: String,
+    },
+    WorkspaceDependencies {
+        path: String,
+    },
+    /// A single data table migration, identified by `<datatable>/<timestamp>_<name>`.
+    DatatableMigration {
+        path: String,
+    },
 }
 
 impl DeployedObject {
@@ -77,6 +149,7 @@ impl DeployedObject {
             DeployedObject::Settings { .. } => "settings.yaml".to_string(),
             DeployedObject::Key { .. } => "encryption_key.yaml".to_string(),
             DeployedObject::WorkspaceDependencies { path, .. } => path.to_owned(),
+            DeployedObject::DatatableMigration { path } => path.to_owned(),
         }
     }
 
@@ -118,6 +191,7 @@ impl DeployedObject {
             DeployedObject::Settings { .. } => None,
             DeployedObject::Key { .. } => None,
             DeployedObject::WorkspaceDependencies { .. } => None,
+            DeployedObject::DatatableMigration { .. } => None,
         }
     }
 
@@ -147,6 +221,7 @@ impl DeployedObject {
             DeployedObject::Settings { .. } => "settings",
             DeployedObject::Key { .. } => "key",
             DeployedObject::WorkspaceDependencies { .. } => "workspace_dependencies",
+            DeployedObject::DatatableMigration { .. } => "datatable_migration",
         }
         .to_string()
     }
diff --git a/backend/windmill-mcp/src/common/scope.rs b/backend/windmill-mcp/src/common/scope.rs
index 7da4e2cebc..f43095d740 100644
--- a/backend/windmill-mcp/src/common/scope.rs
+++ b/backend/windmill-mcp/src/common/scope.rs
@@ -38,6 +38,71 @@ impl McpScopeConfig {
 
         is_resource_allowed(path, patterns)
     }
+
+    /// Directional subset check: does this config grant at least everything
+    /// `requested` grants? Used to enforce monotonic containment when an MCP
+    /// OAuth approval mints a token (the granted scopes must be within the
+    /// approving token's own scopes).
+    ///
+    /// Unlike `is_allowed` (which tests a single concrete path with OR
+    /// semantics), this requires every requested pattern to be covered by some
+    /// caller pattern — so `mcp:scripts:f/x` cannot widen into `mcp:scripts:*`.
+    pub fn contains(&self, requested: &McpScopeConfig) -> bool {
+        if self.all {
+            return true;
+        }
+        if requested.all {
+            return false;
+        }
+        if requested.favorites && !self.favorites {
+            return false;
+        }
+        if let Some(req_hub) = requested.hub_apps.as_ref() {
+            match self.hub_apps.as_ref() {
+                Some(caller_hub) => {
+                    let caller_apps: std::collections::HashSet<&str> =
+                        caller_hub.split(',').map(|s| s.trim()).collect();
+                    if !req_hub
+                        .split(',')
+                        .map(|s| s.trim())
+                        .all(|a| caller_apps.contains(a))
+                    {
+                        return false;
+                    }
+                }
+                None => return false,
+            }
+        }
+        resource_list_covers(&self.scripts, &requested.scripts)
+            && resource_list_covers(&self.flows, &requested.flows)
+            && resource_list_covers(&self.endpoints, &requested.endpoints)
+    }
+}
+
+/// Every requested pattern must be covered by some caller pattern.
+fn resource_list_covers(caller: &[String], requested: &[String]) -> bool {
+    requested
+        .iter()
+        .all(|req| caller.iter().any(|c| pattern_covers(c, req)))
+}
+
+/// Directional: does the single caller pattern cover `requested`? `caller` may
+/// be `*`, an exact path/name, or a `<prefix>/*` subtree; `requested` may itself
+/// be a subtree wildcard, in which case the whole requested subtree must fall
+/// within the caller's. Mirrors the route-scope containment in windmill-api-auth.
+fn pattern_covers(caller: &str, requested: &str) -> bool {
+    if caller == "*" || caller == requested {
+        return true;
+    }
+    // An exact caller pattern only covers itself (handled above); a wildcard
+    // requested can never be covered by a non-`*` exact caller.
+    let Some(prefix) = caller.strip_suffix("/*") else {
+        return false;
+    };
+    let requested_base = requested.strip_suffix("/*").unwrap_or(requested);
+    requested_base == prefix
+        || (requested_base.starts_with(prefix)
+            && requested_base.as_bytes().get(prefix.len()) == Some(&b'/'))
 }
 
 /// Parse MCP scopes from token scope strings
@@ -254,4 +319,51 @@ mod tests {
         assert!(config.is_allowed("flow", "f/automation/test"));
         assert!(!config.is_allowed("flow", "f/other/test"));
     }
+
+    fn cfg(scopes: &[&str]) -> McpScopeConfig {
+        parse_mcp_scopes(&scopes.iter().map(|s| s.to_string()).collect::<Vec<_>>()).unwrap()
+    }
+
+    #[test]
+    fn test_contains_subset_and_widening() {
+        // mcp:all contains anything.
+        assert!(cfg(&["mcp:all"]).contains(&cfg(&["mcp:scripts:f/x"])));
+        assert!(cfg(&["mcp:all"]).contains(&cfg(&["mcp:all"])));
+
+        // A wildcard caller covers narrower requests, but not other domains/all.
+        let star = cfg(&["mcp:scripts:*"]);
+        assert!(star.contains(&cfg(&["mcp:scripts:f/x"])));
+        assert!(star.contains(&cfg(&["mcp:scripts:*"])));
+        assert!(!star.contains(&cfg(&["mcp:all"])));
+        assert!(!star.contains(&cfg(&["mcp:flows:f/x"])));
+
+        // The core regression: a single-path caller must NOT widen into `*` or
+        // into another path.
+        let narrow = cfg(&["mcp:scripts:f/x"]);
+        assert!(narrow.contains(&cfg(&["mcp:scripts:f/x"])));
+        assert!(!narrow.contains(&cfg(&["mcp:scripts:*"])));
+        assert!(!narrow.contains(&cfg(&["mcp:scripts:f/y"])));
+        assert!(!narrow.contains(&cfg(&["mcp:all"])));
+
+        // Subtree wildcard covers paths within it but not a sibling subtree.
+        let subtree = cfg(&["mcp:scripts:f/team/*"]);
+        assert!(subtree.contains(&cfg(&["mcp:scripts:f/team/sub"])));
+        assert!(subtree.contains(&cfg(&["mcp:scripts:f/team/sub/*"])));
+        assert!(!subtree.contains(&cfg(&["mcp:scripts:f/other/x"])));
+    }
+
+    #[test]
+    fn test_contains_favorites_and_endpoints() {
+        assert!(cfg(&["mcp:favorites"]).contains(&cfg(&["mcp:favorites"])));
+        // A caller without favorites cannot grant favorites.
+        assert!(!cfg(&["mcp:scripts:*"]).contains(&cfg(&["mcp:favorites"])));
+
+        // Endpoint names match exactly (or via `*`).
+        let ep = cfg(&["mcp:endpoints:getVariable"]);
+        assert!(ep.contains(&cfg(&["mcp:endpoints:getVariable"])));
+        assert!(!ep.contains(&cfg(&["mcp:endpoints:getResource"])));
+        assert!(!ep.contains(&cfg(&["mcp:all"])));
+        // mcp:all grants all endpoints.
+        assert!(cfg(&["mcp:all"]).contains(&cfg(&["mcp:endpoints:getResource"])));
+    }
 }
diff --git a/backend/windmill-oauth/src/lib.rs b/backend/windmill-oauth/src/lib.rs
index 2f28a6d4c7..e314f13d75 100644
--- a/backend/windmill-oauth/src/lib.rs
+++ b/backend/windmill-oauth/src/lib.rs
@@ -452,12 +452,12 @@ pub async fn build_client_credentials_oauth_client(
 
     let caller_supplied_creds = !client_id.is_empty() && !client_secret.is_empty();
 
-    // Apply the server-resolved concrete token URL. Instance-templated providers
-    // (e.g. Coupa) carry an empty or `{instance}`-templated token URL in their
-    // registry config; the resolved value (host-pinned for bring-your-own,
-    // persisted on the row for refresh) is what completes it. The caller never
-    // supplies a free-form token URL: this value always comes from
-    // `resolve_cc_token_url_input` or a previously-resolved persisted URL.
+    // Apply the resolved concrete token URL. Instance-templated providers (e.g.
+    // Coupa) carry an empty or `{instance}`-templated token URL in their registry
+    // config; the resolved value (host-pinned for instance-name connections,
+    // persisted on the row for refresh) is what completes it. For bring-your-own
+    // connections this value may instead be a caller-supplied override — safe
+    // because only the caller's own credentials are ever sent to it.
     if let Some(url) = resolved_token_url {
         connect_config.token_url = url.to_string();
     }
@@ -652,6 +652,28 @@ pub fn resolve_cc_token_url_input(
     Ok(template.replace("{instance}", value))
 }
 
+/// Whether a built-in provider's client-credentials token URL is host-pinned via
+/// an `{instance}` template (e.g. servicenow, snowflake, coupa). Such providers
+/// only accept an instance name substituted into a fixed-host template, so a
+/// free-form caller token URL override must be rejected for them — otherwise the
+/// exchange host could be redirected, which is exactly what the template pins.
+/// Fixed-host registry providers and custom (non-registry) providers return
+/// `false`: an override is allowed there.
+pub fn is_instance_templated_cc(connect_configs_json: &str, client_name: &str) -> bool {
+    serde_json::from_str::<HashMap<String, OAuthConfig>>(connect_configs_json)
+        .ok()
+        .and_then(|m| resolve_registry_config(&m, client_name))
+        .map(|cfg| {
+            cfg.connect_config_template
+                .as_ref()
+                .map(|t| t.token_url.clone())
+                .filter(|u| !u.is_empty())
+                .unwrap_or(cfg.token_url)
+                .contains("{instance}")
+        })
+        .unwrap_or(false)
+}
+
 /// Resolve the concrete bring-your-own client-credentials token URL for any
 /// provider, never from a caller-supplied URL:
 /// - **Built-in registry providers** resolve from the registry via
@@ -1350,4 +1372,20 @@ mod tests {
         assert!(resolve_cc_token_url_input(CC_REGISTRY, "bad_host_tpl", Some("evil.com")).is_err());
         assert!(resolve_cc_token_url_input(CC_REGISTRY, "bad_mid_tpl", Some("evil")).is_err());
     }
+
+    #[test]
+    fn instance_templated_cc_true_for_templated_providers() {
+        // Host-pinned via `{instance}`: a bring-your-own token URL override must be
+        // refused for these (only the instance-name path may set their URL).
+        assert!(is_instance_templated_cc(CC_REGISTRY, "coupa"));
+        assert!(is_instance_templated_cc(CC_REGISTRY, "servicenow"));
+    }
+
+    #[test]
+    fn instance_templated_cc_false_for_fixed_host_and_unknown() {
+        // Fixed-host registry provider and custom (non-registry) provider both allow
+        // an override, so neither is reported as instance-templated.
+        assert!(!is_instance_templated_cc(CC_REGISTRY, "visma"));
+        assert!(!is_instance_templated_cc(CC_REGISTRY, "my_custom_thing"));
+    }
 }
diff --git a/backend/windmill-object-store/src/lib.rs b/backend/windmill-object-store/src/lib.rs
index cf30efe116..553eb69917 100644
--- a/backend/windmill-object-store/src/lib.rs
+++ b/backend/windmill-object-store/src/lib.rs
@@ -494,6 +494,23 @@ fn build_azure_blob_client(
     return Ok(Arc::new(store));
 }
 
+/// Whether a GCS `service_account_key` carries no static credentials, in which case the client
+/// should fall back to the instance's ambient credentials (GKE Workload Identity / metadata server)
+/// instead of being handed an unparseable key. Besides an empty/whitespace string, the settings UI
+/// stores "no key" as an empty JSON object `{}` (and `serde_json` may yield `null`), so treat those
+/// as absent too. Shared with the connectivity-test SSRF guard so both agree on what "no key" means.
+pub fn gcs_service_account_key_is_blank(service_account_key: &str) -> bool {
+    let trimmed = service_account_key.trim();
+    if trimmed.is_empty() {
+        return true;
+    }
+    match serde_json::from_str::<serde_json::Value>(trimmed) {
+        Ok(serde_json::Value::Null) => true,
+        Ok(serde_json::Value::Object(map)) => map.is_empty(),
+        _ => false,
+    }
+}
+
 #[cfg(feature = "parquet")]
 async fn build_gcs_client(gcs_resource_ref: &GcsResource) -> error::Result<Arc<dyn ObjectStore>> {
     let gcs_resource = gcs_resource_ref.clone();
@@ -509,7 +526,12 @@ async fn build_gcs_client(gcs_resource_ref: &GcsResource) -> error::Result<Arc<d
         )
         .with_bucket_name(gcs_resource.bucket);
 
-    store_builder = store_builder.with_service_account_key(gcs_resource.service_account_key);
+    // A blank key means no static credentials: let the builder fall back to the metadata server
+    // (InstanceCredentialProvider) so GKE Workload Identity / ambient credentials work. Passing a
+    // blank/`{}` key to `with_service_account_key` would instead fail to parse.
+    if !gcs_service_account_key_is_blank(&gcs_resource.service_account_key) {
+        store_builder = store_builder.with_service_account_key(gcs_resource.service_account_key);
+    }
 
     let store = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| store_builder.build()))
         .map_err(|panic_info| {
@@ -1703,6 +1725,40 @@ mod tests {
             .contains("GCS is not supported"));
     }
 
+    #[test]
+    fn test_gcs_service_account_key_is_blank() {
+        for blank in ["", "   ", "\n\t", "{}", "  {}  ", "null"] {
+            assert!(
+                gcs_service_account_key_is_blank(blank),
+                "{blank:?} should be treated as no key"
+            );
+        }
+        for present in ["{\"client_email\":\"x@y.z\"}", "not json"] {
+            assert!(
+                !gcs_service_account_key_is_blank(present),
+                "{present:?} should be treated as a key"
+            );
+        }
+    }
+
+    #[cfg(feature = "parquet")]
+    #[tokio::test]
+    async fn test_build_gcs_client_blank_key_uses_instance_credentials() {
+        // A blank service account key must not be passed to `with_service_account_key`
+        // (which would fail to parse): the builder should fall back to instance credentials
+        // (GKE Workload Identity / metadata server) and construct successfully. `{}` is the
+        // settings UI's representation of "no key".
+        for key in ["", "   ", "{}"] {
+            let resource =
+                GcsResource { bucket: "bucket".to_string(), service_account_key: key.to_string() };
+            assert!(
+                build_gcs_client(&resource).await.is_ok(),
+                "blank key {:?} should build via instance credentials",
+                key
+            );
+        }
+    }
+
     #[test]
     fn test_duckdb_connection_settings_filesystem_unsupported() {
         let resource = ObjectStoreResource::Filesystem(FilesystemSettings {
diff --git a/backend/windmill-queue/Cargo.toml b/backend/windmill-queue/Cargo.toml
index ac956cb709..b9bd6fd28e 100644
--- a/backend/windmill-queue/Cargo.toml
+++ b/backend/windmill-queue/Cargo.toml
@@ -17,10 +17,14 @@ benchmark = ["windmill-common/benchmark"]
 failpoints = []
 prometheus = ["dep:prometheus"]
 smtp = []
+# Enables native evaluation of `retry_if` expressions on the job-failure path.
+# Without it, a `retry_if` gate cannot be evaluated and the job does not retry.
+quickjs = ["dep:windmill-jseval", "windmill-jseval/quickjs"]
 
 [dependencies]
 windmill-audit.workspace = true
 windmill-common = { workspace = true, default-features = false }
+windmill-jseval = { workspace = true, optional = true }
 anyhow.workspace = true
 hmac.workspace = true
 sql-builder.workspace = true
diff --git a/backend/windmill-queue/src/asset_dispatch.rs b/backend/windmill-queue/src/asset_dispatch.rs
index 7647ffc864..29f44b153d 100644
--- a/backend/windmill-queue/src/asset_dispatch.rs
+++ b/backend/windmill-queue/src/asset_dispatch.rs
@@ -37,21 +37,31 @@
 //!       "asset_path": "...",
 //!       "producer_path": "...",
 //!       "producer_job_id": "...",
-//!       "chain": ["f/a/producer0", "f/a/producer1"]
+//!       "chain": ["f/a/producer0", "f/a/producer1"],
+//!       "upstream_snapshots": [
+//!         { "asset": "ducklake://analytics/orders", "snapshot_id": 42 }
+//!       ]
 //!     }
 //!   }
 //!   ```
 //!
+//! `upstream_snapshots` is a forensic record only (present when at least one
+//! direct upstream has a captured materialization snapshot): it says which
+//! substrate version each of the subscriber's `// on` assets was at when the
+//! job was dispatched, so a failing run can be replayed against DuckLake
+//! time-travel (`AT (VERSION => n)`). Nothing pins the consumer's reads to it.
+//!
 //! Errors are logged but never bubble up to fail the producer's job.
 
 use crate::{push, MiniCompletedJob, PushArgs, PushIsolationLevel};
+use serde::Serialize;
 use serde_json::value::RawValue;
 use sqlx::types::Json;
 use sqlx::{Pool, Postgres};
 use std::collections::HashMap;
 use std::sync::Arc;
 use uuid::Uuid;
-use windmill_common::assets::AssetKind;
+use windmill_common::assets::{parse_asset_trigger_ref, AssetKind};
 use windmill_common::error::{self, Result};
 use windmill_common::get_latest_deployed_hash_for_path;
 use windmill_common::jobs::{JobKind, JobPayload, JobTriggerKind};
@@ -226,6 +236,15 @@ async fn try_dispatch(db: &DB, job: &MiniCompletedJob) -> Result<DispatchResult>
     if !is_eligible_kind(job) {
         return Ok(DispatchResult::default());
     }
+    // A parented script is dispatch-eligible only as a native retry attempt — a
+    // re-run of the SAME runnable as its chain parent. Schedule/error/recovery
+    // handlers are also parented `Script` children but run a DIFFERENT script;
+    // excluding them stops a handler that happens to declare assets from
+    // triggering a cascade (the pre-native-retry `parent_job IS NULL` guard
+    // excluded every parented child).
+    if job.parent_job.is_some() && !is_native_retry_attempt(db, job).await? {
+        return Ok(DispatchResult::default());
+    }
     let runnable_path = match job.runnable_path.as_deref() {
         Some(p) if !p.is_empty() => p,
         _ => return Ok(DispatchResult::default()),
@@ -277,6 +296,10 @@ async fn try_dispatch(db: &DB, job: &MiniCompletedJob) -> Result<DispatchResult>
     // subscriber × asset write). The mid-pass join-slot writes
     // (record_and_check_join_slot) are a separate table and unaffected.
     let mut events: Vec<EventRow> = Vec::new();
+    // A subscriber listening to several of this producer's writes is pushed
+    // once per edge; its upstream-snapshot record is identical across those
+    // pushes (same instant, same trigger set), so resolve it once per pass.
+    let mut snapshot_memo: HashMap<String, Arc<Vec<UpstreamSnapshot>>> = HashMap::new();
     for (asset_kind, asset_path) in writes {
         let Some(prefix) = asset_kind.canonical_prefix() else {
             continue;
@@ -352,6 +375,29 @@ async fn try_dispatch(db: &DB, job: &MiniCompletedJob) -> Result<DispatchResult>
                     }
                 }
             }
+            // Forensic upstream-state capture, resolved at dispatch time (a
+            // debounced job that gets superseded is re-pushed by the later
+            // arrival, which re-resolves — the surviving job records what its
+            // own dispatch saw). Best-effort: a lookup failure must not stop
+            // the cascade.
+            let snapshots = match snapshot_memo.get(&sub_path) {
+                Some(s) => s.clone(),
+                None => {
+                    let s = Arc::new(
+                        upstream_snapshots(db, &job.workspace_id, &sub_path)
+                            .await
+                            .unwrap_or_else(|e| {
+                                tracing::error!(
+                                    "upstream-snapshot lookup failed for {}: {e:#}",
+                                    sub_path
+                                );
+                                Vec::new()
+                            }),
+                    );
+                    snapshot_memo.insert(sub_path.clone(), s.clone());
+                    s
+                }
+            };
             match push_subscriber(
                 db,
                 job,
@@ -364,6 +410,7 @@ async fn try_dispatch(db: &DB, job: &MiniCompletedJob) -> Result<DispatchResult>
                 debounce_s,
                 retry_count,
                 retry_delay_s,
+                &snapshots,
             )
             .await
             {
@@ -406,12 +453,28 @@ fn is_eligible_kind(job: &MiniCompletedJob) -> bool {
     if !matches!(job.kind, JobKind::Script | JobKind::Preview) {
         return false;
     }
-    if job.parent_job.is_some() || job.flow_step_id.is_some() {
+    // Flow steps (and sub-flow jobs) carry `flow_step_id` and are ineligible.
+    // Native script-retry attempts carry `parent_job` (the chain root) but no
+    // `flow_step_id`; whether a parented job is actually a retry attempt (vs a
+    // schedule/error handler child) is decided in `try_dispatch`.
+    if job.flow_step_id.is_some() {
         return false;
     }
     true
 }
 
+// Native retry attempts carry an explicit `native_retry_attempt` marker; no
+// other parented `Script` child (schedule handlers, WAC inline children, flow
+// steps) does. One indexed point lookup, only for parented jobs.
+async fn is_native_retry_attempt(db: &DB, job: &MiniCompletedJob) -> Result<bool> {
+    Ok(sqlx::query_scalar!(
+        "SELECT EXISTS(SELECT 1 FROM native_retry_attempt WHERE job_id = $1) AS \"exists!\"",
+        job.id,
+    )
+    .fetch_one(db)
+    .await?)
+}
+
 async fn fetch_args(
     db: &Pool<Postgres>,
     workspace_id: &str,
@@ -527,6 +590,91 @@ async fn workspace_producer_writes(
     Ok(map)
 }
 
+/// Forensic record of one direct upstream's state at dispatch time: the
+/// latest captured materialization snapshot of an asset in the subscriber's
+/// `// on` trigger set. Serialized into the dispatched job's `trigger` arg
+/// (`upstream_snapshots`) so a failing consumer run stays debuggable against
+/// DuckLake time-travel. Record-only — the consumer's reads are not pinned.
+#[derive(Debug, Serialize)]
+struct UpstreamSnapshot {
+    /// Canonical asset uri, e.g. `ducklake://analytics/orders_daily`.
+    asset: String,
+    snapshot_id: i64,
+    /// Partition whose write produced this snapshot — i.e. the latest slice
+    /// written, not necessarily the slice this consumer processes. The
+    /// snapshot itself is table-global. Omitted for whole-table
+    /// materializations.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    partition: Option<String>,
+}
+
+/// Latest captured snapshot per direct upstream of `subscriber_path`: its
+/// asset trigger set joined against `materialized_partition`, keeping the
+/// highest `snapshot_id` per asset (the newest substrate version the consumer
+/// could read). Assets with no captured snapshot (non-materialized upstreams)
+/// simply produce no entry. Two queries total regardless of upstream count.
+async fn upstream_snapshots(
+    db: &Pool<Postgres>,
+    workspace_id: &str,
+    subscriber_path: &str,
+) -> Result<Vec<UpstreamSnapshot>> {
+    let refs = sqlx::query_scalar!(
+        r#"SELECT DISTINCT trigger_ref AS "trigger_ref!"
+           FROM script_trigger
+           WHERE workspace_id = $1
+             AND runnable_path = $2
+             AND trigger_kind = 'asset'
+             AND runnable_kind = 'script'
+           ORDER BY trigger_ref"#,
+        workspace_id,
+        subscriber_path,
+    )
+    .fetch_all(db)
+    .await?;
+    // Keep only refs with a recognized asset prefix, preserving ref order so
+    // the recorded list is deterministic.
+    let parsed: Vec<(String, AssetKind, String)> = refs
+        .into_iter()
+        .filter_map(|r| parse_asset_trigger_ref(&r).map(|(k, p)| (r, k, p)))
+        .collect();
+    if parsed.is_empty() {
+        return Ok(Vec::new());
+    }
+    let kinds: Vec<AssetKind> = parsed.iter().map(|(_, k, _)| *k).collect();
+    let paths: Vec<String> = parsed.iter().map(|(_, _, p)| p.clone()).collect();
+    let rows = sqlx::query!(
+        r#"SELECT DISTINCT ON (mp.asset_kind, mp.asset_path)
+                  mp.asset_kind AS "asset_kind: AssetKind", mp.asset_path,
+                  mp.snapshot_id AS "snapshot_id!", mp.partition
+             FROM materialized_partition mp
+             JOIN unnest($2::ASSET_KIND[], $3::text[]) AS u(kind, path)
+               ON mp.asset_kind = u.kind AND mp.asset_path = u.path
+            WHERE mp.workspace_id = $1
+              AND mp.status = 'materialized' AND mp.snapshot_id IS NOT NULL
+            ORDER BY mp.asset_kind, mp.asset_path, mp.snapshot_id DESC"#,
+        workspace_id,
+        kinds as Vec<AssetKind>,
+        &paths,
+    )
+    .fetch_all(db)
+    .await?;
+    let mut latest: HashMap<(AssetKind, String), (i64, String)> = rows
+        .into_iter()
+        .map(|r| ((r.asset_kind, r.asset_path), (r.snapshot_id, r.partition)))
+        .collect();
+    Ok(parsed
+        .into_iter()
+        .filter_map(|(trigger_ref, kind, path)| {
+            let (snapshot_id, partition) = latest.remove(&(kind, path))?;
+            Some(UpstreamSnapshot {
+                asset: trigger_ref,
+                snapshot_id,
+                partition: (!partition.is_empty()).then_some(partition),
+            })
+        })
+        .collect())
+}
+
 /// A subscriber row resolved from `script_trigger`. Bundles the per-edge
 /// options (debounce) and the script-level policy fields (`join_all`,
 /// retry) that travel together to dispatch.
@@ -589,6 +737,7 @@ async fn push_subscriber(
     debounce_s: Option<i32>,
     retry_count: Option<i16>,
     retry_delay_s: Option<i32>,
+    upstream_snapshots: &[UpstreamSnapshot],
 ) -> Result<Uuid> {
     // Same resolution as every other trigger path (`script_path_to_payload`):
     // latest deployed hash plus the script's own runnable settings
@@ -618,14 +767,16 @@ async fn push_subscriber(
         script.runnable_settings.debouncing_settings,
     );
 
-    // Retry is only available via the flow runtime — wrap the script in a
-    // one-step flow when the cascade declares one. No retry =
-    // unwrapped `ScriptHash` push.
+    // When the cascade declares a retry, hand `push` a one-step-flow request
+    // carrying the policy + `language`; `push` materializes it into a native
+    // retryable `Script` (not a flow), so a failed/recovered subscriber stays
+    // eligible to trigger its own downstream. No retry = plain `ScriptHash`.
     let payload = if let Some(retry) = crate::cascade::cascade_retry(retry_count, retry_delay_s) {
         JobPayload::SingleStepFlow {
             path: subscriber_path.to_string(),
             hash: Some(hash),
             flow_version: None,
+            language: Some(script.language),
             args: HashMap::new(),
             retry: Some(retry),
             error_handler_path: None,
@@ -673,7 +824,7 @@ async fn push_subscriber(
     };
 
     let mut args: HashMap<String, Box<RawValue>> = HashMap::new();
-    let trigger_payload = serde_json::json!({
+    let mut trigger_payload = serde_json::json!({
         "kind": "asset",
         "asset_kind": serde_json::to_value(&asset_kind).expect("AssetKind serializes"),
         "asset_path": asset_path,
@@ -682,6 +833,10 @@ async fn push_subscriber(
         CHAIN_KEY: chain,
         PARTITION_ARG: partition,
     });
+    if !upstream_snapshots.is_empty() {
+        trigger_payload["upstream_snapshots"] =
+            serde_json::to_value(upstream_snapshots).expect("UpstreamSnapshot serializes");
+    }
     args.insert(TRIGGER_ARG.to_string(), to_raw_value(&trigger_payload));
     // Carry the producer's resolved partition forward as a top-level arg so
     // the subscriber's body can read it and the next cascade hop's
diff --git a/backend/windmill-queue/src/ducklake_maintenance_oss.rs b/backend/windmill-queue/src/ducklake_maintenance_oss.rs
new file mode 100644
index 0000000000..ab6e035847
--- /dev/null
+++ b/backend/windmill-queue/src/ducklake_maintenance_oss.rs
@@ -0,0 +1,96 @@
+//! OSS fallback: scheduled ducklake maintenance (snapshot expiry, adjacent-file
+//! compaction, orphaned-file cleanup via managed per-lake schedules) is an
+//! enterprise feature; the implementation lives in windmill-ee-private
+//! (see `ducklake_maintenance_ee`). In the public build the entry points report
+//! that the enterprise edition is required.
+
+use std::collections::HashMap;
+
+use sqlx::{Postgres, Transaction};
+use windmill_common::{
+    error::{Error, Result},
+    jobs::JobPayload,
+    schedule::Schedule,
+    workspaces::Ducklake,
+    DB,
+};
+
+/// Reconcile the managed `f/ducklake_maintenance/<lake>` schedule rows with
+/// the ducklake settings, inside the caller's transaction.
+///
+/// Not an authorization boundary: it mutates schedule rows for `w_id` on
+/// behalf of `edited_by`/`email`, so the caller MUST already have enforced
+/// workspace-admin on `w_id` and that the identity is the authenticated
+/// caller's (as `edit_ducklake_config` does via `require_admin`).
+// Only newly-enabled maintenance is rejected: a config that already had it
+// enabled (e.g. an enterprise license lapsed) must not make every unrelated
+// ducklake settings save fail, and the admin must be able to save it off.
+pub async fn sync_ducklake_maintenance_schedules<'c>(
+    _db: &DB,
+    mut tx: Transaction<'c, Postgres>,
+    w_id: &str,
+    ducklakes: &HashMap<String, Ducklake>,
+    previous: &HashMap<String, Ducklake>,
+    _edited_by: &str,
+    _email: &str,
+) -> Result<Transaction<'c, Postgres>> {
+    let enabled = |dl: &Ducklake| -> bool { dl.maintenance.as_ref().is_some_and(|m| m.enabled) };
+    if ducklakes
+        .iter()
+        .any(|(name, dl)| enabled(dl) && !previous.get(name).is_some_and(|prev| enabled(prev)))
+    {
+        return Err(Error::BadRequest(
+            "Ducklake scheduled maintenance is only available in the enterprise edition"
+                .to_string(),
+        ));
+    }
+
+    // Saving maintenance off (e.g. after an enterprise license lapsed) must
+    // remove the managed row AND its already-queued occurrence here too —
+    // otherwise a maintenance job pushed under the enterprise edition still
+    // runs once after the admin disabled it. Like the enterprise
+    // implementation, the removed set is derived from config, never from the
+    // path prefix.
+    let removed = previous
+        .iter()
+        .filter(|(name, dl)| enabled(dl) && !ducklakes.get(*name).is_some_and(|cur| enabled(cur)))
+        .map(|(name, _)| windmill_common::workspaces::ducklake_maintenance_schedule_path(name))
+        .collect::<Vec<_>>();
+    for path in removed.iter() {
+        crate::schedule::clear_schedule(&mut tx, path, w_id).await?;
+    }
+    sqlx::query!(
+        "DELETE FROM schedule WHERE workspace_id = $1 AND path = ANY($2)",
+        w_id,
+        &removed
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    Ok(tx)
+}
+
+/// Build the job payload for one occurrence of a managed maintenance schedule
+/// (`push_scheduled_job` calls this for reserved-prefix schedule paths).
+/// Returns `(payload, tag, timeout, on_behalf_of_email, created_by)`.
+///
+/// Always `Ok(None)` in the public build: the caller falls through to normal
+/// script resolution, so a pre-existing user schedule under a real
+/// `ducklake_maintenance` folder keeps running, while a managed row left over
+/// from an enterprise period fails script resolution with NotFound and is
+/// auto-disabled with `schedule.error` recorded by the post-completion
+/// scheduler.
+pub async fn build_maintenance_schedule_payload<'c>(
+    _tx: &mut Transaction<'c, Postgres>,
+    _schedule: &Schedule,
+) -> Result<
+    Option<(
+        JobPayload,
+        Option<String>,
+        Option<i32>,
+        Option<String>,
+        String,
+    )>,
+> {
+    Ok(None)
+}
diff --git a/backend/windmill-queue/src/freshness_watchdog_oss.rs b/backend/windmill-queue/src/freshness_watchdog_oss.rs
new file mode 100644
index 0000000000..319fb25f62
--- /dev/null
+++ b/backend/windmill-queue/src/freshness_watchdog_oss.rs
@@ -0,0 +1,9 @@
+//! OSS fallback for the pipeline freshness watchdog. The active backstop —
+//! re-running a `// freshness`-annotated producer whose output aged past its
+//! window — is an enterprise feature (see `freshness_watchdog_ee`). In the
+//! public build the tick is a no-op; CE keeps the passive fresh/stale badge
+//! on the asset graph.
+
+use windmill_common::DB;
+
+pub async fn tick(_db: &DB) {}
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 5cb8911c7e..99f33da3bf 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -45,8 +45,8 @@ use windmill_common::min_version::{
     MIN_VERSION_SUPPORTS_DEBOUNCING, MIN_VERSION_SUPPORTS_DEBOUNCING_V2,
 };
 use windmill_common::runnable_settings::{
-    ConcurrencySettings, ConcurrencySettingsWithCustom, DebouncingSettings, RunnableSettings,
-    RunnableSettingsTrait,
+    ConcurrencySettings, ConcurrencySettingsWithCustom, DebouncingSettings, RetrySettings,
+    RunnableSettings, RunnableSettingsTrait,
 };
 use windmill_common::triggers::TriggerMetadata;
 use windmill_common::utils::{calculate_hash, configure_client, now_from_db};
@@ -68,7 +68,7 @@ use windmill_common::{
     },
     flows::{
         add_virtual_items_if_necessary, FlowModule, FlowModuleValue, FlowValue, InputTransform,
-        StopAfterIf,
+        Retry, StopAfterIf,
     },
     jobs::{get_payload_tag_from_prefixed_path, JobKind, JobPayload, QueuedJob, RawCode},
     min_version::{MIN_VERSION_IS_AT_LEAST_1_432, MIN_VERSION_IS_AT_LEAST_1_440},
@@ -958,6 +958,28 @@ pub async fn add_completed_job<T: Serialize + Send + Sync + ValidableJson>(
         ));
     }
 
+    // Native script retry: a failed `Script` job that carries a retry policy and
+    // has attempts left gets its next attempt enqueued here — before the queue
+    // row (which holds the attempt counter) is removed by commit. The failed
+    // attempt is still recorded as a completed job below. `maybe_enqueue_…`
+    // self-guards on kind/cancellation/policy, so the success path is unaffected.
+    let retry_pending = if !success && !skipped && !from_cache {
+        // Serialized lazily, and only when a `retry_if` policy actually needs it.
+        let result_fn = || serde_json::value::to_raw_value(&result).ok();
+        match maybe_enqueue_native_script_retry(db, completed_job, &canceled_by, &result_fn).await {
+            Ok(enqueued) => enqueued,
+            Err(e) => {
+                tracing::error!(
+                    "native retry enqueue failed for {}: {e:#}",
+                    completed_job.id
+                );
+                false
+            }
+        }
+    } else {
+        false
+    };
+
     let result_columns = result_columns.as_ref();
     let (opt_uuid, duration, _skip_downstream_error_handlers, wac_job_ids) = (|| {
         commit_completed_job(
@@ -972,6 +994,7 @@ pub async fn add_completed_job<T: Serialize + Send + Sync + ValidableJson>(
             flow_is_done,
             duration,
             from_cache,
+            retry_pending,
         )
         .warn_after_seconds(10)
     })
@@ -1031,6 +1054,9 @@ async fn commit_completed_job<T: Serialize + Send + Sync + ValidableJson>(
     flow_is_done: bool,
     duration: Option<i64>,
     from_cache: bool,
+    // True when a native script retry was enqueued for this failed attempt, i.e.
+    // this is not the terminal attempt — schedule completion handlers must wait.
+    retry_pending: bool,
 ) -> windmill_common::error::Result<(Option<Uuid>, i64, bool, Option<serde_json::Value>)> {
     // let start = std::time::Instant::now();
 
@@ -1050,6 +1076,19 @@ async fn commit_completed_job<T: Serialize + Send + Sync + ValidableJson>(
         return value;
     }
 
+    // Resolve the concurrency-limit settings on the pool *before* opening the
+    // completion transaction: doing it inside the tx would hold a second
+    // simultaneous connection from the small per-worker pool.
+    let has_concurrent_limit = completed_job.concurrent_limit.is_some()
+        || windmill_common::runnable_settings::prefetch_cached_from_handle(
+            completed_job.runnable_settings_handle,
+            db,
+        )
+        .await?
+        .1
+        .concurrent_limit
+        .is_some();
+
     let mut tx = db.begin().warn_after_seconds(10).await?;
 
     let duration =  sqlx::query_scalar!(
@@ -1258,11 +1297,17 @@ async fn commit_completed_job<T: Serialize + Send + Sync + ValidableJson>(
                 // for flows, only try to schedule next tick here if flow failed and because first handle_flow failed (step = 0, modules[0] = {type: 'Failure', 'job': uuid::nil()})
                 // or job was cancelled before first handle_flow was called (step = 0, modules = [] OR modules[0].type == 'WaitingForPriorSteps')
                 // otherwise flow rescheduling is done inside handle_flow
-                let schedule_next_tick = !completed_job.is_flow()
-                    || from_cache
-                    || !success
-                        && sqlx::query_scalar!(
-                            "SELECT
+                // Native retry attempts carry the schedule trigger (so the
+                // terminal attempt can drive handlers) but `parent_job` is set —
+                // they must not each push the next cron tick (the root already
+                // did), so gate next-tick on a top-level (`parent_job IS NULL`)
+                // occurrence.
+                let schedule_next_tick = completed_job.parent_job.is_none()
+                    && (!completed_job.is_flow()
+                        || from_cache
+                        || !success
+                            && sqlx::query_scalar!(
+                                "SELECT
                                 flow_status->>'step' = '0'
                                 AND (
                                     jsonb_array_length(flow_status->'modules') = 0
@@ -1273,15 +1318,15 @@ async fn commit_completed_job<T: Serialize + Send + Sync + ValidableJson>(
                                     )
                                 )
                             FROM v2_job_completed WHERE id = $2 AND workspace_id = $3",
-                            Uuid::nil().to_string(),
-                            &completed_job.id,
-                            &completed_job.workspace_id
-                        )
-                        .fetch_optional(&mut *tx)
-                        .warn_after_seconds(10)
-                        .await?
-                        .flatten()
-                        .unwrap_or(false);
+                                Uuid::nil().to_string(),
+                                &completed_job.id,
+                                &completed_job.workspace_id
+                            )
+                            .fetch_optional(&mut *tx)
+                            .warn_after_seconds(10)
+                            .await?
+                            .flatten()
+                            .unwrap_or(false));
 
                 if schedule_next_tick {
                     let (returned_tx, schedule_push_err) =
@@ -1292,42 +1337,55 @@ async fn commit_completed_job<T: Serialize + Send + Sync + ValidableJson>(
                     }
                 }
 
+                // Defer schedule completion handlers (on_failure/on_success/
+                // on_recovery) while a native retry is pending: only the terminal
+                // attempt should drive them. apply_schedule_handlers resolves
+                // per-occurrence failure/recovery status across the whole retry
+                // chain, so multi-count/exact handler policies work even though
+                // each attempt is its own completed job.
                 #[cfg(all(feature = "enterprise", feature = "private"))]
-                if let Err(err) = crate::jobs_ee::apply_schedule_handlers(
-                    db,
-                    &schedule,
-                    &script_path,
-                    &completed_job.workspace_id,
-                    success,
-                    result,
-                    job_id,
-                    completed_job.started_at.unwrap_or(chrono::Utc::now()),
-                    completed_job.priority,
-                )
-                .warn_after_seconds(10)
-                .await
-                {
-                    if !success {
-                        tracing::error!("Could not apply schedule error handler: {}", err);
-                        let base_url = windmill_common::BASE_URL.load();
-                        let w_id: &String = &completed_job.workspace_id;
-                        if !matches!(err, Error::QuotaExceeded(_)) {
-                            report_error_to_workspace_handler_or_critical_side_channel(
-                                    &completed_job,
-                                    db,
-                                    format!(
-                                        "Failed to push schedule error handler job to handle failed job ({base_url}/run/{}?workspace={w_id}): {}",
-                                        completed_job.id,
-                                        err
-                                    ),
-                                )
-                                .warn_after_seconds(10)
-                                .await;
+                if !retry_pending {
+                    if let Err(err) = crate::jobs_ee::apply_schedule_handlers(
+                        db,
+                        &schedule,
+                        &script_path,
+                        &completed_job.workspace_id,
+                        success,
+                        result,
+                        job_id,
+                        // Current occurrence's root: the terminal native-retry
+                        // attempt's parent, else the job itself.
+                        completed_job.parent_job.unwrap_or(job_id),
+                        completed_job.started_at.unwrap_or(chrono::Utc::now()),
+                        completed_job.priority,
+                    )
+                    .warn_after_seconds(10)
+                    .await
+                    {
+                        if !success {
+                            tracing::error!("Could not apply schedule error handler: {}", err);
+                            let base_url = windmill_common::BASE_URL.load();
+                            let w_id: &String = &completed_job.workspace_id;
+                            if !matches!(err, Error::QuotaExceeded(_)) {
+                                report_error_to_workspace_handler_or_critical_side_channel(
+                                        &completed_job,
+                                        db,
+                                        format!(
+                                            "Failed to push schedule error handler job to handle failed job ({base_url}/run/{}?workspace={w_id}): {}",
+                                            completed_job.id,
+                                            err
+                                        ),
+                                    )
+                                    .warn_after_seconds(10)
+                                    .await;
+                            }
+                        } else {
+                            tracing::error!("Could not apply schedule recovery handler: {}", err);
                         }
-                    } else {
-                        tracing::error!("Could not apply schedule recovery handler: {}", err);
-                    }
-                };
+                    };
+                }
+                #[cfg(not(all(feature = "enterprise", feature = "private")))]
+                let _ = retry_pending;
             } else {
                 tracing::error!(
                         "Schedule {schedule_path} in {} not found. Impossible to schedule again and apply schedule handlers",
@@ -1337,16 +1395,7 @@ async fn commit_completed_job<T: Serialize + Send + Sync + ValidableJson>(
         }
     }
 
-    if completed_job.concurrent_limit.is_some()
-        || windmill_common::runnable_settings::prefetch_cached_from_handle(
-            completed_job.runnable_settings_handle,
-            db,
-        )
-        .await?
-        .1
-        .concurrent_limit
-        .is_some()
-    {
+    if has_concurrent_limit {
         let concurrency_key = sqlx::query_scalar!(
             "SELECT key FROM concurrency_key WHERE job_id = $1",
             &completed_job.id
@@ -1589,6 +1638,267 @@ async fn restart_job_if_perpetual_inner(
     Ok(())
 }
 
+/// Evaluate a `retry_if` JS expression. `result`/`previous_result` are the
+/// failure output and `flow_input` the job args. Defaults to retrying on eval
+/// error (an unevaluable gate shouldn't silently swallow retries).
+#[cfg(feature = "quickjs")]
+async fn eval_retry_if(
+    expr: &str,
+    result: Option<&serde_json::value::RawValue>,
+    args: &HashMap<String, Box<serde_json::value::RawValue>>,
+) -> bool {
+    let result_val = result
+        .and_then(|r| serde_json::from_str::<serde_json::Value>(r.get()).ok())
+        .unwrap_or(serde_json::Value::Null);
+    let mut globals = HashMap::new();
+    globals.insert("result".to_string(), result_val.clone());
+    globals.insert("previous_result".to_string(), result_val);
+    globals.insert(
+        "flow_input".to_string(),
+        serde_json::to_value(args).unwrap_or(serde_json::Value::Null),
+    );
+    match windmill_jseval::eval_simple_js(format!("Boolean({expr})"), globals).await {
+        Ok(v) => v.get() == "true",
+        Err(e) => {
+            tracing::warn!("Failed to evaluate retry_if expression, retrying anyway: {e:#}");
+            true
+        }
+    }
+}
+
+/// `retry_if` is unsupported on a worker built without the `quickjs` feature
+/// (the expression cannot be evaluated). Such a worker can't run JS jobs either,
+/// so this is not reached in practice; we fail closed and do not retry.
+#[cfg(not(feature = "quickjs"))]
+async fn eval_retry_if(
+    _expr: &str,
+    _result: Option<&serde_json::value::RawValue>,
+    _args: &HashMap<String, Box<serde_json::value::RawValue>>,
+) -> bool {
+    tracing::warn!("retry_if is unsupported without the quickjs feature; not retrying");
+    false
+}
+
+/// Native script retry. When a failed `Script` job carries a retry policy (via
+/// `runnable_settings_handle`) and has attempts left, enqueue a fresh attempt of
+/// the same script after the policy's backoff delay — instead of having wrapped
+/// it in a one-step flow. Each attempt is a real `Script` job; the attempt
+/// counter lives in the `native_retry_attempt` marker, written here and read only
+/// on the next failure (never on the hot job-pull path).
+///
+/// Returns `true` if a retry was enqueued.
+///
+/// Authorization: this performs no auth check by design. It is `pub` only so the
+/// integration test can reach it; the sole production caller is the worker
+/// job-completion path (`add_completed_job`), which passes a `MiniCompletedJob`
+/// built from a real, already-persisted completed job — its workspace/identity
+/// fields come from the DB, not from request input. Callers MUST uphold this:
+/// never invoke it with caller-supplied or unauthorized job identity.
+pub async fn maybe_enqueue_native_script_retry(
+    db: &Pool<Postgres>,
+    job: &MiniCompletedJob,
+    canceled_by: &Option<CanceledBy>,
+    // Lazily serialize the failure result: only `retry_if` policies need it, so
+    // the common (no-retry_if) failure never pays the serialization cost.
+    result_fn: &(dyn Fn() -> Option<Box<serde_json::value::RawValue>> + Sync),
+) -> Result<bool, Error> {
+    // Only plain top-level scripts retry natively; cancellation always wins.
+    if canceled_by.is_some() || !matches!(job.kind, JobKind::Script) || job.is_flow_step() {
+        return Ok(false);
+    }
+
+    let Some(retry_settings) = windmill_common::runnable_settings::prefetch_retry_from_handle(
+        job.runnable_settings_handle,
+        db,
+    )
+    .await?
+    else {
+        return Ok(false);
+    };
+    let policy: Retry = retry_settings.into();
+    if !policy.has_attempts() {
+        return Ok(false);
+    }
+
+    // Attempt counter for this job: its `native_retry_attempt` marker, or 0 for
+    // the first (un-marked) attempt. The marker is persistent (unlike the queue
+    // row), so it doubles as the explicit "this job is a retry attempt" signal
+    // consumers key off of.
+    let prev_attempts = sqlx::query_scalar!(
+        "SELECT attempt FROM native_retry_attempt WHERE job_id = $1",
+        job.id,
+    )
+    .fetch_optional(db)
+    .await?
+    .unwrap_or(0) as u32;
+    let root = job.parent_job.unwrap_or(job.id);
+    // Scheduled chains keep the schedule trigger so the terminal attempt drives
+    // the schedule completion handlers (on_failure/on_success); `parent_job`
+    // keeps every retry out of the per-occurrence handler counting queries.
+    let trigger = job
+        .schedule_path()
+        .map(|sp| TriggerMetadata::new(Some(sp), JobTriggerKind::Schedule));
+
+    let Some(delay) = policy.interval(prev_attempts, false) else {
+        // Attempts exhausted — let the failure finalize normally.
+        return Ok(false);
+    };
+    // Cap the backoff to match the flow-runtime retry path (evaluate_retry).
+    let delay = std::cmp::min(delay, MAX_RETRY_INTERVAL);
+    let scheduled_for = chrono::Utc::now()
+        + chrono::Duration::from_std(delay).unwrap_or_else(|_| chrono::Duration::zero());
+
+    let args = sqlx::query_scalar!(
+        "SELECT args as \"args: sqlx::types::Json<HashMap<String, Box<RawValue>>>\" FROM v2_job WHERE id = $1 AND workspace_id = $2",
+        job.id,
+        job.workspace_id,
+    )
+    .fetch_optional(db)
+    .await?
+    .flatten()
+    .unwrap_or_default();
+
+    // Optional `retry_if`: gate the retry on a JS expression over the failure
+    // `result` and `flow_input` (the job args). Evaluated by `eval_retry_if`,
+    // which on a worker built without the `quickjs` feature cannot evaluate the
+    // expression and fails closed (no retry).
+    if let Some(retry_if) = policy.retry_if.as_ref() {
+        let result = result_fn();
+        if !eval_retry_if(&retry_if.expr, result.as_deref(), &args.0).await {
+            return Ok(false);
+        }
+    }
+
+    // Re-push as a one-step-flow request; `push` materializes it back into a
+    // native retryable `Script` carrying the policy again. `parent_job = root`
+    // links the chain (and excludes retries from schedule-handler counting); the
+    // schedule trigger, when present, lets the terminal attempt fire handlers.
+    //
+    // Idempotent retry id: deterministic per (root, next attempt). If a worker
+    // dies between this push and the current attempt's finalization, the reaper
+    // re-handles the un-finalized attempt and we land here again with the same
+    // id, so the retry is enqueued exactly once (no double-retry).
+    let retry_job_id = {
+        use std::hash::{Hash, Hasher};
+        let next_attempt = prev_attempts + 1;
+        let mut high = std::hash::DefaultHasher::new();
+        root.hash(&mut high);
+        next_attempt.hash(&mut high);
+        let mut low = std::hash::DefaultHasher::new();
+        "native-retry".hash(&mut low);
+        next_attempt.hash(&mut low);
+        root.hash(&mut low);
+        Uuid::from_u64_pair(high.finish(), low.finish())
+    };
+    // If that retry already exists (the crash-and-reaper-replay case above),
+    // report it as pending WITHOUT re-pushing. Deriving `retry_pending` from the
+    // push *result* would otherwise flip to false on the duplicate-id error and
+    // let the schedule completion handlers fire for this non-terminal attempt.
+    if sqlx::query_scalar!("SELECT 1 FROM v2_job WHERE id = $1", retry_job_id)
+        .fetch_optional(db)
+        .await?
+        .is_some()
+    {
+        return Ok(true);
+    }
+    // Carry forward the failed attempt's concurrency/debouncing settings (same
+    // runnable_settings_handle as the retry policy) so a retry of a concurrency-
+    // limited script still inserts its concurrency_key and respects the limit,
+    // rather than running unbounded with only the retry policy.
+    let (debouncing_settings, concurrency_settings) =
+        windmill_common::runnable_settings::prefetch_cached_from_handle(
+            job.runnable_settings_handle,
+            db,
+        )
+        .await?;
+    let tx = PushIsolationLevel::IsolatedRoot(db.clone());
+    let (new_id, mut tx) = match push(
+        db,
+        tx,
+        &job.workspace_id,
+        JobPayload::SingleStepFlow {
+            path: job.runnable_path.clone().unwrap_or_default(),
+            hash: job.runnable_id,
+            flow_version: None,
+            language: job.script_lang.clone(),
+            args: HashMap::new(),
+            retry: Some(policy),
+            error_handler_path: None,
+            error_handler_args: None,
+            skip_handler: None,
+            cache_ttl: job.cache_ttl,
+            cache_ignore_s3_path: job.cache_ignore_s3_path,
+            priority: job.priority,
+            tag_override: Some(job.tag.clone()),
+            trigger_path: None,
+            apply_preprocessor: false,
+            concurrency_settings,
+            debouncing_settings,
+        },
+        PushArgs::from(&args.0),
+        &job.created_by,
+        &job.permissioned_as_email,
+        job.permissioned_as.clone(),
+        Some(&format!("retry.{}", job.id)),
+        Some(scheduled_for),
+        None,
+        Some(root),
+        None,
+        None,
+        Some(retry_job_id),
+        false,
+        false,
+        None,
+        true,
+        Some(job.tag.clone()),
+        None,
+        None,
+        job.priority,
+        None,
+        false,
+        None,
+        trigger,
+        None,
+    )
+    .await
+    {
+        Ok(v) => v,
+        Err(e) => {
+            // Race with a concurrent completion of the same attempt: it may have
+            // inserted the deterministic retry id between our pre-check and this
+            // push, so the push fails on the duplicate id. The retry IS pending —
+            // re-check and report it as such instead of propagating the error
+            // (which would flip `retry_pending` to false and fire the schedule
+            // completion handlers for this non-terminal attempt).
+            if sqlx::query_scalar!("SELECT 1 FROM v2_job WHERE id = $1", retry_job_id)
+                .fetch_optional(db)
+                .await?
+                .is_some()
+            {
+                return Ok(true);
+            }
+            return Err(e);
+        }
+    };
+
+    sqlx::query!(
+        "INSERT INTO native_retry_attempt (job_id, attempt) VALUES ($1, $2)",
+        new_id,
+        (prev_attempts + 1) as i32,
+    )
+    .execute(&mut *tx)
+    .await?;
+
+    tx.commit().await?;
+    tracing::info!(
+        "Native retry: enqueued attempt {} of script {:?} (root {root}) in {}s as {new_id}",
+        prev_attempts + 1,
+        job.runnable_path,
+        delay.as_secs(),
+    );
+    Ok(true)
+}
+
 #[cfg(feature = "cloud")]
 fn apply_completed_job_cloud_usage(
     db: &Pool<Postgres>,
@@ -1604,22 +1914,31 @@ fn apply_completed_job_cloud_usage(
         tokio::task::spawn(async move {
             let additional_usage = _duration / 1000;
             let result = tokio::time::timeout(std::time::Duration::from_secs(10), async move {
+                // Fork/dev execution-seconds meter against the root (billing) workspace; resolves to
+                // `w_id` itself off-fork.
+                let billing_w_id =
+                    windmill_common::workspaces::get_billing_workspace_id(&db, &w_id)
+                        .await
+                        .unwrap_or_else(|e| {
+                            tracing::error!("Failed to resolve billing workspace for {w_id}: {e:#}");
+                            w_id.clone()
+                        });
                 // Update workspace usage
                 let workspace_result = sqlx::query!(
                     "INSERT INTO usage (id, is_workspace, month_, usage)
                     VALUES ($1, TRUE, EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date), $2)
                     ON CONFLICT (id, is_workspace, month_) DO UPDATE SET usage = usage.usage + EXCLUDED.usage",
-                    &w_id,
+                    &billing_w_id,
                     additional_usage as i32
                 )
                 .execute(&db)
                 .await;
 
                 if let Err(e) = workspace_result {
-                    tracing::error!("Failed to update workspace usage for {}: {:#}", w_id, e);
+                    tracing::error!("Failed to update workspace usage for {}: {:#}", billing_w_id, e);
                 }
 
-                match windmill_common::workspaces::get_team_plan_status(&db, &w_id).await {
+                match windmill_common::workspaces::get_team_plan_status(&db, &billing_w_id).await {
                     Ok(team_plan_status) => {
                         // Update user usage for non-premium workspaces
                         if !team_plan_status.premium {
@@ -1995,7 +2314,7 @@ pub async fn try_schedule_next_job<'c>(
     let email = match windmill_common::users::get_email_from_permissioned_as(
         &permissioned_as,
         &job.workspace_id,
-        db,
+        &mut *tx,
     )
     .await
     {
@@ -3172,108 +3491,189 @@ impl PulledJobResult {
                 if let Some(args) = &mut j.args {
                     args.remove(field_name);
                 }
+
+                // No accumulation on this path: just clean up the batch rows.
+                sqlx::query!(
+                    "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (
+                        SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1
+                    )",
+                    j_id,
+                )
+                .execute(db)
+                .await?;
             } else if let Some(arg_name_to_accumulate) =
                 // TODO: Maybe support multiple arguments in future
                 debounce_args_to_accumulate.as_ref().and_then(|v| v.get(0))
             {
-                tracing::debug!(
-                    job_id = %j_id,
-                    job_kind = ?kind,
-                    arg_name = arg_name_to_accumulate,
-                    "Accumulating debounced arguments from batch"
-                );
-                let mut accumulated_arg: Vec<Box<RawValue>> = vec![];
-                for str_o in sqlx::query_scalar!(
-                    "WITH ids AS (
-                        SELECT id as job_id FROM v2_job_debounce_batch WHERE debounce_batch = (
-                            SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1
-                        )
-                    ) SELECT args->>$2 FROM ids LEFT JOIN v2_job ON v2_job.id = ids.job_id
+                // Claim this job's contribution to its debounce batch exactly once.
+                // Instead of deleting the batch rows, mark them consumed (stamping
+                // consumed_by = this job). A batch normally has a single survivor that
+                // sweeps every row; only a narrow push/pull race can leave two survivors
+                // on one batch. The claim lets the second survivor tell apart:
+                //   - already swept in by the other survivor -> run empty (no duplicate),
+                //   - its own earlier claim on re-pull -> keep its accumulated args,
+                //   - never batched (CE / workers behind v2) -> keep its own args.
+                // Consumed rows are GC'd by the monitor.
+                // Claim + accumulate + persist atomically: a crash between stamping the
+                // batch rows consumed_by=self and persisting the merged args would
+                // otherwise let a zombie re-pull see its own prior claim and keep only
+                // its own args (dropping the siblings it had claimed). One transaction
+                // makes the claim and the merged-args write commit together (or neither).
+                let mut tx = db.begin().await?;
+                // Emitted AFTER the transaction commits — writing logs via a second pool
+                // connection while the claim tx + row locks are held risks pool-exhaustion
+                // stalls under concurrent debounced pulls.
+                let mut accumulation_log: Option<String> = None;
+                let claim = sqlx::query!(
+                    "WITH mine AS (
+                        SELECT debounce_batch, consumed_by FROM v2_job_debounce_batch WHERE id = $1
+                    ), claimed AS (
+                        -- Claim the whole batch in ONE update so concurrent same-batch
+                        -- survivors lock rows in identical scan order (no lock-ordering
+                        -- deadlock); each re-evaluates `consumed_at IS NULL` under EvalPlanQual
+                        -- and skips rows the other already took. A claim therefore consumes
+                        -- every still-unclaimed row of the batch atomically.
+                        UPDATE v2_job_debounce_batch SET consumed_at = now(), consumed_by = $1
+                        WHERE debounce_batch = (SELECT debounce_batch FROM mine)
+                          AND consumed_at IS NULL
+                        RETURNING id
+                    )
+                    SELECT
+                        EXISTS (SELECT 1 FROM mine) AS \"had_row!\",
+                        (SELECT consumed_by FROM mine) AS prev_consumed_by,
+                        ARRAY(SELECT id FROM claimed) AS \"claimed_ids!\",
+                        EXISTS (SELECT 1 FROM claimed WHERE id = $1) AS \"claimed_self!\"
                     ",
                     j_id,
-                    arg_name_to_accumulate,
                 )
-                .fetch_all(db)
-                .await?
-                .into_iter()
-                {
-                    if let Some(s) = str_o.as_ref() {
-                        match serde_json::from_str::<Vec<Box<RawValue>>>(s) {
-                            Ok(ref mut vec) => accumulated_arg.append(vec),
-                            Err(_) => {
-                                // Value is not an array — wrap the scalar into a
-                                // single-element array. This supports union types
-                                // like T | T[] where the caller may pass a bare T.
-                                match RawValue::from_string(s.to_string()) {
-                                    Ok(raw) => accumulated_arg.push(raw),
-                                    Err(e) => {
-                                        return Err(error::Error::ArgumentErr(format!("cannot consolidate argument `{arg_name_to_accumulate}`: value is neither a valid list nor a valid JSON value\nUnwrapped Error: {e}")));
+                .fetch_one(&mut *tx)
+                .await?;
+
+                if !claim.had_row {
+                    // Never batched (CE / workers behind v2): keep the job's own args.
+                    tracing::debug!(
+                        job_id = %j_id,
+                        "Debounce: no batch row, keeping original args"
+                    );
+                } else if claim.claimed_self {
+                    // We claimed our own row; since a claim takes the whole batch, this also
+                    // swept any not-yet-claimed siblings. Accumulate exactly the rows we own.
+                    let ids = claim.claimed_ids;
+
+                    tracing::debug!(
+                        job_id = %j_id,
+                        job_kind = ?kind,
+                        arg_name = arg_name_to_accumulate,
+                        claimed = ids.len(),
+                        "Accumulating debounced arguments from claimed batch rows"
+                    );
+
+                    let mut accumulated_arg: Vec<Box<RawValue>> = vec![];
+                    for str_o in sqlx::query_scalar!(
+                        "SELECT args->>$2 FROM v2_job WHERE id = ANY($1)",
+                        &ids,
+                        arg_name_to_accumulate,
+                    )
+                    .fetch_all(&mut *tx)
+                    .await?
+                    .into_iter()
+                    {
+                        if let Some(s) = str_o.as_ref() {
+                            match serde_json::from_str::<Vec<Box<RawValue>>>(s) {
+                                Ok(ref mut vec) => accumulated_arg.append(vec),
+                                Err(_) => {
+                                    // Value is not an array — wrap the scalar into a
+                                    // single-element array. This supports union types
+                                    // like T | T[] where the caller may pass a bare T.
+                                    match RawValue::from_string(s.to_string()) {
+                                        Ok(raw) => accumulated_arg.push(raw),
+                                        Err(e) => {
+                                            return Err(error::Error::ArgumentErr(format!("cannot consolidate argument `{arg_name_to_accumulate}`: value is neither a valid list nor a valid JSON value\nUnwrapped Error: {e}")));
+                                        }
                                     }
                                 }
                             }
                         }
                     }
-                }
 
-                tracing::debug!(
-                    job_id = %j_id,
-                    arg_name = arg_name_to_accumulate,
-                    accumulated_count = accumulated_arg.len(),
-                    "Accumulated arguments from debounced jobs in batch"
-                );
+                    if !accumulated_arg.is_empty() {
+                        let new_value = to_raw_value(&accumulated_arg);
 
-                // If the batch query returned no entries (e.g. CE where
-                // v2_job_debounce_batch is never populated), keep the
-                // original value unchanged instead of replacing it with [].
-                if !accumulated_arg.is_empty() {
-                    let new_value = to_raw_value(&accumulated_arg);
+                        let original_value = j
+                            .args
+                            .as_ref()
+                            .and_then(|a| a.get(arg_name_to_accumulate))
+                            .map(|v| v.get().to_string())
+                            .unwrap_or_else(|| "null".to_string());
 
-                    let original_value = j
-                        .args
-                        .as_ref()
-                        .and_then(|a| a.get(arg_name_to_accumulate))
-                        .map(|v| v.get().to_string())
-                        .unwrap_or_else(|| "null".to_string());
-
-                    append_logs(
-                        &j_id,
-                        &j.workspace_id,
-                        format!(
+                        accumulation_log = Some(format!(
                             "Accumulating debounced argument `{arg_name_to_accumulate}`:\n  original: {original_value}\n  accumulated: {}\n\n",
                             &new_value
-                        ),
-                        &(db.into()),
-                    )
-                    .await;
+                        ));
 
+                        j.args
+                            .get_or_insert(Json(Default::default()))
+                            .as_mut()
+                            .insert(arg_name_to_accumulate.to_owned(), new_value);
+
+                        // Persist accumulated args to v2_job so that flow steps
+                        // re-reading from the DB (via get_mini_pulled_job) see them
+                        if let Some(ref args) = j.args {
+                            sqlx::query!(
+                                "UPDATE v2_job SET args = $2 WHERE id = $1",
+                                j_id,
+                                args as &Json<HashMap<String, Box<RawValue>>>,
+                            )
+                            .execute(&mut *tx)
+                            .await?;
+                        }
+                    }
+                } else if claim.prev_consumed_by == Some(j_id) {
+                    // Our own prior claim seen again on a re-pull (e.g. crash recovery):
+                    // keep the args we already persisted on the first pull.
+                } else {
+                    // Another survivor already accumulated this job's contribution
+                    // (consumed_by a different job); run as a no-op so its items are not
+                    // reprocessed.
+                    tracing::info!(
+                        job_id = %j_id,
+                        arg_name = arg_name_to_accumulate,
+                        "Debounce: contribution already consumed by a concurrent survivor, running empty"
+                    );
                     j.args
                         .get_or_insert(Json(Default::default()))
                         .as_mut()
-                        .insert(arg_name_to_accumulate.to_owned(), new_value);
-
-                    // Persist accumulated args to v2_job so that flow steps
-                    // re-reading from the DB (via get_mini_pulled_job) see them
+                        .insert(
+                            arg_name_to_accumulate.to_owned(),
+                            to_raw_value(&Vec::<Box<RawValue>>::new()),
+                        );
                     if let Some(ref args) = j.args {
                         sqlx::query!(
                             "UPDATE v2_job SET args = $2 WHERE id = $1",
                             j_id,
                             args as &Json<HashMap<String, Box<RawValue>>>,
                         )
-                        .execute(db)
+                        .execute(&mut *tx)
                         .await?;
                     }
                 }
-            }
+                tx.commit().await?;
 
-            // Clean up the debounce batch entries now that the job has been pulled
-            sqlx::query!(
-                "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (
-                    SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1
-                )",
-                j_id,
-            )
-            .execute(db)
-            .await?;
+                if let Some(msg) = accumulation_log {
+                    append_logs(&j_id, &j.workspace_id, msg, &(db.into())).await;
+                }
+            } else {
+                // Debounced but no args to accumulate (plain debounce / dependency job):
+                // consume the batch by removing this job's rows.
+                sqlx::query!(
+                    "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (
+                        SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1
+                    )",
+                    j_id,
+                )
+                .execute(db)
+                .await?;
+            }
 
             // Handle dependency job debouncing cleanup when a job is pulled for execution
             if is_djob_to_debounce {
@@ -4733,8 +5133,13 @@ async fn push_inner<'c, 'd>(
 ) -> Result<(Uuid, Transaction<'c, Postgres>), Error> {
     #[cfg(feature = "cloud")]
     if *CLOUD_HOSTED {
+        // A fork/dev workspace draws its plan and usage from the root (billing) workspace, so its
+        // executions are metered against the parent's quota/bill. Resolves to `workspace_id` itself
+        // for a standalone workspace (no behavior change off-fork).
+        let billing_w_id =
+            windmill_common::workspaces::get_billing_workspace_id(db, workspace_id).await?;
         let team_plan_status =
-            windmill_common::workspaces::get_team_plan_status(db, workspace_id).await?;
+            windmill_common::workspaces::get_team_plan_status(db, &billing_w_id).await?;
         // we track only non flow steps
         let (workspace_usage, user_usage) = if !matches!(
             job_payload,
@@ -4743,12 +5148,12 @@ async fn push_inner<'c, 'd>(
             // Check current usage with SELECT (fast, no row locks)
             // Only check user usage for non-premium workspaces
             let (current_workspace_usage, current_user_usage) =
-                check_usage_limits(db, workspace_id, email, !team_plan_status.premium).await?;
+                check_usage_limits(db, &billing_w_id, email, !team_plan_status.premium).await?;
 
             // Spawn async task to update usage counters in the background
             increment_usage_async(
                 db.clone(),
-                workspace_id.to_string(),
+                billing_w_id.clone(),
                 if !team_plan_status.premium {
                     Some(email.to_string())
                 } else {
@@ -4851,7 +5256,7 @@ async fn push_inner<'c, 'd>(
                             WHERE is_workspace IS TRUE AND
                             month_ = EXTRACT(YEAR FROM current_date) * 12 + EXTRACT(MONTH FROM current_date)
                             AND id = $1",
-                            workspace_id
+                            billing_w_id
                         )
                         .fetch_optional(db)
                         .await?
@@ -4878,6 +5283,13 @@ async fn push_inner<'c, 'd>(
                             )));
                         }
 
+                        // These two burst guards intentionally stay keyed to `workspace_id`, not the
+                        // billing root: the shared caps are the monthly usage above (metered to the
+                        // root) and the per-user in-queue/concurrent guards further up (keyed by email,
+                        // global across the whole family). Keying these to the root would count the
+                        // root's own queue rather than this workspace's load or the family's; a true
+                        // family-shared burst cap would need a family-wide subquery, not worth the
+                        // hot-path cost for this downgrade-only soft guard.
                         let in_queue_workspace = sqlx::query_scalar!(
                             "SELECT COUNT(id) FROM v2_job_queue WHERE workspace_id = $1",
                             workspace_id
@@ -4926,6 +5338,7 @@ async fn push_inner<'c, 'd>(
         _low_level_priority: Option<i16>,
         concurrency_settings: ConcurrencySettings,
         debouncing_settings: DebouncingSettings,
+        retry_settings: RetrySettings,
         labels: Option<Vec<String>>,
     }
     let mut preprocessed = None;
@@ -4944,6 +5357,7 @@ async fn push_inner<'c, 'd>(
         _low_level_priority,
         mut concurrency_settings,
         debouncing_settings,
+        retry_settings,
         labels,
     } = match job_payload {
         JobPayload::ScriptHash {
@@ -5250,6 +5664,7 @@ async fn push_inner<'c, 'd>(
             path,
             hash,
             flow_version,
+            language,
             retry,
             error_handler_path,
             error_handler_args,
@@ -5263,10 +5678,71 @@ async fn push_inner<'c, 'd>(
             apply_preprocessor,
             debouncing_settings,
             concurrency_settings,
-        } => {
+        } => 'ssf: {
             // Determine if this is a flow or a script
             let is_flow = flow_version.is_some();
 
+            // Native retry: a bare script wrapped only to gain a retry (no
+            // skip/error-handler modules) is pushed as a real `Script` job that
+            // carries the policy in `runnable_settings`. This avoids spawning a
+            // one-step flow — and its extra job rows, flow_status, and UI
+            // projection — for the common schedule/pipeline retry case. The flow
+            // path below is kept only for handler-bearing or flow-wrapping cases.
+            //
+            // Gated on the runnable-settings min version: on a mixed-version
+            // fleet the policy can't be persisted (`insert_rs` would drop it), so
+            // we fall back to the flow wrapper to preserve retry semantics.
+            // `retry_if` is always materialized natively and evaluated on the
+            // failure path (see `eval_retry_if`). On a worker built without the
+            // `quickjs` feature it cannot be evaluated and fails closed (no retry);
+            // the flow path is not a fallback, since the flow runtime needs quickjs
+            // too.
+            let native_retry = !is_flow
+                && skip_handler.is_none()
+                && error_handler_path.is_none()
+                && hash.is_some()
+                && language.is_some()
+                && windmill_common::runnable_settings::min_version_supports_runnable_settings_v0()
+                    .await;
+            if native_retry {
+                if apply_preprocessor {
+                    preprocessed = Some(false);
+                }
+                // Preserve worker affinity: normal ScriptHash pushes carry the
+                // script's `dedicated_worker` (it drives the dedicated tag below),
+                // but the SingleStepFlow payload doesn't — resolve it from the
+                // script row so a dedicated-worker script keeps its dedicated pool.
+                let dedicated_worker = if let Some(h) = &hash {
+                    // Read on the non-RLS pool: push_inner is also entered with RLS
+                    // isolation variants under which the script row may be invisible,
+                    // which would mis-resolve dedicated_worker routing.
+                    sqlx::query_scalar::<_, Option<bool>>(
+                        "SELECT dedicated_worker FROM script WHERE hash = $1 AND workspace_id = $2",
+                    )
+                    .bind(h.0)
+                    .bind(workspace_id)
+                    .fetch_optional(db)
+                    .await?
+                    .flatten()
+                } else {
+                    None
+                };
+                break 'ssf JobPayloadUntagged {
+                    runnable_id: hash.map(|h| h.0),
+                    runnable_path: Some(path),
+                    job_kind: JobKind::Script,
+                    language,
+                    dedicated_worker,
+                    concurrency_settings,
+                    debouncing_settings,
+                    retry_settings: retry.as_ref().map(RetrySettings::from).unwrap_or_default(),
+                    cache_ttl,
+                    cache_ignore_s3_path,
+                    _low_level_priority: priority,
+                    ..Default::default()
+                };
+            }
+
             // Build modules list
             let mut modules = vec![];
 
@@ -5903,6 +6379,7 @@ async fn push_inner<'c, 'd>(
         RunnableSettings {
             debouncing_settings: debouncing_settings.insert_cached(db).await?,
             concurrency_settings: concurrency_settings.insert_cached(db).await?,
+            retry_settings: retry_settings.insert_cached(db).await?,
         },
         db,
     )
diff --git a/backend/windmill-queue/src/lib.rs b/backend/windmill-queue/src/lib.rs
index 6f689c7026..8d8534c926 100644
--- a/backend/windmill-queue/src/lib.rs
+++ b/backend/windmill-queue/src/lib.rs
@@ -14,6 +14,20 @@ pub mod cascade_oss;
 pub use cascade_ee as cascade;
 #[cfg(not(feature = "private"))]
 pub use cascade_oss as cascade;
+#[cfg(feature = "private")]
+pub mod ducklake_maintenance_ee;
+pub mod ducklake_maintenance_oss;
+#[cfg(feature = "private")]
+pub use ducklake_maintenance_ee as ducklake_maintenance;
+#[cfg(not(feature = "private"))]
+pub use ducklake_maintenance_oss as ducklake_maintenance;
+#[cfg(feature = "private")]
+pub mod freshness_watchdog_ee;
+pub mod freshness_watchdog_oss;
+#[cfg(feature = "private")]
+pub use freshness_watchdog_ee as freshness_watchdog;
+#[cfg(not(feature = "private"))]
+pub use freshness_watchdog_oss as freshness_watchdog;
 pub mod jobs;
 #[cfg(feature = "private")]
 pub mod jobs_ee;
diff --git a/backend/windmill-queue/src/schedule.rs b/backend/windmill-queue/src/schedule.rs
index 3f6c587be2..2b5aef96a5 100644
--- a/backend/windmill-queue/src/schedule.rs
+++ b/backend/windmill-queue/src/schedule.rs
@@ -227,11 +227,30 @@ pub async fn push_scheduled_job<'c>(
         }
     }
 
+    // Managed ducklake maintenance schedule (enterprise): the runnable is a
+    // generated DuckDB script, not a deployed one — built in the EE module.
+    // None (CE build, or no enabled maintenance config for the path's lake)
+    // falls through to normal script resolution, so a user schedule that
+    // pre-dates the reserved prefix keeps running its script and a stale
+    // managed row fails resolution with NotFound (auto-disabling it with
+    // schedule.error recorded).
+    let maintenance_payload =
+        if windmill_common::workspaces::lake_from_ducklake_maintenance_path(&schedule.path)
+            .is_some()
+        {
+            crate::ducklake_maintenance::build_maintenance_schedule_payload(&mut tx, schedule)
+                .await?
+        } else {
+            None
+        };
+
     // If schedule handler is defined, wrap the scheduled job in a synthetic flow
     // with the handler as the first step (with stop_after_if to skip if handler returns false)
-    let (payload, tag, timeout, on_behalf_of_email, created_by) = if let Some(handler_path) =
-        &schedule.dynamic_skip
+    let (payload, tag, timeout, on_behalf_of_email, created_by) = if let Some(maintenance_payload) =
+        maintenance_payload
     {
+        maintenance_payload
+    } else if let Some(handler_path) = &schedule.dynamic_skip {
         // Build skip handler args
         let mut skip_handler_args = HashMap::<String, Box<serde_json::value::RawValue>>::new();
         skip_handler_args.insert(
@@ -255,6 +274,7 @@ pub async fn push_scheduled_job<'c>(
                 path: schedule.script_path.clone(),
                 hash,
                 flow_version,
+                language: None,
                 args: args.clone(),
                 retry,
                 error_handler_path: None,
@@ -352,6 +372,11 @@ pub async fn push_scheduled_job<'c>(
         .warn_after_seconds_with_sql(1, "get_latest_hash_for_path".to_string())
         .await?;
 
+        // NB: read on the non-RLS pool (`db`), not `tx`. push_scheduled_job is
+        // also invoked with an RLS user_db transaction (api-schedule/api-flows),
+        // under which these lookups would resolve against the caller's row
+        // visibility rather than the full table. The dual-connection here is
+        // intentional and required for correctness.
         let (debouncing_settings, concurrency_settings) =
             windmill_common::runnable_settings::prefetch_cached_from_handle(
                 runnable_settings_handle,
@@ -371,12 +396,20 @@ pub async fn push_scheduled_job<'c>(
             for (arg_name, arg_value) in args.clone() {
                 static_args.insert(arg_name, arg_value);
             }
-            // if retry is set, we wrap the script into a one step flow with a retry on the module
+            // A retry on a scheduled script is materialized into a native retry
+            // (see `push`): `Some(language)` opts in. Completion handlers are
+            // driven from the terminal attempt, and the per-occurrence
+            // failure/recovery counting queries (apply_schedule_handlers) resolve
+            // terminal status across the retry chain — so on_failure/on_recovery
+            // (incl. multi-count/exact) are all handled. A `retry_if` gate is
+            // evaluated at failure time; on a worker built without quickjs it
+            // cannot be evaluated and fails closed (no retry).
             (
                 JobPayload::SingleStepFlow {
                     path: schedule.script_path.clone(),
                     hash: Some(hash),
                     flow_version: None,
+                    language: Some(language),
                     retry: Some(parsed_retry),
                     error_handler_path: None,
                     error_handler_args: None,
@@ -388,8 +421,12 @@ pub async fn push_scheduled_job<'c>(
                     tag_override: schedule.tag.clone(),
                     trigger_path: None,
                     apply_preprocessor: false,
-                    concurrency_settings: ConcurrencySettings::default(),
-                    debouncing_settings: DebouncingSettings::default(),
+                    // Carry the script's concurrency/debounce settings (fetched
+                    // above) into the native retry materialization, so a retrying
+                    // concurrency-limited scheduled script still inserts its
+                    // concurrency_key instead of running unbounded.
+                    concurrency_settings,
+                    debouncing_settings,
                 },
                 if schedule.tag.as_ref().is_some_and(|x| x != "") {
                     schedule.tag.clone()
@@ -497,7 +534,7 @@ pub async fn push_scheduled_job<'c>(
 
     if let Some(tag) = tag.as_deref().filter(|t| !t.is_empty()) {
         check_tag_available_for_workspace_internal(
-            &db,
+            db,
             &schedule.workspace_id,
             &tag,
             &email,
@@ -600,7 +637,9 @@ pub async fn clear_schedule<'c>(
     w_id: &str,
 ) -> Result<()> {
     tracing::info!("Clearing schedule {}", path);
-    sqlx::query!(
+    // Delete the queued jobs (cascading their v2_job_queue-keyed side tables), then route the
+    // freed ids through delete_jobs so v2_job and its no-longer-cascading side tables go too.
+    let deleted_ids: Vec<uuid::Uuid> = sqlx::query_scalar!(
         "WITH to_delete AS (
             SELECT id FROM v2_job_queue
                 JOIN v2_job j USING (id)
@@ -610,15 +649,16 @@ pub async fn clear_schedule<'c>(
                 AND flow_step_id IS NULL
                 AND running = false
             FOR UPDATE
-        ), deleted AS (
-            DELETE FROM v2_job_queue
-            WHERE id IN (SELECT id FROM to_delete)
-            RETURNING id
-        ) DELETE FROM v2_job WHERE id IN (SELECT id FROM deleted)",
+        )
+        DELETE FROM v2_job_queue
+        WHERE id IN (SELECT id FROM to_delete)
+        RETURNING id",
         path,
         w_id
     )
-    .execute(&mut **tx)
+    .fetch_all(&mut **tx)
     .await?;
+
+    windmill_common::jobs::delete_jobs(&mut **tx, &deleted_ids).await?;
     Ok(())
 }
diff --git a/backend/windmill-queue/src/tags.rs b/backend/windmill-queue/src/tags.rs
index a0cc3a305e..d80e50d8b2 100644
--- a/backend/windmill-queue/src/tags.rs
+++ b/backend/windmill-queue/src/tags.rs
@@ -8,13 +8,21 @@ const FORK_PARENT_CACHE_TTL_SECS: u64 = 300;
 
 lazy_static::lazy_static! {
     // Cache of fork workspace id -> (parent_workspace_id, cached_at).
-    // `parent_workspace_id` is essentially immutable once a fork is created, so a multi-minute TTL
-    // is safe. `None` means the lookup found no parent (or the DB call failed); we still cache it
-    // briefly so that forks missing a parent do not hammer the DB.
+    // `parent_workspace_id` is stable for the lifetime of a fork EXCEPT across attach/detach of a
+    // dev workspace, which set/keep it; those paths call `invalidate_fork_parent_cache` so routing
+    // doesn't lag. `None` means the lookup found no parent (or the DB call failed); we still cache
+    // it briefly so that forks missing a parent do not hammer the DB.
     static ref FORK_PARENT_CACHE: quick_cache::sync::Cache<String, (Option<String>, std::time::Instant)> =
         quick_cache::sync::Cache::new(500);
 }
 
+/// Drop the cached fork->parent mapping for a workspace. Call after mutating `parent_workspace_id`
+/// (attaching/detaching a dev workspace) so per-workspace job tags resolve to the new parent
+/// immediately instead of after the cache TTL.
+pub fn invalidate_fork_parent_cache(workspace_id: &str) {
+    FORK_PARENT_CACHE.remove(workspace_id);
+}
+
 /// Returns `Some(effective_workspace_tag_id)` if jobs of `workspace_id` should use workspace-
 /// specific tags, where `effective_workspace_tag_id` is the string embedded in the tag. For forks,
 /// this is always the parent workspace id, optionally suffixed with `-fork` (controlled by the
@@ -26,16 +34,14 @@ pub async fn per_workspace_tag(workspace_id: &str, db: &Pool<Postgres>) -> Optio
         return None;
     }
 
-    let is_fork = workspace_id.starts_with(WM_FORK_PREFIX);
-
-    // For forks, always resolve to the parent workspace id; regular workspaces avoid the lookup.
-    let effective_ws_id: String = if is_fork {
-        lookup_fork_parent(workspace_id, db)
-            .await
-            .unwrap_or_else(|| workspace_id.to_string()) // no parent found -> fall back to fork's own id
-    } else {
-        workspace_id.to_string()
-    };
+    // Resolve to the parent workspace id when the workspace is a fork or dev workspace (both set
+    // parent_workspace_id). The lookup caches its `None` result, so non-forks stay cheap after warmup
+    // (and the common case is already short-circuited by the global toggle above).
+    let parent = lookup_fork_parent(workspace_id, db).await;
+    // A `wm-fork-` workspace can outlive its parent (the FK is `ON DELETE SET NULL`), so keep
+    // treating the prefix as fork-ness for the `-fork` suffix even when the parent link is gone.
+    let is_fork = parent.is_some() || workspace_id.starts_with(WM_FORK_PREFIX);
+    let effective_ws_id: String = parent.unwrap_or_else(|| workspace_id.to_string());
 
     // Whitelist check is against the resolved (parent) id so that including a parent in the
     // whitelist transparently covers all of its forks.
@@ -62,8 +68,10 @@ pub async fn per_workspace_tag(workspace_id: &str, db: &Pool<Postgres>) -> Optio
     })
 }
 
-/// Returns the parent workspace id for a fork, or `None` if the fork has no parent set (or the
-/// DB lookup failed). Backed by a short-TTL cache to avoid a DB round-trip per job push.
+/// Returns the parent workspace id for a fork, or `None` if the fork has no parent set. Backed by a
+/// short-TTL cache to avoid a DB round-trip per job push. A transient DB error returns `None` for
+/// this call but is NOT cached, so the next push retries instead of misrouting a (prefix-less) dev
+/// workspace's jobs for the whole TTL.
 async fn lookup_fork_parent(fork_id: &str, db: &Pool<Postgres>) -> Option<String> {
     if let Some((parent, cached_at)) = FORK_PARENT_CACHE.get(fork_id) {
         if cached_at.elapsed().as_secs() < FORK_PARENT_CACHE_TTL_SECS {
@@ -78,8 +86,11 @@ async fn lookup_fork_parent(fork_id: &str, db: &Pool<Postgres>) -> Option<String
     .fetch_optional(db)
     .await
     {
-        Ok(Some(Some(parent))) => Some(parent),
-        _ => None,
+        Ok(opt) => opt.flatten(),
+        Err(e) => {
+            tracing::warn!("failed to look up fork parent for {fork_id}: {e:#}");
+            return None;
+        }
     };
 
     FORK_PARENT_CACHE.insert(
diff --git a/backend/windmill-queue/tests/debounce_test.rs b/backend/windmill-queue/tests/debounce_test.rs
index a2c6971c1c..d74f20ff3f 100644
--- a/backend/windmill-queue/tests/debounce_test.rs
+++ b/backend/windmill-queue/tests/debounce_test.rs
@@ -3364,6 +3364,7 @@ mod debounce {
         let rs = RunnableSettings {
             debouncing_settings: debouncing_hash,
             concurrency_settings: concurrency_hash,
+            retry_settings: None,
         };
         let rs_handle = insert_rs(rs, &db).await?;
 
@@ -3741,6 +3742,7 @@ mod debounce {
             RunnableSettings {
                 debouncing_settings: debouncing_hash,
                 concurrency_settings: concurrency_hash,
+                retry_settings: None,
             },
             db,
         )
@@ -3878,6 +3880,1577 @@ mod debounce {
         Ok(())
     }
 
+    /// Helper: push a script job through push-time `maybe_debounce` with the given key.
+    /// Returns the args JSON it was pushed with.
+    async fn push_debounced_script(
+        db: &Pool<Postgres>,
+        id: Uuid,
+        items: Vec<i64>,
+        settings: &DebouncingSettings,
+        rs_handle: Option<i64>,
+    ) -> serde_json::Value {
+        let args_val = serde_json::json!({ "items": items });
+        insert_script_job_with_args(db, id, "test-workspace", "f/test/script", &args_val).await;
+        sqlx::query!(
+            "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+            rs_handle,
+            id,
+        )
+        .execute(db)
+        .await
+        .unwrap();
+        let args_hm: HashMap<String, Box<RawValue>> =
+            serde_json::from_value(args_val.clone()).unwrap();
+        let push_args = PushArgs::from(&args_hm);
+        let mut scheduled_for = None;
+        let mut tx = db.begin().await.unwrap();
+        windmill_queue::jobs_ee::maybe_debounce(
+            settings,
+            &mut scheduled_for,
+            &Some("f/test/script".to_string()),
+            "test-workspace",
+            JobKind::Script,
+            id,
+            &push_args,
+            &mut tx,
+        )
+        .await
+        .unwrap();
+        tx.commit().await.unwrap();
+        args_val
+    }
+
+    /// Regression test for the "running survivor" data-loss bug.
+    ///
+    /// When a debounce survivor has already been pulled and is executing (running), it
+    /// has committed its batch and can no longer accumulate later arrivals. The old
+    /// behavior superseded the running survivor anyway: it was completed/skipped
+    /// ("Debounced Running by ...") and deleted from the queue, silently dropping its
+    /// accumulated work, while the late arrival could not merge into it.
+    ///
+    /// Fix: a late arrival that finds the current survivor already running starts a
+    /// FRESH debounce window. The running survivor is left to finish with its own
+    /// accumulated batch; the late arrival accumulates only its own batch. No job is
+    /// killed and no item is dropped or double-run.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_running_survivor_not_superseded(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "running_survivor_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // J1, J2 share a window; J2 is the survivor with batch {J1, J2}.
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+        assert!(is_completed(&db, &j1).await, "J1 should be debounced by J2");
+        assert!(is_queued(&db, &j2).await, "J2 should be the survivor");
+
+        // Worker pulls J2 and marks it running: the window where the key still points
+        // to J2 and its batch is intact, but J2 can no longer accumulate new arrivals.
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+            j2
+        )
+        .execute(&db)
+        .await?;
+
+        // Late arrival J3 while J2 is running.
+        let j3 = Uuid::new_v4();
+        let j3_args = push_debounced_script(&db, j3, vec![3], &settings, rs_handle).await;
+
+        // The running survivor J2 must NOT be superseded: still queued, not completed.
+        assert!(
+            is_queued(&db, &j2).await,
+            "running survivor J2 must stay in the queue"
+        );
+        assert!(
+            !is_completed(&db, &j2).await,
+            "running survivor J2 must not be completed/skipped"
+        );
+
+        // J3 must own the debounce key as the head of a FRESH window (no previous job).
+        let (dk_job, dk_prev, dk_times) = get_debounce_key(&db, key)
+            .await
+            .expect("debounce key exists");
+        assert_eq!(dk_job, j3, "J3 should hold the debounce key");
+        assert!(
+            dk_prev.is_none(),
+            "J3 should start a fresh window with no previous job (got {dk_prev:?})"
+        );
+        assert_eq!(
+            dk_times, 0,
+            "fresh window should reset debounced_times to 0"
+        );
+
+        // The running survivor J2 accumulates only its own committed batch: [1, 2].
+        let mut j2_res = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &serde_json::json!({"items": [2]}),
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j2_res.maybe_apply_debouncing(&db).await?;
+        assert!(
+            j2_res.job.is_some(),
+            "running survivor J2 must still execute (not nulled out)"
+        );
+        assert_accumulated_items(&j2_res, &[1, 2], "items");
+
+        // The late arrival J3 accumulates only its own batch: [3]. No overlap with J2.
+        let mut j3_res = make_pulled_job_result(
+            j3,
+            "test-workspace",
+            "f/test/script",
+            &j3_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j3_res.maybe_apply_debouncing(&db).await?;
+        assert!(j3_res.job.is_some(), "J3 must execute");
+        assert_accumulated_items(&j3_res, &[3], "items");
+
+        Ok(())
+    }
+
+    /// A second arrival debouncing a NON-running survivor must keep accumulating into
+    /// the same batch (the normal debounce behavior must be unchanged by the
+    /// running-survivor guard).
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_queued_survivor_still_accumulates(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "queued_survivor_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // Three arrivals, none running: classic debounce, all accumulate into J3.
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        let j3 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+        let j3_args = push_debounced_script(&db, j3, vec![3], &settings, rs_handle).await;
+
+        assert!(is_completed(&db, &j1).await, "J1 debounced");
+        assert!(is_completed(&db, &j2).await, "J2 debounced");
+        assert!(is_queued(&db, &j3).await, "J3 is the survivor");
+
+        // Window keeps growing: J3 is the third arrival in the same batch.
+        let (dk_job, dk_prev, dk_times) = get_debounce_key(&db, key)
+            .await
+            .expect("debounce key exists");
+        assert_eq!(dk_job, j3);
+        assert_eq!(dk_prev, Some(j2), "previous job should be J2");
+        assert_eq!(dk_times, 2, "debounced_times should keep incrementing");
+
+        let mut j3_res = make_pulled_job_result(
+            j3,
+            "test-workspace",
+            "f/test/script",
+            &j3_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j3_res.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&j3_res, &[1, 2, 3], "items");
+
+        Ok(())
+    }
+
+    /// The running-survivor guard must also apply to plain debounce (delay only, no
+    /// argument accumulation): a running survivor must never be completed/skipped.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_running_survivor_no_accumulation(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "running_no_accum_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            // No debounce_args_to_accumulate.
+            ..Default::default()
+        };
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        insert_noop_job(&db, j1, "test-workspace").await;
+        insert_noop_job(&db, j2, "test-workspace").await;
+
+        let push = |id: Uuid| {
+            let settings = settings.clone();
+            let db = db.clone();
+            async move {
+                let args_hm = empty_args();
+                let args = PushArgs::from(&args_hm);
+                let mut scheduled_for = None;
+                let mut tx = db.begin().await.unwrap();
+                windmill_queue::jobs_ee::maybe_debounce(
+                    &settings,
+                    &mut scheduled_for,
+                    &Some("f/test/script".to_string()),
+                    "test-workspace",
+                    JobKind::Noop,
+                    id,
+                    &args,
+                    &mut tx,
+                )
+                .await
+                .unwrap();
+                tx.commit().await.unwrap();
+            }
+        };
+
+        push(j1).await;
+        push(j2).await;
+        assert!(is_completed(&db, &j1).await, "J1 debounced by J2");
+
+        // J2 starts running.
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+            j2
+        )
+        .execute(&db)
+        .await?;
+
+        // Late arrival J3.
+        let j3 = Uuid::new_v4();
+        insert_noop_job(&db, j3, "test-workspace").await;
+        push(j3).await;
+
+        // Running survivor J2 is preserved; J3 takes over a fresh window.
+        assert!(is_queued(&db, &j2).await, "running J2 stays queued");
+        assert!(!is_completed(&db, &j2).await, "running J2 not completed");
+        let (dk_job, dk_prev, dk_times) = get_debounce_key(&db, key)
+            .await
+            .expect("debounce key exists");
+        assert_eq!(dk_job, j3);
+        assert!(dk_prev.is_none(), "fresh window: no previous job");
+        assert_eq!(dk_times, 0, "fresh window resets debounced_times");
+
+        Ok(())
+    }
+
+    /// Once a survivor has fully been pulled (batch + key consumed by
+    /// maybe_apply_debouncing) and is running, a later arrival naturally starts a new
+    /// window. This locks in that the committed-running case stays correct alongside
+    /// the in-flight-running guard.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_committed_running_survivor_independent(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "committed_running_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+
+        // J2 is pulled: accumulate its batch and consume key + batch.
+        let mut j2_res = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &j2_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j2_res.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&j2_res, &[1, 2], "items");
+        assert!(
+            get_debounce_key(&db, key).await.is_none(),
+            "key consumed when survivor pulled"
+        );
+
+        // J2 now running.
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+            j2
+        )
+        .execute(&db)
+        .await?;
+
+        // Late arrival J3: fresh window, independent batch, J2 untouched.
+        let j3 = Uuid::new_v4();
+        let j3_args = push_debounced_script(&db, j3, vec![3], &settings, rs_handle).await;
+        assert!(is_queued(&db, &j2).await, "running J2 untouched");
+        assert!(!is_completed(&db, &j2).await, "running J2 not completed");
+        let (dk_job, _, dk_times) = get_debounce_key(&db, key).await.expect("key exists");
+        assert_eq!(dk_job, j3);
+        assert_eq!(dk_times, 0);
+
+        let mut j3_res = make_pulled_job_result(
+            j3,
+            "test-workspace",
+            "f/test/script",
+            &j3_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j3_res.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&j3_res, &[3], "items");
+
+        Ok(())
+    }
+
+    /// Flow post-preprocessing debounce must apply the same running-survivor guard:
+    /// a running flow survivor must not be completed/skipped by a late flow arrival.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_post_preprocessing_running_survivor_not_superseded(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "pp_running_survivor_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            ..Default::default()
+        };
+        let args_hm = empty_args();
+
+        let flow1 = Uuid::new_v4();
+        let flow2 = Uuid::new_v4();
+        insert_flow_job(&db, flow1, "test-workspace", "f/test/flow").await;
+        insert_flow_job(&db, flow2, "test-workspace", "f/test/flow").await;
+
+        let pp = |id: Uuid| {
+            let settings = settings.clone();
+            let db = db.clone();
+            let args_hm = args_hm.clone();
+            async move {
+                let args = PushArgs::from(&args_hm);
+                windmill_queue::jobs_ee::maybe_debounce_post_preprocessing(
+                    &settings,
+                    &Some("f/test/flow".to_string()),
+                    "test-workspace",
+                    id,
+                    &args,
+                    &db,
+                )
+                .await
+                .unwrap()
+            }
+        };
+
+        pp(flow1).await;
+        pp(flow2).await;
+        assert!(is_completed(&db, &flow1).await, "flow1 debounced by flow2");
+
+        // flow2 (the survivor) starts running.
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+            flow2
+        )
+        .execute(&db)
+        .await?;
+
+        // Late flow3 arrival while flow2 is running.
+        let flow3 = Uuid::new_v4();
+        insert_flow_job(&db, flow3, "test-workspace", "f/test/flow").await;
+        let sched = pp(flow3).await;
+        assert!(sched.is_some(), "flow3 should be debounced (fresh window)");
+
+        // Running flow2 must be preserved; flow3 owns a fresh window.
+        assert!(is_queued(&db, &flow2).await, "running flow2 stays queued");
+        assert!(
+            !is_completed(&db, &flow2).await,
+            "running flow2 must not be completed"
+        );
+        let (dk_job, dk_prev, dk_times) = get_debounce_key(&db, key).await.expect("key exists");
+        assert_eq!(dk_job, flow3, "flow3 holds the key");
+        assert!(dk_prev.is_none(), "fresh window: no previous job");
+        assert_eq!(dk_times, 0, "fresh window resets debounced_times");
+
+        Ok(())
+    }
+
+    /// A running survivor resets the debounce window for the late arrival, so an
+    /// inherited high `debounced_times` cannot push the new arrival over
+    /// max_total_debounces_amount and force an immediate (un-debounced) run.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_running_survivor_resets_limit_window(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "running_limit_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            // Limit of 3: J1, J2 stay debounced; a third arrival in the SAME window
+            // would trip the limit (current_amount + 1 >= 3) and fire immediately.
+            max_total_debounces_amount: Some(3),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // Build up the window close to the limit: J1, J2 (debounced_times = 1 on J2).
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+        let (_, _, times_before) = get_debounce_key(&db, key).await.expect("key exists");
+        assert_eq!(times_before, 1);
+
+        // J2 starts running.
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+            j2
+        )
+        .execute(&db)
+        .await?;
+
+        // J3 arrives. Without the reset it would inherit debounced_times and could trip
+        // the max-count limit and fire immediately, killing running J2. With the guard
+        // it starts a fresh window (debounced_times = 0) and is debounced normally.
+        let j3 = Uuid::new_v4();
+        let mut scheduled_for = None;
+        {
+            let args_val = serde_json::json!({ "items": [3] });
+            insert_script_job_with_args(&db, j3, "test-workspace", "f/test/script", &args_val)
+                .await;
+            sqlx::query!(
+                "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+                rs_handle,
+                j3,
+            )
+            .execute(&db)
+            .await?;
+            let args_hm: HashMap<String, Box<RawValue>> = serde_json::from_value(args_val).unwrap();
+            let push_args = PushArgs::from(&args_hm);
+            let mut tx = db.begin().await?;
+            windmill_queue::jobs_ee::maybe_debounce(
+                &settings,
+                &mut scheduled_for,
+                &Some("f/test/script".to_string()),
+                "test-workspace",
+                JobKind::Script,
+                j3,
+                &push_args,
+                &mut tx,
+            )
+            .await?;
+            tx.commit().await?;
+        }
+
+        // J3 is debounced (scheduled_for set, not fired immediately) and J2 survives.
+        assert!(
+            scheduled_for.is_some(),
+            "J3 should be debounced, not fired immediately"
+        );
+        assert!(is_queued(&db, &j2).await, "running J2 stays queued");
+        assert!(!is_completed(&db, &j2).await, "running J2 not completed");
+        let (dk_job, dk_prev, dk_times) = get_debounce_key(&db, key).await.expect("key exists");
+        assert_eq!(dk_job, j3);
+        assert!(dk_prev.is_none());
+        assert_eq!(dk_times, 0, "fresh window resets the limit counter");
+
+        Ok(())
+    }
+
+    /// Concurrency regression: two late arrivals racing AFTER the survivor started
+    /// running must not both spawn independent windows. The running check reads the
+    /// post-conflict-lock holder (`debounce_key.job_id`), so the row lock serializes the
+    /// two upserts: the first observes the running survivor and opens a fresh window;
+    /// the second observes that fresh-window head (queued, not running) and debounces
+    /// into it. Exactly one late arrival survives, the other is debounced — never both.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_concurrent_arrivals_after_running_survivor(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "concurrent_running_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // J2 is the survivor and starts running.
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true, started_at = now() WHERE id = $1",
+            j2
+        )
+        .execute(&db)
+        .await?;
+
+        // Insert the two late arrivals up front, then race only their maybe_debounce calls.
+        let j3 = Uuid::new_v4();
+        let j4 = Uuid::new_v4();
+        for (id, items) in [(j3, 3i64), (j4, 4i64)] {
+            let args_val = serde_json::json!({ "items": [items] });
+            insert_script_job_with_args(&db, id, "test-workspace", "f/test/script", &args_val)
+                .await;
+            sqlx::query!(
+                "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+                rs_handle,
+                id,
+            )
+            .execute(&db)
+            .await?;
+        }
+
+        let race = |id: Uuid, items: i64| {
+            let db = db.clone();
+            let settings = settings.clone();
+            async move {
+                let args_hm: HashMap<String, Box<RawValue>> =
+                    serde_json::from_value(serde_json::json!({ "items": [items] })).unwrap();
+                let push_args = PushArgs::from(&args_hm);
+                let mut scheduled_for = None;
+                let mut tx = db.begin().await.unwrap();
+                windmill_queue::jobs_ee::maybe_debounce(
+                    &settings,
+                    &mut scheduled_for,
+                    &Some("f/test/script".to_string()),
+                    "test-workspace",
+                    JobKind::Script,
+                    id,
+                    &push_args,
+                    &mut tx,
+                )
+                .await
+                .unwrap();
+                tx.commit().await.unwrap();
+            }
+        };
+        tokio::join!(race(j3, 3), race(j4, 4));
+
+        // The running survivor is untouched.
+        assert!(is_queued(&db, &j2).await, "running J2 stays queued");
+        assert!(!is_completed(&db, &j2).await, "running J2 not completed");
+
+        // Exactly one late arrival survives; the other is debounced into the same window.
+        let j3q = is_queued(&db, &j3).await;
+        let j4q = is_queued(&db, &j4).await;
+        let j3c = is_completed(&db, &j3).await;
+        let j4c = is_completed(&db, &j4).await;
+        assert!(
+            (j3q && j4c && !j4q && !j3c) || (j4q && j3c && !j3q && !j4c),
+            "exactly one late arrival must survive and the other be debounced \
+             (not two independent windows); got j3 queued={j3q} completed={j3c}, \
+             j4 queued={j4q} completed={j4c}"
+        );
+
+        // The surviving holder chained the debounced arrival into one window.
+        let (holder, prev, times) = get_debounce_key(&db, key).await.expect("key exists");
+        let (survivor, debounced) = if j3q { (j3, j4) } else { (j4, j3) };
+        assert_eq!(holder, survivor, "key points to the surviving late arrival");
+        assert_eq!(
+            prev,
+            Some(debounced),
+            "the surviving window debounced the other late arrival"
+        );
+        assert_eq!(times, 1, "single fresh window with one debounce");
+
+        // Both late arrivals must share a batch: when the survivor is pulled, its
+        // accumulation must include the debounced arrival's items, not just its own.
+        let survivor_args = serde_json::json!({ "items": [if j3q { 3 } else { 4 }] });
+        let mut survivor_res = make_pulled_job_result(
+            survivor,
+            "test-workspace",
+            "f/test/script",
+            &survivor_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        survivor_res.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&survivor_res, &[3, 4], "items");
+
+        Ok(())
+    }
+
+    /// Regression: a push that would chain onto a queued holder must not error if the
+    /// worker pull path concurrently deletes that holder's debounce_key
+    /// (`DELETE ... WHERE job_id = ...`, which does NOT take the push advisory lock).
+    /// The upsert is a single atomic `INSERT ... ON CONFLICT`, so a deleted holder simply
+    /// yields a fresh window rather than a "no row updated" failure. Races the two and
+    /// asserts the push always succeeds and leaves a consistent key.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_push_races_key_deletion_by_pull(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "push_vs_pull_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // 50 rounds to give the interleaving a chance to land in the read/write window
+        // that the old split read+UPDATE path would have failed on.
+        for round in 0..50 {
+            sqlx::query!("DELETE FROM debounce_key WHERE key = $1", key)
+                .execute(&db)
+                .await?;
+            let holder = Uuid::new_v4();
+            push_debounced_script(&db, holder, vec![round], &settings, rs_handle).await;
+
+            let late = Uuid::new_v4();
+            let late_args = serde_json::json!({ "items": [round * 1000] });
+            insert_script_job_with_args(&db, late, "test-workspace", "f/test/script", &late_args)
+                .await;
+            sqlx::query!(
+                "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+                rs_handle,
+                late,
+            )
+            .execute(&db)
+            .await?;
+
+            // Race: push the late arrival (chains onto `holder`) against the worker pull
+            // cleanup deleting `holder`'s key.
+            let push = {
+                let db = db.clone();
+                let settings = settings.clone();
+                async move {
+                    let args_hm: HashMap<String, Box<RawValue>> =
+                        serde_json::from_value(serde_json::json!({ "items": [round * 1000] }))
+                            .unwrap();
+                    let push_args = PushArgs::from(&args_hm);
+                    let mut scheduled_for = None;
+                    let mut tx = db.begin().await.unwrap();
+                    let res = windmill_queue::jobs_ee::maybe_debounce(
+                        &settings,
+                        &mut scheduled_for,
+                        &Some("f/test/script".to_string()),
+                        "test-workspace",
+                        JobKind::Script,
+                        late,
+                        &push_args,
+                        &mut tx,
+                    )
+                    .await;
+                    if res.is_ok() {
+                        tx.commit().await.unwrap();
+                    }
+                    res
+                }
+            };
+            let delete = {
+                let db = db.clone();
+                async move {
+                    sqlx::query!("DELETE FROM debounce_key WHERE job_id = $1", holder)
+                        .execute(&db)
+                        .await
+                }
+            };
+            let (push_res, _) = tokio::join!(push, delete);
+            assert!(
+                push_res.is_ok(),
+                "round {round}: push must not error when the holder key is concurrently deleted: {push_res:?}"
+            );
+        }
+
+        Ok(())
+    }
+
+    /// Claim-based exactly-once: if two survivors end up on the same batch (only
+    /// possible in a narrow push/pull race), the args of each member are accumulated
+    /// into exactly ONE run. The survivor that claims the batch first accumulates
+    /// everyone; the second survivor finds its contribution already consumed and runs
+    /// empty — no item is dropped and none is processed twice.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_batch_consumed_exactly_once(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let key = "exactly_once_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // J1 superseded, J2 the (first) survivor of batch B = {J1, J2}.
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+
+        // Simulate the race outcome: a second survivor J3 ended up on the SAME batch B.
+        let j3 = Uuid::new_v4();
+        let j3_args = serde_json::json!({ "items": [3] });
+        insert_script_job_with_args(&db, j3, "test-workspace", "f/test/script", &j3_args).await;
+        sqlx::query!(
+            "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+            rs_handle,
+            j3,
+        )
+        .execute(&db)
+        .await?;
+        sqlx::query!(
+            "INSERT INTO v2_job_debounce_batch (id, debounce_batch)
+             SELECT $1, debounce_batch FROM v2_job_debounce_batch WHERE id = $2",
+            j3,
+            j2,
+        )
+        .execute(&db)
+        .await?;
+
+        // J2 pulled first: claims the whole batch, accumulates everyone's items.
+        let mut j2_res = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &j2_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j2_res.maybe_apply_debouncing(&db).await?;
+        assert!(j2_res.job.is_some(), "J2 runs");
+        assert_accumulated_items(&j2_res, &[1, 2, 3], "items");
+
+        // J3 pulled next: its contribution was already consumed by J2 -> runs empty,
+        // so [3] is not processed a second time.
+        let mut j3_res = make_pulled_job_result(
+            j3,
+            "test-workspace",
+            "f/test/script",
+            &j3_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        j3_res.maybe_apply_debouncing(&db).await?;
+        let job = j3_res.job.as_ref().expect("J3 still runs (empty)");
+        let items: Vec<serde_json::Value> =
+            serde_json::from_str(job.job.args.as_ref().unwrap().get("items").unwrap().get())?;
+        assert!(
+            items.is_empty(),
+            "J3's items must be empty (already consumed by J2), got {items:?}"
+        );
+
+        Ok(())
+    }
+
+    /// A survivor re-pulled (e.g. crash recovery) must NOT mistake its own earlier
+    /// claim for a sibling's and wipe its accumulated args. consumed_by = self is
+    /// distinguished from consumed_by = another job.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_repull_keeps_accumulated(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let key = "repull_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+
+        // First pull: J2 claims its batch and accumulates [1, 2].
+        let mut first = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &j2_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        first.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&first, &[1, 2], "items");
+
+        // Re-pull with the args persisted by the first pull: J2 sees its OWN prior claim
+        // (consumed_by = j2), so it keeps the accumulated args rather than running empty.
+        let persisted = first.job.as_ref().unwrap().job.args.as_ref().unwrap();
+        let persisted_json = serde_json::to_value(persisted).unwrap();
+        let mut second = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &persisted_json,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        second.maybe_apply_debouncing(&db).await?;
+        assert!(second.job.is_some(), "re-pulled J2 still runs");
+        assert_accumulated_items(&second, &[1, 2], "items");
+
+        Ok(())
+    }
+
+    /// Helper: insert a script job and put it on the SAME debounce batch as `of_job`
+    /// (simulating a chained survivor). Returns its args JSON.
+    async fn add_survivor_to_batch_of(
+        db: &Pool<Postgres>,
+        id: Uuid,
+        items: Vec<i64>,
+        of_job: Uuid,
+        rs_handle: Option<i64>,
+    ) -> serde_json::Value {
+        let args = serde_json::json!({ "items": items });
+        insert_script_job_with_args(db, id, "test-workspace", "f/test/script", &args).await;
+        sqlx::query!(
+            "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+            rs_handle,
+            id,
+        )
+        .execute(db)
+        .await
+        .unwrap();
+        let inserted = sqlx::query!(
+            "INSERT INTO v2_job_debounce_batch (id, debounce_batch)
+             SELECT $1, debounce_batch FROM v2_job_debounce_batch WHERE id = $2",
+            id,
+            of_job,
+        )
+        .execute(db)
+        .await
+        .unwrap();
+        // `of_job` must already have a batch row, else this no-ops and the test would
+        // pass vacuously (the job would end up never-batched, keeping its own args).
+        assert_eq!(
+            inserted.rows_affected(),
+            1,
+            "add_survivor_to_batch_of: {of_job} has no batch row to share"
+        );
+        args
+    }
+
+    /// Helper: read the accumulated `items` of a pulled job as a sorted Vec<i64>.
+    fn items_of(result: &windmill_queue::PulledJobResult) -> Vec<i64> {
+        let job = result.job.as_ref().expect("job present");
+        let raw = job.job.args.as_ref().unwrap().get("items").unwrap();
+        let mut v: Vec<i64> = serde_json::from_str::<Vec<serde_json::Value>>(raw.get())
+            .unwrap()
+            .iter()
+            .map(|x| x.as_i64().unwrap())
+            .collect();
+        v.sort();
+        v
+    }
+
+    /// Edge: an accumulate-debounced job that was NEVER batched (CE / workers behind v2:
+    /// no v2_job_debounce_batch row) must keep its own args, not be emptied.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_never_batched_keeps_own_args(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some("never_batched_key".to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // Insert a job with the debounce handle but DO NOT push through maybe_debounce,
+        // so it has no batch row at all.
+        let j = Uuid::new_v4();
+        let args = serde_json::json!({ "items": [7, 8] });
+        insert_script_job_with_args(&db, j, "test-workspace", "f/test/script", &args).await;
+        sqlx::query!(
+            "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+            rs_handle,
+            j,
+        )
+        .execute(&db)
+        .await?;
+
+        let mut res = make_pulled_job_result(
+            j,
+            "test-workspace",
+            "f/test/script",
+            &args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        res.maybe_apply_debouncing(&db).await?;
+        assert!(res.job.is_some(), "never-batched job still runs");
+        assert_accumulated_items(&res, &[7, 8], "items");
+        Ok(())
+    }
+
+    /// Edge: two survivors of one batch pulled CONCURRENTLY. The atomic claim must
+    /// partition the batch disjointly — the union of what they each accumulate is the
+    /// full set, with NO item processed by both.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_concurrent_claim_disjoint(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let key = "concurrent_claim_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await; // superseded
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await; // survivor 1
+        let j3 = Uuid::new_v4();
+        let j3_args = add_survivor_to_batch_of(&db, j3, vec![3], j2, rs_handle).await; // survivor 2
+
+        let pull = |id: Uuid, args: serde_json::Value| {
+            let db = db.clone();
+            async move {
+                let mut res = make_pulled_job_result(
+                    id,
+                    "test-workspace",
+                    "f/test/script",
+                    &args,
+                    JobKind::Script,
+                    "deno",
+                    rs_handle,
+                );
+                res.maybe_apply_debouncing(&db).await.unwrap();
+                res
+            }
+        };
+        let (r2, r3) = tokio::join!(pull(j2, j2_args), pull(j3, j3_args));
+
+        let mut union = items_of(&r2);
+        union.extend(items_of(&r3));
+        union.sort();
+        assert_eq!(
+            union,
+            vec![1, 2, 3],
+            "every item accumulated exactly once across the two concurrent survivors"
+        );
+        // disjoint: no overlap between the two survivors' items
+        let i2 = items_of(&r2);
+        let i3 = items_of(&r3);
+        assert!(
+            !i2.iter().any(|x| i3.contains(x)),
+            "no item processed by both survivors; got j2={i2:?} j3={i3:?}"
+        );
+        Ok(())
+    }
+
+    /// Edge: three survivors on one batch pulled in sequence. The first claims the whole
+    /// batch; the rest find themselves consumed and run empty.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_three_survivors_first_takes_all(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "three_survivors_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+        let j3 = Uuid::new_v4();
+        let j3_args = add_survivor_to_batch_of(&db, j3, vec![3], j2, rs_handle).await;
+        let j4 = Uuid::new_v4();
+        let j4_args = add_survivor_to_batch_of(&db, j4, vec![4], j2, rs_handle).await;
+
+        let mk = |id, args: &serde_json::Value| {
+            make_pulled_job_result(
+                id,
+                "test-workspace",
+                "f/test/script",
+                args,
+                JobKind::Script,
+                "deno",
+                rs_handle,
+            )
+        };
+        let (mut r2, mut r3, mut r4) = (mk(j2, &j2_args), mk(j3, &j3_args), mk(j4, &j4_args));
+        r2.maybe_apply_debouncing(&db).await?;
+        r3.maybe_apply_debouncing(&db).await?;
+        r4.maybe_apply_debouncing(&db).await?;
+
+        assert_eq!(
+            items_of(&r2),
+            vec![1, 2, 3, 4],
+            "first survivor takes the whole batch"
+        );
+        assert!(items_of(&r3).is_empty(), "second survivor runs empty");
+        assert!(items_of(&r4).is_empty(), "third survivor runs empty");
+        Ok(())
+    }
+
+    /// Edge: plain debounce (no accumulate args) must HARD-DELETE its batch rows on pull
+    /// (not leave consumed rows lingering), so the non-accumulate path doesn't leak.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_non_accumulate_deletes_batch(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let key = "non_accum_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            // no debounce_args_to_accumulate
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        // push_debounced_script sends {items:[...]} but with no accumulate arg configured,
+        // the batch is created yet never accumulated.
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+
+        let batch_rows_before: i64 =
+            sqlx::query_scalar!("SELECT count(*) as \"c!\" FROM v2_job_debounce_batch")
+                .fetch_one(&db)
+                .await?;
+        assert!(batch_rows_before >= 2, "batch rows exist before pull");
+
+        let mut res = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &j2_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        res.maybe_apply_debouncing(&db).await?;
+
+        let remaining: i64 =
+            sqlx::query_scalar!("SELECT count(*) as \"c!\" FROM v2_job_debounce_batch")
+                .fetch_one(&db)
+                .await?;
+        assert_eq!(
+            remaining, 0,
+            "non-accumulate pull hard-deletes the batch rows"
+        );
+        Ok(())
+    }
+
+    /// Edge: GC sweep deletes consumed rows past the grace period but keeps recently
+    /// consumed and not-yet-consumed rows.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_gc_consumed_batches(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let old = Uuid::new_v4();
+        let recent = Uuid::new_v4();
+        let unconsumed = Uuid::new_v4();
+        // A consumed-long-ago sibling that is STILL QUEUED (e.g. stuck behind a
+        // concurrency limit): its marker must survive GC so its eventual pull still sees
+        // "already consumed" and runs empty (no duplicate).
+        let queued_old = Uuid::new_v4();
+        insert_script_job_with_args(
+            &db,
+            queued_old,
+            "test-workspace",
+            "f/test/script",
+            &serde_json::json!({ "items": [9] }),
+        )
+        .await;
+        sqlx::query!(
+            "INSERT INTO v2_job_debounce_batch (id, debounce_batch, consumed_at) VALUES
+                ($1, nextval('debounce_batch_seq'), now() - interval '20 minutes'),
+                ($2, nextval('debounce_batch_seq'), now() - interval '1 minute'),
+                ($3, nextval('debounce_batch_seq'), NULL),
+                ($4, nextval('debounce_batch_seq'), now() - interval '20 minutes')",
+            old,
+            recent,
+            unconsumed,
+            queued_old,
+        )
+        .execute(&db)
+        .await?;
+
+        // Mirror the monitor GC sweep (age floor + only-if-no-longer-queued).
+        let deleted = sqlx::query_scalar!(
+            "WITH del AS (
+                DELETE FROM v2_job_debounce_batch
+                WHERE consumed_at IS NOT NULL
+                  AND consumed_at < now() - interval '10 minutes'
+                  AND id NOT IN (SELECT id FROM v2_job_queue)
+                RETURNING 1
+            ) SELECT count(*) as \"c!\" FROM del"
+        )
+        .fetch_one(&db)
+        .await?;
+        assert_eq!(
+            deleted, 1,
+            "only the old, no-longer-queued consumed row is GC'd"
+        );
+
+        let exists = |id: Uuid, db: Pool<Postgres>| async move {
+            sqlx::query_scalar!(
+                "SELECT EXISTS(SELECT 1 FROM v2_job_debounce_batch WHERE id = $1) as \"e!\"",
+                id
+            )
+            .fetch_one(&db)
+            .await
+            .unwrap()
+        };
+        assert!(!exists(old, db.clone()).await, "old consumed row gone");
+        assert!(
+            exists(recent, db.clone()).await,
+            "recently consumed row kept"
+        );
+        assert!(exists(unconsumed, db.clone()).await, "unconsumed row kept");
+        assert!(
+            exists(queued_old, db.clone()).await,
+            "old consumed row whose job is still queued must be kept"
+        );
+        Ok(())
+    }
+
+    /// Helper: mark a queued job as running (simulates a survivor that the
+    /// concurrency limiter has just started executing).
+    async fn set_running(db: &Pool<Postgres>, job_id: &Uuid) {
+        sqlx::query!(
+            "UPDATE v2_job_queue SET running = true WHERE id = $1",
+            job_id
+        )
+        .execute(db)
+        .await
+        .expect("set running");
+    }
+
+    /// Regression (ref #9781): post-preprocessing debounce with
+    /// `debounce_args_to_accumulate` under a concurrency limit. A survivor accumulates
+    /// its own element and starts running; a later same-key message must start a NEW
+    /// batch (survive) rather than be folded into the running survivor and silently
+    /// dropped. Exercises the full EE path via `jobs_ee::maybe_debounce_post_preprocessing`.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_post_preprocessing_debounce_into_running_survivor_loses_message(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some("ported_running_survivor_key".to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // --- Wave 1: a single message becomes the survivor and starts running. ---
+        let survivor = Uuid::new_v4();
+        let survivor_args = serde_json::json!({ "items": [1] });
+        insert_flow_job_with_preprocessor(
+            &db,
+            survivor,
+            "test-workspace",
+            "f/test/flow_run",
+            true,
+            0,
+        )
+        .await;
+        sqlx::query!(
+            "UPDATE v2_job SET args = $2 WHERE id = $1",
+            survivor,
+            survivor_args
+        )
+        .execute(&db)
+        .await?;
+
+        let survivor_args_hm: HashMap<String, Box<RawValue>> =
+            serde_json::from_value(survivor_args.clone()).unwrap();
+        windmill_queue::jobs_ee::maybe_debounce_post_preprocessing(
+            &settings,
+            &Some("f/test/flow_run".to_string()),
+            "test-workspace",
+            survivor,
+            &PushArgs::from(&survivor_args_hm),
+            &db,
+        )
+        .await?;
+        assert!(is_queued(&db, &survivor).await, "survivor should be queued");
+
+        // Worker pulls the survivor: accumulate its own [1], consume the batch, run.
+        sqlx::query!(
+            "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+            rs_handle,
+            survivor,
+        )
+        .execute(&db)
+        .await?;
+        let mut pulled = make_pulled_job_result(
+            survivor,
+            "test-workspace",
+            "f/test/flow_run",
+            &survivor_args,
+            JobKind::Flow,
+            "flow",
+            rs_handle,
+        );
+        pulled.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&pulled, &[1], "items");
+        set_running(&db, &survivor).await; // survivor is now RUNNING
+
+        // --- Wave 2: a new message arrives while the survivor is running. ---
+        let late = Uuid::new_v4();
+        let late_args = serde_json::json!({ "items": [2] });
+        insert_flow_job_with_preprocessor(&db, late, "test-workspace", "f/test/flow_run", true, 0)
+            .await;
+        sqlx::query!("UPDATE v2_job SET args = $2 WHERE id = $1", late, late_args)
+            .execute(&db)
+            .await?;
+
+        let late_args_hm: HashMap<String, Box<RawValue>> =
+            serde_json::from_value(late_args.clone()).unwrap();
+        windmill_queue::jobs_ee::maybe_debounce_post_preprocessing(
+            &settings,
+            &Some("f/test/flow_run".to_string()),
+            "test-workspace",
+            late,
+            &PushArgs::from(&late_args_hm),
+            &db,
+        )
+        .await?;
+
+        // The late message must survive (new batch): still queued, and the debounce_key
+        // moved off the already-running survivor.
+        let late_survived = is_queued(&db, &late).await && !is_completed(&db, &late).await;
+        let dk = get_debounce_key(&db, "ported_running_survivor_key").await;
+        let key_moved_off_running_survivor =
+            dk.map(|(job_id, _, _)| job_id != survivor).unwrap_or(true);
+        assert!(
+            late_survived && key_moved_off_running_survivor,
+            "message arriving while the survivor is running must start a new batch \
+             (survive), not be folded into the running survivor and dropped. \
+             late_survived={late_survived}, key_moved_off={key_moved_off_running_survivor}"
+        );
+        Ok(())
+    }
+
+    /// Flow-node debounce (third EE entry point, `jobs_ee::maybe_debounce_flow_node`):
+    /// a running survivor child must not be superseded by a later same-key child; the
+    /// late child starts a fresh window and the running child is left to finish.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_flow_node_debounce_running_survivor_not_superseded(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "flow_node_running_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            ..Default::default()
+        };
+        let args_hm = empty_args();
+
+        let flow1 = Uuid::new_v4();
+        let child1 = Uuid::new_v4();
+        insert_flow_job(&db, flow1, "test-workspace", "f/test/my_flow").await;
+        insert_child_job_with_parent(&db, child1, flow1, "test-workspace").await;
+
+        // child1 becomes the survivor, then starts running.
+        {
+            let args = PushArgs::from(&args_hm);
+            let mut tx = db.begin().await?;
+            windmill_queue::jobs_ee::maybe_debounce_flow_node(
+                &settings,
+                child1,
+                flow1,
+                "f/test/my_flow",
+                "step_a",
+                "test-workspace",
+                &args,
+                &mut tx,
+                &db,
+            )
+            .await?;
+            tx.commit().await?;
+        }
+        set_running(&db, &child1).await;
+
+        // child2 (later same-key child) arrives while child1 is running.
+        let flow2 = Uuid::new_v4();
+        let child2 = Uuid::new_v4();
+        insert_flow_job(&db, flow2, "test-workspace", "f/test/my_flow").await;
+        insert_child_job_with_parent(&db, child2, flow2, "test-workspace").await;
+        {
+            let args = PushArgs::from(&args_hm);
+            let mut tx = db.begin().await?;
+            windmill_queue::jobs_ee::maybe_debounce_flow_node(
+                &settings,
+                child2,
+                flow2,
+                "f/test/my_flow",
+                "step_a",
+                "test-workspace",
+                &args,
+                &mut tx,
+                &db,
+            )
+            .await?;
+            tx.commit().await?;
+        }
+
+        // The running child1 (and its parent flow1) must be left alone; child2 owns a
+        // fresh window.
+        assert!(is_queued(&db, &child1).await, "running child1 stays queued");
+        assert!(
+            !is_completed(&db, &child1).await,
+            "running child1 not completed"
+        );
+        assert!(
+            !is_completed(&db, &flow1).await,
+            "flow1 of running child not completed"
+        );
+        let (dk_job, dk_prev, dk_times) = get_debounce_key(&db, key).await.expect("key exists");
+        assert_eq!(dk_job, child2, "child2 holds the key");
+        assert!(dk_prev.is_none(), "fresh window: no previous child");
+        assert_eq!(dk_times, 0, "fresh window resets debounced_times");
+        Ok(())
+    }
+
+    /// Edge: accumulate values that are bare scalars (not arrays) — the `T | T[]` union
+    /// case. Each scalar contribution must be wrapped into a single-element list so the
+    /// survivor accumulates them all. Exercises the non-array fallback in the claim path.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_accumulate_scalar_values(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let key = "scalar_accum_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        // Push two jobs whose `items` is a BARE SCALAR, not an array.
+        let push_scalar = |id: Uuid, v: i64, db: Pool<Postgres>, settings: DebouncingSettings| async move {
+            let args_val = serde_json::json!({ "items": v });
+            insert_script_job_with_args(&db, id, "test-workspace", "f/test/script", &args_val)
+                .await;
+            sqlx::query!(
+                "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+                rs_handle,
+                id,
+            )
+            .execute(&db)
+            .await
+            .unwrap();
+            let hm: HashMap<String, Box<RawValue>> = serde_json::from_value(args_val).unwrap();
+            let mut sf = None;
+            let mut tx = db.begin().await.unwrap();
+            windmill_queue::jobs_ee::maybe_debounce(
+                &settings,
+                &mut sf,
+                &Some("f/test/script".to_string()),
+                "test-workspace",
+                JobKind::Script,
+                id,
+                &PushArgs::from(&hm),
+                &mut tx,
+            )
+            .await
+            .unwrap();
+            tx.commit().await.unwrap();
+        };
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_scalar(j1, 1, db.clone(), settings.clone()).await;
+        push_scalar(j2, 2, db.clone(), settings.clone()).await;
+
+        let mut res = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &serde_json::json!({ "items": 2 }),
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        res.maybe_apply_debouncing(&db).await?;
+        // Both bare scalars are wrapped and accumulated into a list.
+        assert_accumulated_items(&res, &[1, 2], "items");
+        Ok(())
+    }
+
+    /// Edge: GC reclaiming a survivor's consumed row before a re-pull must NOT lose data —
+    /// the re-pull finds no row (had_row=false) and keeps its already-persisted accumulated
+    /// args, rather than running empty.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    async fn test_debounce_repull_after_gc_keeps_accumulated(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let key = "repull_gc_key";
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some(key.to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let j1 = Uuid::new_v4();
+        let j2 = Uuid::new_v4();
+        push_debounced_script(&db, j1, vec![1], &settings, rs_handle).await;
+        let j2_args = push_debounced_script(&db, j2, vec![2], &settings, rs_handle).await;
+
+        let mut first = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &j2_args,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        first.maybe_apply_debouncing(&db).await?;
+        assert_accumulated_items(&first, &[1, 2], "items");
+
+        // Simulate the GC sweep reclaiming the (now consumed) batch rows for this batch.
+        sqlx::query!(
+            "DELETE FROM v2_job_debounce_batch WHERE debounce_batch = (
+                SELECT debounce_batch FROM v2_job_debounce_batch WHERE id = $1
+            )",
+            j2,
+        )
+        .execute(&db)
+        .await
+        .ok();
+        // (and any that were already consumed elsewhere)
+        sqlx::query!("DELETE FROM v2_job_debounce_batch WHERE consumed_at IS NOT NULL")
+            .execute(&db)
+            .await?;
+
+        // Re-pull with the args persisted on the first pull: no batch row now, so it must
+        // fall back to its own (already-accumulated) args — no loss.
+        let persisted =
+            serde_json::to_value(first.job.as_ref().unwrap().job.args.as_ref().unwrap()).unwrap();
+        let mut second = make_pulled_job_result(
+            j2,
+            "test-workspace",
+            "f/test/script",
+            &persisted,
+            JobKind::Script,
+            "deno",
+            rs_handle,
+        );
+        second.maybe_apply_debouncing(&db).await?;
+        assert!(second.job.is_some(), "re-pulled survivor still runs");
+        assert_accumulated_items(&second, &[1, 2], "items");
+        Ok(())
+    }
+
+    /// Throughput benchmark for the FULL debounce path (EE push +
+    /// `jobs_ee::maybe_debounce`/`complete_debounced_job`/`upsert_debounce_key`, then OSS
+    /// `maybe_apply_debouncing` claim/accumulate/consume). #[ignore]d — run manually:
+    ///   cargo test -p windmill-queue --test debounce_test --features private,enterprise \
+    ///     bench_debounce_full_path -- --ignored --nocapture --test-threads=1
+    /// Each cycle = a burst of BURST pushes to one key (debounced) + one survivor pull
+    /// (accumulate+consume), run across CONCURRENCY tasks. Compare before/after by running
+    /// it on each code revision.
+    #[sqlx::test(migrations = "../migrations", fixtures("base"))]
+    #[ignore]
+    async fn bench_debounce_full_path(db: Pool<Postgres>) -> anyhow::Result<()> {
+        const CONCURRENCY: usize = 4;
+        const CYCLES_PER_TASK: usize = 300;
+        const BURST: usize = 3;
+
+        let settings = DebouncingSettings {
+            debounce_delay_s: Some(5),
+            debounce_key: Some("bench_key".to_string()),
+            debounce_args_to_accumulate: Some(vec!["items".to_string()]),
+            ..Default::default()
+        };
+        let rs_handle = setup_debouncing_settings(&db, &settings).await;
+
+        let start = std::time::Instant::now();
+        let tasks: Vec<_> = (0..CONCURRENCY)
+            .map(|t| {
+                let db = db.clone();
+                let settings = DebouncingSettings {
+                    // distinct key space per task so bursts collapse independently
+                    debounce_key: Some(format!("bench_key_{t}")),
+                    ..settings.clone()
+                };
+                tokio::spawn(async move {
+                    for c in 0..CYCLES_PER_TASK {
+                        // Fresh key per cycle so each cycle is one full collapse+pull.
+                        let key = format!("bench_{t}_{c}");
+                        let settings = DebouncingSettings {
+                            debounce_key: Some(key.clone()),
+                            ..settings.clone()
+                        };
+                        let mut survivor = Uuid::new_v4();
+                        for b in 0..BURST {
+                            let id = Uuid::new_v4();
+                            survivor = id;
+                            let args_val = serde_json::json!({ "items": [b as i64] });
+                            insert_script_job_with_args(
+                                &db, id, "test-workspace", "f/test/script", &args_val,
+                            )
+                            .await;
+                            sqlx::query!(
+                                "UPDATE v2_job_queue SET runnable_settings_handle = $1 WHERE id = $2",
+                                rs_handle, id,
+                            )
+                            .execute(&db)
+                            .await
+                            .unwrap();
+                            let hm: HashMap<String, Box<RawValue>> =
+                                serde_json::from_value(args_val).unwrap();
+                            let mut sf = None;
+                            let mut tx = db.begin().await.unwrap();
+                            windmill_queue::jobs_ee::maybe_debounce(
+                                &settings, &mut sf, &Some("f/test/script".to_string()),
+                                "test-workspace", JobKind::Script, id, &PushArgs::from(&hm), &mut tx,
+                            )
+                            .await
+                            .unwrap();
+                            tx.commit().await.unwrap();
+                        }
+                        // Survivor pull: claim + accumulate + consume.
+                        let mut res = make_pulled_job_result(
+                            survivor, "test-workspace", "f/test/script",
+                            &serde_json::json!({ "items": [] }),
+                            JobKind::Script, "deno", rs_handle,
+                        );
+                        res.maybe_apply_debouncing(&db).await.unwrap();
+                    }
+                })
+            })
+            .collect();
+        for t in tasks {
+            t.await.unwrap();
+        }
+        let elapsed = start.elapsed();
+        let cycles = CONCURRENCY * CYCLES_PER_TASK;
+        let jobs = cycles * BURST;
+        eprintln!(
+            "BENCH full debounce path: {cycles} cycles ({jobs} pushed jobs + {cycles} pulls) in {:.2?} | {:.0} pushes/s | {:.0} pulls/s",
+            elapsed,
+            jobs as f64 / elapsed.as_secs_f64(),
+            cycles as f64 / elapsed.as_secs_f64(),
+        );
+        Ok(())
+    }
+
     /// Test: Push-time (script) debounce with max_total_debounces_amount=2.
     /// 5 calls, each sending {x: [i]}. Expected:
     ///   Call 1: debounced (scheduled_for set)
diff --git a/backend/windmill-queue/tests/native_retry_test.rs b/backend/windmill-queue/tests/native_retry_test.rs
new file mode 100644
index 0000000000..fb8046149b
--- /dev/null
+++ b/backend/windmill-queue/tests/native_retry_test.rs
@@ -0,0 +1,376 @@
+// Integration tests for native single-script retry (no one-step-flow wrapping).
+//
+// These use the *runtime* sqlx API (`sqlx::query`/`query_as`, not the `!` macros)
+// like schedule_push.rs, so they need no `.sqlx` offline cache entry.
+mod native_retry {
+    use sqlx::{Pool, Postgres};
+    use uuid::Uuid;
+
+    use windmill_common::flows::{ConstantDelay, Retry};
+    use windmill_common::jobs::{JobKind, JobTriggerKind};
+    use windmill_common::runnable_settings::{
+        from_handle, insert_rs, ConcurrencySettings, RetrySettings, RunnableSettings,
+        RunnableSettingsTrait,
+    };
+    use windmill_common::scripts::{ScriptHash, ScriptLang};
+    use windmill_common::users::username_to_permissioned_as;
+    use windmill_queue::jobs::{maybe_enqueue_native_script_retry, MiniCompletedJob};
+
+    const WS: &str = "test-workspace";
+    const SCHED: &str = "f/system/test_schedule";
+    const SCRIPT: &str = "f/system/test_script";
+
+    fn mini(id: Uuid, parent_job: Option<Uuid>, handle: Option<i64>) -> MiniCompletedJob {
+        MiniCompletedJob {
+            id,
+            workspace_id: WS.to_string(),
+            runnable_id: Some(ScriptHash(100001)),
+            scheduled_for: chrono::Utc::now(),
+            parent_job,
+            flow_innermost_root_job: None,
+            runnable_path: Some(SCRIPT.to_string()),
+            kind: JobKind::Script,
+            started_at: Some(chrono::Utc::now()),
+            permissioned_as: username_to_permissioned_as("test-user"),
+            created_by: "test-user".to_string(),
+            script_lang: Some(ScriptLang::Deno),
+            permissioned_as_email: "test@windmill.dev".to_string(),
+            flow_step_id: None,
+            trigger_kind: Some(JobTriggerKind::Schedule),
+            trigger: Some(SCHED.to_string()),
+            priority: None,
+            concurrent_limit: None,
+            tag: "deno".to_string(),
+            cache_ttl: None,
+            cache_ignore_s3_path: None,
+            runnable_settings_handle: handle,
+        }
+    }
+
+    async fn count_retries(db: &Pool<Postgres>, root: Uuid) -> i64 {
+        sqlx::query_scalar::<_, i64>("SELECT count(*) FROM v2_job WHERE parent_job = $1")
+            .bind(root)
+            .fetch_one(db)
+            .await
+            .unwrap()
+    }
+
+    /// The queued retry with the given attempt number, if any: (id, kind, parent_job, backoff_s, handle).
+    async fn retry_by_attempt(
+        db: &Pool<Postgres>,
+        root: Uuid,
+        attempt: i64,
+    ) -> Option<(Uuid, String, Option<Uuid>, f64, Option<i64>)> {
+        sqlx::query_as::<_, (Uuid, String, Option<Uuid>, Option<f64>, Option<i64>)>(
+            "SELECT j.id, j.kind::text, j.parent_job,
+                    EXTRACT(EPOCH FROM (q.scheduled_for - now()))::float8,
+                    q.runnable_settings_handle
+             FROM v2_job j
+             JOIN v2_job_queue q ON q.id = j.id
+             JOIN native_retry_attempt nra ON nra.job_id = j.id
+             WHERE j.parent_job = $1 AND nra.attempt = $2",
+        )
+        .bind(root)
+        .bind(attempt)
+        .fetch_optional(db)
+        .await
+        .unwrap()
+        .map(|(id, kind, parent, backoff, handle)| {
+            (id, kind, parent, backoff.unwrap_or(0.0), handle)
+        })
+    }
+
+    fn no_result() -> Option<Box<serde_json::value::RawValue>> {
+        None
+    }
+
+    // attempt0 -> retry1 -> retry2 -> exhausted, with crash-replay idempotency.
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn chains_attempts_and_is_idempotent(db: Pool<Postgres>) -> anyhow::Result<()> {
+        // Policy: 2 constant attempts, 1s apart.
+        let retry = Retry {
+            constant: ConstantDelay { attempts: 2, seconds: 1 },
+            exponential: Default::default(),
+            retry_if: None,
+        };
+        let handle = insert_rs(
+            RunnableSettings {
+                debouncing_settings: None,
+                concurrency_settings: None,
+                retry_settings: RetrySettings::from(&retry).insert_cached(&db).await?,
+            },
+            &db,
+        )
+        .await?;
+        assert!(handle.is_some(), "a retry policy must produce a handle");
+
+        // attempt 0 (the schedule root); maybe_enqueue tolerates the absent queue row (counter -> 0).
+        let root_id = Uuid::new_v4();
+        let root = mini(root_id, None, handle);
+
+        // First failure -> retry 1.
+        assert!(
+            maybe_enqueue_native_script_retry(&db, &root, &None, &no_result).await?,
+            "first failure enqueues a retry"
+        );
+        let (r1_id, kind, parent, backoff, r1_handle) = retry_by_attempt(&db, root_id, 1)
+            .await
+            .expect("retry attempt 1 exists");
+        assert_eq!(
+            kind, "script",
+            "retry is a native Script, not a singlestepflow"
+        );
+        assert_eq!(parent, Some(root_id), "retry links to the chain root");
+        assert!(
+            r1_handle.is_some(),
+            "retry carries the policy for further chaining"
+        );
+        assert!(
+            backoff > 0.0 && backoff <= 3.0,
+            "constant 1s backoff, got {backoff}s"
+        );
+
+        // Crash-replay: the SAME completion again must not double-enqueue, and must
+        // still report pending (so schedule handlers stay deferred). Regression for P1.
+        assert!(
+            maybe_enqueue_native_script_retry(&db, &root, &None, &no_result).await?,
+            "replay still reports the retry as pending"
+        );
+        assert_eq!(
+            count_retries(&db, root_id).await,
+            1,
+            "no double retry on crash replay"
+        );
+
+        // retry 1 fails -> retry 2 (still within attempts = 2).
+        let r1 = mini(r1_id, Some(root_id), r1_handle);
+        assert!(maybe_enqueue_native_script_retry(&db, &r1, &None, &no_result).await?);
+        assert_eq!(count_retries(&db, root_id).await, 2);
+
+        // retry 2 fails -> attempts exhausted, no retry 3.
+        let (r2_id, _, _, _, r2_handle) = retry_by_attempt(&db, root_id, 2)
+            .await
+            .expect("retry attempt 2 exists");
+        let r2 = mini(r2_id, Some(root_id), r2_handle);
+        assert!(
+            !maybe_enqueue_native_script_retry(&db, &r2, &None, &no_result).await?,
+            "exhausted policy does not enqueue"
+        );
+        assert_eq!(
+            count_retries(&db, root_id).await,
+            2,
+            "no retry past max attempts"
+        );
+        Ok(())
+    }
+
+    // Cancellation always wins over a pending retry.
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn canceled_job_does_not_retry(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let retry = Retry {
+            constant: ConstantDelay { attempts: 3, seconds: 1 },
+            exponential: Default::default(),
+            retry_if: None,
+        };
+        let handle = insert_rs(
+            RunnableSettings {
+                debouncing_settings: None,
+                concurrency_settings: None,
+                retry_settings: RetrySettings::from(&retry).insert_cached(&db).await?,
+            },
+            &db,
+        )
+        .await?;
+        let root_id = Uuid::new_v4();
+        let root = mini(root_id, None, handle);
+        let canceled = Some(windmill_queue::jobs::CanceledBy {
+            username: Some("test-user".to_string()),
+            reason: Some("manual".to_string()),
+        });
+        assert!(!maybe_enqueue_native_script_retry(&db, &root, &canceled, &no_result).await?);
+        assert_eq!(
+            count_retries(&db, root_id).await,
+            0,
+            "canceled job must not retry"
+        );
+        Ok(())
+    }
+
+    // A concurrency-limited script that also retries must carry its concurrency
+    // settings into each retry, otherwise the retry runs unbounded. Regression: P1.
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn retry_preserves_concurrency_settings(db: Pool<Postgres>) -> anyhow::Result<()> {
+        let retry = Retry {
+            constant: ConstantDelay { attempts: 1, seconds: 0 },
+            exponential: Default::default(),
+            retry_if: None,
+        };
+        let concurrency = ConcurrencySettings {
+            concurrency_key: Some("f/system/test_script".to_string()),
+            concurrent_limit: Some(1),
+            concurrency_time_window_s: Some(60),
+        };
+        let handle = insert_rs(
+            RunnableSettings {
+                debouncing_settings: None,
+                concurrency_settings: concurrency.insert_cached(&db).await?,
+                retry_settings: RetrySettings::from(&retry).insert_cached(&db).await?,
+            },
+            &db,
+        )
+        .await?;
+
+        let root_id = Uuid::new_v4();
+        let root = mini(root_id, None, handle);
+        assert!(maybe_enqueue_native_script_retry(&db, &root, &None, &no_result).await?);
+
+        let (_id, _kind, _parent, _backoff, r1_handle) = retry_by_attempt(&db, root_id, 1)
+            .await
+            .expect("retry attempt 1 exists");
+        // The retry's own handle must resolve to the same concurrency settings, not
+        // just the retry policy — otherwise it would run with no concurrency_key.
+        let rs = from_handle(r1_handle, &db).await?;
+        let resolved = ConcurrencySettings::get(
+            rs.concurrency_settings
+                .expect("retry must carry concurrency settings forward"),
+            &db,
+        )
+        .await?;
+        assert_eq!(
+            resolved.concurrency_key.as_deref(),
+            Some("f/system/test_script")
+        );
+        assert_eq!(resolved.concurrent_limit, Some(1));
+        assert!(
+            rs.retry_settings.is_some(),
+            "retry policy is still carried for further chaining"
+        );
+        Ok(())
+    }
+
+    // ------------------------------------------------------------------
+    // Per-occurrence terminal status (drives on_failure_times / on_recovery).
+    // Mirrors the exact query in windmill-ee-private jobs_ee::apply_schedule_handlers.
+    // ------------------------------------------------------------------
+    // `is_retry` marks the seeded job as a native retry attempt (the explicit
+    // native_retry_attempt marker), the same signal `apply_schedule_handlers`
+    // keys off. Handlers / WAC inline children are seeded without it.
+    async fn seed_job(
+        db: &Pool<Postgres>,
+        id: Uuid,
+        parent: Option<Uuid>,
+        is_retry: bool,
+        status: &str,
+    ) {
+        sqlx::query(
+            "INSERT INTO v2_job (id, workspace_id, kind, runnable_path, trigger_kind, trigger, parent_job)
+             VALUES ($1, $2, 'script', $3, 'schedule', $4, $5)",
+        )
+        .bind(id)
+        .bind(WS)
+        .bind(SCRIPT)
+        .bind(SCHED)
+        .bind(parent)
+        .execute(db)
+        .await
+        .unwrap();
+        sqlx::query(
+            "INSERT INTO v2_job_completed (id, workspace_id, duration_ms, status)
+             VALUES ($1, $2, 1, $3::job_status)",
+        )
+        .bind(id)
+        .bind(WS)
+        .bind(status)
+        .execute(db)
+        .await
+        .unwrap();
+        if is_retry {
+            sqlx::query("INSERT INTO native_retry_attempt (job_id, attempt) VALUES ($1, 1)")
+                .bind(id)
+                .execute(db)
+                .await
+                .unwrap();
+        }
+    }
+
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn per_occurrence_status_counts_recovered_as_success(db: Pool<Postgres>) {
+        // A native retry attempt is marked (native_retry_attempt); handler and WAC
+        // inline children are parented Script children WITHOUT the marker.
+        // a: root fails, a marked retry succeeds   -> RECOVERED -> success
+        // b: root fails, retry also fails          -> failure
+        // c: root succeeds directly                -> success
+        // e: root fails, only its on_failure HANDLER (unmarked) succeeds
+        //    -> failure: handler child must NOT count as a recovery
+        // f: root fails, only a WAC inline child (unmarked) succeeds
+        //    -> failure: WAC inline child must NOT count as a recovery
+        // d: the current occurrence (excluded by `j.id != $4`)
+        let (a, b, c, e, f, d) = (
+            Uuid::new_v4(),
+            Uuid::new_v4(),
+            Uuid::new_v4(),
+            Uuid::new_v4(),
+            Uuid::new_v4(),
+            Uuid::new_v4(),
+        );
+        seed_job(&db, a, None, false, "failure").await;
+        seed_job(&db, Uuid::new_v4(), Some(a), true, "success").await; // a's retry attempt (marked)
+        seed_job(&db, b, None, false, "failure").await;
+        seed_job(&db, Uuid::new_v4(), Some(b), true, "failure").await; // b's failed retry
+        seed_job(&db, c, None, false, "success").await;
+        seed_job(&db, e, None, false, "failure").await;
+        seed_job(&db, Uuid::new_v4(), Some(e), false, "success").await; // e's handler child (unmarked)
+        seed_job(&db, f, None, false, "failure").await;
+        seed_job(&db, Uuid::new_v4(), Some(f), false, "success").await; // f's WAC inline child (unmarked)
+        seed_job(&db, d, None, false, "failure").await; // current occurrence
+
+        // Exact expression from jobs_ee::apply_schedule_handlers: the EXISTS counts
+        // only marked native retry children, so neither handler nor WAC inline
+        // children count as a recovery.
+        let rows = sqlx::query_as::<_, (Uuid, bool)>(
+            "SELECT j.id, (status = 'success' OR EXISTS (
+                    SELECT 1 FROM native_retry_attempt nra
+                    JOIN v2_job jc ON jc.id = nra.job_id
+                    JOIN v2_job_completed cc ON cc.id = nra.job_id
+                    WHERE jc.parent_job = j.id AND cc.status = 'success'
+                ))
+             FROM v2_job j JOIN v2_job_completed USING (id)
+             WHERE j.workspace_id = $1 AND trigger_kind = 'schedule' AND trigger = $2
+                AND parent_job IS NULL AND runnable_path = $3 AND j.id != $4
+             ORDER BY created_at DESC",
+        )
+        .bind(WS)
+        .bind(SCHED)
+        .bind(SCRIPT)
+        .bind(d)
+        .fetch_all(&db)
+        .await
+        .unwrap();
+
+        let status: std::collections::HashMap<Uuid, bool> = rows.into_iter().collect();
+        // Retries/handlers/WAC children (parent_job set) are NOT occurrences, and the
+        // current one is excluded: exactly the five roots a, b, c, e, f remain.
+        assert_eq!(
+            status.len(),
+            5,
+            "child jobs excluded from occurrence counting; current excluded"
+        );
+        assert_eq!(
+            status[&a], true,
+            "recovered occurrence (same-runnable retry succeeded) = success"
+        );
+        assert_eq!(
+            status[&b], false,
+            "all-attempts-failed occurrence = failure"
+        );
+        assert_eq!(status[&c], true, "direct success");
+        assert_eq!(
+            status[&e], false,
+            "on_failure handler success must NOT count as a recovery"
+        );
+        assert_eq!(
+            status[&f], false,
+            "WAC inline child success must NOT count as a recovery"
+        );
+    }
+}
diff --git a/backend/windmill-queue/tests/schedule_push.rs b/backend/windmill-queue/tests/schedule_push.rs
index c0e09003f0..e11ced23bc 100644
--- a/backend/windmill-queue/tests/schedule_push.rs
+++ b/backend/windmill-queue/tests/schedule_push.rs
@@ -3,6 +3,9 @@ mod schedule_push {
     use sqlx::{Pool, Postgres};
     use windmill_common::db::Authed;
     use windmill_common::jobs::{JobKind, JobTriggerKind};
+    use windmill_common::runnable_settings::{
+        from_handle, insert_rs, ConcurrencySettings, RunnableSettings, RunnableSettingsTrait,
+    };
     use windmill_common::schedule::Schedule;
     use windmill_common::scripts::ScriptHash;
     use windmill_common::users::username_to_permissioned_as;
@@ -233,13 +236,78 @@ mod schedule_push {
 
         assert_eq!(count_queued_jobs(&db).await, 1);
 
-        // When retry is set, the job kind is singlescriptflow (SingleStepFlow wraps it)
-        let kind = sqlx::query_scalar::<_, String>(
-            "SELECT kind::text FROM v2_job j JOIN v2_job_queue q ON j.id = q.id LIMIT 1",
+        // Native retry: a scheduled script with a retry policy is pushed as a plain
+        // Script carrying the policy via runnable_settings_handle — no SingleStepFlow.
+        let (kind, handle) = sqlx::query_as::<_, (String, Option<i64>)>(
+            "SELECT kind::text, q.runnable_settings_handle FROM v2_job j JOIN v2_job_queue q ON j.id = q.id LIMIT 1",
         )
         .fetch_one(&db)
         .await?;
-        assert_eq!(kind, "singlestepflow");
+        assert_eq!(kind, "script");
+        assert!(
+            handle.is_some(),
+            "retry policy carried via runnable_settings_handle"
+        );
+        Ok(())
+    }
+
+    // A scheduled, concurrency-limited script with a retry policy: the materialized
+    // root attempt's handle must resolve to BOTH the retry policy and the script's
+    // concurrency settings — otherwise the retry chain runs unbounded. Regression: P1.
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn test_push_script_with_retry_keeps_concurrency(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let concurrency = ConcurrencySettings {
+            concurrency_key: Some("f/system/test_script".to_string()),
+            concurrent_limit: Some(1),
+            concurrency_time_window_s: Some(60),
+        };
+        let script_handle = insert_rs(
+            RunnableSettings {
+                debouncing_settings: None,
+                concurrency_settings: concurrency.insert_cached(&db).await?,
+                retry_settings: None,
+            },
+            &db,
+        )
+        .await?;
+        sqlx::query(
+            "UPDATE script SET runnable_settings_handle = $1 WHERE workspace_id = 'test-workspace' AND path = 'f/system/test_script'",
+        )
+        .bind(script_handle)
+        .execute(&db)
+        .await?;
+
+        let schedule = make_schedule(|s| {
+            s.retry = Some(serde_json::json!({ "constant": { "attempts": 3, "seconds": 10 } }));
+        });
+        let authed = make_authed();
+        let tx = db.begin().await?;
+        let tx = push_scheduled_job(&db, tx, &schedule, Some(&authed), None).await?;
+        tx.commit().await?;
+
+        let handle = sqlx::query_scalar::<_, Option<i64>>(
+            "SELECT q.runnable_settings_handle FROM v2_job j JOIN v2_job_queue q ON j.id = q.id LIMIT 1",
+        )
+        .fetch_one(&db)
+        .await?;
+        let rs = from_handle(handle, &db).await?;
+        assert!(
+            rs.retry_settings.is_some(),
+            "root attempt carries the retry policy"
+        );
+        let resolved = ConcurrencySettings::get(
+            rs.concurrency_settings
+                .expect("root attempt must carry concurrency settings, not just retry"),
+            &db,
+        )
+        .await?;
+        assert_eq!(resolved.concurrent_limit, Some(1));
+        assert_eq!(
+            resolved.concurrency_key.as_deref(),
+            Some("f/system/test_script")
+        );
         Ok(())
     }
 
@@ -779,7 +847,7 @@ mod schedule_push {
     }
 
     // -----------------------------------------------------------------------
-    // try_schedule_next_job: script with retry wraps in SingleStepFlow
+    // try_schedule_next_job: script with retry is a native Script (no wrapping)
     // -----------------------------------------------------------------------
 
     #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
@@ -798,12 +866,16 @@ mod schedule_push {
         assert!(err.is_none());
         assert_eq!(count_queued_jobs(&db).await, 1);
 
-        let kind = sqlx::query_scalar::<_, String>(
-            "SELECT kind::text FROM v2_job j JOIN v2_job_queue q ON j.id = q.id LIMIT 1",
+        let (kind, handle) = sqlx::query_as::<_, (String, Option<i64>)>(
+            "SELECT kind::text, q.runnable_settings_handle FROM v2_job j JOIN v2_job_queue q ON j.id = q.id LIMIT 1",
         )
         .fetch_one(&db)
         .await?;
-        assert_eq!(kind, "singlestepflow");
+        assert_eq!(kind, "script");
+        assert!(
+            handle.is_some(),
+            "retry policy carried via runnable_settings_handle"
+        );
         Ok(())
     }
 
@@ -1520,4 +1592,174 @@ mod schedule_push {
 
         Ok(())
     }
+
+    // -----------------------------------------------------------------------
+    // push_scheduled_job: reserved ducklake-maintenance prefix
+    // -----------------------------------------------------------------------
+
+    // A schedule that pre-dates the reserved prefix (a user schedule under a
+    // real `ducklake_maintenance` folder) must fall through to normal script
+    // resolution when its path's lake has no enabled maintenance config —
+    // never be hijacked into the maintenance payload builder and auto-disabled.
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn test_push_reserved_prefix_no_config_falls_through_to_script(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        let schedule = make_schedule(|s| {
+            s.path = "f/ducklake_maintenance/legacy".to_string();
+        });
+        let authed = make_authed();
+
+        let tx = db.begin().await?;
+        let tx = push_scheduled_job(&db, tx, &schedule, Some(&authed), None).await?;
+        tx.commit().await?;
+
+        assert_eq!(count_queued_jobs(&db).await, 1);
+        let (ws, path, trigger, _) = get_queued_job(&db).await.unwrap();
+        assert_eq!(ws, "test-workspace");
+        assert_eq!(
+            path.as_deref(),
+            Some("f/system/test_script"),
+            "must resolve the schedule's script_path, not the maintenance builder"
+        );
+        assert_eq!(trigger.as_deref(), Some("f/ducklake_maintenance/legacy"));
+        Ok(())
+    }
+
+    // With maintenance enabled for the path's lake, the occurrence is a
+    // raw-code duckdb job (kind preview, runnable_path = schedule path,
+    // duckdb tag pinned) — enterprise builds only.
+    #[cfg(feature = "private")]
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn test_push_reserved_prefix_with_config_builds_maintenance_job(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        sqlx::query(
+            r#"UPDATE workspace_settings SET ducklake = '{"ducklakes": {"legacy": {
+                "catalog": {"resource_type": "postgresql", "resource_path": "u/test/pg"},
+                "storage": {"path": "legacy"},
+                "maintenance": {"enabled": true, "retention_days": 3}
+            }}}'::jsonb WHERE workspace_id = 'test-workspace'"#,
+        )
+        .execute(&db)
+        .await?;
+
+        let schedule = make_schedule(|s| {
+            s.path = "f/ducklake_maintenance/legacy".to_string();
+            s.script_path = "f/ducklake_maintenance/legacy".to_string();
+            s.tag = Some("duckdb".to_string());
+        });
+        let authed = make_authed();
+
+        let tx = db.begin().await?;
+        let tx = push_scheduled_job(&db, tx, &schedule, Some(&authed), None).await?;
+        tx.commit().await?;
+
+        assert_eq!(count_queued_jobs(&db).await, 1);
+        let (kind, path, tag, raw_code) =
+            sqlx::query_as::<_, (String, Option<String>, String, Option<String>)>(
+                "SELECT j.kind::text, j.runnable_path, j.tag, j.raw_code
+             FROM v2_job j JOIN v2_job_queue q ON j.id = q.id LIMIT 1",
+            )
+            .fetch_one(&db)
+            .await?;
+        assert_eq!(kind, "preview");
+        assert_eq!(path.as_deref(), Some("f/ducklake_maintenance/legacy"));
+        assert_eq!(tag, "duckdb");
+        let raw_code = raw_code.expect("maintenance job must carry generated SQL");
+        assert!(raw_code.contains("ducklake_expire_snapshots"));
+        assert!(raw_code.contains("INTERVAL '3 days'"));
+        Ok(())
+    }
+
+    // Saving maintenance off must remove the managed row AND its queued
+    // occurrence in BOTH builds: the enterprise sync reconciles, and the
+    // public stub must not leave a job pushed under the enterprise edition
+    // to run after the admin disabled maintenance (EE-to-CE downgrade).
+    #[sqlx::test(migrations = "../migrations", fixtures("base", "schedule_push"))]
+    async fn test_sync_disable_clears_managed_row_and_queued_occurrence(
+        db: Pool<Postgres>,
+    ) -> anyhow::Result<()> {
+        use std::collections::HashMap;
+        use windmill_common::workspaces::{
+            Ducklake, DucklakeCatalog, DucklakeCatalogResourceType, DucklakeMaintenance,
+            DucklakeStorage,
+        };
+        use windmill_queue::ducklake_maintenance::sync_ducklake_maintenance_schedules;
+
+        fn lake(maintenance_enabled: bool) -> Ducklake {
+            Ducklake {
+                catalog: DucklakeCatalog {
+                    resource_type: DucklakeCatalogResourceType::Postgresql,
+                    resource_path: "u/test/pg".to_string(),
+                },
+                storage: DucklakeStorage { storage: None, path: "legacy".to_string() },
+                extra_args: None,
+                fork_behavior: None,
+                maintenance: Some(DucklakeMaintenance {
+                    enabled: maintenance_enabled,
+                    schedule: None,
+                    retention_days: None,
+                    compaction: None,
+                    orphan_cleanup: None,
+                }),
+            }
+        }
+
+        // a managed row with a queued occurrence (queued via fall-through: no
+        // lake config exists yet, so the push resolves the script path)
+        let schedule = make_schedule(|s| {
+            s.path = "f/ducklake_maintenance/legacy".to_string();
+        });
+        sqlx::query(
+            "INSERT INTO schedule (workspace_id, path, schedule, timezone, edited_by, script_path,
+                is_flow, enabled, email, permissioned_as, cron_version)
+             VALUES ($1, $2, $3, 'UTC', $4, $5, false, true, $6, $7, 'v2')",
+        )
+        .bind(&schedule.workspace_id)
+        .bind(&schedule.path)
+        .bind(&schedule.schedule)
+        .bind(&schedule.edited_by)
+        .bind(&schedule.script_path)
+        .bind(&schedule.email)
+        .bind(&schedule.permissioned_as)
+        .execute(&db)
+        .await?;
+        let authed = make_authed();
+        let tx = db.begin().await?;
+        let tx = push_scheduled_job(&db, tx, &schedule, Some(&authed), None).await?;
+        tx.commit().await?;
+        assert_eq!(count_queued_jobs(&db).await, 1);
+
+        // maintenance saved off
+        let previous = HashMap::from([("legacy".to_string(), lake(true))]);
+        let current = HashMap::from([("legacy".to_string(), lake(false))]);
+        let tx = db.begin().await?;
+        let tx = sync_ducklake_maintenance_schedules(
+            &db,
+            tx,
+            &schedule.workspace_id,
+            &current,
+            &previous,
+            "test-user",
+            "test@windmill.dev",
+        )
+        .await?;
+        tx.commit().await?;
+
+        assert_eq!(
+            count_queued_jobs(&db).await,
+            0,
+            "queued occurrence must be cleared when maintenance is saved off"
+        );
+        let row_exists: bool = sqlx::query_scalar(
+            "SELECT EXISTS(SELECT 1 FROM schedule WHERE workspace_id = $1 AND path = $2)",
+        )
+        .bind(&schedule.workspace_id)
+        .bind(&schedule.path)
+        .fetch_one(&db)
+        .await?;
+        assert!(!row_exists, "managed schedule row must be deleted");
+        Ok(())
+    }
 }
diff --git a/backend/windmill-store/Cargo.toml b/backend/windmill-store/Cargo.toml
index b3aca5e669..fdd82a7e5d 100644
--- a/backend/windmill-store/Cargo.toml
+++ b/backend/windmill-store/Cargo.toml
@@ -53,3 +53,7 @@ futures.workspace = true
 chrono.workspace = true
 reqwest.workspace = true
 anyhow.workspace = true
+base64.workspace = true
+
+[dev-dependencies]
+magic-crypt.workspace = true
diff --git a/backend/windmill-store/src/resources.rs b/backend/windmill-store/src/resources.rs
index 44db0a1b68..98f91065e4 100644
--- a/backend/windmill-store/src/resources.rs
+++ b/backend/windmill-store/src/resources.rs
@@ -1088,21 +1088,48 @@ async fn create_resource(
         .execute(&db)
         .await?;
     }
-    sqlx::query!(
-        "INSERT INTO resource
-            (workspace_id, path, value, description, resource_type, created_by, edited_at, labels)
-            VALUES ($1, $2, $3, $4, $5, $6, now(), $7) ON CONFLICT (workspace_id, path)
-            DO UPDATE SET value = EXCLUDED.value, description = EXCLUDED.description, resource_type = EXCLUDED.resource_type, edited_at = now(), labels = EXCLUDED.labels",
-        w_id,
-        resource.path,
-        raw_json as sqlx::types::Json<&RawValue>,
-        resource.description,
-        resource.resource_type,
-        authed.username,
-        resource.labels.as_deref() as Option<&[String]>
-    )
-    .execute(&mut *tx)
-    .await?;
+    if update_if_exists {
+        sqlx::query!(
+            "INSERT INTO resource
+                (workspace_id, path, value, description, resource_type, created_by, edited_at, labels)
+                VALUES ($1, $2, $3, $4, $5, $6, now(), $7) ON CONFLICT (workspace_id, path)
+                DO UPDATE SET value = EXCLUDED.value, description = EXCLUDED.description, resource_type = EXCLUDED.resource_type, edited_at = now(), labels = EXCLUDED.labels",
+            w_id,
+            resource.path,
+            raw_json as sqlx::types::Json<&RawValue>,
+            resource.description,
+            resource.resource_type,
+            authed.username,
+            resource.labels.as_deref() as Option<&[String]>
+        )
+        .execute(&mut *tx)
+        .await?;
+    } else {
+        // Create-only (the default): DO NOTHING + a row-count guard, so a path that appears between
+        // check_path_conflict above and this insert is rejected rather than overwritten. A plain
+        // DO UPDATE here would clobber a concurrently-created resource, breaking create-only callers
+        // (e.g. Compare & Deploy "Create in <other>").
+        let inserted = sqlx::query!(
+            "INSERT INTO resource
+                (workspace_id, path, value, description, resource_type, created_by, edited_at, labels)
+                VALUES ($1, $2, $3, $4, $5, $6, now(), $7) ON CONFLICT (workspace_id, path) DO NOTHING",
+            w_id,
+            resource.path,
+            raw_json as sqlx::types::Json<&RawValue>,
+            resource.description,
+            resource.resource_type,
+            authed.username,
+            resource.labels.as_deref() as Option<&[String]>
+        )
+        .execute(&mut *tx)
+        .await?;
+        if inserted.rows_affected() == 0 {
+            return Err(Error::BadRequest(format!(
+                "Resource {} already exists",
+                resource.path
+            )));
+        }
+    }
 
     // Mirror update_resource: Some(true) inserts, Some(false) clears (only
     // meaningful on the upsert path, since a pure create has no existing row),
@@ -1385,7 +1412,12 @@ fn collect_var_refs(value: &serde_json::Value, out: &mut Vec<String>) {
     }
 }
 
-async fn mark_linked_variables_ws_specific(
+/// Marks every variable referenced by the resource at `resource_path` as workspace-specific.
+///
+/// AUTH CONTRACT: this mutates `ws_specific` and does NOT check authorization itself. The caller
+/// MUST verify that `authed` has write access to the resource at `resource_path` in `w_id` (e.g. via
+/// `require_owner_of_path`) before calling it.
+pub async fn mark_linked_variables_ws_specific(
     tx: &mut Transaction<'_, Postgres>,
     authed: &ApiAuthed,
     w_id: &str,
@@ -1634,6 +1666,12 @@ async fn update_resource(
 
     let path = path.to_path();
     check_scopes(&authed, || format!("resources:write:{}", path))?;
+    // A rename moves the resource (and its linked variable) to ns.path, so the
+    // destination must also be within the token's write scope, not just the
+    // source path.
+    if let Some(npath) = ns.path.as_deref() {
+        check_scopes(&authed, || format!("resources:write:{}", npath))?;
+    }
     if let RuleCheckResult::Blocked(msg) = check_deploy_rules(
         &w_id,
         AuditAuthorable::username(&authed),
diff --git a/backend/windmill-store/src/secret_backend_ext.rs b/backend/windmill-store/src/secret_backend_ext.rs
index 1ae32c80ce..d5272384c0 100644
--- a/backend/windmill-store/src/secret_backend_ext.rs
+++ b/backend/windmill-store/src/secret_backend_ext.rs
@@ -6,269 +6,27 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-//! Secret backend extension for the API layer
+//! Secret backend extension for the store layer
 //!
-//! This module provides helper functions for integrating the SecretBackend
-//! trait with variable operations in the API.
+//! Write-side helpers for integrating the SecretBackend trait with variable
+//! operations. Backend resolution and read helpers live in
+//! `windmill_common::secret_backend` (so lower-level crates can resolve secrets
+//! too) and are re-exported here for existing callers.
 //!
 //! Note: HashiCorp Vault integration requires Enterprise Edition.
 //! The OSS version only supports the database backend.
 
-use std::sync::Arc;
-
 use windmill_common::{
     db::DB,
     error::{Error, Result},
-    secret_backend::{database::DatabaseBackend, SecretBackend},
-    variables::{build_crypt, decrypt, encrypt},
+    variables::{build_crypt, encrypt},
 };
 
-#[cfg(all(feature = "private", feature = "enterprise"))]
-use windmill_common::{
-    global_settings::{load_value_from_global_settings, SECRET_BACKEND_SETTING},
-    secret_backend::{
-        AwsSecretsManagerBackend, AwsSecretsManagerSettings, AzureKeyVaultBackend,
-        AzureKeyVaultSettings, SecretBackendConfig, VaultBackend, VaultSettings,
-    },
+pub use windmill_common::secret_backend::{
+    get_secret_backend, get_secret_value, is_aws_sm_stored_value, is_azure_kv_stored_value,
+    is_external_stored_value, is_vault_backend_configured, is_vault_stored_value,
 };
 
-#[cfg(all(feature = "private", feature = "enterprise"))]
-use tokio::sync::RwLock;
-
-// Cached Vault backend to avoid recreating it for every request
-// This enables connection pooling and avoids repeated setup overhead
-#[cfg(all(feature = "private", feature = "enterprise"))]
-struct CachedVaultBackend {
-    backend: Arc<dyn SecretBackend>,
-    settings: VaultSettings,
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-lazy_static::lazy_static! {
-    static ref VAULT_BACKEND_CACHE: RwLock<Option<CachedVaultBackend>> = RwLock::new(None);
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-struct CachedAzureKvBackend {
-    backend: Arc<dyn SecretBackend>,
-    settings: AzureKeyVaultSettings,
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-lazy_static::lazy_static! {
-    static ref AZURE_KV_BACKEND_CACHE: RwLock<Option<CachedAzureKvBackend>> = RwLock::new(None);
-}
-
-// Cached AWS Secrets Manager backend
-#[cfg(all(feature = "private", feature = "enterprise"))]
-struct CachedAwsSmBackend {
-    backend: Arc<dyn SecretBackend>,
-    settings: AwsSecretsManagerSettings,
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-lazy_static::lazy_static! {
-    static ref AWS_SM_BACKEND_CACHE: RwLock<Option<CachedAwsSmBackend>> = RwLock::new(None);
-}
-
-/// Get the current secret backend based on global settings
-///
-/// OSS: Always returns DatabaseBackend
-/// EE: Returns configured backend (Database or Vault)
-#[cfg(not(all(feature = "private", feature = "enterprise")))]
-pub async fn get_secret_backend(db: &DB) -> Result<Arc<dyn SecretBackend>> {
-    Ok(Arc::new(DatabaseBackend::new(db.clone())))
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-pub async fn get_secret_backend(db: &DB) -> Result<Arc<dyn SecretBackend>> {
-    let config = match load_value_from_global_settings(db, SECRET_BACKEND_SETTING).await? {
-        Some(value) => serde_json::from_value::<SecretBackendConfig>(value).unwrap_or_default(),
-        None => SecretBackendConfig::default(),
-    };
-
-    match config {
-        SecretBackendConfig::Database => Ok(Arc::new(DatabaseBackend::new(db.clone()))),
-        SecretBackendConfig::HashiCorpVault(settings) => {
-            get_or_create_vault_backend(db, settings).await
-        }
-        SecretBackendConfig::AzureKeyVault(settings) => {
-            get_or_create_azure_kv_backend(db, settings).await
-        }
-        SecretBackendConfig::AwsSecretsManager(settings) => {
-            get_or_create_aws_sm_backend(db, settings).await
-        }
-    }
-}
-
-/// Get a cached Vault backend or create a new one if settings changed
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_or_create_vault_backend(
-    _db: &DB,
-    settings: VaultSettings,
-) -> Result<Arc<dyn SecretBackend>> {
-    // Check if we have a cached backend with matching settings (read lock)
-    {
-        let cache = VAULT_BACKEND_CACHE.read().await;
-        if let Some(ref cached) = *cache {
-            if cached.settings == settings {
-                return Ok(cached.backend.clone());
-            }
-        }
-    }
-
-    // Need to create a new backend - acquire write lock
-    let mut cache = VAULT_BACKEND_CACHE.write().await;
-
-    // Double-check (another task may have created it while we waited)
-    if let Some(ref cached) = *cache {
-        if cached.settings == settings {
-            return Ok(cached.backend.clone());
-        }
-    }
-
-    // Create new backend
-    let backend: Arc<dyn SecretBackend> = {
-        #[cfg(feature = "openidconnect")]
-        if settings.token.is_none() {
-            Arc::new(VaultBackend::new_with_db(settings.clone(), _db.clone()))
-        } else {
-            Arc::new(VaultBackend::new(settings.clone()))
-        }
-
-        #[cfg(not(feature = "openidconnect"))]
-        Arc::new(VaultBackend::new(settings.clone()))
-    };
-
-    // Cache it
-    *cache = Some(CachedVaultBackend { backend: backend.clone(), settings });
-
-    Ok(backend)
-}
-
-/// Get a cached Azure Key Vault backend or create a new one if settings changed
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_or_create_azure_kv_backend(
-    _db: &DB,
-    settings: AzureKeyVaultSettings,
-) -> Result<Arc<dyn SecretBackend>> {
-    // Check if we have a cached backend with matching settings (read lock)
-    {
-        let cache = AZURE_KV_BACKEND_CACHE.read().await;
-        if let Some(ref cached) = *cache {
-            if cached.settings == settings {
-                return Ok(cached.backend.clone());
-            }
-        }
-    }
-
-    // Need to create a new backend - acquire write lock
-    let mut cache = AZURE_KV_BACKEND_CACHE.write().await;
-
-    // Double-check (another task may have created it while we waited)
-    if let Some(ref cached) = *cache {
-        if cached.settings == settings {
-            return Ok(cached.backend.clone());
-        }
-    }
-
-    // Create new backend
-    let backend: Arc<dyn SecretBackend> = Arc::new(AzureKeyVaultBackend::new(settings.clone()));
-
-    // Cache it
-    *cache = Some(CachedAzureKvBackend { backend: backend.clone(), settings });
-
-    Ok(backend)
-}
-
-/// Get a cached AWS SM backend or create a new one if settings changed
-#[cfg(all(feature = "private", feature = "enterprise"))]
-async fn get_or_create_aws_sm_backend(
-    _db: &DB,
-    settings: AwsSecretsManagerSettings,
-) -> Result<Arc<dyn SecretBackend>> {
-    {
-        let cache = AWS_SM_BACKEND_CACHE.read().await;
-        if let Some(ref cached) = *cache {
-            if cached.settings == settings {
-                return Ok(cached.backend.clone());
-            }
-        }
-    }
-
-    let mut cache = AWS_SM_BACKEND_CACHE.write().await;
-
-    if let Some(ref cached) = *cache {
-        if cached.settings == settings {
-            return Ok(cached.backend.clone());
-        }
-    }
-
-    let backend: Arc<dyn SecretBackend> =
-        Arc::new(AwsSecretsManagerBackend::new_with_client(settings.clone()).await?);
-
-    *cache = Some(CachedAwsSmBackend { backend: backend.clone(), settings });
-
-    Ok(backend)
-}
-
-/// Check if a Vault backend is currently configured
-///
-/// OSS: Always returns false
-/// EE: Checks global settings
-#[cfg(not(all(feature = "private", feature = "enterprise")))]
-pub async fn is_vault_backend_configured(_db: &DB) -> Result<bool> {
-    Ok(false)
-}
-
-#[cfg(all(feature = "private", feature = "enterprise"))]
-pub async fn is_vault_backend_configured(db: &DB) -> Result<bool> {
-    let config = match load_value_from_global_settings(db, SECRET_BACKEND_SETTING).await? {
-        Some(value) => serde_json::from_value::<SecretBackendConfig>(value).unwrap_or_default(),
-        None => SecretBackendConfig::default(),
-    };
-
-    Ok(matches!(
-        config,
-        SecretBackendConfig::HashiCorpVault(_)
-            | SecretBackendConfig::AzureKeyVault(_)
-            | SecretBackendConfig::AwsSecretsManager(_)
-    ))
-}
-
-/// Get a secret value using the configured backend
-///
-/// For database backend: decrypts using workspace key
-/// For vault backend (EE only): fetches from Vault directly
-pub async fn get_secret_value(
-    db: &DB,
-    workspace_id: &str,
-    path: &str,
-    encrypted_value: &str,
-) -> Result<String> {
-    let backend = get_secret_backend(db).await?;
-
-    match backend.backend_name() {
-        "database" => {
-            // Use existing database decryption
-            let mc = build_crypt(db, workspace_id).await?;
-            decrypt(&mc, encrypted_value.to_string()).map_err(|e| {
-                Error::internal_err(format!("Error decrypting variable {}: {}", path, e))
-            })
-        }
-        "hashicorp_vault" => {
-            // Fetch from Vault directly
-            backend.get_secret(workspace_id, path).await
-        }
-        "azure_key_vault" => backend.get_secret(workspace_id, path).await,
-        "aws_secrets_manager" => backend.get_secret(workspace_id, path).await,
-        _ => Err(Error::internal_err(format!(
-            "Unknown backend: {}",
-            backend.backend_name()
-        ))),
-    }
-}
-
 /// Store a secret value using the configured backend
 ///
 /// For database backend: encrypts using workspace key and returns encrypted value
@@ -412,26 +170,6 @@ pub async fn delete_secret_from_backend(db: &DB, workspace_id: &str, path: &str)
     }
 }
 
-/// Check if a value is stored in Vault (indicated by the $vault: prefix)
-pub fn is_vault_stored_value(value: &str) -> bool {
-    value.starts_with("$vault:")
-}
-
-/// Check if a value is stored in Azure Key Vault (indicated by the $azure_kv: prefix)
-pub fn is_azure_kv_stored_value(value: &str) -> bool {
-    value.starts_with("$azure_kv:")
-}
-
-/// Check if a value is stored in AWS Secrets Manager (indicated by the $aws_sm: prefix)
-pub fn is_aws_sm_stored_value(value: &str) -> bool {
-    value.starts_with("$aws_sm:")
-}
-
-/// Check if a value is stored in any external secret backend
-pub fn is_external_stored_value(value: &str) -> bool {
-    is_vault_stored_value(value) || is_azure_kv_stored_value(value) || is_aws_sm_stored_value(value)
-}
-
 /// Rename a secret in Vault when a variable path changes (EE only)
 #[cfg(not(all(feature = "private", feature = "enterprise")))]
 pub async fn rename_vault_secret(
diff --git a/backend/windmill-store/src/variables.rs b/backend/windmill-store/src/variables.rs
index 72ed20cb71..55047ec0c2 100644
--- a/backend/windmill-store/src/variables.rs
+++ b/backend/windmill-store/src/variables.rs
@@ -14,8 +14,8 @@ use windmill_common::db::DB;
 use windmill_common::workspaces::{check_deploy_rules, RuleCheckResult};
 
 use crate::secret_backend_ext::{
-    delete_secret_from_backend, get_secret_value, is_vault_stored_value, rename_vault_secret,
-    store_secret_value,
+    delete_secret_from_backend, get_secret_value, is_external_stored_value, is_vault_stored_value,
+    rename_vault_secret, store_secret_value,
 };
 use windmill_common::utils::{escape_ilike_pattern, BulkDeleteRequest};
 use windmill_common::webhook::{WebhookMessage, WebhookShared};
@@ -25,6 +25,7 @@ use axum::{
     routing::{delete, get, post},
     Json, Router,
 };
+use base64::{engine::general_purpose::STANDARD, Engine as _};
 use futures::future::try_join_all;
 use hyper::StatusCode;
 use serde_json::Value;
@@ -535,6 +536,35 @@ async fn check_path_conflict(db: &DB, w_id: &str, path: &str) -> Result<()> {
     return Ok(());
 }
 
+/// Reject a secret value flagged as already-encrypted (`already_encrypted=true`)
+/// that is not actually workspace-key ciphertext — e.g. plaintext mistakenly
+/// pushed as encrypted. Storing plaintext in the encrypted `value` column
+/// silently bricks the variable: every later read fails to decrypt it.
+///
+/// The check is purely structural and never decrypts, so it cannot act as a
+/// decryption/padding oracle for a caller who can write but not read secrets.
+/// `encrypt` (AES-256-CBC) always yields standard base64 decoding to a non-zero
+/// multiple of the 16-byte block size; anything else cannot be our ciphertext.
+/// Values stored by an external backend ($vault:/$aws_sm:/$azure_kv: markers)
+/// are not workspace ciphertext and are passed through untouched.
+fn validate_already_encrypted_secret(path: &str, value: &str) -> Result<()> {
+    if is_external_stored_value(value) {
+        return Ok(());
+    }
+    let looks_like_ciphertext = STANDARD
+        .decode(value)
+        .map(|bytes| !bytes.is_empty() && bytes.len() % 16 == 0)
+        .unwrap_or(false);
+    if !looks_like_ciphertext {
+        return Err(Error::BadRequest(format!(
+            "Variable {path} was sent as already-encrypted (already_encrypted=true) but its \
+             value is not valid workspace-encrypted ciphertext. To push a plaintext secret, \
+             send it without already_encrypted (CLI: use --plain-secrets) so it gets encrypted."
+        )));
+    }
+    Ok(())
+}
+
 async fn create_variable(
     authed: ApiAuthed,
     Extension(db): Extension<DB>,
@@ -585,6 +615,11 @@ async fn create_variable(
         // Use secret backend for encryption (supports both DB and Vault)
         store_secret_value(&db, &w_id, &variable.path, &plain).await?
     } else {
+        if variable.is_secret {
+            // already_encrypted == true: value is stored verbatim, so it must be
+            // ciphertext and not plaintext mislabeled as encrypted.
+            validate_already_encrypted_secret(&variable.path, &variable.value)?;
+        }
         variable.value
     };
 
@@ -1037,6 +1072,12 @@ async fn update_variable(
 
     let path = path.to_path();
     check_scopes(&authed, || format!("variables:write:{}", path))?;
+    // A rename moves the (possibly secret) variable to ns.path, so the
+    // destination must also be within the token's write scope, not just the
+    // source path.
+    if let Some(npath) = ns.path.as_deref() {
+        check_scopes(&authed, || format!("variables:write:{}", npath))?;
+    }
     let authed = maybe_refresh_folders(&path, &w_id, authed, &db).await;
 
     let mut sqlb = SqlBuilder::update_table("variable");
@@ -1076,6 +1117,11 @@ async fn update_variable(
             // Store at target_path (new path if renaming, otherwise current path)
             store_secret_value(&db, &w_id, target_path, &plain).await?
         } else {
+            if is_secret {
+                // already_encrypted == true: value is stored verbatim, so it must
+                // be ciphertext and not plaintext mislabeled as encrypted.
+                validate_already_encrypted_secret(target_path, &nvalue)?;
+            }
             nvalue
         };
         sqlb.set_str("value", &value);
@@ -1507,3 +1553,61 @@ pub async fn get_value_internal<'a>(
 
     Ok(r)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use magic_crypt::MagicCryptTrait;
+
+    #[test]
+    fn accepts_real_workspace_ciphertext() {
+        // The exact shape produced by `encrypt` (AES-256-CBC, base64).
+        let mc = magic_crypt::new_magic_crypt!("a-test-workspace-key", 256);
+        for plain in [
+            "",
+            "original-secret",
+            "some: plaintext\n",
+            "a".repeat(500).as_str(),
+        ] {
+            let ciphertext = mc.encrypt_str_to_base64(plain);
+            assert!(
+                validate_already_encrypted_secret("f/x/cfg", &ciphertext).is_ok(),
+                "should accept genuine ciphertext for plaintext {plain:?}: {ciphertext}"
+            );
+        }
+    }
+
+    #[test]
+    fn rejects_plaintext_mislabeled_as_encrypted() {
+        // Plaintext mislabeled as encrypted: storing it verbatim would make the
+        // variable undecryptable on every read, so it must be rejected.
+        for plaintext in [
+            "some: plaintext\n",
+            "original-secret",
+            "hunter2",
+            "{\"a\": 1}",
+            "not base64!!",
+            " leading-space",
+        ] {
+            assert!(
+                validate_already_encrypted_secret("f/x/cfg", plaintext).is_err(),
+                "should reject plaintext mislabeled as encrypted: {plaintext:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn rejects_empty_and_non_block_aligned() {
+        // Valid base64 but not a whole number of AES blocks -> cannot be our ciphertext.
+        assert!(validate_already_encrypted_secret("p", "").is_err());
+        assert!(validate_already_encrypted_secret("p", "dGVzdA==").is_err()); // "test" -> 4 bytes
+    }
+
+    #[test]
+    fn passes_through_external_backend_markers() {
+        // External secret backends store $-prefixed markers, not workspace ciphertext.
+        for marker in ["$vault:f/x/cfg", "$aws_sm:f/x/cfg", "$azure_kv:f/x/cfg"] {
+            assert!(validate_already_encrypted_secret("f/x/cfg", marker).is_ok());
+        }
+    }
+}
diff --git a/backend/windmill-trigger-http/src/handler.rs b/backend/windmill-trigger-http/src/handler.rs
index 7b617e1b8d..17321b7775 100644
--- a/backend/windmill-trigger-http/src/handler.rs
+++ b/backend/windmill-trigger-http/src/handler.rs
@@ -7,7 +7,7 @@ use axum::{extract::Path, routing::post, Extension, Json, Router};
 use http::StatusCode;
 use sqlx::PgConnection;
 use std::collections::HashSet;
-use windmill_api_auth::ApiAuthed;
+use windmill_api_auth::{check_scopes, ApiAuthed};
 use windmill_audit::{audit_oss::audit_log, ActionKind};
 use windmill_common::global_settings::HTTP_ROUTE_WORKSPACED_ROUTE;
 use windmill_common::{
@@ -262,6 +262,12 @@ pub async fn create_many_http_triggers(
     let mut route_path_keys = Vec::with_capacity(new_http_triggers.len());
 
     for new_http_trigger in new_http_triggers.iter() {
+        // Per-item write scope, matching the single-create handler. The bulk
+        // endpoint must not let a path-scoped token create triggers outside it.
+        check_scopes(&authed, || {
+            format!("http_triggers:write:{}", &new_http_trigger.base.path)
+        })?;
+
         handler
             .validate_new(&db, &w_id, &new_http_trigger.config)
             .await
@@ -373,7 +379,8 @@ impl TriggerCrud for HttpTrigger {
 
     const TABLE_NAME: &'static str = "http_trigger";
     const TRIGGER_TYPE: &'static str = "http";
-    const DRAFT_KIND: windmill_common::user_drafts::UserDraftItemKind = windmill_common::user_drafts::UserDraftItemKind::TriggerHttp;
+    const DRAFT_KIND: windmill_common::user_drafts::UserDraftItemKind =
+        windmill_common::user_drafts::UserDraftItemKind::TriggerHttp;
     const SUPPORTS_SERVER_STATE: bool = false;
     const SUPPORTS_TEST_CONNECTION: bool = false;
     const ROUTE_PREFIX: &'static str = "/http_triggers";
diff --git a/backend/windmill-trigger-websocket/src/handler.rs b/backend/windmill-trigger-websocket/src/handler.rs
index ed8e95b164..529e5902cc 100644
--- a/backend/windmill-trigger-websocket/src/handler.rs
+++ b/backend/windmill-trigger-websocket/src/handler.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use itertools::Itertools;
 use serde_json::value::RawValue;
 use sqlx::{types::Json as SqlxJson, PgConnection};
-use windmill_api_auth::ApiAuthed;
+use windmill_api_auth::{check_scopes, ApiAuthed};
 use windmill_common::DB;
 use windmill_common::{
     db::UserDB,
@@ -15,10 +15,39 @@ use windmill_git_sync::DeployedObject;
 use windmill_trigger::{Trigger, TriggerCrud, TriggerData};
 
 use super::{
-    get_url_from_runnable_value, proxy::connect_async_with_proxy, validate_websocket_url_for_ssrf,
-    TestWebsocketConfig, WebsocketConfig, WebsocketConfigRequest, WebsocketTrigger,
+    get_url_from_runnable_value, listener::InitialMessage, proxy::connect_async_with_proxy,
+    validate_websocket_url_for_ssrf, TestWebsocketConfig, WebsocketConfig, WebsocketConfigRequest,
+    WebsocketTrigger,
 };
 
+/// A websocket_triggers:write token can configure secondary runnables that the
+/// listener later executes under the trigger owner's identity: a `$flow:`/
+/// `$script:` URL resolver and `initial_messages` of kind `runnable_result`.
+/// That execution happens in a background task where the reconstructed authed is
+/// scopeless (so its check_scopes is a no-op), so enforce run scope here, at
+/// create/update time, against the API caller's token.
+fn check_secondary_runnable_scopes(
+    authed: &ApiAuthed,
+    config: &WebsocketConfigRequest,
+) -> Result<()> {
+    if let Some(rest) = config.url.strip_prefix("$flow:") {
+        check_scopes(authed, || format!("jobs:run:flows:{}", rest))?;
+    } else if let Some(rest) = config.url.strip_prefix("$script:") {
+        check_scopes(authed, || format!("jobs:run:scripts:{}", rest))?;
+    }
+    if let Some(messages) = config.initial_messages.as_ref() {
+        for msg in messages {
+            if let Ok(InitialMessage::RunnableResult { path, is_flow, .. }) =
+                serde_json::from_value::<InitialMessage>(msg.clone())
+            {
+                let kind = if is_flow { "flows" } else { "scripts" };
+                check_scopes(authed, || format!("jobs:run:{}:{}", kind, path))?;
+            }
+        }
+    }
+    Ok(())
+}
+
 #[async_trait]
 impl TriggerCrud for WebsocketTrigger {
     type TriggerConfig = WebsocketConfig;
@@ -101,6 +130,7 @@ impl TriggerCrud for WebsocketTrigger {
         w_id: &str,
         trigger: TriggerData<Self::TriggerConfigRequest>,
     ) -> Result<()> {
+        check_secondary_runnable_scopes(authed, &trigger.config)?;
         let resolved_edited_by = trigger.base.resolve_edited_by(authed);
         let resolved_permissioned_as = trigger.base.resolve_permissioned_as(authed);
         let filters = trigger
@@ -178,6 +208,7 @@ impl TriggerCrud for WebsocketTrigger {
         path: &str,
         trigger: TriggerData<Self::TriggerConfigRequest>,
     ) -> Result<()> {
+        check_secondary_runnable_scopes(authed, &trigger.config)?;
         let resolved_edited_by = trigger.base.resolve_edited_by(authed);
         let resolved_permissioned_as = trigger.base.resolve_permissioned_as(authed);
         let filters = trigger
diff --git a/backend/windmill-trigger-websocket/src/listener.rs b/backend/windmill-trigger-websocket/src/listener.rs
index 31e3f83995..e34fe6e4f6 100644
--- a/backend/windmill-trigger-websocket/src/listener.rs
+++ b/backend/windmill-trigger-websocket/src/listener.rs
@@ -11,7 +11,7 @@ use serde::Deserialize;
 use serde_json::value::RawValue;
 use std::{borrow::Cow, collections::HashMap, sync::Arc};
 use tokio::{net::TcpStream, sync::RwLock};
-use tokio_tungstenite::{tungstenite::Message, MaybeTlsStream, WebSocketStream};
+use tokio_tungstenite::{tungstenite, tungstenite::Message, MaybeTlsStream, WebSocketStream};
 use windmill_common::{
     error::{to_anyhow, Error, Result},
     jobs::JobTriggerKind,
@@ -22,13 +22,30 @@ use windmill_common::{
 };
 use windmill_queue::PushArgsOwned;
 use windmill_trigger::filter::{check_filters, Filter};
-use windmill_trigger::listener::ListeningTrigger;
+use windmill_trigger::listener::{update_rw_lock, ListeningTrigger};
 use windmill_trigger::trigger_helpers::{
     trigger_runnable, trigger_runnable_and_wait_for_raw_result,
     trigger_runnable_and_wait_for_raw_result_with_error_ctx, TriggerJobArgs,
 };
 use windmill_trigger::Listener;
 
+const MAX_CONNECT_ATTEMPTS: u32 = 5;
+
+/// Whether a failed WebSocket connect is worth retrying: network-level IO
+/// errors and HTTP 5xx/429 handshake responses are typically transient (edge
+/// proxies like Cloudflare return 502/520 sporadically), while other errors
+/// (bad URL, protocol mismatch, other 4xx) point at configuration and would
+/// fail identically on every attempt.
+fn is_transient_connect_error(err: &tungstenite::Error) -> bool {
+    match err {
+        tungstenite::Error::Io(_) => true,
+        tungstenite::Error::Http(resp) => {
+            resp.status().is_server_error() || resp.status().as_u16() == 429
+        }
+        _ => false,
+    }
+}
+
 async fn send_initial_messages(
     listening_trigger: &ListeningTrigger<WebsocketConfig>,
     writer: &mut SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>,
@@ -176,12 +193,50 @@ impl Listener for WebsocketTrigger {
 
         validate_websocket_url_for_ssrf(&connect_url).await?;
 
-        let connection = connect_async_with_proxy(&*connect_url)
-            .await
-            .map(|conn| Some(conn))
-            .map_err(|err| to_anyhow(err).into());
-
-        connection
+        // Gateway endpoints are often fronted by an edge proxy (e.g. Cloudflare)
+        // that sporadically answers the upgrade request with a transient 5xx
+        // instead of `101 Switching Protocols`, and a `get_consumer` error
+        // disables the trigger until a human re-enables it — so retry transient
+        // failures with backoff before giving up. The caller runs `loop_ping`
+        // concurrently so `last_server_ping` stays alive across the sleeps, and
+        // killpill cancels this future between awaits.
+        let mut attempt = 0;
+        loop {
+            attempt += 1;
+            match connect_async_with_proxy(&*connect_url).await {
+                Ok(conn) => return Ok(Some(conn)),
+                // Only retry in trigger mode: a failed connect there disables the
+                // trigger until a human re-enables it, while capture mode is an
+                // interactive test where instant feedback beats resilience (an
+                // `Io` error can also be a permanent misconfiguration, e.g. a
+                // typo'd host, which should surface immediately when iterating).
+                Err(err)
+                    if listening_trigger.trigger_mode
+                        && attempt < MAX_CONNECT_ATTEMPTS
+                        && is_transient_connect_error(&err) =>
+                {
+                    let delay_secs = 1u64 << attempt;
+                    tracing::warn!(
+                        "Transient error connecting to WebSocket for trigger {} (attempt {}/{}), retrying in {}s: {}",
+                        listening_trigger.path,
+                        attempt,
+                        MAX_CONNECT_ATTEMPTS,
+                        delay_secs,
+                        err
+                    );
+                    update_rw_lock(
+                        err_message.clone(),
+                        Some(format!(
+                            "Connection attempt {}/{} failed ({}), retrying in {}s...",
+                            attempt, MAX_CONNECT_ATTEMPTS, err, delay_secs
+                        )),
+                    )
+                    .await;
+                    tokio::time::sleep(std::time::Duration::from_secs(delay_secs)).await;
+                }
+                Err(err) => return Err(to_anyhow(err).into()),
+            }
+        }
     }
     async fn consume(
         &self,
@@ -509,7 +564,7 @@ impl Clone for ReturnMessageChannels {
 }
 
 #[derive(Debug, Deserialize)]
-enum InitialMessage {
+pub(crate) enum InitialMessage {
     #[serde(rename = "raw_message")]
     RawMessage(String),
     #[serde(rename = "runnable_result")]
diff --git a/backend/windmill-trigger-websocket/tests/connect_retry.rs b/backend/windmill-trigger-websocket/tests/connect_retry.rs
new file mode 100644
index 0000000000..2d21512692
--- /dev/null
+++ b/backend/windmill-trigger-websocket/tests/connect_retry.rs
@@ -0,0 +1,153 @@
+//! End-to-end tests for the websocket trigger connect-retry behavior: a mock
+//! TCP server rejects the websocket upgrade with a configurable HTTP status a
+//! number of times before completing a real handshake, and the tests assert
+//! which failures `get_consumer` retries.
+//!
+//! This lives in an integration-test binary (own process) because it sets
+//! ALLOW_PRIVATE_WEBSOCKET_URLS — the mock server listens on 127.0.0.1, which
+//! the SSRF check blocks — and that process-global env var must not leak into
+//! the crate's unit tests, which assert loopback URLs are rejected.
+
+use std::sync::{
+    atomic::{AtomicU32, Ordering},
+    Arc,
+};
+
+use tokio::{
+    io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
+    net::TcpListener,
+    sync::{broadcast, RwLock},
+};
+use windmill_trigger::{listener::ListeningTrigger, Listener};
+use windmill_trigger_websocket::{
+    WebsocketConfig, WebsocketTrigger, ALLOW_PRIVATE_WEBSOCKET_URLS_ENV,
+};
+
+/// Mock server: rejects the first `failures` upgrade requests with
+/// `status_line` and closes, then completes real websocket handshakes and
+/// parks the connection open. Returns the bound address and the
+/// connection-attempt counter.
+async fn mock_ws_server(
+    failures: u32,
+    status_line: &'static str,
+) -> (std::net::SocketAddr, Arc<AtomicU32>) {
+    let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
+    let addr = listener.local_addr().unwrap();
+    let attempts = Arc::new(AtomicU32::new(0));
+    let served = attempts.clone();
+    tokio::spawn(async move {
+        loop {
+            let (mut socket, _) = listener.accept().await.unwrap();
+            let n = served.fetch_add(1, Ordering::SeqCst);
+            if n < failures {
+                // Drain the request head, then reject the upgrade.
+                let mut reader = BufReader::new(&mut socket);
+                let mut line = String::new();
+                loop {
+                    line.clear();
+                    let read = reader.read_line(&mut line).await.unwrap_or(0);
+                    if read == 0 || line == "\r\n" {
+                        break;
+                    }
+                }
+                socket
+                    .write_all(
+                        format!("HTTP/1.1 {status_line}\r\nContent-Length: 0\r\n\r\n").as_bytes(),
+                    )
+                    .await
+                    .ok();
+            } else if let Ok(ws) = tokio_tungstenite::accept_async(socket).await {
+                tokio::spawn(async move {
+                    let _open = ws;
+                    std::future::pending::<()>().await
+                });
+            }
+        }
+    });
+    (addr, attempts)
+}
+
+fn trigger(url: String, trigger_mode: bool) -> ListeningTrigger<WebsocketConfig> {
+    ListeningTrigger {
+        path: "f/test/ws".to_string(),
+        is_flow: false,
+        workspace_id: "test".to_string(),
+        edited_by: "test".to_string(),
+        permissioned_as: "u/test".to_string(),
+        trigger_config: WebsocketConfig {
+            url,
+            filters: vec![],
+            filter_logic: "and".to_string(),
+            initial_messages: None,
+            url_runnable_args: None,
+            can_return_message: false,
+            can_return_error_result: false,
+            heartbeat: None,
+        },
+        script_path: "f/test/script".to_string(),
+        trigger_mode,
+        error_handling: None,
+        suspended_mode: false,
+    }
+}
+
+async fn get_consumer_result(
+    lt: &ListeningTrigger<WebsocketConfig>,
+    err_message: Arc<RwLock<Option<String>>>,
+) -> windmill_common::error::Result<Option<<WebsocketTrigger as Listener>::Consumer>> {
+    // The static-URL path of `get_consumer` never touches the DB; a lazy pool
+    // satisfies the signature without a running postgres.
+    let db: windmill_common::DB =
+        sqlx::Pool::connect_lazy("postgres://unused:unused@127.0.0.1:1/unused").unwrap();
+    let (_killpill_tx, killpill_rx) = broadcast::channel::<()>(1);
+    WebsocketTrigger
+        .get_consumer(&db, lt, err_message, killpill_rx)
+        .await
+}
+
+#[tokio::test]
+async fn transient_502s_are_retried_until_the_upgrade_succeeds() {
+    std::env::set_var(ALLOW_PRIVATE_WEBSOCKET_URLS_ENV, "true");
+    let (addr, attempts) = mock_ws_server(2, "502 Bad Gateway").await;
+    let lt = trigger(format!("ws://{addr}"), true);
+    let err_message = Arc::new(RwLock::new(None));
+
+    let consumer = get_consumer_result(&lt, err_message.clone())
+        .await
+        .expect("connect should succeed after retries");
+
+    assert!(consumer.is_some(), "expected an established connection");
+    assert_eq!(attempts.load(Ordering::SeqCst), 3);
+    // Retry progress was reported through the shared status lock.
+    let status = err_message.read().await.clone().unwrap();
+    assert!(status.contains("attempt 2/5"), "got status: {status}");
+    assert!(status.contains("502"), "got status: {status}");
+}
+
+#[tokio::test]
+async fn non_transient_http_errors_fail_on_the_first_attempt() {
+    std::env::set_var(ALLOW_PRIVATE_WEBSOCKET_URLS_ENV, "true");
+    let (addr, attempts) = mock_ws_server(u32::MAX, "404 Not Found").await;
+    let lt = trigger(format!("ws://{addr}"), true);
+
+    let err = get_consumer_result(&lt, Arc::new(RwLock::new(None)))
+        .await
+        .expect_err("a 404 upgrade response should not be retried");
+
+    assert!(err.to_string().contains("404"), "got error: {err}");
+    assert_eq!(attempts.load(Ordering::SeqCst), 1);
+}
+
+#[tokio::test]
+async fn capture_mode_fails_fast_even_on_transient_errors() {
+    std::env::set_var(ALLOW_PRIVATE_WEBSOCKET_URLS_ENV, "true");
+    let (addr, attempts) = mock_ws_server(u32::MAX, "502 Bad Gateway").await;
+    let lt = trigger(format!("ws://{addr}"), false);
+
+    let err = get_consumer_result(&lt, Arc::new(RwLock::new(None)))
+        .await
+        .expect_err("capture mode should surface the first failure immediately");
+
+    assert!(err.to_string().contains("502"), "got error: {err}");
+    assert_eq!(attempts.load(Ordering::SeqCst), 1);
+}
diff --git a/backend/windmill-trigger/src/global_handler.rs b/backend/windmill-trigger/src/global_handler.rs
index 3fbbcddd0e..98b689dda9 100644
--- a/backend/windmill-trigger/src/global_handler.rs
+++ b/backend/windmill-trigger/src/global_handler.rs
@@ -14,7 +14,7 @@ use windmill_api_jobs::execution::cancel_jobs;
 use windmill_common::{
     db::{UserDB, DB},
     error::{self, Error, Result},
-    jobs::JobTriggerKind,
+    jobs::{delete_jobs, JobTriggerKind},
     triggers::TriggerMetadata,
 };
 
@@ -262,9 +262,7 @@ pub async fn resume_suspended_trigger_jobs(
                 .execute(&mut *tx)
                 .await?;
 
-            sqlx::query!("DELETE FROM v2_job WHERE id = $1", job.id)
-                .execute(&mut *tx)
-                .await?;
+            delete_jobs(&mut *tx, &[job.id]).await?;
         }
     }
 
diff --git a/backend/windmill-trigger/src/handler.rs b/backend/windmill-trigger/src/handler.rs
index 65072bc9ab..ed3b89fc65 100644
--- a/backend/windmill-trigger/src/handler.rs
+++ b/backend/windmill-trigger/src/handler.rs
@@ -905,6 +905,26 @@ async fn delete_trigger<T: TriggerCrud>(
 
     tx.commit().await?;
 
+    // Reset the fork/parent workspace_diff tally for this path, exactly as
+    // create/update and every other kind's delete does. Without this a deleted
+    // trigger leaves its cached `has_changes=true` diff row behind: the compare
+    // trusts it (triggers aren't re-validated like scripts/flows), then drops it
+    // as it no longer exists in the table — a phantom "ahead" item that reads as
+    // "changes not visible to your user" and hides the deploy button, even for
+    // superadmins. Re-tallying sets has_changes=NULL so the next compare
+    // re-evaluates and corrects/removes the row.
+    handle_deployment_metadata(
+        &authed.email,
+        &authed.username,
+        &db,
+        &workspace_id,
+        T::get_deployed_object(path.to_string(), None),
+        Some(format!("{} '{}' deleted", T::DEPLOYMENT_NAME, path)),
+        true,
+        None,
+    )
+    .await?;
+
     // Trigger gone for everyone: wipe ALL users' drafts at this path; see scripts.rs.
     delete_all_drafts_for_path(&db, &workspace_id, T::user_draft_item_kind(), path).await?;
 
diff --git a/backend/windmill-trigger/src/trigger_helpers.rs b/backend/windmill-trigger/src/trigger_helpers.rs
index 44e5884420..1427f7f102 100644
--- a/backend/windmill-trigger/src/trigger_helpers.rs
+++ b/backend/windmill-trigger/src/trigger_helpers.rs
@@ -924,6 +924,8 @@ async fn trigger_script_with_retry_and_error_handler<'c>(
             path,
             hash: Some(hash),
             flow_version: None,
+            // Keep the flow path until native retry covers handler semantics.
+            language: None,
             args: HashMap::from(&push_args),
             retry,
             error_handler_path,
diff --git a/backend/windmill-types/src/flows.rs b/backend/windmill-types/src/flows.rs
index 2d1a538124..006185dbd9 100644
--- a/backend/windmill-types/src/flows.rs
+++ b/backend/windmill-types/src/flows.rs
@@ -155,6 +155,19 @@ fn validate_retry(retry: &Retry, module_id: &str) -> anyhow::Result<()> {
     Ok(())
 }
 
+/// Script/sub-flow step references must be workspace paths (`u/`, `f/`, `g/`) or a hub
+/// reference (`hub/`). Empty is tolerated for intermediate/incomplete steps. This blocks
+/// absolute or local filesystem paths (e.g. `/tmp/.../ops/scripts/...` baked in by a
+/// `wmill sync push` from a feature-branch checkout) from being persisted into a flow,
+/// where they silently mis-resolve to an unrelated script at runtime (#9751).
+fn is_workspace_runnable_path(path: &str) -> bool {
+    path.is_empty()
+        || path.starts_with("u/")
+        || path.starts_with("f/")
+        || path.starts_with("g/")
+        || path.starts_with("hub/")
+}
+
 fn validate_flow_value<'de, D>(deserializer: D) -> Result<Box<RawValue>, D::Error>
 where
     D: Deserializer<'de>,
@@ -164,21 +177,38 @@ where
     let flow_value: FlowValue = serde_json::from_str(raw_value.get())
         .map_err(|e| serde::de::Error::custom(format!("Invalid flow value: {}", e)))?;
 
-    FlowModule::traverse_modules(&flow_value.modules, &mut |module| {
+    let mut validate_module = |module: &FlowModule| -> anyhow::Result<()> {
         if let Some(ref retry) = module.retry {
             validate_retry(retry, &module.id)?;
         }
-        return Ok(());
-    })
-    .map_err(|e| serde::de::Error::custom(e.to_string()))?;
+        if let Ok(FlowModuleValue::Script { path, .. } | FlowModuleValue::Flow { path, .. }) =
+            module.get_value()
+        {
+            if !is_workspace_runnable_path(&path) {
+                return Err(anyhow::anyhow!(
+                    "step '{}' references '{}', which is not a workspace path (expected u/, \
+                     f/, g/ or hub/). Absolute or local filesystem paths are not allowed in \
+                     flow steps.",
+                    module.id,
+                    path
+                ));
+            }
+        }
+        Ok(())
+    };
 
-    if let Some(ref _failure_module) = flow_value.failure_module {
-        //add validation logic here for failure module
-    }
-
-    if let Some(ref _preprocessor_module) = flow_value.preprocessor_module {
-        //add validation logic here for preprocessor module
-    }
+    // The API is the authoritative guard (it can be called directly, bypassing the CLI), so
+    // it must cover every step that resolves a path: the main modules AND the failure /
+    // preprocessor modules (which can themselves be sub-flows/loops/branches).
+    let extra_modules: Vec<FlowModule> = flow_value
+        .failure_module
+        .iter()
+        .chain(flow_value.preprocessor_module.iter())
+        .map(|m| (**m).clone())
+        .collect();
+    FlowModule::traverse_modules(&flow_value.modules, &mut validate_module)
+        .and_then(|()| FlowModule::traverse_modules(&extra_modules, &mut validate_module))
+        .map_err(|e| serde::de::Error::custom(e.to_string()))?;
 
     Ok(raw_value)
 }
@@ -1228,6 +1258,108 @@ mod tests {
         assert_eq!(val.modules.len(), 1);
     }
 
+    #[test]
+    fn flow_rejects_absolute_step_path() {
+        // #9751: an absolute local path baked into a step must be rejected on deploy.
+        let bad = json!({
+            "path": "f/test/flow",
+            "summary": "",
+            "value": { "modules": [{
+                "id": "validate_onboard_target",
+                "value": {
+                    "type": "script",
+                    "path": "/tmp/tmp.X/f/ops/scripts/clean_device/pre_clean",
+                    "input_transforms": {}
+                }
+            }]}
+        });
+        let err = serde_json::from_value::<NewFlow>(bad)
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("not a workspace path"),
+            "unexpected error: {err}"
+        );
+        assert!(
+            err.contains("validate_onboard_target"),
+            "error should name the step: {err}"
+        );
+    }
+
+    #[test]
+    fn flow_rejects_absolute_step_path_in_nested_module() {
+        let bad = json!({
+            "path": "f/test/flow",
+            "summary": "",
+            "value": { "modules": [{
+                "id": "loop",
+                "value": {
+                    "type": "forloopflow",
+                    "iterator": {"type": "javascript", "expr": "[1]"},
+                    "modules": [{
+                        "id": "inner",
+                        "value": {"type": "script", "path": "/abs/path", "input_transforms": {}}
+                    }]
+                }
+            }]}
+        });
+        let err = serde_json::from_value::<NewFlow>(bad)
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("not a workspace path"),
+            "unexpected error: {err}"
+        );
+    }
+
+    #[test]
+    fn flow_rejects_absolute_path_in_failure_and_preprocessor_modules() {
+        for slot in ["failure_module", "preprocessor_module"] {
+            // Build the value with the slot as an explicit (interpolated) key.
+            let mut value = serde_json::Map::new();
+            value.insert("modules".to_string(), json!([]));
+            value.insert(
+                slot.to_string(),
+                json!({
+                    "id": slot,
+                    "value": {"type": "script", "path": "/abs/path", "input_transforms": {}}
+                }),
+            );
+            let bad = json!({ "path": "f/test/flow", "summary": "", "value": value });
+            let err = serde_json::from_value::<NewFlow>(bad)
+                .unwrap_err()
+                .to_string();
+            assert!(
+                err.contains("not a workspace path"),
+                "{slot} should be validated, got: {err}"
+            );
+        }
+    }
+
+    #[test]
+    fn flow_accepts_workspace_step_paths() {
+        for p in [
+            "f/ops/scripts/x",
+            "u/me/y",
+            "g/grp/z",
+            "hub/123/foo",
+            "", // tolerated for incomplete steps
+        ] {
+            let ok = json!({
+                "path": "f/test/flow",
+                "summary": "",
+                "value": { "modules": [{
+                    "id": "a",
+                    "value": {"type": "script", "path": p, "input_transforms": {}}
+                }]}
+            });
+            assert!(
+                serde_json::from_value::<NewFlow>(ok).is_ok(),
+                "path {p:?} should be accepted"
+            );
+        }
+    }
+
     #[test]
     fn ai_agent_omit_output_from_conversation_defaults_to_false() {
         let input = json!({
diff --git a/backend/windmill-types/src/jobs.rs b/backend/windmill-types/src/jobs.rs
index ac15430759..f9372b949d 100644
--- a/backend/windmill-types/src/jobs.rs
+++ b/backend/windmill-types/src/jobs.rs
@@ -46,6 +46,9 @@ pub enum JobTriggerKind {
     // A run dispatched because an upstream pipeline script wrote an asset
     // this runnable subscribes to via `// on s3://...` annotations.
     Asset,
+    // A run pushed by the pipeline freshness watchdog (EE) because the
+    // script's `// freshness` window elapsed without a successful run.
+    Freshness,
 }
 
 impl std::fmt::Display for JobTriggerKind {
@@ -68,6 +71,7 @@ impl std::fmt::Display for JobTriggerKind {
             JobTriggerKind::Github => "github",
             JobTriggerKind::CiTest => "ci_test",
             JobTriggerKind::Asset => "asset",
+            JobTriggerKind::Freshness => "freshness",
         };
         write!(f, "{}", kind)
     }
@@ -232,6 +236,14 @@ pub struct QueuedJob {
     pub runnable_settings_handle: Option<i64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub labels: Option<Vec<String>>,
+    // True when this job is a native retry attempt (has a native_retry_attempt
+    // marker). Lets the run-page chain distinguish real retries from other
+    // same-script children (e.g. WAC inline children). The list and single-job
+    // GET endpoints select it; `#[sqlx(default)]` lets any other query omit the
+    // column and default to None.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[sqlx(default)]
+    pub is_retry: Option<bool>,
 }
 
 impl QueuedJob {
@@ -307,6 +319,7 @@ impl Default for QueuedJob {
             preprocessed: None,
             runnable_settings_handle: None,
             labels: None,
+            is_retry: None,
         }
     }
 }
@@ -362,6 +375,14 @@ pub struct CompletedJob {
     pub labels: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub preprocessed: Option<bool>,
+    // True when this job is a native retry attempt (has a native_retry_attempt
+    // marker). Lets the run-page chain distinguish real retries from other
+    // same-script children (e.g. WAC inline children). The list and single-job
+    // GET endpoints select it; `#[sqlx(default)]` lets any other query omit the
+    // column and default to None.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[sqlx(default)]
+    pub is_retry: Option<bool>,
 }
 
 impl CompletedJob {
@@ -473,6 +494,10 @@ pub enum JobPayload {
         path: String,
         hash: Option<ScriptHash>,
         flow_version: Option<i64>,
+        // Set when wrapping a script (not a flow). Lets `push` materialize a
+        // bare-script-with-retry as a native retryable `Script` job instead of
+        // spawning a one-step flow.
+        language: Option<ScriptLang>,
         args: HashMap<String, Box<serde_json::value::RawValue>>,
         retry: Option<Retry>,
         error_handler_path: Option<String>,
diff --git a/backend/windmill-types/src/runnable_settings.rs b/backend/windmill-types/src/runnable_settings.rs
index dfff0df79e..ea0fd30dc0 100644
--- a/backend/windmill-types/src/runnable_settings.rs
+++ b/backend/windmill-types/src/runnable_settings.rs
@@ -1,9 +1,75 @@
 use serde::{Deserialize, Serialize};
 
+use crate::flows::{ConstantDelay, ExponentialDelay, Retry, RetryIf};
+
 #[derive(Deserialize, Clone, Copy, Serialize, Default, Hash)]
 pub struct RunnableSettings {
     pub debouncing_settings: Option<i64>,
     pub concurrency_settings: Option<i64>,
+    pub retry_settings: Option<i64>,
+}
+
+/// Flattened, dedup-friendly representation of a [`Retry`] policy. Native script
+/// retry stores the policy here (via `runnable_settings_handle`) instead of
+/// wrapping the script in a one-step flow.
+#[derive(
+    Debug, Default, Clone, Serialize, Deserialize, Hash, PartialEq, sqlx::FromRow, sqlx::Decode,
+)]
+pub struct RetrySettings {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub constant_attempts: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub constant_seconds: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exponential_attempts: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exponential_multiplier: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exponential_seconds: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub exponential_random_factor: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub retry_if_expr: Option<String>,
+}
+
+impl From<&Retry> for RetrySettings {
+    fn from(r: &Retry) -> Self {
+        Self {
+            // attempts are u32; saturate the narrowing to i32 (the seconds/
+            // multiplier/random_factor fields are u16/i8 and can't overflow i32).
+            constant_attempts: Some(r.constant.attempts.min(i32::MAX as u32) as i32),
+            constant_seconds: Some(r.constant.seconds as i32),
+            exponential_attempts: Some(r.exponential.attempts.min(i32::MAX as u32) as i32),
+            exponential_multiplier: Some(r.exponential.multiplier as i32),
+            exponential_seconds: Some(r.exponential.seconds as i32),
+            exponential_random_factor: r.exponential.random_factor.map(|x| x as i32),
+            retry_if_expr: r.retry_if.as_ref().map(|x| x.expr.clone()),
+        }
+    }
+}
+
+impl From<RetrySettings> for Retry {
+    fn from(s: RetrySettings) -> Self {
+        Retry {
+            constant: ConstantDelay {
+                attempts: s.constant_attempts.unwrap_or(0).max(0) as u32,
+                seconds: s.constant_seconds.unwrap_or(0).clamp(0, u16::MAX as i32) as u16,
+            },
+            exponential: ExponentialDelay {
+                attempts: s.exponential_attempts.unwrap_or(0).max(0) as u32,
+                // Mirror ExponentialDelay::default().multiplier (1) when absent.
+                multiplier: s
+                    .exponential_multiplier
+                    .unwrap_or(1)
+                    .clamp(0, u16::MAX as i32) as u16,
+                seconds: s.exponential_seconds.unwrap_or(0).clamp(0, u16::MAX as i32) as u16,
+                random_factor: s
+                    .exponential_random_factor
+                    .map(|x| x.clamp(i8::MIN as i32, i8::MAX as i32) as i8),
+            },
+            retry_if: s.retry_if_expr.map(|expr| RetryIf { expr }),
+        }
+    }
 }
 
 // TODO: Add validation logic.
@@ -111,3 +177,56 @@ impl From<ConcurrencySettingsWithCustom> for ConcurrencySettings {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::flows::{ConstantDelay, ExponentialDelay, RetryIf};
+
+    #[test]
+    fn retry_settings_roundtrips_retry() {
+        let cases = [
+            // constant only
+            Retry {
+                constant: ConstantDelay { attempts: 3, seconds: 5 },
+                exponential: ExponentialDelay::default(),
+                retry_if: None,
+            },
+            // exponential with jitter
+            Retry {
+                constant: ConstantDelay::default(),
+                exponential: ExponentialDelay {
+                    attempts: 4,
+                    multiplier: 2,
+                    seconds: 3,
+                    random_factor: Some(20),
+                },
+                retry_if: None,
+            },
+            // mixed + retry_if + max-ish narrowings
+            Retry {
+                constant: ConstantDelay { attempts: 1, seconds: u16::MAX },
+                exponential: ExponentialDelay {
+                    attempts: 2,
+                    multiplier: u16::MAX,
+                    seconds: 7,
+                    random_factor: Some(i8::MIN),
+                },
+                retry_if: Some(RetryIf { expr: "result.error.code != 'fatal'".to_string() }),
+            },
+        ];
+        for r in cases {
+            let back: Retry = RetrySettings::from(&r).into();
+            assert_eq!(back, r, "RetrySettings round-trip must preserve {r:?}");
+        }
+    }
+
+    #[test]
+    fn retry_settings_default_maps_to_default_exponential() {
+        // All-None settings must mirror ExponentialDelay::default() (multiplier 1),
+        // so a row with no exponential values doesn't decode to a 0 multiplier.
+        let r: Retry = RetrySettings::default().into();
+        assert_eq!(r, Retry::default());
+        assert_eq!(r.exponential.multiplier, 1);
+    }
+}
diff --git a/backend/windmill-worker/Cargo.toml b/backend/windmill-worker/Cargo.toml
index 14c3698162..14aeb734ed 100644
--- a/backend/windmill-worker/Cargo.toml
+++ b/backend/windmill-worker/Cargo.toml
@@ -21,6 +21,7 @@ bigquery = ["dep:gcp_auth"]
 benchmark = ["windmill-queue/benchmark", "windmill-common/benchmark"]
 parquet = ["windmill-common/parquet", "windmill-object-store/parquet"]
 flow_testing = []
+failpoints = []
 cloud = []
 sqlx = []
 deno_core = ["dep:windmill-runtime-nativets"]
@@ -38,7 +39,7 @@ java = ["dep:windmill-parser-java"]
 ruby = ["dep:windmill-parser-ruby"]
 rlang = ["dep:windmill-parser-r"]
 duckdb = ["dep:libloading"]
-quickjs = ["windmill-jseval/quickjs"]
+quickjs = ["windmill-jseval/quickjs", "windmill-queue/quickjs"]
 bedrock = ["windmill-ai/bedrock"]
 
 [dependencies]
@@ -114,7 +115,8 @@ hmac.workspace = true
 pem = { workspace = true, optional = true }
 rsa = { workspace = true, optional = true }
 urlencoding.workspace = true
-nix.workspace = true
+# `fs` adds flock(2) for the cross-process Python install lock (shared cache mounts)
+nix = { workspace = true, features = ["fs"] }
 bytes.workspace = true
 reqwest.workspace = true
 reqwest-middleware.workspace = true
diff --git a/backend/windmill-worker/loader.bun.windows.js b/backend/windmill-worker/loader.bun.windows.js
index e89b70c26c..a877266662 100644
--- a/backend/windmill-worker/loader.bun.windows.js
+++ b/backend/windmill-worker/loader.bun.windows.js
@@ -10,7 +10,7 @@ const p = {
   name: "windmill-relative-resolver",
   async setup(build) {
     const { readFileSync } = await import("fs");
-    const { resolve } = await import("node:path");
+    const { resolve, dirname } = await import("node:path");
 
     const base_internal_url = "BASE_INTERNAL_URL".replace(
       "localhost",
@@ -26,13 +26,27 @@ const p = {
     // Normalize path to forward slashes to match Bun's resolver output on Windows
     const cdirFwd = cdir.replace(/\\/g, "/");
     const cdirPosix = cdirFwd.replace(/^[a-zA-Z]:/, "");
+    // Match either an already-normalized `.ts` specifier OR an *extensionless*
+    // windmill relative/workspace import (`./`, `../`, `f/`, `/f/`, `u/`, `/u/`).
+    // The extensionless branch is essential on Windows: the `main.ts` onLoad that
+    // would rewrite `./mid` → `./mid.ts` only fires when its path filter matches
+    // bun's resolver output, and the 8.3 short-name (`RUNNER~1`) vs canonical-path
+    // mismatch makes that unreliable — so bare imports must be resolvable here
+    // directly rather than depending on the rewrite. The `(?!.*\.[A-Za-z0-9]+$)`
+    // guard keeps extension-bearing relative imports (a package's internal
+    // `./foo.js`/`./x.json` requires) OUT of this resolver so they fall through
+    // to bun's default resolver — a windmill script import is always `.ts` or
+    // extensionless. Bare npm specifiers (no `./` prefix, not `f/`/`u/`) never
+    // match either branch.
     const filterResolve = new RegExp(
-      `^(?!\\.\/main\\.ts)(?!\\.\/_wm_)(?!${cdirFwd}\/main\\.ts)(?!${cdirFwd}\/_wm_)(?!${cdirPosix}\/main\\.ts)(?!${cdirPosix}\/_wm_)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.mjs).*\\.ts$`
+      `^(?!\\.\/main\\.ts)(?!\\.\/_wm_)(?!${cdirFwd}\/main\\.ts)(?!${cdirFwd}\/_wm_)(?!${cdirPosix}\/main\\.ts)(?!${cdirPosix}\/_wm_)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.mjs)(?:.*\\.ts|(?:\\.\\.?\/|\/?f\/|\/?u\/)(?!.*\\.[A-Za-z0-9]+$).*)$`
     );
 
-    let cdirNodeModules = `${cdirFwd}/node_modules/`;
-
-    const filterLoad = new RegExp(`^${cdir}\/main\\.ts$`);
+    // Match the entry main.ts against bun's forward-slash resolver output on
+    // Windows — raw `cdir` carries backslashes that corrupt the regex, so the
+    // onLoad below would never fire and extensionless relative imports in
+    // main.ts would slip past filterResolve unrewritten.
+    const filterLoad = new RegExp(`^(?:${cdirFwd}|${cdirPosix})\/main\\.ts$`);
     const transpiler = new Bun.Transpiler({
       loader: "ts",
     });
@@ -117,16 +131,35 @@ const p = {
     // Resolve windmill script imports from the file namespace (e.g. from main.ts)
     build.onResolve({ filter: filterResolve }, (args) => {
       const importerFwd = args.importer?.replace(/\\/g, "/") ?? "";
-      if (importerFwd.startsWith(cdirNodeModules)) {
+      // Let bun natively resolve any import originating INSIDE a dependency, so a
+      // package's own relative requires (`./string.js`, extensionless `./foo`)
+      // are never sent to the windmill resolver. Match `/node_modules/` anywhere
+      // rather than a `cdir`-anchored prefix: on Windows `cdir` (canonical, e.g.
+      // `runneradmin`) and the importer path (8.3 short name, e.g. `RUNNER~1`)
+      // disagree, so a prefix check silently fails and dependency imports 404.
+      if (importerFwd.includes("/node_modules/")) {
         return undefined;
       }
-      // Check if the import resolves to a local module file (written by write_module_files)
+      // Check if the import resolves to a local module file (written by
+      // write_module_files, which can nest files in subdirectories). Resolve
+      // candidates against the importer's own directory — not the job root — so
+      // a subdir module importing a sibling (`dir/a.ts` → `./b`) finds
+      // `dir/b.ts` rather than a phantom `job_dir/b.ts`. For imports from
+      // `main.ts` the importer dir IS the job root, so behavior is unchanged.
+      // Module files carry a `.ts` extension, so also try the `.ts` variant of
+      // a bare relative import before falling through to the remote resolver.
       if (args.path.startsWith(".")) {
-        const cwdPath = resolve(cdir, args.path);
-        try {
-          readFileSync(cwdPath);
-          return { path: cwdPath };
-        } catch {}
+        const importerDir = args.importer ? dirname(args.importer) : cdir;
+        const candidates = args.path.endsWith(".ts")
+          ? [args.path]
+          : [args.path, args.path + ".ts"];
+        for (const candidate of candidates) {
+          const cwdPath = resolve(importerDir, candidate);
+          try {
+            readFileSync(cwdPath);
+            return { path: cwdPath };
+          } catch {}
+        }
       }
       const isMainTs =
         args.importer == "./main.ts" || importerFwd.endsWith("/main.ts");
diff --git a/backend/windmill-worker/src/agent_workers.rs b/backend/windmill-worker/src/agent_workers.rs
index 9bf0ea1834..5320c8ef6c 100644
--- a/backend/windmill-worker/src/agent_workers.rs
+++ b/backend/windmill-worker/src/agent_workers.rs
@@ -78,4 +78,22 @@ pub async fn get_datatable_resource_from_agent_http(
         .await
 }
 
+/// Record a materialization outcome from an agent worker (no direct DB) via the
+/// API, so `materialized_partition` state lands the same as on a Sql worker.
+// Only called from the duckdb executor, which is itself `#[cfg(feature = "duckdb")]`.
+#[cfg(feature = "duckdb")]
+pub async fn record_materialization_from_agent_http(
+    client: &HttpClient,
+    w_id: &str,
+    req: &windmill_common::materialization::RecordMaterializationRequest,
+) -> anyhow::Result<()> {
+    client
+        .post(
+            &format!("/api/w/{}/agent_workers/record_materialization", w_id),
+            None,
+            req,
+        )
+        .await
+}
+
 pub const UPDATE_PING_URL: &str = "/api/agent_workers/update_ping";
diff --git a/backend/windmill-worker/src/ai/tools.rs b/backend/windmill-worker/src/ai/tools.rs
index 612b534578..1e965ccb3f 100644
--- a/backend/windmill-worker/src/ai/tools.rs
+++ b/backend/windmill-worker/src/ai/tools.rs
@@ -198,6 +198,10 @@ async fn execute_mcp_tool_call(
         arguments: arguments.clone(),
     });
 
+    if let Some(parent_job) = ctx.parent_job {
+        update_flow_status_module_with_actions(ctx.db, parent_job, actions).await?;
+    }
+
     match tool_result {
         Ok(result) => {
             let result_str =
@@ -227,6 +231,10 @@ async fn execute_mcp_tool_call(
                 stream_event_processor.send(event, final_events_str).await?;
             }
 
+            if let Some(parent_job) = ctx.parent_job {
+                update_flow_status_module_with_actions_success(ctx.db, parent_job, true).await?;
+            }
+
             // Add tool message to conversation if chat_input_enabled
             let content = format!("Used {} tool", tool_call.function.name);
             add_tool_message_to_chat(ctx, None, &content, true).await;
@@ -259,6 +267,10 @@ async fn execute_mcp_tool_call(
                 stream_event_processor.send(event, final_events_str).await?;
             }
 
+            if let Some(parent_job) = ctx.parent_job {
+                update_flow_status_module_with_actions_success(ctx.db, parent_job, false).await?;
+            }
+
             // Add tool message to conversation if chat_input_enabled
             add_tool_message_to_chat(ctx, None, &error_msg, false).await;
         }
diff --git a/backend/windmill-worker/src/ai_executor.rs b/backend/windmill-worker/src/ai_executor.rs
index 2591cc6495..8c8c94c7e6 100644
--- a/backend/windmill-worker/src/ai_executor.rs
+++ b/backend/windmill-worker/src/ai_executor.rs
@@ -591,7 +591,7 @@ pub async fn run_agent(
     let api_key = credentials.api_key.as_deref().unwrap_or("");
 
     // Create the query builder for the provider
-    let query_builder = create_query_builder(&credentials);
+    let query_builder = create_query_builder(&credentials, args.provider.get_model());
 
     // Initialize messages
     let mut messages =
@@ -869,6 +869,7 @@ pub async fn run_agent(
                         tool_defs.as_deref(),
                         args.provider.get_model(),
                         args.temperature,
+                        args.provider.get_reasoning_effort(),
                         args.max_completion_tokens,
                         api_key,
                         region,
@@ -895,6 +896,7 @@ pub async fn run_agent(
                 tools: tool_defs.as_deref(),
                 model: args.provider.get_model(),
                 temperature: args.temperature,
+                reasoning_effort: args.provider.get_reasoning_effort(),
                 max_tokens: args.max_completion_tokens,
                 output_schema: args.output_schema.as_ref(),
                 output_type,
@@ -1028,6 +1030,11 @@ pub async fn run_agent(
                 // Add websearch tool message if websearch was used
                 if used_websearch {
                     actions.push(AgentAction::WebSearch {});
+                    if let Some(parent_job) = parent_job {
+                        update_flow_status_module_with_actions(db, parent_job, &actions).await?;
+                        update_flow_status_module_with_actions_success(db, parent_job, true)
+                            .await?;
+                    }
                     messages.push(OpenAIMessage {
                         role: "tool".to_string(),
                         content: Some(OpenAIContent::Text(
diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs
index dec0623e36..292246c62c 100644
--- a/backend/windmill-worker/src/ansible_executor.rs
+++ b/backend/windmill-worker/src/ansible_executor.rs
@@ -13,7 +13,7 @@ use tokio::process::Command;
 use uuid::Uuid;
 use windmill_common::{
     error,
-    git_sync_oss::prepend_token_to_github_url,
+    git_sync_oss::{prepend_token_to_github_url, sanitize_git_url},
     worker::{
         is_allowed_file_location, split_python_requirements, to_raw_value, write_file,
         write_file_at_user_defined_location, Connection, PyVAlias, WORKER_CONFIG,
@@ -847,7 +847,7 @@ pub async fn get_git_repo_full_head_commit_hash(
         .first()
         .ok_or(anyhow!(
             "The HEAD commit hash was not found for repo `{}`",
-            &repo.url
+            sanitize_git_url(&repo.url)
         ))?
         .split_whitespace()
         .next()
@@ -938,6 +938,143 @@ remote_tmp={job_dir}/.ansible/tmp
     Ok(())
 }
 
+/// Read a colon-separated path list (e.g. `roles_path`, `collections_path`) from
+/// the `[defaults]` section of an ansible.cfg. Returns the raw entries as written,
+/// unresolved. Deliberately minimal: no inline-comment or continuation handling,
+/// which ansible's configparser also does not apply to these values. `key` and `=`
+/// or `:` as the delimiter are both matched (Python configparser accepts either),
+/// with the value itself split on `:` (`os.pathsep`).
+fn parse_ansible_cfg_path_list(content: &str, key: &str) -> Option<Vec<String>> {
+    let mut in_defaults = false;
+    for line in content.lines() {
+        let trimmed = line.trim();
+        if trimmed.starts_with('[') && trimmed.ends_with(']') {
+            in_defaults = trimmed[1..trimmed.len() - 1]
+                .trim()
+                .eq_ignore_ascii_case("defaults");
+            continue;
+        }
+        if !in_defaults || trimmed.starts_with('#') || trimmed.starts_with(';') {
+            continue;
+        }
+        // configparser delimits key/value on the first `=` or `:`, whichever
+        // comes first; the remaining `:` in the value are path separators.
+        let sep = trimmed.find('=').into_iter().chain(trimmed.find(':')).min();
+        if let Some(sep) = sep {
+            let (k, rest) = trimmed.split_at(sep);
+            let v = &rest[1..];
+            if k.trim().eq_ignore_ascii_case(key) {
+                let entries: Vec<String> = v
+                    .split(':')
+                    .map(|s| s.trim())
+                    .filter(|s| !s.is_empty())
+                    .map(|s| s.to_string())
+                    .collect();
+                return (!entries.is_empty()).then_some(entries);
+            }
+        }
+    }
+    None
+}
+
+/// Prepend Windmill's dependency install dir to the repo cfg's declared path list.
+/// Relative entries from the repo cfg are resolved against `cfg_dir` to match how
+/// ansible resolves them relative to the config file's own directory.
+fn resolve_and_prepend_path(
+    base: String,
+    repo_entries: Option<Vec<String>>,
+    cfg_dir: &str,
+) -> String {
+    let mut paths = vec![base];
+    if let Some(entries) = repo_entries {
+        for e in entries {
+            if e.starts_with('/') || e.starts_with('~') {
+                paths.push(e);
+            } else {
+                paths.push(format!("{cfg_dir}/{e}"));
+            }
+        }
+    }
+    paths.join(":")
+}
+
+/// Build the environment overrides applied when delegating to a git repo that
+/// ships its own ansible.cfg. See the call site for the layering rationale.
+async fn build_ansible_cfg_override_envs(
+    cfg_path: &str,
+    job_dir: &str,
+    vault_password_file_exists: bool,
+    reqs: Option<&AnsibleRequirements>,
+) -> error::Result<Vec<(String, String)>> {
+    let mut envs = vec![
+        ("ANSIBLE_CONFIG".to_string(), cfg_path.to_string()),
+        // Runtime-bound: reference the ephemeral job dir, cannot be set statically.
+        ("ANSIBLE_HOME".to_string(), format!("{job_dir}/.ansible")),
+        (
+            "ANSIBLE_LOCAL_TEMP".to_string(),
+            format!("{job_dir}/.ansible/tmp"),
+        ),
+        (
+            "ANSIBLE_REMOTE_TEMP".to_string(),
+            format!("{job_dir}/.ansible/tmp"),
+        ),
+    ];
+
+    // Vault: Windmill manages the secret, so its config wins over the repo cfg.
+    if vault_password_file_exists {
+        envs.push((
+            "ANSIBLE_VAULT_PASSWORD_FILE".to_string(),
+            format!("{job_dir}/{WINDMILL_ANSIBLE_PASSWORD_FILENAME}"),
+        ));
+    }
+    if let Some(vault_ids) = reqs.map(|r| &r.vault_id).filter(|v| !v.is_empty()) {
+        // Defense in depth: entries are validated at parse time, but re-check
+        // here since they are interpolated raw into the env value.
+        for vault_id in vault_ids {
+            validate_vault_id(vault_id)?;
+        }
+        envs.push((
+            "ANSIBLE_VAULT_IDENTITY_LIST".to_string(),
+            vault_ids.join(","),
+        ));
+    }
+
+    // Dependency search paths: additive. Windmill installs galaxy roles into
+    // `{job_dir}/roles` and collections into `{job_dir}`; prepend those to the
+    // repo cfg's declared paths so both Windmill-installed and repo deps resolve.
+    let cfg_dir = std::path::Path::new(cfg_path)
+        .parent()
+        .and_then(|p| p.to_str())
+        .unwrap_or(job_dir);
+    let cfg_content = tokio::fs::read_to_string(cfg_path).await.map_err(|e| {
+        windmill_common::error::Error::internal_err(format!(
+            "Failed to read delegated ansible.cfg at `{cfg_path}`: {e}"
+        ))
+    })?;
+
+    envs.push((
+        "ANSIBLE_ROLES_PATH".to_string(),
+        resolve_and_prepend_path(
+            format!("{job_dir}/roles"),
+            parse_ansible_cfg_path_list(&cfg_content, "roles_path"),
+            cfg_dir,
+        ),
+    ));
+    envs.push((
+        "ANSIBLE_COLLECTIONS_PATH".to_string(),
+        resolve_and_prepend_path(
+            job_dir.to_string(),
+            // Also probe the deprecated plural ini alias; env vars replace (not
+            // merge) the cfg value, so a repo using it would otherwise be dropped.
+            parse_ansible_cfg_path_list(&cfg_content, "collections_path")
+                .or_else(|| parse_ansible_cfg_path_list(&cfg_content, "collections_paths")),
+            cfg_dir,
+        ),
+    ));
+
+    Ok(envs)
+}
+
 pub async fn get_git_ssh_cmd(
     reqs: &AnsibleRequirements,
     job_dir: &str,
@@ -1136,6 +1273,9 @@ pub async fn handle_ansible_job(
 
     let mut nsjail_extra_mounts = vec![];
     let mut playbook_override = None;
+    // Absolute path of a repo-provided `ansible.cfg` to use as the effective
+    // config, set when `delegate_to_git_repo.ansible_cfg` is provided.
+    let mut ansible_config_override: Option<String> = None;
 
     if let Some(r) = reqs.as_ref() {
         nsjail_extra_mounts = create_file_resources(
@@ -1254,7 +1394,12 @@ pub async fn handle_ansible_job(
                     git_ssh_cmd,
                 )
                 .await
-                .map_err(|e| anyhow!("Failed to clone git repo `{}`: {e}", repo.url))?;
+                .map_err(|e| {
+                    anyhow!(
+                        "Failed to clone git repo `{}`: {e}",
+                        sanitize_git_url(&repo.url)
+                    )
+                })?;
             } else {
                 clone_repo(
                     &repo,
@@ -1269,7 +1414,12 @@ pub async fn handle_ansible_job(
                     git_ssh_cmd,
                 )
                 .await
-                .map_err(|e| anyhow!("Failed to clone git repo `{}`: {e}", repo.url))?;
+                .map_err(|e| {
+                    anyhow!(
+                        "Failed to clone git repo `{}`: {e}",
+                        sanitize_git_url(&repo.url)
+                    )
+                })?;
             }
 
             append_logs(
@@ -1291,6 +1441,23 @@ pub async fn handle_ansible_job(
                 inventories.push(format!("{}/{}", &repo.target_path, inv));
             }
 
+            if let Some(cfg_rel) = delegated_git_repo.ansible_cfg.as_ref() {
+                let cfg_rel = interpolate_template(
+                    cfg_rel,
+                    interpolated_args.as_ref(),
+                    "delegate_to_git_repo.ansible_cfg",
+                )?;
+                validate_relative_path(&cfg_rel, "delegate_to_git_repo.ansible_cfg")?;
+                let cfg_path = format!("{}/{}/{}", job_dir, &repo.target_path, cfg_rel);
+                if !tokio::fs::try_exists(&cfg_path).await.unwrap_or(false) {
+                    return Err(windmill_common::error::Error::BadRequest(format!(
+                        "delegate_to_git_repo.ansible_cfg: no ansible.cfg found in the cloned repo at `{}/{}`",
+                        &repo.target_path, cfg_rel
+                    )));
+                }
+                ansible_config_override = Some(cfg_path);
+            }
+
             if delegated_git_repo.install_requirements {
                 install_requirements_from_cloned_repo(
                     &repo.target_path,
@@ -1316,7 +1483,7 @@ pub async fn handle_ansible_job(
             append_logs(
                 &job.id,
                 &job.workspace_id,
-                format!("\nCloning {}...\n", &repo.url),
+                format!("\nCloning {}...\n", sanitize_git_url(&repo.url)),
                 conn,
             )
             .await;
@@ -1338,13 +1505,18 @@ pub async fn handle_ansible_job(
                     git_ssh_cmd,
                 )
                 .await
-                .map_err(|e| anyhow!("Failed to clone git repo `{}`: {e}", repo.url))?;
+                .map_err(|e| {
+                    anyhow!(
+                        "Failed to clone git repo `{}`: {e}",
+                        sanitize_git_url(&repo.url)
+                    )
+                })?;
             } else {
                 if req_lockfiles.is_some() {
                     append_logs(
                         &job.id,
                         &job.workspace_id,
-                        format!("Warning: `{}` is using latest commit because the lockfile didn't store a commit hash for this repo. Updates to the repo could break the deployed playbook.\n", &repo.url),
+                        format!("Warning: `{}` is using latest commit because the lockfile didn't store a commit hash for this repo. Updates to the repo could break the deployed playbook.\n", sanitize_git_url(&repo.url)),
                         conn,
                     )
                     .await;
@@ -1362,13 +1534,22 @@ pub async fn handle_ansible_job(
                     git_ssh_cmd,
                 )
                 .await
-                .map_err(|e| anyhow!("Failed to clone git repo `{}`: {e}", repo.url))?;
+                .map_err(|e| {
+                    anyhow!(
+                        "Failed to clone git repo `{}`: {e}",
+                        sanitize_git_url(&repo.url)
+                    )
+                })?;
             }
 
             append_logs(
                 &job.id,
                 &job.workspace_id,
-                format!("Cloned {} into {}\n", &repo.url, &repo.target_path),
+                format!(
+                    "Cloned {} into {}\n",
+                    sanitize_git_url(&repo.url),
+                    &repo.target_path
+                ),
                 conn,
             )
             .await;
@@ -1426,6 +1607,32 @@ pub async fn handle_ansible_job(
 
     create_ansible_cfg(reqs.as_ref(), job_dir, vault_password_file_exists)?;
 
+    // When the run delegates to a git repo that ships its own ansible.cfg, that
+    // file becomes the effective config (ansible loads exactly one config file and
+    // does not merge). These env vars layer Windmill's runtime-bound settings back
+    // on top — env vars outrank ansible.cfg. Only applied on the non-sandboxed
+    // path: git-repo delegation clones into `job_dir` which the nsjail profile does
+    // not mount, so it already requires DISABLE_NSJAIL.
+    let ansible_env_overrides = match ansible_config_override.as_ref() {
+        Some(cfg_path) => {
+            if is_sandboxing_enabled() {
+                tracing::warn!(
+                    "delegate_to_git_repo.ansible_cfg is set but sandboxing is enabled; \
+                     git-repo delegation requires DISABLE_NSJAIL, the ansible.cfg override \
+                     will not take effect"
+                );
+            }
+            build_ansible_cfg_override_envs(
+                cfg_path,
+                job_dir,
+                vault_password_file_exists,
+                reqs.as_ref(),
+            )
+            .await?
+        }
+        None => vec![],
+    };
+
     let mut reserved_variables =
         get_reserved_variables(job, &client.token, conn, parent_runnable_path).await?;
     let additional_python_paths_folders = additional_python_paths.join(":");
@@ -1536,6 +1743,7 @@ fi
             .env("TZ", TZ_ENV.as_str())
             .env("BASE_INTERNAL_URL", base_internal_url)
             .env("HOME", HOME_ENV.as_str())
+            .envs(ansible_env_overrides)
             .stdin(Stdio::null())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
@@ -1832,4 +2040,230 @@ mod tests {
         assert!(create_ansible_cfg(Some(&reqs), job_dir, false).is_err());
         assert!(!dir.path().join("ansible.cfg").exists());
     }
+
+    #[test]
+    fn test_parse_ansible_cfg_path_list() {
+        let cfg = "\
+[defaults]
+roles_path = roles:extra/roles
+collections_path=/opt/collections
+host_key_checking = False
+
+[inventory]
+roles_path = ignored/section
+";
+        assert_eq!(
+            parse_ansible_cfg_path_list(cfg, "roles_path"),
+            Some(vec!["roles".to_string(), "extra/roles".to_string()])
+        );
+        assert_eq!(
+            parse_ansible_cfg_path_list(cfg, "collections_path"),
+            Some(vec!["/opt/collections".to_string()])
+        );
+        // Keys only in another section are not picked up.
+        assert_eq!(parse_ansible_cfg_path_list(cfg, "library"), None);
+    }
+
+    #[test]
+    fn test_parse_ansible_cfg_path_list_ignores_comments() {
+        let cfg = "\
+[defaults]
+# roles_path = commented
+; roles_path = also_commented
+";
+        assert_eq!(parse_ansible_cfg_path_list(cfg, "roles_path"), None);
+    }
+
+    #[test]
+    fn test_parse_ansible_cfg_path_list_colon_delimiter() {
+        // configparser accepts `:` as a key/value delimiter, and the value can
+        // itself be a `:`-separated list.
+        let cfg = "\
+[defaults]
+roles_path: my_roles
+collections_path : a/col:b/col
+";
+        assert_eq!(
+            parse_ansible_cfg_path_list(cfg, "roles_path"),
+            Some(vec!["my_roles".to_string()])
+        );
+        assert_eq!(
+            parse_ansible_cfg_path_list(cfg, "collections_path"),
+            Some(vec!["a/col".to_string(), "b/col".to_string()])
+        );
+    }
+
+    #[test]
+    fn test_resolve_and_prepend_path() {
+        // No repo entries: only Windmill's install dir.
+        assert_eq!(
+            resolve_and_prepend_path("/job/roles".to_string(), None, "/job/repo"),
+            "/job/roles"
+        );
+        // Relative repo entries resolve against the cfg dir; absolute/~ kept as-is.
+        assert_eq!(
+            resolve_and_prepend_path(
+                "/job/roles".to_string(),
+                Some(vec![
+                    "roles".to_string(),
+                    "/abs/roles".to_string(),
+                    "~/r".to_string()
+                ]),
+                "/job/repo/config"
+            ),
+            "/job/roles:/job/repo/config/roles:/abs/roles:~/r"
+        );
+    }
+
+    fn ansible_playbook_available() -> bool {
+        std::process::Command::new("ansible-playbook")
+            .arg("--version")
+            .output()
+            .is_ok()
+    }
+
+    /// End-to-end: with a delegated repo that ships its own `ansible.cfg` pointing
+    /// `roles_path` at an in-repo directory, the override env vars must make the
+    /// real `ansible-playbook` resolve a role it otherwise cannot. Requires the
+    /// `ansible-playbook` binary; self-skips when absent (e.g. standard CI). Run on
+    /// a worker devbox with `cargo test -p windmill-worker --features python`.
+    #[tokio::test]
+    async fn test_ansible_cfg_override_resolves_repo_roles_e2e() {
+        if !ansible_playbook_available() {
+            eprintln!(
+                "SKIP test_ansible_cfg_override_resolves_repo_roles_e2e: ansible-playbook not found on PATH"
+            );
+            return;
+        }
+
+        let dir = tempfile::tempdir().unwrap();
+        let job_dir = dir.path().to_str().unwrap();
+        let repo = dir.path().join(DELEGATE_GIT_REPO_TARGET);
+        let role_tasks = repo.join("my_roles/greet/tasks");
+        std::fs::create_dir_all(&role_tasks).unwrap();
+
+        std::fs::write(
+            repo.join("ansible.cfg"),
+            "[defaults]\nroles_path = my_roles\n",
+        )
+        .unwrap();
+        std::fs::write(
+            role_tasks.join("main.yml"),
+            "- debug:\n    msg: \"hello from greet role\"\n",
+        )
+        .unwrap();
+        let play = "- hosts: localhost\n  connection: local\n  gather_facts: false\n  roles:\n    - greet\n";
+        std::fs::write(repo.join("play.yml"), play).unwrap();
+
+        // Windmill's own generated cfg (the negative-control config that exists today).
+        create_ansible_cfg(None, job_dir, false).unwrap();
+
+        let playbook = format!("{DELEGATE_GIT_REPO_TARGET}/play.yml");
+        let run = |envs: Vec<(String, String)>| {
+            std::process::Command::new("ansible-playbook")
+                .arg(&playbook)
+                .current_dir(job_dir)
+                .envs(envs)
+                .output()
+                .unwrap()
+        };
+
+        // Negative control: today's behavior (Windmill cfg via cwd, no override) —
+        // the role lives in the repo subdir and is not found.
+        let cfg_path = repo.join("ansible.cfg");
+        let before = run(vec![]);
+        assert!(
+            !before.status.success(),
+            "without the override the repo role must NOT resolve; stdout={}",
+            String::from_utf8_lossy(&before.stdout)
+        );
+
+        // With the override: ANSIBLE_CONFIG points at the repo cfg and roles_path
+        // is honored, so the role runs.
+        let envs =
+            build_ansible_cfg_override_envs(cfg_path.to_str().unwrap(), job_dir, false, None)
+                .await
+                .unwrap();
+        let after = run(envs);
+        let stdout = String::from_utf8_lossy(&after.stdout);
+        assert!(
+            after.status.success() && stdout.contains("hello from greet role"),
+            "with the override the repo role must resolve; status={:?} stdout={stdout} stderr={}",
+            after.status,
+            String::from_utf8_lossy(&after.stderr)
+        );
+    }
+
+    #[tokio::test]
+    async fn test_build_ansible_cfg_override_envs() {
+        let dir = tempfile::tempdir().unwrap();
+        let job_dir = dir.path().to_str().unwrap();
+        let repo_dir = dir.path().join("delegate_git_repository");
+        std::fs::create_dir_all(&repo_dir).unwrap();
+        let cfg_path = repo_dir.join("ansible.cfg");
+        std::fs::write(&cfg_path, "[defaults]\nroles_path = my_roles\n").unwrap();
+        let cfg_path = cfg_path.to_str().unwrap();
+
+        let reqs = AnsibleRequirements {
+            vault_id: vec!["dev@vault_pass.txt".to_string()],
+            ..Default::default()
+        };
+        let envs = build_ansible_cfg_override_envs(cfg_path, job_dir, true, Some(&reqs))
+            .await
+            .unwrap();
+        let map: std::collections::HashMap<_, _> = envs.into_iter().collect();
+
+        assert_eq!(
+            map.get("ANSIBLE_CONFIG").map(|s| s.as_str()),
+            Some(cfg_path)
+        );
+        assert_eq!(
+            map.get("ANSIBLE_HOME"),
+            Some(&format!("{job_dir}/.ansible"))
+        );
+        assert_eq!(
+            map.get("ANSIBLE_VAULT_PASSWORD_FILE"),
+            Some(&format!("{job_dir}/{WINDMILL_ANSIBLE_PASSWORD_FILENAME}"))
+        );
+        assert_eq!(
+            map.get("ANSIBLE_VAULT_IDENTITY_LIST").map(|s| s.as_str()),
+            Some("dev@vault_pass.txt")
+        );
+        // Windmill's `{job_dir}/roles` is prepended to the repo cfg's own path,
+        // which is resolved against the cfg directory.
+        assert_eq!(
+            map.get("ANSIBLE_ROLES_PATH"),
+            Some(&format!(
+                "{job_dir}/roles:{}/my_roles",
+                repo_dir.to_str().unwrap()
+            ))
+        );
+        // No collections_path in the repo cfg → only Windmill's job dir.
+        assert_eq!(
+            map.get("ANSIBLE_COLLECTIONS_PATH").map(|s| s.as_str()),
+            Some(job_dir)
+        );
+    }
+
+    #[tokio::test]
+    async fn test_build_ansible_cfg_override_envs_collections_paths_alias() {
+        let dir = tempfile::tempdir().unwrap();
+        let job_dir = dir.path().to_str().unwrap();
+        let repo_dir = dir.path().join("delegate_git_repository");
+        std::fs::create_dir_all(&repo_dir).unwrap();
+        let cfg_path = repo_dir.join("ansible.cfg");
+        // Deprecated plural alias must still be picked up so the repo's collections
+        // are not silently dropped when the env override replaces the cfg value.
+        std::fs::write(&cfg_path, "[defaults]\ncollections_paths = my_cols\n").unwrap();
+
+        let envs =
+            build_ansible_cfg_override_envs(cfg_path.to_str().unwrap(), job_dir, false, None)
+                .await
+                .unwrap();
+        let map: std::collections::HashMap<_, _> = envs.into_iter().collect();
+        assert_eq!(
+            map.get("ANSIBLE_COLLECTIONS_PATH"),
+            Some(&format!("{job_dir}:{}/my_cols", repo_dir.to_str().unwrap()))
+        );
+    }
 }
diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index 1e4f4aafd6..f6b093f766 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -1,6 +1,11 @@
 #[cfg(feature = "deno_core")]
 use std::time::Instant;
-use std::{collections::HashMap, fs, process::Stdio};
+use std::{
+    collections::{HashMap, HashSet},
+    fs,
+    process::Stdio,
+    sync::Arc,
+};
 
 use base64::Engine;
 use itertools::Itertools;
@@ -27,9 +32,10 @@ use crate::{
     NSJAIL_AVAILABLE, NSJAIL_PATH, PATH_ENV, PROXY_ENVS, TRACING_PROXY_CA_CERT_PATH, TZ_ENV,
 };
 use windmill_common::{
+    cache,
     client::AuthedClient,
     jobs::JobKind,
-    scripts::{id_to_codebase_info, CodebaseInfo, ScriptLang},
+    scripts::{id_to_codebase_info, CodebaseInfo, ScriptHash, ScriptLang},
     utils::WarnAfterExt,
     workspace_dependencies::WorkspaceDependenciesPrefetched,
 };
@@ -44,7 +50,6 @@ use tokio::io::AsyncReadExt;
 
 use windmill_common::{
     error::{self, Result},
-    get_latest_hash_for_path,
     worker::{write_file, Connection, DISABLE_BUNDLING},
     DB,
 };
@@ -1242,16 +1247,101 @@ pub fn ensure_bundle_output_exists(bundle_path: &str) -> Result<()> {
 
 pub const BUN_BUNDLE_OBJECT_STORE_PREFIX: &str = "bun_bundle/";
 
-async fn get_script_import_updated_at(db: &DB, w_id: &str, script_path: &str) -> Result<String> {
-    let script_hash = get_latest_hash_for_path(db, w_id, script_path, false).await?;
-    let last_updated_at = sqlx::query_scalar!(
-        "SELECT created_at FROM script WHERE workspace_id = $1 AND hash = $2",
-        w_id,
-        script_hash.0 .0
+// A script version's relative-import list never changes (content is immutable
+// per hash), so parses are memoized without any invalidation.
+lazy_static::lazy_static! {
+    static ref RELATIVE_IMPORTS_PER_HASH: quick_cache::sync::Cache<i64, Arc<Vec<String>>> =
+        quick_cache::sync::Cache::new(1000);
+}
+
+const MAX_TRANSITIVE_IMPORT_PATHS: usize = 256;
+
+/// `(path, latest hash)` for the whole transitive closure of relative imports
+/// of `inner_content` — the set of scripts whose code gets inlined into the
+/// bundle, so all of them must key the bundle cache. Resolution goes through
+/// `IMPORTED_SCRIPT_HASH_CACHE` (notify-evicted, 60s TTL fallback, same
+/// version-selection predicate as the loader's content endpoint) and the
+/// per-hash script/parse caches, so steady state costs no DB queries.
+async fn collect_transitive_import_versions(
+    db: &DB,
+    w_id: &str,
+    script_path: &str,
+    inner_content: &str,
+) -> Vec<(String, i64)> {
+    let conn = Connection::from(db.clone());
+    let mut queue = crate::worker_lockfiles::extract_relative_imports(
+        inner_content,
+        script_path,
+        &Some(ScriptLang::Bun),
     )
-    .fetch_one(db)
-    .await?;
-    Ok(last_updated_at.to_string())
+    .unwrap_or_default();
+    let mut visited: HashSet<String> = HashSet::new();
+    let mut versions: Vec<(String, i64)> = vec![];
+    while let Some(path) = queue.pop() {
+        if !visited.insert(path.clone()) {
+            continue;
+        }
+        if visited.len() > MAX_TRANSITIVE_IMPORT_PATHS {
+            tracing::warn!(
+                "transitive relative-import closure of {script_path} exceeds \
+                {MAX_TRANSITIVE_IMPORT_PATHS} scripts; bundle cache key covers only the first \
+                {MAX_TRANSITIVE_IMPORT_PATHS}"
+            );
+            break;
+        }
+        let hash = match windmill_common::get_latest_script_hash_for_import_cached(db, w_id, &path)
+            .await
+        {
+            Ok(Some(hash)) => hash,
+            // Not a deployed script at this path (deleted, or not a script):
+            // excluded from the key, matching what the bundler can inline.
+            Ok(None) => continue,
+            Err(e) => {
+                tracing::warn!(
+                    "could not resolve import {path} while computing bundle cache key for \
+                    {script_path}: {e:#}"
+                );
+                continue;
+            }
+        };
+        versions.push((path.clone(), hash));
+        let imports = match RELATIVE_IMPORTS_PER_HASH.get(&hash) {
+            Some(imports) => imports,
+            None => match cache::script::fetch(&conn, ScriptHash(hash)).await {
+                Ok((data, meta)) => {
+                    let imports = Arc::new(match meta.language {
+                        Some(ScriptLang::Bun)
+                        | Some(ScriptLang::Bunnative)
+                        | Some(ScriptLang::Deno) => {
+                            crate::worker_lockfiles::extract_relative_imports(
+                                &data.code,
+                                &path,
+                                &meta.language,
+                            )
+                            .unwrap_or_default()
+                        }
+                        _ => vec![],
+                    });
+                    RELATIVE_IMPORTS_PER_HASH.insert(hash, imports.clone());
+                    imports
+                }
+                // A fetch error is transient, not a property of the (immutable)
+                // content — memoizing it would drop this subtree from the key
+                // until worker restart. Skip caching and retry next run.
+                Err(e) => {
+                    tracing::warn!(
+                        "could not fetch import {path} (hash {hash}) while computing bundle \
+                        cache key for {script_path}: {e:#}"
+                    );
+                    Arc::new(vec![])
+                }
+            },
+        };
+        queue.extend(imports.iter().cloned());
+    }
+    // deterministic key regardless of traversal order
+    versions.sort();
+    versions
 }
 
 pub async fn compute_bundle_local_and_remote_path(
@@ -1265,16 +1355,13 @@ pub async fn compute_bundle_local_and_remote_path(
     let mut input_src = format!("{inner_content}{lock}",);
 
     if let Some(db) = db {
-        let relative_imports = crate::worker_lockfiles::extract_relative_imports(
-            &inner_content,
-            script_path,
-            &Some(ScriptLang::Bun),
-        );
-        for path in relative_imports.unwrap_or_default() {
-            if let Ok(updated_at) = get_script_import_updated_at(&db, w_id, &path).await {
-                input_src.push_str(&path);
-                input_src.push_str(&updated_at.to_string());
-            }
+        // The bundle inlines the whole transitive relative-import closure, so a
+        // new deployed version of ANY script in it must change the key.
+        for (path, hash) in
+            collect_transitive_import_versions(db, w_id, script_path, inner_content).await
+        {
+            input_src.push_str(&path);
+            input_src.push_str(&hash.to_string());
         }
     };
 
diff --git a/backend/windmill-worker/src/deno_executor.rs b/backend/windmill-worker/src/deno_executor.rs
index c39e9e999e..a446548e1f 100644
--- a/backend/windmill-worker/src/deno_executor.rs
+++ b/backend/windmill-worker/src/deno_executor.rs
@@ -434,7 +434,11 @@ try {{
     if let Some(ref npmrc_content) = npmrc {
         if !npmrc_content.trim().is_empty() {
             write_file(job_dir, ".npmrc", npmrc_content)?;
-            write_file(job_dir, "deno.json", "{}")?;
+            // minimumDependencyAge=0 opts out of Deno's supply-chain guard that rejects
+            // npm packages published within the last ~24h. Private/internal registries
+            // routinely serve just-published versions, so the guard would break them.
+            // Older Deno ignores the unknown field, so this is safe across versions.
+            write_file(job_dir, "deno.json", r#"{"minimumDependencyAge":"0"}"#)?;
         }
     }
 
diff --git a/backend/windmill-worker/src/duckdb_executor.rs b/backend/windmill-worker/src/duckdb_executor.rs
index 1a474ee9a0..e4e24d6653 100644
--- a/backend/windmill-worker/src/duckdb_executor.rs
+++ b/backend/windmill-worker/src/duckdb_executor.rs
@@ -11,15 +11,15 @@ use serde_json::{json, Value};
 use uuid::Uuid;
 use windmill_common::error::{to_anyhow, Error, Result};
 use windmill_common::utils::sanitize_string_from_password;
-use windmill_common::worker::{get_memory, Connection, SqlResultCollectionStrategy};
+use windmill_common::worker::{get_memory, to_raw_value, Connection, SqlResultCollectionStrategy};
 use windmill_common::workspaces::{
     get_datatable_resource_from_db_unchecked, get_ducklake_from_db_unchecked,
-    DucklakeCatalogResourceType,
+    strip_fork_reserved_attach_args, DucklakeCatalogResourceType,
 };
 use windmill_common::PgDatabase;
 use windmill_object_store::S3_PROXY_LAST_ERRORS_CACHE;
 use windmill_parser_sql::{parse_duckdb_sig, parse_sql_blocks};
-use windmill_queue::{CanceledBy, MiniPulledJob};
+use windmill_queue::{append_logs, CanceledBy, MiniPulledJob};
 use windmill_types::s3::S3Object;
 
 use crate::agent_workers::{get_datatable_resource_from_agent_http, get_ducklake_from_agent_http};
@@ -32,6 +32,1268 @@ use crate::sql_utils::remove_comments;
 use windmill_common::client::AuthedClient;
 use windmill_object_store::DEFAULT_STORAGE;
 
+// What a `// materialize` run records into `materialized_partition` once it
+// finishes. `asset_path` is the full `<name>/<table>` (the asset identity);
+// `partition` is "" for an unpartitioned (whole-table) materialization.
+struct MaterializeExec {
+    asset_kind: windmill_common::assets::AssetKind,
+    asset_path: String,
+    partition: String,
+    // Number of `// data_test` checks the codegen embedded. Enforcement recovers
+    // the per-test outcomes from the summary row; if it recovers fewer than this
+    // (e.g. an FFI serialization change drops the column), we fail loud rather
+    // than silently pass declared-but-unverified tests.
+    n_data_tests: usize,
+    // `on_schema_change=warn` (default) on a positional persist-and-mutate write:
+    // the summary carries a `schema_drift` column the worker logs + returns.
+    on_schema_change: windmill_parser::asset_parser::OnSchemaChange,
+    // `on_schema_change=sync`: the pre-pass probe (setup + target ATTACH + the
+    // SELECT's/table's column reads) whose result drives the injected ALTER DDL.
+    // `None` for every other mode / non-persist-and-mutate strategy.
+    sync_prepass: Option<SyncPrepass>,
+}
+
+// Inputs for the `on_schema_change=sync` pre-pass: a probe query read against
+// the live session and the target table it migrates. The worker runs the probe
+// (same interpolation + ATTACH transform as the main query), diffs the SELECT's
+// columns against the table's, and splices `ALTER TABLE … ADD/DROP COLUMN` DDL
+// into the plan at the [`SYNC_ALTER_SENTINEL`] slot before the write.
+struct SyncPrepass {
+    // Setup + synthetic target ATTACH + the two column reads. Carries `$args`/
+    // `{partition}` verbatim (the worker interpolates it like the main query).
+    probe_query: String,
+    // Target table within `_wm_target` (e.g. `orders` or `schema.orders`), used
+    // to build the quoted `ALTER TABLE _wm_target.<table>` statements.
+    target_table: String,
+}
+
+// Fetch and validate a custom data-test script's body. v1 custom tests are
+// DuckDB scripts holding a single SELECT/CTE that returns the violating rows
+// (dbt's singular-test convention); the worker embeds that query as a subquery
+// check in the materialize connection (the single-statement constraint is
+// enforced in sql_materialize.rs). Server workers only — agent (Http) workers
+// have no script cache to read deployed content from.
+async fn fetch_custom_test_body(conn: &Connection, w_id: &str, path: &str) -> Result<String> {
+    let Connection::Sql(db) = conn else {
+        return Err(Error::ExecutionErr(format!(
+            "data_test custom `{path}`: custom tests require a server worker (not supported on \
+             agent workers in v1)"
+        )));
+    };
+    let hash = windmill_common::get_latest_script_hash(db, path, w_id)
+        .await?
+        .ok_or_else(|| {
+            Error::ExecutionErr(format!(
+                "data_test custom `{path}`: no deployed script found at this path"
+            ))
+        })?;
+    let content =
+        crate::get_script_content_by_hash(&windmill_common::scripts::ScriptHash(hash), w_id, conn)
+            .await?;
+    if !matches!(
+        content.language,
+        Some(windmill_common::scripts::ScriptLang::DuckDb)
+    ) {
+        return Err(Error::ExecutionErr(format!(
+            "data_test custom `{path}`: must be a DuckDB script returning the violating rows \
+             (got language {:?})",
+            content.language
+        )));
+    }
+    Ok(content.content)
+}
+
+// If `query` declares `// materialize <ducklake>`, return what to record plus,
+// for the default managed mode, the rewritten managed-write SQL (in `manual`
+// mode the script writes its own DDL, so the rewrite is `None`). The rewritten
+// SQL contains a synthetic `ATTACH 'ducklake://<name>' AS _wm_target` that the
+// normal ATTACH-transform pass resolves to real credentials — the same path as
+// the user's own ATTACH. `// data_test` lines append verifier probes that run
+// against the freshly-materialized target and raise (failing the run) on
+// violation. Returns `None` when there is no materialize annotation or the
+// target isn't a ducklake (only ducklake is materialized in v1).
+fn build_materialized_query(
+    query: &str,
+    partition_value: Option<&str>,
+    // Custom (`// data_test <path>`) test bodies, pre-fetched by the caller
+    // (`fetch_custom_test_bodies`) so this stays pure/sync and unit-testable —
+    // the DB read is the only thing that needs a connection. Keyed by script path.
+    custom_test_bodies: &std::collections::HashMap<String, String>,
+) -> Result<Option<(Option<String>, MaterializeExec)>> {
+    use windmill_parser::asset_parser::{
+        parse_pipeline_annotations, AssetKind as PAssetKind, DataTest,
+    };
+    use windmill_parser::sql_materialize::{
+        build_wrap_blocks, DataTestResolved, MaterializeStrategy, TARGET_ALIAS,
+    };
+
+    let ann = parse_pipeline_annotations(query);
+    let has_tests = !ann.data_tests.is_empty();
+    let Some(m) = ann.materialize else {
+        // Data tests run *against the materialized asset*; without a
+        // `// materialize` target there is nothing to test. Fail loudly rather
+        // than silently skip the declared checks.
+        if has_tests {
+            return Err(Error::ExecutionErr(
+                "data_test: requires a `// materialize` target — data tests run against the \
+                 materialized asset"
+                    .to_string(),
+            ));
+        }
+        return Ok(None);
+    };
+    if m.target_kind != PAssetKind::Ducklake {
+        if has_tests {
+            return Err(Error::ExecutionErr(
+                "data_test: only `ducklake://` materialization targets support data tests in v1"
+                    .to_string(),
+            ));
+        }
+        return Ok(None);
+    }
+    let partitioned = ann.partition.is_some();
+    let partition = partition_value.unwrap_or("").to_string();
+    // Partition *resolution* is enterprise; in its absence a partitioned
+    // materialize only runs with an explicit `partition` arg. Fail loudly rather
+    // than silently materialize the wrong (empty) slice.
+    if partitioned && partition.is_empty() {
+        return Err(Error::ExecutionErr(
+            "materialize: a `// partitioned` script ran with no resolved partition — pass an \
+             explicit `partition` arg, or enable enterprise partition resolution"
+                .to_string(),
+        ));
+    }
+    // Convention: `ducklake://<name>/<table>` — <name> is the configured
+    // ducklake (resolved like a user ATTACH), <table> is the rest.
+    let (ducklake_name, table) = m
+        .target_path
+        .split_once('/')
+        .unwrap_or((m.target_path.as_str(), ""));
+    let mut meta = MaterializeExec {
+        asset_kind: windmill_common::assets::AssetKind::Ducklake,
+        asset_path: m.target_path.clone(),
+        partition: partition.clone(),
+        n_data_tests: ann.data_tests.len(),
+        on_schema_change: m.on_schema_change,
+        // Set below once the strategy is known (managed persist-and-mutate only).
+        sync_prepass: None,
+    };
+
+    // `{partition}` → escaped SQL literal substitution, applied to the managed
+    // SELECT, its setup, and any custom-test body so a partitioned test can
+    // filter by the active slice. Always a complete `'…'` literal (with `'`
+    // doubled) whether or not the author quoted it, so a run caller can't break
+    // out and alter statement boundaries. The pre-quoted `'{partition}'` form is
+    // matched first so it doesn't become `''…''`. No-op when unpartitioned.
+    let lit = format!("'{}'", partition.replace('\'', "''"));
+    let substitute = |s: &str| -> String {
+        if !partitioned {
+            return s.to_string();
+        }
+        let tok = windmill_common::assets::PARTITION_TOKEN;
+        let quoted_tok = format!("'{tok}'");
+        s.replace(&quoted_tok, &lit).replace(tok, &lit)
+    };
+
+    if m.manual {
+        // Escape hatch: the script owns its DDL. We can't reliably attach the
+        // managed target or know the partition column it wrote, so data tests
+        // are not generated for manual mode in v1.
+        if has_tests {
+            return Err(Error::ExecutionErr(
+                "data_test: not supported with `// materialize manual` in v1 — use managed \
+                 `// materialize`"
+                    .to_string(),
+            ));
+        }
+        return Ok(Some((None, meta)));
+    }
+    if table.is_empty() {
+        return Err(Error::ExecutionErr(format!(
+            "materialize: target `ducklake://{}` has no table (use ducklake://<name>/<table>)",
+            m.target_path
+        )));
+    }
+    let mut plan = classify_wrap_or_err(query)?;
+    plan.output = substitute(&plan.output);
+    for s in plan.setup.iter_mut() {
+        *s = substitute(s);
+    }
+    // Prepend the `wm_partition(ts)` helper macro for a time-partitioned
+    // materialize so the SELECT can filter to the active slice with
+    // `WHERE wm_partition(<ts_col>) = {partition}`. Runs first (setup precedes
+    // the wrapped SELECT and the write transaction), carries no `{partition}`
+    // token so it's inserted post-substitution, and reads its format from the
+    // same source the resolver stamped the identity with — so they can't drift.
+    if partitioned {
+        if let Some(macro_sql) = ann
+            .partition
+            .as_ref()
+            .and_then(windmill_parser::sql_materialize::wm_partition_macro)
+        {
+            plan.setup.insert(0, macro_sql);
+        }
+    }
+    // Deploy (`create_script_internal`) already rejects the invalid SCD2 combos,
+    // but preview/test runs reach the executor without a deploy — re-check so a
+    // bad combo fails with the same clear message instead of a raw DuckDB error.
+    m.validate(partitioned).map_err(Error::ExecutionErr)?;
+    let strategy = if m.scd2 {
+        // SCD2 needs a natural key to identify an entity across versions (checked
+        // by `validate` above, which guarantees a non-empty key here).
+        let key = m.unique_key.clone().ok_or_else(|| {
+            Error::ExecutionErr(
+                "materialize scd2: requires a natural key — add `key=<col>`".to_string(),
+            )
+        })?;
+        MaterializeStrategy::Scd2 { key, track: m.track.clone(), close_deleted: m.close_deleted }
+    } else if m.append {
+        MaterializeStrategy::Append
+    } else if let Some(uk) = m.unique_key {
+        MaterializeStrategy::Merge { unique_key: uk }
+    } else {
+        MaterializeStrategy::Replace
+    };
+    // Inline the partition as an escaped SQL literal (DuckLake has no bind for
+    // the partition column in our generated DDL).
+    let pval = lit.clone();
+    let synthetic_attach = format!("ATTACH 'ducklake://{ducklake_name}' AS {TARGET_ALIAS};");
+
+    // Resolve data tests (fetch + partition-substitute custom bodies) so codegen
+    // can embed every check's violating-row count in the materialize summary.
+    // The summary then carries the full per-test breakdown back to the worker,
+    // which runs them all and decides pass/fail (no abort-on-first). Empty when
+    // there are no `// data_test` lines.
+    let mut resolved = Vec::with_capacity(ann.data_tests.len());
+    for test in &ann.data_tests {
+        match test {
+            DataTest::Custom { path } => {
+                let raw = custom_test_bodies.get(path).ok_or_else(|| {
+                    Error::ExecutionErr(format!(
+                        "data_test custom `{path}`: body not fetched before codegen (internal)"
+                    ))
+                })?;
+                resolved
+                    .push(DataTestResolved::Custom { path: path.clone(), body: substitute(raw) });
+            }
+            other => resolved.push(DataTestResolved::BuiltIn(other.clone())),
+        }
+    }
+
+    let cg_probe = windmill_parser::sql_materialize::MaterializeCodegen {
+        target_qualified: "",
+        select_sql: "",
+        partition_col: "_wm_partition",
+        partition_value_sql: "",
+        partitioned,
+        strategy: strategy.clone(),
+        on_schema_change: m.on_schema_change,
+    };
+    // `sync` needs a host round-trip: a pre-pass probe reads the SELECT's and the
+    // table's columns so the ALTER DDL can be computed, then spliced into the
+    // plan at the sentinel slot. Build the probe query here (setup + target
+    // ATTACH + the two column reads) while we still have the substituted SELECT +
+    // setup; the executor runs it through the same interpolation/ATTACH transform
+    // as the main query. Only for the positional persist-and-mutate strategies
+    // (scd2 / whole-table replace emit no sentinel).
+    if m.on_schema_change == windmill_parser::asset_parser::OnSchemaChange::Sync
+        && cg_probe.is_persist_and_mutate()
+    {
+        meta.sync_prepass = Some(SyncPrepass {
+            probe_query: build_sync_probe_query(
+                &plan.setup,
+                &synthetic_attach,
+                &plan.output,
+                table,
+            ),
+            target_table: table.to_string(),
+        });
+    }
+
+    let mat_plan = build_wrap_blocks(
+        &plan,
+        &synthetic_attach,
+        table,
+        &m.target_path,
+        "_wm_partition",
+        &pval,
+        partitioned,
+        strategy,
+        m.on_schema_change,
+        &resolved,
+    )
+    .map_err(Error::ExecutionErr)?;
+    // Enterprise seam: assembles the plan into the final statement list —
+    // verbatim on the public build (commit-then-test), restructured into
+    // write-audit-publish (guarded transaction, rollback on violation) on EE.
+    let blocks =
+        windmill_common::pipeline_advanced::finalize_materialize_query(mat_plan, &m.target_path);
+
+    Ok(Some((Some(blocks.join("\n")), meta)))
+}
+
+// Build the `on_schema_change=sync` pre-pass probe: the substituted setup + the
+// synthetic target ATTACH, then two column reads unioned — the SELECT's columns
+// (via `DESCRIBE`) tagged `sel`, and the target table's (via information_schema,
+// which yields zero rows when the table doesn't exist yet, so a first
+// materialize is a no-drift skip rather than an error) tagged `tbl`. The managed
+// `_wm_partition` column is filtered out of the table side. Carries
+// `$args`/`{partition}` verbatim; the caller interpolates + ATTACH-transforms it
+// like the main query so the DESCRIBE binds run-time args.
+fn build_sync_probe_query(
+    setup: &[String],
+    synthetic_attach: &str,
+    select_sql: &str,
+    table: &str,
+) -> String {
+    let (schema, tname) = match table.split_once('.') {
+        Some((s, t)) => (Some(s), t),
+        None => (None, table),
+    };
+    let esc = |s: &str| s.replace('\'', "''");
+    let schema_filter = schema
+        .map(|s| format!(" AND table_schema = '{}'", esc(s)))
+        .unwrap_or_default();
+    let mut out = String::new();
+    let mut push_stmt = |s: &str| {
+        let t = s.trim_end();
+        if t.is_empty() {
+            return;
+        }
+        out.push_str(t);
+        if !t.ends_with(';') {
+            out.push(';');
+        }
+        out.push('\n');
+    };
+    for s in setup {
+        push_stmt(s);
+    }
+    push_stmt(synthetic_attach);
+    // Read the target's columns from `information_schema.columns` scoped to the
+    // attached target catalog via `table_catalog` (DuckDB's catalog-qualified
+    // `<db>.information_schema` does NOT exist; the unqualified view spans
+    // attached catalogs and distinguishes them by `table_catalog`). It yields
+    // zero rows for a not-yet-created table — a no-drift skip, not an error
+    // (unlike `pragma_table_info`/`DESCRIBE`).
+    out.push_str(&format!(
+        "SELECT 'sel' AS _wm_which, column_name AS _wm_name, column_type AS _wm_type \
+         FROM (DESCRIBE SELECT * FROM ({select_sql})) \
+         UNION ALL \
+         SELECT 'tbl' AS _wm_which, column_name AS _wm_name, data_type AS _wm_type \
+         FROM information_schema.columns \
+         WHERE table_catalog = '{alias}' AND table_name = '{tname}'{schema_filter} \
+         AND column_name <> '_wm_partition';",
+        alias = windmill_parser::sql_materialize::TARGET_ALIAS,
+        tname = esc(tname),
+    ));
+    out
+}
+
+// Run the sync pre-pass probe (already interpolated + ATTACH-transformed by the
+// caller) and turn its column diff into the `ALTER TABLE … ADD/DROP COLUMN` DDL
+// to splice at the sentinel. Empty string when the table is fresh (no rows) or
+// the SELECT already matches. The probe failing is fatal (no silent fallback).
+async fn compute_sync_alter_ddl(
+    probe_blocks: Vec<String>,
+    job_args: Vec<Arg>,
+    target_table: String,
+    token: String,
+    base_internal_url: String,
+    w_id: String,
+    job_dir: String,
+) -> Result<String> {
+    let n = probe_blocks.len();
+    let (result, _) = tokio::task::spawn_blocking(move || {
+        run_duckdb_ffi_safe(
+            probe_blocks.iter().map(String::as_str),
+            n,
+            job_args,
+            &token,
+            &base_internal_url,
+            &w_id,
+            &job_dir,
+            SqlResultCollectionStrategy::LastStatementAllRows,
+        )
+    })
+    .await
+    .map_err(|e| Error::from(to_anyhow(e)))
+    .and_then(|r| r)
+    .map_err(|e| {
+        Error::ExecutionErr(format!(
+            "on_schema_change=sync: the schema pre-pass probe failed ({e}); refusing to write"
+        ))
+    })?;
+
+    let (added, removed) = parse_sync_drift(&result)?;
+    let tq = format!(
+        "{}.{}",
+        windmill_parser::sql_materialize::TARGET_ALIAS,
+        quote_qualified_table(&target_table)
+    );
+    let mut stmts = Vec::new();
+    for (name, typ) in &added {
+        if typ.is_empty() {
+            return Err(Error::ExecutionErr(format!(
+                "on_schema_change=sync: could not resolve a type for new column `{name}`"
+            )));
+        }
+        // `typ` is DuckDB's own DESCRIBE type name (e.g. BIGINT, VARCHAR,
+        // DECIMAL(10,2)) — a valid type expression, injected verbatim.
+        stmts.push(format!(
+            "ALTER TABLE {tq} ADD COLUMN \"{}\" {typ};",
+            name.replace('"', "\"\"")
+        ));
+    }
+    for name in &removed {
+        stmts.push(format!(
+            "ALTER TABLE {tq} DROP COLUMN \"{}\";",
+            name.replace('"', "\"\"")
+        ));
+    }
+    Ok(stmts.join("\n"))
+}
+
+// Parse the sync probe result rows (`_wm_which`/`_wm_name`/`_wm_type`) into the
+// column diff: `added` = SELECT columns (with their types) absent from the
+// table, `removed` = table columns absent from the SELECT. `_wm_partition` and
+// empty names are ignored. An empty table side means the table doesn't exist
+// yet — a no-op first materialize, so both lists are empty.
+fn parse_sync_drift(result: &RawValue) -> Result<(Vec<(String, String)>, Vec<String>)> {
+    let root: Value = serde_json::from_str(result.get()).map_err(|e| {
+        Error::ExecutionErr(format!("on_schema_change=sync: bad probe result json: {e}"))
+    })?;
+    // The FFI may surface the rows as an array, a single object, or a JSON
+    // string — normalize to a list of row objects.
+    let owned;
+    let rows: Vec<&Value> = match &root {
+        Value::Array(a) => a.iter().collect(),
+        Value::Object(_) => vec![&root],
+        Value::String(s) => {
+            owned = serde_json::from_str::<Value>(s).unwrap_or(Value::Null);
+            match &owned {
+                Value::Array(a) => a.iter().collect(),
+                Value::Object(_) => vec![&owned],
+                _ => vec![],
+            }
+        }
+        _ => vec![],
+    };
+    let mut sel: Vec<(String, String)> = Vec::new();
+    let mut tbl: std::collections::HashSet<String> = std::collections::HashSet::new();
+    for row in rows {
+        let Some(o) = row.as_object() else { continue };
+        let name = o
+            .get("_wm_name")
+            .and_then(|v| v.as_str())
+            .unwrap_or("")
+            .to_string();
+        if name.is_empty() || name == "_wm_partition" {
+            continue;
+        }
+        let typ = o
+            .get("_wm_type")
+            .and_then(|v| v.as_str())
+            .unwrap_or("")
+            .to_string();
+        match o.get("_wm_which").and_then(|v| v.as_str()).unwrap_or("") {
+            "sel" => sel.push((name, typ)),
+            "tbl" => {
+                tbl.insert(name);
+            }
+            _ => {}
+        }
+    }
+    if tbl.is_empty() {
+        return Ok((Vec::new(), Vec::new()));
+    }
+    let sel_names: std::collections::HashSet<&String> = sel.iter().map(|(n, _)| n).collect();
+    let added = sel
+        .iter()
+        .filter(|(n, _)| !tbl.contains(n))
+        .cloned()
+        .collect();
+    let removed = tbl.into_iter().filter(|n| !sel_names.contains(n)).collect();
+    Ok((added, removed))
+}
+
+// Fetch the deployed body of every `// data_test <path>` custom test declared in
+// `query`, keyed by path, so the sync `build_materialized_query` can splice them
+// in. The DB read is the only part of materialize codegen that needs a
+// connection; isolating it here keeps the codegen pure and unit-testable.
+// Server workers only (`fetch_custom_test_body` errors on agent workers). Empty
+// when there are no custom tests.
+async fn fetch_custom_test_bodies(
+    query: &str,
+    conn: &Connection,
+    w_id: &str,
+) -> Result<std::collections::HashMap<String, String>> {
+    use windmill_parser::asset_parser::{parse_pipeline_annotations, DataTest};
+    let ann = parse_pipeline_annotations(query);
+    let mut bodies = std::collections::HashMap::new();
+    for test in &ann.data_tests {
+        if let DataTest::Custom { path } = test {
+            if !bodies.contains_key(path) {
+                let body = fetch_custom_test_body(conn, w_id, path).await?;
+                bodies.insert(path.clone(), body);
+            }
+        }
+    }
+    Ok(bodies)
+}
+
+// classify_wrap with the spec's actionable message turned into an executor error.
+fn classify_wrap_or_err(query: &str) -> Result<windmill_parser::sql_materialize::WrapPlan> {
+    windmill_parser::sql_materialize::classify_wrap(query)
+        .map_err(|e| Error::ExecutionErr(e.message()))
+}
+
+// One workspace-macro registry row (`macro_definition`, written at deploy of a
+// `// macros` library script). Shared with windmill-common so the registry
+// cache can live there (main.rs evicts it on `notify_macro_registry_change`).
+use windmill_common::assets::MacroRegistryEntry as MacroRow;
+
+// The registry read runs on every DuckDB job (including the common macro-free
+// case), so it's cached per workspace. Invalidation is primarily the
+// transactional `notify_macro_registry_change` event (registry mutations →
+// notify_event table → the poller in main.rs evicts); the TTL bounds
+// staleness for anything that doesn't emit.
+async fn fetch_macro_registry(
+    db: &windmill_common::DB,
+    w_id: &str,
+) -> Result<std::sync::Arc<Vec<MacroRow>>> {
+    use windmill_common::assets::{
+        ExpiringMacroRegistry, MACRO_REGISTRY_CACHE, MACRO_REGISTRY_CACHE_DISABLED,
+        MACRO_REGISTRY_TTL,
+    };
+    // Cloud: unbounded workspace count makes the 1000-entry per-workspace
+    // cache churn instead of hit, and its per-entry memory (full registry
+    // text) is tenant-controlled — skip it there; self-hosted keeps the fast
+    // path.
+    let use_cache = !*windmill_common::worker::CLOUD_HOSTED
+        && !MACRO_REGISTRY_CACHE_DISABLED.load(std::sync::atomic::Ordering::Relaxed);
+    if use_cache {
+        if let Some(e) = MACRO_REGISTRY_CACHE.get(w_id) {
+            if e.expires_at > std::time::Instant::now() {
+                return Ok(e.rows);
+            }
+        }
+    }
+    let rows = sqlx::query_as!(
+        MacroRow,
+        "SELECT name, params, body, is_table_macro, provider_path FROM macro_definition WHERE workspace_id = $1",
+        w_id
+    )
+    .fetch_all(db)
+    .await?;
+    let rows = std::sync::Arc::new(rows);
+    if use_cache {
+        MACRO_REGISTRY_CACHE.insert(
+            w_id.to_string(),
+            ExpiringMacroRegistry {
+                rows: rows.clone(),
+                expires_at: std::time::Instant::now() + MACRO_REGISTRY_TTL,
+            },
+        );
+    }
+    Ok(rows)
+}
+
+// Selection pass: seed = macros the (comment-stripped, transformed) blocks
+// call, plus every macro of each `// use` library; then the transitive
+// closure over macro bodies. Local definitions win — their names are removed
+// from the injectable set entirely, so a later workspace-library deploy can
+// never silently replace a script's own macro. Pure and separate from
+// `plan_macro_injection` so the shell knows which provider libraries to
+// fetch (their setup statements are injected too) before planning.
+fn select_workspace_macros(
+    blocks: &[String],
+    registry: &[MacroRow],
+    use_libs: &[String],
+) -> Result<std::collections::HashSet<String>> {
+    use std::collections::{BTreeMap, HashSet};
+    use windmill_parser::duckdb_macros::{detect_macro_calls, locally_defined_macro_names};
+
+    let local = locally_defined_macro_names(blocks);
+    let all_names: HashSet<String> = registry
+        .iter()
+        .map(|r| r.name.clone())
+        .filter(|n| !local.contains(n))
+        .collect();
+    let by_name: BTreeMap<&str, &MacroRow> =
+        registry.iter().map(|r| (r.name.as_str(), r)).collect();
+
+    let mut selected: HashSet<String> = HashSet::new();
+    for path in use_libs {
+        let lib_names: Vec<&str> = registry
+            .iter()
+            .filter(|r| &r.provider_path == path)
+            .map(|r| r.name.as_str())
+            .collect();
+        if lib_names.is_empty() {
+            return Err(Error::ExecutionErr(format!(
+                "`// use {path}`: no deployed macro library at this path"
+            )));
+        }
+        selected.extend(
+            lib_names
+                .into_iter()
+                .filter(|n| all_names.contains(*n))
+                .map(String::from),
+        );
+    }
+    selected.extend(detect_macro_calls(&blocks.join("\n"), &all_names));
+
+    // Transitive closure over macro bodies (a selected macro may call others).
+    let mut frontier: Vec<String> = selected.iter().cloned().collect();
+    while let Some(name) = frontier.pop() {
+        if let Some(row) = by_name.get(name.as_str()) {
+            for dep in detect_macro_calls(&row.body, &all_names) {
+                if selected.insert(dep.clone()) {
+                    frontier.push(dep);
+                }
+            }
+        }
+    }
+    Ok(selected)
+}
+
+// Fixpoint over library-level `// use`: a library may declare `// use` for
+// dynamic calls its macro bodies make (string-hidden from lexical detection,
+// e.g. inside `query('…')`). Those declarations are honored transitively —
+// consuming a macro from lib B pulls in whatever B `// use`s, so the dynamic
+// dependency stays encapsulated in the library instead of leaking to every
+// consumer. `lib_uses` maps provider path → its parsed `// use` list; the
+// shell grows it lazily and re-resolves until no new library appears.
+// Returns the selected macro names plus the effective `// use` list
+// (consumer's own first, in annotation order, then discovered libs).
+fn resolve_macro_selection(
+    blocks: &[String],
+    registry: &[MacroRow],
+    consumer_use_libs: &[String],
+    lib_uses: &std::collections::BTreeMap<String, Vec<String>>,
+) -> Result<(std::collections::HashSet<String>, Vec<String>)> {
+    let mut effective: Vec<String> = Vec::new();
+    for p in consumer_use_libs {
+        if !effective.contains(p) {
+            effective.push(p.clone());
+        }
+    }
+    loop {
+        let selected = select_workspace_macros(blocks, registry, &effective)?;
+        let mut relevant: Vec<String> = effective.clone();
+        for name in &selected {
+            if let Some(r) = registry.iter().find(|r| &r.name == name) {
+                if !relevant.contains(&r.provider_path) {
+                    relevant.push(r.provider_path.clone());
+                }
+            }
+        }
+        let mut grew = false;
+        for lib in &relevant {
+            for u in lib_uses.get(lib).map(Vec::as_slice).unwrap_or(&[]) {
+                if !effective.contains(u) {
+                    effective.push(u.clone());
+                    grew = true;
+                }
+            }
+        }
+        if !grew {
+            return Ok((selected, effective));
+        }
+    }
+}
+
+// Emit the blocks to inject: first every relevant library's setup statements
+// (a macro body may reference its own lib's ATTACH, and DuckDB bind-checks
+// at CREATE — so setup is injected for the provider of every selected macro,
+// not just `// use` libs), then the selected definitions in dependency order.
+// `lib_bodies` carries the parsed deployed content per provider path; setup
+// order = `// use` libs in annotation order, then remaining providers sorted.
+// Exact-duplicate setup statements across libraries are deduped (two libs
+// attaching the same catalog the same way must not double-ATTACH). Pure —
+// fetches happen in `inject_workspace_macros` — so this is unit-testable.
+fn plan_macro_injection(
+    selected: &std::collections::HashSet<String>,
+    registry: &[MacroRow],
+    use_libs: &[String],
+    lib_bodies: &std::collections::BTreeMap<
+        String,
+        Vec<windmill_parser::duckdb_macros::LibStatement>,
+    >,
+) -> Result<Vec<String>> {
+    use std::collections::{BTreeMap, BTreeSet, HashSet};
+    use windmill_parser::duckdb_macros::{macro_create_statement, topo_order_macros, LibStatement};
+
+    let by_name: BTreeMap<&str, &MacroRow> =
+        registry.iter().map(|r| (r.name.as_str(), r)).collect();
+
+    // Providers whose setup must run: every `// use` lib (annotation order —
+    // even with zero selected macros, the explicit `use` carries its ATTACH
+    // side effects), then the provider of each selected macro (sorted).
+    let mut providers: Vec<&str> = use_libs.iter().map(String::as_str).collect();
+    let selected_providers: BTreeSet<&str> = selected
+        .iter()
+        .filter_map(|n| by_name.get(n.as_str()).map(|r| r.provider_path.as_str()))
+        .collect();
+    for p in selected_providers {
+        if !providers.contains(&p) {
+            providers.push(p);
+        }
+    }
+
+    let mut injected: Vec<String> = Vec::new();
+    let mut seen_setup: HashSet<String> = HashSet::new();
+    for provider in providers {
+        let Some(statements) = lib_bodies.get(provider) else {
+            return Err(Error::ExecutionErr(format!(
+                "macro library `{provider}` has registry entries but its deployed script could \
+                 not be loaded"
+            )));
+        };
+        for s in statements {
+            if let LibStatement::Setup(stmt) = s {
+                let stmt = format!("{};", stmt.trim_end_matches(';').trim_end());
+                if seen_setup.insert(stmt.clone()) {
+                    injected.push(stmt);
+                }
+            }
+        }
+    }
+
+    if selected.is_empty() {
+        return Ok(injected);
+    }
+    let defs: BTreeMap<String, String> = selected
+        .iter()
+        .filter_map(|n| by_name.get(n.as_str()).map(|r| (n.clone(), r.body.clone())))
+        .collect();
+    let order = topo_order_macros(selected, &defs).map_err(Error::ExecutionErr)?;
+    for name in order {
+        let r = by_name.get(name.as_str()).ok_or_else(|| {
+            Error::ExecutionErr(format!("workspace macro `{name}` has no registry row"))
+        })?;
+        injected.push(macro_create_statement(
+            &r.name,
+            &r.params,
+            r.is_table_macro,
+            &r.body,
+        ));
+    }
+    Ok(injected)
+}
+
+// Weave the injected blocks into the user's statement list. DuckDB
+// bind-checks macro bodies at CREATE, in both directions:
+//   - an injected definition that a LOCAL macro calls must land *before*
+//     that local definition (pulling its own injected dependencies with it);
+//   - an injected definition that references a local macro must stay *after*
+//     it — a conflict between the two requirements is an error, not a
+//     silent mis-ordering.
+// The default slot (no local interplay) is after the leading prefix of setup
+// statements and local definitions, as before. Injected setup statements
+// (library ATTACHes) go at the earliest slot any injected definition landed
+// on: injected bodies are self-contained w.r.t. their own library's setup
+// and never depend on the consumer's setup.
+fn weave_macro_blocks(blocks: Vec<String>, injected: Vec<String>) -> Result<Vec<String>> {
+    if injected.is_empty() {
+        return Ok(blocks);
+    }
+    use std::collections::HashSet;
+    use windmill_parser::duckdb_macros::{
+        detect_macro_calls, is_macro_definition, parse_macro_definition,
+    };
+    use windmill_parser::sql_materialize::{classify_block, BlockClass};
+
+    // Default slot: insert before the first block that is neither setup nor
+    // a local macro definition (i.e. after the whole leading prefix).
+    let default_slot = blocks
+        .iter()
+        .position(|b| !matches!(classify_block(b), BlockClass::Setup) && !is_macro_definition(b))
+        .unwrap_or(blocks.len());
+
+    // The user's own macro definitions, as placement anchors.
+    let locals: Vec<(usize, windmill_parser::duckdb_macros::ParsedMacro)> = blocks
+        .iter()
+        .enumerate()
+        .filter_map(|(i, b)| parse_macro_definition(b).map(|m| (i, m)))
+        .collect();
+    let local_names: HashSet<String> = locals.iter().map(|(_, m)| m.name.clone()).collect();
+
+    // Plan emits [lib setup…, definitions in topo order…].
+    let (setup, defs): (Vec<String>, Vec<String>) =
+        injected.into_iter().partition(|s| !is_macro_definition(s));
+    let def_metas: Vec<windmill_parser::duckdb_macros::ParsedMacro> = defs
+        .iter()
+        .map(|s| {
+            parse_macro_definition(s).ok_or_else(|| {
+                Error::ExecutionErr(format!(
+                    "internal: generated macro statement failed to re-parse: {}",
+                    s.chars().take(80).collect::<String>()
+                ))
+            })
+        })
+        .collect::<Result<_>>()?;
+    let def_names: HashSet<String> = def_metas.iter().map(|m| m.name.clone()).collect();
+
+    // Per-injected-definition slot bounds from the local anchors. `slot = i`
+    // means "insert before block i".
+    let mut max_slot: Vec<usize> = vec![default_slot; defs.len()];
+    let mut min_slot: Vec<usize> = vec![0; defs.len()];
+    for (li, lm) in &locals {
+        let local_calls = detect_macro_calls(&lm.body, &def_names);
+        let referenced_locals_of: Vec<usize> = def_metas
+            .iter()
+            .enumerate()
+            .filter(|(_, dm)| detect_macro_calls(&dm.body, &local_names).contains(&lm.name))
+            .map(|(di, _)| di)
+            .collect();
+        for (di, dm) in def_metas.iter().enumerate() {
+            if local_calls.contains(&dm.name) {
+                max_slot[di] = max_slot[di].min(*li);
+            }
+        }
+        for di in referenced_locals_of {
+            min_slot[di] = min_slot[di].max(*li + 1);
+        }
+    }
+    // An injected definition must not land after any injected definition
+    // that depends on it: propagate upper bounds backwards through the topo
+    // order (dependents come later in `defs`).
+    let mut eff_slot = max_slot.clone();
+    for i in (0..defs.len()).rev() {
+        for j in (i + 1)..defs.len() {
+            if detect_macro_calls(&def_metas[j].body, &def_names).contains(&def_metas[i].name) {
+                eff_slot[i] = eff_slot[i].min(eff_slot[j]);
+            }
+        }
+        if min_slot[i] > eff_slot[i] {
+            return Err(Error::ExecutionErr(format!(
+                "workspace macro `{}` and this script's own macro definitions have conflicting \
+                 order requirements (a local macro calls it while it references a local macro \
+                 defined later); reorder the local definitions",
+                def_metas[i].name
+            )));
+        }
+    }
+    // Library setup runs before everything: the statements are self-contained
+    // (validated plain/non-managed at lib deploy, within-lib order preserved)
+    // and ANY consumer statement may depend on them at bind time — including
+    // a leading local macro definition that shadows a lib macro (so no def is
+    // injected) but still references the lib's ATTACHed catalog.
+    let mut out: Vec<String> = Vec::with_capacity(blocks.len() + defs.len() + setup.len());
+    out.extend(setup);
+    for slot in 0..=blocks.len() {
+        for (di, d) in defs.iter().enumerate() {
+            if eff_slot[di] == slot {
+                out.push(d.clone());
+            }
+        }
+        if let Some(b) = blocks.get(slot) {
+            out.push(b.clone());
+        }
+    }
+    Ok(out)
+}
+
+// Workspace-macro injection (`// macros` libraries): fetch the registry, plan
+// the needed `CREATE OR REPLACE TEMP MACRO` blocks and splice them into the
+// job's statement list. Late-bound: every run reads the current registry, so a
+// lib redeploy applies to the next run. On agent (Http) workers — no DB — the
+// implicit path silently degrades (a called macro then fails with DuckDB's
+// clear Catalog Error) but an explicit `// use` hard-errors like custom tests.
+async fn inject_workspace_macros(
+    conn: &Connection,
+    w_id: &str,
+    is_macro_lib: bool,
+    use_libs: &[String],
+    blocks: Vec<String>,
+) -> Result<Vec<String>> {
+    if is_macro_lib {
+        // A library run executes its own definitions; nothing to inject.
+        return Ok(blocks);
+    }
+    let db = match conn {
+        Connection::Sql(db) => db,
+        Connection::Http(_) => {
+            if !use_libs.is_empty() {
+                return Err(Error::ExecutionErr(
+                    "`// use` requires a server worker (not supported on agent workers in v1)"
+                        .to_string(),
+                ));
+            }
+            return Ok(blocks);
+        }
+    };
+    let registry = fetch_macro_registry(db, w_id).await?;
+    if registry.is_empty() && use_libs.is_empty() {
+        return Ok(blocks);
+    }
+    if select_workspace_macros(&blocks, &registry, use_libs)?.is_empty() && use_libs.is_empty() {
+        return Ok(blocks);
+    }
+    // Every relevant provider's deployed body is fetched: its setup
+    // statements are injected ahead of the definitions (a macro body may
+    // reference its own lib's ATTACH, which must run before the injected
+    // CREATE binds), and its own `// use` declarations are honored
+    // transitively — so the loop fetches lazily and re-resolves until no new
+    // library appears. Content fetches are cached by hash.
+    let mut lib_bodies: std::collections::BTreeMap<
+        String,
+        Vec<windmill_parser::duckdb_macros::LibStatement>,
+    > = Default::default();
+    let mut lib_uses: std::collections::BTreeMap<String, Vec<String>> = Default::default();
+    let (selected, effective_use) = loop {
+        let (selected, effective) =
+            resolve_macro_selection(&blocks, &registry, use_libs, &lib_uses)?;
+        let mut relevant: Vec<String> = effective.clone();
+        for name in &selected {
+            if let Some(r) = registry.iter().find(|r| &r.name == name) {
+                if !relevant.contains(&r.provider_path) {
+                    relevant.push(r.provider_path.clone());
+                }
+            }
+        }
+        let missing: Vec<String> = relevant
+            .into_iter()
+            .filter(|l| !lib_bodies.contains_key(l))
+            .collect();
+        if missing.is_empty() {
+            break (selected, effective);
+        }
+        for path in missing {
+            let content = fetch_macro_lib_body(conn, w_id, &path).await?;
+            let statements = windmill_parser::duckdb_macros::parse_macro_library(&content)
+                .map_err(|e| {
+                    Error::ExecutionErr(format!("macro library `{path}`: invalid content: {e}"))
+                })?;
+            lib_uses.insert(
+                path.clone(),
+                windmill_parser::asset_parser::parse_pipeline_annotations(&content).use_libs,
+            );
+            lib_bodies.insert(path, statements);
+        }
+    };
+    let injected = plan_macro_injection(&selected, &registry, &effective_use, &lib_bodies)?;
+    weave_macro_blocks(blocks, injected)
+}
+
+// Fetch a macro library's deployed body — for its setup statements; the
+// macro definitions themselves come from the registry. Used both for `// use`
+// libs and for the provider of every selected macro. Same server-worker
+// fetch path as custom data tests.
+async fn fetch_macro_lib_body(conn: &Connection, w_id: &str, path: &str) -> Result<String> {
+    let Connection::Sql(db) = conn else {
+        return Err(Error::ExecutionErr(
+            "workspace macros require a server worker (not supported on agent workers in v1)"
+                .to_string(),
+        ));
+    };
+    let hash = windmill_common::get_latest_script_hash(db, path, w_id)
+        .await?
+        .ok_or_else(|| {
+            Error::ExecutionErr(format!(
+                "macro library `{path}`: no deployed script found at this path"
+            ))
+        })?;
+    let content =
+        crate::get_script_content_by_hash(&windmill_common::scripts::ScriptHash(hash), w_id, conn)
+            .await?;
+    if !matches!(
+        content.language,
+        Some(windmill_common::scripts::ScriptLang::DuckDb)
+    ) {
+        return Err(Error::ExecutionErr(format!(
+            "macro library `{path}`: must be a DuckDB `// macros` library (got language {:?})",
+            content.language
+        )));
+    }
+    Ok(content.content)
+}
+
+// Pull a named i64 field (`snapshot_id` / `rows`) out of the trailing summary
+// read — which in wrap mode is the job result. Shape-tolerant (object / array /
+// nested), returns None if absent (literal mode, or capture failed).
+fn extract_i64(result: &RawValue, field: &str) -> Option<i64> {
+    fn find(v: &Value, field: &str) -> Option<i64> {
+        match v {
+            Value::Number(n) => n.as_i64(),
+            Value::Object(m) => m.get(field).and_then(|x| find(x, field)),
+            Value::Array(a) => a.iter().find_map(|x| find(x, field)),
+            _ => None,
+        }
+    }
+    find(&serde_json::from_str::<Value>(result.get()).ok()?, field)
+}
+
+// One data test's outcome as carried by the materialize summary's `data_tests`
+// column: its display name, how many rows violated it (0 = pass), and an
+// optional bounded sample of the violating rows. The sample is decoration
+// only — enforcement reads `violating`, never `sample` — so a NULL, dropped
+// (over the size cap) or unparseable sample must never affect pass/fail.
+struct DataTestOutcome {
+    name: String,
+    violating: i64,
+    sample: Option<Value>,
+}
+
+// Pull the per-test breakdown out of the materialize summary result. The
+// `data_tests` column is a DuckLake list-of-struct `[{test, violating}, …]`;
+// the FFI may surface it as a nested JSON array or as a JSON string, so accept
+// both. Returns empty when there are no tests (the column is absent).
+fn extract_data_tests(result: &RawValue) -> Vec<DataTestOutcome> {
+    fn collect(v: &Value, out: &mut Vec<DataTestOutcome>) {
+        if let Value::Array(arr) = v {
+            for item in arr {
+                if let Value::Object(o) = item {
+                    if let Some(Value::String(name)) = o.get("test") {
+                        let violating = o
+                            .get("violating")
+                            .and_then(|x| x.as_i64().or_else(|| x.as_f64().map(|f| f as i64)))
+                            .unwrap_or(0);
+                        // The probe serializes the sample as a JSON *string*
+                        // (a VARCHAR through the FFI), deliberately — parse it
+                        // only here, so sampled user columns named `rows` /
+                        // `snapshot_id` stay invisible to the key-recursive
+                        // `extract_i64` scans over the summary result. Accept
+                        // a native array too (FFI JSON-column quirk); anything
+                        // else (NULL, size-capped, garbage) degrades to None.
+                        let sample = o.get("sample").and_then(|s| match s {
+                            arr @ Value::Array(_) => Some(arr.clone()),
+                            Value::String(txt) => serde_json::from_str::<Value>(txt)
+                                .ok()
+                                .filter(|v| v.is_array()),
+                            _ => None,
+                        });
+                        out.push(DataTestOutcome { name: name.clone(), violating, sample });
+                    }
+                }
+            }
+        }
+    }
+    fn find_field(v: &Value) -> Option<&Value> {
+        match v {
+            Value::Object(o) => o.get("data_tests"),
+            Value::Array(a) => a.iter().find_map(find_field),
+            _ => None,
+        }
+    }
+    let mut out = Vec::new();
+    let Ok(root) = serde_json::from_str::<Value>(result.get()) else {
+        return out;
+    };
+    match find_field(&root) {
+        Some(arr @ Value::Array(_)) => collect(arr, &mut out),
+        // FFI serialized the list-of-struct as a JSON string — parse it.
+        Some(Value::String(s)) => {
+            if let Ok(parsed) = serde_json::from_str::<Value>(s) {
+                collect(&parsed, &mut out);
+            }
+        }
+        _ => {}
+    }
+    out
+}
+
+// Pull the captured output schema out of the materialize summary's
+// `output_schema` column (gap #2a): a list-of-struct `[{name, type}, …]` the
+// codegen built from a `DESCRIBE`. Like `data_tests`, the FFI may surface it as
+// a nested JSON array or a JSON string — accept both. Returns `None` when the
+// column is absent (literal mode, manual mode, or capture failed) so the worker
+// records the run without a schema rather than an empty one.
+fn extract_schema(
+    result: &RawValue,
+) -> Option<Vec<windmill_common::materialization::SchemaColumn>> {
+    use windmill_common::materialization::SchemaColumn;
+    fn collect(v: &Value) -> Option<Vec<SchemaColumn>> {
+        let Value::Array(arr) = v else { return None };
+        let mut out = Vec::with_capacity(arr.len());
+        for item in arr {
+            let o = item.as_object()?;
+            let name = o.get("name")?.as_str()?.to_string();
+            let data_type = o.get("type")?.as_str()?.to_string();
+            out.push(SchemaColumn { name, data_type });
+        }
+        Some(out)
+    }
+    fn find_field(v: &Value) -> Option<&Value> {
+        match v {
+            Value::Object(o) => o.get("output_schema"),
+            Value::Array(a) => a.iter().find_map(find_field),
+            _ => None,
+        }
+    }
+    let root = serde_json::from_str::<Value>(result.get()).ok()?;
+    match find_field(&root)? {
+        arr @ Value::Array(_) => collect(arr),
+        // FFI serialized the list-of-struct as a JSON string — parse it.
+        Value::String(s) => collect(&serde_json::from_str::<Value>(s).ok()?),
+        _ => None,
+    }
+}
+
+// Pull the `on_schema_change=warn` drift out of the materialize summary's
+// `schema_drift` column: a `{added: [..], removed: [..]}` struct (or NULL when
+// the SELECT matched the table). Like `output_schema`, the FFI may surface it
+// nested or as a JSON string — accept both. `None` when there is no drift.
+fn extract_schema_drift(result: &RawValue) -> Option<(Vec<String>, Vec<String>)> {
+    fn str_list(v: Option<&Value>) -> Vec<String> {
+        match v {
+            Some(Value::Array(a)) => a
+                .iter()
+                .filter_map(|x| x.as_str().map(str::to_string))
+                .collect(),
+            _ => Vec::new(),
+        }
+    }
+    fn find_field(v: &Value) -> Option<&Value> {
+        match v {
+            Value::Object(o) => o.get("schema_drift"),
+            Value::Array(a) => a.iter().find_map(find_field),
+            _ => None,
+        }
+    }
+    let root = serde_json::from_str::<Value>(result.get()).ok()?;
+    let field = find_field(&root)?;
+    let owned;
+    let obj = match field {
+        Value::Object(_) => field,
+        // FFI serialized the struct as a JSON string — parse it.
+        Value::String(s) => {
+            owned = serde_json::from_str::<Value>(s).ok()?;
+            &owned
+        }
+        // NULL / absent ⇒ no drift.
+        _ => return None,
+    };
+    let o = obj.as_object()?;
+    let added = str_list(o.get("added"));
+    let removed = str_list(o.get("removed"));
+    if added.is_empty() && removed.is_empty() {
+        None
+    } else {
+        Some((added, removed))
+    }
+}
+
+// Render the full pass/fail breakdown for a failed data-test run — every test,
+// not just the first failure, so the user sees the whole picture in one place.
+fn format_data_test_breakdown(asset_path: &str, tests: &[DataTestOutcome]) -> String {
+    let failed = tests.iter().filter(|t| t.violating > 0).count();
+    let mut lines = vec![format!(
+        "data tests failed on {asset_path} ({failed}/{} failed):",
+        tests.len()
+    )];
+    for t in tests {
+        if t.violating > 0 {
+            lines.push(format!("  ✗ {} — {} violating row(s)", t.name, t.violating));
+        } else {
+            lines.push(format!("  ✓ {}", t.name));
+        }
+    }
+    lines.join("\n")
+}
+
+// Best-effort record of a materialization outcome. On a Sql connection it writes
+// the row directly; on an agent worker (Http, no direct DB) it posts to the API
+// so state lands the same way. Never fails the job — a lost row degrades the
+// grid, not the run.
+async fn record_mat(
+    conn: &Connection,
+    w_id: &str,
+    job_id: Uuid,
+    meta: &MaterializeExec,
+    status: windmill_common::materialization::MaterializationStatus,
+    snapshot_id: Option<i64>,
+    row_count: Option<i64>,
+    // Captured output schema (gap #2a). Only set on a successful materialize;
+    // when present, also upserts a `materialized_asset_schema` version.
+    schema: Option<Vec<windmill_common::materialization::SchemaColumn>>,
+    error: Option<&str>,
+) {
+    let req = windmill_common::materialization::RecordMaterializationRequest {
+        asset_kind: meta.asset_kind,
+        asset_path: meta.asset_path.clone(),
+        partition: meta.partition.clone(),
+        status,
+        snapshot_id,
+        row_count,
+        job_id: Some(job_id),
+        error: error.map(|e| e.to_string()),
+        schema: schema.clone(),
+    };
+    let res: anyhow::Result<()> = match conn {
+        Connection::Sql(db) => {
+            let partition_res = windmill_common::materialization::record_materialization(
+                db,
+                w_id,
+                req.asset_kind,
+                &req.asset_path,
+                &req.partition,
+                req.status,
+                req.snapshot_id,
+                req.row_count,
+                req.job_id,
+                req.error.as_deref(),
+            )
+            .await
+            .map_err(|e| anyhow::anyhow!("{e:#}"));
+            // Schema capture is a separate, independently best-effort write (its
+            // own transaction for the per-asset advisory lock); a failure here
+            // must not lose the partition row above.
+            if let Some(cols) = schema.as_ref() {
+                if let Err(e) = record_asset_schema_best_effort(
+                    db,
+                    w_id,
+                    meta.asset_kind,
+                    &meta.asset_path,
+                    cols,
+                    snapshot_id,
+                    job_id,
+                )
+                .await
+                {
+                    tracing::warn!("failed to record captured asset schema: {e:#}");
+                }
+            }
+            partition_res
+        }
+        Connection::Http(client) => {
+            crate::agent_workers::record_materialization_from_agent_http(client, w_id, &req).await
+        }
+    };
+    if let Err(e) = res {
+        tracing::warn!("failed to record materialization state: {e:#}");
+    }
+}
+
+// Open a short transaction (needed for the per-asset advisory lock) and upsert
+// the captured schema version. Isolated so its tx lifetime doesn't entangle the
+// partition write.
+async fn record_asset_schema_best_effort(
+    db: &windmill_common::DB,
+    w_id: &str,
+    asset_kind: windmill_common::assets::AssetKind,
+    asset_path: &str,
+    columns: &[windmill_common::materialization::SchemaColumn],
+    snapshot_id: Option<i64>,
+    job_id: Uuid,
+) -> anyhow::Result<()> {
+    let mut tx = db.begin().await?;
+    windmill_common::materialization::record_asset_schema(
+        &mut tx,
+        w_id,
+        asset_kind,
+        asset_path,
+        columns,
+        snapshot_id,
+        Some(job_id),
+    )
+    .await?;
+    tx.commit().await?;
+    Ok(())
+}
+
 pub async fn do_duckdb(
     job: &MiniPulledJob,
     client: &AuthedClient,
@@ -68,7 +1330,59 @@ pub async fn do_duckdb(
         let mut hidden_passwords = hidden_passwords.clone();
         let mut bigquery_credentials = None;
 
+        // Materialization (`// materialize`): rewrite a wrap script into managed
+        // DDL (its synthetic target ATTACH is resolved by the transform pass
+        // below, like the user's own ATTACH); a literal script is left as-is.
+        // `materialize` also carries what to record once the run finishes.
+        let partition_value: Option<String> = job
+            .args
+            .as_ref()
+            .and_then(|a| a.0.get(windmill_common::partition::PARTITION_ARG))
+            .and_then(|rv| serde_json::from_str::<String>(rv.get()).ok())
+            .filter(|s| !s.is_empty());
+        let materialize = if query.contains("materialize") || query.contains("data_test") {
+            // Custom-test bodies need a DB read; fetch them first so the codegen
+            // itself stays pure/sync.
+            let custom_test_bodies =
+                fetch_custom_test_bodies(query, conn, &job.workspace_id).await?;
+            build_materialized_query(query, partition_value.as_deref(), &custom_test_bodies)?
+        } else {
+            None
+        };
+        // Parse the signature from the ORIGINAL script: managed materialize wraps
+        // the trailing SELECT and strips line comments, which drops the
+        // `-- $name (type)` arg declarations while their `$name` references
+        // survive in the embedded SELECT. Parsing args here (pre-wrap) keeps them
+        // declared so they are still bound — and s3object args translated to
+        // `s3://` URIs — at run time.
         let sig = parse_duckdb_sig(query)?.args;
+
+        // `// macros` / `// use` also come off the ORIGINAL script text (the
+        // materialize rewrite strips the annotation comments). Drives the
+        // workspace-macro injection after the ATTACH-transform pass below.
+        let macro_ann = windmill_parser::asset_parser::parse_pipeline_annotations(query);
+
+        let materialized_query;
+        let query: &str = match &materialize {
+            Some((Some(rewritten), _)) => {
+                materialized_query = rewritten.clone();
+                &materialized_query
+            }
+            _ => query,
+        };
+
+        // Managed materialize generates its own trailing summary row (asset /
+        // rows / snapshot_id / data_tests), and data-test enforcement below reads
+        // the `data_tests` column off that row. The row shape is ours, not the
+        // user's — so force the full-last-row strategy regardless of any
+        // `// result_collection` annotation, which would otherwise reshape it
+        // (e.g. a scalar mode drops every column but the first) and silently
+        // bypass test enforcement.
+        let collection_strategy = if matches!(&materialize, Some((Some(_), _))) {
+            SqlResultCollectionStrategy::LastStatementAllRows
+        } else {
+            collection_strategy
+        };
         let mut job_args = build_args_values(job, client, conn).await?;
 
         let reserved_variables =
@@ -76,7 +1390,27 @@ pub async fn do_duckdb(
 
         let (query, _) =
             &sanitize_and_interpolate_unsafe_sql_args(query, &sig, &job_args, &reserved_variables)?;
-        let query = transform_s3_uris(query).await?;
+        let mut query = transform_s3_uris(query).await?;
+
+        // `on_schema_change=sync`: interpolate the pre-pass probe with the same
+        // sig / args / reserved vars as the main query (before `sig` is consumed
+        // and the arg map drained just below) so its `DESCRIBE` of the SELECT
+        // binds `$args`/`$partition` the same way.
+        let sync_probe_interpolated = match materialize
+            .as_ref()
+            .and_then(|(_, m)| m.sync_prepass.as_ref())
+        {
+            Some(pp) => {
+                let (interp, _) = sanitize_and_interpolate_unsafe_sql_args(
+                    &pp.probe_query,
+                    &sig,
+                    &job_args,
+                    &reserved_variables,
+                )?;
+                Some(transform_s3_uris(&interp).await?)
+            }
+            None => None,
+        };
 
         let job_args = {
             let mut m = Vec::new();
@@ -111,6 +1445,96 @@ pub async fn do_duckdb(
             m
         };
 
+        // `on_schema_change=sync` pre-pass: run the probe (through the same
+        // ATTACH transform as the main query), diff the SELECT's columns against
+        // the table's, and splice the `ALTER TABLE … ADD/DROP COLUMN` DDL into
+        // the plan at the sentinel slot (removing the sentinel when there is no
+        // drift). Runs before the main query so the ALTERs are in place when the
+        // BY NAME insert executes.
+        if let (Some(probe_sql), Some(pp)) = (
+            &sync_probe_interpolated,
+            materialize
+                .as_ref()
+                .and_then(|(_, m)| m.sync_prepass.as_ref()),
+        ) {
+            let mut probe_blocks = vec![];
+            // Held for the whole probe (through compute_sync_alter_ddl): a
+            // `TYPE bigquery` ATTACH needs GOOGLE_APPLICATION_CREDENTIALS + the
+            // temp creds file set before DuckDB binds the extension, exactly as
+            // the main query path does — otherwise the probe DESCRIBE fails.
+            let mut probe_bigquery_credentials = None;
+            for query_block in parse_sql_blocks(probe_sql, true).iter() {
+                let query_block = remove_comments(query_block);
+                if let Some(parsed) = parse_attach_db_resource(query_block) {
+                    probe_blocks.extend(
+                        transform_attach_db_resource_query(
+                            &parsed,
+                            &job.id,
+                            client,
+                            &mut hidden_passwords,
+                        )
+                        .await?,
+                    );
+                    if parsed.db_type == "bigquery" {
+                        probe_bigquery_credentials = Some(UseBigQueryCredentialsFile::new(
+                            job.id,
+                            parsed.resource_path,
+                        )?);
+                    }
+                } else if let Some(q) = transform_attach_ducklake(
+                    &query_block,
+                    conn,
+                    &mut hidden_passwords,
+                    &job.workspace_id,
+                    materialize.as_ref().map(|(_, m)| m.asset_path.as_str()),
+                )
+                .await?
+                {
+                    probe_blocks.extend(q);
+                } else if let Some(q) = transform_attach_datatable(
+                    &query_block,
+                    conn,
+                    &mut hidden_passwords,
+                    &job.workspace_id,
+                )
+                .await?
+                {
+                    probe_blocks.extend(q);
+                } else {
+                    probe_blocks.push(query_block.to_string());
+                }
+            }
+            // The probe `DESCRIBE`s the same SELECT as the main query, so it
+            // needs the same workspace-macro / `// use` library definitions
+            // injected (post-ATTACH), or a macro-calling SELECT fails to bind
+            // here and the fatal probe makes `sync` unusable with macros.
+            let probe_blocks = inject_workspace_macros(
+                conn,
+                &job.workspace_id,
+                macro_ann.macros,
+                &macro_ann.use_libs,
+                probe_blocks,
+            )
+            .await?;
+            let alter_ddl = compute_sync_alter_ddl(
+                probe_blocks,
+                job_args.clone(),
+                pp.target_table.clone(),
+                token.clone(),
+                client.base_internal_url.clone(),
+                job.workspace_id.clone(),
+                job_dir.to_string(),
+            )
+            .await?;
+            query = query.replace(
+                windmill_parser::sql_materialize::SYNC_ALTER_SENTINEL,
+                &alter_ddl,
+            );
+            // Kept alive until the probe finished; the main query path recreates
+            // its own credentials for its own ATTACH pass below.
+            drop(probe_bigquery_credentials);
+        }
+
         let query_block_list = parse_sql_blocks(&query, true);
 
         // Replace custom ATTACH statements with the real instructions
@@ -139,6 +1563,7 @@ pub async fn do_duckdb(
                     conn,
                     &mut hidden_passwords,
                     &job.workspace_id,
+                    materialize.as_ref().map(|(_, m)| m.asset_path.as_str()),
                 )
                 .await?
                 {
@@ -159,6 +1584,19 @@ pub async fn do_duckdb(
             v
         };
 
+        // Workspace macros: splice `CREATE OR REPLACE TEMP MACRO` blocks for
+        // registry macros this script calls (plus whole `// use` libraries)
+        // after the setup/ATTACH prefix — post-transform, so macro bodies can
+        // reference the attached catalogs when DuckDB bind-checks the CREATE.
+        let query_block_list = inject_workspace_macros(
+            conn,
+            &job.workspace_id,
+            macro_ann.macros,
+            &macro_ann.use_libs,
+            query_block_list,
+        )
+        .await?;
+
         let base_internal_url = client.base_internal_url.clone();
         let w_id = job.workspace_id.clone();
         let job_dir = job_dir.to_string();
@@ -199,6 +1637,20 @@ pub async fn do_duckdb(
         let (result, column_order) = match result {
             Ok(r) => r,
             Err(e) => {
+                if let Some((_, meta)) = &materialize {
+                    record_mat(
+                        conn,
+                        &job.workspace_id,
+                        job.id,
+                        meta,
+                        windmill_common::materialization::MaterializationStatus::Failed,
+                        None,
+                        None,
+                        None,
+                        Some(&e.to_string()),
+                    )
+                    .await;
+                }
                 if let Some(s3_proxy_err) = S3_PROXY_LAST_ERRORS_CACHE.get(&client.token) {
                     return Err(Error::ExecutionErr(format!(
                         "{}\n\nS3 Related Error: {}",
@@ -210,6 +1662,157 @@ pub async fn do_duckdb(
             }
         };
 
+        if let Some((_, meta)) = &materialize {
+            // In wrap mode the job result is the summary read (snapshot_id +
+            // rows + the per-test breakdown); in literal mode there is none.
+            let snapshot_id = extract_i64(&result, "snapshot_id");
+            let row_count = extract_i64(&result, "rows");
+            // Data tests all ran (every check counted in one query); decide
+            // pass/fail here. Any violation fails the run — the write is already
+            // committed (like dbt), so the slice is recorded `Failed` and the
+            // cascade stops. The error lists *every* test so the user sees the
+            // whole picture, not just the first failure.
+            // Under enterprise write-audit-publish an in-transaction guard
+            // (the enterprise `finalize_materialize_query` restructure) already aborted a failing run before
+            // COMMIT — that surfaces on the Err path above with the same
+            // breakdown in the error string, and nothing was published; this
+            // post-commit path then only ever sees passing counts.
+            let tests = extract_data_tests(&result);
+            // Captured output schema (gap #2a) — recorded only on the successful
+            // path below, not on the failure paths (a failed run shouldn't
+            // advance the asset's recorded schema version). Managed mode ONLY:
+            // in `// materialize manual` the result is the user's own query
+            // output (we generate no summary), so an `output_schema` field there
+            // is caller-shaped and must not be trusted — `materialize` is
+            // `Some((Some(_), _))` for managed, `Some((None, _))` for manual.
+            let is_managed = matches!(&materialize, Some((Some(_), _)));
+            let schema = if is_managed {
+                extract_schema(&result)
+            } else {
+                None
+            };
+            // `on_schema_change=warn` (default): the summary carries a
+            // `schema_drift` column when the SELECT's columns diverged from the
+            // fixed table schema. The write already happened positionally (data
+            // may have landed in the wrong/old columns) — log it LOUDLY so the
+            // drift isn't silent. The drift also rides back in the job result
+            // (it's a column of the returned summary row).
+            if is_managed
+                && meta.on_schema_change == windmill_parser::asset_parser::OnSchemaChange::Warn
+            {
+                if let Some((added, removed)) = extract_schema_drift(&result) {
+                    let fmt = |cols: &[String]| {
+                        if cols.is_empty() {
+                            "(none)".to_string()
+                        } else {
+                            cols.join(", ")
+                        }
+                    };
+                    let warning = format!(
+                        "\n⚠️  SCHEMA DRIFT on {asset}: the SELECT's columns no longer match the \
+                         existing table.\n    added (in SELECT, not in table): {added}\n    removed \
+                         (in table, not in SELECT): {removed}\n    The write proceeded POSITIONALLY \
+                         against the existing table schema — data may have landed in the wrong \
+                         columns. Set `on_schema_change=fail` to block this, or \
+                         `on_schema_change=sync` to migrate the table automatically.\n",
+                        asset = meta.asset_path,
+                        added = fmt(&added),
+                        removed = fmt(&removed),
+                    );
+                    append_logs(&job.id, &job.workspace_id, warning, conn).await;
+                }
+            }
+            // Defense-in-depth: codegen embedded `n_data_tests` checks, so the
+            // summary row must carry that many outcomes. Recovering fewer means
+            // the `data_tests` column was dropped/reshaped before we read it —
+            // fail loud rather than silently pass unverified tests.
+            if tests.len() < meta.n_data_tests {
+                let msg = format!(
+                    "data tests on {}: expected {} test outcome(s) but recovered {} from the \
+                     result — aborting to avoid a silent pass",
+                    meta.asset_path,
+                    meta.n_data_tests,
+                    tests.len()
+                );
+                record_mat(
+                    conn,
+                    &job.workspace_id,
+                    job.id,
+                    meta,
+                    windmill_common::materialization::MaterializationStatus::Failed,
+                    snapshot_id,
+                    row_count,
+                    None,
+                    Some(&msg),
+                )
+                .await;
+                return Err(Error::ExecutionErr(msg));
+            }
+            if tests.iter().any(|t| t.violating > 0) {
+                let breakdown = format_data_test_breakdown(&meta.asset_path, &tests);
+                record_mat(
+                    conn,
+                    &job.workspace_id,
+                    job.id,
+                    meta,
+                    windmill_common::materialization::MaterializationStatus::Failed,
+                    snapshot_id,
+                    row_count,
+                    None,
+                    Some(&breakdown),
+                )
+                .await;
+                // Structured failure payload: the queue wraps it as
+                // `{"error": {...}}` (`WrappedError`) and result_processor
+                // derives the run description from the top-level `message`,
+                // so keep `message` at the top and add no `error` nesting of
+                // our own. Samples ride only on failed tests, only in this
+                // structured result — the message text stays counts-only.
+                let has_samples = tests.iter().any(|t| t.violating > 0 && t.sample.is_some());
+                let message = if has_samples {
+                    // Wording must not match the UI's breakdown-line parsing
+                    // (no ✓/✗, no `— N violating`), which older-result
+                    // rendering still relies on.
+                    format!(
+                        "{breakdown}\n\nSamples of the violating rows are \
+                         attached to this run's result (error.data_tests)."
+                    )
+                } else {
+                    breakdown
+                };
+                let data_tests = tests
+                    .iter()
+                    .map(|t| {
+                        let mut o = json!({ "test": t.name, "violating": t.violating });
+                        if t.violating > 0 {
+                            if let Some(s) = &t.sample {
+                                o["sample"] = s.clone();
+                            }
+                        }
+                        o
+                    })
+                    .collect::<Vec<_>>();
+                return Err(Error::ExecutionRawError(to_raw_value(&json!({
+                    "message": message,
+                    "name": "ExecutionErr",
+                    "step_id": job.flow_step_id,
+                    "data_tests": data_tests,
+                }))));
+            }
+            record_mat(
+                conn,
+                &job.workspace_id,
+                job.id,
+                meta,
+                windmill_common::materialization::MaterializationStatus::Materialized,
+                snapshot_id,
+                row_count,
+                schema,
+                None,
+            )
+            .await;
+        }
+
         drop(bigquery_credentials);
 
         *column_order_ref = column_order;
@@ -237,14 +1840,46 @@ pub async fn do_duckdb(
     match result {
         Ok(result) => Ok(result),
         Err(e) => {
-            // Passwords might appear in the error message
-            let mut err_str = e.to_string();
-            for pwd in hidden_passwords.lock().unwrap().iter() {
-                if let Some(sanitized) = sanitize_string_from_password(&err_str, &pwd.clone()) {
-                    err_str = sanitized;
+            // Passwords might appear in the error message — and, for the
+            // structured data-test failure, in sampled row data read from an
+            // attached database — so every outgoing error is sanitized here.
+            let sanitize = |mut s: String| {
+                for pwd in hidden_passwords.lock().unwrap().iter() {
+                    if let Some(sanitized) = sanitize_string_from_password(&s, &pwd.clone()) {
+                        s = sanitized;
+                    }
                 }
+                s
+            };
+            match e {
+                // The structured payload must keep its variant: flattening it
+                // to a string (the arm below) would strip the data-test
+                // samples result_processor places verbatim into the failed
+                // job's result. Sanitize its string *leaves*, not the
+                // serialized text: a secret containing `"` or `\` is
+                // JSON-escaped in the text, so a plain-substring pass would
+                // miss it — and samples carry raw row data from attached
+                // databases.
+                Error::ExecutionRawError(raw) => {
+                    fn walk(v: &mut Value, f: &dyn Fn(String) -> String) {
+                        match v {
+                            Value::String(s) => *s = f(std::mem::take(s)),
+                            Value::Array(a) => a.iter_mut().for_each(|x| walk(x, f)),
+                            Value::Object(o) => o.values_mut().for_each(|x| walk(x, f)),
+                            _ => {}
+                        }
+                    }
+                    Err(match serde_json::from_str::<Value>(raw.get()) {
+                        Ok(mut v) => {
+                            walk(&mut v, &sanitize);
+                            Error::ExecutionRawError(to_raw_value(&v))
+                        }
+                        // Not valid JSON (shouldn't happen) — redact as text.
+                        Err(_) => Error::ExecutionErr(sanitize(raw.get().to_string())),
+                    })
+                }
+                e => Err(Error::ExecutionErr(sanitize(e.to_string()))),
             }
-            Err(Error::ExecutionErr(err_str))
         }
     }
 }
@@ -383,6 +2018,15 @@ fn cgroup_bytes_to_duckdb_memory_limit(bytes: i64) -> Option<String> {
 }
 
 // Read backend/windmill-duckdb-ffi-internal/README_DEV.md for details about why we use FFI
+// The FFI returns errors as `ERROR <json-encoded-message>` (the message is
+// serde_json::to_string'd). Decode the JSON string back so multi-line errors
+// render with real newlines, not escaped `\n` inside wrapping quotes; fall back
+// to the raw slice if it is somehow not a JSON string.
+fn decode_ffi_error(result_str: &str) -> String {
+    let raw = result_str.strip_prefix("ERROR ").unwrap_or(result_str);
+    serde_json::from_str::<String>(raw).unwrap_or_else(|_| raw.to_string())
+}
+
 fn run_duckdb_ffi_safe<'a>(
     query_block_list: impl Iterator<Item = &'a str>,
     query_block_list_count: usize,
@@ -448,7 +2092,7 @@ fn run_duckdb_ffi_safe<'a>(
     };
 
     if result_str.starts_with("ERROR") {
-        Err(Error::ExecutionErr(result_str[6..].to_string()))
+        Err(Error::ExecutionErr(decode_ffi_error(&result_str)))
     } else {
         let result = if collection_strategy == SqlResultCollectionStrategy::AllStatementsAllRows {
             // Avoid parsing JSON
@@ -512,7 +2156,7 @@ fn prepare_duckdb_ffi_safe<'a>(
     };
 
     if result_str.starts_with("ERROR") {
-        Err(Error::ExecutionErr(result_str[6..].to_string()))
+        Err(Error::ExecutionErr(decode_ffi_error(&result_str)))
     } else {
         Ok(serde_json::value::RawValue::from_string(result_str).map_err(to_anyhow)?)
     }
@@ -663,6 +2307,7 @@ async fn transform_attach_ducklake(
     conn: &Connection,
     hidden_passwords: &mut Arc<Mutex<Vec<String>>>,
     w_id: &str,
+    materialize_target: Option<&str>,
 ) -> Result<Option<Vec<String>>> {
     lazy_static::lazy_static! {
         static ref RE: regex::Regex = regex::Regex::new(r"(?i)ATTACH\s*'ducklake(://[^':]+)?'\s*AS\s+([^ ;]+)\s*(\([^)]*\))?").unwrap();
@@ -672,15 +2317,28 @@ async fn transform_attach_ducklake(
     };
     let name = cap.get(1).map(|m| &m.as_str()[3..]).unwrap_or("main");
     let alias_name = cap.get(2).map(|m| m.as_str()).unwrap_or("");
-    let extra_args = cap
+    let user_extra_args = cap
         .get(3)
-        .map(|m| format!(", {}", &m.as_str()[1..m.as_str().len() - 1]))
-        .unwrap_or("".to_string());
+        .map(|m| m.as_str()[1..m.as_str().len() - 1].to_string())
+        .unwrap_or_default();
 
     let ducklake = match conn {
         Connection::Http(client) => get_ducklake_from_agent_http(client, name, w_id).await?,
         Connection::Sql(db) => get_ducklake_from_db_unchecked(name, w_id, db).await?,
     };
+    // In a fork, METADATA_SCHEMA / DATA_PATH / OVERRIDE_DATA_PATH are owned by the fork
+    // resolution (DuckDB silently keeps the last occurrence of a duplicated option, so a
+    // user-supplied one would escape the fork namespace back to the parent's).
+    let user_extra_args = if ducklake.fork_defer.is_some() {
+        strip_fork_reserved_attach_args(&user_extra_args)
+    } else {
+        user_extra_args
+    };
+    let extra_args = if user_extra_args.is_empty() {
+        String::new()
+    } else {
+        format!(", {}", user_extra_args)
+    };
     let db_type = match ducklake.catalog.resource_type {
         DucklakeCatalogResourceType::Instance => "postgres",
         _ => ducklake.catalog.resource_type.as_ref(),
@@ -726,17 +2384,170 @@ async fn transform_attach_ducklake(
     } else {
         format!(", AUTOMATIC_MIGRATION TRUE{extra_args}")
     };
+    // In a fork, re-emit the fork-owned DATA_PATH as the LAST option: DuckDB keeps the last
+    // occurrence of a duplicated option, so this wins over anything the arg stripping might
+    // not recognize (e.g. a dollar-quoted literal), regardless of literal syntax. The
+    // METADATA_SCHEMA injected by the fork resolution is already last within `extra_args`.
+    let extra_args = if ducklake.fork_defer.is_some() {
+        format!("{extra_args}, DATA_PATH 's3://{storage}/{data_path}'")
+    } else {
+        extra_args
+    };
 
     let attach_str = format!(
         "ATTACH 'ducklake:{db_type}:{db_conn_str}' AS {alias_name} (DATA_PATH 's3://{storage}/{data_path}'{extra_args});",
     );
 
     let install_db_ext_str = get_attach_db_install_str(db_type)?;
-    Ok(Some(vec![
+    let mut statements = vec![
         "INSTALL ducklake;".to_string(),
         install_db_ext_str.to_string(),
         attach_str,
-    ]))
+    ];
+    if let Some(defer) = ducklake.fork_defer.as_ref() {
+        statements.extend(fork_defer_statements(
+            name,
+            alias_name,
+            defer,
+            materialize_target,
+            hidden_passwords,
+        )?);
+    }
+    Ok(Some(statements))
+}
+
+// Double-quote a possibly schema-qualified table reference, each dotted segment
+// independently (local copy of sql_materialize's private helper).
+fn quote_qualified_table(name: &str) -> String {
+    name.split('.')
+        .map(|id| format!("\"{}\"", id.replace('"', "\"\"")))
+        .collect::<Vec<_>>()
+        .join(".")
+}
+
+// `schema.table` → `schema.table_current`: the SCD2 companion view lives next to its table.
+fn current_companion(table: &str) -> String {
+    match table.rsplit_once('.') {
+        Some((s, t)) => format!("{s}.{t}_current"),
+        None => format!("{table}_current"),
+    }
+}
+
+/// Statements appended after a fork workspace's lake ATTACH: read-only attaches of the
+/// ancestor namespaces plus `CREATE VIEW IF NOT EXISTS` defer views over the direct parent for
+/// every table the fork has not materialized. When this job's managed materialize targets one
+/// of the deferred tables, its defer view is dropped instead of created — the write must hit a
+/// real fork table (`CREATE [OR REPLACE] TABLE` refuses to replace a view).
+fn fork_defer_statements(
+    lake_name: &str,
+    alias_name: &str,
+    defer: &windmill_common::workspaces::DucklakeForkDefer,
+    materialize_target: Option<&str>,
+    hidden_passwords: &mut Arc<Mutex<Vec<String>>>,
+) -> Result<Vec<String>> {
+    let mut stmts = vec![];
+    if defer.ancestors.is_empty() {
+        // Defer unavailable (an ancestor no longer defines this lake); the fork namespace
+        // still isolates writes.
+        return Ok(stmts);
+    }
+    for a in &defer.ancestors {
+        if let Some(pwd) = a.catalog_resource.get("password").and_then(|p| p.as_str()) {
+            hidden_passwords.lock().unwrap().push(pwd.to_string());
+        }
+        let db_type = match a.catalog.resource_type {
+            DucklakeCatalogResourceType::Instance => "postgres",
+            _ => a.catalog.resource_type.as_ref(),
+        };
+        stmts.push(get_attach_db_install_str(db_type)?.to_string());
+        let conn_str =
+            format_attach_db_conn_str(a.catalog_resource.clone(), db_type)?.replace('\'', "''");
+        let storage = a
+            .storage
+            .storage
+            .as_deref()
+            .unwrap_or(DEFAULT_STORAGE)
+            .replace('\'', "''");
+        let data_path = a.storage.path.replace('\'', "''");
+        let metadata_schema = a
+            .metadata_schema
+            .as_ref()
+            .map(|s| format!(", METADATA_SCHEMA '{}'", s.replace('\'', "''")))
+            .unwrap_or_default();
+        // The ancestor config's own non-reserved args (e.g. `ENCRYPTED true`) — an
+        // option-dependent lake wouldn't attach without them. Emitted FIRST: DuckDB keeps the
+        // last occurrence of a duplicated option, so the fork-owned DATA_PATH / READ_ONLY /
+        // METADATA_SCHEMA after them always win.
+        let extra_args = a
+            .extra_args
+            .as_ref()
+            .map(|e| format!("{e}, "))
+            .unwrap_or_default();
+        // READ_ONLY: a fork job must never write an ancestor namespace. No AUTOMATIC_MIGRATION
+        // / CREATE_IF_NOT_EXISTS: an ancestor lake that would need creating or migrating fails
+        // loudly rather than being mutated from a fork. IF NOT EXISTS: several ATTACH blocks in
+        // one script (e.g. the user's + the materialize synthetic one) emit the same ancestors.
+        stmts.push(format!(
+            "ATTACH IF NOT EXISTS 'ducklake:{db_type}:{conn_str}' AS {} ({extra_args}DATA_PATH 's3://{storage}/{data_path}', OVERRIDE_DATA_PATH TRUE, READ_ONLY{metadata_schema});",
+            a.alias
+        ));
+    }
+    let parent_alias = &defer.ancestors[0].alias;
+    let target_table = materialize_target.and_then(|ap| {
+        let (l, t) = ap.split_once('/')?;
+        (l == lake_name).then_some(t)
+    });
+    let mut created_schemas = std::collections::HashSet::new();
+    for dt in &defer.defer_tables {
+        if Some(dt.table.as_str()) == target_table {
+            continue;
+        }
+        // Each view targets the NEAREST ancestor that physically owns the table (a direct
+        // parent that itself defers has no copy to bind against). Out-of-range index (never
+        // produced by the resolver, but the field crosses the agent wire) falls back to the
+        // direct parent rather than panicking.
+        let owner_alias = defer
+            .ancestors
+            .get(dt.ancestor_idx as usize)
+            .map(|a| a.alias.as_str())
+            .unwrap_or(parent_alias);
+        if let Some((schema, _)) = dt.table.rsplit_once('.') {
+            if created_schemas.insert(schema) {
+                stmts.push(format!(
+                    "CREATE SCHEMA IF NOT EXISTS {alias_name}.{};",
+                    quote_qualified_table(schema)
+                ));
+            }
+        }
+        let q = quote_qualified_table(&dt.table);
+        stmts.push(format!(
+            "CREATE VIEW IF NOT EXISTS {alias_name}.{q} AS SELECT * FROM {owner_alias}.{q};"
+        ));
+        if dt.with_current_view {
+            let qc = quote_qualified_table(&current_companion(&dt.table));
+            stmts.push(format!(
+                "CREATE VIEW IF NOT EXISTS {alias_name}.{qc} AS SELECT * FROM {owner_alias}.{qc};"
+            ));
+        }
+    }
+    if let Some(t) = target_table {
+        // View→table transition: replace the target's defer view(s) with the real table this
+        // job writes (`CREATE [OR REPLACE] TABLE` refuses to replace a view). Keyed on the
+        // catalog's ACTUAL live views — not on recorded materialization status, which after a
+        // failed run can't tell a defer view from a real table, and a mismatched DROP VIEW
+        // would wedge the asset. `_current` is dropped too when it is a view — SCD2 codegen
+        // recreates it with `IF NOT EXISTS`, which would otherwise silently keep a view over
+        // the parent.
+        for name in [t.to_string(), current_companion(t)] {
+            if defer.fork_views.iter().any(|v| v == &name) {
+                stmts.push(format!(
+                    "DROP VIEW IF EXISTS {alias_name}.{};",
+                    quote_qualified_table(&name)
+                ));
+            }
+        }
+    }
+    Ok(stmts)
 }
 
 async fn transform_attach_datatable(
@@ -841,6 +2652,591 @@ pub struct Arg {
 mod tests {
     use super::*;
 
+    #[test]
+    fn decode_ffi_error_unescapes_multiline_and_strips_quotes() {
+        // Mirror the FFI: JSON-encode the raw DuckDB message, prefix "ERROR ".
+        let raw_msg = "Invalid Input Error: data tests failed on main/raw_orders \
+             (1/3 failed) — write rolled back, previous version left live:\n  \
+             ✓ not_null(order_id)\n  ✗ accepted_values(status) — 12 violating row(s)";
+        let ffi = format!("ERROR {}", serde_json::to_string(raw_msg).unwrap());
+        let decoded = decode_ffi_error(&ffi);
+        assert_eq!(decoded, raw_msg);
+        // real newlines, no literal `\n`, no wrapping quotes
+        assert!(decoded.contains('\n') && !decoded.contains("\\n"));
+        assert!(!decoded.starts_with('"'));
+        // single-line error with inner quotes round-trips unescaped
+        let single = format!(
+            "ERROR {}",
+            serde_json::to_string("Binder Error: column \"x\" not found").unwrap()
+        );
+        assert_eq!(
+            decode_ffi_error(&single),
+            "Binder Error: column \"x\" not found"
+        );
+        // non-JSON payload falls back to the raw slice
+        assert_eq!(decode_ffi_error("ERROR not json"), "not json");
+    }
+
+    fn test_ancestor(wid: &str) -> windmill_common::workspaces::DucklakeAncestorAttach {
+        windmill_common::workspaces::DucklakeAncestorAttach {
+            workspace_id: wid.to_string(),
+            alias: format!("__wm_dl_lake_{}_abcd1234", wid.replace('-', "_")),
+            catalog: windmill_common::workspaces::DucklakeCatalog {
+                resource_type: windmill_common::workspaces::DucklakeCatalogResourceType::Instance,
+                resource_path: "cat_db".to_string(),
+            },
+            catalog_resource: serde_json::json!({
+                "host": "h", "dbname": "cat_db", "user": "u", "password": "pw"
+            }),
+            storage: windmill_common::workspaces::DucklakeStorage {
+                storage: None,
+                path: "lake".to_string(),
+            },
+            metadata_schema: None,
+            extra_args: None,
+        }
+    }
+
+    fn test_fork_defer_chain(
+        ancestor_wids: Vec<&str>,
+        defer_tables: Vec<(&str, bool, u32)>,
+        fork_views: Vec<&str>,
+    ) -> windmill_common::workspaces::DucklakeForkDefer {
+        windmill_common::workspaces::DucklakeForkDefer {
+            ancestors: ancestor_wids.into_iter().map(test_ancestor).collect(),
+            defer_tables: defer_tables
+                .into_iter()
+                .map(
+                    |(t, cur, idx)| windmill_common::materialization::ForkDeferTable {
+                        table: t.to_string(),
+                        with_current_view: cur,
+                        ancestor_idx: idx,
+                    },
+                )
+                .collect(),
+            fork_views: fork_views.into_iter().map(str::to_string).collect(),
+        }
+    }
+
+    fn test_fork_defer(
+        defer_tables: Vec<(&str, bool)>,
+        fork_views: Vec<&str>,
+    ) -> windmill_common::workspaces::DucklakeForkDefer {
+        test_fork_defer_chain(
+            vec!["parent-ws"],
+            defer_tables.into_iter().map(|(t, c)| (t, c, 0)).collect(),
+            fork_views,
+        )
+    }
+
+    #[test]
+    fn test_fork_defer_statements_ancestor_extra_args() {
+        // The ancestor config's own args (e.g. ENCRYPTED) must ride on its read-only attach —
+        // BEFORE the fork-owned options, so DuckDB's last-occurrence-wins keeps DATA_PATH /
+        // READ_ONLY / METADATA_SCHEMA authoritative even if the args tried to override them.
+        let mut defer = test_fork_defer(vec![("orders", false)], vec![]);
+        defer.ancestors[0].extra_args = Some("ENCRYPTED true".to_string());
+        let mut hp = Arc::new(Mutex::new(vec![]));
+        let stmts = fork_defer_statements("lake", "dl", &defer, None, &mut hp).unwrap();
+        let attach = stmts
+            .iter()
+            .find(|s| s.starts_with("ATTACH IF NOT EXISTS"))
+            .unwrap();
+        assert!(attach.contains("(ENCRYPTED true, DATA_PATH "), "{attach}");
+        assert!(
+            attach.find("ENCRYPTED true").unwrap() < attach.find("READ_ONLY").unwrap(),
+            "{attach}"
+        );
+    }
+
+    #[test]
+    fn test_fork_defer_statements_chained_ancestors() {
+        // fork → parent → root: `orders` was only materialized in the root (idx 1) — its view
+        // must target the ROOT alias (the parent has no physical copy); `daily` owned by the
+        // direct parent (idx 0) targets the parent alias. Out-of-range idx falls back to the
+        // direct parent instead of panicking.
+        let defer = test_fork_defer_chain(
+            vec!["parent-ws", "root-ws"],
+            vec![("orders", false, 1), ("daily", false, 0), ("oob", false, 9)],
+            vec![],
+        );
+        let mut hp = Arc::new(Mutex::new(vec![]));
+        let stmts = fork_defer_statements("lake", "dl", &defer, None, &mut hp).unwrap();
+        let joined = stmts.join("\n");
+        assert!(
+            joined.contains(
+                "CREATE VIEW IF NOT EXISTS dl.\"orders\" AS SELECT * FROM __wm_dl_lake_root_ws_abcd1234.\"orders\""
+            ),
+            "{joined}"
+        );
+        assert!(
+            joined.contains(
+                "CREATE VIEW IF NOT EXISTS dl.\"daily\" AS SELECT * FROM __wm_dl_lake_parent_ws_abcd1234.\"daily\""
+            ),
+            "{joined}"
+        );
+        assert!(
+            joined.contains(
+                "CREATE VIEW IF NOT EXISTS dl.\"oob\" AS SELECT * FROM __wm_dl_lake_parent_ws_abcd1234.\"oob\""
+            ),
+            "{joined}"
+        );
+        // Both ancestors attached read-only.
+        assert_eq!(
+            joined.matches("ATTACH IF NOT EXISTS").count(),
+            2,
+            "{joined}"
+        );
+    }
+
+    #[test]
+    fn test_fork_defer_statements_shape() {
+        let defer = test_fork_defer(vec![("orders", false), ("dim", true)], vec![]);
+        let mut hp = Arc::new(Mutex::new(vec![]));
+        let stmts = fork_defer_statements("lake", "dl", &defer, None, &mut hp).unwrap();
+        let joined = stmts.join("\n");
+        // Ancestor attach: read-only, idempotent, never auto-migrating or auto-creating.
+        assert!(joined.contains("ATTACH IF NOT EXISTS"), "{joined}");
+        assert!(joined.contains("READ_ONLY"), "{joined}");
+        assert!(!joined.contains("AUTOMATIC_MIGRATION"), "{joined}");
+        assert!(!joined.contains("CREATE_IF_NOT_EXISTS"), "{joined}");
+        // Ancestor catalog password is hidden from logs.
+        assert_eq!(hp.lock().unwrap().as_slice(), ["pw"]);
+        // Defer views over the parent alias, plus the SCD2 `_current` companion.
+        assert!(
+            joined.contains(
+                "CREATE VIEW IF NOT EXISTS dl.\"orders\" AS SELECT * FROM __wm_dl_lake_parent_ws_abcd1234.\"orders\""
+            ),
+            "{joined}"
+        );
+        assert!(joined.contains("dl.\"dim_current\""), "{joined}");
+        // No target → no transition drops.
+        assert!(!joined.contains("DROP VIEW"), "{joined}");
+    }
+
+    #[test]
+    fn test_fork_defer_statements_target_transition() {
+        // Target currently a defer view → skip its CREATE, drop the view (+ companion).
+        let defer = test_fork_defer(vec![("orders", false)], vec!["orders", "orders_current"]);
+        let mut hp = Arc::new(Mutex::new(vec![]));
+        let stmts =
+            fork_defer_statements("lake", "_wm_target", &defer, Some("lake/orders"), &mut hp)
+                .unwrap();
+        let joined = stmts.join("\n");
+        assert!(!joined.contains("CREATE VIEW"), "{joined}");
+        assert!(
+            joined.contains("DROP VIEW IF EXISTS _wm_target.\"orders\";"),
+            "{joined}"
+        );
+        assert!(
+            joined.contains("DROP VIEW IF EXISTS _wm_target.\"orders_current\";"),
+            "{joined}"
+        );
+
+        // Target already a real table (NOT in fork_views, e.g. after a failed re-run whose
+        // status can't be trusted) → no DROP VIEW, or the job would wedge on a type mismatch.
+        let defer = test_fork_defer(vec![("orders", false)], vec![]);
+        let stmts =
+            fork_defer_statements("lake", "_wm_target", &defer, Some("lake/orders"), &mut hp)
+                .unwrap();
+        assert!(!stmts.join("\n").contains("DROP VIEW"), "{stmts:?}");
+
+        // Target in a different lake → this lake's defer views are untouched.
+        let defer = test_fork_defer(vec![("orders", false)], vec!["orders"]);
+        let stmts =
+            fork_defer_statements("lake", "dl", &defer, Some("other/orders"), &mut hp).unwrap();
+        let joined = stmts.join("\n");
+        assert!(
+            joined.contains("CREATE VIEW IF NOT EXISTS dl.\"orders\""),
+            "{joined}"
+        );
+        assert!(!joined.contains("DROP VIEW"), "{joined}");
+    }
+
+    #[test]
+    fn test_fork_defer_statements_schema_qualified() {
+        let defer = test_fork_defer(vec![("staging.raw", false)], vec![]);
+        let mut hp = Arc::new(Mutex::new(vec![]));
+        let stmts = fork_defer_statements("lake", "dl", &defer, None, &mut hp).unwrap();
+        let joined = stmts.join("\n");
+        assert!(
+            joined.contains("CREATE SCHEMA IF NOT EXISTS dl.\"staging\";"),
+            "{joined}"
+        );
+        assert!(
+            joined.contains("CREATE VIEW IF NOT EXISTS dl.\"staging\".\"raw\""),
+            "{joined}"
+        );
+    }
+
+    fn mrow(name: &str, params: &str, body: &str, is_table: bool, provider: &str) -> MacroRow {
+        MacroRow {
+            name: name.to_string(),
+            params: params.to_string(),
+            body: body.to_string(),
+            is_table_macro: is_table,
+            provider_path: provider.to_string(),
+        }
+    }
+
+    fn blocks(list: &[&str]) -> Vec<String> {
+        list.iter().map(|s| s.to_string()).collect()
+    }
+
+    // Mimics the shell: resolve (incl. transitive library `// use`), parse the
+    // given lib sources, plan. `libs` maps provider path → deployed source
+    // (must cover every relevant provider).
+    fn select_and_plan(
+        b: &[String],
+        registry: &[MacroRow],
+        use_libs: &[&str],
+        libs: &[(&str, &str)],
+    ) -> Result<Vec<String>> {
+        use windmill_parser::asset_parser::parse_pipeline_annotations;
+        use windmill_parser::duckdb_macros::parse_macro_library;
+        let use_libs: Vec<String> = use_libs.iter().map(|s| s.to_string()).collect();
+        let lib_uses = libs
+            .iter()
+            .map(|(p, src)| (p.to_string(), parse_pipeline_annotations(src).use_libs))
+            .collect();
+        let (selected, effective) = resolve_macro_selection(b, registry, &use_libs, &lib_uses)?;
+        let lib_bodies = libs
+            .iter()
+            .map(|(p, src)| (p.to_string(), parse_macro_library(src).unwrap()))
+            .collect();
+        plan_macro_injection(&selected, registry, &effective, &lib_bodies)
+    }
+
+    #[test]
+    fn macro_injection_detects_and_orders_transitively() {
+        // consumer calls `outer`; `outer` calls `inner` — both injected, inner first.
+        let registry = vec![
+            mrow("outer", "a", "inner(a) + 1", false, "f/lib/m"),
+            mrow("inner", "a", "a * 2", false, "f/lib/m"),
+            mrow("unused", "a", "a", false, "f/lib/m"),
+        ];
+        let b = blocks(&["ATTACH 'x.duckdb' AS ext;", "SELECT outer(1);"]);
+        let injected = select_and_plan(&b, &registry, &[], &[("f/lib/m", "")]).unwrap();
+        assert_eq!(
+            injected,
+            vec![
+                "CREATE OR REPLACE TEMP MACRO inner(a) AS a * 2;".to_string(),
+                "CREATE OR REPLACE TEMP MACRO outer(a) AS inner(a) + 1;".to_string(),
+            ]
+        );
+    }
+
+    #[test]
+    fn implicit_call_injects_provider_setup() {
+        // A macro whose body references its own lib's ATTACH must carry that
+        // setup even on the implicit (detection) path — DuckDB bind-checks the
+        // body at CREATE, so `ext` must be attached first.
+        let registry = vec![mrow(
+            "lookup",
+            "k",
+            "(SELECT v FROM ext.kv WHERE key = k)",
+            false,
+            "f/lib/m",
+        )];
+        let b = blocks(&["SELECT lookup('a');"]);
+        let injected = select_and_plan(
+            &b,
+            &registry,
+            &[],
+            &[(
+                "f/lib/m",
+                "ATTACH 'ext.duckdb' AS ext;\nCREATE MACRO lookup(k) AS (SELECT v FROM ext.kv WHERE key = k);",
+            )],
+        )
+        .unwrap();
+        assert_eq!(injected[0], "ATTACH 'ext.duckdb' AS ext;");
+        assert!(injected[1].contains("TEMP MACRO lookup(k)"));
+    }
+
+    #[test]
+    fn provider_lib_use_is_honored_transitively() {
+        // Lib B's macro calls `base_macro` inside a string (invisible to
+        // lexical detection), so B declares `// use f/lib/base`. A consumer
+        // that merely calls B's macro must still get base's whole library —
+        // the dynamic dependency is encapsulated in B, not leaked to every
+        // consumer.
+        let registry = vec![
+            mrow(
+                "str_macro",
+                "",
+                "(SELECT v FROM query('SELECT base_macro() AS v'))",
+                false,
+                "f/lib/b",
+            ),
+            mrow("base_macro", "", "42", false, "f/lib/base"),
+        ];
+        let b = blocks(&["SELECT str_macro();"]);
+        let injected = select_and_plan(
+            &b,
+            &registry,
+            &[],
+            &[
+                (
+                    "f/lib/b",
+                    "-- macros\n-- use f/lib/base\nCREATE MACRO str_macro() AS (SELECT v FROM query('SELECT base_macro() AS v'));",
+                ),
+                ("f/lib/base", "-- macros\nCREATE MACRO base_macro() AS 42;"),
+            ],
+        )
+        .unwrap();
+        assert!(
+            injected
+                .iter()
+                .any(|s| s.contains("TEMP MACRO base_macro()")),
+            "{injected:?}"
+        );
+        assert!(injected
+            .iter()
+            .any(|s| s.contains("TEMP MACRO str_macro()")));
+        // Both defs are injected; string-hidden deps carry no topo edge, so
+        // their relative order falls back to name-sorted ties (deterministic
+        // for this input — the assertion pins the current behavior).
+        let base_idx = injected
+            .iter()
+            .position(|s| s.contains("TEMP MACRO base_macro()"))
+            .unwrap();
+        let str_idx = injected
+            .iter()
+            .position(|s| s.contains("TEMP MACRO str_macro()"))
+            .unwrap();
+        assert!(base_idx < str_idx, "{injected:?}");
+    }
+
+    #[test]
+    fn duplicate_setup_across_libs_is_deduped() {
+        // Two libs attaching the same catalog identically must not double-ATTACH.
+        let registry = vec![
+            mrow("m1", "a", "a", false, "f/lib/one"),
+            mrow("m2", "a", "a", false, "f/lib/two"),
+        ];
+        let b = blocks(&["SELECT m1(1), m2(2);"]);
+        let src = "ATTACH 'ext.duckdb' AS ext;\nCREATE MACRO m1(a) AS a;";
+        let src2 = "ATTACH 'ext.duckdb' AS ext;\nCREATE MACRO m2(a) AS a;";
+        let injected = select_and_plan(
+            &b,
+            &registry,
+            &[],
+            &[("f/lib/one", src), ("f/lib/two", src2)],
+        )
+        .unwrap();
+        assert_eq!(
+            injected
+                .iter()
+                .filter(|s| s.starts_with("ATTACH 'ext.duckdb'"))
+                .count(),
+            1
+        );
+    }
+
+    #[test]
+    fn macro_injection_empty_when_nothing_called() {
+        let registry = vec![mrow("m", "a", "a", false, "f/lib/m")];
+        let b = blocks(&["SELECT 1;"]);
+        assert!(select_workspace_macros(&b, &registry, &[])
+            .unwrap()
+            .is_empty());
+    }
+
+    #[test]
+    fn local_definition_wins_over_registry() {
+        // A consumer defining its own `dbl` must never get the registry's
+        // version injected — a library deploy can't change this job.
+        let registry = vec![mrow("dbl", "a", "a * 10", false, "f/lib/m")];
+        let b = blocks(&["CREATE TEMP MACRO dbl(a) AS a * 2;", "SELECT dbl(4);"]);
+        assert!(select_workspace_macros(&b, &registry, &[])
+            .unwrap()
+            .is_empty());
+    }
+
+    #[test]
+    fn use_lib_setup_survives_when_no_macros_selected() {
+        // Every lib macro shadowed locally — the explicit `// use` must still
+        // carry the lib's setup statements (its ATTACH side effects).
+        let registry = vec![mrow("dbl", "a", "a * 10", false, "f/lib/m")];
+        let b = blocks(&["CREATE TEMP MACRO dbl(a) AS a * 2;", "SELECT dbl(4);"]);
+        let injected = select_and_plan(
+            &b,
+            &registry,
+            &["f/lib/m"],
+            &[(
+                "f/lib/m",
+                "ATTACH 'ext.duckdb' AS ext;\nCREATE MACRO dbl(a) AS a * 10;",
+            )],
+        )
+        .unwrap();
+        assert_eq!(injected, vec!["ATTACH 'ext.duckdb' AS ext;".to_string()]);
+    }
+
+    #[test]
+    fn weave_lands_after_local_definition_it_references() {
+        // Injected bodies may call a local macro (local-wins excludes it from
+        // the registry set), so the leading local CREATE must run first.
+        let b = blocks(&[
+            "ATTACH 'x' AS a;",
+            "CREATE MACRO local_dbl(a) AS a * 2;",
+            "SELECT registry_m(1);",
+        ]);
+        let out = weave_macro_blocks(
+            b,
+            vec!["CREATE OR REPLACE TEMP MACRO registry_m(a) AS local_dbl(a) + 1;".into()],
+        )
+        .unwrap();
+        assert_eq!(
+            out[2],
+            "CREATE OR REPLACE TEMP MACRO registry_m(a) AS local_dbl(a) + 1;"
+        );
+    }
+
+    #[test]
+    fn weave_lands_before_local_definition_that_calls_it() {
+        // The inverse direction: a LOCAL macro whose body calls a registry
+        // macro bind-checks at its own CREATE, so the injected definition
+        // (and its library setup) must come first.
+        let b = blocks(&[
+            "CREATE MACRO outer(x) AS shared_inner(x) + 1;",
+            "SELECT outer(1);",
+        ]);
+        let out = weave_macro_blocks(
+            b,
+            vec![
+                "ATTACH 'ext.duckdb' AS ext;".into(),
+                "CREATE OR REPLACE TEMP MACRO shared_inner(x) AS x * 2;".into(),
+            ],
+        )
+        .unwrap();
+        assert_eq!(
+            out,
+            blocks(&[
+                "ATTACH 'ext.duckdb' AS ext;",
+                "CREATE OR REPLACE TEMP MACRO shared_inner(x) AS x * 2;",
+                "CREATE MACRO outer(x) AS shared_inner(x) + 1;",
+                "SELECT outer(1);",
+            ])
+        );
+    }
+
+    #[test]
+    fn weave_pulls_injected_dependencies_before_the_calling_local() {
+        // outer(local) calls injected `mid`, whose body calls injected `base`:
+        // both must precede the local definition, base before mid.
+        let b = blocks(&["CREATE MACRO outer(x) AS mid(x) + 1;", "SELECT outer(1);"]);
+        let out = weave_macro_blocks(
+            b,
+            vec![
+                "CREATE OR REPLACE TEMP MACRO base(x) AS x * 2;".into(),
+                "CREATE OR REPLACE TEMP MACRO mid(x) AS base(x) + 1;".into(),
+            ],
+        )
+        .unwrap();
+        let pos = |needle: &str| out.iter().position(|s| s.contains(needle)).unwrap();
+        assert!(pos("MACRO base(x)") < pos("MACRO mid(x)"));
+        assert!(pos("MACRO mid(x)") < pos("MACRO outer(x)"));
+    }
+
+    #[test]
+    fn weave_conflicting_local_order_errors() {
+        // local_a calls injected X; X references local_b, defined after
+        // local_a — unsatisfiable, must error rather than silently mis-order.
+        let b = blocks(&[
+            "CREATE MACRO local_a(x) AS conflicted(x);",
+            "CREATE MACRO local_b(x) AS x * 3;",
+            "SELECT local_a(1);",
+        ]);
+        let err = weave_macro_blocks(
+            b,
+            vec!["CREATE OR REPLACE TEMP MACRO conflicted(x) AS local_b(x) + 1;".into()],
+        )
+        .unwrap_err()
+        .to_string();
+        assert!(err.contains("conflicting"), "{err}");
+    }
+
+    #[test]
+    fn use_lib_injects_all_macros_and_setup() {
+        let registry = vec![
+            mrow("m1", "a", "a", false, "f/lib/m"),
+            mrow("m2", "", "SELECT 1", true, "f/lib/m"),
+        ];
+        let b = blocks(&["SELECT 'no calls here';"]);
+        let injected = select_and_plan(
+            &b,
+            &registry,
+            &["f/lib/m"],
+            &[(
+                "f/lib/m",
+                "ATTACH 'ext.duckdb' AS ext;\nCREATE MACRO m1(a) AS a;\nCREATE MACRO m2() AS TABLE SELECT 1;",
+            )],
+        )
+        .unwrap();
+        assert_eq!(injected[0], "ATTACH 'ext.duckdb' AS ext;");
+        assert!(injected[1..].iter().any(|s| s.contains("TEMP MACRO m1(a)")));
+        assert!(injected[1..]
+            .iter()
+            .any(|s| s.contains("TEMP MACRO m2() AS TABLE")));
+    }
+
+    #[test]
+    fn use_lib_without_registry_rows_errors() {
+        let b = blocks(&["SELECT 1;"]);
+        let err = select_workspace_macros(&b, &[], &["f/lib/gone".to_string()])
+            .unwrap_err()
+            .to_string();
+        assert!(err.contains("no deployed macro library"), "{err}");
+    }
+
+    #[test]
+    fn weave_lands_after_setup_prefix() {
+        let b = blocks(&[
+            "INSTALL ducklake;",
+            "ATTACH 'ducklake:postgres:...' AS lake (DATA_PATH 's3://x');",
+            "CREATE TABLE IF NOT EXISTS lake.t AS SELECT 1;",
+            "SELECT dbl(1);",
+        ]);
+        let out = weave_macro_blocks(
+            b,
+            vec!["CREATE OR REPLACE TEMP MACRO dbl(a) AS a * 2;".into()],
+        )
+        .unwrap();
+        assert_eq!(out[2], "CREATE OR REPLACE TEMP MACRO dbl(a) AS a * 2;");
+        assert_eq!(out.len(), 5);
+    }
+
+    #[test]
+    fn weave_setup_runs_before_all_user_blocks() {
+        // Injected library setup is self-contained and anything in the
+        // consumer may depend on it at bind time — it always goes first.
+        let out = weave_macro_blocks(blocks(&["ATTACH 'x' AS a;"]), blocks(&["m;"])).unwrap();
+        assert_eq!(out, blocks(&["m;", "ATTACH 'x' AS a;"]));
+        let out = weave_macro_blocks(vec![], blocks(&["m;"])).unwrap();
+        assert_eq!(out, blocks(&["m;"]));
+    }
+
+    #[test]
+    fn weave_use_setup_precedes_local_shadow_that_references_it() {
+        // `// use` with every lib macro shadowed locally: no defs are
+        // injected, but the local shadow's body references the lib's
+        // ATTACHed catalog — the injected setup must still run first or the
+        // local CREATE bind-fails.
+        let b = blocks(&[
+            "CREATE TEMP MACRO kv_lookup(k) AS (SELECT v FROM ext.kv WHERE key = k);",
+            "SELECT kv_lookup('a');",
+        ]);
+        let out = weave_macro_blocks(b, vec!["ATTACH 'ext.duckdb' AS ext;".into()]).unwrap();
+        assert_eq!(
+            out,
+            blocks(&[
+                "ATTACH 'ext.duckdb' AS ext;",
+                "CREATE TEMP MACRO kv_lookup(k) AS (SELECT v FROM ext.kv WHERE key = k);",
+                "SELECT kv_lookup('a');",
+            ])
+        );
+    }
+
     #[test]
     fn cgroup_bytes_unlimited_or_invalid_returns_none() {
         assert_eq!(cgroup_bytes_to_duckdb_memory_limit(0), None);
@@ -879,6 +3275,319 @@ mod tests {
         );
     }
 
+    // Managed `// materialize` may take SQL args (e.g. an s3object uploaded on
+    // the run form). The wrap strips line comments — including the
+    // `-- $name (type)` declarations — so the executor parses the signature from
+    // the original script (done above, before the rewrite) while the `$name`
+    // references survive inside the wrapped SELECT. This pins both halves of that
+    // contract so a regression that drops either is caught.
+    #[test]
+    fn materialize_preserves_sql_args() {
+        let script = "-- materialize ducklake://main/rows\n\
+                      -- $file (s3object)\n\
+                      SELECT * FROM read_json_auto($file)";
+
+        // The signature is recoverable from the original (un-wrapped) script.
+        let sig = parse_duckdb_sig(script).expect("sig parses").args;
+        let file_arg = sig
+            .iter()
+            .find(|a| a.name == "file")
+            .expect("`$file` declared");
+        assert_eq!(file_arg.otyp.as_deref(), Some("s3object"));
+
+        // The wrapped query still references `$file`, so the parsed sig binds it.
+        // No custom data tests here, so no fetched bodies are needed.
+        let (rewritten, _) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(
+            rewritten.contains("$file"),
+            "wrapped query must keep the `$file` reference, got:\n{rewritten}"
+        );
+        // The declaration comment is gone (wrap strips line comments) — which is
+        // exactly why the sig must come from the original, not the rewrite.
+        assert!(!rewritten.contains("-- $file"));
+    }
+
+    // A `// partitioned` script referencing `$partition` needs no manual
+    // `-- $partition (text)` declaration: the parser auto-declares the arg, so
+    // the executor binds the injected `partition` job arg instead of failing
+    // with duckdb's "Wrong number of parameters" at prepare time.
+    #[test]
+    fn partitioned_auto_declares_partition_arg() {
+        let script = "// partitioned daily\n\
+                      // materialize ducklake://main/sales_daily\n\
+                      SELECT $partition AS day, count(*) AS n FROM dl.sales WHERE day = $partition";
+
+        let sig = parse_duckdb_sig(script).expect("sig parses").args;
+        let partition_arg = sig
+            .iter()
+            .find(|a| a.name == "partition")
+            .expect("`partition` auto-declared");
+        assert_eq!(partition_arg.otyp.as_deref(), Some("text"));
+
+        // The wrapped query keeps the `$partition` references so the parsed sig
+        // binds them at run time.
+        let (rewritten, _) = build_materialized_query(
+            script,
+            Some("2026-07-02"),
+            &std::collections::HashMap::new(),
+        )
+        .expect("materialize builds")
+        .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(
+            rewritten.contains("$partition"),
+            "wrapped query must keep the `$partition` reference, got:\n{rewritten}"
+        );
+    }
+
+    // SCD2 managed mode wraps the SELECT into the diff → close-old → open-new
+    // shape (unit-covered in the parser's codegen tests); here we pin the
+    // executor-level wiring: the natural key flows through and the wrap is
+    // generated (not the manual track-only path).
+    #[test]
+    fn materialize_scd2_wraps_with_history() {
+        // Primary spelling: `key=<col> history` on a merge.
+        let script = "-- materialize ducklake://main/dim key=id history track=name\n\
+                      SELECT id, name FROM dl.src";
+        let (rewritten, _) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("scd2 is managed — must rewrite");
+        assert!(
+            rewritten.contains("valid_from"),
+            "adds SCD2 columns:\n{rewritten}"
+        );
+        assert!(rewritten.contains("is_current"));
+        assert!(
+            rewritten.contains("_wm_scd2_changed"),
+            "captures changed keys"
+        );
+        assert!(
+            rewritten.contains("UPDATE _wm_target.dim SET valid_to"),
+            "closes prior version"
+        );
+        assert!(
+            rewritten.contains("CREATE VIEW IF NOT EXISTS _wm_target.dim_current"),
+            "emits the consumer-convenience current view"
+        );
+        // default is soft-delete — no deleted-key set without `deletes=close`
+        assert!(!rewritten.contains("_wm_scd2_deleted"));
+        assert!(!rewritten.contains("MERGE INTO"));
+    }
+
+    #[test]
+    fn materialize_scd2_deletes_close_wires_through() {
+        let script = "-- materialize ducklake://main/dim key=id history deletes=close\n\
+                      SELECT id, name FROM dl.src";
+        let (rewritten, _) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("scd2 is managed — must rewrite");
+        assert!(
+            rewritten.contains("_wm_scd2_deleted"),
+            "deletes=close adds the vanished-key set + close:\n{rewritten}"
+        );
+    }
+
+    #[test]
+    fn materialize_scd2_requires_key() {
+        let script = "-- materialize scd2 ducklake://main/dim\nSELECT id, name FROM dl.src";
+        let err = match build_materialized_query(script, None, &std::collections::HashMap::new()) {
+            Err(e) => e,
+            Ok(_) => panic!("scd2 without key must error"),
+        };
+        assert!(
+            format!("{err}").contains("requires a natural key"),
+            "got: {err}"
+        );
+    }
+
+    #[test]
+    fn materialize_scd2_rejects_partitioned() {
+        let script = "-- pipeline\n-- partitioned daily\n\
+                      -- materialize scd2 ducklake://main/dim key=id\nSELECT id, name FROM dl.src";
+        let err = match build_materialized_query(
+            script,
+            Some("2026-07-01"),
+            &std::collections::HashMap::new(),
+        ) {
+            Err(e) => e,
+            Ok(_) => panic!("partitioned + scd2 must error"),
+        };
+        assert!(
+            format!("{err}").contains("not supported with scd2"),
+            "got: {err}"
+        );
+    }
+
+    // The rewritten SQL is the plan assembled by
+    // `pipeline_advanced::finalize_materialize_query`, so what it contains is
+    // build-dependent: the public assembly runs the plan verbatim (tests only
+    // in the post-commit summary breakdown), the enterprise assembly adds the
+    // in-transaction write-audit-publish guard (whose shape/placement is
+    // tested next to its implementation in windmill-common's
+    // `pipeline_advanced_ee`).
+    #[test]
+    fn materialize_rewrite_carries_data_test_summary() {
+        let script = "-- materialize ducklake://main/orders\n\
+                      -- data_test not_null id\n\
+                      SELECT id FROM dl.src";
+        let (rewritten, meta) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(rewritten.contains("AS data_tests"));
+        assert_eq!(meta.n_data_tests, 1);
+        #[cfg(not(feature = "private"))]
+        assert!(
+            !rewritten.contains("error("),
+            "public assembly is commit-then-test (no guard)"
+        );
+        #[cfg(all(feature = "private", feature = "enterprise"))]
+        assert!(
+            rewritten.contains("error("),
+            "enterprise assembly places the WAP guard"
+        );
+    }
+
+    // on_schema_change=fail on a persist-and-mutate strategy (merge) emits the
+    // drift guard inside the write, and no sync artifacts.
+    #[test]
+    fn materialize_fail_emits_drift_guard() {
+        let script = "-- materialize ducklake://main/dim key=id on_schema_change=fail\n\
+                      SELECT id, name FROM dl.src";
+        let (rewritten, meta) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(
+            rewritten.contains("CAST(error(") && rewritten.contains("on_schema_change=fail"),
+            "fail emits the drift guard: {rewritten}"
+        );
+        assert!(!rewritten.contains("BY NAME"), "fail writes positionally");
+        assert!(meta.sync_prepass.is_none(), "fail needs no pre-pass probe");
+    }
+
+    // on_schema_change=sync writes BY NAME, emits the ALTER sentinel, and builds
+    // the pre-pass probe (DESCRIBE of the SELECT + information_schema read).
+    #[test]
+    fn materialize_sync_by_name_and_prepass() {
+        let script = "-- materialize ducklake://main/dim key=id on_schema_change=sync\n\
+                      SELECT id, name FROM dl.src";
+        let (rewritten, meta) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(
+            rewritten.contains("INSERT INTO _wm_target.dim BY NAME"),
+            "sync insert is name-mapped: {rewritten}"
+        );
+        assert!(
+            rewritten.contains(windmill_parser::sql_materialize::SYNC_ALTER_SENTINEL),
+            "sync emits the ALTER injection sentinel"
+        );
+        let pp = meta.sync_prepass.expect("sync builds a pre-pass probe");
+        assert_eq!(pp.target_table, "dim");
+        assert!(pp
+            .probe_query
+            .contains("DESCRIBE SELECT * FROM (SELECT id, name FROM dl.src)"));
+        assert!(pp.probe_query.contains("FROM information_schema.columns"));
+        assert!(pp
+            .probe_query
+            .contains("table_catalog = '_wm_target' AND table_name = 'dim'"));
+        assert!(pp
+            .probe_query
+            .contains("ATTACH 'ducklake://main' AS _wm_target;"));
+    }
+
+    // on_schema_change=warn (default) on a persist-and-mutate strategy folds the
+    // drift into the summary; no guard, no sync artifacts.
+    #[test]
+    fn materialize_warn_summary_carries_schema_drift() {
+        let script = "-- materialize ducklake://main/dim key=id\n\
+                      SELECT id, name FROM dl.src";
+        let (rewritten, meta) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(
+            rewritten.contains("AS schema_drift"),
+            "warn folds drift into the summary: {rewritten}"
+        );
+        // No schema-drift *fail* guard in warn mode (the keyed merge still emits
+        // its own duplicate-source-key guard, which is a different `error(...)`).
+        assert!(!rewritten.contains("on_schema_change=fail blocked"));
+        assert!(rewritten.contains("keyed merge on `id` blocked"));
+        assert!(!rewritten.contains("BY NAME"));
+        assert!(meta.sync_prepass.is_none());
+    }
+
+    // Whole-table replace (unpartitioned, no key/append) is not persist-and-
+    // mutate: even with on_schema_change=fail there is no guard / sentinel — the
+    // CREATE OR REPLACE already rebuilds the schema each run.
+    #[test]
+    fn materialize_whole_table_replace_ignores_guardrail() {
+        let script = "-- materialize ducklake://main/t on_schema_change=fail\n\
+                      SELECT a, b FROM dl.src";
+        let (rewritten, meta) =
+            build_materialized_query(script, None, &std::collections::HashMap::new())
+                .expect("materialize builds")
+                .expect("materialize present");
+        let rewritten = rewritten.expect("managed mode rewrites the query");
+        assert!(rewritten.contains("CREATE OR REPLACE TABLE _wm_target.t"));
+        assert!(!rewritten.contains("on_schema_change=fail"));
+        assert!(!rewritten.contains(windmill_parser::sql_materialize::SYNC_ALTER_SENTINEL));
+        assert!(meta.sync_prepass.is_none());
+    }
+
+    #[test]
+    fn extract_schema_drift_parses_struct_and_string_and_null() {
+        // nested struct form
+        let r = raw(
+            r#"{"materialized":"ducklake://main/dim","schema_drift":{"added":["c"],"removed":["b"]}}"#,
+        );
+        let (added, removed) = extract_schema_drift(&r).expect("drift present");
+        assert_eq!(added, vec!["c".to_string()]);
+        assert_eq!(removed, vec!["b".to_string()]);
+        // FFI string-encoded form
+        let r = raw(r#"{"schema_drift":"{\"added\":[\"x\"],\"removed\":[]}"}"#);
+        let (added, removed) = extract_schema_drift(&r).expect("drift present");
+        assert_eq!(added, vec!["x".to_string()]);
+        assert!(removed.is_empty());
+        // NULL / both-empty ⇒ no drift
+        assert!(extract_schema_drift(&raw(r#"{"schema_drift":null}"#)).is_none());
+        assert!(
+            extract_schema_drift(&raw(r#"{"schema_drift":{"added":[],"removed":[]}}"#)).is_none()
+        );
+        assert!(extract_schema_drift(&raw(r#"{"rows":3}"#)).is_none());
+    }
+
+    #[test]
+    fn parse_sync_drift_computes_added_removed_and_skips_fresh_table() {
+        // table (a, b) vs SELECT (a, c): add c, drop b; _wm_partition ignored
+        let r = raw(r#"[{"_wm_which":"sel","_wm_name":"a","_wm_type":"BIGINT"},
+                {"_wm_which":"sel","_wm_name":"c","_wm_type":"VARCHAR"},
+                {"_wm_which":"tbl","_wm_name":"a","_wm_type":"BIGINT"},
+                {"_wm_which":"tbl","_wm_name":"b","_wm_type":"BIGINT"}]"#);
+        let (added, removed) = parse_sync_drift(&r).unwrap();
+        assert_eq!(added, vec![("c".to_string(), "VARCHAR".to_string())]);
+        assert_eq!(removed, vec!["b".to_string()]);
+        // no `tbl` rows ⇒ table doesn't exist yet ⇒ no migration
+        let r = raw(r#"[{"_wm_which":"sel","_wm_name":"a","_wm_type":"BIGINT"}]"#);
+        let (added, removed) = parse_sync_drift(&r).unwrap();
+        assert!(added.is_empty() && removed.is_empty());
+    }
+
     // Tests for parse_attach_db_resource function
     #[test]
     fn test_parse_attach_db_resource_postgres_res_prefix() {
@@ -1237,4 +3946,112 @@ mod tests {
         let serialized = serde_json::to_string(&arg).unwrap();
         assert!(serialized.contains("\"json_value\":{\"key\":\"value\"}"));
     }
+
+    fn raw(s: &str) -> Box<RawValue> {
+        serde_json::from_str(s).unwrap()
+    }
+
+    #[test]
+    fn extract_data_tests_parses_nested_array() {
+        // The real result shape: an array of one summary row carrying a nested
+        // `data_tests` array (how the FFI serialises the list-of-struct).
+        let r = raw(
+            r#"[{"rows":3,"snapshot_id":17,"materialized":"ducklake://a/b",
+                "data_tests":[{"test":"unique(order_id)","violating":0,"sample":null},
+                              {"test":"accepted_values(status)","violating":2,
+                               "sample":"[{\"id\":1,\"status\":\"bad\"}]"}]}]"#,
+        );
+        let out = extract_data_tests(&r);
+        assert_eq!(out.len(), 2);
+        assert_eq!(out[0].name, "unique(order_id)");
+        assert_eq!(out[0].violating, 0);
+        assert!(out[0].sample.is_none());
+        assert_eq!(out[1].name, "accepted_values(status)");
+        assert_eq!(out[1].violating, 2);
+        // The probe emits the sample as a JSON string; it parses to rows here.
+        assert_eq!(
+            out[1].sample,
+            Some(serde_json::json!([{"id": 1, "status": "bad"}]))
+        );
+    }
+
+    #[test]
+    fn extract_data_tests_handles_string_encoded_and_absent() {
+        // Fallback: some serialisations surface the list-of-struct as a JSON string.
+        let s = raw(r#"{"data_tests":"[{\"test\":\"not_null(x)\",\"violating\":1}]"}"#);
+        let out = extract_data_tests(&s);
+        assert_eq!(out.len(), 1);
+        assert_eq!(out[0].name, "not_null(x)");
+        assert_eq!(out[0].violating, 1);
+        assert!(out[0].sample.is_none());
+        // Absent column (no tests) -> empty, no panic.
+        assert!(extract_data_tests(&raw(r#"[{"rows":3}]"#)).is_empty());
+    }
+
+    #[test]
+    fn extract_data_tests_sample_degrades_to_none_never_flips_outcome() {
+        // sample is optional by contract: native array accepted; non-array
+        // JSON, garbage text, and absence all degrade to None without
+        // touching `violating`.
+        let r = raw(r#"[{"data_tests":[
+                {"test":"a","violating":1,"sample":[{"id":9}]},
+                {"test":"b","violating":2,"sample":"{\"not\":\"an array\"}"},
+                {"test":"c","violating":3,"sample":"not json at all"},
+                {"test":"d","violating":4}]}]"#);
+        let out = extract_data_tests(&r);
+        assert_eq!(out.len(), 4);
+        assert_eq!(out[0].sample, Some(serde_json::json!([{"id": 9}])));
+        for (i, t) in out.iter().enumerate().skip(1) {
+            assert!(t.sample.is_none(), "test {} should have no sample", t.name);
+            assert_eq!(t.violating, i as i64 + 1);
+        }
+    }
+
+    #[test]
+    fn extract_schema_parses_nested_and_string_encoded() {
+        // Real shape: the summary row carries a nested `output_schema`
+        // list-of-struct from the DESCRIBE fold.
+        let r = raw(
+            r#"[{"materialized":"ducklake://a/b","rows":3,"snapshot_id":17,
+                "output_schema":[{"name":"order_id","type":"BIGINT"},
+                                 {"name":"status","type":"VARCHAR"}]}]"#,
+        );
+        let cols = extract_schema(&r).expect("schema present");
+        assert_eq!(cols.len(), 2);
+        assert_eq!(cols[0].name, "order_id");
+        assert_eq!(cols[0].data_type, "BIGINT");
+        assert_eq!(cols[1].name, "status");
+        assert_eq!(cols[1].data_type, "VARCHAR");
+        // Fallback: FFI serialised the list-of-struct as a JSON string.
+        let s = raw(r#"{"output_schema":"[{\"name\":\"x\",\"type\":\"INTEGER\"}]"}"#);
+        let cols = extract_schema(&s).expect("schema present");
+        assert_eq!(cols.len(), 1);
+        assert_eq!(cols[0].name, "x");
+        assert_eq!(cols[0].data_type, "INTEGER");
+        // Absent column (literal/manual mode) -> None, no panic.
+        assert!(extract_schema(&raw(r#"[{"rows":3}]"#)).is_none());
+    }
+
+    #[test]
+    fn format_data_test_breakdown_lists_all_with_marks() {
+        let tests = vec![
+            DataTestOutcome { name: "unique(order_id)".into(), violating: 1, sample: None },
+            DataTestOutcome { name: "not_null(user_id)".into(), violating: 0, sample: None },
+            DataTestOutcome {
+                name: "accepted_values(status)".into(),
+                violating: 2,
+                // The breakdown is counts-only by design — samples never
+                // appear in the error text.
+                sample: Some(serde_json::json!([{"status": "bad"}])),
+            },
+        ];
+        let msg = format_data_test_breakdown("analytics/orders", &tests);
+        assert_eq!(
+            msg,
+            "data tests failed on analytics/orders (2/3 failed):\n  \
+             ✗ unique(order_id) — 1 violating row(s)\n  \
+             ✓ not_null(user_id)\n  \
+             ✗ accepted_values(status) — 2 violating row(s)"
+        );
+    }
 }
diff --git a/backend/windmill-worker/src/pg_executor.rs b/backend/windmill-worker/src/pg_executor.rs
index a1a26d0630..98c1b5bba7 100644
--- a/backend/windmill-worker/src/pg_executor.rs
+++ b/backend/windmill-worker/src/pg_executor.rs
@@ -615,6 +615,25 @@ pub async fn do_postgresql(
         return Err(Error::BadRequest("Missing database argument".to_string()));
     };
 
+    // Surface in the job logs (not just the worker logs) when a verify-ca/verify-full
+    // resource is connecting without actually verifying the server certificate, so the
+    // person running the query can see and fix the misconfiguration.
+    if database.verify_mode_skips_verification() {
+        windmill_queue::append_logs(
+            &job.id,
+            &job.workspace_id,
+            format!(
+                "warning: sslmode={} but the server's TLS certificate is not being verified \
+                 (accept_invalid_certs is enabled, or no root certificate is configured). Set \
+                 accept_invalid_certs to false or provide root_certificate_pem to verify the \
+                 server identity.\n",
+                database.sslmode.as_deref().unwrap_or("")
+            ),
+            conn,
+        )
+        .await;
+    }
+
     let annotations = windmill_common::worker::SqlAnnotations::parse(query);
     let collection_strategy = if annotations.raw_output || annotations.return_last_result {
         // raw_output emits a single envelope from the last statement, so the
@@ -629,10 +648,26 @@ pub async fn do_postgresql(
     // Include use_iam_auth in cache key to distinguish IAM vs non-IAM connections to the same host.
     // The cache key is static (doesn't include the token), which is correct because PostgreSQL
     // connections remain valid after initial auth — fresh tokens are generated on cache miss.
+    //
+    // to_uri() collapses require/verify-ca/verify-full to the same string, so the TLS verification
+    // inputs are folded into the key separately. Without this a connection established under a
+    // weaker sslmode (or a different root cert) could be reused for a stricter request, undoing
+    // the verification configured in PgDatabase::configure_pg_tls_verification.
+    let tls_disc = {
+        use std::hash::{Hash, Hasher};
+        let mut h = std::collections::hash_map::DefaultHasher::new();
+        database.sslmode.hash(&mut h);
+        database.root_certificate_pem.hash(&mut h);
+        database.accept_invalid_certs.hash(&mut h);
+        h.finish()
+    };
+    // to_uri() already ends with `?sslmode=...`, so append further key segments
+    // with `&` to keep database_string a well-formed URI (it is only ever a cache
+    // key, but a malformed one would mislead anyone who later logs or parses it).
     let database_string = if use_iam_auth {
-        format!("{}?iam=true", database.to_uri())
+        format!("{}&iam=true&tls={tls_disc:x}", database.to_uri())
     } else {
-        database.to_uri()
+        format!("{}&tls={tls_disc:x}", database.to_uri())
     };
     let database_string_clone = database_string.clone();
 
diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
index 409dc362af..9ca79c6852 100644
--- a/backend/windmill-worker/src/python_executor.rs
+++ b/backend/windmill-worker/src/python_executor.rs
@@ -37,8 +37,8 @@ use windmill_common::{
     scripts::ScriptLang,
     utils::calculate_hash,
     worker::{
-        copy_dir_recursively, pad_string, split_python_requirements, write_file, Connection,
-        PyVAlias, PythonAnnotations, WORKER_CONFIG,
+        copy_dir_recursively, is_allowed_file_location, pad_string, split_python_requirements,
+        write_file, Connection, PyVAlias, PythonAnnotations, WORKER_CONFIG,
     },
 };
 
@@ -62,6 +62,13 @@ lazy_static::lazy_static! {
     static ref PY_CONCURRENT_DOWNLOADS: usize =
     var("PY_CONCURRENT_DOWNLOADS").ok().map(|flag| flag.parse().unwrap_or(20)).unwrap_or(20);
 
+    // uv's HTTP request timeout (seconds). spawn_uv_install uses env_clear(), so a
+    // UV_HTTP_TIMEOUT set on the worker is dropped unless forwarded explicitly.
+    // Only forwarded when set; otherwise uv keeps its own default. Lets operators
+    // raise it for slow/contended private registries ("operation timed out").
+    static ref UV_HTTP_TIMEOUT: Option<String> =
+    var("UV_HTTP_TIMEOUT").ok().filter(|v| !v.is_empty());
+
 
     static ref NON_ALPHANUM_CHAR: Regex = regex::Regex::new(r"[^0-9A-Za-z=.-]").unwrap();
 
@@ -664,10 +671,16 @@ pub fn compute_python_module_dir(script_path: &str) -> String {
         .replace("-", "_")
         .replace("@", ".");
     if dirs_full.len() > 0 {
-        dirs_full
-            .strip_prefix("/")
-            .unwrap_or(&dirs_full)
-            .to_string()
+        let dirs = dirs_full.strip_prefix("/").unwrap_or(&dirs_full);
+        // This directory is appended to job_dir and written to. Neutralize any
+        // `.`/`..` segment so the result stays a relative path inside job_dir: a
+        // Preview path is request-supplied and skips the DB `proper_id` CHECK that
+        // deployed runnables get, and the `@`->`.` rewrite above can also turn a
+        // segment like `@.` into `..`.
+        dirs.split('/')
+            .map(|seg| if seg == "." || seg == ".." { "_" } else { seg })
+            .collect::<Vec<_>>()
+            .join("/")
     } else {
         "tmp".to_string()
     }
@@ -1668,6 +1681,10 @@ async fn prepare_wrapper(
         last
     };
     let module_dir = format!("{}/{}", job_dir, dirs);
+    // Defense-in-depth: `dirs`/`last` derive from the (request-supplied for
+    // previews) script path. compute_python_module_dir already neutralizes `..`,
+    // but assert containment here too so the write can never escape job_dir.
+    is_allowed_file_location(job_dir, &format!("{dirs}/{last}.py"))?;
     tokio::fs::create_dir_all(format!("{module_dir}/")).await?;
 
     let _ = write_file(&module_dir, &format!("{last}.py"), inner_content)?;
@@ -2040,6 +2057,33 @@ Returned from server: py_version - {:?}, py_version_v2 - {:?}
 
 lazy_static::lazy_static! {
     static ref PIP_SECRET_VARIABLE: Regex = Regex::new(r"\$\{PIP_SECRET:([^\s\}]+)\}").unwrap();
+
+    /// venv paths whose wheel RECORD this process has already verified against
+    /// disk. A cache entry is only damaged out-of-band (disk-pressure eviction,
+    /// an interrupted extraction on a shared cache volume, or a corrupt entry
+    /// that predates this worker), never spontaneously while we keep running, so
+    /// re-verifying it once per process is enough — every later reuse trusts the
+    /// in-memory marker and pays only the original single stat.
+    static ref VERIFIED_VENVS: tokio::sync::Mutex<HashSet<String>> =
+        tokio::sync::Mutex::new(HashSet::new());
+
+    // In-process locks serializing concurrent installs into the same shared
+    // `venv_p` cache dir; `uv --reinstall` removes a package's .dist-info/RECORD
+    // before rewriting it, so a sibling install/verify racing it corrupts the
+    // dir. Keyed by venv_p so distinct deps still install in parallel.
+    static ref PY_INSTALL_LOCKS: tokio::sync::Mutex<std::collections::HashMap<String, Arc<tokio::sync::Mutex<()>>>> =
+        tokio::sync::Mutex::new(std::collections::HashMap::new());
+}
+
+/// Returns the in-process install lock for a given target cache dir, creating it
+/// on first use. Idle entries (only the map holds a reference) are pruned each
+/// call so the map stays bounded by the number of in-flight installs.
+async fn get_venv_install_lock(venv_p: &str) -> Arc<tokio::sync::Mutex<()>> {
+    let mut map = PY_INSTALL_LOCKS.lock().await;
+    map.retain(|_, v| Arc::strong_count(v) > 1);
+    map.entry(venv_p.to_string())
+        .or_insert_with(|| Arc::new(tokio::sync::Mutex::new(())))
+        .clone()
 }
 
 /// Spawn process of uv install
@@ -2085,6 +2129,9 @@ async fn spawn_uv_install(
         if *NATIVE_CERT {
             vars.push(("UV_NATIVE_TLS", "true"));
         }
+        if let Some(timeout) = UV_HTTP_TIMEOUT.as_ref() {
+            vars.push(("UV_HTTP_TIMEOUT", timeout.as_str()));
+        }
 
         let _owner;
         if let Some(py_path) = py_path.as_ref() {
@@ -2188,6 +2235,9 @@ async fn spawn_uv_install(
         let mut envs = vec![("PATH", PATH_ENV.as_str())];
         envs.push(("HOME", HOME_ENV.as_str()));
         envs.push(("UV_INDEX_STRATEGY", uv_index_strategy));
+        if let Some(timeout) = UV_HTTP_TIMEOUT.as_ref() {
+            envs.push(("UV_HTTP_TIMEOUT", timeout.as_str()));
+        }
         if let Some(mirror) = uv_python_install_mirror.as_ref() {
             envs.push(("UV_PYTHON_INSTALL_MIRROR", mirror));
         }
@@ -2479,8 +2529,53 @@ pub async fn handle_python_reqs(
             req.replace(' ', "").replace('/', "").replace(':', "")
         );
         if metadata(venv_p.clone() + "/.valid.windmill").await.is_ok() {
-            req_paths.push(venv_p);
-            in_cache.push(req.to_string());
+            // The .valid.windmill marker is written once at creation time, after
+            // verify_wheel_record passes on the install/pull paths. It is an empty
+            // file with no binding to the directory contents, so a file dropped
+            // out-of-band afterwards (disk-pressure eviction, interrupted tar
+            // extraction on a shared cache volume, or a corrupt entry that
+            // predates this worker) leaves the marker intact while the wheel is
+            // incomplete. Re-verify the RECORD once per process so such an entry
+            // is repaired rather than trusted; VERIFIED_VENVS makes every later
+            // reuse skip the scan and pay only the single stat above.
+            let already_verified = VERIFIED_VENVS.lock().await.contains(&venv_p);
+            let verify_res = if already_verified {
+                Ok(())
+            } else {
+                verify_wheel_record(&venv_p).await
+            };
+            match verify_res {
+                Ok(()) => {
+                    if !already_verified {
+                        VERIFIED_VENVS.lock().await.insert(venv_p.clone());
+                    }
+                    req_paths.push(venv_p);
+                    in_cache.push(req.to_string());
+                }
+                Err(verify_err) => {
+                    tracing::warn!(
+                        workspace_id = %w_id,
+                        job_id = %job_id,
+                        "Local cache for {venv_p} failed wheel RECORD verification, will reinstall: {verify_err}"
+                    );
+                    append_logs(
+                        &job_id,
+                        w_id,
+                        format!(
+                            "\n[!] cached wheel for {req} failed integrity check, reinstalling: {verify_err}\n"
+                        ),
+                        conn,
+                    )
+                    .await;
+                    if let Err(rm_err) = tokio::fs::remove_dir_all(&venv_p).await {
+                        tracing::warn!(
+                            workspace_id = %w_id,
+                            "could not remove broken cache dir {venv_p}: {rm_err}"
+                        );
+                    }
+                    req_with_penv.push((req.to_string(), venv_p));
+                }
+            }
         } else {
             // There is no valid or no wheel at all. Regardless of if there is content or not, we will overwrite it with --reinstall flag
             req_with_penv.push((req.to_string(), venv_p));
@@ -2716,6 +2811,96 @@ pub async fn handle_python_reqs(
             );
 
             let start = std::time::Instant::now();
+
+            // Lock the shared target dir (see PY_INSTALL_LOCKS). In-process lock
+            // first; only one task per dir then contends the cross-process file
+            // lock below. Both guards drop on every return path.
+            let venv_lock = get_venv_install_lock(&venv_p).await;
+            let _venv_guard = tokio::select! {
+                _ = kill_rx.recv() => {
+                    pids.lock().await.get_mut(i).and_then(|e| e.take());
+                    return Err(Error::from(anyhow::anyhow!(
+                        "install of {venv_p} canceled while waiting for venv lock"
+                    )));
+                }
+                guard = venv_lock.lock_owned() => guard,
+            };
+
+            // Cross-process advisory lock. Best-effort: if the filesystem doesn't
+            // support flock we log and proceed — verify_wheel_record + job retry
+            // still guard correctness, just without the dedup.
+            #[cfg(unix)]
+            let _venv_file_lock: Option<std::fs::File> = {
+                use std::os::unix::io::AsRawFd;
+                let lock_path = format!("{venv_p}.lock");
+                if let Some(parent) = std::path::Path::new(&lock_path).parent() {
+                    let _ = std::fs::create_dir_all(parent);
+                }
+                match std::fs::OpenOptions::new().create(true).write(true).open(&lock_path) {
+                    Ok(f) => {
+                        // Bounded wait: a holder that crashes releases the lock (the
+                        // kernel drops it on fd close), but a live-but-stuck holder
+                        // (e.g. uv wedged on a hung mount) would otherwise block us
+                        // forever. After the cap, proceed degraded rather than hang —
+                        // verify_wheel_record + retry still guard correctness.
+                        const MAX_WAIT: std::time::Duration = std::time::Duration::from_secs(300);
+                        let waited_since = std::time::Instant::now();
+                        loop {
+                            match nix::fcntl::flock(f.as_raw_fd(), nix::fcntl::FlockArg::LockExclusiveNonblock) {
+                                Ok(()) => break Some(f),
+                                // EWOULDBLOCK == EAGAIN on Linux: another holder has the lock.
+                                Err(nix::errno::Errno::EWOULDBLOCK) => {
+                                    if waited_since.elapsed() >= MAX_WAIT {
+                                        tracing::warn!(
+                                            workspace_id = %w_id,
+                                            "venv install lock {lock_path} still held after {}s, proceeding without cross-process install lock",
+                                            MAX_WAIT.as_secs()
+                                        );
+                                        break Some(f);
+                                    }
+                                    tokio::select! {
+                                        _ = kill_rx.recv() => {
+                                            pids.lock().await.get_mut(i).and_then(|e| e.take());
+                                            return Err(Error::from(anyhow::anyhow!(
+                                                "install of {venv_p} canceled while waiting for venv file lock"
+                                            )));
+                                        }
+                                        _ = tokio::time::sleep(std::time::Duration::from_millis(200)) => {}
+                                    }
+                                }
+                                Err(e) => {
+                                    tracing::warn!(
+                                        workspace_id = %w_id,
+                                        "could not flock {lock_path}, proceeding without cross-process install lock: {e}"
+                                    );
+                                    break Some(f);
+                                }
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        tracing::warn!(
+                            workspace_id = %w_id,
+                            "could not open install lock file {lock_path}, proceeding without cross-process install lock: {e}"
+                        );
+                        None
+                    }
+                }
+            };
+
+            // Double-checked: another job (this process or another sharing the
+            // mount) may have installed this exact dep while we waited on the
+            // locks. Reuse it instead of reinstalling.
+            if metadata(format!("{venv_p}/.valid.windmill")).await.is_ok() {
+                print_success(
+                    false, false, &job_id, &w_id, &req, req_tl, counter_arc,
+                    total_to_install, start, &conn,
+                )
+                .await;
+                pids.lock().await.get_mut(i).and_then(|e| e.take());
+                return Ok(());
+            }
+
             #[cfg(all(feature = "enterprise", feature = "parquet"))]
             if is_not_pro {
                 if let Some(os) = windmill_object_store::get_object_store().await {
@@ -3357,6 +3542,17 @@ mod tests {
         assert_eq!(compute_python_module_dir("f/in/script"), "f/_in");
     }
 
+    #[test]
+    fn test_compute_python_module_dir_neutralizes_traversal() {
+        // A Preview path skips the DB `proper_id` CHECK, so it can carry `..`.
+        // `..`/`.` segments must be neutralized so the dir stays inside job_dir.
+        let dirs = compute_python_module_dir("u/x/../../../../tmp/evil/payload");
+        assert!(!dirs.split('/').any(|s| s == ".." || s == "."));
+        assert_eq!(dirs, "u/x/_/_/_/_/tmp/evil");
+        // The `@`->`.` rewrite must not be able to synthesize a `..` segment.
+        assert_eq!(compute_python_module_dir("u/@./script"), "u/_");
+    }
+
     #[test]
     fn test_compute_py_codegen_basic_args() {
         let code = "def main(x: str, y: int):\n    return x\n";
@@ -3446,4 +3642,179 @@ mod tests {
         assert_eq!(kept, lines(&["# py: 3.11", "requests==2.0"]));
         assert_eq!(ignored, lines(&["pyyaml==6.0"]));
     }
+
+    /// Materialize a fake installed wheel: every file in `files` is created, and
+    /// `record_entries` is written verbatim as the RECORD (so a test can list a
+    /// path in RECORD without creating it, to simulate out-of-band loss).
+    fn write_fake_wheel(root: &std::path::Path, files: &[&str], record_entries: &[&str]) {
+        for f in files {
+            let full = root.join(f);
+            std::fs::create_dir_all(full.parent().unwrap()).unwrap();
+            std::fs::write(full, b"x").unwrap();
+        }
+        let dist_info = root.join("pkg-1.0.0.dist-info");
+        std::fs::create_dir_all(&dist_info).unwrap();
+        std::fs::write(dist_info.join("RECORD"), record_entries.join("\n") + "\n").unwrap();
+    }
+
+    #[tokio::test]
+    async fn test_verify_wheel_record_ok_when_all_present() {
+        let dir = tempfile::tempdir().unwrap();
+        write_fake_wheel(
+            dir.path(),
+            &["pkg/__init__.py", "pkg/mod.py"],
+            &[
+                "pkg/__init__.py,sha256=aaa,1",
+                "pkg/mod.py,sha256=bbb,1",
+                "pkg-1.0.0.dist-info/RECORD,,",
+            ],
+        );
+        assert!(verify_wheel_record(dir.path().to_str().unwrap())
+            .await
+            .is_ok());
+    }
+
+    #[tokio::test]
+    async fn test_verify_wheel_record_err_when_file_missing() {
+        let dir = tempfile::tempdir().unwrap();
+        // RECORD lists pkg/mod.py but we never create it: the exact failure mode
+        // the customer hit (wmill/s3_reader.py present in RECORD, gone on disk).
+        write_fake_wheel(
+            dir.path(),
+            &["pkg/__init__.py"],
+            &[
+                "pkg/__init__.py,sha256=aaa,1",
+                "pkg/mod.py,sha256=bbb,1",
+                "pkg-1.0.0.dist-info/RECORD,,",
+            ],
+        );
+        let err = verify_wheel_record(dir.path().to_str().unwrap())
+            .await
+            .unwrap_err();
+        assert!(err.contains("pkg/mod.py"), "unexpected error: {err}");
+    }
+
+    #[tokio::test]
+    async fn test_verify_wheel_record_err_when_no_dist_info() {
+        let dir = tempfile::tempdir().unwrap();
+        std::fs::write(dir.path().join("loose.py"), b"x").unwrap();
+        assert!(verify_wheel_record(dir.path().to_str().unwrap())
+            .await
+            .is_err());
+    }
+
+    #[tokio::test]
+    async fn test_verify_wheel_record_skips_absolute_and_escaping_entries() {
+        let dir = tempfile::tempdir().unwrap();
+        // Absolute and `..` RECORD entries are not package-relative and must be
+        // skipped rather than reported missing.
+        write_fake_wheel(
+            dir.path(),
+            &["pkg/__init__.py"],
+            &[
+                "pkg/__init__.py,sha256=aaa,1",
+                "/etc/passwd,sha256=ccc,1",
+                "../outside.py,sha256=ddd,1",
+                "pkg-1.0.0.dist-info/RECORD,,",
+            ],
+        );
+        assert!(verify_wheel_record(dir.path().to_str().unwrap())
+            .await
+            .is_ok());
+    }
+
+    // Regression tests for the concurrent-install guard. Two jobs installing the
+    // same uncached dep into the shared `venv_p` used to race uv's `--reinstall`,
+    // corrupting the on-disk wheel and failing with "Env installation did not
+    // succeed". The guard serializes those installs.
+
+    #[tokio::test]
+    async fn test_venv_install_lock_serializes_same_path() {
+        use std::sync::atomic::{AtomicUsize, Ordering};
+        // Same target path => one shared lock => no two tasks install at once.
+        let active = Arc::new(AtomicUsize::new(0));
+        let max_seen = Arc::new(AtomicUsize::new(0));
+        let mut handles = vec![];
+        for _ in 0..8 {
+            let active = active.clone();
+            let max_seen = max_seen.clone();
+            handles.push(tokio::spawn(async move {
+                let lock = get_venv_install_lock("/cache/py/3.11/samedep==1.0").await;
+                let _g = lock.lock_owned().await;
+                let cur = active.fetch_add(1, Ordering::SeqCst) + 1;
+                max_seen.fetch_max(cur, Ordering::SeqCst);
+                // Yield so any concurrency would be observed by another task.
+                tokio::time::sleep(std::time::Duration::from_millis(5)).await;
+                active.fetch_sub(1, Ordering::SeqCst);
+            }));
+        }
+        for h in handles {
+            h.await.unwrap();
+        }
+        assert_eq!(
+            max_seen.load(Ordering::SeqCst),
+            1,
+            "installs into the same target dir must be serialized"
+        );
+    }
+
+    #[tokio::test]
+    async fn test_venv_install_lock_distinct_paths_are_independent() {
+        // Different target paths get different locks and never block each other.
+        let a = get_venv_install_lock("/cache/py/3.11/depA==1.0").await;
+        let b = get_venv_install_lock("/cache/py/3.11/depB==1.0").await;
+        let _ga = a.lock_owned().await;
+        // Holding depA's lock must not prevent acquiring depB's.
+        assert!(
+            b.try_lock().is_ok(),
+            "distinct deps must install in parallel"
+        );
+        // Same path returns the same underlying lock.
+        let a2 = get_venv_install_lock("/cache/py/3.11/depA==1.0").await;
+        assert!(
+            a2.try_lock().is_err(),
+            "same target dir must map to the same lock"
+        );
+    }
+
+    #[cfg(unix)]
+    #[tokio::test]
+    async fn test_venv_file_lock_excludes_across_descriptions() {
+        // The cross-process layer: flock on a sibling `.lock` excludes a second
+        // independent open file description (i.e. another worker process) while
+        // held, and frees it on close. Mirrors the loop in handle_python_reqs.
+        use nix::fcntl::{flock, FlockArg};
+        use std::os::unix::io::AsRawFd;
+
+        let dir = std::env::temp_dir().join("wm_venv_lock_test");
+        std::fs::create_dir_all(&dir).unwrap();
+        let lock_path = dir.join("dep==1.0.lock");
+
+        let f1 = std::fs::OpenOptions::new()
+            .create(true)
+            .write(true)
+            .open(&lock_path)
+            .unwrap();
+        flock(f1.as_raw_fd(), FlockArg::LockExclusiveNonblock).unwrap();
+
+        // A second descriptor (stand-in for another process) cannot take it.
+        let f2 = std::fs::OpenOptions::new()
+            .create(true)
+            .write(true)
+            .open(&lock_path)
+            .unwrap();
+        assert_eq!(
+            flock(f2.as_raw_fd(), FlockArg::LockExclusiveNonblock),
+            Err(nix::errno::Errno::EWOULDBLOCK),
+            "a second holder must be blocked while the lock is held"
+        );
+
+        // Releasing the first lets the second acquire it.
+        drop(f1);
+        flock(f2.as_raw_fd(), FlockArg::LockExclusiveNonblock)
+            .expect("lock must be acquirable once the holder releases it");
+
+        drop(f2);
+        let _ = std::fs::remove_file(&lock_path);
+    }
 }
diff --git a/backend/windmill-worker/src/python_versions.rs b/backend/windmill-worker/src/python_versions.rs
index 0ae6b3462a..3a1f35a302 100644
--- a/backend/windmill-worker/src/python_versions.rs
+++ b/backend/windmill-worker/src/python_versions.rs
@@ -551,6 +551,13 @@ impl PyV {
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
 
+        if let Some(cert_path) = INDEX_CERT.as_ref() {
+            child_cmd.env("SSL_CERT_FILE", cert_path);
+        }
+        if *NATIVE_CERT {
+            child_cmd.env("UV_NATIVE_TLS", "true");
+        }
+
         if let Some(mirror) = UV_PYTHON_INSTALL_MIRROR.read().await.as_ref() {
             child_cmd.env("UV_PYTHON_INSTALL_MIRROR", mirror);
         }
diff --git a/backend/windmill-worker/src/result_processor.rs b/backend/windmill-worker/src/result_processor.rs
index ab2cad4da9..26fbdb21af 100644
--- a/backend/windmill-worker/src/result_processor.rs
+++ b/backend/windmill-worker/src/result_processor.rs
@@ -1295,7 +1295,7 @@ pub async fn handle_job_error(
                         db,
                         &parent_job,
                         mem_peak,
-                        canceled_by,
+                        canceled_by.clone(),
                         e,
                         worker_name,
                         false,
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 1ca77310ff..2335a78453 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -44,7 +44,7 @@ use windmill_common::{
     schema::{should_validate_schema, SchemaValidator},
     utils::{create_directory_async, WarnAfterExt},
     worker::{
-        make_pull_query, write_file, Connection, HttpClient, MAX_TIMEOUT,
+        is_allowed_file_location, make_pull_query, write_file, Connection, HttpClient, MAX_TIMEOUT,
         MIN_PERIODIC_SCRIPT_INTERVAL_SECONDS, ROOT_CACHE_DIR, ROOT_CACHE_NOMOUNT_DIR, WINDMILL_DIR,
     },
     worker_group_job_stats::JobStatsMap,
@@ -4324,20 +4324,25 @@ async fn resolve_partition_for_job(
     job: &MiniPulledJob,
     code: &str,
     conn: &Connection,
-) -> error::Result<Option<MiniPulledJob>> {
+) -> error::Result<(Option<MiniPulledJob>, bool)> {
     use windmill_common::partition::{resolve_partition, PARTITION_ARG};
     use windmill_parser::asset_parser::PartitionKind;
 
-    // Only deployed scripts participate in asset pipelines. Cheap
-    // substring guard so the overwhelming majority of script jobs (no
-    // `// partitioned` line) skip the full annotation scan on the hot
-    // path; a false positive only costs one extra parse, never wrong.
-    if !matches!(job.kind, JobKind::Script) || !code.contains("partitioned") {
-        return Ok(None);
+    // Only deployed scripts participate in asset pipelines. Cheap substring
+    // guard so the overwhelming majority of script jobs skip the annotation
+    // scan; when one might be present we parse *once* here and reuse the result
+    // for both `in_pipeline` (→ WM_PIPELINE env, read by the wmll.ducklake SDK to
+    // record state) and `partition` resolution — no second parse downstream. The
+    // bool is whether the script is a `// pipeline` member.
+    if !matches!(job.kind, JobKind::Script)
+        || !(code.contains("pipeline") || code.contains("partitioned"))
+    {
+        return Ok((None, false));
     }
-    let Some(spec) = windmill_parser::asset_parser::parse_pipeline_annotations(code).partition
-    else {
-        return Ok(None);
+    let ann = windmill_parser::asset_parser::parse_pipeline_annotations(code);
+    let in_pipeline = ann.in_pipeline;
+    let Some(spec) = ann.partition else {
+        return Ok((None, in_pipeline));
     };
 
     // Already resolved upstream — explicit run arg, backfill, or
@@ -4349,7 +4354,7 @@ async fn resolve_partition_for_job(
             .is_some_and(|s| !s.is_empty())
     });
     if already_set {
-        return Ok(None);
+        return Ok((None, in_pipeline));
     }
 
     // `dynamic` extracts from the triggering payload (the `trigger` object
@@ -4382,7 +4387,7 @@ async fn resolve_partition_for_job(
             job_id = %job.id,
             "partitioned script resolved to no partition (before start anchor); running without one"
         );
-        return Ok(None);
+        return Ok((None, in_pipeline));
     };
 
     // Persist back so dispatch_asset_triggers (which reads the producer's
@@ -4404,7 +4409,7 @@ async fn resolve_partition_for_job(
         windmill_common::worker::to_raw_value(&value),
     );
     updated.args = Some(Json(map));
-    Ok(Some(updated))
+    Ok((Some(updated), in_pipeline))
 }
 
 #[tracing::instrument(level = "trace", skip_all)]
@@ -4566,7 +4571,8 @@ async fn handle_code_execution_job(
     // `// partitioned` (if any) and shadow `job` with a clone whose args
     // carry the resolved `partition` for the rest of execution.
     let _job_with_partition;
-    let job = match resolve_partition_for_job(job, code, conn).await? {
+    let (resolved_job, in_pipeline) = resolve_partition_for_job(job, code, conn).await?;
+    let job = match resolved_job {
         Some(j) => {
             _job_with_partition = j;
             &_job_with_partition
@@ -4619,48 +4625,153 @@ async fn handle_code_execution_job(
         lock,
         &modules,
         false,
+        in_pipeline,
     )
     .await
 }
 
+/// True when `path` contains only `Normal`/`CurDir` components, i.e. it cannot
+/// escape the directory it is joined onto (no `..`, no absolute root, no Windows
+/// drive prefix).
+fn is_contained_relative_path(path: &str) -> bool {
+    use std::path::Component;
+    std::path::Path::new(path)
+        .components()
+        .all(|c| matches!(c, Component::Normal(_) | Component::CurDir))
+}
+
 pub async fn write_module_files(
     job_dir: &str,
     modules: &std::collections::HashMap<String, ScriptModule>,
     base_dir: Option<&str>,
 ) -> error::Result<()> {
+    // base_dir is derived from the runnable path, which on a preview run can
+    // carry `..` traversal (it is not the validated module-map key). Reject it
+    // before it is used to build any write target, otherwise a module could
+    // escape job_dir and write arbitrary files.
+    if let Some(dir) = base_dir {
+        if !is_contained_relative_path(dir) {
+            return Err(error::Error::BadRequest(format!(
+                "Invalid module base directory (path traversal): {dir}"
+            )));
+        }
+    }
     for (relpath, module) in modules {
-        // Reject path traversal attempts in module paths
-        if relpath.contains("..") {
+        // Reject path traversal attempts in module paths (the module-map key).
+        if !is_contained_relative_path(relpath) {
             tracing::warn!("Skipping module with path traversal: {relpath}");
             continue;
         }
-        let full_path = match base_dir {
-            Some(dir) => format!("{}/{}/{}", job_dir, dir, relpath),
-            None => format!("{}/{}", job_dir, relpath),
+        let relpath_from_job_dir = match base_dir {
+            Some(dir) => format!("{}/{}", dir, relpath),
+            None => relpath.to_string(),
         };
-        if let Some(parent) = std::path::Path::new(&full_path).parent() {
+        // Authoritative guard: resolve the path and assert it stays inside job_dir.
+        let full_path = is_allowed_file_location(job_dir, &relpath_from_job_dir)?;
+        if let Some(parent) = full_path.parent() {
             tokio::fs::create_dir_all(parent).await?;
         }
         // For Python modules, create __init__.py in each intermediate directory
         // between base_dir and the module's parent so that relative imports work.
         if let Some(dir) = base_dir {
-            let rel = std::path::Path::new(relpath);
-            let base = std::path::Path::new(job_dir).join(dir);
-            let mut current = base.clone();
-            for component in rel.parent().into_iter().flat_map(|p| p.components()) {
+            let mut current = std::path::PathBuf::from(dir);
+            for component in std::path::Path::new(relpath)
+                .parent()
+                .into_iter()
+                .flat_map(|p| p.components())
+            {
                 current = current.join(component);
-                let init_py = current.join("__init__.py");
+                let init_py = is_allowed_file_location(
+                    job_dir,
+                    &current.join("__init__.py").to_string_lossy(),
+                )?;
                 if !init_py.exists() {
                     tokio::fs::write(&init_py, "").await?;
                 }
             }
         }
-        tracing::debug!("Writing module file: {full_path}");
+        tracing::debug!("Writing module file: {}", full_path.display());
         tokio::fs::write(&full_path, &module.content).await?;
     }
     Ok(())
 }
 
+#[cfg(test)]
+mod write_module_files_tests {
+    use super::*;
+    use std::collections::HashMap;
+    use windmill_common::scripts::ScriptLang;
+
+    fn module(content: &str) -> ScriptModule {
+        ScriptModule { content: content.to_string(), language: ScriptLang::Python3, lock: None }
+    }
+
+    #[test]
+    fn contained_relative_path_rejects_traversal_and_absolute() {
+        assert!(is_contained_relative_path("u/admin/pkg"));
+        assert!(is_contained_relative_path("./pkg/sub"));
+        // A `..` in a filename is a valid name, not a traversal.
+        assert!(is_contained_relative_path("weird..name"));
+
+        assert!(!is_contained_relative_path("u/x/../../../etc"));
+        assert!(!is_contained_relative_path("../escape"));
+        assert!(!is_contained_relative_path("/etc/cron.d/wm"));
+    }
+
+    #[tokio::test]
+    async fn base_dir_traversal_is_rejected_and_writes_nothing() {
+        let job = tempfile::tempdir().unwrap();
+        let job_dir = job.path().to_str().unwrap();
+        // Sentinel just outside job_dir that a successful traversal would create.
+        let outside = job.path().parent().unwrap().join("wm_escaped_marker");
+
+        let mut modules = HashMap::new();
+        modules.insert(
+            "wm_escaped_marker".to_string(),
+            module("* * * * * root id\n"),
+        );
+
+        // base_dir derived from a preview path carrying `..` traversal.
+        let res = write_module_files(job_dir, &modules, Some("u/x/../../../../../..")).await;
+        assert!(res.is_err(), "traversal base_dir must be rejected");
+        assert!(!outside.exists(), "no file may be written outside job_dir");
+    }
+
+    #[tokio::test]
+    async fn relpath_traversal_is_skipped() {
+        let job = tempfile::tempdir().unwrap();
+        let job_dir = job.path().to_str().unwrap();
+        let outside = job.path().parent().unwrap().join("wm_relpath_escape.py");
+
+        let mut modules = HashMap::new();
+        modules.insert("../wm_relpath_escape.py".to_string(), module("x = 1"));
+
+        write_module_files(job_dir, &modules, None).await.unwrap();
+        assert!(!outside.exists());
+    }
+
+    #[tokio::test]
+    async fn legitimate_modules_are_written_with_init_py() {
+        let job = tempfile::tempdir().unwrap();
+        let job_dir = job.path().to_str().unwrap();
+
+        let mut modules = HashMap::new();
+        modules.insert("pkg/sub/mod.py".to_string(), module("VALUE = 42"));
+
+        write_module_files(job_dir, &modules, Some("u/admin"))
+            .await
+            .unwrap();
+
+        let base = job.path().join("u/admin");
+        assert_eq!(
+            std::fs::read_to_string(base.join("pkg/sub/mod.py")).unwrap(),
+            "VALUE = 42"
+        );
+        assert!(base.join("pkg/__init__.py").exists());
+        assert!(base.join("pkg/sub/__init__.py").exists());
+    }
+}
+
 pub async fn run_language_executor(
     job: &MiniPulledJob,
     conn: &Connection,
@@ -4685,6 +4796,9 @@ pub async fn run_language_executor(
     lock: &Option<String>,
     modules: &Option<std::collections::HashMap<String, ScriptModule>>,
     run_inline: bool,
+    // Whether the script is a `// pipeline` member (parsed once upstream) — sets
+    // WM_PIPELINE so the wmll.ducklake SDK helpers record materialization state.
+    in_pipeline: bool,
 ) -> error::Result<Box<RawValue>> {
     // Defense-in-depth (GHSA-wxjq-w5pj-jqhx): the entrypoint override is
     // interpolated verbatim into a code position of the generated language
@@ -5047,6 +5161,11 @@ mount {{
 
     #[allow(unused_mut)]
     let mut envs = build_envs(envs.as_ref())?;
+    // Signal pipeline context to the script so the wmll.ducklake SDK helpers
+    // record materialization state (the grid/backfill) and skip it otherwise.
+    if in_pipeline {
+        envs.insert("WM_PIPELINE".to_string(), "true".to_string());
+    }
 
     let Some(language) = language else {
         return Err(Error::ExecutionErr(
@@ -5832,6 +5951,7 @@ pub fn init_worker_internal_server_inline_utils(
                     &None,
                     &None,
                     true,
+                    false,
                 )
                 .await
             })
@@ -5913,6 +6033,7 @@ pub fn init_worker_internal_server_inline_utils(
                     &content_info.lockfile,
                     &content_info.modules,
                     true,
+                    false,
                 )
                 .await
             })
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 7f90f9240e..10e8218a77 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 use serde_json::{json, Value};
 use sqlx::types::Json;
-use sqlx::{FromRow, Postgres, Transaction};
+use sqlx::{Acquire, FromRow, Postgres, Transaction};
 use tracing::instrument;
 use uuid::Uuid;
 use windmill_common::auth::get_job_perms;
@@ -332,14 +332,14 @@ fn get_stop_after_if_data(stop_after_if: Option<&StopAfterIf>) -> (bool, Option<
     return (false, None, false);
 }
 
-async fn get_id_ctx_for_expr(
+async fn get_id_ctx_for_expr<'c>(
     expr: &str,
     flow: uuid::Uuid,
-    db: &DB,
+    e: impl sqlx::PgExecutor<'c>,
     status: &FlowStatus,
 ) -> error::Result<Option<IdContext>> {
     if expr.contains("results.") || expr.contains("results[") || expr.contains("results?.") {
-        let flow_job = get_mini_pulled_job(db, &flow).await?;
+        let flow_job = get_mini_pulled_job(e, &flow).await?;
         if let Some(flow_job) = flow_job {
             Ok(Some(get_transform_context(&flow_job, "", &status)))
         } else {
@@ -351,7 +351,7 @@ async fn get_id_ctx_for_expr(
 }
 
 async fn evaluate_stop_after_all_iters_if(
-    db: &DB,
+    tx: &mut Transaction<'_, Postgres>,
     stop_after_all_iters_if: &StopAfterIf,
     module_status: &FlowStatusModule,
     w_id: &str,
@@ -366,9 +366,20 @@ async fn evaluate_stop_after_all_iters_if(
     flow: uuid::Uuid,
     status: &FlowStatus,
 ) -> error::Result<()> {
+    // Test hook (see test_stop_after_all_iters_if_db_error_isolated_by_savepoint):
+    // run a query that aborts this (savepoint) transaction so the test can verify the
+    // caller's savepoint keeps the outer status-update transaction committable.
+    #[cfg(feature = "failpoints")]
+    if stop_after_all_iters_if.expr == "__wm_failpoint_abort_tx__" {
+        sqlx::query("SELECT 1/0")
+            .execute(&mut **tx)
+            .await
+            .map_err(|e| Error::internal_err(format!("failpoint abort_tx: {e:#}")))?;
+    }
+
     let iters_result = match &module_status {
         FlowStatusModule::InProgress { flow_jobs: Some(flow_jobs), .. } => {
-            Arc::new(retrieve_flow_jobs_results(db, w_id, flow_jobs).await?)
+            Arc::new(retrieve_flow_jobs_results(&mut **tx, w_id, flow_jobs).await?)
         }
         _ => {
             return Err(Error::internal_err(format!(
@@ -379,7 +390,8 @@ async fn evaluate_stop_after_all_iters_if(
 
     *nresult = Some(iters_result.clone()); // as an optimization, we store the result of all jobs as when stop_early_after_all_iters evaluates to false, it would have to be computed (finished loop/branchall)
 
-    let id_ctx = get_id_ctx_for_expr(&stop_after_all_iters_if.expr, flow, db, status).await?;
+    let id_ctx =
+        get_id_ctx_for_expr(&stop_after_all_iters_if.expr, flow, &mut **tx, status).await?;
 
     let stop_early_after_all_iters = compute_bool_from_expr(
         &stop_after_all_iters_if.expr,
@@ -976,8 +988,15 @@ pub async fn update_flow_status_after_job_completion_internal(
                         .and_then(|x| x.stop_after_all_iters_if.as_ref())
                     {
                         let args = from_result_to_args(args.as_ref().await.get_ref())?;
-                        if let Err(e) = evaluate_stop_after_all_iters_if(
-                            db,
+                        // Isolate the reads in a savepoint on the same connection: the
+                        // caller below swallows our error and keeps using `tx`, so a DB
+                        // read failure must not leave the outer transaction aborted (that
+                        // would fail the later commit). On error we roll back to the
+                        // savepoint, matching the previous pool-read behaviour where a
+                        // failed read left `tx` usable and the iteration was marked failed.
+                        let mut sp = tx.begin().await?;
+                        let eval_res = evaluate_stop_after_all_iters_if(
+                            &mut sp,
                             stop_after_all_iters_if,
                             module_status,
                             w_id,
@@ -992,15 +1011,19 @@ pub async fn update_flow_status_after_job_completion_internal(
                             flow,
                             &old_status,
                         )
-                        .await
-                        {
-                            tracing::error!("error evaluating stop_after_all_iters_if: {e:#}");
-                            stop_early = true;
-                            skip_if_stop_early = false;
-                            stop_early_err_msg = Some(format!(
-                                "Error evaluating stop_after_all_iters_if expression `{}`: {e:#}",
-                                stop_after_all_iters_if.expr
-                            ));
+                        .await;
+                        match eval_res {
+                            Ok(()) => sp.commit().await?,
+                            Err(e) => {
+                                let _ = sp.rollback().await;
+                                tracing::error!("error evaluating stop_after_all_iters_if: {e:#}");
+                                stop_early = true;
+                                skip_if_stop_early = false;
+                                stop_early_err_msg = Some(format!(
+                                    "Error evaluating stop_after_all_iters_if expression `{}`: {e:#}",
+                                    stop_after_all_iters_if.expr
+                                ));
+                            }
                         }
                     }
 
@@ -1054,7 +1077,7 @@ pub async fn update_flow_status_after_job_completion_internal(
                     let r = sqlx::query_scalar!(
                          "DELETE FROM parallel_monitor_lock WHERE parent_flow_id = $1 RETURNING last_ping",
                          flow,
-                     ).fetch_optional(db).await.map_err(|e| {
+                     ).fetch_optional(&mut *tx).await.map_err(|e| {
                          Error::internal_err(format!(
                              "error while deleting parallel_monitor_lock: {e:#}"
                          ))
@@ -1198,8 +1221,12 @@ pub async fn update_flow_status_after_job_completion_internal(
                     {
                         let args = from_result_to_args(args.as_ref().await.get_ref())?;
 
-                        if let Err(e) = evaluate_stop_after_all_iters_if(
-                            db,
+                        // See the matching savepoint comment above: isolate the reads so a
+                        // DB read failure (whose error the caller swallows) cannot abort
+                        // the outer transaction and break the later commit.
+                        let mut sp = tx.begin().await?;
+                        let eval_res = evaluate_stop_after_all_iters_if(
+                            &mut sp,
                             stop_after_all_iters_if,
                             module_status,
                             w_id,
@@ -1214,14 +1241,18 @@ pub async fn update_flow_status_after_job_completion_internal(
                             flow,
                             &old_status,
                         )
-                        .await
-                        {
-                            stop_early = true;
-                            skip_if_stop_early = false;
-                            stop_early_err_msg = Some(format!(
-                                "Error evaluating stop_after_all_iters_if expression `{}`: {e:#}",
-                                stop_after_all_iters_if.expr
-                            ));
+                        .await;
+                        match eval_res {
+                            Ok(()) => sp.commit().await?,
+                            Err(e) => {
+                                let _ = sp.rollback().await;
+                                stop_early = true;
+                                skip_if_stop_early = false;
+                                stop_early_err_msg = Some(format!(
+                                    "Error evaluating stop_after_all_iters_if expression `{}`: {e:#}",
+                                    stop_after_all_iters_if.expr
+                                ));
+                            }
                         }
                     }
                 }
@@ -1462,7 +1493,7 @@ pub async fn update_flow_status_after_job_completion_internal(
             match &new_status {
                 Some(FlowStatusModule::Success { flow_jobs: Some(jobs), .. })
                 | Some(FlowStatusModule::Failure { flow_jobs: Some(jobs), .. }) => {
-                    Arc::new(retrieve_flow_jobs_results(db, w_id, jobs).await?)
+                    Arc::new(retrieve_flow_jobs_results(&mut *tx, w_id, jobs).await?)
                 }
                 _ => result.clone(),
             }
@@ -1604,6 +1635,7 @@ pub async fn update_flow_status_after_job_completion_internal(
                     windmill_common::runnable_settings::RunnableSettings {
                         debouncing_settings: debouncing_hash,
                         concurrency_settings: None,
+                        retry_settings: None,
                     },
                     db,
                 )
@@ -2273,8 +2305,8 @@ async fn set_success_and_duration_in_flow_job_success<'c>(
     Ok(())
 }
 
-async fn retrieve_flow_jobs_results(
-    db: &DB,
+async fn retrieve_flow_jobs_results<'c>(
+    e: impl sqlx::PgExecutor<'c>,
     w_id: &str,
     job_uuids: &Vec<Uuid>,
 ) -> error::Result<Box<RawValue>> {
@@ -2285,7 +2317,7 @@ async fn retrieve_flow_jobs_results(
         job_uuids.as_slice(),
         w_id
     )
-    .fetch_all(db)
+    .fetch_all(e)
     .await?
     .into_iter()
     .map(|br| (br.id, br.result))
@@ -4326,7 +4358,7 @@ async fn push_next_flow_job(
             .filter(|t| !t.is_empty() && *t != flow_job.tag.as_str())
         {
             check_tag_available_for_workspace_internal(
-                &db,
+                db,
                 &flow_job.workspace_id,
                 tag_str,
                 email,
@@ -6179,8 +6211,15 @@ fn needs_resume(flow: &FlowValue, status: &FlowStatus) -> Option<(Suspend, Uuid)
         return None;
     }
 
-    if let &FlowStatusModule::Success { job, .. } = status.modules.get(prev)? {
-        Some((suspend.unwrap(), job))
+    if let &FlowStatusModule::Success { job, skipped, .. } = status.modules.get(prev)? {
+        // A step skipped via skip_if never ran, so its suspend/approval was never
+        // armed and no resume event will ever arrive. Gating the next step on it
+        // would park the flow forever.
+        if skipped {
+            None
+        } else {
+            Some((suspend.unwrap(), job))
+        }
     } else {
         None
     }
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index cf66a11663..b7a8d0c397 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.733.1";
+export const VERSION = "v1.753.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/build-npm.ts b/cli/build-npm.ts
index 5c9353dd21..1dbc9261de 100644
--- a/cli/build-npm.ts
+++ b/cli/build-npm.ts
@@ -4,24 +4,20 @@ import { join } from "node:path";
 
 const outDir = "./npm";
 
-// Parser npm packages — used as externals and added to generated package.json
-const parserPackages = [
-  "windmill-parser-wasm-py", "windmill-parser-wasm-ts",
-  "windmill-parser-wasm-regex", "windmill-parser-wasm-go",
-  "windmill-parser-wasm-php", "windmill-parser-wasm-rust",
-  "windmill-parser-wasm-yaml", "windmill-parser-wasm-csharp",
-  "windmill-parser-wasm-nu", "windmill-parser-wasm-java",
-  "windmill-parser-wasm-ruby",
-  "windmill-parser-wasm-py-imports",
-];
-const parserExternals = parserPackages.flatMap(p => ["--external", p]);
-
 // Forward parser specs from the dev package.json so the published CLI pins
-// to the same versions devs install/test against. Falls back to "*" if not
-// listed locally.
+// to the same versions devs install/test against.
 const cliDeps: Record<string, string> =
   JSON.parse(readFileSync("./package.json", "utf-8")).dependencies ?? {};
 
+// Parser packages: bundle externals + published dependencies. Derived from
+// package.json (not hand-listed) — a parser missing from this set ships a CLI
+// whose loadParser() silently falls back. package.json itself is kept in sync
+// with loadParser() call sites by test/parser_packages_unit.test.ts.
+const parserPackages = Object.keys(cliDeps).filter((p) =>
+  p.startsWith("windmill-parser-wasm")
+);
+const parserExternals = parserPackages.flatMap(p => ["--external", p]);
+
 // Clean output directory
 rmSync(outDir, { recursive: true, force: true });
 
diff --git a/cli/bun.lock b/cli/bun.lock
index c94551beb3..a745acbcba 100644
--- a/cli/bun.lock
+++ b/cli/bun.lock
@@ -19,6 +19,7 @@
         "pg-gateway": "0.3.0-beta.4",
         "svelte": "^5.45.2",
         "tar-stream": "^3.1.7",
+        "windmill-parser-wasm-asset": "1.749.0",
         "windmill-parser-wasm-csharp": "1.510.1",
         "windmill-parser-wasm-go": "1.510.1",
         "windmill-parser-wasm-java": "1.510.1",
@@ -26,6 +27,7 @@
         "windmill-parser-wasm-php": "1.647.1",
         "windmill-parser-wasm-py": "1.693.1",
         "windmill-parser-wasm-py-imports": "1.693.1",
+        "windmill-parser-wasm-r": "1.668.1",
         "windmill-parser-wasm-regex": "1.692.0",
         "windmill-parser-wasm-ruby": "1.526.1",
         "windmill-parser-wasm-rust": "1.647.1",
@@ -288,6 +290,8 @@
 
     "utility-types": ["utility-types@3.11.0", "", {}, "sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw=="],
 
+    "windmill-parser-wasm-asset": ["windmill-parser-wasm-asset@1.749.0", "", {}, "sha512-gj8g9sWQ0tXKfXso7xJxR56sS8Loe/RsnFy+0af5R8siZeCag9ikquGbQ8d8kOqIK2U8eCNA0LqsU/xAFDJIOg=="],
+
     "windmill-parser-wasm-csharp": ["windmill-parser-wasm-csharp@1.510.1", "", {}, "sha512-qm09YmnbeYHLwYn1jUnObVzPhYO9NZKMlIO7nlo7zPJBXqksgG5fK/KCtwGw9rChrnz+DsvM9wP5FhrwRLMtwQ=="],
 
     "windmill-parser-wasm-go": ["windmill-parser-wasm-go@1.510.1", "", {}, "sha512-HOkk6LXK0wrwvkn+zjm3Gxo90HmyL6TYqmLo2yp8fZuppy7GOngT27zwYeBtwONiPyvDKskzoqPQoEfd8VuUsQ=="],
@@ -302,6 +306,8 @@
 
     "windmill-parser-wasm-py-imports": ["windmill-parser-wasm-py-imports@1.693.1", "", {}, "sha512-FC0KbREe2G/sa/9kYIR930wmWw+VL6PvEIqg12J3dsJes3A+0x5JIUPT/jeD+c24DrG0ko/Ub7yDnYs56Bem7g=="],
 
+    "windmill-parser-wasm-r": ["windmill-parser-wasm-r@1.668.1", "", {}, "sha512-5YNeUibxpNBvYrxCgQcz1PxGhTFx2CyEpg2udtIhq7bx0d4gF/KDZVupMeQmAObmrEtTSFGUWNRJ4zXSWNrSpQ=="],
+
     "windmill-parser-wasm-regex": ["windmill-parser-wasm-regex@1.692.0", "", {}, "sha512-BHGTxrinZJ9ef6hFxbKiBqBEr5uqgG/QySOgMA5r1LswO9n/8fyGswr8JcPT2kGaoeoweV6/RQ+RHVaOhosnKw=="],
 
     "windmill-parser-wasm-ruby": ["windmill-parser-wasm-ruby@1.526.1", "", {}, "sha512-rMBQA8s21wmL2kA5ztRs/ZgVA3ckxe9/NLjxl3iQPL0CX6DlvfaUH0O+AnhpXXDMyBs1Y1SZIhcnbnvsHZ3R8g=="],
diff --git a/cli/package-lock.json b/cli/package-lock.json
index c502b3b25e..a9d72696b2 100644
--- a/cli/package-lock.json
+++ b/cli/package-lock.json
@@ -20,6 +20,7 @@
         "pg-gateway": "0.3.0-beta.4",
         "svelte": "^5.45.2",
         "tar-stream": "^3.1.7",
+        "windmill-parser-wasm-asset": "1.749.0",
         "windmill-parser-wasm-csharp": "1.510.1",
         "windmill-parser-wasm-go": "1.510.1",
         "windmill-parser-wasm-java": "1.510.1",
@@ -27,6 +28,7 @@
         "windmill-parser-wasm-php": "1.647.1",
         "windmill-parser-wasm-py": "1.693.1",
         "windmill-parser-wasm-py-imports": "1.693.1",
+        "windmill-parser-wasm-r": "1.668.1",
         "windmill-parser-wasm-regex": "1.692.0",
         "windmill-parser-wasm-ruby": "1.526.1",
         "windmill-parser-wasm-rust": "1.647.1",
@@ -1409,6 +1411,11 @@
         "node": ">= 4"
       }
     },
+    "node_modules/windmill-parser-wasm-asset": {
+      "version": "1.749.0",
+      "resolved": "https://registry.npmjs.org/windmill-parser-wasm-asset/-/windmill-parser-wasm-asset-1.749.0.tgz",
+      "integrity": "sha512-gj8g9sWQ0tXKfXso7xJxR56sS8Loe/RsnFy+0af5R8siZeCag9ikquGbQ8d8kOqIK2U8eCNA0LqsU/xAFDJIOg=="
+    },
     "node_modules/windmill-parser-wasm-csharp": {
       "version": "1.510.1",
       "resolved": "https://registry.npmjs.org/windmill-parser-wasm-csharp/-/windmill-parser-wasm-csharp-1.510.1.tgz",
@@ -1444,6 +1451,11 @@
       "resolved": "https://registry.npmjs.org/windmill-parser-wasm-py-imports/-/windmill-parser-wasm-py-imports-1.693.1.tgz",
       "integrity": "sha512-FC0KbREe2G/sa/9kYIR930wmWw+VL6PvEIqg12J3dsJes3A+0x5JIUPT/jeD+c24DrG0ko/Ub7yDnYs56Bem7g=="
     },
+    "node_modules/windmill-parser-wasm-r": {
+      "version": "1.668.1",
+      "resolved": "https://registry.npmjs.org/windmill-parser-wasm-r/-/windmill-parser-wasm-r-1.668.1.tgz",
+      "integrity": "sha512-5YNeUibxpNBvYrxCgQcz1PxGhTFx2CyEpg2udtIhq7bx0d4gF/KDZVupMeQmAObmrEtTSFGUWNRJ4zXSWNrSpQ=="
+    },
     "node_modules/windmill-parser-wasm-regex": {
       "version": "1.692.0",
       "resolved": "https://registry.npmjs.org/windmill-parser-wasm-regex/-/windmill-parser-wasm-regex-1.692.0.tgz",
diff --git a/cli/package.json b/cli/package.json
index 2f46e3829b..589bc52271 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -28,6 +28,7 @@
     "pg-gateway": "0.3.0-beta.4",
     "svelte": "^5.45.2",
     "tar-stream": "^3.1.7",
+    "windmill-parser-wasm-asset": "1.749.0",
     "windmill-parser-wasm-csharp": "1.510.1",
     "windmill-parser-wasm-go": "1.510.1",
     "windmill-parser-wasm-java": "1.510.1",
@@ -35,6 +36,7 @@
     "windmill-parser-wasm-php": "1.647.1",
     "windmill-parser-wasm-py": "1.693.1",
     "windmill-parser-wasm-py-imports": "1.693.1",
+    "windmill-parser-wasm-r": "1.668.1",
     "windmill-parser-wasm-regex": "1.692.0",
     "windmill-parser-wasm-ruby": "1.526.1",
     "windmill-parser-wasm-rust": "1.647.1",
diff --git a/cli/src/commands/datatable/datatable.ts b/cli/src/commands/datatable/datatable.ts
index 1291d4cc13..6609d08c50 100644
--- a/cli/src/commands/datatable/datatable.ts
+++ b/cli/src/commands/datatable/datatable.ts
@@ -9,6 +9,13 @@ import { GlobalOptions } from "../../types.ts";
 import { runCatalogQuery } from "../../utils/catalog.ts";
 import { psql as psqlDatatable } from "./psql.ts";
 import { serve as serveDatatable } from "./serve.ts";
+import {
+  createMigration,
+  pushLocalMigrations,
+  rollbackMigrations,
+  runMigrations,
+  validateLocalMigrations,
+} from "../datatable_migrations.ts";
 
 const DEFAULT_DATATABLE_NAME = "main";
 
@@ -41,6 +48,69 @@ async function run(
   await runCatalogQuery(opts, "datatable", name, sql);
 }
 
+function migrateNew(
+  opts: GlobalOptions & { datatable?: string },
+  name: string,
+) {
+  createMigration(opts.datatable ?? DEFAULT_DATATABLE_NAME, name);
+}
+
+async function migrateUp(opts: GlobalOptions & { datatable?: string }) {
+  const workspace = await resolveWorkspace(opts);
+  await requireLogin(opts);
+  const dt = opts.datatable ?? DEFAULT_DATATABLE_NAME;
+  // Reject malformed local migrations (duplicate timestamps, orphan downs) before
+  // pushing — the same check `wmill sync push` runs — so a duplicate timestamp
+  // can't silently overwrite one migration on upsert.
+  const errors = validateLocalMigrations(new Set([dt]));
+  if (errors.length > 0) {
+    log.error(
+      "Invalid datatable migrations, aborting:\n" +
+        errors.map((e) => `  - ${e}`).join("\n"),
+    );
+    process.exit(1);
+  }
+  // Push any locally-created/edited migration files first (without running
+  // them), so `migrate up` works even before a `wmill sync push`.
+  await pushLocalMigrations(workspace.workspaceId, dt);
+  await runMigrations(workspace.workspaceId, dt);
+}
+
+async function migrateDown(opts: GlobalOptions & { datatable?: string }) {
+  const workspace = await resolveWorkspace(opts);
+  await requireLogin(opts);
+  const dt = opts.datatable ?? DEFAULT_DATATABLE_NAME;
+  await rollbackMigrations(workspace.workspaceId, dt);
+}
+
+const migrateCommand = new Command()
+  .description("manage datatable migrations")
+  .command("new", "scaffold a new migration (.up.sql / .down.sql files)")
+  .arguments("<name:string>")
+  .option(
+    "-d --datatable <datatable:string>",
+    "Target datatable (default: main)",
+  )
+  .action(migrateNew as any)
+  .command(
+    "up",
+    "apply all pending migrations to the main datatable (or one via --datatable)",
+  )
+  .option(
+    "-d --datatable <datatable:string>",
+    "Target datatable (default: main)",
+  )
+  .action(migrateUp as any)
+  .command(
+    "down",
+    "roll back the most recent migration on the main datatable (or one via --datatable)",
+  )
+  .option(
+    "-d --datatable <datatable:string>",
+    "Target datatable (default: main)",
+  )
+  .action(migrateDown as any);
+
 async function create(
   opts: GlobalOptions & { resource?: string; force?: boolean },
   name?: string,
@@ -124,6 +194,7 @@ const command = new Command()
     "Output only the final result as JSON. Useful for scripting.",
   )
   .action(run as any)
+  .command("migrate", migrateCommand)
   .command(
     "create",
     "register a datatable database in the workspace (default: instance-backed 'main') so scripts can use datatable://<name>",
diff --git a/cli/src/commands/datatable_migrations.ts b/cli/src/commands/datatable_migrations.ts
new file mode 100644
index 0000000000..4fcaffd4fa
--- /dev/null
+++ b/cli/src/commands/datatable_migrations.ts
@@ -0,0 +1,340 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as log from "../core/log.ts";
+import { colors } from "@cliffy/ansi/colors";
+import * as wmill from "../../gen/services.gen.ts";
+import { readTextFile } from "../utils/utils.ts";
+import { Confirm } from "@cliffy/prompt/confirm";
+
+// Migrations live under <cwd>/migrations/datatable/<datatable>/, one folder per
+// target data table, as `<timestamp>_<name>.up.sql` (and optional `.down.sql`).
+// They are synced as ordinary workspace files (see the workspace tarball export
+// and the `datatable_migration` handling in sync.ts); this module only holds the
+// `wmill datatable migrate` command helpers and the per-file push primitive.
+const MIGRATIONS_DIR = path.join("migrations", "datatable");
+
+// Migration names map directly onto file names and the DB `name` column.
+const MIGRATION_NAME_RE = /^[a-zA-Z0-9_-]+$/;
+
+/** Current UTC time as a YYYYMMDDHHMMSS migration version. */
+function migrationTimestamp(): string {
+  const d = new Date();
+  const p = (n: number) => String(n).padStart(2, "0");
+  return (
+    `${d.getUTCFullYear()}${p(d.getUTCMonth() + 1)}${p(d.getUTCDate())}` +
+    `${p(d.getUTCHours())}${p(d.getUTCMinutes())}${p(d.getUTCSeconds())}`
+  );
+}
+
+/**
+ * A migration version unique within a data table folder: the current UTC
+ * timestamp bumped past any existing version, so two migrations scaffolded in
+ * the same second don't collide on the `(datatable, timestamp)` identity used to
+ * upsert them.
+ */
+function nextMigrationTimestamp(dir: string): string {
+  const now = Number(migrationTimestamp());
+  let max = 0;
+  if (fs.existsSync(dir)) {
+    for (const file of fs.readdirSync(dir)) {
+      const m = file.match(/^(\d+)_.*\.(up|down)\.sql$/);
+      if (m) max = Math.max(max, Number(m[1]));
+    }
+  }
+  return String(max >= now ? max + 1 : now);
+}
+
+/**
+ * Scaffold a new migration under migrations/datatable/<datatable>/ as empty
+ * `<timestamp>_<name>.up.sql` and `.down.sql` files. Purely local — no network.
+ */
+export function createMigration(datatable: string, name: string): void {
+  if (!MIGRATION_NAME_RE.test(name)) {
+    throw new Error(
+      `Invalid migration name '${name}': use only letters, digits, '_' and '-'`,
+    );
+  }
+  const dir = path.join(process.cwd(), MIGRATIONS_DIR, datatable);
+  fs.mkdirSync(dir, { recursive: true });
+
+  const timestamp = nextMigrationTimestamp(dir);
+  const base = `${timestamp}_${name}`;
+  const up = path.join(dir, `${base}.up.sql`);
+  const down = path.join(dir, `${base}.down.sql`);
+  // Frame the body in an explicit transaction so it applies atomically, matching
+  // the template the UI's "New migration" modal seeds.
+  const template = (direction: string) =>
+    `-- ${direction} migration: ${name}\nBEGIN;\n\n-- Add your migration here\n\nEND;\n`;
+  fs.writeFileSync(up, template("up"), "utf-8");
+  fs.writeFileSync(down, template("down"), "utf-8");
+
+  log.info(
+    colors.green(`Created migration ${base} in ${MIGRATIONS_DIR}/${datatable}/`),
+  );
+  for (const f of [up, down]) {
+    log.info(colors.gray(`  ${path.relative(process.cwd(), f)}`));
+  }
+}
+
+/**
+ * Apply the workspace's pending migrations to a data table (forwards migrations
+ * recorded in `_wm_migrations`). Mirrors `wmill datatable migrate up`.
+ */
+export async function runMigrations(
+  workspace: string,
+  datatableName: string,
+): Promise<void> {
+  const result = await wmill.runDatatableMigrations({
+    workspace,
+    datatableName,
+  });
+  const applied = result.applied ?? [];
+  if (applied.length === 0) {
+    log.info(colors.gray(`No pending migrations to run on '${datatableName}'`));
+    return;
+  }
+  log.info(
+    colors.green(`Applied ${applied.length} migration(s) to '${datatableName}':`),
+  );
+  for (const m of applied) {
+    log.info(colors.gray(`  ${m.version} ${m.name}`));
+  }
+}
+
+/**
+ * Roll back the most recently applied migration on a data table (one step).
+ * Mirrors `wmill datatable migrate down`.
+ */
+export async function rollbackMigrations(
+  workspace: string,
+  datatableName: string,
+): Promise<void> {
+  const result = await wmill.rollbackDatatableMigrations({
+    workspace,
+    datatableName,
+  });
+  const rolledBack = result.rolled_back ?? [];
+  if (rolledBack.length === 0) {
+    log.info(
+      colors.gray(`No applied migrations to roll back on '${datatableName}'`),
+    );
+    return;
+  }
+  for (const m of rolledBack) {
+    log.info(
+      colors.green(`Rolled back migration ${m.version} ${m.name} on '${datatableName}'`),
+    );
+  }
+}
+
+/**
+ * Validate the on-disk migration files for the given data tables (or all of
+ * them when `datatables` is omitted). Returns a list of human-readable problems;
+ * an empty list means the migrations are well-formed. Two states are invalid:
+ *  - two up (or two down) files sharing the same timestamp, which collide on the
+ *    `(datatable, timestamp)` identity used to upsert; and
+ *  - a `.down.sql` with no matching `.up.sql` (an up file is mandatory).
+ */
+export function validateLocalMigrations(datatables?: Set<string>): string[] {
+  const errors: string[] = [];
+  const root = path.join(process.cwd(), MIGRATIONS_DIR);
+  if (!fs.existsSync(root)) return errors;
+
+  for (const datatable of fs.readdirSync(root)) {
+    if (datatables && !datatables.has(datatable)) continue;
+    const dtDir = path.join(root, datatable);
+    if (!fs.statSync(dtDir).isDirectory()) continue;
+
+    const upNamesByTs = new Map<number, string[]>();
+    const downNamesByTs = new Map<number, string[]>();
+    const upBases = new Set<string>();
+    const downBases: { ts: number; name: string }[] = [];
+
+    for (const file of fs.readdirSync(dtDir)) {
+      const m = file.match(/^(\d+)_(.*)\.(up|down)\.sql$/);
+      if (!m) continue;
+      const ts = Number(m[1]);
+      const name = m[2];
+      if (m[3] === "up") {
+        (upNamesByTs.get(ts) ?? upNamesByTs.set(ts, []).get(ts)!).push(name);
+        upBases.add(`${ts}_${name}`);
+      } else {
+        (downNamesByTs.get(ts) ?? downNamesByTs.set(ts, []).get(ts)!).push(name);
+        downBases.push({ ts, name });
+      }
+    }
+
+    for (const [ts, names] of upNamesByTs) {
+      if (names.length > 1) {
+        errors.push(
+          `${datatable}: ${names.length} up migrations share timestamp ${ts} (${names.join(", ")})`,
+        );
+      }
+    }
+    for (const [ts, names] of downNamesByTs) {
+      if (names.length > 1) {
+        errors.push(
+          `${datatable}: ${names.length} down migrations share timestamp ${ts} (${names.join(", ")})`,
+        );
+      }
+    }
+    for (const d of downBases) {
+      if (!upBases.has(`${d.ts}_${d.name}`)) {
+        errors.push(
+          `${datatable}: ${d.ts}_${d.name}.down.sql has no matching ${d.ts}_${d.name}.up.sql`,
+        );
+      }
+    }
+  }
+
+  return errors;
+}
+
+/**
+ * Sync a single migration to the workspace based on the current on-disk state of
+ * its `<datatable>/<timestamp>_<name>.up.sql` file: upsert it when the up file
+ * exists, otherwise delete it. Called by `wmill sync push` for each changed
+ * `datatable_migration` file.
+ */
+export async function pushMigrationFromDisk(
+  workspace: string,
+  m: { datatable: string; timestamp: number },
+): Promise<void> {
+  const dir = path.join(process.cwd(), MIGRATIONS_DIR, m.datatable);
+  // Find the up file for this timestamp regardless of its name segment. A rename
+  // (`123_old.up.sql` -> `123_new.up.sql`) keeps the (datatable, timestamp)
+  // identity but changes the name; the diff sorter may process the deleted old
+  // path before the added new one, so keying off the passed name would delete
+  // the record. Scanning by timestamp upserts the surviving file instead.
+  const upFile = fs.existsSync(dir)
+    ? fs.readdirSync(dir).find((f) => {
+        const parsed = f.match(/^(\d+)_(.*)\.up\.sql$/);
+        return parsed !== null && Number(parsed[1]) === m.timestamp;
+      })
+    : undefined;
+
+  if (upFile === undefined) {
+    log.info(colors.red(`Deleting datatable_migration ${m.datatable}/${m.timestamp}`));
+    await wmill.deleteDatatableMigration({
+      workspace,
+      datatableName: m.datatable,
+      timestamp: m.timestamp,
+    });
+    return;
+  }
+
+  const name = upFile.match(/^(\d+)_(.*)\.up\.sql$/)![2];
+  const base = `${m.timestamp}_${name}`;
+  const code_up = await readTextFile(path.join(dir, upFile));
+  const downPath = path.join(dir, `${base}.down.sql`);
+  const code_down = fs.existsSync(downPath) ? await readTextFile(downPath) : undefined;
+
+  log.info(colors.green(`Pushing datatable_migration ${m.datatable}/${base}`));
+  await wmill.upsertDatatableMigration({
+    workspace,
+    datatableName: m.datatable,
+    requestBody: {
+      timestamp: m.timestamp,
+      name,
+      code_up,
+      ...(code_down !== undefined ? { code_down } : {}),
+    },
+  });
+}
+
+/**
+ * Upsert the on-disk migrations of a data table to the workspace, so a freshly
+ * created migration file works with `wmill datatable migrate up` even without a
+ * prior `wmill sync push`. Pushes only migrations that are new or edited
+ * (compared against the workspace's current definitions); it never deletes
+ * remote migrations absent on disk and never touches other item kinds.
+ */
+export async function pushLocalMigrations(
+  workspace: string,
+  datatableName: string,
+): Promise<void> {
+  const dir = path.join(process.cwd(), MIGRATIONS_DIR, datatableName);
+  if (!fs.existsSync(dir)) return;
+
+  // Local migrations are identified by their `.up.sql` file (the up file is
+  // mandatory); this deliberately ignores files that were only deleted locally.
+  const local: { timestamp: number; name: string }[] = [];
+  for (const file of fs.readdirSync(dir)) {
+    const m = file.match(/^(\d+)_(.*)\.up\.sql$/);
+    if (m) local.push({ timestamp: Number(m[1]), name: m[2] });
+  }
+  if (local.length === 0) return;
+
+  const remote = await wmill.listDatatableMigrations({ workspace });
+  const remoteByTs = new Map(
+    remote
+      .filter((r) => r.datatable === datatableName)
+      .map((r) => [r.timestamp, r] as const),
+  );
+
+  for (const { timestamp, name } of local) {
+    const base = `${timestamp}_${name}`;
+    const code_up = await readTextFile(path.join(dir, `${base}.up.sql`));
+    const downPath = path.join(dir, `${base}.down.sql`);
+    const code_down = fs.existsSync(downPath)
+      ? await readTextFile(downPath)
+      : undefined;
+
+    const r = remoteByTs.get(timestamp);
+    const unchanged =
+      r !== undefined &&
+      r.name === name &&
+      r.code_up === code_up &&
+      (r.code_down ?? undefined) === code_down;
+    if (unchanged) continue;
+
+    log.info(colors.green(`Pushing datatable_migration ${datatableName}/${base}`));
+    await wmill.upsertDatatableMigration({
+      workspace,
+      datatableName,
+      requestBody: {
+        timestamp,
+        name,
+        code_up,
+        ...(code_down !== undefined ? { code_down } : {}),
+      },
+    });
+  }
+}
+
+/**
+ * After a push that introduced new migrations, list them and (interactively)
+ * offer to run them, equivalent to `wmill datatable migrate up` on each affected
+ * data table.
+ */
+export async function offerToRunNewMigrations(
+  workspace: string,
+  newMigrations: { datatable: string; timestamp: number; name: string }[],
+  opts?: { yes?: boolean; jsonOutput?: boolean },
+): Promise<void> {
+  if (newMigrations.length === 0) return;
+
+  log.info(colors.green("New migrations were pushed:"));
+  for (const m of newMigrations) {
+    log.info(colors.gray(`  ${m.datatable}: ${m.timestamp} ${m.name}`));
+  }
+
+  // Running migrations mutates the data tables, so skip the prompt in
+  // non-interactive contexts (--yes, --json, no TTY).
+  const interactive = !opts?.jsonOutput && !opts?.yes && !!process.stdin.isTTY;
+  if (!interactive) {
+    return;
+  }
+
+  const shouldRun = await Confirm.prompt({
+    message: "New migrations were pushed, run them?",
+    default: false,
+  });
+  if (!shouldRun) {
+    return;
+  }
+
+  for (const datatable of new Set(newMigrations.map((m) => m.datatable))) {
+    await runMigrations(workspace, datatable);
+  }
+}
diff --git a/cli/src/commands/docs/docs.ts b/cli/src/commands/docs/docs.ts
index fed91201e0..4ba7ae95d5 100644
--- a/cli/src/commands/docs/docs.ts
+++ b/cli/src/commands/docs/docs.ts
@@ -7,24 +7,16 @@ import { GlobalOptions } from "../../types.ts";
 import { getHeaders } from "../../utils/utils.ts";
 import { detectAuthGatewayChallenge } from "../../utils/http_guards.ts";
 
-interface DocContentItem {
-  title: string;
+interface DocsSearchResult {
   url: string;
-  source?: {
-    content?: Array<{ text: string }>;
-  };
+  title: string;
+  score: number;
+  snippets: string[];
 }
 
-interface InkeepResponse {
-  choices?: Array<{
-    message?: {
-      content?: string;
-    };
-  }>;
-}
-
-interface ParsedContent {
-  content?: DocContentItem[];
+interface DocsSearchResponse {
+  text: string;
+  results: DocsSearchResult[];
 }
 
 async function docs(
@@ -34,7 +26,9 @@ async function docs(
   await requireLogin(opts);
   const workspace = await resolveWorkspace(opts);
 
-  const url = `${workspace.remote}api/inkeep`;
+  // The backend self-hosts the docs corpus and does the search, so this works
+  // against any instance (no windmill.dev egress required).
+  const url = `${workspace.remote}api/docs/search?query=${encodeURIComponent(query)}`;
 
   console.log(colors.bold(`\nSearching Windmill docs...\n`));
 
@@ -42,13 +36,11 @@ async function docs(
   let res: Response;
   try {
     res = await fetch(url, {
-      method: "POST",
+      method: "GET",
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${workspace.token}`,
         ...extraHeaders,
       },
-      body: JSON.stringify({ query }),
     });
   } catch (e) {
     throw new Error(`Network error connecting to ${workspace.remote}: ${e}`);
@@ -56,54 +48,31 @@ async function docs(
 
   await detectAuthGatewayChallenge(res, url);
 
-  if (res.status === 403) {
-    log.info(
-      "Windmill documentation search is an Enterprise Edition feature. Please upgrade to use this command."
-    );
-    return;
-  }
-
   if (!res.ok) {
     throw new Error(
       `Documentation search failed: ${res.status} ${res.statusText}\n${await res.text()}`
     );
   }
 
-  const data = (await res.json()) as InkeepResponse;
-  const raw = data.choices?.[0]?.message?.content;
-
-  if (!raw) {
-    log.info("No documentation found for this query.");
-    return;
-  }
-
-  let parsed: ParsedContent;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    throw new Error("Failed to parse documentation response.");
-  }
-
-  const items = parsed.content ?? [];
-
-  if (items.length === 0) {
-    log.info("No documentation found for this query.");
-    return;
-  }
+  const data = (await res.json()) as DocsSearchResponse;
+  const items = data.results ?? [];
 
   if (opts.json) {
     console.log(JSON.stringify(items, null, 2));
     return;
   }
 
+  if (items.length === 0) {
+    log.info("No documentation found for this query.");
+    return;
+  }
+
   for (const item of items) {
     console.log(colors.bold(colors.cyan(`📄 ${item.title}`)));
     if (item.url) {
       console.log(`   ${colors.underline(item.url)}`);
     }
-    const text = item.source?.content?.[0]?.text;
-    if (text) {
-      const snippet = text.length > 500 ? text.slice(0, 500) + "..." : text;
+    for (const snippet of item.snippets ?? []) {
       console.log(`   ${snippet}`);
     }
     console.log();
diff --git a/cli/src/commands/flow/flow.ts b/cli/src/commands/flow/flow.ts
index c0e94c478d..71d90af6fe 100644
--- a/cli/src/commands/flow/flow.ts
+++ b/cli/src/commands/flow/flow.ts
@@ -135,6 +135,31 @@ function warnAboutLocalPathScriptDivergence(
 
 const alreadySynced: string[] = [];
 
+// Collect every script/sub-flow step path in a flow value — recursively through loops,
+// branches, and the failure/preprocessor modules — for workspace-path validation. Unlike
+// `collectPathScriptPaths` this also includes `type: "flow"` sub-flow steps.
+function collectStepPaths(flowValue: any): string[] {
+  const paths: string[] = [];
+  const walk = (modules: any[] | undefined) => {
+    for (const m of modules ?? []) {
+      const v = m?.value;
+      if (!v) continue;
+      if ((v.type === "script" || v.type === "flow") && typeof v.path === "string") {
+        paths.push(v.path);
+      }
+      walk(v.modules);
+      walk(v.default);
+      for (const b of v.branches ?? []) walk(b?.modules);
+      // AI-agent tools are step-like and can carry script paths too.
+      walk(v.tools);
+    }
+  };
+  walk(flowValue?.modules);
+  if (flowValue?.failure_module) walk([flowValue.failure_module]);
+  if (flowValue?.preprocessor_module) walk([flowValue.preprocessor_module]);
+  return paths;
+}
+
 export async function pushFlow(
   workspace: string,
   remotePath: string,
@@ -190,6 +215,21 @@ export async function pushFlow(
     );
   }
 
+  // Reject script/sub-flow steps whose path is not a workspace path (u/, f/, g/ or hub/).
+  // A flow.yaml generated from a feature-branch checkout can carry absolute local paths
+  // (e.g. /tmp/.../ops/scripts/...); pushed, they silently mis-resolve at runtime (#9751).
+  // The backend re-validates the same rule for every step type, so this is a fail-fast.
+  const badStepPaths = collectStepPaths(localFlow.value).filter(
+    (p) => p !== "" && !/^(u|f|g|hub)\//.test(p)
+  );
+  if (badStepPaths.length > 0) {
+    throw new Error(
+      `Cannot push flow ${remotePath}: step(s) reference non-workspace path(s): ${badStepPaths.join(", ")}. ` +
+      `Flow step paths must be workspace paths (u/, f/, g/ or hub/), not absolute or local filesystem paths. ` +
+      `This usually means flow.yaml was generated with paths from a checkout directory.`
+    );
+  }
+
   const hasOnBehalfOf = (localFlow as any).has_on_behalf_of ?? !!localFlow.on_behalf_of_email;
   delete (localFlow as any).has_on_behalf_of;
 
diff --git a/cli/src/commands/generate-metadata/generate-metadata.ts b/cli/src/commands/generate-metadata/generate-metadata.ts
index 8517ac0912..7eab79b52d 100644
--- a/cli/src/commands/generate-metadata/generate-metadata.ts
+++ b/cli/src/commands/generate-metadata/generate-metadata.ts
@@ -2,7 +2,7 @@ import { Command } from "@cliffy/command";
 import { Confirm } from "@cliffy/prompt/confirm";
 import { colors } from "@cliffy/ansi/colors";
 import { sep as SEP } from "node:path";
-import { GlobalOptions } from "../../types.ts";
+import { GlobalOptions, isDatatableMigrationPath } from "../../types.ts";
 import { SyncOptions, mergeConfigWithConfigFile } from "../../core/conf.ts";
 import { resolveWorkspace } from "../../core/context.ts";
 import { requireLogin } from "../../core/auth.ts";
@@ -54,6 +54,8 @@ async function walkLocalScripts(
       (!isD && !exts.some((ext) => p.endsWith(ext))) ||
       ignore(p, isD) ||
       isFolderResourcePathAnyFormat(p) ||
+      // Datatable migration `.sql` files aren't Windmill scripts.
+      isDatatableMigrationPath(p) ||
       (isScriptModulePath(p) && !isModuleEntryPoint(p)),
     false,
     {},
@@ -221,6 +223,8 @@ function categorizeLocalFiles(
     } else if (
       exts.some((ext) => p.endsWith(ext)) &&
       !isFolderResourcePathAnyFormat(p) &&
+      // Datatable migration `.sql` files aren't Windmill scripts.
+      !isDatatableMigrationPath(p) &&
       !(isScriptModulePath(p) && !isModuleEntryPoint(p))
     ) {
       scripts.push(p);
diff --git a/cli/src/commands/init/init.ts b/cli/src/commands/init/init.ts
index f1a10d7cc9..fc6e70c5b2 100644
--- a/cli/src/commands/init/init.ts
+++ b/cli/src/commands/init/init.ts
@@ -251,7 +251,7 @@ async function initAction(opts: InitOptions) {
     );
   }
 
-  // Generate resource type namespace (only if a workspace was bound)
+  // Generate resource type namespace (needs a bound workspace)
   if (didBindWorkspace && boundProfile) {
     try {
       // Cache the bound profile so resolveWorkspace doesn't re-resolve and prompt again
@@ -266,9 +266,51 @@ async function initAction(opts: InitOptions) {
       );
     }
   } else {
-    log.info(
-      colors.gray("Skipped resource type namespace generation (no workspace bound). Run 'wmill workspace bind' then 'wmill init' to generate it.")
+    // generateRTNamespace resolves a workspace; its non-interactive
+    // multiple-workspaces path process.exit(-1)s (uncatchable), aborting init.
+    // So generate only for a single resolvable workspace (baseUrl + matching
+    // profile), passed via __secret_workspace to skip resolution; else skip.
+    const { readConfigFile, getWorkspaceNames, getEffectiveWorkspaceId } =
+      await import("../../core/conf.ts");
+    const config = await readConfigFile({ warnIfMissing: false });
+    const resolvable = getWorkspaceNames(config.workspaces).filter(
+      (n) => !!(config.workspaces as any)?.[n]?.baseUrl
     );
+    let boundProfileForGen: Workspace | undefined;
+    if (resolvable.length === 1) {
+      const name = resolvable[0];
+      const entry = (config.workspaces as any)[name];
+      let normalizedBaseUrl: string | undefined;
+      try {
+        normalizedBaseUrl = new URL(entry.baseUrl).toString();
+      } catch {
+        normalizedBaseUrl = undefined;
+      }
+      if (normalizedBaseUrl) {
+        const workspaceId = getEffectiveWorkspaceId(name, entry);
+        const profiles = await allWorkspaces(opts.configDir);
+        boundProfileForGen = profiles.find(
+          (p) => p.remote === normalizedBaseUrl && p.workspaceId === workspaceId
+        );
+      }
+    }
+    if (boundProfileForGen) {
+      try {
+        const rtOpts = { ...opts } as GlobalOptions;
+        (rtOpts as any).__secret_workspace = boundProfileForGen;
+        await generateRTNamespace(rtOpts);
+      } catch (error) {
+        log.warn(
+          `Could not pull resource types and generate TypeScript namespace: ${
+            error instanceof Error ? error.message : error
+          }`
+        );
+      }
+    } else {
+      log.info(
+        colors.gray("Skipped resource type namespace generation (no workspace bound). Run 'wmill workspace bind' then 'wmill init' to generate it.")
+      );
+    }
   }
 }
 
diff --git a/cli/src/commands/init/template.ts b/cli/src/commands/init/template.ts
index 210aae5aca..b0c83d7039 100644
--- a/cli/src/commands/init/template.ts
+++ b/cli/src/commands/init/template.ts
@@ -180,8 +180,12 @@ export const CONFIG_REFERENCE: ConfigOption[] = [
     additionalProperties: WORKSPACE_CONFIG_SCHEMA,
     section: "Workspace bindings",
     sectionNote: "Map workspace names to Windmill instances and override settings per workspace.\nThe key is a human-friendly workspace name. gitBranch and workspaceId default to the key name.",
-    templateValue: "\n  {{BRANCH}}: {}",
+    // Empty ` {}`, not a live `<name>: {}` stub: a stub has no baseUrl yet
+    // counts as a configured workspace, breaking auto-selection and making a
+    // later `workspace bind` ambiguous. The example stays commented.
+    templateValue: " {}",
     example: [
+      "  # {{BRANCH}}:",
       "{{BASEURL_LINE}}",
       "{{WORKSPACE_ID_LINE}}",
       "    # gitBranch: main                        # git branch (defaults to workspace name)",
diff --git a/cli/src/commands/pipeline/boundedCascade.ts b/cli/src/commands/pipeline/boundedCascade.ts
new file mode 100644
index 0000000000..69166726c5
--- /dev/null
+++ b/cli/src/commands/pipeline/boundedCascade.ts
@@ -0,0 +1,355 @@
+// Bounded-cascade graph engine for `wmill pipeline run --to`.
+//
+// MIRROR of frontend/src/lib/components/assets/AssetGraph/boundedCascade.ts —
+// the two have no shared import path (frontend is a separate package), so keep
+// them in sync. The grammar is intentionally tiny: there is no dbt-style
+// `--select` string. The user names a start (a schedule / manual root) and one
+// or more end nodes; the run is the "path between" them:
+//
+//     descendants(start) ∩ (ancestors(ends) ∪ ends) ∪ {start}
+//
+// Node ids: assets `${kind}:${path}` (e.g. `datatable:main/raw`); runnables
+// `script:${path}`. Operates on the asset-graph payload shape used by
+// pipeline.ts.
+
+export type BCGraph = {
+  runnables: {
+    path: string;
+    usage_kind: "script" | "flow" | "job";
+    // `// partitioned <kind>` on the script (daily/hourly/weekly/monthly/dynamic).
+    // Emitted by both the deployed graph endpoint and the local builder.
+    partition_kind?: string;
+    // `// macros` library: non-empty on a workspace macro library (deployed
+    // graph only). Definition-only — never a runnable cascade step.
+    macros?: { name: string }[];
+  }[];
+  assets: { kind: string; path: string }[];
+  edges: {
+    runnable_kind: string;
+    runnable_path: string;
+    asset_kind: string;
+    asset_path: string;
+    access_type?: "r" | "w" | "rw";
+  }[];
+  triggers: (
+    | {
+        trigger_kind: "asset";
+        asset_kind: string;
+        asset_path: string;
+        runnable_kind: string;
+        runnable_path: string;
+      }
+    | { trigger_kind: string; runnable_kind: string; runnable_path: string }
+  )[];
+  // `// data_test` ordering edges (HD-1): the referenced asset's producer must
+  // materialize before the tested script runs. Fed into the lineage DAG so a
+  // bounded/cold cascade orders the referenced dimension first. Optional — the
+  // deployed graph omits it when empty, and older local graphs never emit it.
+  test_edges?: {
+    producer_kind: string;
+    producer_path: string;
+    runnable_kind: string;
+    runnable_path: string;
+    asset_kind: string;
+    asset_path: string;
+  }[];
+};
+
+export const SCRIPT_PREFIX = "script:";
+export const scriptNodeId = (path: string): string => `${SCRIPT_PREFIX}${path}`;
+export const isScriptNode = (id: string): boolean => id.startsWith(SCRIPT_PREFIX);
+export const scriptPathOf = (id: string): string => id.slice(SCRIPT_PREFIX.length);
+const assetNodeId = (kind: string, path: string): string => `${kind}:${path}`;
+
+// Native trigger kinds whose scripts must NOT be auto-run by the CLI cascade:
+// event triggers fan out per external event, and `webhook`/`data_upload` are UI
+// entrypoints that need caller-supplied input (a request body / an uploaded
+// S3Object) — previewing any of them with empty args runs the wrong thing.
+// The deployed graph omits `webhook`/`data_upload` rows, but the local graph
+// emits them, so a `// on data_upload` script would otherwise read as a manual
+// root and get auto-run without its upload argument.
+const NON_AUTORUN_TRIGGER_KINDS = new Set([
+  "kafka",
+  "mqtt",
+  "nats",
+  "postgres",
+  "sqs",
+  "gcp",
+  "email",
+  "webhook",
+  "data_upload",
+]);
+
+/** Resolve an asset URI (`datatable://x`, `s3://b/k`, …) to its node id. */
+export function assetUriToNodeId(uri: string): string | undefined {
+  const m = uri.match(/^([a-z0-9_]+):\/\/(.+)$/i);
+  if (!m) return undefined;
+  const prefix = m[1].toLowerCase();
+  const kind = prefix === "s3" ? "s3object" : prefix;
+  // Mirror Rust `parse_asset_syntax`: strip all leading slashes from S3 keys so a
+  // `--to s3:///exports/x` token resolves to the canonical graph node
+  // `s3object:exports/x` (default storage), same as `s3://exports/x`, and a
+  // canonical key never starts with `/`.
+  const path = kind === "s3object" ? m[2].replace(/^\/+/, "") : m[2];
+  return `${kind}:${path}`;
+}
+
+export type LineageDag = {
+  down: Map<string, Set<string>>;
+  up: Map<string, Set<string>>;
+  nodes: Set<string>;
+};
+
+function addEdge(dag: LineageDag, a: string, b: string) {
+  if (a === b) return;
+  dag.nodes.add(a);
+  dag.nodes.add(b);
+  (dag.down.get(a) ?? dag.down.set(a, new Set()).get(a)!).add(b);
+  (dag.up.get(b) ?? dag.up.set(b, new Set()).get(b)!).add(a);
+}
+
+/** Unified upstream→downstream lineage DAG over scripts ∪ assets. */
+export function buildLineageDag(g: BCGraph): LineageDag {
+  const dag: LineageDag = { down: new Map(), up: new Map(), nodes: new Set() };
+  for (const r of g.runnables ?? []) {
+    if (r.usage_kind === "script") dag.nodes.add(scriptNodeId(r.path));
+  }
+  for (const a of g.assets ?? []) dag.nodes.add(assetNodeId(a.kind, a.path));
+  for (const e of g.edges ?? []) {
+    if (e.runnable_kind !== "script") continue;
+    const aid = assetNodeId(e.asset_kind, e.asset_path);
+    const access = e.access_type ?? "r";
+    if (access === "w" || access === "rw") {
+      addEdge(dag, scriptNodeId(e.runnable_path), aid); // producer
+    } else if (access === "r") {
+      addEdge(dag, aid, scriptNodeId(e.runnable_path)); // pure reader
+    }
+  }
+  for (const t of g.triggers ?? []) {
+    if (t.trigger_kind !== "asset" || t.runnable_kind !== "script") continue;
+    const at = t as Extract<BCGraph["triggers"][number], { trigger_kind: "asset" }>;
+    addEdge(dag, assetNodeId(at.asset_kind, at.asset_path), scriptNodeId(at.runnable_path));
+  }
+  // Data-test ordering edges: route through the referenced asset node so the
+  // existing producer → asset write edge extends into producer → asset → testing
+  // script (mirrors frontend boundedCascade.ts) — the tested script runs after
+  // the referenced dimension materializes.
+  for (const t of g.test_edges ?? []) {
+    if (t.runnable_kind !== "script") continue;
+    addEdge(dag, assetNodeId(t.asset_kind, t.asset_path), scriptNodeId(t.runnable_path));
+  }
+  return dag;
+}
+
+function closure(adj: Map<string, Set<string>>, start: string): Set<string> {
+  const seen = new Set<string>();
+  const queue = [start];
+  while (queue.length > 0) {
+    const cur = queue.shift()!;
+    for (const n of adj.get(cur) ?? []) {
+      if (seen.has(n)) continue;
+      seen.add(n);
+      queue.push(n);
+    }
+  }
+  // A cycle back to `start` would have re-added it; the contract excludes
+  // the node itself.
+  seen.delete(start);
+  return seen;
+}
+
+export const descendants = (dag: LineageDag, n: string): Set<string> => closure(dag.down, n);
+export const ancestors = (dag: LineageDag, n: string): Set<string> => closure(dag.up, n);
+
+/**
+ * Nodes reachable from `starts` over the lineage DAG, treating `barriers` as cut
+ * points: a barrier node is neither included NOR traversed through. So a node
+ * reachable ONLY via a barrier is excluded, while one also reachable via another
+ * path stays. Used for whole-pipeline runs to keep event handlers AND their
+ * event-only downstream closure out (subtracting only the handler would leave a
+ * consumer whose producer was skipped, which topoOrder would then run with
+ * missing/stale inputs).
+ */
+export function reachableCutting(
+  dag: LineageDag,
+  starts: Iterable<string>,
+  barriers: Set<string>,
+): Set<string> {
+  const seen = new Set<string>();
+  const queue: string[] = [];
+  for (const s of starts) {
+    if (barriers.has(s) || seen.has(s)) continue;
+    seen.add(s);
+    queue.push(s);
+  }
+  while (queue.length > 0) {
+    const n = queue.shift()!;
+    for (const next of dag.down.get(n) ?? []) {
+      if (barriers.has(next) || seen.has(next)) continue;
+      seen.add(next);
+      queue.push(next);
+    }
+  }
+  return seen;
+}
+
+export type BoundedResult = {
+  nodes: Set<string>;
+  reachableEnds: string[];
+  droppedEnds: string[];
+};
+
+/** Path-between node set for `start` and `ends` (inclusive). */
+export function boundedSet(dag: LineageDag, start: string, ends: string[]): BoundedResult {
+  const downSet = new Set(descendants(dag, start));
+  downSet.add(start);
+  const reachableEnds = ends.filter((e) => downSet.has(e));
+  const droppedEnds = ends.filter((e) => !downSet.has(e));
+  if (reachableEnds.length === 0) {
+    return { nodes: new Set([start]), reachableEnds, droppedEnds };
+  }
+  const upClosure = new Set<string>();
+  for (const e of reachableEnds) {
+    upClosure.add(e);
+    for (const a of ancestors(dag, e)) upClosure.add(a);
+  }
+  const nodes = new Set<string>();
+  for (const n of downSet) if (upClosure.has(n)) nodes.add(n);
+  nodes.add(start);
+  return { nodes, reachableEnds, droppedEnds };
+}
+
+/** Script node ids eligible to start a bounded run. */
+export function validStarts(g: BCGraph): Set<string> {
+  const subscribers = new Set<string>();
+  const scheduleScripts = new Set<string>();
+  const nonAutorunScripts = new Set<string>();
+  for (const t of g.triggers ?? []) {
+    if (t.runnable_kind !== "script") continue;
+    if (t.trigger_kind === "asset") subscribers.add(t.runnable_path);
+    else if (t.trigger_kind === "schedule") scheduleScripts.add(t.runnable_path);
+    else if (NON_AUTORUN_TRIGGER_KINDS.has(t.trigger_kind)) nonAutorunScripts.add(t.runnable_path);
+  }
+  const out = new Set<string>();
+  for (const r of g.runnables ?? []) {
+    if (r.usage_kind !== "script") continue;
+    const p = r.path;
+    if (scheduleScripts.has(p)) out.add(scriptNodeId(p));
+    else if (!subscribers.has(p) && !nonAutorunScripts.has(p)) out.add(scriptNodeId(p));
+  }
+  return out;
+}
+
+/**
+ * Script node ids eligible as an EXPLICIT bounded-run start from *anywhere* in
+ * the DAG (dbt's `--select model+`): every script that can run with empty args —
+ * i.e. all scripts except non-autorun-trigger ones (kafka/mqtt/…/webhook/
+ * data_upload, which fan out per event or need caller-supplied input). Unlike
+ * `validStarts` (schedule/manual roots only), this INCLUDES mid-DAG asset
+ * subscribers and pure readers, so `--from <mid-model>` runs that node plus its
+ * transitive downstream WITHOUT re-running upstream. Roots stay a subset of this
+ * set. A non-autorun handler still qualifies once it's `--upload`-bound (handled
+ * by the caller, which unions in the bound node ids).
+ */
+export function validFromStarts(g: BCGraph): Set<string> {
+  const nonAutorun = nonAutorunTriggerScripts(g);
+  // Seed with the schedule/manual roots: `validStarts` lets a schedule identity
+  // win over a secondary non-autorun trigger (a `// on schedule` + `// on
+  // data_upload` script IS a scheduled root), so a root must stay `--from`-
+  // eligible even though it's also in `nonAutorunTriggerScripts`.
+  const out = new Set<string>(validStarts(g));
+  for (const r of g.runnables ?? []) {
+    if (r.usage_kind !== "script") continue;
+    const id = scriptNodeId(r.path);
+    if (!nonAutorun.has(id)) out.add(id);
+  }
+  return out;
+}
+
+/**
+ * Script node ids that carry a trigger requiring caller-supplied input or
+ * per-event fanout (kafka/mqtt/nats/postgres/sqs/gcp/email/webhook/data_upload).
+ * These can't be run with empty args, so a whole-pipeline run must exclude them
+ * even when they're a lineage descendant of a valid start (not just a root).
+ */
+export function nonAutorunTriggerScripts(g: BCGraph): Set<string> {
+  const out = new Set<string>();
+  for (const t of g.triggers ?? []) {
+    if (t.runnable_kind === "script" && NON_AUTORUN_TRIGGER_KINDS.has(t.trigger_kind)) {
+      out.add(scriptNodeId(t.runnable_path));
+    }
+  }
+  return out;
+}
+
+/** Project a node-id set to the script paths it contains. */
+export function scriptsOf(nodes: Iterable<string>): string[] {
+  const out: string[] = [];
+  for (const id of nodes) if (isScriptNode(id)) out.push(scriptPathOf(id));
+  return out;
+}
+
+/**
+ * Resolve a CLI `--to` / `--from` token to a node id, or undefined if it
+ * matches nothing. Asset URIs (`kind://path`) resolve to the asset node; a bare
+ * token matches a runnable by exact path or by short (last-segment) name.
+ */
+export function resolveToken(g: BCGraph, token: string): string | undefined {
+  if (token.includes("://")) {
+    const id = assetUriToNodeId(token);
+    return id && g.assets.some((a) => `${a.kind}:${a.path}` === id) ? id : undefined;
+  }
+  const scripts = (g.runnables ?? []).filter((r) => r.usage_kind === "script");
+  const exact = scripts.find((r) => r.path === token);
+  if (exact) return scriptNodeId(exact.path);
+  const byShort = scripts.filter((r) => (r.path.split("/").pop() ?? r.path) === token);
+  return byShort.length === 1 ? scriptNodeId(byShort[0].path) : undefined;
+}
+
+/**
+ * Topological order of `scripts` over the in-set producer→subscriber edges
+ * (assets collapsed). Scripts on a cycle are returned in `cyclic` and excluded
+ * from `order`. Serial-run friendly: every script comes after its in-set
+ * upstreams.
+ */
+export function topoOrder(
+  g: BCGraph,
+  scripts: Set<string>,
+): { order: string[]; cyclic: string[] } {
+  const dag = buildLineageDag(g);
+  const down = new Map<string, Set<string>>();
+  const indegree = new Map<string, number>();
+  for (const s of scripts) indegree.set(s, 0);
+  // One-hop (through a single asset) script→script edges, restricted to the set.
+  for (const s of scripts) {
+    const sid = scriptNodeId(s);
+    const oneHop = new Set<string>();
+    for (const asset of dag.down.get(sid) ?? []) {
+      for (const sub of dag.down.get(asset) ?? []) {
+        if (isScriptNode(sub)) {
+          const p = scriptPathOf(sub);
+          if (p !== s && scripts.has(p)) oneHop.add(p);
+        }
+      }
+    }
+    if (oneHop.size > 0) {
+      down.set(s, oneHop);
+      for (const p of oneHop) indegree.set(p, (indegree.get(p) ?? 0) + 1);
+    }
+  }
+  const ready = [...scripts].filter((s) => (indegree.get(s) ?? 0) === 0);
+  const remaining = new Map(indegree);
+  const order: string[] = [];
+  while (ready.length > 0) {
+    const n = ready.shift()!;
+    order.push(n);
+    for (const p of down.get(n) ?? []) {
+      const d = (remaining.get(p) ?? 0) - 1;
+      remaining.set(p, d);
+      if (d === 0) ready.push(p);
+    }
+  }
+  const orderedSet = new Set(order);
+  const cyclic = [...scripts].filter((s) => !orderedSet.has(s));
+  return { order, cyclic };
+}
diff --git a/cli/src/commands/pipeline/dev.ts b/cli/src/commands/pipeline/dev.ts
new file mode 100644
index 0000000000..3d11dfc2bd
--- /dev/null
+++ b/cli/src/commands/pipeline/dev.ts
@@ -0,0 +1,290 @@
+// `wmill pipeline dev [folder]` — live-preview a data pipeline from local files.
+//
+// The pipeline analog of `wmill dev` / `wmill app dev`: watch a folder of
+// `// pipeline` scripts, rebuild the asset graph from the working tree on every
+// save, and push it over a WebSocket to the `/pipeline_dev` page, which renders
+// the same graph editor the UI uses and runs the cascade via preview (no deploy).
+// Editing stays in the user's own editor; the page live-reloads.
+
+import { Command } from "@cliffy/command";
+import { colors } from "@cliffy/ansi/colors";
+import * as http from "node:http";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { createHash, randomBytes } from "node:crypto";
+import process from "node:process";
+import * as open from "open";
+import { WebSocket, WebSocketServer } from "ws";
+import * as log from "../../core/log.ts";
+import { GlobalOptions } from "../../types.ts";
+import { requireLogin } from "../../core/auth.ts";
+import { resolveWorkspace } from "../../core/context.ts";
+import {
+  mergeConfigWithConfigFile,
+  type SyncOptions,
+} from "../../core/conf.ts";
+import { listSyncCodebases } from "../../utils/codebase.ts";
+import { resolveBindPort } from "../../utils/port-probe.ts";
+import { getConfigDirPath } from "../../../windmill-utils-internal/src/config/config.ts";
+import { buildLocalPipelineGraph, workspaceRoot } from "./localGraph.ts";
+
+const PORT = 3201;
+// Bind loopback only: each WS frame ships the folder's full script source
+// (`scripts[].content` + `temp_script_refs`) with no auth, so it must not be
+// reachable from the LAN. The webview connects via `ws://localhost`, and an SSH
+// `-L` / devbox port-forward targets 127.0.0.1 on the host, so both still work.
+const LISTEN_HOST = "127.0.0.1";
+
+interface PipelineDevOpts extends GlobalOptions, SyncOptions {
+  port?: number;
+  open?: boolean;
+  defaultTs?: "bun" | "deno";
+  frontend?: string;
+}
+
+// The WS token gates access to local source. Persist it under the user-private
+// config dir (0600) so a `pipeline dev` restart reuses it — an already-open
+// `/pipeline_dev` page auto-reconnecting with the token from its URL then
+// survives the restart, instead of every upgrade being rejected by
+// `verifyClient` until the freshly printed URL is reopened. Scoped by
+// remote+workspace+root+folder+port (NOT port alone): a same-session restart
+// reconnects, but any *different* session — another folder, workspace, remote, or
+// local checkout on the same port — gets a different token, so a stale tab can't
+// reconnect and receive another session's source. Falls back to an ephemeral
+// token if the config dir can't be read/written.
+async function stableWsToken(
+  remote: string,
+  workspaceId: string,
+  root: string,
+  folder: string,
+  port: number,
+): Promise<string> {
+  // Hash the tuple (NUL-delimited so no value can spoof the boundary) → a
+  // collision-resistant, filesystem-safe key. A plain sanitized join would let
+  // different values collide (`a/b` and `a_b` → same name), which would reuse a
+  // token across sessions and reintroduce the cross-session leak.
+  const key = createHash("sha256")
+    .update(`${remote}\0${workspaceId}\0${root}\0${folder}\0${port}`)
+    .digest("hex")
+    .slice(0, 32);
+  let tokenFile: string | undefined;
+  try {
+    tokenFile = path.join(await getConfigDirPath(), `pipeline-dev-${key}.token`);
+    const existing = fs.readFileSync(tokenFile, "utf-8").trim();
+    if (existing) return existing;
+  } catch {
+    // no reusable token file yet (or config dir unavailable) — mint a fresh one
+  }
+  const token = randomBytes(24).toString("base64url");
+  if (tokenFile) {
+    try {
+      fs.writeFileSync(tokenFile, token, { mode: 0o600 });
+    } catch {
+      // best-effort persistence; fall back to the in-memory token
+    }
+  }
+  return token;
+}
+
+// Resolve the target folder: explicit arg, else auto-detect when cwd sits inside
+// `f/<folder>/…` (the supported `cd f/my_pipeline && wmill pipeline dev` form).
+function resolveFolder(root: string, folderArg?: string): string | undefined {
+  if (folderArg) return folderArg.replace(/^f\//, "").replace(/\/$/, "");
+  const rel = path.relative(root, process.cwd()).replaceAll("\\", "/");
+  if (rel === "" || rel.startsWith("..")) return undefined;
+  const segs = rel.split("/");
+  if (segs[0] === "f" && segs[1]) return segs[1];
+  return undefined;
+}
+
+async function dev(opts: PipelineDevOpts, folderArg?: string) {
+  const root = workspaceRoot();
+  const folder = resolveFolder(root, folderArg);
+  if (!folder) {
+    log.error(
+      colors.red(
+        "Could not determine the pipeline folder. Pass it explicitly " +
+          "(`wmill pipeline dev <folder>`) or run from inside an `f/<folder>` directory.",
+      ),
+    );
+    process.exit(1);
+  }
+  const folderDir = path.join(root, "f", folder);
+  if (!fs.existsSync(folderDir)) {
+    log.error(colors.red(`Folder not found on disk: ${folderDir}`));
+    process.exit(1);
+  }
+
+  const workspace = await resolveWorkspace(opts);
+  await requireLogin(opts);
+  const merged = await mergeConfigWithConfigFile(opts);
+  const codebases = await listSyncCodebases(merged);
+
+  // Resolve relative imports from local (not-yet-deployed) content for previews.
+  // Snapshot at startup like `wmill dev`; restart to refresh. Degrades to
+  // undefined on older backends.
+  let tempScriptRefs: Record<string, string> | undefined;
+  try {
+    const { buildPreviewTempScriptRefs } = await import(
+      "../generate-metadata/generate-metadata.ts"
+    );
+    tempScriptRefs = await buildPreviewTempScriptRefs(
+      workspace,
+      merged,
+      codebases,
+      { kind: "all" },
+    );
+  } catch {
+    // best-effort
+  }
+
+  const EMPTY_GRAPH = { runnables: [], assets: [], edges: [], triggers: [] };
+  async function buildBundle() {
+    const { graph, scripts } = await buildLocalPipelineGraph({
+      root,
+      folder: folder!,
+      defaultTs: merged.defaultTs,
+    });
+    return {
+      type: "pipeline" as const,
+      folder,
+      graph,
+      scripts,
+      temp_script_refs: tempScriptRefs,
+    };
+  }
+
+  // Don't let a transient build error (e.g. a half-written file) abort startup —
+  // serve an empty graph and recover on the next save.
+  let current: Awaited<ReturnType<typeof buildBundle>>;
+  try {
+    current = await buildBundle();
+  } catch (e: any) {
+    log.error(colors.red(`Initial graph build failed: ${e.message}`));
+    current = { type: "pipeline", folder, graph: EMPTY_GRAPH, scripts: [], temp_script_refs: tempScriptRefs };
+  }
+  log.info(
+    colors.blue(
+      `Watching f/${folder} — ${current.scripts.length} pipeline script(s)`,
+    ),
+  );
+
+  const clients = new Set<WebSocket>();
+  function broadcast() {
+    const msg = JSON.stringify(current);
+    for (const ws of clients) {
+      if (ws.readyState === WebSocket.OPEN) ws.send(msg);
+    }
+  }
+
+  // Debounced rebuild on any change under the folder.
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  const watcher = fs.watch(folderDir, { recursive: true });
+  watcher.on("change", (_ev, filename) => {
+    if (filename && filename.toString().endsWith(".lock")) return;
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(async () => {
+      timer = undefined;
+      try {
+        current = await buildBundle();
+        log.info(colors.cyan(`↻ rebuilt graph (${current.scripts.length} scripts)`));
+        broadcast();
+      } catch (e: any) {
+        log.error(colors.red(`Failed to rebuild pipeline graph: ${e.message}`));
+      }
+    }, 150);
+  });
+  watcher.on("error", (e) => log.error(colors.red(`Watcher error: ${e.message}`)));
+
+  const port = await resolveBindPort(opts.port ?? PORT, "wmill pipeline dev", {
+    info: (m) => log.info(m),
+    warn: (m) => log.warn(m),
+  });
+
+  const server = http.createServer((_req, res) => {
+    res.writeHead(200);
+    res.end();
+  });
+  // Loopback bind keeps the LAN out, but any browser tab can still open a
+  // `ws://localhost:<port>` connection — and each frame ships the folder's full
+  // script source. Gate the upgrade on an unguessable per-session token (carried
+  // in the dev-page URL) so a stray page on the predictable dev port can't
+  // exfiltrate the source. base64url → safe as a query value.
+  // Stable across restarts (scoped to remote+workspace+root+folder+port) so an
+  // already-open page reconnects after a CLI restart (see stableWsToken), not
+  // just after a transient WS drop.
+  const wsToken = await stableWsToken(
+    workspace.remote,
+    workspace.workspaceId,
+    root,
+    folder,
+    port,
+  );
+  const wss = new WebSocketServer({
+    server,
+    verifyClient: (info) => {
+      try {
+        const u = new URL(info.req.url ?? "", "http://localhost");
+        return u.searchParams.get("token") === wsToken;
+      } catch {
+        return false;
+      }
+    },
+  });
+  wss.on("connection", (ws: WebSocket) => {
+    clients.add(ws);
+    // Push the current bundle immediately so the page renders without waiting
+    // for the first file change.
+    try {
+      ws.send(JSON.stringify(current));
+    } catch {
+      // ignore
+    }
+    ws.on("close", () => clients.delete(ws));
+    ws.on("error", () => clients.delete(ws));
+  });
+
+  // The `/pipeline_dev` page is served by the frontend, not the backend. By
+  // default we open it on the workspace remote, but that 404s on a remote whose
+  // deployed frontend predates this route — `--frontend` points the page at a
+  // locally-run frontend (`REMOTE=<remote> npm run dev`) while the API/token
+  // still target the remote. Normalize to a single trailing slash either way.
+  const pageBase = (opts.frontend ?? workspace.remote).replace(/\/?$/, "/");
+  const url =
+    `${pageBase}pipeline_dev?workspace=${workspace.workspaceId}` +
+    `&wm_token=${workspace.token}&folder=${encodeURIComponent(folder)}&port=${port}` +
+    `&ws_token=${encodeURIComponent(wsToken)}`;
+
+  server.listen(port, LISTEN_HOST, () => {
+    log.info(colors.green.bold(`🚀 Pipeline dev server on ws://localhost:${port}/ws`));
+    log.info(colors.gray(`Open: ${url}`));
+    if (opts.open !== false) {
+      open.default(url).catch((e: any) =>
+        log.warn(colors.yellow(`Failed to open browser: ${e.message}`)),
+      );
+    }
+  });
+
+  process.on("SIGINT", () => {
+    log.info(colors.yellow("\n🛑 Shutting down…"));
+    watcher.close();
+    for (const ws of clients) ws.close();
+    server.close();
+    process.exit(0);
+  });
+}
+
+const command = new Command()
+  .description(
+    "Live-preview a data pipeline from local files: watch an `f/<folder>` of `// pipeline` scripts, push the working-tree graph to the dev page, and run the cascade via preview (no deploy).",
+  )
+  .arguments("[folder:string]")
+  .option("--port <port:number>", "Port for the dev WebSocket server.")
+  .option("--no-open", "Do not open the browser automatically.")
+  .option(
+    "--frontend <origin:string>",
+    "Origin serving the /pipeline_dev page (e.g. http://localhost:3000 for a locally-run frontend). Defaults to the workspace remote; use it when the remote's deployed frontend predates the dev page.",
+  )
+  .action(dev as any);
+
+export default command;
diff --git a/cli/src/commands/pipeline/docs.ts b/cli/src/commands/pipeline/docs.ts
new file mode 100644
index 0000000000..abee64cbf3
--- /dev/null
+++ b/cli/src/commands/pipeline/docs.ts
@@ -0,0 +1,296 @@
+// `wmill pipeline docs <folder>` — generate a PIPELINE.md (+ AGENTS.md / CLAUDE.md
+// pointer) describing a folder's pipeline so an editor or agentic loop has the
+// same context the UI surfaces: the asset DAG, per-script triggers/IO, and the
+// schemas of the datatables the pipeline touches. Mirrors the app docs pattern
+// (`app/generate_agents.ts:regenerateAgentDocs`) but scoped to a pipeline folder.
+
+import { writeFile } from "node:fs/promises";
+import { existsSync, readFileSync } from "node:fs";
+import * as path from "node:path";
+import { OpenAPI } from "../../../gen/index.ts";
+import * as wmill from "../../../gen/services.gen.ts";
+import { requireLogin } from "../../core/auth.ts";
+import { resolveWorkspace } from "../../core/context.ts";
+import { mergeConfigWithConfigFile } from "../../core/conf.ts";
+import * as log from "../../core/log.ts";
+import { colors } from "@cliffy/ansi/colors";
+import { GlobalOptions } from "../../types.ts";
+import {
+  type AssetGraph,
+  buildLocalPipelineGraph,
+  workspaceRoot,
+} from "./localGraph.ts";
+
+const ASSET_KINDS = "s3object,ducklake,datatable,volume";
+
+function assetUri(kind: string, p: string): string {
+  const prefix = kind === "s3object" ? "s3" : kind;
+  return `${prefix}://${p}`;
+}
+
+async function fetchDeployedGraph(
+  workspaceId: string,
+  folder: string,
+): Promise<AssetGraph> {
+  const res = await fetch(
+    `${OpenAPI.BASE}/w/${workspaceId}/assets/graph?folder=${encodeURIComponent(folder)}&asset_kinds=${ASSET_KINDS}`,
+    { headers: { Authorization: `Bearer ${OpenAPI.TOKEN}` } },
+  );
+  if (!res.ok) {
+    throw new Error(`GET assets/graph -> ${res.status}: ${await res.text()}`);
+  }
+  return (await res.json()) as AssetGraph;
+}
+
+// Render the pipeline graph as a markdown document.
+export function generatePipelineMarkdown(
+  folder: string,
+  graph: AssetGraph,
+  datatableSchemas: any[],
+  local: boolean,
+): string {
+  const writesByScript = new Map<string, string[]>();
+  const readsByScript = new Map<string, string[]>();
+  for (const e of graph.edges) {
+    if (e.runnable_kind !== "script") continue;
+    const uri = assetUri(e.asset_kind, e.asset_path);
+    if (e.access_type === "w" || e.access_type === "rw") {
+      (writesByScript.get(e.runnable_path) ?? writesByScript.set(e.runnable_path, []).get(e.runnable_path)!).push(uri);
+    }
+    if (e.access_type === "r" || e.access_type === "rw" || e.access_type === undefined) {
+      (readsByScript.get(e.runnable_path) ?? readsByScript.set(e.runnable_path, []).get(e.runnable_path)!).push(uri);
+    }
+  }
+  const onByScript = new Map<string, string[]>();
+  const nativeByScript = new Map<string, string[]>();
+  for (const t of graph.triggers) {
+    if (t.runnable_kind !== "script") continue;
+    if (t.trigger_kind === "asset") {
+      const at = t as Extract<AssetGraph["triggers"][number], { trigger_kind: "asset" }>;
+      (onByScript.get(at.runnable_path) ?? onByScript.set(at.runnable_path, []).get(at.runnable_path)!).push(assetUri(at.asset_kind, at.asset_path));
+    } else {
+      (nativeByScript.get(t.runnable_path) ?? nativeByScript.set(t.runnable_path, []).get(t.runnable_path)!).push(t.trigger_kind);
+    }
+  }
+
+  // `// macros` libraries are definition-only nodes (not runnable pipeline
+  // steps), so they get their own section below and are excluded from the
+  // per-script listing + the script count.
+  const macroLibs = graph.runnables
+    .filter((r) => r.usage_kind === "script" && (r.macros?.length ?? 0) > 0)
+    .sort((a, b) => a.path.localeCompare(b.path));
+  const macroLibPaths = new Set(macroLibs.map((r) => r.path));
+  const macroConsumersByLib = new Map<string, { consumer: string; names: string[]; viaUse?: boolean }[]>();
+  for (const me of graph.macro_edges ?? []) {
+    (macroConsumersByLib.get(me.lib_path) ?? macroConsumersByLib.set(me.lib_path, []).get(me.lib_path)!).push({
+      consumer: me.consumer_path,
+      names: me.macro_names,
+      viaUse: me.via_use,
+    });
+  }
+
+  const scripts = graph.runnables
+    .filter((r) => r.usage_kind === "script" && !macroLibPaths.has(r.path))
+    .map((r) => r.path)
+    .sort();
+
+  let md = `# Pipeline \`f/${folder}\`
+
+${local ? "_Built from local working-tree files (`// pipeline` scripts)._" : "_Built from the deployed workspace asset graph._"}
+
+A data pipeline is a folder of scripts marked \`// pipeline\` and wired by asset
+annotations. A script subscribes to upstream data with \`// on <asset-uri>\` and
+produces data by reading/writing assets in its body (\`datatable://\`,
+\`ducklake://\`, \`s3://\`, \`volume://\`). The cascade runs a producer, then every
+downstream subscriber, in topological order.
+
+- **${scripts.length}** script${scripts.length === 1 ? "" : "s"} · **${graph.assets.length}** asset${graph.assets.length === 1 ? "" : "s"}${macroLibs.length > 0 ? ` · **${macroLibs.length}** macro librar${macroLibs.length === 1 ? "y" : "ies"}` : ""}
+
+## Scripts
+
+`;
+
+  for (const s of scripts) {
+    const on = onByScript.get(s) ?? [];
+    const native = nativeByScript.get(s) ?? [];
+    const writes = [...new Set(writesByScript.get(s) ?? [])].sort();
+    const reads = [...new Set(readsByScript.get(s) ?? [])].sort();
+    md += `### \`${s}\`\n\n`;
+    if (native.length) md += `- **Triggers:** ${native.map((n) => `\`${n}\``).join(", ")}\n`;
+    if (on.length) md += `- **On (subscribes to):** ${on.map((u) => `\`${u}\``).join(", ")}\n`;
+    if (reads.length) md += `- **Reads:** ${reads.map((u) => `\`${u}\``).join(", ")}\n`;
+    if (writes.length) md += `- **Writes:** ${writes.map((u) => `\`${u}\``).join(", ")}\n`;
+    if (!native.length && !on.length && !reads.length && !writes.length) {
+      md += `- _No declared triggers or asset IO._\n`;
+    }
+    md += `\n`;
+  }
+
+  // Macro libraries: `// macros` scripts whose macros are injected into consuming
+  // DuckDB scripts at run time. List each library's signatures and its callers so
+  // an agent discovers the reuse layer instead of re-inlining the logic.
+  if (macroLibs.length > 0) {
+    md += `## Macro libraries\n\n`;
+    md += `\`// macros\` DuckDB libraries. Their \`CREATE MACRO\` definitions are injected as\nTEMP macros into consuming scripts at run time — call a macro by name, or force the\nwhole library in with \`// use <lib-path>\` (needed for macros only reached via dynamic SQL).\n\n`;
+    for (const lib of macroLibs) {
+      md += `### \`${lib.path}\`\n\n`;
+      for (const m of lib.macros ?? []) {
+        md += `- \`${m.name}(${m.params ?? ""})\`${m.is_table ? " → TABLE" : ""}\n`;
+      }
+      const consumers = [...(macroConsumersByLib.get(lib.path) ?? [])].sort((a, b) =>
+        a.consumer.localeCompare(b.consumer),
+      );
+      if (consumers.length > 0) {
+        md += `- **Used by:**\n`;
+        for (const c of consumers) {
+          md += `  - \`${c.consumer}\` (${c.viaUse ? "via \`// use\`" : `calls ${c.names.map((n) => `\`${n}\``).join(", ")}`})\n`;
+        }
+      }
+      md += `\n`;
+    }
+  }
+
+  // Datatable schemas, restricted to datatables this pipeline references.
+  const referencedDatatables = new Set(
+    graph.assets.filter((a) => a.kind === "datatable").map((a) => a.path.split("/")[0]),
+  );
+  const relevant = (datatableSchemas ?? []).filter((dt: any) => referencedDatatables.has(dt.datatable_name));
+  if (relevant.length > 0) {
+    md += `## Datatable schemas\n\n`;
+    for (const dt of relevant) {
+      md += `### Datatable \`${dt.datatable_name}\`\n\n`;
+      if (dt.error) {
+        md += `> ⚠️ ${dt.error}\n\n`;
+        continue;
+      }
+      for (const [schemaName, tables] of Object.entries(dt.schemas ?? {})) {
+        for (const [tableName, columns] of Object.entries(tables as Record<string, any>)) {
+          const ref = schemaName === "public"
+            ? `${dt.datatable_name}/${tableName}`
+            : `${dt.datatable_name}/${schemaName}:${tableName}`;
+          md += `- \`datatable://${ref}\`\n`;
+          for (const [col, type] of Object.entries(columns as Record<string, any>)) {
+            md += `  - \`${col}\`: ${type}\n`;
+          }
+        }
+      }
+      md += `\n`;
+    }
+  }
+
+  md += `## Working with this pipeline
+
+- **Inspect the graph:** \`wmill pipeline show ${folder} --local\`
+- **Run the cascade locally (no deploy):** \`wmill pipeline run ${folder} --local\`
+  (optionally \`--from <script> --to <script>\` to bound it, \`--dry-run\` to preview the plan)
+- **Live visual preview while editing:** \`wmill pipeline dev ${folder}\`
+- **Deploy:** \`wmill sync push\`
+
+Mark a script as part of this pipeline with a bare \`// pipeline\` comment
+(\`#\` for Python, \`--\` for SQL). Add \`// on <asset-uri>\` lines to subscribe it to
+upstream assets.
+
+---
+*Generated by \`wmill pipeline docs\`.*
+`;
+  return md;
+}
+
+export async function generatePipelineDocs(
+  opts: GlobalOptions & { local?: boolean; defaultTs?: "bun" | "deno" },
+  folder: string,
+) {
+  const f = folder.replace(/^f\//, "").replace(/\/$/, "");
+  // `docs` WRITES PIPELINE.md / AGENTS.md / CLAUDE.md under `f/<folder>`; a `..`
+  // segment would escape the folder and clobber files elsewhere in the tree.
+  if (f.split("/").includes("..")) {
+    log.error(colors.red(`Invalid folder '${folder}': '..' path segments are not allowed.`));
+    return;
+  }
+  const root = workspaceRoot();
+  // defaultTs (from wmill.yaml) drives .ts → bun/deno inference for the local graph.
+  const merged = await mergeConfigWithConfigFile(opts);
+
+  const workspace = opts.local ? undefined : await resolveWorkspace(opts);
+  if (!opts.local) await requireLogin(opts);
+
+  const graph = opts.local
+    ? (await buildLocalPipelineGraph({ root, folder: f, defaultTs: merged.defaultTs })).graph
+    : await fetchDeployedGraph(workspace!.workspaceId, f);
+
+  if (graph.runnables.length === 0) {
+    // The deployed graph is empty — but a user/agent in a working tree may have
+    // local `// pipeline` scripts not yet deployed. Point them at --local rather
+    // than leaving them thinking the folder is empty.
+    if (!opts.local) {
+      try {
+        const localCount =
+          (await buildLocalPipelineGraph({ root, folder: f, defaultTs: merged.defaultTs })).graph
+            .runnables.length;
+        if (localCount > 0) {
+          log.info(
+            `No deployed pipeline scripts in f/${f}, but ${localCount} \`// pipeline\` script(s) exist in the local working tree — run \`wmill pipeline docs ${f} --local\` to document those.`,
+          );
+          return;
+        }
+      } catch {
+        // best-effort hint; fall through to the generic message
+      }
+    }
+    log.info(`No pipeline scripts in f/${f}.`);
+    return;
+  }
+
+  let datatableSchemas: any[] = [];
+  const hasExplicitWorkspace =
+    !!opts.workspace ||
+    (!!opts.baseUrl && !!opts.token) ||
+    (!!process.env["WM_WORKSPACE"] &&
+      !!process.env["WM_TOKEN"] &&
+      !!(process.env["BASE_INTERNAL_URL"] ?? process.env["BASE_URL"]));
+  if (!opts.local || hasExplicitWorkspace) {
+    try {
+      const schemaWorkspace = workspace ?? await resolveWorkspace(opts);
+      if (opts.local) await requireLogin(opts);
+      datatableSchemas = await wmill.listDataTableSchemas({ workspace: schemaWorkspace.workspaceId });
+    } catch (err: any) {
+      log.warn(colors.yellow(`Could not fetch datatable schemas: ${err.message}`));
+    }
+  }
+
+  const md = generatePipelineMarkdown(f, graph, datatableSchemas, !!opts.local);
+  const folderDir = path.join(root, "f", f);
+  await writeFile(path.join(folderDir, "PIPELINE.md"), md, "utf-8");
+
+  // PIPELINE.md is ours to own. AGENTS.md / CLAUDE.md are commonly user-authored,
+  // so write the pointer only when the file is ABSENT or is byte-for-byte the
+  // exact pointer we generate — never clobber hand-written instructions, even a
+  // file that merely references `@PIPELINE.md` alongside its own content.
+  const written = ["PIPELINE.md"];
+  const pointers: Array<[string, string]> = [
+    ["AGENTS.md", `See @PIPELINE.md for this pipeline's graph, assets, and how to run it.\n`],
+    ["CLAUDE.md", `Instructions are in @PIPELINE.md\n`],
+  ];
+  for (const [name, content] of pointers) {
+    const p = path.join(folderDir, name);
+    if (existsSync(p)) {
+      let existing: string;
+      try {
+        existing = readFileSync(p, "utf-8");
+      } catch {
+        continue;
+      }
+      // Anything other than our exact generated pointer is treated as
+      // hand-written and preserved (writing when identical is a no-op anyway).
+      if (existing.trim() !== content.trim()) {
+        log.warn(
+          colors.yellow(`Kept existing f/${f}/${name} (hand-written — not the generated pointer)`),
+        );
+        continue;
+      }
+    }
+    await writeFile(p, content, "utf-8");
+    written.push(name);
+  }
+  log.info(colors.green(`✓ Wrote ${written.join(", ")} to f/${f}`));
+}
diff --git a/cli/src/commands/pipeline/duckdbMacros.ts b/cli/src/commands/pipeline/duckdbMacros.ts
new file mode 100644
index 0000000000..be505874d7
--- /dev/null
+++ b/cli/src/commands/pipeline/duckdbMacros.ts
@@ -0,0 +1,261 @@
+// Faithful TS port of the lexical rules in
+// `backend/parsers/windmill-parser/src/duckdb_macros.rs` — keep the two in
+// lockstep. Deliberately lexical, not an AST parse: over-matching a call only
+// draws a spurious edge, never a wrong run. A macro reached only through dynamic
+// SQL (`query('…')`) is invisible to call detection here as on the server —
+// `// use <lib>` forces the whole-library edge instead.
+
+export type ParsedMacro = {
+  // Lowercased bare identifier (DuckDB identifiers are case-insensitive unquoted;
+  // qualified / quoted names are rejected, matching the backend).
+  name: string;
+  // Verbatim text inside the parameter parens (may be empty).
+  params: string;
+  isTable: boolean;
+};
+
+// Case-insensitive whole-word prefix strip (whitespace-bounded). Returns the
+// remainder with leading whitespace trimmed, or null when `s` does not start with
+// `kw` as a whole word. `kw` must be lowercase. Mirrors `strip_kw`.
+function stripKw(s: string, kw: string): string | null {
+  if (s.length < kw.length) return null;
+  if (s.slice(0, kw.length).toLowerCase() !== kw) return null;
+  const after = s.slice(kw.length);
+  if (after.length === 0 || /^\s/.test(after)) return after.replace(/^\s+/, "");
+  return null;
+}
+
+function isIdent(s: string): boolean {
+  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(s);
+}
+
+// Split a script body into `;`-terminated statements with line comments
+// (`--`, `//`), block comments (`/* */`), and quoted spans stripped/preserved as
+// in the SQL executor. Char-wise (not byte-wise) so multi-byte text survives.
+// Mirrors `split_statements`.
+export function splitStatements(sql: string): string[] {
+  const out: string[] = [];
+  let cur = "";
+  const chars = [...sql];
+  let i = 0;
+  const n = chars.length;
+  while (i < n) {
+    const c = chars[i];
+    // line comment: `--` (SQL) or `//` (Windmill annotation prefix)
+    if (
+      (c === "-" && i + 1 < n && chars[i + 1] === "-") ||
+      (c === "/" && i + 1 < n && chars[i + 1] === "/")
+    ) {
+      while (i < n && chars[i] !== "\n") i += 1;
+      continue;
+    }
+    // block comment
+    if (c === "/" && i + 1 < n && chars[i + 1] === "*") {
+      i += 2;
+      while (i + 1 < n && !(chars[i] === "*" && chars[i + 1] === "/")) i += 1;
+      i += 2;
+      continue;
+    }
+    // single-quoted string ('' escapes an embedded quote)
+    if (c === "'") {
+      cur += c;
+      i += 1;
+      while (i < n) {
+        cur += chars[i];
+        if (chars[i] === "'") {
+          if (i + 1 < n && chars[i + 1] === "'") {
+            cur += "'";
+            i += 2;
+            continue;
+          }
+          i += 1;
+          break;
+        }
+        i += 1;
+      }
+      continue;
+    }
+    // double-quoted identifier
+    if (c === '"') {
+      cur += c;
+      i += 1;
+      while (i < n) {
+        cur += chars[i];
+        if (chars[i] === '"') {
+          i += 1;
+          break;
+        }
+        i += 1;
+      }
+      continue;
+    }
+    if (c === ";") {
+      const t = cur.trim();
+      if (t !== "") out.push(t);
+      cur = "";
+      i += 1;
+      continue;
+    }
+    cur += c;
+    i += 1;
+  }
+  const t = cur.trim();
+  if (t !== "") out.push(t);
+  return out;
+}
+
+// Parse one comment-free, `;`-less statement as a CREATE MACRO. Returns null when
+// the statement is not a well-formed macro definition (unlike the backend, which
+// distinguishes "not macro-shaped" from "malformed" to surface deploy errors —
+// the local graph is lenient and simply skips anything it can't read). Mirrors
+// `parse_create_macro` for the shape it accepts.
+export function parseCreateMacro(stmt: string): ParsedMacro | null {
+  let rest = stripKw(stmt.trim(), "create");
+  if (rest === null) return null;
+  const afterOr = stripKw(rest, "or");
+  if (afterOr !== null) {
+    const afterReplace = stripKw(afterOr, "replace");
+    if (afterReplace === null) return null; // CREATE OR <not replace>
+    rest = afterReplace;
+  }
+  const afterTemp = stripKw(rest, "temp") ?? stripKw(rest, "temporary");
+  if (afterTemp !== null) rest = afterTemp;
+  // `FUNCTION` is DuckDB's alias for `MACRO`.
+  const afterMacro = stripKw(rest, "macro") ?? stripKw(rest, "function");
+  if (afterMacro === null) return null;
+  rest = afterMacro;
+
+  const nameEndMatch = rest.match(/[\s(]/);
+  const nameEnd = nameEndMatch ? nameEndMatch.index! : rest.length;
+  const rawName = rest.slice(0, nameEnd);
+  if (rawName === "" || rawName.includes(".") || rawName.includes('"') || !isIdent(rawName)) {
+    return null;
+  }
+  const name = rawName.toLowerCase();
+
+  rest = rest.slice(nameEnd).replace(/^\s+/, "");
+  if (!rest.startsWith("(")) return null;
+  // Balanced-paren scan for the verbatim param list; skip quoted spans (a default
+  // value may contain a paren).
+  const pchars = [...rest];
+  let depth = 0;
+  let j = 0;
+  let close = -1;
+  while (j < pchars.length) {
+    const ch = pchars[j];
+    if (ch === "(") depth += 1;
+    else if (ch === ")") {
+      depth -= 1;
+      if (depth === 0) {
+        close = j;
+        break;
+      }
+    } else if (ch === "'" || ch === '"') {
+      const q = ch;
+      j += 1;
+      while (j < pchars.length && pchars[j] !== q) j += 1;
+    }
+    j += 1;
+  }
+  if (close === -1) return null; // unbalanced
+  const params = pchars.slice(1, close).join("").trim();
+
+  const afterParams = pchars.slice(close + 1).join("").replace(/^\s+/, "");
+  let body = stripKw(afterParams, "as");
+  if (body === null) return null;
+  let isTable = false;
+  const afterTable = stripKw(body, "table");
+  if (afterTable !== null) {
+    body = afterTable;
+    isTable = true;
+  }
+  const trimmedBody = body.replace(/;+\s*$/, "").trim();
+  if (trimmedBody === "") return null; // empty body
+  return { name, params, isTable };
+}
+
+// All well-formed macro definitions in a `// macros` library body, in source
+// order. Non-macro statements (setup: ATTACH/INSTALL/… ) are skipped.
+export function parseMacroLibrary(sql: string): ParsedMacro[] {
+  const out: ParsedMacro[] = [];
+  for (const stmt of splitStatements(sql)) {
+    const m = parseCreateMacro(stmt);
+    if (m) out.push(m);
+  }
+  return out;
+}
+
+// Names from `names` that `sql` calls: an identifier token immediately followed
+// by `(` (after optional whitespace), not `.`-qualified, outside strings and
+// comments. Lexical (over-matching only adds an unused edge). Mirrors
+// `detect_macro_calls`.
+export function detectMacroCalls(sql: string, names: Set<string>): Set<string> {
+  const found = new Set<string>();
+  if (names.size === 0) return found;
+  for (const stmt of splitStatements(sql)) {
+    const chars = [...stmt];
+    const n = chars.length;
+    let i = 0;
+    let prev: string | undefined = undefined;
+    while (i < n) {
+      const c = chars[i];
+      if (c === "'" || c === '"') {
+        const q = c;
+        i += 1;
+        while (i < n && chars[i] !== q) i += 1;
+        i += 1;
+        prev = q;
+        continue;
+      }
+      const isIdentStart = /[A-Za-z_]/.test(c);
+      const prevBlocks = prev !== undefined && /[.A-Za-z0-9_]/.test(prev);
+      if (isIdentStart && !prevBlocks) {
+        const start = i;
+        while (i < n && /[A-Za-z0-9_]/.test(chars[i])) i += 1;
+        const word = chars.slice(start, i).join("").toLowerCase();
+        let k = i;
+        while (k < n && /\s/.test(chars[k])) k += 1;
+        if (k < n && chars[k] === "(" && names.has(word)) found.add(word);
+        prev = chars[i - 1];
+        continue;
+      }
+      prev = c;
+      i += 1;
+    }
+  }
+  return found;
+}
+
+// Scan the LEADING comment header for the `// macros` marker and `// use <lib>`
+// annotations, independent of the wasm parser (which drops both). Faithful mirror
+// of the canonical `parse_pipeline_annotations` (asset_parser.rs): each line's
+// prefix is stripped as `//`, `--`, or `#` REGARDLESS of language (a DuckDB
+// library may legitimately head its annotations with `// macros`), scanning stops
+// at the first non-comment line, the marker must stand alone on its line, and a
+// `// use` target is a single whitespace-free token containing `/`.
+export function parseMacroAnnotations(
+  content: string,
+): { macros: boolean; useLibs: string[] } {
+  let macros = false;
+  const useLibs: string[] = [];
+  for (const raw of content.split("\n")) {
+    const line = raw.replace(/^\s+/, "");
+    if (line === "") continue;
+    let rest: string;
+    if (line.startsWith("//") || line.startsWith("--")) rest = line.slice(2);
+    else if (line.startsWith("#")) rest = line.slice(1);
+    else break; // first line of actual code ends the annotation header
+    rest = rest.replace(/^\s+/, "");
+    // marker: `macros` as the only content on the line (rejects `macros_v2`,
+    // `macros are below`)
+    if (/^macros\s*$/.test(rest)) {
+      macros = true;
+      continue;
+    }
+    // `use <lib>`: a single whitespace-free path token (must contain `/`, so
+    // prose like `use this to …` is dropped)
+    const u = rest.match(/^use\s+(\S+)\s*$/);
+    if (u && u[1].includes("/") && !useLibs.includes(u[1])) useLibs.push(u[1]);
+  }
+  return { macros, useLibs };
+}
diff --git a/cli/src/commands/pipeline/localGraph.ts b/cli/src/commands/pipeline/localGraph.ts
new file mode 100644
index 0000000000..eb3350c818
--- /dev/null
+++ b/cli/src/commands/pipeline/localGraph.ts
@@ -0,0 +1,1044 @@
+// Build a pipeline asset-graph from LOCAL, not-yet-deployed script files.
+//
+// The deployed asset-graph endpoint (`GET /assets/graph`) only reflects scripts
+// already pushed to the workspace. To get the same graph from the working tree
+// (so `pipeline show --local` / `pipeline run --local` / `pipeline dev` work
+// before deploy), we infer each script's assets + pipeline annotations with the
+// SAME wasm parser the frontend uses (`windmill-parser-wasm-asset`,
+// `frontend/src/lib/infer.ts:inferAssets`). That wasm returns the full serialized
+// Rust `ParseAssetsOutput`: body-inferred `assets` (with r/w/rw access) AND the
+// parsed pipeline annotations (`in_pipeline`, `triggers`, …) in one call — so we
+// reproduce the endpoint payload without a backend round-trip or a TS re-port of
+// the annotation parser.
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import process from "node:process";
+import { loadParser } from "../../utils/metadata.ts";
+import * as log from "../../core/log.ts";
+import { exts, removeExtensionToPath } from "../script/script.ts";
+import { inferContentTypeFromFilePath } from "../../utils/script_common.ts";
+import { getWmillYamlPath } from "../../core/conf.ts";
+import {
+  detectMacroCalls,
+  parseMacroAnnotations,
+  parseMacroLibrary,
+  type ParsedMacro,
+} from "./duckdbMacros.ts";
+
+// Resolve the workspace root (the directory containing wmill.yaml) for reading
+// local files, falling back to the current directory.
+export function workspaceRoot(): string {
+  const yaml = getWmillYamlPath();
+  return yaml ? path.dirname(yaml) : process.cwd();
+}
+
+// Graph payload shape — structurally identical to the backend `/assets/graph`
+// response and a superset of `boundedCascade.ts`'s `BCGraph`. Defined here (the
+// graph module) and re-imported by pipeline.ts so there is one canonical type.
+export type GraphRunnable = {
+  path: string;
+  usage_kind: "script" | "flow" | "job";
+  in_pipeline?: boolean;
+  // Annotation metadata the shared canvas renders as badges / lineage. Mirrors
+  // the deployed graph's runnable node (frontend `AssetGraphRunnableNode`) so the
+  // local-dev graph is the same surface as the deployed one for annotated scripts.
+  partition_kind?: string;
+  freshness?: string;
+  tag?: string;
+  retry?: { count: number; delay?: string };
+  data_tests?: unknown[];
+  column_lineage?: unknown[];
+  // `// materialize <asset>` target + strategy — the script's declared output,
+  // so the UI anchors column lineage / the materialize badge to it (the producer
+  // write-edge is emitted separately). `scd2` also identifies the producer of a
+  // `<dim>_current` view for the editor's schema-contract fallback.
+  materialize_target?: { kind: string; path: string };
+  materialize_strategy?: "replace" | "append" | "merge" | "scd2";
+  // `on_schema_change=ignore` — producer's opt-out from downstream
+  // schema-contract warnings; only present when set (default `warn` is absent),
+  // mirroring the deployed graph node.
+  materialize_on_schema_change?: string;
+  // `// macros` library: the macros it defines. Derived locally by
+  // `buildMacroEdges` (the wasm asset parser emits neither the marker nor the
+  // registry). Non-empty ⇒ definition-only node.
+  macros?: { name: string; params?: string; is_table?: boolean }[];
+};
+export type GraphEdge = {
+  runnable_kind: string;
+  runnable_path: string;
+  asset_kind: string;
+  asset_path: string;
+  access_type?: "r" | "w" | "rw";
+};
+// Ordering-only "must-run-after" edge (HD-1): a `// data_test relationships`
+// (or, best-effort, a custom `// data_test <script>` whose body reads an
+// in-pipeline asset) needs the referenced asset's producer to materialize before
+// the tested script runs — a dependency otherwise absent from the DAG, so a cold
+// cascade could run the tested script first and hard-fail. Synthesized locally
+// from the parsed `data_tests` + write edges; mirrors the deployed graph's
+// `test_edges` (backend `asset_graph`) so `--local` orders a cold cascade the
+// same way. Only emitted when the referenced asset has an in-pipeline producer;
+// an external table (no producer) adds no edge. NOT a data-consumption edge.
+export type GraphTestEdge = {
+  producer_kind: string;
+  producer_path: string;
+  runnable_kind: string;
+  runnable_path: string;
+  asset_kind: string;
+  asset_path: string;
+};
+export type GraphTrigger =
+  | {
+      trigger_kind: "asset";
+      asset_kind: string;
+      asset_path: string;
+      runnable_kind: string;
+      runnable_path: string;
+    }
+  | {
+      trigger_kind: string;
+      path?: string;
+      runnable_kind: string;
+      runnable_path: string;
+      missing?: boolean;
+    };
+export type AssetGraph = {
+  runnables: GraphRunnable[];
+  // `derived_from` is the base `<dim>` path when this node is the SCD2
+  // `<dim>_current` companion view of a managed `// materialize … history`
+  // producer — lets the canvas mark it as a derived "current view". Absent
+  // otherwise. Lockstep with backend `GraphAssetNode`.
+  assets: { kind: string; path: string; derived_from?: string }[];
+  edges: GraphEdge[];
+  triggers: GraphTrigger[];
+  // ƒ edges from a `// macros` library to the scripts calling its macros
+  // (present on both the deployed graph and the locally-derived one).
+  macro_edges?: {
+    lib_path: string;
+    consumer_path: string;
+    macro_names: string[];
+    via_use?: boolean;
+  }[];
+  // `// data_test` ordering edges (HD-1); present on both the deployed graph and
+  // this local one. Absent when empty (matches the deployed graph's
+  // `skip_serializing_if = Vec::is_empty`).
+  test_edges?: GraphTestEdge[];
+};
+
+export type LocalScript = {
+  path: string;
+  content: string;
+  language: string;
+  // `// tag <worker-tag>` — routes the preview to that worker tag, matching the
+  // deployed pipeline. Undefined → default worker.
+  tag?: string;
+};
+
+// Raw shape of the wasm `parse_assets_<lang>` JSON output (a serialized Rust
+// `ParseAssetsOutput`). `triggers` is internally tagged on `kind`
+// (`#[serde(tag = "kind", rename_all = "lowercase")]`): asset triggers carry
+// `asset_kind` + `path`; native triggers are bare `{ kind }`.
+// One parsed `// data_test` entry (serialized Rust `DataTest`, tagged on `type`).
+// A proper discriminated union over the five built-ins so a `dt.type` switch
+// narrows; only `relationships` / `custom` carry a cross-asset ref that the
+// local test-edge synthesis reads. Kept structurally identical to the wasm
+// output and the deployed graph's `data_tests`.
+export type ParsedDataTest =
+  | { type: "unique"; column: string }
+  | { type: "not_null"; column: string }
+  | { type: "accepted_values"; column: string; values: string[] }
+  | {
+      type: "relationships";
+      column: string;
+      to_kind: string;
+      to_path: string;
+      to_column: string;
+    }
+  | { type: "custom"; path: string };
+
+export type ParseAssetsRaw = {
+  assets?: {
+    kind: string;
+    path: string;
+    access_type?: "r" | "w" | "rw";
+  }[];
+  in_pipeline?: boolean;
+  triggers?: (
+    | { kind: "asset"; asset_kind: string; path: string; debounce?: string }
+    | { kind: string }
+  )[];
+  // `// materialize [manual] <asset> …` — managed-materialize target (emitted by
+  // the wasm asset parser). The body (a bare trailing SELECT) writes nothing
+  // inferable, so the producer's output edge comes from here, not from `assets`.
+  materialize?: {
+    target_kind: string;
+    target_path: string;
+    manual?: boolean;
+    append?: boolean;
+    unique_key?: string;
+    scd2?: boolean;
+    // "ignore" when set; the default `warn` is skipped in serialization.
+    on_schema_change?: string;
+  };
+  // `// tag <worker-tag>` — the worker tag the deployed pipeline routes to.
+  tag?: string;
+  // Other annotation metadata the deployed graph carries onto its runnable nodes.
+  partition?: { kind: string };
+  freshness?: { duration: string };
+  retry?: { count: number; delay?: string };
+  data_tests?: ParsedDataTest[];
+  column_lineage?: unknown[];
+};
+
+// Mirror `inferAssets` (frontend/src/lib/infer.ts): only ts / py / sql have a
+// wasm asset parser. SQL dialects all route to `parse_assets_sql` — the comment-
+// header annotation scan inside it is dialect-independent, so `in_pipeline` /
+// `// on` come through even when body asset detection is duckdb-shaped. Languages
+// with no entry (go, bash, …) fall back to a minimal annotation scan below.
+function wasmFnForLanguage(language: string): "parse_assets_ts" | "parse_assets_py" | "parse_assets_sql" | undefined {
+  switch (language) {
+    case "bun":
+    case "deno":
+    case "nativets":
+      return "parse_assets_ts";
+    case "bunnative":
+      return "parse_assets_ts";
+    case "python3":
+      return "parse_assets_py";
+    case "duckdb":
+    case "postgresql":
+    case "mysql":
+    case "bigquery":
+    case "snowflake":
+    case "mssql":
+    case "oracledb":
+      return "parse_assets_sql";
+    default:
+      return undefined;
+  }
+}
+
+const ASSET_WASM_PKG = "windmill-parser-wasm-asset";
+
+// Comment prefix per language, for the no-wasm annotation fallback.
+function commentPrefix(language: string): string {
+  if (
+    language === "python3" ||
+    language === "bash" ||
+    language === "ansible" ||
+    language === "ruby" ||
+    language === "rlang" ||
+    language === "nu" ||
+    language === "powershell"
+  )
+    return "#";
+  if (
+    language === "postgresql" ||
+    language === "mysql" ||
+    language === "bigquery" ||
+    language === "snowflake" ||
+    language === "mssql" ||
+    language === "oracledb" ||
+    language === "duckdb"
+  )
+    return "--";
+  return "//";
+}
+
+// Minimal annotation scan for languages without a wasm asset parser (go, bash).
+// Deliberately a SUBSET of the canonical parsers (backend
+// `parse_pipeline_annotations`, frontend `parsePipelineAnnotations.ts`): it
+// recovers `// pipeline` membership, `// on <asset-uri | native-kind>`, and
+// `// tag <worker-tag>` (routing affects execution) so the node, its trigger
+// edges, and its worker tag still appear. Body-inferred I/O for these languages
+// is out of scope (see plan); annotate explicitly to get edges.
+const NATIVE_KINDS = new Set([
+  "schedule",
+  "webhook",
+  "email",
+  "kafka",
+  "mqtt",
+  "nats",
+  "postgres",
+  "sqs",
+  "gcp",
+  "data_upload",
+]);
+function fallbackParse(content: string, language: string): ParseAssetsRaw {
+  const raw = commentPrefix(language);
+  const p = raw.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const out: ParseAssetsRaw = { in_pipeline: false, triggers: [] };
+  // Annotations live in the LEADING comment header (like the canonical parsers).
+  // Stop at the first non-comment line so a body comment — e.g. `// on s3://…`
+  // inside commented-out code or a heredoc — can't inject a phantom trigger.
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") continue;
+    if (!trimmed.startsWith(raw)) break;
+    if (line.match(new RegExp(`^\\s*${p}\\s*pipeline\\s*$`))) {
+      out.in_pipeline = true;
+      continue;
+    }
+    // `// tag <worker-tag>` — routes the preview; cheap to scan and it affects
+    // execution, so recover it here too (the wasm path already carries it). A
+    // worker tag is a single token — match `\S+` (not `.+`) so trailing prose
+    // (`// tag gpu for heavy jobs`) can't smuggle a bogus multi-word tag.
+    const tag = line.match(new RegExp(`^\\s*${p}\\s*tag\\s+(\\S+)\\s*$`));
+    if (tag) {
+      out.tag = tag[1];
+      continue;
+    }
+    const on = line.match(new RegExp(`^\\s*${p}\\s*on\\s+(.+?)\\s*$`));
+    if (!on) continue;
+    // The asset/native kind is the FIRST token; trailing `key=value` options
+    // (e.g. `debounce=5s`) are not part of the path.
+    const rest = on[1].trim();
+    const firstTok = rest.split(/\s+/)[0];
+    const uri = firstTok.match(/^([a-z0-9_]+):\/\/(.+)$/i);
+    if (uri) {
+      const prefix = uri[1].toLowerCase();
+      const kind = prefix === "s3" ? "s3object" : prefix;
+      // Mirror Rust `parse_asset_syntax`: strip all leading slashes from S3 keys
+      // so `s3:///key` (default storage) and `s3://key` / DuckDB canonicalize
+      // to the same node id (and a canonical key never starts with `/`) —
+      // otherwise a go/bash fallback consumer's `// on s3:///x` would not
+      // connect to a wasm-inferred `x` producer.
+      const path = kind === "s3object" ? uri[2].replace(/^\/+/, "") : uri[2];
+      out.triggers!.push({ kind: "asset", asset_kind: kind, path });
+    } else if (NATIVE_KINDS.has(firstTok) && rest === firstTok) {
+      // A native marker (`// on data_upload`) must stand alone: the canonical
+      // parser rejects a marker line with trailing content (`// on data_upload
+      // f/foo`, `# on kafka topic`), so match that here to keep local/deployed
+      // parity for the fallback surface.
+      out.triggers!.push({ kind: firstTok });
+    }
+  }
+  return out;
+}
+
+function recoverHeaderNativeTriggers(content: string, language: string): string[] {
+  const raw = commentPrefix(language);
+  const p = raw.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const out: string[] = [];
+  const seen = new Set<string>();
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") continue;
+    if (!trimmed.startsWith(raw)) break;
+    const marker = line.match(new RegExp(`^\\s*${p}\\s*on\\s+(\\S+)\\s*$`));
+    if (!marker) continue;
+    const kind = marker[1];
+    if (!NATIVE_KINDS.has(kind) || seen.has(kind)) continue;
+    seen.add(kind);
+    out.push(kind);
+  }
+  return out;
+}
+
+function normalizeRetry(retry: ParseAssetsRaw["retry"]): ParseAssetsRaw["retry"] {
+  if (!retry?.delay) return retry;
+  return { ...retry, delay: retry.delay.replace(/^delay=/, "") };
+}
+
+// Read-asset kinds whose read auto-derives a cascade trigger edge inside a
+// `// pipeline`. Mirror of backend `is_auto_trigger_kind` (windmill-common
+// assets.rs) / frontend `AUTO_TRIGGER_KINDS` (resolveGraph.ts) — ducklake
+// tables and s3 objects only; resource/datatable/volume stay explicit-`// on`.
+const AUTO_TRIGGER_KINDS = new Set(["ducklake", "s3object"]);
+
+// Asset-URI prefixes accepted by `// mute <asset>`, in lockstep with the
+// canonical `parse_asset_syntax` / frontend `ASSET_PREFIXES`. Non-derivable
+// kinds are parsed too (their muted key simply never matches a derived edge),
+// so a mute line is never REinterpreted differently from the deploy path.
+const MUTE_ASSET_PREFIXES: [string, string][] = [
+  ["s3://", "s3object"],
+  ["res://", "resource"],
+  ["$res:", "resource"],
+  ["ducklake://", "ducklake"],
+  ["datatable://", "datatable"],
+  ["volume://", "volume"],
+];
+
+// `// mute <asset>` / `// mute all` from the LEADING comment header, as
+// `<kind>:<path>` keys. Parsed locally because the pinned wasm asset parser
+// predates the mute annotations; mirrors the canonical parsers (Rust
+// `parse_pipeline_annotations`, frontend parsePipelineAnnotations.ts): any of
+// the three comment prefixes is accepted regardless of language, blank lines
+// are skipped, scanning stops at the first non-comment line, and `mute` must
+// be a complete word (`// muted for now` never matches).
+export function parseMuteAnnotations(content: string): {
+  muteAll: boolean;
+  muted: Set<string>;
+} {
+  const muted = new Set<string>();
+  let muteAll = false;
+  for (const rawLine of content.split("\n")) {
+    const line = rawLine.trimStart();
+    if (line === "") continue;
+    let rest: string;
+    if (line.startsWith("//")) rest = line.slice(2);
+    else if (line.startsWith("--")) rest = line.slice(2);
+    else if (line.startsWith("#")) rest = line.slice(1);
+    else break;
+    rest = rest.trimStart();
+    if (!rest.startsWith("mute")) continue;
+    const after = rest.slice("mute".length);
+    if (after !== "" && !/^\s/.test(after)) continue;
+    const arg = after.trim();
+    if (arg === "all") {
+      muteAll = true;
+      continue;
+    }
+    for (const [prefix, kind] of MUTE_ASSET_PREFIXES) {
+      if (arg.startsWith(prefix)) {
+        // S3 canonicalization as in `parse_asset_syntax`: strip every leading
+        // slash so `s3:///key` (default storage) mutes the same node as the
+        // inferred bare `key`.
+        const p =
+          kind === "s3object"
+            ? arg.slice(prefix.length).replace(/^\/+/, "")
+            : arg.slice(prefix.length);
+        muted.add(`${kind}:${p}`);
+        break;
+      }
+    }
+  }
+  return { muteAll, muted };
+}
+
+// Comment prefix for `volume:` annotations. Deliberately NOT `commentPrefix`
+// above (which returns `--` for SQL): volume annotations are only recognized for
+// the languages the backend/frontend recognize them for — mirrors
+// `asset_inference.rs:comment_prefix` and `infer.ts:getCommentPrefix` (SQL → none).
+function volumeCommentPrefix(language: string): string | undefined {
+  switch (language) {
+    case "python3":
+    case "bash":
+    case "powershell":
+    case "ansible":
+    case "ruby":
+    case "rlang":
+      return "#";
+    case "deno":
+    case "bun":
+    case "bunnative":
+    case "nativets":
+    case "go":
+      return "//";
+    default:
+      return undefined;
+  }
+}
+
+// `<prefix> volume: <path>` lines in the LEADING comment block, each an `rw`
+// volume asset. Scanning stops at the first non-comment line (blank lines
+// skipped). Exact mirror of frontend `parseVolumeAnnotations` (infer.ts) /
+// backend `parse_volume_annotations` (asset_inference.rs) — the wasm body parser
+// does NOT emit these, so the local graph must supplement them or a `volume:`
+// producer shows disconnected from its `// on volume://…` consumers.
+function parseVolumeAnnotations(
+  content: string,
+  prefix: string,
+): { kind: string; path: string; access_type: "rw" }[] {
+  const out: { kind: string; path: string; access_type: "rw" }[] = [];
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") continue;
+    if (!trimmed.startsWith(prefix)) break;
+    const after = trimmed.slice(prefix.length).trim();
+    const m = after.match(/^volume:\s*(\S+)/);
+    if (m) out.push({ kind: "volume", path: m[1], access_type: "rw" });
+  }
+  return out;
+}
+
+// Infer a single script's assets + pipeline annotations. Returns the raw
+// `ParseAssetsOutput` (incl. `materialize` with its `scd2` flag, which the wasm
+// asset parser emits as of windmill-parser-wasm-asset 1.749.0 — kept in lockstep
+// with the frontend's pin so the local graph mirrors the deployed one), plus
+// `volume:` annotation assets the wasm doesn't surface (merged in below, like
+// the frontend/backend).
+// wasm parse errors degrade to the annotation fallback so a syntactically-broken
+// script still shows as a pipeline node if it's annotated.
+export async function inferScriptAssets(
+  content: string,
+  language: string,
+): Promise<ParseAssetsRaw> {
+  const out = await inferScriptAssetsBody(content, language);
+  const vp = volumeCommentPrefix(language);
+  if (vp) {
+    const vols = parseVolumeAnnotations(content, vp);
+    if (vols.length > 0) out.assets = [...(out.assets ?? []), ...vols];
+  }
+  return out;
+}
+
+// Warn once when the wasm asset parser can't load: the annotation-only
+// fallback silently drops all inferred read/write edges, so a packaging or
+// install problem would otherwise masquerade as a parsing limitation.
+let warnedAssetParserUnavailable = false;
+
+async function inferScriptAssetsBody(
+  content: string,
+  language: string,
+): Promise<ParseAssetsRaw> {
+  const fn = wasmFnForLanguage(language);
+  if (!fn) return fallbackParse(content, language);
+  let raw: string;
+  try {
+    const mod = await loadParser(ASSET_WASM_PKG);
+    raw = mod[fn](content) as string;
+  } catch (e) {
+    if (!warnedAssetParserUnavailable) {
+      warnedAssetParserUnavailable = true;
+      log.warnStderr(
+        `warning: ${ASSET_WASM_PKG} failed to load (${
+          e instanceof Error ? e.message : e
+        }) — falling back to annotation-only parsing; inferred read/write edges (materialize targets, COPY TO, writeS3File) will be missing from the local graph`,
+      );
+    }
+    return fallbackParse(content, language);
+  }
+  if (raw.startsWith("err:")) return fallbackParse(content, language);
+  try {
+    return JSON.parse(raw) as ParseAssetsRaw;
+  } catch {
+    return fallbackParse(content, language);
+  }
+}
+
+// Recursively collect every local script file under `folderDir`, returning each
+// one's windmill path (relative to `root`, extension stripped), content, and
+// language. Skips lock files and metadata YAMLs.
+export async function collectScripts(
+  folderDir: string,
+  root: string,
+  defaultTs: "bun" | "deno" | undefined,
+): Promise<LocalScript[]> {
+  const out: LocalScript[] = [];
+  function walk(dir: string) {
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const e of entries) {
+      if (e.name.startsWith(".") || e.name === "node_modules") continue;
+      const abs = path.join(dir, e.name);
+      if (e.isDirectory()) {
+        walk(abs);
+        continue;
+      }
+      if (!e.isFile()) continue;
+      const ext = exts.find((x) => e.name.endsWith(x));
+      if (!ext) continue;
+      const relFromRoot = path.relative(root, abs).replaceAll("\\", "/");
+      // A bare `.sql` (no dialect) makes inferContentTypeFromFilePath throw —
+      // skip the file rather than letting one unclassifiable file abort the
+      // whole graph build (which would also wedge `pipeline dev` at startup).
+      let language: string;
+      try {
+        language = inferContentTypeFromFilePath(abs, defaultTs);
+      } catch {
+        continue;
+      }
+      out.push({
+        path: removeExtensionToPath(relFromRoot),
+        content: fs.readFileSync(abs, "utf-8"),
+        language,
+      });
+    }
+  }
+  walk(folderDir);
+  out.sort((a, b) => a.path.localeCompare(b.path));
+  return out;
+}
+
+// Build the full pipeline asset-graph from local files in `f/<folder>/`.
+// Only `// pipeline` scripts become graph nodes (pipeline membership), mirroring
+// the deployed graph endpoint. Returns the graph plus the in-pipeline scripts'
+// content (the dev watcher pushes the latter; the runner re-reads it for preview).
+export async function buildLocalPipelineGraph(args: {
+  root: string;
+  folder: string;
+  defaultTs?: "bun" | "deno";
+}): Promise<{ graph: AssetGraph; scripts: LocalScript[] }> {
+  const folderClean = args.folder.replace(/^f\//, "").replace(/\/$/, "");
+  const folderDir = path.join(args.root, "f", folderClean);
+  const all = await collectScripts(folderDir, args.root, args.defaultTs);
+
+  // `// macros` DuckDB libraries across the whole workspace (a pipeline may use a
+  // shared library outside its folder).
+  const libMacros = collectMacroLibraries(args.root);
+
+  const runnables: GraphRunnable[] = [];
+  const edges: GraphEdge[] = [];
+  const triggers: GraphTrigger[] = [];
+  const assetSet = new Map<
+    string,
+    { kind: string; path: string; derived_from?: string }
+  >();
+  // `<kind>:<current-path>` → base `<dim>` path, for scd2 `_current` companion
+  // views. Applied to the final asset nodes so a consumer's `// on …_current`
+  // trigger (processed after the producer) can't clobber the derived marker.
+  const derivedFromByKey = new Map<string, string>();
+  const pipelineScripts: LocalScript[] = [];
+  // For HD-1 test edges: a pipeline member's parsed `// data_test`s, and the
+  // assets each script READS (any script, so a custom test resolves against a
+  // non-member test script's reads — best-effort, mirroring the backend, which
+  // resolves custom tests against every deployed runnable's asset usages).
+  const dataTestsByPath = new Map<string, ParsedDataTest[]>();
+  const readsByRunnable = new Map<string, { kind: string; path: string }[]>();
+
+  for (const s of all) {
+    const out = await inferScriptAssets(s.content, s.language);
+    const reads = (out.assets ?? [])
+      .filter(
+        (a) =>
+          a.access_type == null ||
+          a.access_type === "r" ||
+          a.access_type === "rw",
+      )
+      .map((a) => ({ kind: a.kind, path: a.path }));
+    if (reads.length > 0) readsByRunnable.set(s.path, reads);
+    // A `// macros` library is a pipeline-member node carrying its macro
+    // signatures — whether or not any consumer uses it — matching the deployed
+    // graph, which marks every macro library `auto_kind='pipeline'`. It is
+    // definition-only (no assets/triggers, never run), so we add just the node;
+    // it is NOT a previewable script (excluded from `pipelineScripts`).
+    const macroLibDefs = libMacros.get(s.path);
+    if (macroLibDefs) {
+      runnables.push({
+        path: s.path,
+        usage_kind: "script",
+        in_pipeline: true,
+        ...(out.tag ? { tag: out.tag } : {}),
+        macros: macroLibDefs.map((m) => ({
+          name: m.name,
+          params: m.params,
+          is_table: m.isTable,
+        })),
+      });
+      continue;
+    }
+    if (!out.in_pipeline) continue; // not a pipeline member
+    if (out.data_tests && out.data_tests.length > 0) {
+      dataTestsByPath.set(s.path, out.data_tests);
+    }
+    const retry = normalizeRetry(out.retry);
+    const nativeTriggers = recoverHeaderNativeTriggers(s.content, s.language);
+    // Carry the parsed `// tag` so previews route to the same worker the
+    // deployed pipeline would (both `pipeline run --local` and `/pipeline_dev`).
+    pipelineScripts.push(out.tag ? { ...s, tag: out.tag } : s);
+    const mat = out.materialize;
+    // Managed-materialize write strategy, derived like the deployed graph —
+    // precedence mirrors the runtime: scd2 (`history`) > append > merge
+    // (key=<col>) > replace. Manual mode has no managed strategy.
+    const materialize_strategy =
+      mat && !mat.manual
+        ? mat.scd2
+          ? "scd2"
+          : mat.append
+            ? "append"
+            : mat.unique_key
+              ? "merge"
+              : "replace"
+        : undefined;
+    runnables.push({
+      path: s.path,
+      usage_kind: "script",
+      in_pipeline: true,
+      ...(out.partition ? { partition_kind: out.partition.kind } : {}),
+      ...(out.freshness ? { freshness: out.freshness.duration } : {}),
+      ...(out.tag ? { tag: out.tag } : {}),
+      ...(retry ? { retry } : {}),
+      ...(out.data_tests && out.data_tests.length > 0 ? { data_tests: out.data_tests } : {}),
+      ...(out.column_lineage && out.column_lineage.length > 0
+        ? { column_lineage: out.column_lineage }
+        : {}),
+      ...(mat ? { materialize_target: { kind: mat.target_kind, path: mat.target_path } } : {}),
+      ...(materialize_strategy ? { materialize_strategy } : {}),
+      ...(mat?.on_schema_change === "ignore"
+        ? { materialize_on_schema_change: "ignore" }
+        : {}),
+    });
+
+    for (const a of out.assets ?? []) {
+      assetSet.set(`${a.kind}:${a.path}`, { kind: a.kind, path: a.path });
+      edges.push({
+        runnable_kind: "script",
+        runnable_path: s.path,
+        asset_kind: a.kind,
+        asset_path: a.path,
+        access_type: a.access_type,
+      });
+    }
+    // `// materialize <asset>` declares a write output via annotation, not the
+    // SQL body, so body-inference misses it. Translate the parsed materialize
+    // target into the producer's write edge here (mirrors frontend
+    // resolveGraph.ts) so the materialized asset connects to its `// on`
+    // consumers; dedup against any body write. A managed scd2 materialize also
+    // produces the `<dim>_current` companion view — register it as a second
+    // write (mirrors the deploy path) so a consumer reading only the view links
+    // back to this producer instead of orphaning.
+    if (mat) {
+      const matWrites: { path: string; derived_from?: string }[] = [
+        { path: mat.target_path },
+      ];
+      if (mat.scd2 && !mat.manual) {
+        const currentPath = `${mat.target_path}_current`;
+        matWrites.push({ path: currentPath, derived_from: mat.target_path });
+        derivedFromByKey.set(
+          `${mat.target_kind}:${currentPath}`,
+          mat.target_path,
+        );
+      }
+      for (const w of matWrites) {
+        assetSet.set(`${mat.target_kind}:${w.path}`, {
+          kind: mat.target_kind,
+          path: w.path,
+          ...(w.derived_from ? { derived_from: w.derived_from } : {}),
+        });
+        const hasWrite = edges.some(
+          (e) =>
+            e.runnable_path === s.path &&
+            e.asset_kind === mat.target_kind &&
+            e.asset_path === w.path &&
+            (e.access_type === "w" || e.access_type === "rw"),
+        );
+        if (!hasWrite) {
+          edges.push({
+            runnable_kind: "script",
+            runnable_path: s.path,
+            asset_kind: mat.target_kind,
+            asset_path: w.path,
+            access_type: "w",
+          });
+        }
+      }
+    }
+    const existingNativeTriggers = new Set<string>();
+    for (const t of out.triggers ?? []) {
+      if (t.kind === "asset") {
+        const at = t as { kind: "asset"; asset_kind: string; path: string };
+        assetSet.set(`${at.asset_kind}:${at.path}`, {
+          kind: at.asset_kind,
+          path: at.path,
+        });
+        triggers.push({
+          trigger_kind: "asset",
+          asset_kind: at.asset_kind,
+          asset_path: at.path,
+          runnable_kind: "script",
+          runnable_path: s.path,
+        });
+      } else {
+        existingNativeTriggers.add(t.kind);
+        triggers.push({
+          trigger_kind: t.kind,
+          runnable_kind: "script",
+          runnable_path: s.path,
+        });
+      }
+    }
+    for (const kind of nativeTriggers) {
+      if (existingNativeTriggers.has(kind)) continue;
+      triggers.push({
+        trigger_kind: kind,
+        runnable_kind: "script",
+        runnable_path: s.path,
+      });
+    }
+    // Auto-derived cascade edges (backend `derive_pipeline_asset_trigger_refs`,
+    // frontend `deriveAutoAssetTriggers`): a pipeline script's read-only
+    // ducklake/s3 input wires its cascade trigger straight from the body read,
+    // so `// on <asset>` is only needed for edges inference can't see. Skipped:
+    // assets this script also writes — including the `// materialize` target and
+    // its scd2 `_current` companion, whose writes the body SELECT doesn't
+    // express — plus `// mute <asset>` opt-outs and explicit `// on` (which wins
+    // the dedup); `// mute all` opts the script out of derivation entirely.
+    // Ambiguous access (no `access_type`) fails safe and derives nothing.
+    const mute = parseMuteAnnotations(s.content);
+    if (!mute.muteAll) {
+      const skip = new Set<string>(mute.muted);
+      for (const a of out.assets ?? []) {
+        if (a.access_type === "w" || a.access_type === "rw") {
+          skip.add(`${a.kind}:${a.path}`);
+        }
+      }
+      if (mat) {
+        skip.add(`${mat.target_kind}:${mat.target_path}`);
+        if (mat.scd2 && !mat.manual) {
+          skip.add(`${mat.target_kind}:${mat.target_path}_current`);
+        }
+      }
+      for (const t of out.triggers ?? []) {
+        if (t.kind === "asset") {
+          const at = t as { kind: "asset"; asset_kind: string; path: string };
+          skip.add(`${at.asset_kind}:${at.path}`);
+        }
+      }
+      for (const a of out.assets ?? []) {
+        if (a.access_type !== "r" || !AUTO_TRIGGER_KINDS.has(a.kind)) continue;
+        const key = `${a.kind}:${a.path}`;
+        if (skip.has(key)) continue;
+        skip.add(key);
+        triggers.push({
+          trigger_kind: "asset",
+          asset_kind: a.kind,
+          asset_path: a.path,
+          runnable_kind: "script",
+          runnable_path: s.path,
+        });
+      }
+    }
+  }
+
+  const macroEdges = buildMacroEdges(all, libMacros, runnables);
+
+  const testEdges = buildTestEdges(dataTestsByPath, readsByRunnable, edges);
+
+  const assets = [...assetSet.entries()].map(([key, a]) => {
+    const derived_from = a.derived_from ?? derivedFromByKey.get(key);
+    return derived_from ? { ...a, derived_from } : a;
+  });
+
+  return {
+    graph: {
+      runnables,
+      assets,
+      edges,
+      triggers,
+      ...(macroEdges.length > 0 ? { macro_edges: macroEdges } : {}),
+      ...(testEdges.length > 0 ? { test_edges: testEdges } : {}),
+    },
+    scripts: pipelineScripts,
+  };
+}
+
+// Synthesize HD-1 ordering edges from parsed `// data_test`s. Ports backend
+// `asset_graph` (windmill-api-assets): resolve each test's referenced asset(s)
+// to their in-pipeline producer(s) via the write edges, and add an ordering-only
+// producer → tested-script edge. A `relationships` test references its `to_path`
+// asset directly; a `custom` test references the tested/other script's parsed
+// reads (best-effort). Self-edges (a script testing its own output) and assets
+// with no in-pipeline producer are dropped, exactly like the backend.
+function buildTestEdges(
+  dataTestsByPath: Map<string, ParsedDataTest[]>,
+  readsByRunnable: Map<string, { kind: string; path: string }[]>,
+  edges: GraphEdge[],
+): GraphTestEdge[] {
+  const producersByAsset = new Map<string, { kind: string; path: string }[]>();
+  for (const e of edges) {
+    if (e.access_type !== "w" && e.access_type !== "rw") continue;
+    // `\u0000` as the (kind, path) separator: it can't occur in an asset path,
+    // so no packed key can collide.
+    const key = `${e.asset_kind}\u0000${e.asset_path}`;
+    (producersByAsset.get(key) ?? producersByAsset.set(key, []).get(key)!).push({
+      kind: e.runnable_kind,
+      path: e.runnable_path,
+    });
+  }
+
+  const out: GraphTestEdge[] = [];
+  // Dedup on (producer, tested_script, asset) so repeated tests / producers
+  // referencing the same asset yield one edge (mirrors the backend's set).
+  const seen = new Set<string>();
+  for (const [memberPath, dts] of dataTestsByPath) {
+    for (const dt of dts) {
+      let referenced: { kind: string; path: string }[] = [];
+      if (dt.type === "relationships") {
+        referenced = [{ kind: dt.to_kind, path: dt.to_path }];
+      } else if (dt.type === "custom") {
+        // The custom test script's own parsed reads. Reading the member's OWN
+        // output resolves to the member as producer and is dropped below.
+        referenced = readsByRunnable.get(dt.path) ?? [];
+      }
+      for (const ref of referenced) {
+        const producers = producersByAsset.get(`${ref.kind}\u0000${ref.path}`);
+        if (!producers) continue; // external table (no producer) ⇒ no edge
+        for (const p of producers) {
+          // Skip a self-edge: the tested script produces the asset it tests.
+          if (p.kind === "script" && p.path === memberPath) continue;
+          const key = [p.path, memberPath, ref.kind, ref.path].join("\u0000");
+          if (seen.has(key)) continue;
+          seen.add(key);
+          out.push({
+            producer_kind: p.kind,
+            producer_path: p.path,
+            runnable_kind: "script",
+            runnable_path: memberPath,
+            asset_kind: ref.kind,
+            asset_path: ref.path,
+          });
+        }
+      }
+    }
+  }
+  // Deterministic order for stable `--json` output (the deployed graph iterates
+  // an unordered map; the local one sorts so snapshots don't churn).
+  out.sort(
+    (a, b) =>
+      a.producer_path.localeCompare(b.producer_path) ||
+      a.runnable_path.localeCompare(b.runnable_path) ||
+      a.asset_kind.localeCompare(b.asset_kind) ||
+      a.asset_path.localeCompare(b.asset_path),
+  );
+  return out;
+}
+
+// Every `// macros` DuckDB library in the workspace, keyed by its windmill path,
+// mapped to its parsed macro definitions. Walks the whole `f/` tree (not just the
+// pipeline folder) because the deployed graph resolves consumers against the
+// workspace-wide macro registry — a pipeline may `// use` / call a shared library
+// living outside its own folder. Only `*.duckdb.sql` files are read (macros are
+// DuckDB-only), so the extra walk stays cheap.
+function collectMacroLibraries(root: string): Map<string, ParsedMacro[]> {
+  const out = new Map<string, ParsedMacro[]>();
+  const walk = (dir: string) => {
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const e of entries) {
+      if (e.name.startsWith(".") || e.name === "node_modules") continue;
+      const abs = path.join(dir, e.name);
+      if (e.isDirectory()) {
+        walk(abs);
+        continue;
+      }
+      if (!e.isFile() || !e.name.endsWith(".duckdb.sql")) continue;
+      let content: string;
+      try {
+        content = fs.readFileSync(abs, "utf-8");
+      } catch {
+        continue;
+      }
+      if (!parseMacroAnnotations(content).macros) continue;
+      const relFromRoot = path.relative(root, abs).replaceAll("\\", "/");
+      out.set(removeExtensionToPath(relFromRoot), parseMacroLibrary(content));
+    }
+  };
+  walk(path.join(root, "f"));
+  return out;
+}
+
+// Derive lib→consumer edges (lexical calls + `// use`). In-folder libraries are
+// already member nodes; this adds any out-of-folder provider referenced by an
+// in-folder consumer. Mirrors the deployed `asset_graph`: libraries resolve
+// workspace-wide, consumers are folder-scoped.
+function buildMacroEdges(
+  all: LocalScript[],
+  libMacros: Map<string, ParsedMacro[]>,
+  runnables: GraphRunnable[],
+): NonNullable<AssetGraph["macro_edges"]> {
+  if (libMacros.size === 0) return [];
+  const useLibsByScript = new Map<string, string[]>();
+  for (const s of all) {
+    if (s.language !== "duckdb") continue;
+    const { useLibs } = parseMacroAnnotations(s.content);
+    if (useLibs.length > 0) useLibsByScript.set(s.path, useLibs);
+  }
+
+  // Macro name → providing library. Names are workspace-unique (the deploy path
+  // enforces this); on a local collision, last-writer-wins, harmlessly.
+  const providerByName = new Map<string, string>();
+  for (const [lib, macros] of libMacros) {
+    for (const m of macros) providerByName.set(m.name, lib);
+  }
+  const allMacroNames = new Set(providerByName.keys());
+
+  // Aggregate per (lib, consumer): the set of called macro names and whether the
+  // edge came (also) from a whole-library `// use`. Consumers are folder-scoped
+  // (`all` is this folder's scripts).
+  const pipelinePaths = new Set(runnables.map((r) => r.path));
+  type EdgeAgg = { names: Set<string>; viaUse: boolean };
+  // lib_path → consumer_path → aggregate. Nested (not a packed single-string key)
+  // so no separator can ever collide with a path.
+  const edgeMap = new Map<string, Map<string, EdgeAgg>>();
+  const aggFor = (lib: string, consumer: string): EdgeAgg => {
+    let byConsumer = edgeMap.get(lib);
+    if (!byConsumer) {
+      byConsumer = new Map();
+      edgeMap.set(lib, byConsumer);
+    }
+    let agg = byConsumer.get(consumer);
+    if (!agg) {
+      agg = { names: new Set(), viaUse: false };
+      byConsumer.set(consumer, agg);
+    }
+    return agg;
+  };
+  for (const s of all) {
+    if (s.language !== "duckdb") continue;
+    // Lexical call edges: the deploy path records `macro_usage` for EVERY DuckDB
+    // script in the folder (not only pipeline members) — including a macro
+    // library that calls another library's macros — so a lib→lib edge and its
+    // upstream provider node survive. Mirror that: any folder DuckDB script is a
+    // candidate consumer here.
+    for (const name of detectMacroCalls(s.content, allMacroNames)) {
+      const lib = providerByName.get(name)!;
+      if (lib === s.path) continue; // a library calling its own macro is not an edge
+      aggFor(lib, s.path).names.add(name);
+    }
+    // `// use` whole-library edges: the deployed graph re-parses these only from
+    // pipeline members (`annotations_by_path`), so scope them the same way.
+    if (!pipelinePaths.has(s.path)) continue;
+    for (const lib of useLibsByScript.get(s.path) ?? []) {
+      const macros = libMacros.get(lib);
+      // An out-of-tree / unknown `// use` target can't be resolved locally.
+      if (!macros || lib === s.path) continue;
+      const agg = aggFor(lib, s.path);
+      agg.viaUse = true;
+      for (const m of macros) agg.names.add(m.name);
+    }
+  }
+
+  const edges = [...edgeMap.entries()]
+    .flatMap(([lib_path, byConsumer]) =>
+      [...byConsumer.entries()].map(([consumer_path, agg]) => ({
+        lib_path,
+        consumer_path,
+        macro_names: [...agg.names].sort(),
+        // `via_use` is always present (the deployed `MacroEdge` serializes it
+        // unconditionally) so `--json` matches byte-for-byte.
+        via_use: agg.viaUse,
+      })),
+    )
+    .sort((a, b) =>
+      a.lib_path.localeCompare(b.lib_path) ||
+      a.consumer_path.localeCompare(b.consumer_path),
+    );
+
+  // In-folder libraries are already member nodes (added above with `in_pipeline`
+  // + macros). An OUT-OF-folder library referenced by an in-folder consumer is
+  // added here as a non-member provider node (no `in_pipeline`), matching the
+  // deployed graph, which folder-scopes membership but pulls the out-of-folder
+  // provider in as the edge's endpoint.
+  const libPaths = new Set<string>(edges.map((e) => e.lib_path));
+  for (const lib of libPaths) {
+    if (runnables.some((r) => r.path === lib)) continue;
+    const macros = (libMacros.get(lib) ?? []).map((m) => ({
+      name: m.name,
+      params: m.params,
+      is_table: m.isTable,
+    }));
+    runnables.push({ path: lib, usage_kind: "script", macros });
+  }
+  // Force every edge's CONSUMER endpoint into the node set too, like the deployed
+  // builder, so no edge dangles at a missing runnable. Members and libraries are
+  // already nodes; only a non-member DuckDB helper (calls a macro but isn't
+  // `// pipeline` and isn't itself a library) needs a bare node here.
+  for (const consumer of new Set(edges.map((e) => e.consumer_path))) {
+    if (!runnables.some((r) => r.path === consumer)) {
+      runnables.push({ path: consumer, usage_kind: "script" });
+    }
+  }
+  runnables.sort((a, b) => a.path.localeCompare(b.path));
+
+  return edges;
+}
diff --git a/cli/src/commands/pipeline/pipeline.ts b/cli/src/commands/pipeline/pipeline.ts
index b4e08f6416..0738283fba 100644
--- a/cli/src/commands/pipeline/pipeline.ts
+++ b/cli/src/commands/pipeline/pipeline.ts
@@ -8,7 +8,50 @@ import { requireLogin } from "../../core/auth.ts";
 import { resolveWorkspace } from "../../core/context.ts";
 import * as log from "../../core/log.ts";
 import { GlobalOptions } from "../../types.ts";
+import {
+  type BCGraph,
+  boundedSet,
+  buildLineageDag,
+  nonAutorunTriggerScripts,
+  reachableCutting,
+  resolveToken,
+  scriptNodeId,
+  scriptPathOf,
+  scriptsOf,
+  topoOrder,
+  validStarts,
+  validFromStarts,
+} from "./boundedCascade.ts";
+import {
+  type AssetGraph,
+  type GraphTrigger,
+  type LocalScript,
+  buildLocalPipelineGraph,
+  workspaceRoot,
+} from "./localGraph.ts";
+import {
+  mergeConfigWithConfigFile,
+  type SyncOptions,
+} from "../../core/conf.ts";
+import { listSyncCodebases } from "../../utils/codebase.ts";
+import { inferSchema } from "../../utils/metadata.ts";
+import { readFile } from "node:fs/promises";
+import pipelineDev from "./dev.ts";
+import { generatePipelineDocs } from "./docs.ts";
+import {
+  type UploadBinding,
+  devUploadKey,
+  parseArgBinding,
+  parseS3Uri,
+  parseUploadBinding,
+  s3Arg,
+  s3ObjectParams,
+} from "./pipelineUpload.ts";
 
+// The graph payload types (AssetGraph / GraphRunnable / GraphEdge /
+// GraphTrigger) are defined in ./localGraph.ts — the canonical pipeline graph
+// module — and shared by the local (wasm-built) and deployed (apiGet) paths.
+//
 // Mirrors the asset-graph endpoint payload (backend/windmill-api-assets).
 // TODO: the checked-in generated client (cli/gen, last regenerated 2025-04)
 // predates these routes, so we raw-fetch and hand-roll the types. Once
@@ -17,39 +60,6 @@ import { GlobalOptions } from "../../types.ts";
 // `apiGet` + these types with the generated `wmill.getAssetsGraph(...)`
 // (operationId getAssetsGraph) and `wmill.listPipelineFolders(...)`
 // (operationId listPipelineFolders).
-type GraphRunnable = {
-  path: string;
-  usage_kind: "script" | "flow" | "job";
-  in_pipeline?: boolean;
-};
-type GraphEdge = {
-  runnable_kind: string;
-  runnable_path: string;
-  asset_kind: string;
-  asset_path: string;
-  access_type?: "r" | "w" | "rw";
-};
-type GraphTrigger =
-  | {
-      trigger_kind: "asset";
-      asset_kind: string;
-      asset_path: string;
-      runnable_kind: string;
-      runnable_path: string;
-    }
-  | {
-      trigger_kind: string;
-      path?: string;
-      runnable_kind: string;
-      runnable_path: string;
-      missing?: boolean;
-    };
-type AssetGraph = {
-  runnables: GraphRunnable[];
-  assets: { kind: string; path: string }[];
-  edges: GraphEdge[];
-  triggers: GraphTrigger[];
-};
 
 async function apiGet<T>(path: string): Promise<T> {
   const response = await fetch(`${OpenAPI.BASE}${path}`, {
@@ -104,28 +114,153 @@ function pushTo<K, V>(map: Map<K, V[]>, key: K, val: V): void {
 }
 
 async function show(
-  opts: GlobalOptions & { json?: boolean },
+  opts: GlobalOptions & { json?: boolean; local?: boolean; defaultTs?: "bun" | "deno" },
   folder: string,
 ) {
   if (opts.json) log.setSilent(true);
-  const workspace = await resolveWorkspace(opts);
-  await requireLogin(opts);
-
   const f = folder.replace(/^f\//, "").replace(/\/$/, "");
-  const graph = await apiGet<AssetGraph>(
-    `/w/${workspace.workspaceId}/assets/graph?folder=${encodeURIComponent(f)}&asset_kinds=${ASSET_KINDS}`,
-  );
+
+  // Acquire the graph: `--local` builds it from working-tree files (wasm
+  // inference, no deploy); otherwise fetch the deployed asset graph. The
+  // deployed path also enriches roots with UI-only source markers (the local
+  // path gets those from the wasm directly, so no enrichment).
+  let graph: AssetGraph;
+  let enrich: ((nativeByScript: Map<string, NativeMarker[]>, roots: string[]) => Promise<void>) | undefined;
+  if (opts.local) {
+    const merged = await mergeConfigWithConfigFile(opts);
+    graph = (await buildLocalPipelineGraph({ root: workspaceRoot(), folder: f, defaultTs: merged.defaultTs })).graph;
+  } else {
+    const workspace = await resolveWorkspace(opts);
+    await requireLogin(opts);
+    graph = await apiGet<AssetGraph>(
+      `/w/${workspace.workspaceId}/assets/graph?folder=${encodeURIComponent(f)}&asset_kinds=${ASSET_KINDS}`,
+    );
+    enrich = (nativeByScript, roots) => enrichRootMarkers(workspace.workspaceId, graph, nativeByScript, roots);
+  }
+
   if (opts.json) {
     console.log(JSON.stringify(graph));
     return;
   }
   if (graph.runnables.length === 0) {
     log.info(
-      `No pipeline scripts in f/${f}. Mark scripts with a \`// pipeline\` comment and push them.`,
+      opts.local
+        ? `No \`// pipeline\` scripts found in f/${f} locally. Mark scripts with a \`// pipeline\` comment.`
+        : `No pipeline scripts in f/${f}. Mark scripts with a \`// pipeline\` comment and push them.`,
     );
     return;
   }
 
+  await renderGraph(graph, f, enrich);
+}
+
+type NativeMarker = { kind: string; path?: string; missing?: boolean };
+
+// Deployed-only: UI-first markers (data_upload, webhook, email) have no trigger
+// row — the graph endpoint's trigger enum can't surface them, so they only exist
+// as `// on <kind>` annotations in the script body. Fetch just the root bodies
+// and lift the marker kinds the canvas would show. (Local mode skips this: the
+// wasm asset parser already returns these as triggers.)
+//
+// DRIFT RISK: this regex + MARKER_KINDS is a divergent, partial copy of the
+// canonical annotation parser. The proper fix is to have the graph endpoint emit
+// these UI-only markers as trigger rows (a backend change), after which this can
+// be deleted. Until then, keep this list in sync with the canonical parser.
+const MARKER_KINDS = new Set(["data_upload", "webhook", "email"]);
+
+// Recover marker-only native triggers (`// on data_upload`/`webhook`/`email`) from
+// a deployed script body — they have no trigger row for the graph endpoint to
+// emit. Scans the LEADING comment header only (stops at the first non-comment
+// line, blank lines allowed) like the canonical/fallback annotation parsers, so a
+// body comment can't inject a phantom trigger.
+export function recoverHeaderMarkers(content: string): string[] {
+  const found: string[] = [];
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") continue;
+    if (!trimmed.startsWith("//") && !trimmed.startsWith("--") && !trimmed.startsWith("#")) break;
+    const m = line.match(/^\s*(?:\/\/|--|#)\s*on\s+(\w+)\s*$/);
+    if (m && MARKER_KINDS.has(m[1]) && !found.includes(m[1])) found.push(m[1]);
+  }
+  return found;
+}
+
+async function enrichRootMarkers(
+  workspaceId: string,
+  graph: AssetGraph,
+  nativeByScript: Map<string, NativeMarker[]>,
+  roots: string[],
+): Promise<void> {
+  await Promise.all(
+    roots.map(async (p) => {
+      const r = graph.runnables.find((x) => x.path === p);
+      if (r?.usage_kind !== "script") return;
+      try {
+        const script = await wmill.getScriptByPath({ workspace: workspaceId, path: p });
+        const existing = nativeByScript.get(p) ?? [];
+        for (const kind of recoverHeaderMarkers(script.content ?? "")) {
+          if (!existing.some((t) => t.kind === kind)) existing.push({ kind });
+        }
+        if (existing.length > 0) nativeByScript.set(p, existing);
+      } catch {
+        // body fetch is best-effort enrichment only
+      }
+    }),
+  );
+}
+
+// The deployed `/assets/graph` omits `data_upload`/`webhook`/`email` trigger rows
+// (marker-only annotations with no trigger table), so on the deployed `run` path
+// `validStarts`/`nonAutorunTriggerScripts` can't see them and would auto-run such
+// an entrypoint with empty args. Recover them from the script bodies — the same
+// body-scan the deployed `show` path uses (`enrichRootMarkers`) — and inject
+// trigger rows so the run selection cuts them like the `--local` graph does.
+async function enrichDeployedNonAutorunTriggers(
+  workspaceId: string,
+  graph: BCGraph,
+): Promise<void> {
+  const scripts = (graph.runnables ?? []).filter((r) => r.usage_kind === "script");
+  await Promise.all(
+    scripts.map(async (r) => {
+      const known = new Set(
+        (graph.triggers ?? [])
+          .filter((t) => t.runnable_path === r.path && MARKER_KINDS.has(t.trigger_kind))
+          .map((t) => t.trigger_kind),
+      );
+      let script;
+      try {
+        script = await wmill.getScriptByPath({ workspace: workspaceId, path: r.path });
+      } catch (e: any) {
+        // Fail CLOSED: if we can't read a script's body we can't rule out a
+        // marker-only input trigger, so aborting is safer than auto-running it
+        // with empty args. (The `show` enrichment stays best-effort — it only
+        // affects the rendered tree, not what runs.)
+        throw new Error(
+          `Could not verify triggers for ${r.path} (${e?.body ?? e?.message ?? e}) — ` +
+            `aborting so an input-only entrypoint isn't run with empty args; retry once resolved.`,
+        );
+      }
+      for (const kind of recoverHeaderMarkers(script.content ?? "")) {
+        if (known.has(kind)) continue;
+        known.add(kind);
+        graph.triggers.push({
+          trigger_kind: kind,
+          runnable_kind: "script",
+          runnable_path: r.path,
+        });
+      }
+    }),
+  );
+}
+
+// Index a pipeline graph and render its DAG as an ASCII tree. Shared by the
+// deployed (`show`) and local (`show --local`) paths; `enrich` lifts deployed
+// UI-only root markers when provided.
+async function renderGraph(
+  graph: AssetGraph,
+  f: string,
+  enrich?: (nativeByScript: Map<string, NativeMarker[]>, roots: string[]) => Promise<void>,
+) {
   // Index the graph: writes per script, subscribers per asset, native
   // trigger markers per script, asset subscriptions per script.
   const writesByScript = new Map<string, string[]>();
@@ -137,10 +272,7 @@ async function show(
   }
   const subsByAsset = new Map<string, string[]>();
   const subsByScript = new Map<string, string[]>();
-  const nativeByScript = new Map<
-    string,
-    { kind: string; path?: string; missing?: boolean }[]
-  >();
+  const nativeByScript = new Map<string, NativeMarker[]>();
   for (const t of graph.triggers) {
     if (t.trigger_kind === "asset") {
       const at = t as Extract<GraphTrigger, { trigger_kind: "asset" }>;
@@ -171,6 +303,26 @@ async function show(
     return out.length > 0 ? " " + out.join(" ") : "";
   }
 
+  // `// macros` libraries: badge the node with the macros it defines and list
+  // its consumers as ƒ edges. Populated on both the deployed graph and the local
+  // graph (localGraph.ts derives `macros`/`macro_edges` from the working tree,
+  // since the wasm asset parser emits neither).
+  const macrosByLib = new Map(
+    graph.runnables
+      .filter((r) => (r.macros?.length ?? 0) > 0)
+      .map((r) => [r.path, r.macros!]),
+  );
+  const macroConsumersByLib = new Map<
+    string,
+    { consumer: string; names: string[] }[]
+  >();
+  for (const me of graph.macro_edges ?? []) {
+    pushTo(macroConsumersByLib, me.lib_path, {
+      consumer: me.consumer_path,
+      names: me.macro_names,
+    });
+  }
+
   const printed = new Set<string>();
   const lines: string[] = [];
 
@@ -186,8 +338,22 @@ async function show(
       return;
     }
     printed.add(script);
-    lines.push(`${prefix}${colors.bold(shortName(script))}${triggerBadges(script)}${alsoOn}`);
+    const libMacros = macrosByLib.get(script);
+    const macroBadge = libMacros
+      ? " " +
+        colors.magenta(`[ƒ macros: ${libMacros.map((m) => m.name).join(", ")}]`)
+      : "";
+    lines.push(`${prefix}${colors.bold(shortName(script))}${macroBadge}${triggerBadges(script)}${alsoOn}`);
     const childPrefix = prefix.replace(/├─ $/, "│  ").replace(/└─ $/, "   ");
+    const macroConsumers = [...(macroConsumersByLib.get(script) ?? [])].sort(
+      (a, b) => a.consumer.localeCompare(b.consumer),
+    );
+    macroConsumers.forEach(({ consumer, names }, i) => {
+      const branch = i === macroConsumers.length - 1 ? "└─ƒ " : "├─ƒ ";
+      lines.push(
+        `${childPrefix}${branch}${shortName(consumer)} ${colors.dim(`(uses ${names.join(", ")})`)}`,
+      );
+    });
     const writes = [...(writesByScript.get(script) ?? [])].sort();
     writes.forEach((uri, i) => {
       const lastAsset = i === writes.length - 1;
@@ -210,43 +376,9 @@ async function show(
     .filter((p) => !(subsByScript.get(p)?.length))
     .sort();
 
-  // UI-first markers (data_upload, webhook) have no trigger row — the
-  // graph endpoint's trigger enum (schedule/email/kafka/mqtt/nats/postgres/
-  // sqs/gcp) can't surface them, so they only exist as `// on <kind>`
-  // annotations in the script body. Roots are where sources matter, so fetch
-  // just those bodies and lift the marker kinds the canvas would show.
-  //
-  // DRIFT RISK: this regex + MARKER_KINDS is a divergent, partial copy of the
-  // canonical annotation parser. The proper fix is to have the graph endpoint
-  // emit these UI-only markers as trigger rows (a backend change), after which
-  // this whole Promise.all body-fetch can be deleted and read straight from
-  // the response. Until then, keep this list in sync with the canonical parser.
-  const MARKER_KINDS = ["data_upload", "webhook", "email"];
-  await Promise.all(
-    roots.map(async (p) => {
-      const r = graph.runnables.find((x) => x.path === p);
-      if (r?.usage_kind !== "script") return;
-      try {
-        const script = await wmill.getScriptByPath({
-          workspace: workspace.workspaceId,
-          path: p,
-        });
-        const existing = nativeByScript.get(p) ?? [];
-        for (const line of (script.content ?? "").split("\n")) {
-          const m = line.match(/^\s*(?:\/\/|--|#)\s*on\s+(\w+)\s*$/);
-          if (!m) continue;
-          const kind = m[1];
-          if (!MARKER_KINDS.includes(kind)) continue;
-          if (!existing.some((t) => t.kind === kind)) {
-            existing.push({ kind });
-          }
-        }
-        if (existing.length > 0) nativeByScript.set(p, existing);
-      } catch {
-        // body fetch is best-effort enrichment only
-      }
-    }),
-  );
+  // Deployed-only: lift UI-only source markers (data_upload/webhook/email) onto
+  // the roots. No-op in local mode (the wasm already emitted them as triggers).
+  if (enrich) await enrich(nativeByScript, roots);
 
   const scriptCount = graph.runnables.length;
   const assetCount = graph.assets.length;
@@ -269,6 +401,633 @@ async function show(
   console.log(lines.join("\n"));
 }
 
+// Poll a launched job to a terminal state. Modest fixed cadence; capped so a
+// wedged job can't hang the CLI forever.
+async function waitJob(
+  workspace: string,
+  id: string,
+): Promise<{ ok: boolean; result?: unknown }> {
+  const MAX_RETRIES = 6000; // ~10min at 100ms
+  for (let i = 0; i < MAX_RETRIES; i++) {
+    try {
+      const r = await wmill.getCompletedJobResultMaybe({
+        workspace,
+        id,
+        getStarted: false,
+      });
+      // A completed job without an explicit `success: true` is a failure
+      // (mirrors the frontend `waitJobTerminal`): the cascade only advances on
+      // a confirmed success.
+      if (r.completed) return { ok: r.success === true, result: r.result };
+    } catch {
+      // transient — retry
+    }
+    await new Promise((res) => setTimeout(res, 100));
+  }
+  throw new Error(`Timed out waiting for job ${id}`);
+}
+
+// Render a failed job's `{error: {name, message}}` result for the terminal, so
+// the user sees WHY the cascade stopped without opening the UI. Result shapes
+// vary (structured data-test payloads, plain strings), so fall back to raw
+// JSON when the canonical error shape is absent.
+function formatJobFailure(result: unknown): string | undefined {
+  if (result == null) return undefined;
+  const err = (result as any)?.error;
+  if (err && typeof err === "object") {
+    const name = typeof err.name === "string" ? err.name : undefined;
+    const message = typeof err.message === "string" ? err.message : undefined;
+    if (message) return name ? `${name}: ${message}` : message;
+  }
+  if (typeof result === "string") return result;
+  try {
+    return JSON.stringify(result, null, 2);
+  } catch {
+    return undefined;
+  }
+}
+
+// Bounded-cascade run: start at `--from` — a schedule/manual root OR any mid-DAG
+// model (asset subscriber / pure reader) — fan downstream, but stop at the
+// `--to` end node(s). A mid-DAG start runs that node plus its transitive
+// downstream and never re-runs upstream (dbt `--select model+`). Scripts run in
+// topological order; each is launched with `_wmill_skip_asset_dispatch` so the
+// CLI owns the whole closure (the backend dispatcher never double-fires the
+// deployed part). With no `--to`, runs the full read-aware downstream of
+// `--from` (every descendant in the lineage DAG, pure readers included — broader
+// than the canvas cascade, which dispatches subscribers only).
+// Resolve one `--upload` binding to the run-arg it injects: pick the target
+// S3Object parameter (explicit `:param`, else the script's sole S3Object arg)
+// and turn the source into an object key — an `s3://` source is used as-is, a
+// local path is uploaded to the workspace store under a deterministic dev key.
+async function resolveUploadArgs(
+  bindings: UploadBinding[],
+  scriptPath: string,
+  workspaceId: string,
+  local: boolean | undefined,
+  localScripts: Map<string, LocalScript> | undefined,
+): Promise<Record<string, any>> {
+  // Fetch the schema at most once, and only when a binding omits `:param`.
+  let schema: any | undefined;
+  const loadSchema = async (): Promise<any> => {
+    if (schema) return schema;
+    if (local) {
+      const ls = localScripts?.get(scriptPath);
+      if (!ls) {
+        throw new Error(`No local file for ${scriptPath} to infer its S3Object parameter.`);
+      }
+      schema = (await inferSchema(ls.language as any, ls.content, {}, scriptPath)).schema;
+    } else {
+      schema = (await wmill.getScriptByPath({ workspace: workspaceId, path: scriptPath })).schema;
+    }
+    return schema;
+  };
+
+  const args: Record<string, any> = {};
+  for (const binding of bindings) {
+    let param = binding.param;
+    if (!param) {
+      const params = s3ObjectParams(await loadSchema());
+      if (params.length === 1) param = params[0];
+      else if (params.length === 0) {
+        throw new Error(`${scriptPath} declares no S3Object parameter to bind --upload to.`);
+      } else {
+        throw new Error(
+          `${scriptPath} has multiple S3Object parameters (${params.join(", ")}) — pick one with --upload ${binding.scriptTok}:<param>=${binding.source}`,
+        );
+      }
+    }
+    if (param in args) {
+      throw new Error(`--upload binds ${scriptPath}:${param} more than once.`);
+    }
+    let obj: { s3: string; storage?: string };
+    if (binding.source.startsWith("s3://")) {
+      // Canonical `s3://<storage>/<key>`; keeps named storage (see parseS3Uri).
+      obj = parseS3Uri(binding.source);
+    } else {
+      const buf = await readFile(binding.source);
+      // Key scoped by script + param so distinct sources sharing a basename
+      // (across scripts or params) don't clobber each other in the store.
+      const key = devUploadKey(scriptPath, param, binding.source);
+      await wmill.fileUpload({
+        workspace: workspaceId,
+        fileKey: key,
+        requestBody: new Blob([buf]) as any,
+      });
+      log.info(colors.gray(`  ↑ ${binding.source} → s3://${key}`));
+      obj = { s3: key };
+    }
+    Object.assign(args, s3Arg(param, obj));
+  }
+  return args;
+}
+
+// Default partition value for a `// partitioned <kind>` script, from the
+// current UTC instant — mirrors the backend defaults (partition_ee.rs):
+// hourly `%Y-%m-%dT%H`, weekly `%G-W%V` (ISO week-year), monthly `%Y-%m`,
+// daily `%Y-%m-%d`. `dynamic` has no time default and returns undefined.
+export function defaultPartitionValue(kind: string, now: Date = new Date()): string | undefined {
+  const pad = (n: number) => String(n).padStart(2, "0");
+  const date = `${now.getUTCFullYear()}-${pad(now.getUTCMonth() + 1)}-${pad(now.getUTCDate())}`;
+  switch (kind) {
+    case "hourly":
+      return `${date}T${pad(now.getUTCHours())}`;
+    case "weekly": {
+      // ISO 8601 week (chrono's `%G-W%V`): the week containing this date's
+      // nearest Thursday belongs to that Thursday's year.
+      const d = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+      const dow = d.getUTCDay() || 7; // Mon=1 … Sun=7
+      d.setUTCDate(d.getUTCDate() + 4 - dow);
+      const week = Math.ceil(((d.getTime() - Date.UTC(d.getUTCFullYear(), 0, 1)) / 86400000 + 1) / 7);
+      return `${d.getUTCFullYear()}-W${pad(week)}`;
+    }
+    case "monthly":
+      return date.slice(0, 7);
+    case "daily":
+      return date;
+    default:
+      return undefined;
+  }
+}
+
+async function run(
+  opts: GlobalOptions & SyncOptions & {
+    from?: string;
+    to?: string[];
+    dryRun?: boolean;
+    json?: boolean;
+    local?: boolean;
+    upload?: string[];
+    arg?: string[];
+    partition?: string;
+    defaultTs?: "bun" | "deno";
+  },
+  folder: string,
+) {
+  if (opts.json) log.setSilent(true);
+  const workspace = await resolveWorkspace(opts);
+  await requireLogin(opts);
+
+  const f = folder.replace(/^f\//, "").replace(/\/$/, "");
+
+  // `--local` runs the working-tree scripts via preview (no deploy); the graph
+  // is built from local files. Otherwise run deployed scripts by path off the
+  // deployed asset graph. Both still execute against the remote backend, with
+  // `_wmill_skip_asset_dispatch` so the CLI owns the whole closure.
+  let graph: BCGraph;
+  let localScripts: Map<string, LocalScript> | undefined;
+  let tempScriptRefs: Record<string, string> | undefined;
+  if (opts.local) {
+    // Resolve config (defaultTs drives .ts → bun/deno language inference, so a
+    // deno-default workspace previews under the right runtime).
+    const merged = await mergeConfigWithConfigFile(opts);
+    const built = await buildLocalPipelineGraph({
+      root: workspaceRoot(),
+      folder: f,
+      defaultTs: merged.defaultTs,
+    });
+    graph = built.graph;
+    localScripts = new Map(built.scripts.map((s) => [s.path, s]));
+    // Resolve relative imports from local (not-yet-deployed) content so a script
+    // that imports a sibling workspace lib previews against local edits. Same
+    // trick as `wmill dev` / `wmill app dev`; degrades to undefined gracefully.
+    // Skipped for `--dry-run`: it locks/uploads scripts as a side effect (it
+    // regenerates `*.script.yaml` / `*.script.lock` / `wmill-lock.yaml`), and a
+    // plan preview must stay READ-ONLY — the refs are only consumed when a
+    // preview job actually runs below, which dry-run never reaches.
+    if (!opts.dryRun) {
+      try {
+        const codebases = await listSyncCodebases(merged);
+        const { buildPreviewTempScriptRefs } = await import(
+          "../generate-metadata/generate-metadata.ts"
+        );
+        tempScriptRefs = await buildPreviewTempScriptRefs(
+          workspace,
+          merged,
+          codebases,
+          { kind: "all" },
+        );
+      } catch {
+        // best-effort: relative imports fall back to deployed versions
+      }
+    }
+  } else {
+    graph = await apiGet<BCGraph>(
+      `/w/${workspace.workspaceId}/assets/graph?folder=${encodeURIComponent(f)}&asset_kinds=${ASSET_KINDS}`,
+    );
+    // Recover marker-only `data_upload`/`webhook`/`email` triggers the graph
+    // endpoint can't emit, so input-only entrypoints are cut here as they are
+    // under `--local` (else they'd auto-run empty).
+    await enrichDeployedNonAutorunTriggers(workspace.workspaceId, graph);
+  }
+
+  // Resolve a `--upload`/`--arg` script token to its graph node, with an
+  // actionable error when the short name is ambiguous or matches nothing.
+  const resolveScriptTokenOrThrow = (tok: string, flag: string): string => {
+    const id = resolveToken(graph, tok);
+    if (!id || !id.startsWith("script:")) {
+      const matches = graph.runnables.filter(
+        (r) => r.usage_kind === "script" && (r.path.split("/").pop() ?? r.path) === tok,
+      );
+      if (matches.length > 1) {
+        throw new Error(
+          `${flag} '${tok}' matches multiple scripts (${matches.map((r) => r.path).sort().join(", ")}) — use the full path.`,
+        );
+      }
+      throw new Error(`${flag} '${tok}' matched no script in f/${f}.`);
+    }
+    return id;
+  };
+
+  // `--upload <script>[:<param>]=<file|s3://key>` binds an object to a
+  // data_upload/webhook entry point so it becomes a runnable start (and its
+  // downstream is no longer cut) — the arg is injected at execution. Repeatable
+  // per script (accumulated) so a multi-S3Object entry can bind each param.
+  const boundBindingsByPath = new Map<string, UploadBinding[]>();
+  const boundNodeIds = new Set<string>();
+  for (const spec of opts.upload ?? []) {
+    const binding = parseUploadBinding(spec);
+    const id = resolveScriptTokenOrThrow(binding.scriptTok, "--upload");
+    const p = scriptPathOf(id);
+    (boundBindingsByPath.get(p) ?? boundBindingsByPath.set(p, []).get(p)!).push(binding);
+    boundNodeIds.add(id);
+  }
+
+  // `--arg <script>:<param>=<value>` overlays a plain run arg on a script in
+  // the selection. Unlike `--upload` it does not make the script a runnable
+  // start — it only supplies a value if the script runs.
+  const plainArgsByPath = new Map<string, Record<string, unknown>>();
+  for (const spec of opts.arg ?? []) {
+    const b = parseArgBinding(spec);
+    const p = scriptPathOf(resolveScriptTokenOrThrow(b.scriptTok, "--arg"));
+    const merged = plainArgsByPath.get(p) ?? plainArgsByPath.set(p, {}).get(p)!;
+    // Object.hasOwn, not `in`: a param named like a prototype member
+    // (`toString`, `constructor`, …) must not trip the duplicate check.
+    if (Object.hasOwn(merged, b.param)) {
+      throw new Error(`--arg binds ${p}:${b.param} more than once.`);
+    }
+    merged[b.param] = b.value;
+  }
+
+  // `// macros` libraries are definition-only: their macros are injected into
+  // consuming DuckDB scripts at run time, so "running" one is a no-op preview.
+  // They are excluded from starts and from every selection below (they'd
+  // otherwise read as manual roots, since nothing triggers them).
+  const macroLibPaths = new Set(
+    graph.runnables
+      .filter((r) => r.usage_kind === "script" && (r.macros?.length ?? 0) > 0)
+      .map((r) => r.path),
+  );
+  // Non-runnable graph nodes: the macro libraries above, plus (under `--local`)
+  // any script node with no local file. The local graph surfaces macro-consumer
+  // nodes for lineage display — a DuckDB script that calls a macro but isn't a
+  // `// pipeline` member (so has no previewable content). They must never enter
+  // the run: as a manual root they'd be scheduled, and a preview would fail with
+  // no local content to send.
+  const notRunnablePaths = new Set<string>(macroLibPaths);
+  if (opts.local && localScripts) {
+    for (const r of graph.runnables) {
+      if (r.usage_kind === "script" && !localScripts.has(r.path)) {
+        notRunnablePaths.add(r.path);
+      }
+    }
+  }
+
+  // Resolve the start. Two eligibility sets:
+  //   `starts`       — schedule/manual roots (+ `--upload`-bound handlers). The
+  //                    fan-in candidates for an IMPLICIT start (`runAll`, or the
+  //                    folder's sole root).
+  //   `fromEligible` — every autorun-able script, roots AND mid-DAG models
+  //                    (asset subscribers, pure readers). An EXPLICIT `--from`
+  //                    may name any of these: `--from <mid-model>` runs that node
+  //                    plus its transitive downstream, without re-running upstream
+  //                    (dbt `--select model+`). Non-autorun handlers stay out
+  //                    unless `--upload`-bound.
+  const starts = new Set(
+    [...validStarts(graph), ...boundNodeIds].filter(
+      (id) => !notRunnablePaths.has(scriptPathOf(id)),
+    ),
+  );
+  const fromEligible = new Set(
+    [...validFromStarts(graph), ...boundNodeIds].filter(
+      (id) => !notRunnablePaths.has(scriptPathOf(id)),
+    ),
+  );
+  // `runAll` = no `--from` on a multi-root pipeline (fan-in): run the whole
+  // pipeline in topological order rather than forcing a single start, the way
+  // `dbt run` (no `--select`) runs the entire project. `--to` still needs an
+  // explicit `--from` since bounding is relative to one start.
+  let runAll = false;
+  let start: string | undefined;
+  if (opts.from) {
+    const resolved = resolveToken(graph, opts.from);
+    if (!resolved) {
+      // Distinguish "no match" from "ambiguous short name" (resolveToken
+      // returns undefined for both) so the hint is actionable.
+      const matches = graph.runnables.filter(
+        (r) => r.usage_kind === "script" && (r.path.split("/").pop() ?? r.path) === opts.from,
+      );
+      if (matches.length > 1) {
+        throw new Error(
+          `--from '${opts.from}' matches multiple scripts (${matches.map((r) => r.path).sort().join(", ")}) — pass the full path.`,
+        );
+      }
+      throw new Error(`--from '${opts.from}' matched no script in f/${f}.`);
+    }
+    if (macroLibPaths.has(scriptPathOf(resolved))) {
+      throw new Error(
+        `--from '${opts.from}' is a \`// macros\` library — definition-only, injected into consuming scripts at run time, never a runnable step.`,
+      );
+    }
+    // A `--local` display-only node (a non-`// pipeline` DuckDB script surfaced
+    // only because it calls a macro) has no previewable content — reject it
+    // clearly rather than admitting it and silently producing an empty plan.
+    if (notRunnablePaths.has(scriptPathOf(resolved))) {
+      throw new Error(
+        `--from '${opts.from}' isn't a \`// pipeline\` script — it appears in the local graph only as a macro consumer (lineage). Mark it \`// pipeline\` to run it.`,
+      );
+    }
+    if (!resolved.startsWith("script:")) {
+      throw new Error(
+        `--from '${opts.from}' is an asset, not a runnable — start a run from a script (assets are produced, not run).`,
+      );
+    }
+    if (!fromEligible.has(resolved)) {
+      throw new Error(
+        `--from '${opts.from}' can't start a run: row-backed event triggers (kafka/mqtt/nats/postgres/sqs/gcp/email) and input-only entrypoints (webhook/data_upload) fan out per-event or need caller-supplied input — bind it with --upload to run it.`,
+      );
+    }
+    start = resolved;
+  } else if (starts.size === 1) {
+    start = [...starts][0];
+  } else if (starts.size === 0) {
+    throw new Error(
+      `No schedule or manual root in f/${f} to start a bounded run from.`,
+    );
+  } else if ((opts.to ?? []).length === 0) {
+    // Multiple roots, no `--from`, no `--to` → run the whole pipeline.
+    runAll = true;
+  } else {
+    throw new Error(
+      `f/${f} has ${starts.size} possible starts — pass --from <script> when using --to. Candidates: ${scriptsOf(starts).sort().join(", ")}`,
+    );
+  }
+
+  // Resolve --to end node(s): split on comma, resolve each. An unresolved or
+  // ambiguous token is a hard error — silently ignoring it would run a
+  // different subset than the user asked for.
+  const toTokens = (opts.to ?? []).flatMap((t) => t.split(",")).map((t) => t.trim()).filter(
+    Boolean,
+  );
+  const ends: string[] = [];
+  const unresolved: string[] = [];
+  for (const tok of toTokens) {
+    const id = resolveToken(graph, tok);
+    if (!id) unresolved.push(tok);
+    else ends.push(id);
+  }
+  if (unresolved.length > 0) {
+    const details = unresolved.map((tok) => {
+      const matches = graph.runnables.filter(
+        (r) => r.usage_kind === "script" && (r.path.split("/").pop() ?? r.path) === tok,
+      );
+      return matches.length > 1
+        ? `'${tok}' (ambiguous: ${matches.map((r) => r.path).sort().join(", ")} — use the full path)`
+        : `'${tok}' (no match in f/${f})`;
+    });
+    throw new Error(`--to could not be resolved: ${details.join("; ")}.`);
+  }
+
+  // Readable label for a node id: `script:<path>` → `<path>`; asset ids
+  // (`<kind>:<path>`) are kept verbatim (slicing `script:` off them corrupts
+  // the name).
+  const idLabel = (id: string): string => (id.startsWith("script:") ? scriptPathOf(id) : id);
+
+  const dag = buildLineageDag(graph);
+  // CUT the selection at scripts whose trigger needs caller-supplied input or
+  // per-event fanout (kafka/mqtt/nats/postgres/sqs/gcp/email/webhook/data_upload):
+  // they can't run with empty args, so no run mode — whole-pipeline, single-root,
+  // or bounded — may schedule them, nor a downstream consumer that only such a
+  // handler feeds (it would get missing/stale inputs). Exclude `starts` from the
+  // barriers: a valid start (a schedule/manual root, or an `--upload`-bound
+  // handler) runs with its own input even if it ALSO carries a non-autorun
+  // trigger — cutting it would drop a legitimately-scheduled root and its chain.
+  // An explicit mid-DAG `--from` is likewise protected: the user named it as the
+  // start, so it runs even if it also carries a non-autorun trigger.
+  const barriers = new Set(
+    [...nonAutorunTriggerScripts(graph)].filter(
+      (id) => !starts.has(id) && id !== start,
+    ),
+  );
+  let selectedScripts: Set<string>;
+  let reachableEnds: string[] = [];
+  let droppedEnds: string[] = [];
+  if (runAll) {
+    // Whole pipeline = everything reachable from the valid starts (schedule/manual
+    // roots), cutting at the barriers above. A node reachable via another,
+    // non-barrier path still runs.
+    selectedScripts = new Set(scriptsOf(reachableCutting(dag, starts, barriers)));
+  } else if (ends.length === 0) {
+    // No bound → full read-aware downstream of start (pure readers included),
+    // still cut at barriers so an event/upload descendant isn't run empty.
+    selectedScripts = new Set(scriptsOf(reachableCutting(dag, [start!], barriers)));
+  } else {
+    const res = boundedSet(dag, start!, ends);
+    droppedEnds = res.droppedEnds;
+    for (const d of droppedEnds) {
+      log.warn(`end '${idLabel(d)}' is not downstream of the start — ignored.`);
+    }
+    // Intersect the bounded window with the barrier-cut closure from the start so
+    // a barrier (or a node only reachable through one) inside the window is dropped.
+    const reachable = reachableCutting(dag, [start!], barriers);
+    selectedScripts = new Set(
+      scriptsOf([...res.nodes].filter((n) => reachable.has(n))),
+    );
+    // An end that boundedSet reached but the barrier cut removed is NOT satisfied:
+    // report it as dropped (not reachable) and warn, so `--json`/the plan don't
+    // claim a bound was met when its only path ran through a skipped handler.
+    for (const e of res.reachableEnds) {
+      if (reachable.has(e)) {
+        reachableEnds.push(e);
+      } else {
+        droppedEnds.push(e);
+        log.warn(
+          `end '${idLabel(e)}' is only reachable through a skipped input/event handler — not run (bind it with --upload to include it).`,
+        );
+      }
+    }
+  }
+
+  // Selections can still pull a non-runnable node in via graph reachability (e.g.
+  // whole-pipeline mode collects every root's closure) — drop macro libraries and
+  // local-only display nodes before ordering so they never run.
+  for (const p of notRunnablePaths) selectedScripts.delete(p);
+
+  const { order, cyclic } = topoOrder(graph, selectedScripts);
+  if (cyclic.length > 0) {
+    log.warn(`Skipping ${cyclic.length} script(s) on a dependency cycle: ${cyclic.sort().join(", ")}`);
+  }
+
+  // `// partitioned` scripts need a resolved `partition` arg. Deployed runs get
+  // it from backend run-start resolution, but previews (`--local`) never do —
+  // so resolve it client-side there: `--partition` wins; otherwise time kinds
+  // default to the current UTC period (mirroring the backend defaults; custom
+  // `tz=`/`format=`/`start=` opts are a backend concern — pass --partition
+  // explicitly to match them). `dynamic` has no default. For deployed runs the
+  // arg is only injected when `--partition` is given (an explicit backfill).
+  const partitionKindByPath = new Map(
+    graph.runnables
+      .filter((r) => r.usage_kind === "script" && r.partition_kind)
+      .map((r) => [r.path, r.partition_kind!]),
+  );
+  const partitionValueFor = (nodePath: string): string | undefined => {
+    const kind = partitionKindByPath.get(nodePath);
+    if (!kind) return undefined;
+    if (opts.partition) return opts.partition;
+    if (!opts.local) return undefined; // deployed: backend resolves at run start
+    return defaultPartitionValue(kind);
+  };
+  if (opts.local && !opts.partition) {
+    const unresolvable = order.filter(
+      (p) => partitionKindByPath.get(p) === "dynamic",
+    );
+    if (unresolvable.length > 0) {
+      throw new Error(
+        `dynamic \`// partitioned\` script(s) need an explicit partition for a local run: ${unresolvable.sort().join(", ")} — pass --partition <value>.`,
+      );
+    }
+  }
+
+  // A `--upload` whose script fell outside the selection is a no-op the user
+  // should know about, rather than silently ignored.
+  const orderSet = new Set(order);
+  const boundInOrder = [...boundBindingsByPath.keys()].filter((p) => orderSet.has(p)).sort();
+  for (const p of boundBindingsByPath.keys()) {
+    if (!orderSet.has(p)) log.warn(`--upload for ${p} is unused — it isn't in the run selection.`);
+  }
+  for (const p of plainArgsByPath.keys()) {
+    if (!orderSet.has(p)) log.warn(`--arg for ${p} is unused — it isn't in the run selection.`);
+  }
+
+  if (opts.json) {
+    // Surface reachable/dropped ends so a machine-readable plan reflects the
+    // same trimming the human-facing warning does — a resolved-but-unreachable
+    // `--to` must not look like a clean plan that silently runs only the start.
+    console.log(
+      JSON.stringify({
+        start: runAll ? null : scriptPathOf(start!),
+        ends: ends.map(idLabel),
+        reachableEnds: reachableEnds.map(idLabel),
+        droppedEnds: droppedEnds.map(idLabel),
+        order,
+        cyclic,
+        uploads: boundInOrder,
+      }),
+    );
+  }
+
+  if (order.length === 0) {
+    if (!opts.json) log.info("Nothing to run.");
+    return;
+  }
+
+  if (opts.dryRun) {
+    if (!opts.json) {
+      log.info(
+        colors.bold(`Bounded run plan — ${order.length} script${order.length === 1 ? "" : "s"}`) +
+          colors.dim(runAll ? ` (whole pipeline)` : ` (from ${shortName(scriptPathOf(start!))})`),
+      );
+      order.forEach((p, i) => {
+        const pv = partitionValueFor(p);
+        const marks = [
+          boundBindingsByPath.has(p) ? " (← --upload)" : "",
+          plainArgsByPath.has(p) ? " (← --arg)" : "",
+          pv
+            ? ` (partition=${pv})`
+            : partitionKindByPath.has(p)
+              ? " (partition resolved by backend at run start)"
+              : "",
+        ].join("");
+        log.info(`  ${i + 1}. ${p}${marks ? colors.dim(marks) : ""}`);
+      });
+    }
+    return;
+  }
+
+  // Resolve `--upload` bindings to their injected args up front (uploading any
+  // local sources) so a bad path / missing S3Object param fails before we start
+  // launching jobs.
+  const uploadArgs = new Map<string, Record<string, any>>();
+  for (const nodePath of boundInOrder) {
+    uploadArgs.set(
+      nodePath,
+      await resolveUploadArgs(
+        boundBindingsByPath.get(nodePath)!,
+        nodePath,
+        workspace.workspaceId,
+        opts.local,
+        localScripts,
+      ),
+    );
+  }
+
+  // Execute in topological order, stopping on the first failure.
+  for (const nodePath of order) {
+    if (!opts.json) log.info(colors.gray(`▶ running ${nodePath}…`));
+    // `--arg` spreads after `--upload` so an explicit value wins for the same
+    // param; the internal dispatch guard spreads LAST so neither binding can
+    // re-enable backend dispatch (the CLI owns the whole closure here).
+    const partitionValue = partitionValueFor(nodePath);
+    const nodeArgs = {
+      ...(partitionValue !== undefined ? { partition: partitionValue } : {}),
+      ...(uploadArgs.get(nodePath) ?? {}),
+      ...(plainArgsByPath.get(nodePath) ?? {}),
+      _wmill_skip_asset_dispatch: true,
+    };
+    let id: string;
+    if (opts.local) {
+      const ls = localScripts!.get(nodePath);
+      if (!ls) {
+        throw new Error(
+          `No local file for ${nodePath} — is it a \`// pipeline\` script in f/${f}?`,
+        );
+      }
+      id = await wmill.runScriptPreview({
+        workspace: workspace.workspaceId,
+        requestBody: {
+          content: ls.content,
+          language: ls.language as any,
+          path: nodePath,
+          args: nodeArgs,
+          temp_script_refs: tempScriptRefs,
+          // `// tag` routes to the same worker the deployed pipeline would.
+          ...(ls.tag ? { tag: ls.tag } : {}),
+        } as any,
+      });
+    } else {
+      id = await wmill.runScriptByPath({
+        workspace: workspace.workspaceId,
+        path: nodePath,
+        requestBody: nodeArgs,
+      });
+    }
+    const { ok, result } = await waitJob(workspace.workspaceId, id);
+    if (!ok) {
+      const detail = formatJobFailure(result);
+      const runUrl = `${workspace.remote}run/${id}?workspace=${workspace.workspaceId}`;
+      throw new Error(
+        `Bounded run failed at ${nodePath} (job ${id}).` +
+          (detail ? `\n${detail}` : "") +
+          `\nFull logs: ${runUrl}`,
+      );
+    }
+    if (!opts.json) log.info(colors.green(`  ✓ ${nodePath}`));
+  }
+  if (!opts.json) {
+    log.info(colors.green.bold(`Bounded run complete — ${order.length} script(s) succeeded.`));
+  }
+}
+
 const command = new Command()
   .description(
     "inspect asset-driven pipelines (scripts marked `// pipeline`, wired by `// on <spec>` annotations)",
@@ -282,6 +1041,56 @@ const command = new Command()
   )
   .arguments("<folder:string>")
   .option("--json", "Output the raw asset graph as JSON")
-  .action(show as any);
+  .option(
+    "--local",
+    "Build the graph from local working-tree files (// pipeline scripts) instead of the deployed workspace — no deploy needed.",
+  )
+  .action(show as any)
+  .command(
+    "run",
+    "run a cascade: from --from (a root OR any mid-DAG model), fan downstream up to the --to end node(s)",
+  )
+  .arguments("<folder:string>")
+  .option(
+    "--from <script:string>",
+    "Start script (short name or path). May be any node, including a mid-DAG model — that node plus its transitive downstream runs, upstream is NOT re-run (dbt `--select model+`). Defaults to the folder's sole schedule/manual root.",
+  )
+  .option(
+    "--to <node:string>",
+    "End node(s) to stop at — script names/paths or asset URIs (e.g. datatable://main/staged). Repeatable or comma-separated. Omit to run the full downstream.",
+    { collect: true },
+  )
+  .option("--dry-run", "Print the topological run plan without executing.")
+  .option("--json", "Output the plan as JSON (for piping to jq).")
+  .option(
+    "--local",
+    "Run the local working-tree scripts via preview (no deploy) instead of the deployed versions; the graph is built from local files.",
+  )
+  .option(
+    "--upload <binding:string>",
+    "Bind an object to a data_upload/webhook entry point so it runs in the cascade, as SCRIPT[:PARAM]=SOURCE (SOURCE is a local file or an s3://key). Local files are uploaded to the workspace store; the S3Object param is inferred when the script has exactly one. Repeatable.",
+    { collect: true },
+  )
+  .option(
+    "--arg <binding:string>",
+    "Pass a plain run arg to a script in the cascade, as SCRIPT:PARAM=VALUE (VALUE is parsed as JSON when possible, else taken as a string — e.g. daily_report:partition=2026-07-02). Repeatable.",
+    { collect: true },
+  )
+  .option(
+    "--partition <value:string>",
+    "Partition value for `// partitioned` scripts in the run (e.g. 2026-06-30) — use it to backfill a past slice. With --local, time kinds (daily/hourly/weekly/monthly) default to the current UTC period when omitted; `dynamic` always needs it. Deployed runs without it defer to backend run-start resolution.",
+  )
+  .action(run as any)
+  .command(
+    "docs",
+    "generate PIPELINE.md (+ AGENTS.md pointer) describing a folder's pipeline graph and datatable schemas, for an editor / agentic loop",
+  )
+  .arguments("<folder:string>")
+  .option(
+    "--local",
+    "Build the graph from local working-tree files instead of the deployed workspace.",
+  )
+  .action(generatePipelineDocs as any)
+  .command("dev", pipelineDev);
 
 export default command;
diff --git a/cli/src/commands/pipeline/pipelineUpload.ts b/cli/src/commands/pipeline/pipelineUpload.ts
new file mode 100644
index 0000000000..a753409464
--- /dev/null
+++ b/cli/src/commands/pipeline/pipelineUpload.ts
@@ -0,0 +1,106 @@
+// Helpers for `wmill pipeline run` per-script bindings:
+// `--upload <script>[:<param>]=<file|s3://key>` binds an object to a
+// `data_upload` / `webhook` entry point so it (and its downstream) runs in the
+// cascade instead of being skipped for want of input;
+// `--arg <script>:<param>=<value>` passes a plain (non-S3Object) run arg.
+import { basename } from "node:path";
+
+export type UploadBinding = { scriptTok: string; param?: string; source: string };
+
+/**
+ * Parse a `--upload` spec: `<script>[:<param>]=<file-or-s3-uri>`.
+ * Split on the FIRST `=` so an `s3://…` source (whose `:` sits to the right of
+ * it) stays unambiguous; an optional `:<param>` on the left names the target
+ * S3Object argument when the script declares more than one.
+ */
+export function parseUploadBinding(spec: string): UploadBinding {
+  const eq = spec.indexOf("=");
+  const left = eq < 0 ? "" : spec.slice(0, eq).trim();
+  const source = eq < 0 ? "" : spec.slice(eq + 1).trim();
+  if (!left || !source) {
+    throw new Error(`--upload '${spec}' must be <script>[:<param>]=<file-or-s3-uri>`);
+  }
+  const colon = left.indexOf(":");
+  if (colon < 0) return { scriptTok: left, source };
+  const scriptTok = left.slice(0, colon).trim();
+  const param = left.slice(colon + 1).trim();
+  if (!scriptTok || !param) {
+    throw new Error(`--upload '${spec}' must be <script>[:<param>]=<file-or-s3-uri>`);
+  }
+  return { scriptTok, param, source };
+}
+
+export type ArgBinding = { scriptTok: string; param: string; value: unknown };
+
+/**
+ * Parse an `--arg` spec: `<script>:<param>=<value>`. Split on the FIRST `=`
+ * (values may contain `=`); the value is JSON when it parses as JSON, else the
+ * raw string — so `stats:limit=10` is a number and
+ * `daily_report:partition=2026-07-02` a string. `:<param>` is required: unlike
+ * `--upload` there is no single-S3Object convention to infer it from.
+ */
+export function parseArgBinding(spec: string): ArgBinding {
+  const eq = spec.indexOf("=");
+  const left = eq < 0 ? "" : spec.slice(0, eq).trim();
+  const raw = eq < 0 ? "" : spec.slice(eq + 1).trim();
+  const colon = left.indexOf(":");
+  const scriptTok = colon < 0 ? "" : left.slice(0, colon).trim();
+  const param = colon < 0 ? "" : left.slice(colon + 1).trim();
+  if (!scriptTok || !param) {
+    throw new Error(`--arg '${spec}' must be <script>:<param>=<json-or-string>`);
+  }
+  let value: unknown;
+  try {
+    value = JSON.parse(raw);
+  } catch {
+    value = raw;
+  }
+  return { scriptTok, param, value };
+}
+
+/**
+ * Names of a schema's S3Object properties. The resource name in `format`
+ * varies by language parser — TS/python emit `resource-s3_object`, the SQL
+ * dialects emit `resource-S3Object` — so match it case/underscore-insensitively
+ * the way the frontend's ArgInput does.
+ */
+export function s3ObjectParams(schema: any): string[] {
+  const props = schema?.properties ?? {};
+  const isS3Object = (format: unknown): boolean =>
+    typeof format === "string" &&
+    format.startsWith("resource-") &&
+    format.slice("resource-".length).replaceAll("_", "").toLowerCase() === "s3object";
+  return Object.keys(props).filter((k) => isS3Object(props[k]?.format));
+}
+
+/**
+ * Deterministic dev object key for a local sample bound to a script's param.
+ * Scoped by script path + param so two different sources that share a basename
+ * (across scripts or params) resolve to distinct keys instead of clobbering.
+ */
+export function devUploadKey(scriptPath: string, param: string, source: string): string {
+  return `wmilldev/pipeline/${scriptPath}/${param}/${basename(source)}`;
+}
+
+export type S3Object = { s3: string; storage?: string };
+
+/**
+ * Parse an `s3://<storage>/<key>` source into an S3Object, matching Windmill's
+ * canonical `parseS3Object` (frontend `utils.ts`): the authority is the named
+ * storage — empty ⇒ default — and the rest is the object key. So
+ * `s3://secondary/k.csv` → `{ s3: "k.csv", storage: "secondary" }`, and the
+ * default-storage form is `s3:///key` (empty authority), including nested keys
+ * (`s3:///raw/2026/events.csv`). A source with no `/` after the scheme has no
+ * authority, so the whole remainder is the key in the default store.
+ */
+export function parseS3Uri(source: string): S3Object {
+  const m = source.match(/^s3:\/\/([^/]*)\/(.*)$/);
+  if (!m) return { s3: source.slice("s3://".length) };
+  const storage = m[1] || undefined;
+  return storage ? { s3: m[2], storage } : { s3: m[2] };
+}
+
+/** The S3Object run-arg (`{ <param>: <S3Object> }`). */
+export function s3Arg(param: string, obj: S3Object): Record<string, S3Object> {
+  return { [param]: obj };
+}
diff --git a/cli/src/commands/sync/sync.ts b/cli/src/commands/sync/sync.ts
index e0e4e73659..65ce10eaad 100644
--- a/cli/src/commands/sync/sync.ts
+++ b/cli/src/commands/sync/sync.ts
@@ -23,10 +23,17 @@ import {
   showDiff,
   extractNativeTriggerInfo,
   redactEncryptionKey,
+  isDatatableMigrationPath,
+  parseDatatableMigrationPath,
 } from "../../types.ts";
 import { downloadZip } from "./pull.ts";
 import { runLint, printReport, checkMissingLocks } from "../lint/lint.ts";
 import { pullSharedUi, pushSharedUi } from "../shared_ui.ts";
+import {
+  pushMigrationFromDisk,
+  offerToRunNewMigrations,
+  validateLocalMigrations,
+} from "../datatable_migrations.ts";
 
 import {
   exts,
@@ -41,6 +48,7 @@ import { handleFile } from "../script/script.ts";
 import {
   deepEqual,
   fetchRemoteVersion,
+  getHeaders,
   isFileResource,
   isFilesetResource,
   isRawAppFile,
@@ -2476,7 +2484,8 @@ const isNotWmillFile = (p: string, isDirectory: boolean) => {
       !p.startsWith("g" + SEP) &&
       !p.startsWith("users" + SEP) &&
       !p.startsWith("groups" + SEP) &&
-      !p.startsWith("dependencies" + SEP)
+      !p.startsWith("dependencies" + SEP) &&
+      !p.startsWith("migrations" + SEP)
     );
   }
 
@@ -2487,6 +2496,11 @@ const isNotWmillFile = (p: string, isDirectory: boolean) => {
 
   try {
     const typ = getTypeStrFromPath(p);
+    // Datatable migrations live under migrations/datatable/<datatable>/, outside
+    // the u/f/g namespaces, but are valid wmill files.
+    if (typ == "datatable_migration") {
+      return false;
+    }
     if (
       typ == "resource-type" ||
       typ == "settings" ||
@@ -2518,7 +2532,8 @@ export const isWhitelisted = (p: string) => {
     p == "ui" ||
     p == "users" ||
     p == "groups" ||
-    p == "dependencies"
+    p == "dependencies" ||
+    p == "migrations"
   );
 };
 
@@ -2613,6 +2628,11 @@ interface ChangeTracker {
 }
 
 async function addToChangedIfNotExists(p: string, tracker: ChangeTracker) {
+  // Datatable migration .sql files are not scripts; they're synced via the
+  // dedicated datatable_migration handler in the push loop.
+  if (isDatatableMigrationPath(p)) {
+    return;
+  }
   const isScript = exts.some((e) => p.endsWith(e)) && !isFileResource(p) && !isFilesetResource(p);
   if (isScript) {
     if (isFlowPath(p)) {
@@ -3118,7 +3138,7 @@ export async function pull(
           change.path.endsWith(".json")
         ) {
           log.info(
-            `Editing ${getTypeStrFromPath(change.path)} ${targetPath}${
+            `Editing ${changeTypeLabel(change.path)}${targetPath}${
               targetPath !== change.path
                 ? colors.gray(` (workspace-specific override for ${change.path})`)
                 : ""
@@ -3136,7 +3156,7 @@ export async function pull(
         if (opts.stateful) {
           await mkdir(path.dirname(stateTarget), { recursive: true });
           log.info(
-            `Adding ${getTypeStrFromPath(change.path)} ${targetPath}${
+            `Adding ${changeTypeLabel(change.path)}${targetPath}${
               targetPath !== change.path
                 ? colors.gray(` (workspace-specific override for ${change.path})`)
                 : ""
@@ -3145,7 +3165,7 @@ export async function pull(
         }
         await writeFile(target, change.content, "utf-8");
         log.info(
-          `Writing ${getTypeStrFromPath(change.path)} ${targetPath}${
+          `Writing ${changeTypeLabel(change.path)}${targetPath}${
             targetPath !== change.path
               ? colors.gray(` (workspace-specific override for ${change.path})`)
               : ""
@@ -3157,7 +3177,7 @@ export async function pull(
       } else if (change.name === "deleted") {
         try {
           log.info(
-            `Deleting ${getTypeStrFromPath(change.path)} ${change.path}`,
+            `Deleting ${changeTypeLabel(change.path)}${change.path}`,
           );
           await rm(target);
           if (opts.stateful) {
@@ -3349,6 +3369,9 @@ export async function pull(
     log.warn(`Failed to pull shared UI folder: ${e}`);
   }
 
+  // Datatable migrations are part of the workspace export now, so they flow
+  // through the normal diff/apply above as `datatable_migration` items.
+
   // Git-sync deployment-callback mode stops here: branch checkout + pull have
   // happened, but commit + push are the caller's job. The hub script does
   // them in-process with `set_gpg_signing_secret` so the agent's pre-warmed
@@ -3424,6 +3447,14 @@ export async function gitDeploy(
   } as any);
 }
 
+// Display label for a change's type, with a trailing space. Datatable migrations
+// are self-describing via their `migrations/datatable/...` path, so they get no
+// label prefix.
+function changeTypeLabel(p: string): string {
+  const t = getTypeStrFromPath(p);
+  return t === "datatable_migration" ? "" : `${t} `;
+}
+
 function prettyChanges(
   changes: Change[],
   specificItems?: SpecificItemsConfig,
@@ -3455,7 +3486,7 @@ function prettyChanges(
     if (change.name === "added") {
       log.info(
         colors.green(
-          `+ ${getTypeStrFromPath(change.path)} ` +
+          `+ ${changeTypeLabel(change.path)}` +
             displayPath +
             colors.gray(wsNote),
         ) + extraNote,
@@ -3463,7 +3494,7 @@ function prettyChanges(
     } else if (change.name === "deleted") {
       log.info(
         colors.red(
-          `- ${getTypeStrFromPath(change.path)} ` +
+          `- ${changeTypeLabel(change.path)}` +
             displayPath +
             colors.gray(wsNote),
         ),
@@ -3472,7 +3503,7 @@ function prettyChanges(
       const changeType = getTypeStrFromPath(change.path);
       log.info(
         colors.yellow(
-          `~ ${changeType} ` +
+          `~ ${changeTypeLabel(change.path)}` +
             displayPath +
             colors.gray(wsNote) +
             (change.codebase ? ` (codebase changed)` : ""),
@@ -3550,6 +3581,61 @@ function removeSuffix(str: string, suffix: string) {
 const SYNC_PUSH_DESTRUCTIVE_WARNING =
   "`wmill sync push` is destructive: applying it deploys these changes to the remote workspace and overwrites or deletes remote items that differ from or are absent locally — this is not automatically reversible. If you are an AI agent, do NOT run `wmill sync push` (without --dry-run) until the user has explicitly confirmed this deploy, unless your custom instructions explicitly allow bypassing that confirmation.";
 
+// A script pushed without a local lock queues a server-side dependency job; if
+// that job fails the script deploys broken (no lock/assets) with no CLI signal.
+// One-shot (no polling): report this push's already-failed + still-running
+// dependency jobs.
+async function checkServerLockJobs(
+  workspaceId: string,
+  sinceIso: string,
+  changedPaths: string[],
+): Promise<{ pending: number; failed: { path: string; error?: string }[] }> {
+  // A dependency job's script_path has no file extension; changed paths do.
+  const belongsToPush = (scriptPath?: string) =>
+    !!scriptPath &&
+    changedPaths.some(
+      (p) => p === scriptPath || p.startsWith(scriptPath + "."),
+    );
+  // Raw fetch: the checked-in generated client predates the `created_after` /
+  // `success` filters on the job list routes (see the `apiGet` note in
+  // pipeline.ts).
+  const listJobs = async (path: string): Promise<unknown[]> => {
+    const { OpenAPI } = await import("../../../gen/index.ts");
+    const resp = await fetch(`${OpenAPI.BASE}${path}`, {
+      headers: { ...getHeaders(), Authorization: `Bearer ${OpenAPI.TOKEN}` },
+    });
+    if (!resp.ok) throw new Error(`GET ${path} -> ${resp.status}`);
+    return (await resp.json()) as unknown[];
+  };
+  try {
+    const since = encodeURIComponent(sinceIso);
+    const [queued, completed] = await Promise.all([
+      listJobs(
+        `/w/${workspaceId}/jobs/queue/list?job_kinds=dependencies&created_after=${since}`,
+      ),
+      listJobs(
+        `/w/${workspaceId}/jobs/completed/list?job_kinds=dependencies&created_after=${since}&success=false`,
+      ),
+    ]);
+    const pending = (queued as { script_path?: string }[]).filter((j) =>
+      belongsToPush(j.script_path),
+    ).length;
+    const failed = (
+      completed as { script_path?: string; result?: unknown }[]
+    )
+      .filter((j) => belongsToPush(j.script_path))
+      .map((j) => ({
+        path: j.script_path!,
+        error: (j.result as { error?: { message?: string } } | undefined)
+          ?.error?.message,
+      }));
+    return { pending, failed };
+  } catch {
+    // Advisory only: a failed check must not fail an otherwise-complete push.
+    return { pending: 0, failed: [] };
+  }
+}
+
 export async function push(
   opts: GlobalOptions & SyncOptions & { repository?: string; branch?: string; acceptOverridingPermissionedAsWithSelf?: boolean },
 ) {
@@ -4165,6 +4251,24 @@ export async function push(
       ));
     }
 
+    // Reject malformed datatable migrations (duplicate timestamps, orphan downs)
+    // before touching the remote, scanning only the data tables in this push.
+    const migrationDatatables = new Set(
+      changes
+        .map((c) => parseDatatableMigrationPath(c.path)?.datatable)
+        .filter((d): d is string => !!d),
+    );
+    if (migrationDatatables.size > 0) {
+      const migrationErrors = validateLocalMigrations(migrationDatatables);
+      if (migrationErrors.length > 0) {
+        log.error(
+          "Invalid datatable migrations, aborting push:\n" +
+            migrationErrors.map((e) => `  - ${e}`).join("\n"),
+        );
+        process.exit(1);
+      }
+    }
+
     if (
       !opts.yes &&
       !(await Confirm.prompt({
@@ -4176,6 +4280,7 @@ export async function push(
     }
 
     const start = performance.now();
+    const pushStartedAt = new Date().toISOString();
     log.info(colors.gray(`Applying changes to files ...`));
 
     let stateful = opts.stateful;
@@ -4236,6 +4341,21 @@ export async function push(
     // Cache git branch at the start to avoid repeated execSync calls per change
     const cachedWsNameForPush = wsNameForFiles || (isGitRepository() ? getCurrentGitBranch() : null);
 
+    // Datatable migrations are two files (.up.sql/.down.sql) for one record, so
+    // dedupe upsert/delete by (datatable, version) across the whole push.
+    const pushedMigrationKeys = new Set<string>();
+    // Migrations newly added by this push (an added .up.sql) — offered to run once
+    // the push has completed.
+    const newDatatableMigrations = changes
+      .filter((c) => c.name === "added")
+      .map((c) => parseDatatableMigrationPath(c.path))
+      .filter((p) => !!p && p.kind === "up")
+      .map((p) => ({
+        datatable: p!.datatable,
+        timestamp: p!.timestamp,
+        name: p!.name,
+      }));
+
     while (queue.length > 0 || pool.size > 0) {
       // Fill the pool until we reach the effective parallelism limit.
       // During the folder-meta phase this is 1 (sequential) so no item change
@@ -4263,6 +4383,20 @@ export async function push(
           }
 
           for await (const change of changes) {
+            // A datatable migration is one record across two files; upsert/delete
+            // it from disk once (deduped), regardless of which file changed.
+            if (isDatatableMigrationPath(change.path)) {
+              const parsed = parseDatatableMigrationPath(change.path);
+              if (parsed) {
+                const key = `${parsed.datatable}\0${parsed.timestamp}`;
+                if (!pushedMigrationKeys.has(key)) {
+                  pushedMigrationKeys.add(key);
+                  await pushMigrationFromDisk(workspace.workspaceId, parsed);
+                }
+              }
+              continue;
+            }
+
             let stateTarget = undefined;
             if (stateful) {
               try {
@@ -4917,9 +5051,40 @@ export async function push(
     } catch (e) {
       log.warn(`Failed to push shared UI folder: ${e}`);
     }
+    try {
+      await offerToRunNewMigrations(workspace.workspaceId, newDatatableMigrations, {
+        yes: opts.yes,
+        jsonOutput: opts.jsonOutput,
+      });
+    } catch (e: any) {
+      log.warn(
+        `Failed to run new datatable migrations: ${e?.body ?? e?.message ?? e}`,
+      );
+    }
+    const lockJobs = await checkServerLockJobs(
+      workspace.workspaceId,
+      pushStartedAt,
+      changes.map((c) => c.path.replaceAll(SEP, "/")),
+    );
+    if (!opts.jsonOutput) {
+      for (const f of lockJobs.failed) {
+        log.warn(
+          `⚠ server-side lock generation FAILED for ${f.path} — the deployed script is broken until it locks.` +
+            (f.error ? `\n  ${f.error.split("\n")[0]}` : ""),
+        );
+      }
+      if (lockJobs.pending > 0) {
+        log.info(
+          colors.gray(
+            `${lockJobs.pending} server-side lock job(s) still running — locks (and inferred assets) land when they finish; check the Runs page if a script stays broken.`,
+          ),
+        );
+      }
+    }
     if (opts.jsonOutput) {
       const result = {
         success: true,
+        lock_jobs: lockJobs,
         message: `All ${changes.length} changes pushed to the remote workspace ${workspace.workspaceId} named ${workspace.name}`,
         changes: changes.map((change) => ({
           type: change.name,
@@ -4961,6 +5126,7 @@ export async function push(
     } catch (e) {
       log.warn(`Failed to push shared UI folder: ${e}`);
     }
+    // No changes pushed, so no new datatable migrations to run.
     if (opts.jsonOutput) {
       console.log(
         JSON.stringify(
diff --git a/cli/src/commands/variable/variable.ts b/cli/src/commands/variable/variable.ts
index dec35fc4f0..2d885c9dd5 100644
--- a/cli/src/commands/variable/variable.ts
+++ b/cli/src/commands/variable/variable.ts
@@ -99,6 +99,31 @@ export interface VariableFile {
   is_oauth?: boolean;
 }
 
+/**
+ * Whether `value` has the structural shape of a workspace-encrypted secret
+ * (the form produced by `sync pull` without --plain-secrets), as opposed to a
+ * plaintext value a user authored by hand.
+ *
+ * Mirrors the server guard (windmill-store/src/variables.rs): workspace
+ * ciphertext (AES-256-CBC, base64) is standard base64 decoding to a non-zero
+ * multiple of the 16-byte block size. External secret-backend markers
+ * ($vault:/$aws_sm:/$azure_kv:) are stored verbatim too, so they count as
+ * already-encrypted. This is a shape check only — it never decrypts.
+ */
+export function looksLikeWorkspaceCiphertext(value: string): boolean {
+  if (
+    value.startsWith("$vault:") ||
+    value.startsWith("$aws_sm:") ||
+    value.startsWith("$azure_kv:")
+  ) {
+    return true;
+  }
+  if (value.length === 0 || value.length % 4 !== 0) return false;
+  if (!/^[A-Za-z0-9+/]+={0,2}$/.test(value)) return false;
+  const decodedLen = Buffer.from(value, "base64").length;
+  return decodedLen > 0 && decodedLen % 16 === 0;
+}
+
 export async function pushVariable(
   workspace: string,
   remotePath: string,
@@ -106,6 +131,11 @@ export async function pushVariable(
   localVariable: VariableFile,
   plainSecrets: boolean,
   wsSpecific?: boolean,
+  // Whether a secret->non-secret downgrade may be applied. Only an authoritative
+  // single-file `variable push` sets this. Bulk `sync push` leaves it false: a
+  // pulled secret's spec value is ciphertext, and demoting it would store that
+  // ciphertext verbatim as a visible non-secret value.
+  allowSecretDowngrade: boolean = false,
 ): Promise<void> {
   remotePath = removeType(remotePath, "variable");
   log.debug(`Processing local variable ${remotePath}`);
@@ -130,14 +160,26 @@ export async function pushVariable(
 
     log.debug(`Variable ${remotePath} is not up-to-date, updating`);
 
+    // Apply is_secret only when it differs from the remote (the value is always
+    // sent, so the server allows the flag change). Upgrades (non-secret->secret)
+    // always apply; downgrades only when explicitly allowed (single-file push) —
+    // see allowSecretDowngrade. `undefined` leaves the flag untouched.
+    let nextIsSecret: boolean | undefined = undefined;
+    if (localVariable.is_secret !== variable.is_secret) {
+      if (localVariable.is_secret) {
+        nextIsSecret = true;
+      } else if (allowSecretDowngrade) {
+        nextIsSecret = false;
+      }
+    }
+
     await wmill.updateVariable({
       workspace,
       path: remotePath.replaceAll(SEP, "/"),
       alreadyEncrypted: !plainSecrets,
       requestBody: {
         ...localVariable,
-        is_secret:
-          localVariable.is_secret && !variable.is_secret ? true : undefined,
+        is_secret: nextIsSecret,
         ...(wsSpecific !== undefined ? { ws_specific: wsSpecific } : {}),
       },
     });
@@ -174,12 +216,40 @@ async function push(
 
   log.info(colors.bold.yellow("Pushing variable..."));
 
+  const local = parseFromFile(filePath) as VariableFile;
+
+  // A secret value in a single-file push is authored by the user and is
+  // therefore plaintext that must be encrypted server-side — unless it has the
+  // shape of workspace ciphertext (a value round-tripped from `sync pull`).
+  // Pushing plaintext as already-encrypted would brick the variable. An explicit
+  // --plain-secrets always forces the plaintext (encrypt) path.
+  let plainSecrets = opts.plainSecrets ?? false;
+  if (opts.plainSecrets === undefined && local.is_secret) {
+    if (!looksLikeWorkspaceCiphertext(local.value)) {
+      log.info(
+        colors.yellow(
+          "Secret value is not in encrypted form; pushing as plaintext to be encrypted server-side (pass --plain-secrets to silence)."
+        )
+      );
+      plainSecrets = true;
+    } else {
+      // The value has the shape of workspace ciphertext, so it's stored as-is.
+      // A plaintext secret that coincidentally looks like ciphertext (e.g. a
+      // base64 token) would be stored unreadable, so surface the assumption.
+      log.warn(
+        "Secret value looks already-encrypted; pushing it as-is. If it is a plaintext secret, re-run with --plain-secrets so it gets encrypted."
+      );
+    }
+  }
+
   await pushVariable(
     workspace.workspaceId,
     remotePath,
     undefined,
-    parseFromFile(filePath),
-    opts.plainSecrets ?? false
+    local,
+    plainSecrets,
+    undefined,
+    true // single-file push is authoritative: allow secret->non-secret downgrade
   );
   log.info(colors.bold.underline.green(`Variable ${remotePath} pushed`));
 }
diff --git a/cli/src/commands/workspace/fork.ts b/cli/src/commands/workspace/fork.ts
index 5742d9ae68..219252bb7a 100644
--- a/cli/src/commands/workspace/fork.ts
+++ b/cli/src/commands/workspace/fork.ts
@@ -131,41 +131,6 @@ async function createWorkspaceFork(
     return;
   }
 
-  // When we're converting the current branch into the fork branch, default
-  // the fork's name/id to that branch — almost always what you want, and it
-  // keeps the fork branch named after the work you already have
-  // (wm-fork/<base>/<branch>). Interactive: pre-fill the prompt (press enter
-  // to accept). Non-interactive (`--yes`): use it automatically.
-  const branchDefaultId = renameCurrent ? branchToForkId(currentBranch) : undefined;
-  const interactive = process.stdin.isTTY && opts.yes !== true;
-
-  if (workspaceName === undefined) {
-    if (branchDefaultId && !interactive) {
-      workspaceName = branchDefaultId;
-      log.info(`Naming the fork after the current branch: \`${workspaceName}\``);
-    } else {
-      workspaceName = await Input.prompt({
-        message: "Name this forked workspace:",
-        default: branchDefaultId,
-      });
-    }
-  }
-
-  if (!workspaceId) {
-    // The id (unlike the display name) must be a valid slug — derive it from
-    // the name rather than using the free-form name verbatim.
-    const idDefault = branchToForkId(workspaceName);
-    if (branchDefaultId && !interactive) {
-      workspaceId = idDefault;
-    } else {
-      workspaceId = await Input.prompt({
-        message: `Enter the ID of this forked workspace, it will then be prefixed by ${WM_FORK_PREFIX}. It will also determine the branch name`,
-        default: idDefault,
-        suggestions: [idDefault],
-      });
-    }
-  }
-
   const token = workspace.token;
 
   if (!token) {
@@ -178,6 +143,62 @@ async function createWorkspaceFork(
     remote.endsWith("/") ? remote.substring(0, remote.length - 1) : remote
   );
 
+  // Default the fork's display name to "<parent>'s fork", using the parent
+  // workspace's actual name (fall back to the local profile name / id if the
+  // lookup fails). It's only a default — always overridable.
+  let parentName = workspace.name;
+  try {
+    const fetched = await wmill.getWorkspaceName({ workspace: workspace.workspaceId });
+    if (fetched) parentName = fetched;
+  } catch {
+    // Non-fatal: keep the local profile name / id as the fallback.
+  }
+  // Cap the auto default at the workspace.name limit (varchar(50)): a valid
+  // parent name can be up to 50 chars, so appending "'s fork" would otherwise
+  // push the default over the limit and trip the length guard below.
+  const forkSuffix = "'s fork";
+  const nameBase = parentName || workspace.workspaceId;
+  const defaultForkName =
+    nameBase.length + forkSuffix.length <= 50
+      ? `${nameBase}${forkSuffix}`
+      : `${nameBase.slice(0, 50 - forkSuffix.length).trimEnd()}${forkSuffix}`;
+
+  // The fork branch (and thus the id) stays named after the work you already
+  // have when converting the current branch into the fork branch
+  // (wm-fork/<base>/<branch>); the display name is independent.
+  const branchDefaultId = renameCurrent ? branchToForkId(currentBranch) : undefined;
+  const interactive = process.stdin.isTTY && opts.yes !== true;
+
+  if (workspaceName === undefined) {
+    if (interactive) {
+      workspaceName = await Input.prompt({
+        message: "Friendly name for the forked workspace (shown in the UI, may contain spaces):",
+        default: defaultForkName,
+      });
+    } else {
+      workspaceName = defaultForkName;
+      log.info(`Naming the fork \`${workspaceName}\` (override with the workspace_name argument).`);
+    }
+  }
+
+  if (!workspaceId) {
+    // The id must be a valid slug. Prefer the branch-derived id when renaming a
+    // working branch (keeps id/branch aligned). Otherwise slugify the name —
+    // but for the auto default name ("<parent>'s fork") slugify "<parent>-fork"
+    // instead, so the id/branch is `<parent>-fork` rather than `<parent>-s-fork`.
+    const idBasis = workspaceName === defaultForkName ? `${parentName}-fork` : workspaceName;
+    const idDefault = branchDefaultId ?? branchToForkId(idBasis);
+    if (interactive) {
+      workspaceId = await Input.prompt({
+        message: `Id for the forked workspace (a slug: no spaces or special characters). It will be prefixed with '${WM_FORK_PREFIX}-' and also determines the git branch name. The suggested default is normalized from the name (or the branch when converting one into the fork branch)`,
+        default: idDefault,
+        suggestions: [idDefault],
+      });
+    } else {
+      workspaceId = idDefault;
+    }
+  }
+
   log.info(colors.blue(`Creating forked workspace: ${workspaceName}...`));
 
   const trueWorkspaceId = `${WM_FORK_PREFIX}-${workspaceId}`;
@@ -186,6 +207,15 @@ async function createWorkspaceFork(
   // branch creation — a late backend rejection would leave cloned databases
   // behind.
   validateForkWorkspaceId(trueWorkspaceId);
+  // The workspace.name column is character varying(50); reject an over-long name
+  // up front (matching the name actually sent to the backend below) instead of
+  // failing late after databases are cloned and the git branch is created.
+  const effectiveName = opts.createWorkspaceName ?? workspaceName ?? trueWorkspaceId;
+  if (effectiveName.length > 50) {
+    throw new Error(
+      `Fork workspace name is too long (${effectiveName.length} chars; max 50). Choose a shorter name.`
+    );
+  }
   let alreadyExists = false;
   try {
     alreadyExists = await wmill.existsWorkspace({
@@ -381,7 +411,7 @@ async function createWorkspaceFork(
 
   log.info(`${checkoutHint}
 
-When doing operations on the forked workspace, it will use the remote setup in the workspaces section for the branch it was forked from.
+While on the branch \`${newBranchName}\`, every wmill command (sync pull/push, script run, ...) automatically targets the fork workspace \`${trueWorkspaceId}\` — no --workspace flag or profile switch needed. The remote comes from the base branch \`${clonedBranchName}\`'s entry in wmill.yaml's workspaces section, and auth is reused from that workspace's saved profile.
 
 To merge changes back to the parent workspace, you can:
   - Use the CLI: ` + colors.white(`git checkout ${newBranchName} && wmill workspace merge`) + `
diff --git a/cli/src/commands/workspace/merge.ts b/cli/src/commands/workspace/merge.ts
index b8ef24f7d4..585772a9d0 100644
--- a/cli/src/commands/workspace/merge.ts
+++ b/cli/src/commands/workspace/merge.ts
@@ -11,10 +11,12 @@ import {
   deleteItemInWorkspace,
   getOnBehalfOf,
   isTriggerOrScheduleKind,
+  parseDatatableMigrationDeployPath,
   type DeployKind,
   type DeployProvider,
   type TriggerDeployKind,
 } from "../../../windmill-utils-internal/src/deploy.ts";
+import { offerToRunNewMigrations } from "../datatable_migrations.ts";
 
 // ---------------------------------------------------------------------------
 // Provider adapter — wraps CLI's standalone API functions
@@ -85,6 +87,10 @@ const provider: DeployProvider = {
   createSchedule: wmill.createSchedule,
   updateSchedule: wmill.updateSchedule,
   deleteSchedule: wmill.deleteSchedule,
+  // Datatable migrations
+  listDatatableMigrations: wmill.listDatatableMigrations,
+  upsertDatatableMigration: wmill.upsertDatatableMigration,
+  deleteDatatableMigration: wmill.deleteDatatableMigration,
 };
 
 /**
@@ -530,6 +536,14 @@ async function mergeWorkspaces(
   // 10. Deploy
   let successCount = 0;
   let failCount = 0;
+  // Datatable migrations deployed (not deleted) into the target. Deploying a
+  // migration only upserts its definition — the target schema is unchanged until
+  // the migration is run — so offer to run them afterwards (like the push path).
+  const deployedMigrations: {
+    datatable: string;
+    timestamp: number;
+    name: string;
+  }[] = [];
 
   for (const diff of sorted) {
     const label = `${diff.kind}:${diff.path}`;
@@ -573,6 +587,12 @@ async function mergeWorkspaces(
     if (result.success) {
       log.info(colors.green(`  ✓ ${label}`));
       successCount++;
+      if (
+        !itemDeletedInSource &&
+        (diff.kind as DeployKind) === "datatable_migration"
+      ) {
+        deployedMigrations.push(parseDatatableMigrationDeployPath(diff.path));
+      }
     } else {
       log.info(colors.red(`  ✗ ${label}: ${result.error}`));
       failCount++;
@@ -606,6 +626,18 @@ async function mergeWorkspaces(
       )
     );
   }
+
+  // 13. Deployed migration definitions don't touch the target schema until run;
+  // offer to run them on the target now (interactive only, like the push path).
+  if (deployedMigrations.length > 0) {
+    try {
+      await offerToRunNewMigrations(workspaceTo, deployedMigrations, {
+        yes: opts.yes,
+      });
+    } catch (e) {
+      log.warn(colors.yellow(`Failed to run deployed migrations: ${e}`));
+    }
+  }
 }
 
 export { mergeWorkspaces };
diff --git a/cli/src/commands/workspace/workspace.ts b/cli/src/commands/workspace/workspace.ts
index 5628213b75..9e12afe54f 100644
--- a/cli/src/commands/workspace/workspace.ts
+++ b/cli/src/commands/workspace/workspace.ts
@@ -86,6 +86,29 @@ export async function getWorkspaceByName(
   return undefined;
 }
 
+// When the current git branch is a fork branch (wm-fork/<base>/<id>), commands
+// resolve the fork workspace from the branch name and ignore the active
+// profile — surface that wherever we display the active workspace, so users
+// don't act on the wrong "Active:" line.
+async function forkBranchAutoTargetNote(): Promise<string | undefined> {
+  const {
+    getCurrentGitBranch,
+    getOriginalBranchForWorkspaceForks,
+    getWorkspaceIdForWorkspaceForkFromBranchName,
+  } = await import("../../utils/git.ts");
+  const branch = getCurrentGitBranch();
+  if (!branch || !getOriginalBranchForWorkspaceForks(branch)) {
+    return undefined;
+  }
+  const forkWorkspaceId = getWorkspaceIdForWorkspaceForkFromBranchName(branch);
+  if (!forkWorkspaceId) {
+    return undefined;
+  }
+  return (
+    `Note: you are on fork branch \`${branch}\` — wmill commands automatically target the fork workspace \`${forkWorkspaceId}\` here, regardless of the active profile. Use --workspace to override.`
+  );
+}
+
 export async function list(opts: GlobalOptions) {
   const workspaces = await allWorkspaces(opts.configDir);
   const activeName = await getActiveWorkspaceName(opts);
@@ -107,6 +130,11 @@ export async function list(opts: GlobalOptions) {
     .render();
 
   log.info("Active: " + colors.green.bold(activeName || "none"));
+
+  const forkNote = await forkBranchAutoTargetNote();
+  if (forkNote) {
+    log.info(colors.yellow(forkNote));
+  }
 }
 
 async function switchC(opts: GlobalOptions, workspaceName: string) {
@@ -140,6 +168,10 @@ async function switchC(opts: GlobalOptions, workspaceName: string) {
       `Switched to workspace ${workspaceName} (${workspace?.workspaceId} on ${workspace?.remote})`
     )
   );
+  const forkNote = await forkBranchAutoTargetNote();
+  if (forkNote) {
+    log.info(colors.yellow(forkNote));
+  }
   return;
 }
 
@@ -669,6 +701,26 @@ async function bind(
     }
     (config.workspaces as any)[wsName] = entry;
 
+    // Drop empty `{}` placeholder entries (older `wmill init` scaffolded one):
+    // they resolve to nothing (no baseUrl) yet count as configured workspaces,
+    // so leaving one beside the real binding makes every later command demand
+    // --workspace to disambiguate.
+    for (const [name, e] of Object.entries(
+      config.workspaces as Record<string, unknown>
+    )) {
+      if (
+        name !== wsName &&
+        !!e &&
+        typeof e === "object" &&
+        Object.keys(e).length === 0
+      ) {
+        delete (config.workspaces as any)[name];
+        log.info(
+          colors.gray(`Removed empty placeholder workspace entry '${name}'`)
+        );
+      }
+    }
+
     log.info(
       colors.green(
         `✓ Bound workspace '${wsName}'` +
@@ -801,7 +853,15 @@ const command = new Command()
   .option("--workspace <name:string>", "Workspace to unbind")
   .action((opts) => bind(opts as any, false))
   .command("fork")
-  .description("Create a forked workspace")
+  .description(
+    `Create a forked workspace from its parent workspace.
+
+The parent is resolved from your current git branch, not from the active profile: run this from a git repo checked out on the branch mapped to the parent workspace in wmill.yaml's \`workspaces:\` section (a fork branch of it resolves to the same parent). \`wmill workspace switch\` does not change which workspace is forked.
+
+Arguments (omit both to be prompted interactively):
+  [workspace_name]  Friendly display name for the fork, shown in the UI. May contain spaces, so quote it in the shell (e.g. "My Fork"). Max 50 chars. Defaults to "<parent workspace name>'s fork".
+  [workspace_id]    Id for the fork. Must be a slug (no spaces or special characters) and is automatically prefixed with \`wm-fork-\`, so pass just the bare slug (e.g. \`my-fork\` becomes \`wm-fork-my-fork\`). This id also determines the fork's git branch name. Defaults to a slug derived from the name — or, when you are converting an existing branch into the fork branch, from that branch.`
+  )
   .arguments("[workspace_name:string] [workspace_id:string]")
   .option(
     "--create-workspace-name <workspace_name:string>",
@@ -819,7 +879,7 @@ const command = new Command()
   .option("-y --yes", "Skip interactive prompts (defaults datatable behavior to 'skip'). On a non-base branch, requires --from-branch since the base branch can't be prompted for.")
   .action(createWorkspaceFork as any)
   .command("delete-fork")
-  .description("Delete a forked workspace and git branch")
+  .description("Delete a forked workspace")
   .arguments("<fork_name:string>")
   .option("-y --yes", "Skip confirmation prompt")
   .action(deleteWorkspaceFork as any)
diff --git a/cli/src/core/auth.ts b/cli/src/core/auth.ts
index b3496d3cb8..bee70aef28 100644
--- a/cli/src/core/auth.ts
+++ b/cli/src/core/auth.ts
@@ -104,25 +104,25 @@ export async function requireLogin(
           // 403 means the token authenticated but lacks scope — re-issuing
           // won't help. Keep this distinct from the 401 message so the user
           // doesn't waste time reproducing the token.
-          log.info(colors.red(
+          log.infoStderr(colors.red(
             `Permission denied: the token is valid but lacks the required scope.${bodyStr ? `\n${bodyStr}` : ""}`
           ));
         } else if (status === 401) {
-          log.info(colors.red(
+          log.infoStderr(colors.red(
             `Could not authenticate with the provided credentials. Please check your --token and --base-url and try again.${bodyStr ? `\n${bodyStr}` : ""}`
           ));
         } else {
-          log.info(colors.red(
+          log.infoStderr(colors.red(
             `Request failed (${status ?? "unknown"}): ${bodyStr}`
           ));
         }
         return process.exit(1);
       }
-      log.info(colors.red("Could not authenticate with the provided credentials. Please check your --token and --base-url and try again."));
+      log.infoStderr(colors.red("Could not authenticate with the provided credentials. Please check your --token and --base-url and try again."));
       return process.exit(1);
     }
 
-    log.info(
+    log.infoStderr(
       "! Could not reach API given existing credentials. Attempting to reauth..."
     );
     const newToken = await loginInteractive(workspace.remote);
diff --git a/cli/src/core/conf.ts b/cli/src/core/conf.ts
index c4fda73b1b..0129a4fd18 100644
--- a/cli/src/core/conf.ts
+++ b/cli/src/core/conf.ts
@@ -405,7 +405,9 @@ export async function validateBranchConfiguration(
 
   let currentBranch: string | null;
   if (originalBranchIfForked) {
-    log.info(
+    // The fork targeting itself is announced by tryResolveBranchWorkspace;
+    // this validation detail stays at debug to avoid a near-duplicate line.
+    log.debug(
       `Workspace fork detected from branch name \`${rawBranch}\`. Validating workspace configuration using original branch \`${originalBranchIfForked}\``
     );
     currentBranch = originalBranchIfForked;
@@ -563,7 +565,7 @@ export async function getEffectiveSettings(
 
     const branch = originalBranchIfForked ?? rawGitBranch;
     if (originalBranchIfForked) {
-      log.info(
+      log.debug(
         `Using overrides from original branch \`${originalBranchIfForked}\``
       );
     }
diff --git a/cli/src/core/constants.ts b/cli/src/core/constants.ts
index fea36a37a2..0d547cb8ac 100644
--- a/cli/src/core/constants.ts
+++ b/cli/src/core/constants.ts
@@ -10,4 +10,4 @@ export const WM_FORK_PREFIX = "wm-fork";
 // (e.g. utils.ts) can read it without importing main.ts and creating a circular
 // dependency (main → workspace → utils → main) that triggers a TDZ.
 // Re-exported from main.ts for backwards compatibility.
-export const VERSION = "1.733.1";
+export const VERSION = "1.753.0";
diff --git a/cli/src/core/context.ts b/cli/src/core/context.ts
index a4ec705473..6440213d5c 100644
--- a/cli/src/core/context.ts
+++ b/cli/src/core/context.ts
@@ -57,7 +57,7 @@ async function selectFromMultipleProfiles(
       (p) => p.name === lastUsedProfileName
     );
     if (lastUsedProfile) {
-      log.info(
+      log.infoStderr(
         colors.green(
           `Using last used profile '${lastUsedProfile.name}' for ${context}`
         )
@@ -69,7 +69,7 @@ async function selectFromMultipleProfiles(
   // No last used or it no longer exists - prompt for selection
   if (!!!process.stdin.isTTY || !!!process.stdout.isTTY) {
     const selectedProfile = profiles[0];
-    log.info(
+    log.infoStderr(
       colors.yellow(
         `Multiple profiles found for ${context}. Using first available profile: '${selectedProfile.name}'`
       )
@@ -87,7 +87,7 @@ async function selectFromMultipleProfiles(
     return selectedProfile;
   }
 
-  log.info(
+  log.infoStderr(
     colors.yellow(`\nMultiple workspace profiles found for ${context}:`)
   );
 
@@ -125,14 +125,14 @@ async function createWorkspaceProfileInteractively(
 ): Promise<Workspace | undefined> {
   // Log appropriate message based on context
   if (!context.isForked) {
-    log.info(
+    log.infoStderr(
       colors.yellow(
         `\nNo workspace profile found for branch '${context.rawBranch}'\n` +
           `(${normalizedBaseUrl}, ${workspaceId})`
       )
     );
   } else {
-    log.info(
+    log.infoStderr(
       colors.yellow(
         `\nNo workspace profile was found for this forked workspace\n` +
           `(${normalizedBaseUrl}, ${workspaceId})`
@@ -141,7 +141,7 @@ async function createWorkspaceProfileInteractively(
   }
 
   if (!!!process.stdin.isTTY || !!!process.stdout.isTTY) {
-    log.info(
+    log.infoStderr(
       "Not a TTY, cannot create profile interactively. Use 'wmill workspace add' first."
     );
     return undefined;
@@ -187,12 +187,12 @@ async function createWorkspaceProfileInteractively(
     opts.configDir
   );
 
-  log.info(
+  log.infoStderr(
     colors.green(
       `✓ Created profile '${profileName}' for ${workspaceId} on ${normalizedBaseUrl}`
     )
   );
-  log.info(colors.green(`✓ Profile '${profileName}' is now active`));
+  log.infoStderr(colors.green(`✓ Profile '${profileName}' is now active`));
 
   return newWorkspace;
 }
@@ -244,7 +244,7 @@ async function tryResolveWorkspace(
               `workspace '${opts.workspace}'`,
               opts.configDir
             );
-        log.info(
+        log.infoStderr(
           colors.green(
             `Using workspace profile '${selected.name}' for workspace '${opts.workspace}' (${workspaceId} on ${normalizedBaseUrl})`
           )
@@ -254,7 +254,7 @@ async function tryResolveWorkspace(
       }
 
       // No matching profile — offer to create one
-      log.info(
+      log.infoStderr(
         `No profile found for workspace '${opts.workspace}' (${workspaceId} on ${normalizedBaseUrl})`
       );
       const ws = await createWorkspaceProfileInteractively(
@@ -309,7 +309,7 @@ export async function tryResolveBranchWorkspace(
     wsEntry = config.workspaces?.[workspaceNameOverride] as WorkspaceEntryConfig | undefined;
     if (wsEntry) {
       wsName = workspaceNameOverride;
-      log.info(`Using workspace override: ${workspaceNameOverride}`);
+      log.infoStderr(`Using workspace override: ${workspaceNameOverride}`);
     }
   } else {
     // Only try branch-based resolution if in a Git repository
@@ -326,12 +326,9 @@ export async function tryResolveBranchWorkspace(
     workspaceIdIfForked =
       getWorkspaceIdForWorkspaceForkFromBranchName(rawBranch);
 
+    // The "matched via fork branch" reason logged below already explains the
+    // base-branch lookup, so no extra message here.
     const branchToLookup = originalBranchIfForked ?? rawBranch;
-    if (originalBranchIfForked) {
-      log.info(
-        `Using original branch \`${originalBranchIfForked}\` for finding workspace from workspaces section in wmill.yaml`
-      );
-    }
 
     const match = findWorkspaceByGitBranch(config.workspaces, branchToLookup);
     if (match) {
@@ -346,7 +343,7 @@ export async function tryResolveBranchWorkspace(
   if (!wsEntry.baseUrl) {
     if (workspaceNameOverride) {
       // User explicitly asked for this workspace but it has no baseUrl
-      log.warn(
+      log.warnStderr(
         `⚠️  Workspace '${wsName}' has no baseUrl configured. Cannot resolve a profile.\n` +
         `   Add baseUrl to workspace '${wsName}' in wmill.yaml, or use --base-url flag.`
       );
@@ -370,9 +367,9 @@ export async function tryResolveBranchWorkspace(
     reason = `matched current git branch '${rawBranch}'`;
   }
 
-  log.info(
-    `Using workspace '${wsName}' (${reason}) → ${workspaceId} on ${baseUrl}`
-  );
+  // Printed as part of the single final targeting line on the happy paths;
+  // logged up front only when an interactive flow needs the context first.
+  const workspaceLine = `Using workspace '${wsName}' (${reason}) → ${workspaceId} on ${baseUrl}`;
 
   let normalizedBaseUrl: string;
   try {
@@ -390,27 +387,34 @@ export async function tryResolveBranchWorkspace(
     (w) => w.remote === normalizedBaseUrl && w.workspaceId === workspaceId
   );
 
+  // Every branch below must flow into the shared fork handling at the end —
+  // returning a profile directly would hand back the parent workspace profile
+  // on a fork branch.
+  let selectedProfile: Workspace;
+  let profileNote: string;
+  // Set when workspaceLine was already printed as context for the interactive
+  // profile-creation flow, so it isn't printed a second time at the end.
+  let workspaceLinePrinted = false;
+
   if (matchingProfiles.length === 0) {
     // No matching profile exists - prompt to create one
-    return await createWorkspaceProfileInteractively(
+    log.infoStderr(workspaceLine);
+    workspaceLinePrinted = true;
+    const created = await createWorkspaceProfileInteractively(
       normalizedBaseUrl,
       workspaceId,
       wsName,
       opts,
       { rawBranch: rawBranch ?? wsName, isForked: !!originalBranchIfForked }
     );
-  }
-
-  // Handle multiple profiles
-  let selectedProfile: Workspace;
-
-  if (matchingProfiles.length === 1) {
+    if (!created) {
+      return undefined;
+    }
+    selectedProfile = created;
+    profileNote = `profile '${selectedProfile.name}'`;
+  } else if (matchingProfiles.length === 1) {
     selectedProfile = matchingProfiles[0];
-    log.info(
-      colors.green(
-        `Using workspace profile '${selectedProfile.name}' for workspace '${wsName}' with workspace id \`${workspaceId}\``
-      )
-    );
+    profileNote = `profile '${selectedProfile.name}'`;
   } else {
     const lastUsedName = await getLastUsedProfile(
       wsName,
@@ -418,50 +422,45 @@ export async function tryResolveBranchWorkspace(
       workspaceId,
       opts.configDir
     );
+    const lastUsedProfile = lastUsedName
+      ? matchingProfiles.find((p) => p.name === lastUsedName)
+      : undefined;
 
-    if (lastUsedName) {
-      const lastUsedProfile = matchingProfiles.find(
-        (p) => p.name === lastUsedName
+    if (lastUsedProfile) {
+      selectedProfile = lastUsedProfile;
+      profileNote = `last used profile '${selectedProfile.name}'`;
+    } else {
+      // selectFromMultipleProfiles prints its own context header, and the
+      // final summary line below names the chosen profile.
+      selectedProfile = await selectFromMultipleProfiles(
+        matchingProfiles,
+        normalizedBaseUrl,
+        workspaceId,
+        `workspace '${wsName}'`,
+        opts.configDir
       );
-      if (lastUsedProfile) {
-        log.info(
-          colors.green(
-            `Using workspace profile '${lastUsedProfile.name}' for workspace '${wsName}' (last used)`
-          )
-        );
-        return lastUsedProfile;
-      }
+
+      await setLastUsedProfile(
+        wsName,
+        normalizedBaseUrl,
+        workspaceId,
+        selectedProfile.name,
+        opts.configDir
+      );
+      profileNote = `profile '${selectedProfile.name}'`;
     }
-
-    selectedProfile = await selectFromMultipleProfiles(
-      matchingProfiles,
-      normalizedBaseUrl,
-      workspaceId,
-      `workspace '${wsName}'`,
-      opts.configDir
-    );
-
-    await setLastUsedProfile(
-      wsName,
-      normalizedBaseUrl,
-      workspaceId,
-      selectedProfile.name,
-      opts.configDir
-    );
-
-    log.info(
-      colors.green(
-        `Using workspace profile '${selectedProfile.name}' for workspace '${wsName}'`
-      )
-    );
   }
 
   if (workspaceIdIfForked) {
     selectedProfile.name = `${selectedProfile.name}/${workspaceIdIfForked}`;
     selectedProfile.workspaceId = workspaceIdIfForked;
-    log.info(
-      `Using fork workspace \`${workspaceIdIfForked}\` (parent: \`${workspaceId}\`) from branch \`${rawBranch}\``
+    log.infoStderr(
+      colors.green(
+        `Automatically targeting fork workspace \`${workspaceIdIfForked}\` (fork of \`${workspaceId}\` on ${baseUrl}, ${profileNote}), resolved from git branch \`${rawBranch}\`. Use --workspace to override.`
+      )
     );
+  } else if (!workspaceLinePrinted) {
+    log.infoStderr(`${workspaceLine} (${profileNote})`);
   }
 
   return selectedProfile;
@@ -480,7 +479,7 @@ export async function resolveWorkspace(
       try {
         normalizedBaseUrl = new URL(opts.baseUrl).toString();
       } catch (error) {
-        log.info(colors.red(`Invalid base URL: ${opts.baseUrl}`));
+        log.infoStderr(colors.red(`Invalid base URL: ${opts.baseUrl}`));
         return process.exit(-1);
       }
 
@@ -514,7 +513,7 @@ export async function resolveWorkspace(
 
         if (existingWorkspace) {
           if (existingWorkspace.remote !== normalizedBaseUrl) {
-            log.info(
+            log.infoStderr(
               colors.red(
                 `Base URL mismatch: --base-url is ${normalizedBaseUrl} but workspace profile "${opts.workspace}" uses ${existingWorkspace.remote}`
               )
@@ -535,7 +534,7 @@ export async function resolveWorkspace(
         token: opts.token,
       };
     } else {
-      log.info(
+      log.infoStderr(
         colors.red(
           "If you specify a base URL with --base-url, you must also specify a workspace (--workspace) and token (--token)."
         )
@@ -555,8 +554,8 @@ export async function resolveWorkspace(
     if (workspaceNameOverride || opts.workspace || !branch || !branch.startsWith(WM_FORK_PREFIX)) {
       return workspace;
     } else {
-      log.info(
-        `Found an active workspace \`${workspace.name}\` but the branch name indicates this is a forked workspace. Ignoring active workspace and trying to resolve the correct workspace from the branch name \`${branch}\`. Use --workspace to override.`
+      log.infoStderr(
+        `You are on fork branch \`${branch}\`, which takes precedence over the active workspace profile \`${workspace.name}\`: resolving the fork workspace from the branch name instead. Use --workspace to override.`
       );
     }
   } else if (opts.workspace) {
@@ -572,9 +571,9 @@ export async function resolveWorkspace(
     if (suggestions.length > 0) {
       msg += ` Did you mean: ${suggestions.map((s) => `"${s.name}"`).join(", ")}?`;
     }
-    log.info(colors.red.bold(msg));
+    log.infoStderr(colors.red.bold(msg));
     if (profiles.length > 0) {
-      log.info("\nAvailable workspaces:");
+      log.infoStderr("\nAvailable workspaces:");
       new Table()
         .header(["name", "remote", "workspace id"])
         .padding(2)
@@ -620,12 +619,12 @@ export async function resolveWorkspace(
 
     if (wsNames.length === 1) {
       pickedWsName = wsNames[0];
-      log.info(
+      log.infoStderr(
         `Auto-selected workspace '${pickedWsName}' (only workspace in config).\n` +
         `Use --workspace to override or 'wmill workspace bind' to add more workspaces.`
       );
     } else if (process.stdin.isTTY) {
-      log.info(
+      log.infoStderr(
         `Multiple workspaces configured but none matched the current context.\n` +
         `Configured workspaces:\n${wsListStr}\n` +
         `Use --workspace to skip this prompt.`
@@ -675,7 +674,7 @@ export async function resolveWorkspace(
     try {
       normalizedBaseUrl = new URL(envBaseUrl).toString();
     } catch {
-      log.info(colors.red(`Invalid BASE_INTERNAL_URL: ${envBaseUrl}`));
+      log.infoStderr(colors.red(`Invalid BASE_INTERNAL_URL: ${envBaseUrl}`));
       return process.exit(-1);
     }
     log.debug(
@@ -691,7 +690,7 @@ export async function resolveWorkspace(
     return ws;
   }
 
-  log.info(colors.red.bold("No workspace given and no default set. Run 'wmill workspace add' to configure one."));
+  log.infoStderr(colors.red.bold("No workspace given and no default set. Run 'wmill workspace add' to configure one."));
   return process.exit(-1);
 }
 
@@ -746,7 +745,7 @@ export async function tryResolveVersion(
 
 export function validatePath(path: string): boolean {
   if (!(path.startsWith("g") || path.startsWith("u") || path.startsWith("f"))) {
-    log.info(
+    log.infoStderr(
       colors.red(
         "Given remote path looks invalid. Remote paths are typically of the form <u|g|f>/<username|group|folder>/..."
       )
diff --git a/cli/src/core/log.ts b/cli/src/core/log.ts
index 034e13e3e1..e78450597f 100644
--- a/cli/src/core/log.ts
+++ b/cli/src/core/log.ts
@@ -21,11 +21,26 @@ export function info(msg: unknown) {
   console.log(`\x1b[34m${String(msg)}\x1b[39m`);
 }
 
+// Like `info` but written to stderr, for diagnostics (e.g. the workspace-profile
+// banner printed on every command) that must not pollute stdout when a command's
+// data output is piped or redirected (e.g. `wmill variable get path > file`).
+export function infoStderr(msg: unknown) {
+  if (silentMode) return;
+  console.error(`\x1b[34m${String(msg)}\x1b[39m`);
+}
+
 export function warn(msg: unknown) {
   if (silentMode) return;
   console.log(`\x1b[33m${String(msg)}\x1b[39m`);
 }
 
+// Like `warn` but written to stderr; see `infoStderr` for why diagnostics must
+// not land on stdout.
+export function warnStderr(msg: unknown) {
+  if (silentMode) return;
+  console.error(`\x1b[33m${String(msg)}\x1b[39m`);
+}
+
 export function error(msg: unknown) {
   console.error(`\x1b[31m${String(msg)}\x1b[39m`);
 }
diff --git a/cli/src/core/login.ts b/cli/src/core/login.ts
index f6034b3add..e6a06e8383 100644
--- a/cli/src/core/login.ts
+++ b/cli/src/core/login.ts
@@ -10,7 +10,7 @@ import * as http from "node:http";
 export async function loginInteractive(remote: string) {
   let token: string | undefined;
   if (!process.stdin.isTTY) {
-    log.info("Not a TTY, can't login interactively.");
+    log.infoStderr("Not a TTY, can't login interactively.");
     return undefined;
   }
   if (
@@ -55,7 +55,7 @@ export async function browserLogin(
   const port = await getPort.default({ port: env });
 
   if (port == undefined) {
-    log.info(colors.red.underline("failed to aquire port"));
+    log.infoStderr(colors.red.underline("failed to aquire port"));
     return undefined;
   }
 
@@ -79,7 +79,7 @@ export async function browserLogin(
     });
 
     const url = `${baseUrl}user/cli?port=${port}`;
-    log.info(`Login by going to ${url}`);
+    log.infoStderr(`Login by going to ${url}`);
 
     try {
       open.default(url).catch((error) => {
@@ -88,7 +88,7 @@ export async function browserLogin(
         );
       });
 
-      log.info("Opened browser for you");
+      log.infoStderr("Opened browser for you");
     } catch (error) {
       console.error(
         `Failed to open browser, please navigate to ${url}, error: ${error}`
diff --git a/cli/src/guidance/core.ts b/cli/src/guidance/core.ts
index cd9ba686ef..1d060a58cb 100644
--- a/cli/src/guidance/core.ts
+++ b/cli/src/guidance/core.ts
@@ -177,6 +177,8 @@ Just run \`wmill workspace fork\` — it adapts to where you are:
 
 For non-interactive runs from a working branch, pass \`--from-branch <base>\` to skip the prompts. The CLI refuses to rename a base branch.
 
+While a \`wm-fork/<base>/<id>\` branch is checked out, every wmill command automatically targets the fork workspace (resolved from the branch name), reusing the base branch workspace's remote (from wmill.yaml) and its saved profile's auth — no \`--workspace\` flag or profile switch needed. Pass \`--workspace\` to target a different workspace explicitly.
+
 Merge a fork back into its parent with \`wmill workspace merge\` (or the Merge UI on the fork's home page). Full reference: https://www.windmill.dev/docs/advanced/workspace_forks
 
 ## Debugging Jobs
diff --git a/cli/src/guidance/skills.gen.ts b/cli/src/guidance/skills.gen.ts
index 1e6202b443..e24ad8d0d1 100644
--- a/cli/src/guidance/skills.gen.ts
+++ b/cli/src/guidance/skills.gen.ts
@@ -580,25 +580,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -617,9 +619,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -646,25 +649,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -672,9 +677,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -994,13 +1000,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -1070,6 +1069,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (\`s3://storage/key\`, \`s3:///key\`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -1102,6 +1112,29 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize \`selectSql\` into a ducklake table for one
+ * partition (or the whole table when \`partition\` is omitted) — the client-side
+ * equivalent of the \`// materialize\` engine.
+ * With \`uniqueKey\` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → \`CREATE OR REPLACE\`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.upsertPartition({ table, selectSql, partition }).execute()\`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.appendPartition({ table, selectSql, partition }).execute()\`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
 `,
   "write-script-bunnative": `---
 name: write-script-bunnative
@@ -1311,25 +1344,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -1348,9 +1383,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -1377,25 +1413,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -1403,9 +1441,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -1725,13 +1764,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -1801,6 +1833,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (\`s3://storage/key\`, \`s3:///key\`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -1833,6 +1876,29 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize \`selectSql\` into a ducklake table for one
+ * partition (or the whole table when \`partition\` is omitted) — the client-side
+ * equivalent of the \`// materialize\` engine.
+ * With \`uniqueKey\` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → \`CREATE OR REPLACE\`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.upsertPartition({ table, selectSql, partition }).execute()\`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.appendPartition({ table, selectSql, partition }).execute()\`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
 `,
   "write-script-csharp": `---
 name: write-script-csharp
@@ -2134,25 +2200,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -2171,9 +2239,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -2200,25 +2269,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -2226,9 +2297,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -2548,13 +2620,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -2624,6 +2689,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (\`s3://storage/key\`, \`s3:///key\`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -2656,6 +2732,29 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize \`selectSql\` into a ducklake table for one
+ * partition (or the whole table when \`partition\` is omitted) — the client-side
+ * equivalent of the \`// materialize\` engine.
+ * With \`uniqueKey\` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → \`CREATE OR REPLACE\`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.upsertPartition({ table, selectSql, partition }).execute()\`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.appendPartition({ table, selectSql, partition }).execute()\`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
 `,
   "write-script-duckdb": `---
 name: write-script-duckdb
@@ -3800,27 +3899,27 @@ def create_token(duration = dt.timedelta(days=1)) -> str
 # Create a script job and return its job id.
 # 
 # .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.
-def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by path and return its job id.
-def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by hash and return its job id.
-def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a flow job and return its job id.
-def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True) -> str
+def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True, tag: str = None) -> str
 
 # Run script synchronously and return its result.
 # 
 # .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
-def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by path synchronously and return its result.
-def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by hash synchronously and return its result.
-def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run a script on the current worker without creating a job.
 # 
@@ -4238,10 +4337,11 @@ def get_version() -> str
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Run a script synchronously by path and return its result.
 # 
@@ -4252,10 +4352,11 @@ def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = Fals
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Convenient helpers that takes an S3 resource as input and returns the settings necessary to
 # initiate an S3 connection from DuckDB
@@ -4278,7 +4379,11 @@ def get_state_path() -> str
 # Parse resource syntax from string.
 def parse_resource_syntax(s: str) -> Optional[str]
 
-# Parse S3 object from string or S3Object format.
+# Parse S3 object from a \`s3://<storage>/<key>\` URI string (\`s3:///<key>\`
+# for the default storage) or S3Object format. Any other string raises
+# rather than falling back to an auto-generated key: an auto key is
+# requested by omitting the object, and a fallback would silently misplace
+# the upload on any typo.
 def parse_s3_object(s3_object: S3Object | str) -> S3Object
 
 # Parse variable syntax from string.
@@ -4306,6 +4411,27 @@ def stream_result(stream) -> None
 #     SqlQuery instance for fetching results
 def query(sql: str, *args) -> SqlQuery
 
+# Idempotently materialize the rows of \`select_sql\` into ducklake
+# \`table\` for one \`partition\` (or the whole table when \`partition\` is
+# None). Client-side equivalent of the \`// materialize\` engine: with
+# \`unique_key\` it upserts within the slice (delete-by-key + insert);
+# without it, it replaces (whole table → CREATE OR REPLACE; partition →
+# delete the partition + insert). Re-running the same slice is safe — the
+# backfill / failure-recovery contract.
+# 
+# The partition value is bound as a DuckDB arg (never string-interpolated)
+# so it cannot inject SQL. \`select_sql\` is trusted (your own query).
+def upsert_partition(table: str, select_sql: str, partition: str = None, unique_key: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# INSERT-only materialization (no dedup / no replace) for an immutable
+# event-log table — for one \`partition\`, or the whole table when
+# \`partition\` is None. NOTE: unlike \`upsert_partition\`, re-running the same
+# slice duplicates rows — use only for append-only sources.
+def append_partition(table: str, select_sql: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# Read a materialized ducklake table, optionally a single partition.
+def read(table: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
 # Execute query and fetch results.
 # 
 # Args:
@@ -5025,8 +5151,11 @@ input_transforms:
 
 ## Approval / Suspend Structure
 
+An approval step is a normal **script** step (\`type: rawscript\` or \`type: script\`) that is turned into an approval by adding a module-level \`suspend\`. Its script calls \`wmill.getResumeUrls(approver)\` to generate the secret resume/cancel URLs and returns them so they can be sent to the approver(s) (Slack, email, etc.) or approved from the run page.
+
 - \`suspend\` belongs on the flow module object itself, as a sibling of \`id\` and \`value\`
 - Never put \`suspend\` inside \`value\`
+- Do NOT use \`type: identity\` for an approval step. An identity step suspends but never produces the resume URLs, so approvers have no link to act on — it is not a functional approval.
 
 Correct shape:
 
@@ -5042,10 +5171,23 @@ Correct shape:
             type: string
         required: [comment]
   value:
-    type: identity
+    type: rawscript
+    language: bun
+    input_transforms:
+      approver:
+        type: static
+        value: ''
+    content: |
+      import * as wmill from "windmill-client"
+
+      export async function main(approver?: string) {
+        const urls = await wmill.getResumeUrls(approver)
+        // send urls.resume / urls.cancel to the approver(s), e.g. via Slack or email
+        return urls
+      }
 \`\`\`
 
-Incorrect shape:
+Incorrect shape (suspend misplaced inside \`value\`):
 
 \`\`\`yaml
 - id: request_approval
@@ -5055,6 +5197,16 @@ Incorrect shape:
       required_events: 1
 \`\`\`
 
+Incorrect shape (identity has no resume URLs — not a real approval):
+
+\`\`\`yaml
+- id: request_approval
+  suspend:
+    required_events: 1
+  value:
+    type: identity
+\`\`\`
+
 ## Branch Result Scope Rules
 
 - Inside a branch, you may reference earlier outer steps and earlier steps in the same branch
@@ -5181,7 +5333,7 @@ Reference a specific resource using \`$res:\` prefix:
 
 ## OpenFlow Schema
 
-{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \\"yellow\\", \\"#ffff00\\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \\u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\\nValid values: 'text' (default) - plain text response, 'image' - image generation\\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\\nFormat: Array<{ bucket: string, key: string }> - S3 object references\\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\\nRange: 0.0 to 2.0 (provider-dependent)\\n- 0.0 = deterministic, focused responses\\n- 0.7 = balanced (common default)\\n- 1.0+ = more creative/random\\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\\nRange: 1-1000.\\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default \`flow\`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}`,
+{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \\"yellow\\", \\"#ffff00\\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \\u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"},"reasoning_effort":{"type":"string","description":"Provider-native reasoning effort token (e.g. 'low', 'high', 'none') for models that support extended thinking. Optional; unset leaves the provider default."}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\\nValid values: 'text' (default) - plain text response, 'image' - image generation\\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\\nStreaming events include: token_delta, reasoning_token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\\nFormat: Array<{ bucket: string, key: string }> - S3 object references\\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\\nRange: 0.0 to 2.0 (provider-dependent)\\n- 0.0 = deterministic, focused responses\\n- 0.7 = balanced (common default)\\n- 1.0+ = more creative/random\\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\\nRange: 1-1000.\\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default \`flow\`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}`,
   "raw-app": `---
 name: raw-app
 description: MUST use when creating raw apps.
@@ -5435,6 +5587,8 @@ A raw app has three logical parts:
 
 \`index.tsx\` is the bundling entrypoint. It typically renders a top-level \`App\` component. The bundler is esbuild.
 
+**Always begin every React file (\`.tsx\`/\`.jsx\`) that uses JSX with \`import React from 'react'\`.** esbuild uses the classic JSX transform, so \`React\` must be in scope wherever JSX appears — a missing import compiles fine but throws \`React is not defined\` at runtime, leaving a blank screen.
+
 ### Generated bindings (\`wmill.d.ts\` / \`wmill.ts\`)
 
 The frontend imports a generated module that mirrors the backend runnables. **Never write to it directly** — it gets regenerated whenever backend runnables change. Modifying it by hand will be overwritten.
@@ -6465,6 +6619,13 @@ datatable related commands
 - \`datatable run <sql:string>\` - run a SQL query on a datatable
   - \`-n --name <name:string>\` - Datatable name (default: main)
   - \`-s --silent\` - Output only the final result as JSON. Useful for scripting.
+- \`datatable migrate\` - manage datatable migrations
+  - \`datatable migrate new <name:string>\` - scaffold a new migration (.up.sql / .down.sql files)
+    - \`-d --datatable <datatable:string>\` - Target datatable (default: main)
+  - \`datatable migrate up\` - apply all pending migrations to the main datatable (or one via --datatable)
+    - \`-d --datatable <datatable:string>\` - Target datatable (default: main)
+  - \`datatable migrate down\` - roll back the most recent migration on the main datatable (or one via --datatable)
+    - \`-d --datatable <datatable:string>\` - Target datatable (default: main)
 - \`datatable create [name:string]\` - register a datatable database in the workspace (default: instance-backed 'main') so scripts can use datatable://<name>
   - \`--resource <resource:string>\` - Back the datatable with an existing postgresql resource path instead of the instance database
   - \`--force\` - Allow adding to a workspace that already has datatables (fork metadata on existing ones is not preserved)
@@ -6733,19 +6894,18 @@ Manage jobs (list, inspect, cancel)
 
 ### jobs
 
-Pull completed and queued jobs from workspace
-
-**Arguments:** \`[workspace:string]\`
-
-**Options:**
-- \`-c, --completed-output <file:string>\` - Completed jobs output file (default: completed_jobs.json)
-- \`-q, --queued-output <file:string>\` - Queued jobs output file (default: queued_jobs.json)
-- \`--skip-worker-check\` - Skip checking for active workers before export
+Manage jobs (import/export)
 
 **Subcommands:**
 
-- \`jobs pull\`
-- \`jobs push\`
+- \`jobs pull [workspace:string]\` - Pull completed and queued jobs from workspace
+  - \`-c, --completed-output <file:string>\` - Completed jobs output file (default: completed_jobs.json)
+  - \`-q, --queued-output <file:string>\` - Queued jobs output file (default: queued_jobs.json)
+  - \`--skip-worker-check\` - Skip checking for active workers before export
+- \`jobs push [workspace:string]\` - Push completed and queued jobs to workspace
+  - \`-c, --completed-file <file:string>\` - Completed jobs input file (default: completed_jobs.json)
+  - \`-q, --queued-file <file:string>\` - Queued jobs input file (default: queued_jobs.json)
+  - \`--skip-worker-check\` - Skip checking for active workers before import
 
 ### lint
 
@@ -6807,6 +6967,22 @@ inspect asset-driven pipelines (scripts marked \`// pipeline\`, wired by \`// on
   - \`--json\` - Output as JSON (for piping to jq)
 - \`pipeline show <folder:string>\` - render a pipeline folder's DAG (sources, lineage, subscriptions) in the terminal
   - \`--json\` - Output the raw asset graph as JSON
+  - \`--local\` - Build the graph from local working-tree files (// pipeline scripts) instead of the deployed workspace — no deploy needed.
+- \`pipeline run <folder:string>\` - run a cascade: from --from (a root OR any mid-DAG model), fan downstream up to the --to end node(s)
+  - \`--from <script:string>\` - Start script (short name or path). May be any node, including a mid-DAG model — that node plus its transitive downstream runs, upstream is NOT re-run (dbt \`--select model+\`). Defaults to the folder's sole schedule/manual root.
+  - \`--to <node:string>\` - End node(s) to stop at — script names/paths or asset URIs (e.g. datatable://main/staged). Repeatable or comma-separated. Omit to run the full downstream.
+  - \`--dry-run\` - Print the topological run plan without executing.
+  - \`--json\` - Output the plan as JSON (for piping to jq).
+  - \`--local\` - Run the local working-tree scripts via preview (no deploy) instead of the deployed versions; the graph is built from local files.
+  - \`--upload <binding:string>\` - Bind an object to a data_upload/webhook entry point so it runs in the cascade, as SCRIPT[:PARAM]=SOURCE (SOURCE is a local file or an s3://key). Local files are uploaded to the workspace store; the S3Object param is inferred when the script has exactly one. Repeatable.
+  - \`--arg <binding:string>\` - Pass a plain run arg to a script in the cascade, as SCRIPT:PARAM=VALUE (VALUE is parsed as JSON when possible, else taken as a string — e.g. daily_report:partition=2026-07-02). Repeatable.
+  - \`--partition <value:string>\` - Partition value for \`// partitioned\` scripts in the run (e.g. 2026-06-30) — use it to backfill a past slice. With --local, time kinds (daily/hourly/weekly/monthly) default to the current UTC period when omitted; \`dynamic\` always needs it. Deployed runs without it defer to backend run-start resolution.
+- \`pipeline docs <folder:string>\` - generate PIPELINE.md (+ AGENTS.md pointer) describing a folder's pipeline graph and datatable schemas, for an editor / agentic loop
+  - \`--local\` - Build the graph from local working-tree files instead of the deployed workspace.
+- \`pipeline dev [folder:string]\` - Live-preview a data pipeline from local files: watch an \`f/<folder>\` of \`// pipeline\` scripts, push the working-tree graph to the dev page, and run the cascade via preview (no deploy).
+  - \`--port <port:number>\` - Port for the dev WebSocket server.
+  - \`--no-open\` - Do not open the browser automatically.
+  - \`--frontend <origin:string>\` - Origin serving the /pipeline_dev page (e.g. http://localhost:3000 for a locally-run frontend). Defaults to the workspace remote; use it when the remote's deployed frontend predates the dev page.
 
 ### protection-rules
 
@@ -7132,13 +7308,19 @@ workspace related commands
   - \`--branch <branch:string>\` - Git branch to associate (default: workspace name)
 - \`workspace unbind\` - Remove baseUrl and workspaceId from a workspace entry
   - \`--workspace <name:string>\` - Workspace to unbind
-- \`workspace fork [workspace_name:string] [workspace_id:string]\` - Create a forked workspace
+- \`workspace fork [workspace_name:string] [workspace_id:string]\` - Create a forked workspace from its parent workspace.
+
+The parent is resolved from your current git branch, not from the active profile: run this from a git repo checked out on the branch mapped to the parent workspace in wmill.yaml's \`workspaces:\` section (a fork branch of it resolves to the same parent). \`wmill workspace switch\` does not change which workspace is forked.
+
+Arguments (omit both to be prompted interactively):
+  [workspace_name]  Friendly display name for the fork, shown in the UI. May contain spaces, so quote it in the shell (e.g. "My Fork"). Max 50 chars. Defaults to "<parent workspace name>'s fork".
+  [workspace_id]    Id for the fork. Must be a slug (no spaces or special characters) and is automatically prefixed with \`wm-fork-\`, so pass just the bare slug (e.g. \`my-fork\` becomes \`wm-fork-my-fork\`). This id also determines the fork's git branch name. Defaults to a slug derived from the name — or, when you are converting an existing branch into the fork branch, from that branch.
   - \`--create-workspace-name <workspace_name:string>\` - Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.
   - \`--color <color:string>\` - Workspace color (hex code, e.g. #ff0000)
   - \`--datatable-behavior <behavior:string>\` - How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)
   - \`--from-branch <branch:string>\` - Non-interactive override for the 'turn my current working branch into the fork' workflow: base the fork on <branch> (its bound workspace is the parent) and rename the current branch onto wm-fork/<branch>/<id>. Usually unneeded — from a working branch \`wmill workspace fork\` offers this interactively; from a base branch it creates a fresh fork branch.
   - \`-y --yes\` - Skip interactive prompts (defaults datatable behavior to 'skip'). On a non-base branch, requires --from-branch since the base branch can't be prompted for.
-- \`workspace delete-fork <fork_name:string>\` - Delete a forked workspace and git branch
+- \`workspace delete-fork <fork_name:string>\` - Delete a forked workspace
   - \`-y --yes\` - Skip confirmation prompt
 - \`workspace merge\` - Compare and deploy changes between a fork and its parent workspace
   - \`--direction <direction:string>\` - Deploy direction: to-parent or to-fork
diff --git a/cli/src/types.ts b/cli/src/types.ts
index 5de6cea48b..c125ae2c2e 100644
--- a/cli/src/types.ts
+++ b/cli/src/types.ts
@@ -274,10 +274,10 @@ export function parseFromPath(p: string, content: string): any {
   return isWorkspaceDependencies(p)
     ? content
     : p.endsWith(".yaml")
-    ? yamlParseContent(p, content)
-    : p.endsWith(".json")
-    ? JSON.parse(content)
-    : content;
+      ? yamlParseContent(p, content)
+      : p.endsWith(".json")
+        ? JSON.parse(content)
+        : content;
 }
 export function parseFromFile(p: string): any {
   if (p.endsWith(".json")) {
@@ -288,9 +288,38 @@ export function parseFromFile(p: string): any {
     throw new Error("Could not read file " + p);
   }
 }
+/**
+ * Parse a `migrations/datatable/<datatable>/<timestamp>_<name>.(up|down).sql`
+ * path into its parts. Returns undefined for any other path.
+ */
+export function parseDatatableMigrationPath(p: string):
+  | { datatable: string; timestamp: number; name: string; kind: "up" | "down" }
+  | undefined {
+  const parts = p.split("/");
+  if (
+    parts[0] !== "migrations" ||
+    parts[1] !== "datatable" ||
+    parts.length !== 4
+  )
+    return undefined;
+  const m = parts[3].match(/^(\d+)_(.*)\.(up|down)\.sql$/);
+  if (!m) return undefined;
+  return {
+    datatable: parts[2],
+    timestamp: Number(m[1]),
+    name: m[2],
+    kind: m[3] as "up" | "down",
+  };
+}
+
+export function isDatatableMigrationPath(p: string): boolean {
+  return parseDatatableMigrationPath(p) !== undefined;
+}
+
 export function getTypeStrFromPath(
   p: string
 ):
+  | "datatable_migration"
   | "script"
   | "variable"
   | "flow"
@@ -316,6 +345,9 @@ export function getTypeStrFromPath(
   | "settings"
   | "encryption_key"
   | "workspace_dependencies" {
+  if (isDatatableMigrationPath(p)) {
+    return "datatable_migration";
+  }
   if (isScriptModulePath(p)) {
     return "script";
   }
diff --git a/cli/src/utils/resource_types.ts b/cli/src/utils/resource_types.ts
index 741cb9fb71..5bd56c9a8e 100644
--- a/cli/src/utils/resource_types.ts
+++ b/cli/src/utils/resource_types.ts
@@ -1,5 +1,9 @@
 import { Schema, SchemaProperty } from "../../bootstrap/common.ts";
 
+function quotePropName(name: string): string {
+  return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : JSON.stringify(name);
+}
+
 export function compileResourceTypeToTsType(schema: Schema) {
   function rec(x: { [name: string]: SchemaProperty }, root = false) {
     let res = "{\n";
@@ -10,15 +14,15 @@ export function compileResourceTypeToTsType(schema: Schema) {
     let i = 0;
     for (let [name, prop] of entries) {
       if (prop.type == "object") {
-        res += `  ${name}: ${rec(prop.properties ?? {})}`;
+        res += `  ${quotePropName(name)}: ${rec(prop.properties ?? {})}`;
       } else if (prop.type == "array") {
-        res += `  ${name}: ${prop?.items?.type ?? "any"}[]`;
+        res += `  ${quotePropName(name)}: ${prop?.items?.type ?? "any"}[]`;
       } else {
         let typ = prop?.type ?? "any";
         if (typ == "integer") {
           typ = "number";
         }
-        res += `  ${name}: ${typ}`;
+        res += `  ${quotePropName(name)}: ${typ}`;
       }
       i++;
       if (i < entries.length) {
diff --git a/cli/src/utils/upgrade.ts b/cli/src/utils/upgrade.ts
index 44ab0741fd..e72a2a2a93 100644
--- a/cli/src/utils/upgrade.ts
+++ b/cli/src/utils/upgrade.ts
@@ -57,6 +57,64 @@ export class NpmProvider extends Provider {
   async hasRequiredPermissions(): Promise<boolean> {
     return true;
   }
+
+  // Cliffy's default runtime runs `npm install --silent`, so a failed upgrade
+  // throws with an empty message. Override to run npm without --silent and put
+  // the captured output + recovery hint in the error, so failures are actionable.
+  override async upgrade({
+    name,
+    to,
+    main,
+    verbose,
+  }: {
+    name: string;
+    to: string;
+    main?: string;
+    verbose?: boolean;
+  }): Promise<void> {
+    const specifier = this.getSpecifier(name, to, main).replace(/^npm:/, "");
+    const args = ["install", "--global", "--force", specifier];
+    this.logger?.log(`$ npm ${args.join(" ")}`);
+    const { spawn } = await import("node:child_process");
+    const HINT =
+      "If this is a permissions error, retry with sudo, or reinstall with: npm uninstall -g windmill-cli && npm install -g windmill-cli";
+    // `shell: true` so `npm` resolves on Windows (npm.cmd) — same spawn
+    // pattern as commands/app/bundle.ts.
+    const proc = spawn("npm", args, {
+      stdio: [null, "pipe", "pipe"],
+      shell: true,
+    });
+    const output: string[] = [];
+    proc.stdout?.on("data", (d) => {
+      output.push(String(d));
+      if (verbose) process.stdout.write(d);
+    });
+    proc.stderr?.on("data", (d) => {
+      output.push(String(d));
+      if (verbose) process.stderr.write(d);
+    });
+    // `error` fires when npm can't be spawned at all; without a listener that
+    // is an uncaught exception, crashing before any hint prints. `close`
+    // resolves null when npm died from a signal — a failure too.
+    const exitCode: number | null = await new Promise<number | null>(
+      (resolve, reject) => {
+        proc.on("error", reject);
+        proc.on("close", resolve);
+      }
+    ).catch((e) => {
+      throw new Error(
+        `failed to run npm: ${e instanceof Error ? e.message : e}\n\n${HINT}`
+      );
+    });
+    if (exitCode !== 0) {
+      const detail = output.join("").trim();
+      throw new Error(
+        `npm exited with ${
+          exitCode === null ? "a signal" : `code ${exitCode}`
+        }${detail ? `:\n${detail}` : ""}\n\n${HINT}`
+      );
+    }
+  }
 }
 
 type NpmApiPackageMetadata = {
diff --git a/cli/test/datatable_migrations_unit.test.ts b/cli/test/datatable_migrations_unit.test.ts
new file mode 100644
index 0000000000..09af49f890
--- /dev/null
+++ b/cli/test/datatable_migrations_unit.test.ts
@@ -0,0 +1,122 @@
+/**
+ * Unit tests for datatable-migration path parsing and local validation.
+ *
+ * These exercise pure logic with no backend:
+ *  - `parseDatatableMigrationPath` recognizes only the
+ *    `migrations/datatable/<dt>/<timestamp>_<name>.(up|down).sql` shape.
+ *  - `validateLocalMigrations` rejects the two invalid on-disk states a push
+ *    must catch: two up (or two down) files sharing a timestamp, and a
+ *    `.down.sql` with no matching `.up.sql`.
+ */
+
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as os from "node:os";
+import { parseDatatableMigrationPath } from "../src/types.ts";
+import { validateLocalMigrations } from "../src/commands/datatable_migrations.ts";
+
+describe("parseDatatableMigrationPath", () => {
+  test("parses up and down files of the new layout", () => {
+    expect(
+      parseDatatableMigrationPath(
+        "migrations/datatable/mydt/20260101000001_create_users.up.sql",
+      ),
+    ).toEqual({
+      datatable: "mydt",
+      timestamp: 20260101000001,
+      name: "create_users",
+      kind: "up",
+    });
+    expect(
+      parseDatatableMigrationPath(
+        "migrations/datatable/my-dt/42_x.down.sql",
+      ),
+    ).toEqual({ datatable: "my-dt", timestamp: 42, name: "x", kind: "down" });
+  });
+
+  test("rejects unrelated, legacy and malformed paths", () => {
+    for (
+      const p of [
+        // legacy top-level layout
+        "datatable_migrations/mydt/20260101000001_x.up.sql",
+        // wrong sub-namespace / depth
+        "migrations/ducklake/mydt/1_x.up.sql",
+        "migrations/datatable/1_x.up.sql",
+        "migrations/datatable/mydt/sub/1_x.up.sql",
+        // not a migration file
+        "migrations/datatable/mydt/notes.txt",
+        "migrations/datatable/mydt/x.up.sql", // no numeric timestamp prefix
+        // unrelated workspace files
+        "f/foo/bar.script.yaml",
+        "u/admin/script.ts",
+      ]
+    ) {
+      expect(parseDatatableMigrationPath(p)).toBeUndefined();
+    }
+  });
+});
+
+describe("validateLocalMigrations", () => {
+  let prevCwd: string;
+  let tmp: string;
+
+  beforeEach(() => {
+    prevCwd = process.cwd();
+    tmp = fs.mkdtempSync(path.join(os.tmpdir(), "dtmig-"));
+    process.chdir(tmp);
+  });
+  afterEach(() => {
+    process.chdir(prevCwd);
+    fs.rmSync(tmp, { recursive: true, force: true });
+  });
+
+  function write(datatable: string, file: string) {
+    const dir = path.join(tmp, "migrations", "datatable", datatable);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(path.join(dir, file), "-- sql\n");
+  }
+
+  test("accepts up+down pairs and up-only migrations", () => {
+    write("mydt", "20260101000001_create_users.up.sql");
+    write("mydt", "20260101000001_create_users.down.sql");
+    write("mydt", "20260101000002_add_email.up.sql"); // down is optional
+    expect(validateLocalMigrations()).toEqual([]);
+  });
+
+  test("flags two up files sharing a timestamp", () => {
+    write("mydt", "20260101000003_foo.up.sql");
+    write("mydt", "20260101000003_bar.up.sql");
+    const errors = validateLocalMigrations();
+    expect(errors.length).toBe(1);
+    expect(errors[0]).toContain("20260101000003");
+  });
+
+  test("flags two down files sharing a timestamp", () => {
+    write("mydt", "20260101000004_a.up.sql");
+    write("mydt", "20260101000004_a.down.sql");
+    write("mydt", "20260101000004_b.down.sql");
+    const errors = validateLocalMigrations();
+    // duplicate down + the b.down orphan (no b.up)
+    expect(errors.some((e) => e.includes("down") && e.includes("20260101000004"))).toBe(true);
+  });
+
+  test("flags a down file with no matching up", () => {
+    write("mydt", "20260101000005_orphan.down.sql");
+    const errors = validateLocalMigrations();
+    expect(errors.length).toBe(1);
+    expect(errors[0]).toContain("20260101000005_orphan");
+  });
+
+  test("only validates the requested datatables", () => {
+    write("bad", "20260101000006_x.up.sql");
+    write("bad", "20260101000006_y.up.sql"); // duplicate, but in 'bad'
+    write("good", "20260101000007_ok.up.sql");
+    expect(validateLocalMigrations(new Set(["good"]))).toEqual([]);
+    expect(validateLocalMigrations(new Set(["bad"])).length).toBe(1);
+  });
+
+  test("returns no errors when the migrations folder is absent", () => {
+    expect(validateLocalMigrations()).toEqual([]);
+  });
+});
diff --git a/cli/test/duckdb_macros_unit.test.ts b/cli/test/duckdb_macros_unit.test.ts
new file mode 100644
index 0000000000..9ad1fec568
--- /dev/null
+++ b/cli/test/duckdb_macros_unit.test.ts
@@ -0,0 +1,87 @@
+import { expect, test } from "bun:test";
+
+import {
+  detectMacroCalls,
+  parseCreateMacro,
+  parseMacroAnnotations,
+  parseMacroLibrary,
+  splitStatements,
+} from "../src/commands/pipeline/duckdbMacros.ts";
+
+// These mirror the accepted-shape cases of the backend parser
+// (backend/parsers/windmill-parser/src/duckdb_macros.rs) so the local graph
+// derives the same macro registry the server records at deploy.
+
+test("parseCreateMacro: scalar, OR REPLACE / TEMP / TABLE, FUNCTION alias", () => {
+  expect(parseCreateMacro("CREATE MACRO surrogate_key(a, b) AS md5(concat_ws('||', a, b))")).toEqual(
+    { name: "surrogate_key", params: "a, b", isTable: false },
+  );
+  expect(parseCreateMacro("CREATE OR REPLACE TEMP MACRO top_n(t_max) AS TABLE SELECT * FROM t")).toEqual(
+    { name: "top_n", params: "t_max", isTable: true },
+  );
+  // FUNCTION is DuckDB's alias for MACRO; name lowercased
+  expect(parseCreateMacro("create function Dbl(a) as a * 2")).toEqual(
+    { name: "dbl", params: "a", isTable: false },
+  );
+});
+
+test("parseCreateMacro: default params + nested/string parens in the param list", () => {
+  expect(
+    parseCreateMacro("CREATE MACRO safe_div(a, b, fallback := (0)) AS CASE WHEN b = 0 THEN fallback ELSE a / b END")?.params,
+  ).toBe("a, b, fallback := (0)");
+  expect(parseCreateMacro("CREATE MACRO f(sep := '(') AS concat(sep, 'x')")?.params).toBe("sep := '('");
+});
+
+test("parseCreateMacro: rejects non-macro, qualified/quoted names, missing params/body", () => {
+  expect(parseCreateMacro("SELECT 1")).toBeNull();
+  expect(parseCreateMacro("CREATE TABLE t(x int)")).toBeNull();
+  expect(parseCreateMacro("CREATE MACRO lake.m(a) AS a")).toBeNull();
+  expect(parseCreateMacro('CREATE MACRO "weird name"(a) AS a')).toBeNull();
+  expect(parseCreateMacro("CREATE MACRO m AS 1")).toBeNull(); // no params
+  expect(parseCreateMacro("CREATE MACRO m(a) AS")).toBeNull(); // empty body
+  expect(parseCreateMacro("CREATE OR MACRO m(a) AS a")).toBeNull(); // OR without REPLACE
+});
+
+test("splitStatements strips comments/strings and parseMacroLibrary skips setup", () => {
+  const lib = `-- macros
+ATTACH 'x.duckdb' AS ext;
+CREATE MACRO m1(a) AS a; -- inline comment ; not a split
+CREATE MACRO m2(b) AS b + 1;`;
+  expect(splitStatements("SELECT 1; -- c ; still\nSELECT ';' AS x;").length).toBe(2);
+  expect(parseMacroLibrary(lib).map((m) => m.name)).toEqual(["m1", "m2"]);
+});
+
+test("detectMacroCalls: word-boundary, case-insensitive, skips qualified/strings/comments", () => {
+  const ns = new Set(["dbl", "avg_x"]);
+  const found = detectMacroCalls("SELECT DBL(1), my_dbl(2), avg_x (3) FROM t", ns);
+  expect([...found].sort()).toEqual(["avg_x", "dbl"]);
+  expect(detectMacroCalls("SELECT lake.dbl(1)", new Set(["dbl"])).size).toBe(0);
+  expect(detectMacroCalls("SELECT 'dbl(1)'", new Set(["dbl"])).size).toBe(0);
+  expect(detectMacroCalls("-- dbl(1)\nSELECT 1", new Set(["dbl"])).size).toBe(0);
+  expect(detectMacroCalls("SELECT dbl FROM t", new Set(["dbl"])).size).toBe(0); // no call parens
+});
+
+test("parseMacroAnnotations: leading-header only, marker stands alone, `// use` needs a path token", () => {
+  expect(parseMacroAnnotations("-- macros\nCREATE MACRO m(a) AS a;")).toEqual({
+    macros: true,
+    useLibs: [],
+  });
+  // marker with trailing prose is not the macros marker
+  expect(parseMacroAnnotations("-- macros are below\nSELECT 1;").macros).toBe(false);
+  // `// use` accumulates path-shaped tokens, dedups, and stops at the body
+  expect(
+    parseMacroAnnotations("-- pipeline\n-- use f/lib/a\n-- use f/lib/a\n-- use notapath\nSELECT 1;").useLibs,
+  ).toEqual(["f/lib/a"]);
+  // an annotation after code is ignored (leading header only)
+  expect(parseMacroAnnotations("SELECT 1;\n-- use f/lib/a").useLibs).toEqual([]);
+});
+
+test("parseMacroAnnotations accepts `//`, `--`, and `#` prefixes (backend parity, any language)", () => {
+  // The canonical backend parser strips `//`/`--`/`#` regardless of language, so
+  // a DuckDB library headed with `// macros` (not `-- macros`) must be detected.
+  expect(parseMacroAnnotations("// macros\nCREATE MACRO m(a) AS a;").macros).toBe(true);
+  expect(parseMacroAnnotations("# macros\nSELECT 1;").macros).toBe(true);
+  expect(parseMacroAnnotations("// use f/lib/a\nSELECT 1;").useLibs).toEqual(["f/lib/a"]);
+  // mixed prefixes in one header both register
+  expect(parseMacroAnnotations("// pipeline\n-- use f/lib/a\nSELECT 1;").useLibs).toEqual(["f/lib/a"]);
+});
diff --git a/cli/test/folder_missing_meta.test.ts b/cli/test/folder_missing_meta.test.ts
index 429ef83b94..37e8ee3a14 100644
--- a/cli/test/folder_missing_meta.test.ts
+++ b/cli/test/folder_missing_meta.test.ts
@@ -70,11 +70,13 @@ async function withIsolatedWorkspace(
   } finally {
     if (workspaceCreated) {
       try {
-        const archiveResponse = await backend.apiRequest!(
-          `/api/w/${workspaceId}/workspaces/archive`,
-          { method: "POST" }
+        // Permanently delete (not archive): CE caps archived workspaces at 1, so archiving
+        // temp workspaces would leak them back into the active set and blow the 2-workspace cap.
+        const deleteResponse = await backend.apiRequest!(
+          `/api/workspaces/delete/${workspaceId}`,
+          { method: "DELETE" }
         );
-        await archiveResponse.text();
+        await deleteResponse.text();
       } catch {
         // Best-effort cleanup to avoid exceeding non-enterprise workspace limits.
       }
diff --git a/cli/test/fork_branch_profile_resolution_unit.test.ts b/cli/test/fork_branch_profile_resolution_unit.test.ts
new file mode 100644
index 0000000000..57fe2cb958
--- /dev/null
+++ b/cli/test/fork_branch_profile_resolution_unit.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, test } from "bun:test";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { execSync } from "node:child_process";
+import os from "node:os";
+import path from "node:path";
+import { stringify as yamlStringify } from "yaml";
+
+import { tryResolveBranchWorkspace } from "../src/core/context.ts";
+import { setLastUsedProfile } from "../src/core/branch-profiles.ts";
+import { getWorkspaceConfigFilePath } from "../windmill-utils-internal/src/config/config.ts";
+import type { GlobalOptions } from "../src/types.ts";
+import type { Workspace } from "../src/commands/workspace/workspace.ts";
+
+const BASE_URL = "http://localhost:9999/";
+const PARENT_WORKSPACE_ID = "parent";
+
+// Fork-branch workspace resolution: every profile-selection path in
+// tryResolveBranchWorkspace must rewrite the returned profile to the fork
+// workspace id derived from the wm-fork/<base>/<id> branch — a path that
+// returns the parent profile untouched silently targets the parent workspace.
+async function withForkBranchSetup(
+  profiles: Workspace[],
+  fn: (opts: GlobalOptions) => Promise<void>,
+): Promise<void> {
+  const repoDir = await mkdtemp(path.join(os.tmpdir(), "wmill_fork_repo_"));
+  const configDir = await mkdtemp(path.join(os.tmpdir(), "wmill_fork_conf_"));
+  const originalCwd = process.cwd();
+  try {
+    execSync(`git init -q -b wm-fork/main/myfork`, { cwd: repoDir });
+    execSync(`git config user.email test@example.com`, { cwd: repoDir });
+    execSync(`git config user.name test`, { cwd: repoDir });
+
+    await writeFile(
+      path.join(repoDir, "wmill.yaml"),
+      yamlStringify({
+        workspaces: {
+          main: { baseUrl: BASE_URL, workspaceId: PARENT_WORKSPACE_ID },
+        },
+      }),
+    );
+    execSync(`git add wmill.yaml && git commit -q -m init`, { cwd: repoDir });
+
+    const remotesPath = await getWorkspaceConfigFilePath(configDir);
+    await writeFile(
+      remotesPath,
+      profiles.map((p) => JSON.stringify(p)).join("\n") + "\n",
+    );
+
+    process.chdir(repoDir);
+    await fn({ configDir } as GlobalOptions);
+  } finally {
+    process.chdir(originalCwd);
+    await rm(repoDir, { recursive: true, force: true });
+    await rm(configDir, { recursive: true, force: true });
+  }
+}
+
+function profile(name: string): Workspace {
+  return {
+    name,
+    remote: BASE_URL,
+    workspaceId: PARENT_WORKSPACE_ID,
+    token: `token-${name}`,
+  };
+}
+
+describe("tryResolveBranchWorkspace on a fork branch", () => {
+  test("single matching profile targets the fork workspace", async () => {
+    await withForkBranchSetup([profile("prod")], async (opts) => {
+      const ws = await tryResolveBranchWorkspace(opts);
+      expect(ws?.workspaceId).toEqual("wm-fork-myfork");
+      expect(ws?.token).toEqual("token-prod");
+    });
+  });
+
+  test("last-used profile among multiple still targets the fork workspace", async () => {
+    await withForkBranchSetup(
+      [profile("prod"), profile("prod-alt")],
+      async (opts) => {
+        await setLastUsedProfile(
+          "main",
+          BASE_URL,
+          PARENT_WORKSPACE_ID,
+          "prod-alt",
+          opts.configDir,
+        );
+        const ws = await tryResolveBranchWorkspace(opts);
+        expect(ws?.workspaceId).toEqual("wm-fork-myfork");
+        expect(ws?.token).toEqual("token-prod-alt");
+      },
+    );
+  });
+});
diff --git a/cli/test/init_template_unit.test.ts b/cli/test/init_template_unit.test.ts
index e7d69c2184..227fc271a2 100644
--- a/cli/test/init_template_unit.test.ts
+++ b/cli/test/init_template_unit.test.ts
@@ -25,25 +25,46 @@ describe("generateCommentedTemplate", () => {
     expect(typeof config).toBe("object");
   });
 
-  test("uses provided branch name in workspaces", () => {
-    const config = parse(generateCommentedTemplate("my-feature"));
-    expect(config.workspaces["my-feature"]).toBeDefined();
+  // Without bindings, `workspaces` must stay EMPTY (a live `<branch>: {}`
+  // placeholder is unresolvable — no baseUrl — yet counts as a configured
+  // workspace, breaking auto-selection and making a later bind ambiguous).
+  // The branch name only appears in the commented example.
+  test("uses provided branch name in the commented workspaces example only", () => {
+    const yaml = generateCommentedTemplate("my-feature");
+    const config = parse(yaml);
+    expect(config.workspaces).toEqual({});
+    expect(yaml).toContain("# my-feature:");
   });
 
   test("defaults to 'main' when no branch name given", () => {
-    const config = parse(generateCommentedTemplate());
-    expect(config.workspaces["main"]).toBeDefined();
+    const yaml = generateCommentedTemplate();
+    const config = parse(yaml);
+    expect(config.workspaces).toEqual({});
+    expect(yaml).toContain("# main:");
   });
 
   test("quotes branch names with YAML-special characters", () => {
     const specialBranches = ["fix: something", "feat/my branch", "release#1"];
     for (const branch of specialBranches) {
       const yaml = generateCommentedTemplate(branch);
+      // Still valid YAML with an empty workspaces map; the (quoted) branch
+      // name only appears in comments.
       const config = parse(yaml);
-      expect(config.workspaces[branch]).toBeDefined();
+      expect(config.workspaces).toEqual({});
+      expect(yaml).toContain(branch);
     }
   });
 
+  test("renders live workspaces entries when bindings are provided", () => {
+    const yaml = generateCommentedTemplate("main", undefined, [
+      { name: "prod", baseUrl: "https://app.windmill.dev/", workspaceId: "prod-ws" },
+    ]);
+    const config = parse(yaml);
+    expect(config.workspaces["prod"]).toBeDefined();
+    expect(config.workspaces["prod"].baseUrl).toBe("https://app.windmill.dev/");
+    expect(config.workspaces["prod"].workspaceId).toBe("prod-ws");
+  });
+
   test("contains yaml-language-server schema directive", () => {
     const yaml = generateCommentedTemplate("main");
     expect(yaml.startsWith("# yaml-language-server: $schema=wmill.schema.json")).toBe(true);
diff --git a/cli/test/parser_packages_unit.test.ts b/cli/test/parser_packages_unit.test.ts
new file mode 100644
index 0000000000..4270a4996e
--- /dev/null
+++ b/cli/test/parser_packages_unit.test.ts
@@ -0,0 +1,40 @@
+import { expect, test } from "bun:test";
+import { readFileSync, readdirSync, statSync } from "node:fs";
+import { join } from "node:path";
+
+// build-npm.ts derives the published CLI's parser dependencies from
+// package.json, so a parser package that src/ loads but package.json omits
+// ships a CLI where loadParser() throws and callers silently degrade.
+
+const cliRoot = join(import.meta.dir, "..");
+
+function collectSourceFiles(dir: string, out: string[] = []): string[] {
+  for (const entry of readdirSync(dir)) {
+    const p = join(dir, entry);
+    if (statSync(p).isDirectory()) collectSourceFiles(p, out);
+    else if (p.endsWith(".ts")) out.push(p);
+  }
+  return out;
+}
+
+test("every windmill-parser-wasm-* package referenced in src/ is a declared dependency", () => {
+  const deps: Record<string, string> =
+    JSON.parse(readFileSync(join(cliRoot, "package.json"), "utf-8"))
+      .dependencies ?? {};
+
+  const referenced = new Set<string>();
+  for (const file of collectSourceFiles(join(cliRoot, "src"))) {
+    for (const m of readFileSync(file, "utf-8").matchAll(
+      /"(windmill-parser-wasm-[a-z-]+)"/g,
+    )) {
+      referenced.add(m[1]);
+    }
+  }
+
+  // Sanity: the scan must see the known call sites, else the regex went stale.
+  expect(referenced.has("windmill-parser-wasm-ts")).toBe(true);
+  expect(referenced.has("windmill-parser-wasm-asset")).toBe(true);
+
+  const missing = [...referenced].filter((p) => !(p in deps)).sort();
+  expect(missing).toEqual([]);
+});
diff --git a/cli/test/pipeline_bounded_cascade_unit.test.ts b/cli/test/pipeline_bounded_cascade_unit.test.ts
new file mode 100644
index 0000000000..06781e0c6a
--- /dev/null
+++ b/cli/test/pipeline_bounded_cascade_unit.test.ts
@@ -0,0 +1,307 @@
+import { expect, test } from "bun:test";
+
+// Mirror of
+// frontend/src/lib/components/assets/AssetGraph/boundedCascade.test.ts — keep
+// the two engines in sync. (Bun project → bun:test, not Deno.)
+import {
+  type BCGraph,
+  ancestors,
+  assetUriToNodeId,
+  boundedSet,
+  buildLineageDag,
+  descendants,
+  resolveToken,
+  scriptNodeId,
+  scriptsOf,
+  topoOrder,
+  validStarts,
+  validFromStarts,
+  nonAutorunTriggerScripts,
+  reachableCutting,
+  isScriptNode,
+  scriptPathOf,
+} from "../src/commands/pipeline/boundedCascade.ts";
+
+type W = [script: string, asset: string];
+type S = [script: string, asset: string];
+type R = [script: string, asset: string];
+
+function graph(opts: {
+  scripts?: string[];
+  writes?: W[];
+  reads?: R[];
+  subs?: S[];
+  native?: Array<[kind: string, script: string]>;
+}): BCGraph {
+  const { scripts = [], writes = [], reads = [], subs = [], native = [] } = opts;
+  return {
+    assets: [],
+    runnables: scripts.map((p) => ({ path: p, usage_kind: "script" as const })),
+    edges: [
+      ...writes.map(([s, a]) => ({
+        runnable_kind: "script",
+        runnable_path: s,
+        asset_kind: "datatable",
+        asset_path: a,
+        access_type: "w" as const,
+      })),
+      ...reads.map(([s, a]) => ({
+        runnable_kind: "script",
+        runnable_path: s,
+        asset_kind: "datatable",
+        asset_path: a,
+        access_type: "r" as const,
+      })),
+    ],
+    triggers: [
+      ...subs.map(([s, a]) => ({
+        trigger_kind: "asset" as const,
+        asset_kind: "datatable",
+        asset_path: a,
+        runnable_kind: "script",
+        runnable_path: s,
+      })),
+      ...native.map(([kind, s]) => ({
+        trigger_kind: kind,
+        runnable_kind: "script",
+        runnable_path: s,
+      })),
+    ],
+  };
+}
+
+const sn = scriptNodeId;
+const sorted = (it: Iterable<string>) => [...it].sort();
+
+// a → x → b → y → c → z → d (linear chain through assets)
+const chain = () =>
+  graph({
+    scripts: ["a", "b", "c", "d"],
+    writes: [
+      ["a", "x"],
+      ["b", "y"],
+      ["c", "z"],
+    ],
+    subs: [
+      ["b", "x"],
+      ["c", "y"],
+      ["d", "z"],
+    ],
+  });
+
+test("boundedSet stops at a single end node", () => {
+  const res = boundedSet(buildLineageDag(chain()), sn("a"), [sn("c")]);
+  expect(sorted(scriptsOf(res.nodes))).toEqual(["a", "b", "c"]);
+  expect(res.nodes.has("datatable:z")).toBe(false);
+});
+
+test("boundedSet supports an asset as the end bound", () => {
+  const res = boundedSet(buildLineageDag(chain()), sn("a"), ["datatable:y"]);
+  expect(sorted(scriptsOf(res.nodes))).toEqual(["a", "b"]);
+});
+
+test("boundedSet drops ends not downstream of start", () => {
+  const res = boundedSet(buildLineageDag(chain()), sn("c"), [sn("a")]);
+  expect(res.droppedEnds).toEqual([sn("a")]);
+  expect([...res.nodes]).toEqual([sn("c")]);
+});
+
+test("validStarts: schedule and manual roots, not events/uploads/webhooks or subscribers", () => {
+  const g = graph({
+    scripts: ["a", "sub", "sched", "kfk", "upl", "hook"],
+    writes: [["a", "x"]],
+    subs: [["sub", "x"], ["sched", "x"]],
+    native: [
+      ["schedule", "sched"],
+      ["kafka", "kfk"],
+      ["data_upload", "upl"],
+      ["webhook", "hook"],
+    ],
+  });
+  const starts = validStarts(g);
+  expect(starts.has(sn("a"))).toBe(true); // manual root
+  expect(starts.has(sn("sched"))).toBe(true); // schedule overrides subscriber
+  expect(starts.has(sn("sub"))).toBe(false); // pure subscriber
+  expect(starts.has(sn("kfk"))).toBe(false); // event-only
+  // data_upload / webhook need caller-supplied input → not auto-run roots
+  expect(starts.has(sn("upl"))).toBe(false);
+  expect(starts.has(sn("hook"))).toBe(false);
+});
+
+test("a scheduled root with a secondary data_upload trigger stays a start and isn't cut", () => {
+  // Regression: the barrier set must exclude valid starts, else a script with
+  // both `// on schedule` and `// on data_upload` resolves as the start yet is
+  // also a barrier, so reachableCutting skips it → empty run plan.
+  const g = graph({
+    scripts: ["sched_upload", "consumer"],
+    writes: [["sched_upload", "x"]],
+    subs: [["consumer", "x"]],
+    native: [
+      ["schedule", "sched_upload"],
+      ["data_upload", "sched_upload"],
+    ],
+  });
+  const starts = validStarts(g);
+  expect(starts.has(sn("sched_upload"))).toBe(true); // schedule wins over the upload trigger
+  // Mirror run()'s barrier set: nonAutorun handlers minus the valid starts.
+  const barriers = new Set([...nonAutorunTriggerScripts(g)].filter((id) => !starts.has(id)));
+  expect(barriers.has(sn("sched_upload"))).toBe(false); // the scheduled root is protected
+  const sel = new Set(
+    [...reachableCutting(buildLineageDag(g), starts, barriers)]
+      .filter(isScriptNode)
+      .map(scriptPathOf),
+  );
+  expect(sel.has("sched_upload")).toBe(true); // runs on its schedule path…
+  expect(sel.has("consumer")).toBe(true); // …and its downstream isn't cut off
+});
+
+test("validFromStarts: mid-DAG models are eligible starts, event/upload/webhook are not", () => {
+  // a(root) → x → sub → y → reader ; k=kafka, upl=data_upload, hook=webhook.
+  const g = graph({
+    scripts: ["a", "sub", "reader", "k", "upl", "hook"],
+    writes: [["a", "x"], ["sub", "y"]],
+    reads: [["reader", "y"]],
+    subs: [["sub", "x"]],
+    native: [["kafka", "k"], ["data_upload", "upl"], ["webhook", "hook"]],
+  });
+  const from = validFromStarts(g);
+  expect(from.has(sn("a"))).toBe(true); // root
+  expect(from.has(sn("sub"))).toBe(true); // mid-DAG subscriber — NOT a validStart
+  expect(from.has(sn("reader"))).toBe(true); // pure reader
+  expect(validStarts(g).has(sn("sub"))).toBe(false); // old root-only gate rejected it
+  // Non-autorun handlers stay out (they need caller input / fan out per event).
+  expect(from.has(sn("k"))).toBe(false);
+  expect(from.has(sn("upl"))).toBe(false);
+  expect(from.has(sn("hook"))).toBe(false);
+});
+
+test("validFromStarts keeps a scheduled root that also carries a non-autorun trigger", () => {
+  // Regression: `--from sched_upload` must be accepted just like the implicit
+  // start. `sched_upload` is a scheduled root AND a data_upload handler — schedule
+  // wins in validStarts, so it stays --from-eligible despite being a nonAutorun
+  // handler (else explicit --from throws where the implicit start succeeds).
+  const g = graph({
+    scripts: ["sched_upload", "consumer"],
+    writes: [["sched_upload", "x"]],
+    subs: [["consumer", "x"]],
+    native: [["schedule", "sched_upload"], ["data_upload", "sched_upload"]],
+  });
+  expect(validStarts(g).has(sn("sched_upload"))).toBe(true);
+  expect(nonAutorunTriggerScripts(g).has(sn("sched_upload"))).toBe(true);
+  expect(validFromStarts(g).has(sn("sched_upload"))).toBe(true); // union with roots
+});
+
+test("a mid-DAG start runs itself + downstream, never upstream", () => {
+  // Starting at `sub`, the unbounded downstream is {sub, reader}; `a`/`x` upstream
+  // are never pulled in (dbt `--select sub+`).
+  const g = graph({
+    scripts: ["a", "sub", "reader"],
+    writes: [["a", "x"], ["sub", "y"]],
+    reads: [["reader", "y"]],
+    subs: [["sub", "x"]],
+  });
+  const dag = buildLineageDag(g);
+  const downstream = new Set([sn("sub"), ...descendants(dag, sn("sub"))]);
+  expect(sorted(scriptsOf(downstream))).toEqual(["reader", "sub"]);
+  expect(downstream.has(sn("a"))).toBe(false);
+  expect(downstream.has("datatable:x")).toBe(false);
+});
+
+test("nonAutorunTriggerScripts: event + upload/webhook handlers, incl. subscribers (descendants)", () => {
+  const g = graph({
+    scripts: ["a", "evt", "upl"],
+    writes: [["a", "x"]],
+    subs: [["evt", "x"], ["upl", "x"]], // both are lineage descendants of a…
+    native: [["kafka", "evt"], ["data_upload", "upl"]], // …and input-requiring handlers
+  });
+  const ev = nonAutorunTriggerScripts(g);
+  // excluded from a whole-pipeline run despite being descendants
+  expect(ev.has(sn("evt"))).toBe(true);
+  expect(ev.has(sn("upl"))).toBe(true);
+  expect(ev.has(sn("a"))).toBe(false);
+});
+
+test("reachableCutting: drops barrier + its exclusive downstream, keeps alt-path nodes", () => {
+  // root_a → x → handler(kafka) → y → consumer ; root_b → z ; (variant: consumer also ← z)
+  const g = graph({
+    scripts: ["root_a", "root_b", "handler", "consumer"],
+    writes: [["root_a", "x"], ["root_b", "z"], ["handler", "y"]],
+    subs: [["handler", "x"], ["consumer", "y"]],
+    native: [["kafka", "handler"]],
+  });
+  const dag = buildLineageDag(g);
+  const scripts = (s: Set<string>) =>
+    new Set([...s].filter(isScriptNode).map(scriptPathOf));
+
+  // consumer only reachable via the event handler → both excluded
+  expect(scripts(reachableCutting(dag, validStarts(g), nonAutorunTriggerScripts(g)))).toEqual(
+    new Set(["root_a", "root_b"]),
+  );
+
+  // now consumer also reads z (a non-event path via root_b) → it stays
+  const g2 = graph({
+    scripts: ["root_a", "root_b", "handler", "consumer"],
+    writes: [["root_a", "x"], ["root_b", "z"], ["handler", "y"]],
+    subs: [["handler", "x"], ["consumer", "y"], ["consumer", "z"]],
+    native: [["kafka", "handler"]],
+  });
+  expect(
+    scripts(reachableCutting(buildLineageDag(g2), validStarts(g2), nonAutorunTriggerScripts(g2))),
+  ).toEqual(new Set(["root_a", "root_b", "consumer"]));
+});
+
+test("assetUriToNodeId maps s3 → s3object, others verbatim", () => {
+  expect(assetUriToNodeId("s3://b/k")).toBe("s3object:b/k");
+  expect(assetUriToNodeId("datatable://main/users")).toBe("datatable:main/users");
+  expect(assetUriToNodeId("nope")).toBe(undefined);
+});
+
+test("assetUriToNodeId strips leading slashes from S3 keys (canonical node)", () => {
+  // Mirror of Rust `parse_asset_syntax`: `--to s3:///exports/x` must resolve to
+  // the same canonical node as the graph's `s3object:exports/x`.
+  expect(assetUriToNodeId("s3:///exports/x")).toBe("s3object:exports/x");
+  expect(assetUriToNodeId("s3:///exports/x")).toBe(assetUriToNodeId("s3://exports/x"));
+  // All leading slashes stripped so a canonical key never starts with `/`
+  // (the quad-slash `S3Object(s3="/x")` form collapses to `x`).
+  expect(assetUriToNodeId("s3:////x")).toBe("s3object:x");
+  // Hive-partition keys and non-S3 kinds are untouched.
+  expect(assetUriToNodeId("s3:///t/y=2024/f.parquet")).toBe("s3object:t/y=2024/f.parquet");
+});
+
+test("resolveToken: short name, full path, and asset URI", () => {
+  const g = graph({ scripts: ["f/p/stage"], writes: [["f/p/stage", "main/staged"]] });
+  g.assets = [{ kind: "datatable", path: "main/staged" }];
+  expect(resolveToken(g, "stage")).toBe(sn("f/p/stage"));
+  expect(resolveToken(g, "f/p/stage")).toBe(sn("f/p/stage"));
+  expect(resolveToken(g, "datatable://main/staged")).toBe("datatable:main/staged");
+  expect(resolveToken(g, "missing")).toBe(undefined);
+});
+
+test("topoOrder sorts the bounded scripts and flags cycles", () => {
+  const { order, cyclic } = topoOrder(chain(), new Set(["a", "b", "c"]));
+  expect(order).toEqual(["a", "b", "c"]);
+  expect(cyclic).toEqual([]);
+});
+
+test("descendants/ancestors exclude the start even on a cycle", () => {
+  // a → x → b → y → a (cycle): closures must not contain a.
+  const g = graph({
+    scripts: ["a", "b"],
+    writes: [["a", "x"], ["b", "y"]],
+    subs: [["b", "x"], ["a", "y"]],
+  });
+  const dag = buildLineageDag(g);
+  expect(descendants(dag, sn("a")).has(sn("a"))).toBe(false);
+  expect(ancestors(dag, sn("a")).has(sn("a"))).toBe(false);
+});
+
+test("topoOrder orders a pure reader after its producer", () => {
+  // a writes x; c only *reads* x (no `// on x`). c must run after a.
+  const g = graph({
+    scripts: ["a", "c"],
+    writes: [["a", "x"]],
+    reads: [["c", "x"]],
+  });
+  const { order } = topoOrder(g, new Set(["a", "c"]));
+  expect(order).toEqual(["a", "c"]);
+});
diff --git a/cli/test/pipeline_enrich_unit.test.ts b/cli/test/pipeline_enrich_unit.test.ts
new file mode 100644
index 0000000000..78697465af
--- /dev/null
+++ b/cli/test/pipeline_enrich_unit.test.ts
@@ -0,0 +1,36 @@
+import { expect, test } from "bun:test";
+import { recoverHeaderMarkers } from "../src/commands/pipeline/pipeline.ts";
+
+// The deployed graph omits marker-only `// on data_upload`/`webhook`/`email`
+// triggers, so `pipeline run` recovers them from script bodies. It must scan the
+// LEADING comment header only (like the canonical/fallback parsers) so a body
+// comment can't inject a phantom trigger and over-cut the run selection.
+
+test("recovers marker triggers from the leading comment header", () => {
+  expect(recoverHeaderMarkers("-- pipeline\n-- on data_upload\nSELECT 1;")).toEqual([
+    "data_upload",
+  ]);
+  // multiple kinds, blank lines allowed inside the header
+  expect(
+    recoverHeaderMarkers("// pipeline\n\n// on webhook\n// on email\nexport function main(){}"),
+  ).toEqual(["webhook", "email"]);
+});
+
+test("ignores a marker in a body comment (stops at first non-comment line)", () => {
+  const code = `-- pipeline
+-- on schedule
+SELECT * FROM t;
+-- on data_upload`;
+  // the body `-- on data_upload` is past the header → not recovered
+  expect(recoverHeaderMarkers(code)).toEqual([]);
+});
+
+test("ignores non-marker `on` kinds and dedupes", () => {
+  // kafka/asset `on` lines aren't marker kinds; data_upload deduped
+  const code = `# pipeline
+# on data_upload
+# on kafka
+# on data_upload
+def main(): pass`;
+  expect(recoverHeaderMarkers(code)).toEqual(["data_upload"]);
+});
diff --git a/cli/test/pipeline_local_graph_unit.test.ts b/cli/test/pipeline_local_graph_unit.test.ts
new file mode 100644
index 0000000000..59058bbcf4
--- /dev/null
+++ b/cli/test/pipeline_local_graph_unit.test.ts
@@ -0,0 +1,918 @@
+import { expect, test } from "bun:test";
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import {
+  buildLocalPipelineGraph,
+  parseMuteAnnotations,
+} from "../src/commands/pipeline/localGraph.ts";
+
+// Build a throwaway workspace tree with `f/<folder>/<file>` scripts and a
+// wmill.yaml at the root, then assert the graph the wasm-backed builder derives.
+function withFolder(
+  files: Record<string, string>,
+  fn: (root: string, folder: string) => Promise<void> | void,
+) {
+  const root = mkdtempSync(join(tmpdir(), "wm-pl-"));
+  writeFileSync(join(root, "wmill.yaml"), "defaultTs: bun\n");
+  const folder = "mypipe";
+  mkdirSync(join(root, "f", folder), { recursive: true });
+  for (const [name, content] of Object.entries(files)) {
+    writeFileSync(join(root, "f", folder, name), content);
+  }
+  return Promise.resolve(fn(root, folder)).finally(() =>
+    rmSync(root, { recursive: true, force: true }),
+  );
+}
+
+test("only `// pipeline` scripts become nodes; `// on` asset triggers wire edges", async () => {
+  await withFolder(
+    {
+      // a source: pipeline member, subscribes to nothing, but is annotated.
+      "raw.bun.ts":
+        `// pipeline\nimport * as wmill from "windmill-client"\nexport async function main() {}\n`,
+      // a transform: pipeline member, subscribes to raw.
+      "staged.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/raw\nINSERT INTO main.staged SELECT 1;\n`,
+      // not a pipeline member — must be excluded.
+      "helper.bun.ts":
+        `export async function main() {}\n`,
+    },
+    async (root, folder) => {
+      const { graph, scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+
+      const paths = graph.runnables.map((r) => r.path).sort();
+      expect(paths).toEqual(["f/mypipe/raw", "f/mypipe/staged"]);
+      // helper is excluded
+      expect(paths).not.toContain("f/mypipe/helper");
+      expect(scripts.map((s) => s.path).sort()).toEqual(paths);
+
+      // staged subscribes to datatable://main/raw via an asset trigger
+      const assetTriggers = graph.triggers.filter((t) => t.trigger_kind === "asset");
+      expect(assetTriggers).toHaveLength(1);
+      const at = assetTriggers[0] as Extract<
+        (typeof graph.triggers)[number],
+        { trigger_kind: "asset" }
+      >;
+      expect(at.asset_kind).toBe("datatable");
+      expect(at.asset_path).toBe("main/raw");
+      expect(at.runnable_path).toBe("f/mypipe/staged");
+
+      // the referenced asset exists in the asset set
+      expect(graph.assets).toContainEqual({ kind: "datatable", path: "main/raw" });
+    },
+  );
+});
+
+test("native triggers surface as trigger rows (no deploy needed)", async () => {
+  await withFolder(
+    {
+      "ingest.bun.ts":
+        `// pipeline\n// on data_upload\nimport * as wmill from "windmill-client"\nexport async function main() {}\n`,
+      "upload_trigger.duckdb.sql": `-- pipeline\n-- on data_upload\nSELECT 1;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const native = graph.triggers.filter((t) => t.trigger_kind !== "asset");
+      expect(
+        native
+          .filter((t) => t.trigger_kind === "data_upload")
+          .map((t) => t.runnable_path)
+          .sort(),
+      ).toEqual(["f/mypipe/ingest", "f/mypipe/upload_trigger"]);
+    },
+  );
+});
+
+test("retry delay metadata strips the optional `delay=` prefix", async () => {
+  await withFolder(
+    {
+      "retry.duckdb.sql": `-- pipeline\n-- retry 2 delay=10s\nSELECT 1;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/retry")?.retry).toEqual({
+        count: 2,
+        delay: "10s",
+      });
+    },
+  );
+});
+
+test("empty / no-pipeline folder yields an empty graph", async () => {
+  await withFolder(
+    { "plain.bun.ts": `export async function main() {}\n` },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.runnables).toHaveLength(0);
+      expect(graph.assets).toHaveLength(0);
+    },
+  );
+});
+
+test("`// materialize <asset>` producer connects to its `// on` consumer", async () => {
+  // The wasm asset parser doesn't surface `// materialize`; the CLI-side scan
+  // must still emit the producer's write edge so it links to the consumer.
+  await withFolder(
+    {
+      "load.duckdb.sql": `-- pipeline\n-- materialize ducklake://main/users\nSELECT 1 AS id;\n`,
+      "consume.duckdb.sql":
+        `-- pipeline\n-- on ducklake://main/users\nSELECT count(*) FROM users;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+
+      // the materialize target is a shared asset
+      expect(graph.assets).toContainEqual({ kind: "ducklake", path: "main/users" });
+
+      // the producer carries its materialize_target and a write edge
+      const load = graph.runnables.find((r) => r.path === "f/mypipe/load");
+      expect(load?.materialize_target).toEqual({ kind: "ducklake", path: "main/users" });
+      expect(graph.edges).toContainEqual({
+        runnable_kind: "script",
+        runnable_path: "f/mypipe/load",
+        asset_kind: "ducklake",
+        asset_path: "main/users",
+        access_type: "w",
+      });
+
+      // the consumer subscribes to the same asset (the connecting trigger)
+      const at = graph.triggers.find(
+        (t) => t.trigger_kind === "asset" && t.runnable_path === "f/mypipe/consume",
+      ) as Extract<(typeof graph.triggers)[number], { trigger_kind: "asset" }> | undefined;
+      expect(at?.asset_path).toBe("main/users");
+    },
+  );
+});
+
+test("HD-1: `// data_test relationships` adds a producer → tested-script ordering edge", async () => {
+  // Mirror of the deployed graph's `test_edges` (backend `asset_graph`): the
+  // referenced dimension's in-pipeline producer must materialize before the
+  // tested script runs, so a cold cascade orders it first. The wasm emits the
+  // parsed `relationships` test; the local builder resolves its producer.
+  await withFolder(
+    {
+      "dim_customers.duckdb.sql":
+        `-- pipeline\n-- materialize ducklake://main/dim_customers\nSELECT 1 AS id;\n`,
+      "fct_orders_daily.duckdb.sql":
+        `-- pipeline\n-- on ducklake://main/orders\n-- data_test relationships customer_id -> ducklake://main/dim_customers.id\nSELECT customer_id FROM main.orders;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.test_edges).toEqual([
+        {
+          producer_kind: "script",
+          producer_path: "f/mypipe/dim_customers",
+          runnable_kind: "script",
+          runnable_path: "f/mypipe/fct_orders_daily",
+          asset_kind: "ducklake",
+          asset_path: "main/dim_customers",
+        },
+      ]);
+    },
+  );
+});
+
+test("HD-1: a relationships ref to an asset with no in-pipeline producer adds no edge", async () => {
+  // No producer (external / not-yet-in-pipeline table) ⇒ no ordering edge — the
+  // runtime error stands, exactly like the backend (`test_edges` stays empty and
+  // is omitted from the graph).
+  await withFolder(
+    {
+      "fct.duckdb.sql":
+        `-- pipeline\n-- on ducklake://main/orders\n-- data_test relationships customer_id -> ducklake://main/external_dim.id\nSELECT customer_id FROM main.orders;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.test_edges).toBeUndefined();
+    },
+  );
+});
+
+test("HD-1: a self-test (relationships on the script's own materialize output) is dropped", async () => {
+  // The tested script produces the very asset it references — the backend's
+  // self-edge guard drops it, and so must the local builder (no self-ordering).
+  await withFolder(
+    {
+      "dim.duckdb.sql":
+        `-- pipeline\n-- materialize ducklake://main/dim\n-- data_test relationships id -> ducklake://main/dim.id\nSELECT 1 AS id;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.test_edges).toBeUndefined();
+    },
+  );
+});
+
+test("HD-1: a custom `// data_test <script>` whose body reads an in-pipeline asset orders it (best-effort)", async () => {
+  // Escape-hatch test: the tested member declares `// data_test f/mypipe/test_dim`;
+  // that script reads `s3://demo/dim.parquet`, which a pipeline member produces.
+  // The producer must run before the tested script, so the custom test resolves
+  // to a producer → tested-script edge through the shared asset (mirrors the
+  // backend resolving custom tests against the script's parsed reads).
+  await withFolder(
+    {
+      // producer writes the S3 asset the custom test reads
+      "export_dim.duckdb.sql":
+        `-- pipeline\nCOPY (SELECT 1 AS id) TO 's3://demo/dim.parquet';\n`,
+      // the escape-hatch test script (NOT a pipeline member) reads that asset
+      "test_dim.duckdb.sql":
+        `SELECT * FROM read_parquet('s3://demo/dim.parquet') WHERE id IS NULL;\n`,
+      // the tested member points at the custom test
+      "fct.duckdb.sql":
+        `-- pipeline\n-- on ducklake://main/orders\n-- data_test f/mypipe/test_dim\nSELECT 1 AS id;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.test_edges).toEqual([
+        {
+          producer_kind: "script",
+          producer_path: "f/mypipe/export_dim",
+          runnable_kind: "script",
+          runnable_path: "f/mypipe/fct",
+          asset_kind: "s3object",
+          asset_path: "demo/dim.parquet",
+        },
+      ]);
+    },
+  );
+});
+
+test("HD-2: an scd2 `history` producer writes both `<dim>` and `<dim>_current` so a `_current` reader resolves to it", async () => {
+  // Managed `// materialize … history` (scd2) also produces a `<dim>_current`
+  // companion view (backend `MaterializeSpec::write_targets`). The wasm asset
+  // parser emits the `scd2` flag; the local builder must add the second write
+  // edge and mark the view `derived_from` its base dimension so a consumer
+  // reading only the view links back to the producer instead of orphaning.
+  await withFolder(
+    {
+      "dim.duckdb.sql":
+        `-- pipeline\n-- materialize ducklake://main/dim_customers key=id history\nSELECT 1 AS id;\n`,
+      // a consumer reading ONLY the `_current` companion view
+      "consume.duckdb.sql":
+        `-- pipeline\n-- on ducklake://main/dim_customers_current\nSELECT * FROM main.dim_customers_current;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({
+        root,
+        folder,
+        defaultTs: "bun",
+      });
+
+      // the producer carries BOTH write edges (base dim + `_current` companion)
+      const writes = graph.edges
+        .filter(
+          (e) =>
+            e.runnable_path === "f/mypipe/dim" && e.access_type === "w",
+        )
+        .map((e) => e.asset_path)
+        .sort();
+      expect(writes).toEqual(["main/dim_customers", "main/dim_customers_current"]);
+
+      // the strategy is derived as scd2 on the producer node
+      expect(
+        graph.runnables.find((r) => r.path === "f/mypipe/dim")?.materialize_strategy,
+      ).toBe("scd2");
+
+      // the `_current` asset is marked as derived from its base dimension, so the
+      // canvas renders it as a companion view rather than an orphan table
+      expect(graph.assets).toContainEqual({
+        kind: "ducklake",
+        path: "main/dim_customers_current",
+        derived_from: "main/dim_customers",
+      });
+
+      // the `_current` reader's `// on` trigger points at the same node the
+      // producer now writes — no orphaned read
+      const at = graph.triggers.find(
+        (t) => t.trigger_kind === "asset" && t.runnable_path === "f/mypipe/consume",
+      ) as Extract<(typeof graph.triggers)[number], { trigger_kind: "asset" }> | undefined;
+      expect(at?.asset_path).toBe("main/dim_customers_current");
+    },
+  );
+});
+
+test("auto-derived cascade triggers: a body ducklake read wires the edge, incl. the scd2 `_current` view", async () => {
+  // Backend parity (#9963 `derive_pipeline_asset_trigger_refs`): inside a
+  // `// pipeline`, a read-only ducklake/s3 body read derives its cascade
+  // trigger — no `// on` needed. The scd2 `_current` companion is both written
+  // by the producer AND a derivable read for its consumer, so the full chain
+  // stg → dim → consumer must connect without a single explicit trigger.
+  await withFolder(
+    {
+      "stg.duckdb.sql":
+        `-- pipeline\n-- materialize ducklake://main/stg\nSELECT 1 AS id;\n`,
+      "dim.duckdb.sql":
+        `-- pipeline\n-- materialize ducklake://main/dim key=id history\nATTACH 'ducklake' AS dl;\nUSE dl;\nSELECT * FROM stg;\n`,
+      "consume.duckdb.sql":
+        `-- pipeline\nATTACH 'ducklake' AS dl;\nUSE dl;\nSELECT * FROM dim_current;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const ats = graph.triggers.filter((t) => t.trigger_kind === "asset") as Extract<
+        (typeof graph.triggers)[number],
+        { trigger_kind: "asset" }
+      >[];
+      expect(
+        ats.map((t) => `${t.asset_path}->${t.runnable_path}`).sort(),
+      ).toEqual(["main/dim_current->f/mypipe/consume", "main/stg->f/mypipe/dim"]);
+      // the schema-level `main` read (ambiguous access) must NOT derive a trigger
+      expect(ats.some((t) => t.asset_path === "main")).toBe(false);
+      // the scd2 producer still carries the `_current` companion write the
+      // derived consumer edge resolves against (deployed-graph parity)
+      expect(graph.edges).toContainEqual({
+        runnable_kind: "script",
+        runnable_path: "f/mypipe/dim",
+        asset_kind: "ducklake",
+        asset_path: "main/dim_current",
+        access_type: "w",
+      });
+    },
+  );
+});
+
+test("`// mute <asset>` suppresses one derived trigger; `// mute all` opts the script out", async () => {
+  await withFolder(
+    {
+      // reads two tables, mutes one → only the unmuted read derives
+      "partial.duckdb.sql":
+        `-- pipeline\n-- mute ducklake://main/lookup\nATTACH 'ducklake' AS dl;\nUSE dl;\nSELECT * FROM lookup JOIN facts USING (id);\n`,
+      // mute all: body read derives nothing, the explicit `// on` still stands
+      "optout.duckdb.sql":
+        `-- pipeline\n-- mute all\n-- on ducklake://main/manual\nATTACH 'ducklake' AS dl;\nUSE dl;\nSELECT * FROM facts;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const ats = graph.triggers.filter((t) => t.trigger_kind === "asset") as Extract<
+        (typeof graph.triggers)[number],
+        { trigger_kind: "asset" }
+      >[];
+      expect(
+        ats.map((t) => `${t.asset_path}->${t.runnable_path}`).sort(),
+      ).toEqual(["main/facts->f/mypipe/partial", "main/manual->f/mypipe/optout"]);
+    },
+  );
+});
+
+test("derived triggers dedup against explicit `// on` and never self-trigger a materialize producer", async () => {
+  await withFolder(
+    {
+      // explicit `// on` for an asset the body also reads → exactly one trigger
+      "explicit.duckdb.sql":
+        `-- pipeline\n-- on ducklake://main/src debounce=60s\nATTACH 'ducklake' AS dl;\nUSE dl;\nSELECT * FROM src;\n`,
+      // an incremental model reading its own materialize target must not
+      // cascade on itself (the deploy path upgrades that read to rw)
+      "incremental.duckdb.sql":
+        `-- pipeline\n-- materialize ducklake://main/inc key=id\nATTACH 'ducklake' AS dl;\nUSE dl;\nSELECT * FROM inc;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const ats = graph.triggers.filter((t) => t.trigger_kind === "asset") as Extract<
+        (typeof graph.triggers)[number],
+        { trigger_kind: "asset" }
+      >[];
+      expect(
+        ats.map((t) => `${t.asset_path}->${t.runnable_path}`),
+      ).toEqual(["main/src->f/mypipe/explicit"]);
+    },
+  );
+});
+
+test("parseMuteAnnotations mirrors the canonical annotation grammar", () => {
+  // Any comment prefix regardless of language, header-only scan, complete-word
+  // keyword, s3 leading-slash canonicalization — in lockstep with the Rust
+  // `parse_pipeline_annotations` / frontend parsePipelineAnnotations.ts.
+  const all3 = parseMuteAnnotations(
+    `// mute ducklake://main/a\n-- mute datatable://main/b\n# mute s3:///lead/slash\nSELECT 1;\n// mute ducklake://main/body\n`,
+  );
+  expect(all3.muteAll).toBe(false);
+  // all three prefixes accepted; s3 triple-slash canonicalizes to the bare key;
+  // the line PAST the first non-comment line is ignored (header-only)
+  expect([...all3.muted].sort()).toEqual([
+    "datatable:main/b",
+    "ducklake:main/a",
+    "s3object:lead/slash",
+  ]);
+
+  // `mute` must be a complete word, and prose args are not asset URIs
+  const prose = parseMuteAnnotations(
+    `// muted for now\n// mutex ducklake://main/x\n// mute for now\n`,
+  );
+  expect(prose.muteAll).toBe(false);
+  expect(prose.muted.size).toBe(0);
+
+  // `mute all` sets the opt-out; blank header lines are skipped, not a stop
+  const optout = parseMuteAnnotations(`-- pipeline\n\n-- mute all\nSELECT 1;\n`);
+  expect(optout.muteAll).toBe(true);
+});
+
+test("a bare `.sql` (ambiguous dialect) is skipped, not a build-aborting crash", async () => {
+  // `inferContentTypeFromFilePath` throws on a dialect-less `.sql`; one such file
+  // must not abort the whole graph build (it also wedged `pipeline dev` at start).
+  await withFolder(
+    {
+      "good.duckdb.sql": `-- pipeline\nSELECT 1;\n`,
+      "ambiguous.sql": `-- pipeline\nSELECT 1;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const paths = graph.runnables.map((r) => r.path);
+      expect(paths).toContain("f/mypipe/good");
+      // the unclassifiable file is dropped — the build still succeeds
+      expect(paths).not.toContain("f/mypipe/ambiguous");
+    },
+  );
+});
+
+test("defaultTs (from wmill.yaml) drives bare `.ts` runtime — deno, not always bun", async () => {
+  await withFolder(
+    { "etl.ts": `// pipeline\nexport async function main() {}\n` },
+    async (root, folder) => {
+      const bun = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const deno = await buildLocalPipelineGraph({ root, folder, defaultTs: "deno" });
+      expect(bun.scripts.find((s) => s.path === "f/mypipe/etl")?.language).toBe("bun");
+      expect(deno.scripts.find((s) => s.path === "f/mypipe/etl")?.language).toBe("deno");
+    },
+  );
+});
+
+test("`// tag <worker>` is carried on the pushed script for preview routing", async () => {
+  await withFolder(
+    {
+      "gpu_job.duckdb.sql": `-- pipeline\n-- tag gpu\nSELECT 1;\n`,
+      "plain.duckdb.sql": `-- pipeline\nSELECT 2;\n`,
+    },
+    async (root, folder) => {
+      const { scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(scripts.find((s) => s.path === "f/mypipe/gpu_job")?.tag).toBe("gpu");
+      // a node without `// tag` carries no tag (→ default worker)
+      expect(scripts.find((s) => s.path === "f/mypipe/plain")?.tag).toBeUndefined();
+    },
+  );
+});
+
+test("go/bash fallback: leading-header `// on` only, options stripped, no body phantoms", async () => {
+  await withFolder(
+    {
+      // header annotations (incl. `// tag`, one `// on` with a trailing option) +
+      // a body comment that must NOT become a phantom trigger.
+      "ingest.go":
+        `// pipeline\n// tag heavy\n// on s3://demo/raw.csv debounce=5s\npackage inner\nfunc main() {\n\t// on s3://demo/PHANTOM.csv\n}\n`,
+    },
+    async (root, folder) => {
+      const { graph, scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const ats = graph.triggers.filter((t) => t.trigger_kind === "asset") as Extract<
+        (typeof graph.triggers)[number],
+        { trigger_kind: "asset" }
+      >[];
+      // exactly one trigger: the body `// on …PHANTOM` is past the header → ignored
+      expect(ats).toHaveLength(1);
+      // the trailing `debounce=5s` option is stripped from the asset path
+      expect(ats[0].asset_path).toBe("demo/raw.csv");
+      expect(graph.assets.some((a) => a.path.includes("PHANTOM"))).toBe(false);
+      // `// tag` is recovered by the fallback too (routes the preview)
+      expect(scripts.find((s) => s.path === "f/mypipe/ingest")?.tag).toBe("heavy");
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/ingest")?.tag).toBe("heavy");
+    },
+  );
+});
+
+test("go/bash fallback: `// on s3:///key` canonicalizes to the slashless key", async () => {
+  // Mirror of the Rust/wasm `parse_asset_syntax` S3 strip: a fallback consumer's
+  // triple-slash default-storage trigger must resolve to the bare key `exports/x`
+  // — the same identity a wasm-inferred SDK/DuckDB producer uses — or the local
+  // graph shows a disconnected `/exports/x` node. Explicit storage is untouched.
+  await withFolder(
+    {
+      "triple.go": `// pipeline\n// on s3:///exports/x\npackage inner\nfunc main() {}\n`,
+      "bare.go": `// pipeline\n// on s3://exports/x\npackage inner\nfunc main() {}\n`,
+      "storage.go": `// pipeline\n// on s3://mybucket/exports/x\npackage inner\nfunc main() {}\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const pathFor = (p: string) =>
+        graph.triggers.find(
+          (t) => t.trigger_kind === "asset" && t.runnable_path === p
+        ) as Extract<(typeof graph.triggers)[number], { trigger_kind: "asset" }> | undefined;
+      // triple-slash and bare both canonicalize to `exports/x` → same node
+      expect(pathFor("f/mypipe/triple")?.asset_path).toBe("exports/x");
+      expect(pathFor("f/mypipe/bare")?.asset_path).toBe("exports/x");
+      // explicit storage keeps its `storage/key` path (no leading slash to strip)
+      expect(pathFor("f/mypipe/storage")?.asset_path).toBe("mybucket/exports/x");
+    },
+  );
+});
+
+test("go/bash fallback: a native marker with trailing content is rejected (parity)", async () => {
+  // The canonical parser rejects a marker line with trailing content, so the
+  // fallback must too — else a `// on data_upload f/foo` / `# on kafka topic`
+  // shows up locally as an upload/event trigger that deployed parsing drops.
+  await withFolder(
+    {
+      "bare.go": `// pipeline\n// on data_upload\npackage inner\nfunc main() {}\n`,
+      "trailing.go": `// pipeline\n// on data_upload f/foo\npackage inner\nfunc main() {}\n`,
+      "kafka.rb": `# pipeline\n# on kafka topic\nputs "hi"\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const nativeOf = (p: string) =>
+        graph.triggers
+          .filter((t) => t.trigger_kind !== "asset" && t.runnable_path === p)
+          .map((t) => t.trigger_kind);
+      // bare marker stands alone → recognized
+      expect(nativeOf("f/mypipe/bare")).toEqual(["data_upload"]);
+      // trailing content → rejected (no native trigger)
+      expect(nativeOf("f/mypipe/trailing")).toEqual([]);
+      expect(nativeOf("f/mypipe/kafka")).toEqual([]);
+    },
+  );
+});
+
+test("go/bash fallback: a multi-word `// tag` is rejected (single token only)", async () => {
+  // A worker tag is one token; trailing prose must NOT smuggle a bogus tag that
+  // would route the preview to a non-existent worker.
+  await withFolder(
+    {
+      "single.go": `// pipeline\n// tag gpu\npackage inner\nfunc main() {}\n`,
+      "multi.go": `// pipeline\n// tag gpu for heavy jobs\npackage inner\nfunc main() {}\n`,
+    },
+    async (root, folder) => {
+      const { scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(scripts.find((s) => s.path === "f/mypipe/single")?.tag).toBe("gpu");
+      // multi-word → no tag (default worker), not "gpu for heavy jobs"
+      expect(scripts.find((s) => s.path === "f/mypipe/multi")?.tag).toBeUndefined();
+    },
+  );
+});
+
+test("`# volume:` producer connects to its `# on volume://` consumer", async () => {
+  // Volume annotations are parsed separately from the wasm body parser (mirrors
+  // the frontend/backend); without that pass the producer has no write edge.
+  await withFolder(
+    {
+      "producer.py": `# pipeline\n# volume: cache /tmp/cache\ndef main():\n    pass\n`,
+      "consumer.py": `# pipeline\n# on volume://cache\ndef main():\n    pass\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+
+      expect(graph.assets).toContainEqual({ kind: "volume", path: "cache" });
+      // producer carries the rw write edge to the volume
+      const producerEdge = graph.edges.find(
+        (e) =>
+          e.runnable_path === "f/mypipe/producer" &&
+          e.asset_kind === "volume" &&
+          e.asset_path === "cache",
+      );
+      expect(producerEdge?.access_type).toBe("rw");
+      // consumer subscribes to the same volume (the connecting trigger)
+      const at = graph.triggers.find(
+        (t) => t.trigger_kind === "asset" && t.runnable_path === "f/mypipe/consumer",
+      ) as Extract<(typeof graph.triggers)[number], { trigger_kind: "asset" }> | undefined;
+      expect(at?.asset_kind).toBe("volume");
+      expect(at?.asset_path).toBe("cache");
+    },
+  );
+});
+
+test("`// macros` library: node with signatures + call-detected consumer edge, counted", async () => {
+  // The wasm asset parser drops `// macros`/`// use`; the CLI-side lexical scan
+  // must surface the library node, its macro signatures, and the caller edge so
+  // `--local` reaches parity with the deployed graph.
+  await withFolder(
+    {
+      "macros_finance.duckdb.sql":
+        `-- macros\nCREATE MACRO net_revenue(gross, refunds) AS gross - refunds;\nCREATE OR REPLACE MACRO safe_div(a, b) AS TABLE SELECT a / b;\n`,
+      "fct.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/orders\nSELECT net_revenue(gross, refunds) AS rev FROM main.orders;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+
+      // the library is a node carrying its macro signatures
+      const lib = graph.runnables.find((r) => r.path === "f/mypipe/macros_finance");
+      expect(lib?.macros).toEqual([
+        { name: "net_revenue", params: "gross, refunds", is_table: false },
+        { name: "safe_div", params: "a, b", is_table: true },
+      ]);
+
+      // library counts toward the script total (2 scripts, not just the 1 pipeline member)
+      expect(graph.runnables.map((r) => r.path).sort()).toEqual([
+        "f/mypipe/fct",
+        "f/mypipe/macros_finance",
+      ]);
+
+      // the caller edge names only the macro actually called (safe_div is not)
+      expect(graph.macro_edges).toEqual([
+        {
+          lib_path: "f/mypipe/macros_finance",
+          consumer_path: "f/mypipe/fct",
+          macro_names: ["net_revenue"],
+          via_use: false,
+        },
+      ]);
+    },
+  );
+});
+
+test("`// use <lib>` forces a whole-library edge even with no lexical call", async () => {
+  // Dynamic-SQL callers annotate `// use`; the edge lists every macro and is
+  // flagged via_use (mirrors the deployed graph).
+  await withFolder(
+    {
+      "stats.duckdb.sql":
+        `-- macros\nCREATE MACRO zscore(x, m, s) AS (x - m) / s;\n`,
+      "report.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/metrics\n-- use f/mypipe/stats\nSELECT query('SELECT zscore(v, 0, 1) FROM main.metrics');\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.macro_edges).toEqual([
+        {
+          lib_path: "f/mypipe/stats",
+          consumer_path: "f/mypipe/report",
+          macro_names: ["zscore"],
+          via_use: true,
+        },
+      ]);
+      // the library still becomes a node
+      expect(graph.runnables.some((r) => r.path === "f/mypipe/stats")).toBe(true);
+    },
+  );
+});
+
+test("an UNUSED in-folder `// macros` library is still a member node (deployed parity)", async () => {
+  // The deployed graph marks every macro library `auto_kind='pipeline'`, so an
+  // in-folder library is a member node (in_pipeline, with signatures) whether or
+  // not a consumer uses it. It is still excluded from runs (via `macros`).
+  await withFolder(
+    {
+      "unused.duckdb.sql": `-- macros\nCREATE MACRO helper(a) AS a + 1;\n`,
+      "solo.duckdb.sql": `-- pipeline\nSELECT 1;\n`,
+    },
+    async (root, folder) => {
+      const { graph, scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const lib = graph.runnables.find((r) => r.path === "f/mypipe/unused");
+      expect(lib?.in_pipeline).toBe(true);
+      expect(lib?.macros).toEqual([{ name: "helper", params: "a", is_table: false }]);
+      expect(graph.macro_edges).toBeUndefined();
+      // but it is not a previewable/runnable script — only `solo` is
+      expect(scripts.map((s) => s.path)).toEqual(["f/mypipe/solo"]);
+    },
+  );
+});
+
+test("a shared macro library OUTSIDE the pipeline folder is resolved (workspace-wide)", async () => {
+  // The deployed graph loads the macro registry workspace-wide and only
+  // folder-scopes consumers, so a pipeline in `f/mypipe` can use a shared library
+  // in `f/shared`. Local discovery must walk the whole `f/` tree, not just the
+  // folder, or the edge/node/docs are missing (parity gap).
+  const root = mkdtempSync(join(tmpdir(), "wm-pl-"));
+  writeFileSync(join(root, "wmill.yaml"), "defaultTs: bun\n");
+  mkdirSync(join(root, "f", "shared"), { recursive: true });
+  mkdirSync(join(root, "f", "mypipe"), { recursive: true });
+  writeFileSync(
+    join(root, "f", "shared", "stats.duckdb.sql"),
+    `-- macros\nCREATE MACRO zscore(x, m, s) AS (x - m) / s;\n`,
+  );
+  // one consumer calls the shared macro lexically, another pulls it via `// use`
+  writeFileSync(
+    join(root, "f", "mypipe", "fct.duckdb.sql"),
+    `-- pipeline\n-- on datatable://main/metrics\nSELECT zscore(v, 0, 1) FROM main.metrics;\n`,
+  );
+  writeFileSync(
+    join(root, "f", "mypipe", "dyn.duckdb.sql"),
+    `-- pipeline\n-- on datatable://main/metrics\n-- use f/shared/stats\nSELECT query('SELECT zscore(v, 0, 1)');\n`,
+  );
+  try {
+    const { graph } = await buildLocalPipelineGraph({ root, folder: "mypipe", defaultTs: "bun" });
+    expect(graph.macro_edges).toEqual([
+      {
+        lib_path: "f/shared/stats",
+        consumer_path: "f/mypipe/dyn",
+        macro_names: ["zscore"],
+        via_use: true,
+      },
+      {
+        lib_path: "f/shared/stats",
+        consumer_path: "f/mypipe/fct",
+        macro_names: ["zscore"],
+        via_use: false,
+      },
+    ]);
+    // the out-of-folder library is surfaced as a node with its signatures
+    expect(graph.runnables.find((r) => r.path === "f/shared/stats")?.macros).toEqual([
+      { name: "zscore", params: "x, m, s", is_table: false },
+    ]);
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test("macro library that CONSUMES another library gets a lib→lib edge (both nodes surface)", async () => {
+  // The deploy path records macro_usage for any DuckDB script, including a macro
+  // library calling another library's macros. A `base → derived` edge must exist
+  // (and `base`, an in-folder library, is a member node not just an edge stub).
+  await withFolder(
+    {
+      "base.duckdb.sql": `-- macros\nCREATE MACRO base_add(a, b) AS a + b;\n`,
+      // derived is a `// macros` library (NOT `// pipeline`) whose body calls base_add
+      "derived.duckdb.sql":
+        `-- macros\nCREATE MACRO derived_sum(a, b) AS base_add(a, b) * 2;\n`,
+      // the pipeline consumer calls derived_sum
+      "report.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/t\nSELECT derived_sum(x, y) FROM main.t;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.macro_edges).toEqual([
+        // base → derived: the intermediate library is itself a consumer
+        {
+          lib_path: "f/mypipe/base",
+          consumer_path: "f/mypipe/derived",
+          macro_names: ["base_add"],
+          via_use: false,
+        },
+        // derived → report: the pipeline consumer
+        {
+          lib_path: "f/mypipe/derived",
+          consumer_path: "f/mypipe/report",
+          macro_names: ["derived_sum"],
+          via_use: false,
+        },
+      ]);
+      // both libraries surface as nodes with their signatures (base does NOT
+      // disappear just because it is only reached transitively)
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/base")?.macros).toEqual([
+        { name: "base_add", params: "a, b", is_table: false },
+      ]);
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/derived")?.macros).toEqual([
+        { name: "derived_sum", params: "a, b", is_table: false },
+      ]);
+      // both intermediate libraries are members (in_pipeline), like the deployed graph
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/base")?.in_pipeline).toBe(true);
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/derived")?.in_pipeline).toBe(true);
+    },
+  );
+});
+
+test("macro library reaching another only via dynamic SQL gets a `// use` lib→lib edge", async () => {
+  // A library that calls another's macro only inside a `query('…')` string is
+  // invisible to lexical detection; `// use` forces the lib→lib edge. Exercises
+  // the case where the CONSUMER is itself a `// macros` library.
+  await withFolder(
+    {
+      "base.duckdb.sql": `-- macros\nCREATE MACRO base_add(a, b) AS a + b;\n`,
+      "derived.duckdb.sql":
+        `-- macros\n-- use f/mypipe/base\nCREATE MACRO wrap(a, b) AS query('SELECT base_add(1, 2)');\n`,
+      "report.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/t\nSELECT wrap(x, y) FROM main.t;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.macro_edges).toEqual([
+        // base → derived comes from `// use` (via_use), NOT a lexical call
+        {
+          lib_path: "f/mypipe/base",
+          consumer_path: "f/mypipe/derived",
+          macro_names: ["base_add"],
+          via_use: true,
+        },
+        {
+          lib_path: "f/mypipe/derived",
+          consumer_path: "f/mypipe/report",
+          macro_names: ["wrap"],
+          via_use: false,
+        },
+      ]);
+    },
+  );
+});
+
+test("a `// macros` (slash-prefix) DuckDB library is detected (backend prefix parity)", async () => {
+  // A `.duckdb.sql` library may head its annotation with `// macros` (the backend
+  // accepts `//`/`--`/`#` for any language); the local scan must too.
+  await withFolder(
+    {
+      "lib.duckdb.sql": `// macros\nCREATE MACRO dbl(a) AS a * 2;\n`,
+      "use_it.duckdb.sql": `-- pipeline\n-- on datatable://main/t\nSELECT dbl(x) FROM main.t;\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.macro_edges).toEqual([
+        {
+          lib_path: "f/mypipe/lib",
+          consumer_path: "f/mypipe/use_it",
+          macro_names: ["dbl"],
+          via_use: false,
+        },
+      ]);
+      expect(graph.runnables.find((r) => r.path === "f/mypipe/lib")?.macros).toEqual([
+        { name: "dbl", params: "a", is_table: false },
+      ]);
+    },
+  );
+});
+
+test("a non-pipeline DuckDB macro consumer is a display-only node, never a run step", async () => {
+  // A `.duckdb.sql` helper that calls a macro but isn't `// pipeline` surfaces as
+  // a graph node (lineage parity) but is NOT a runnable pipeline script: it must
+  // be absent from `scripts` (the previewable set `run --local` selects from), so
+  // it can never be scheduled or fail a preview for lack of local content.
+  await withFolder(
+    {
+      "lib.duckdb.sql": `-- macros\nCREATE MACRO dbl(a) AS a * 2;\n`,
+      "helper.duckdb.sql": `-- on ducklake://main/src\nSELECT dbl(x) FROM main.src;\n`,
+      "root.duckdb.sql": `-- pipeline\n-- materialize ducklake://main/out\nSELECT dbl(1) AS v;\n`,
+    },
+    async (root, folder) => {
+      const { graph, scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+
+      // the helper IS a node (macro consumer, for lineage display) …
+      const helper = graph.runnables.find((r) => r.path === "f/mypipe/helper");
+      expect(helper).toBeDefined();
+      // … but not a pipeline member (no local file to preview) and carries no macros
+      expect(helper?.in_pipeline).toBeFalsy();
+      expect(helper?.macros).toBeUndefined();
+      // the previewable set (what `run --local` can schedule) is ONLY the member
+      expect(scripts.map((s) => s.path)).toEqual(["f/mypipe/root"]);
+      // and the macro edge still connects lib → helper for the lineage view
+      expect(graph.macro_edges).toContainEqual({
+        lib_path: "f/mypipe/lib",
+        consumer_path: "f/mypipe/helper",
+        macro_names: ["dbl"],
+        via_use: false,
+      });
+    },
+  );
+});
+
+test("`// pipeline` on a macros library is redundant — it's a library node either way", async () => {
+  // The backend marks a macro library `auto_kind='pipeline'` regardless of the
+  // `// pipeline` marker, so a `-- pipeline -- macros` script behaves exactly like
+  // a plain `-- macros` one: a member library node (in_pipeline + signatures),
+  // excluded from runs (via `macros`) and from the previewable `scripts` set.
+  await withFolder(
+    {
+      "lib.duckdb.sql": `-- pipeline\n-- macros\nCREATE MACRO dbl(a) AS a * 2;\n`,
+      "root.duckdb.sql": `-- pipeline\n-- materialize ducklake://main/out\nSELECT 1 AS v;\n`,
+    },
+    async (root, folder) => {
+      const { graph, scripts } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const lib = graph.runnables.find((r) => r.path === "f/mypipe/lib");
+      expect(lib?.in_pipeline).toBe(true);
+      expect(lib?.macros).toEqual([{ name: "dbl", params: "a", is_table: false }]);
+      // unused here → no edges, but still a node; not previewable/runnable
+      expect(graph.macro_edges).toBeUndefined();
+      expect(scripts.map((s) => s.path)).toEqual(["f/mypipe/root"]);
+    },
+  );
+});
+
+test("`#`-comment languages (ruby) use the `#` annotation fallback (no wasm parser)", async () => {
+  await withFolder(
+    { "ingest.rb": `# pipeline\n# on s3://demo/raw.csv\nputs "hi"\n` },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      expect(graph.runnables.map((r) => r.path)).toContain("f/mypipe/ingest");
+      const at = graph.triggers.find(
+        (t) => t.trigger_kind === "asset" && t.runnable_path === "f/mypipe/ingest",
+      ) as Extract<(typeof graph.triggers)[number], { trigger_kind: "asset" }> | undefined;
+      expect(at?.asset_kind).toBe("s3object");
+      expect(at?.asset_path).toBe("demo/raw.csv");
+    },
+  );
+});
+
+test("pipeline docs renders a `Macro libraries` section (call + `// use`)", async () => {
+  const { generatePipelineMarkdown } = await import(
+    "../src/commands/pipeline/docs.ts"
+  );
+  await withFolder(
+    {
+      "macros_finance.duckdb.sql":
+        `-- macros\nCREATE MACRO net_revenue(gross, refunds) AS gross - refunds;\nCREATE MACRO safe_div(a, b) AS TABLE SELECT a / b;\n`,
+      "fct.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/orders\nSELECT net_revenue(gross, refunds) FROM main.orders;\n`,
+      "report.duckdb.sql":
+        `-- pipeline\n-- on datatable://main/orders\n-- use f/mypipe/macros_finance\nSELECT query('SELECT safe_div(1, 2)');\n`,
+    },
+    async (root, folder) => {
+      const { graph } = await buildLocalPipelineGraph({ root, folder, defaultTs: "bun" });
+      const md = generatePipelineMarkdown(folder, graph, [], true);
+
+      // count line mentions the library; two pipeline scripts, one library
+      expect(md).toContain("**2** scripts · **1** asset · **1** macro library");
+      // dedicated section with signatures (TABLE marker) and callers
+      expect(md).toContain("## Macro libraries");
+      expect(md).toContain("### `f/mypipe/macros_finance`");
+      expect(md).toContain("- `net_revenue(gross, refunds)`");
+      expect(md).toContain("- `safe_div(a, b)` → TABLE");
+      expect(md).toContain("`f/mypipe/fct` (calls `net_revenue`)");
+      expect(md).toContain("`f/mypipe/report` (via `// use`)");
+      // the library is NOT double-listed under `## Scripts`
+      expect(md).not.toContain("### `f/mypipe/macros_finance`\n\n- **");
+    },
+  );
+});
diff --git a/cli/test/pipeline_partition_unit.test.ts b/cli/test/pipeline_partition_unit.test.ts
new file mode 100644
index 0000000000..61fcc991b5
--- /dev/null
+++ b/cli/test/pipeline_partition_unit.test.ts
@@ -0,0 +1,23 @@
+import { expect, test } from "bun:test";
+import { defaultPartitionValue } from "../src/commands/pipeline/pipeline.ts";
+
+// Mirrors the backend defaults in partition_ee.rs::default_format — a --local
+// run resolves the partition client-side, so a divergence here writes a slice
+// the deployed cadence never reruns.
+test("defaultPartitionValue: time kinds match backend default formats (UTC)", () => {
+  const at = new Date(Date.UTC(2026, 6, 2, 6, 30)); // 2026-07-02T06:30Z, a Thursday
+  expect(defaultPartitionValue("daily", at)).toBe("2026-07-02");
+  expect(defaultPartitionValue("hourly", at)).toBe("2026-07-02T06");
+  expect(defaultPartitionValue("weekly", at)).toBe("2026-W27");
+  expect(defaultPartitionValue("monthly", at)).toBe("2026-07");
+  expect(defaultPartitionValue("dynamic", at)).toBeUndefined();
+});
+
+test("defaultPartitionValue: ISO week-year boundaries (%G-W%V)", () => {
+  // Jan 1 2026 is a Thursday → week 1 of 2026.
+  expect(defaultPartitionValue("weekly", new Date(Date.UTC(2026, 0, 1)))).toBe("2026-W01");
+  // Jan 1 2023 is a Sunday → still week 52 of 2022.
+  expect(defaultPartitionValue("weekly", new Date(Date.UTC(2023, 0, 1)))).toBe("2022-W52");
+  // Dec 30 2024 is a Monday → already week 1 of 2025.
+  expect(defaultPartitionValue("weekly", new Date(Date.UTC(2024, 11, 30)))).toBe("2025-W01");
+});
diff --git a/cli/test/pipeline_upload_unit.test.ts b/cli/test/pipeline_upload_unit.test.ts
new file mode 100644
index 0000000000..38a5a41035
--- /dev/null
+++ b/cli/test/pipeline_upload_unit.test.ts
@@ -0,0 +1,151 @@
+import { expect, test } from "bun:test";
+import {
+  devUploadKey,
+  parseArgBinding,
+  parseS3Uri,
+  parseUploadBinding,
+  s3Arg,
+  s3ObjectParams,
+} from "../src/commands/pipeline/pipelineUpload.ts";
+
+test("parseUploadBinding: bare script + local source infers the param later", () => {
+  expect(parseUploadBinding("ingest=./fixtures/events.csv")).toEqual({
+    scriptTok: "ingest",
+    source: "./fixtures/events.csv",
+  });
+});
+
+test("parseUploadBinding: explicit :param on the left", () => {
+  expect(parseUploadBinding("f/analytics/ingest:file=./events.csv")).toEqual({
+    scriptTok: "f/analytics/ingest",
+    param: "file",
+    source: "./events.csv",
+  });
+});
+
+test("parseUploadBinding: s3:// source — its `:` is right of the first `=`, so it stays intact", () => {
+  expect(parseUploadBinding("ingest=s3://bucket/2026/events.csv")).toEqual({
+    scriptTok: "ingest",
+    source: "s3://bucket/2026/events.csv",
+  });
+  expect(parseUploadBinding("ingest:file=s3://bucket/k")).toEqual({
+    scriptTok: "ingest",
+    param: "file",
+    source: "s3://bucket/k",
+  });
+});
+
+test("parseUploadBinding: malformed specs throw", () => {
+  expect(() => parseUploadBinding("ingest")).toThrow(); // no `=`
+  expect(() => parseUploadBinding("=./x.csv")).toThrow(); // no script
+  expect(() => parseUploadBinding("ingest=")).toThrow(); // no source
+  expect(() => parseUploadBinding("ingest:=./x.csv")).toThrow(); // empty param
+  expect(() => parseUploadBinding(":file=./x.csv")).toThrow(); // empty script
+});
+
+test("parseArgBinding: JSON values parse, non-JSON falls back to the raw string", () => {
+  // a bare date is not valid JSON → string
+  expect(parseArgBinding("daily_report:partition=2026-07-02")).toEqual({
+    scriptTok: "daily_report",
+    param: "partition",
+    value: "2026-07-02",
+  });
+  // JSON scalars/objects keep their type
+  expect(parseArgBinding("stats:limit=10")).toEqual({
+    scriptTok: "stats",
+    param: "limit",
+    value: 10,
+  });
+  expect(parseArgBinding("stats:enabled=true")).toEqual({
+    scriptTok: "stats",
+    param: "enabled",
+    value: true,
+  });
+  expect(parseArgBinding('f/pd/stats:opts={"a":1}')).toEqual({
+    scriptTok: "f/pd/stats",
+    param: "opts",
+    value: { a: 1 },
+  });
+  // quoting forces a string even for number-looking values
+  expect(parseArgBinding('stats:code="42"')).toEqual({
+    scriptTok: "stats",
+    param: "code",
+    value: "42",
+  });
+  // split on the FIRST `=` — values may contain `=`
+  expect(parseArgBinding("stats:expr=a=b")).toEqual({
+    scriptTok: "stats",
+    param: "expr",
+    value: "a=b",
+  });
+});
+
+test("parseArgBinding: :param is required and malformed specs throw", () => {
+  expect(() => parseArgBinding("stats=10")).toThrow(); // no :param
+  expect(() => parseArgBinding("stats:limit")).toThrow(); // no `=`
+  expect(() => parseArgBinding(":limit=10")).toThrow(); // empty script
+  expect(() => parseArgBinding("stats:=10")).toThrow(); // empty param
+});
+
+test("s3ObjectParams: only resource-s3_object properties, in declaration order", () => {
+  const schema = {
+    properties: {
+      note: { type: "string" },
+      file: { type: "object", format: "resource-s3_object" },
+      db: { type: "object", format: "resource-postgresql" },
+      backup: { type: "object", format: "resource-s3_object" },
+    },
+  };
+  expect(s3ObjectParams(schema)).toEqual(["file", "backup"]);
+  expect(s3ObjectParams({})).toEqual([]);
+  expect(s3ObjectParams(undefined)).toEqual([]);
+});
+
+test("s3ObjectParams: matches SQL-dialect resource-S3Object casing too", () => {
+  // TS/python parsers emit `resource-s3_object`; the SQL dialects (duckdb
+  // `-- $file (s3object)`) emit `resource-S3Object` — both must bind.
+  const schema = {
+    properties: {
+      file: { type: "object", format: "resource-S3Object" },
+      other: { type: "object", format: "resource-s3" },
+    },
+  };
+  expect(s3ObjectParams(schema)).toEqual(["file"]);
+});
+
+test("devUploadKey: key scoped by script path + param so basenames don't clobber", () => {
+  expect(devUploadKey("f/analytics/ingest", "file", "./fixtures/events.csv")).toBe(
+    "wmilldev/pipeline/f/analytics/ingest/file/events.csv",
+  );
+  // same basename, different script/param → distinct keys
+  expect(devUploadKey("f/analytics/other", "file", "/abs/events.csv")).toBe(
+    "wmilldev/pipeline/f/analytics/other/file/events.csv",
+  );
+  expect(devUploadKey("f/analytics/ingest", "backup", "/abs/events.csv")).toBe(
+    "wmilldev/pipeline/f/analytics/ingest/backup/events.csv",
+  );
+});
+
+test("s3Arg: shapes the S3Object run-arg", () => {
+  expect(s3Arg("file", { s3: "wmilldev/pipeline/analytics/events.csv" })).toEqual({
+    file: { s3: "wmilldev/pipeline/analytics/events.csv" },
+  });
+  expect(s3Arg("file", { s3: "k.csv", storage: "secondary" })).toEqual({
+    file: { s3: "k.csv", storage: "secondary" },
+  });
+});
+
+test("parseS3Uri: canonical `s3://<storage>/<key>` (authority is the named storage)", () => {
+  // named storage — the authority is the storage, the rest is the key
+  expect(parseS3Uri("s3://secondary/k.csv")).toEqual({ s3: "k.csv", storage: "secondary" });
+  // empty authority (`s3:///key`) ⇒ default storage, incl. nested keys
+  expect(parseS3Uri("s3:///events.csv")).toEqual({ s3: "events.csv" });
+  expect(parseS3Uri("s3:///raw/2026/events.csv")).toEqual({ s3: "raw/2026/events.csv" });
+  // named storage with a nested key
+  expect(parseS3Uri("s3://secondary/raw/2026/events.csv")).toEqual({
+    s3: "raw/2026/events.csv",
+    storage: "secondary",
+  });
+  // no `/` after the scheme → no authority; whole rest is the default-storage key
+  expect(parseS3Uri("s3://events.csv")).toEqual({ s3: "events.csv" });
+});
diff --git a/cli/test/resource_types_unit.test.ts b/cli/test/resource_types_unit.test.ts
new file mode 100644
index 0000000000..0966ae25bf
--- /dev/null
+++ b/cli/test/resource_types_unit.test.ts
@@ -0,0 +1,68 @@
+import { expect, test } from "bun:test";
+
+import { compileResourceTypeToTsType } from "../src/utils/resource_types.ts";
+import type { Schema } from "../bootstrap/common.ts";
+
+// =============================================================================
+// Resource-type namespace generation (WIN-2132)
+//
+// `compileResourceTypeToTsType` renders a JSON Schema into the body of a
+// TypeScript type used in the generated `rt.d.ts` (RT namespace). JSON Schema
+// property names are unconstrained, so a name with a colon, hyphen, or space
+// is legal in the schema but not a valid bare TS identifier. Emitting it raw
+// produced syntactically invalid output that broke `tsc`. These tests pin that
+// such names are quoted while plain identifiers stay bare.
+// =============================================================================
+
+function schema(properties: Schema["properties"]): Schema {
+  return {
+    $schema: undefined,
+    type: "object",
+    properties,
+    required: [],
+  };
+}
+
+test("plain identifiers are emitted without quotes", () => {
+  const out = compileResourceTypeToTsType(
+    schema({
+      host: { type: "string" },
+      _port: { type: "integer" },
+      $ref: { type: "boolean" },
+    })
+  );
+  expect(out).toContain("  host: string");
+  expect(out).toContain("  _port: number");
+  expect(out).toContain("  $ref: boolean");
+  expect(out).not.toContain('"host"');
+});
+
+test("non-identifier property names are double-quoted", () => {
+  const out = compileResourceTypeToTsType(
+    schema({
+      "content-type": { type: "string" },
+      "x:api:key": { type: "string" },
+      "with space": { type: "integer" },
+      "3leading": { type: "boolean" },
+    })
+  );
+  expect(out).toContain('  "content-type": string');
+  expect(out).toContain('  "x:api:key": string');
+  expect(out).toContain('  "with space": number');
+  expect(out).toContain('  "3leading": boolean');
+});
+
+test("nested object and array property names are quoted too", () => {
+  const out = compileResourceTypeToTsType(
+    schema({
+      "nested-obj": {
+        type: "object",
+        properties: { "inner-key": { type: "string" } },
+      },
+      "arr-field": { type: "array", items: { type: "string" } },
+    })
+  );
+  expect(out).toContain('"nested-obj": {');
+  expect(out).toContain('"inner-key": string');
+  expect(out).toContain('"arr-field": string[]');
+});
diff --git a/cli/test/standalone_commands.test.ts b/cli/test/standalone_commands.test.ts
index bb1e13cde8..271b13867b 100644
--- a/cli/test/standalone_commands.test.ts
+++ b/cli/test/standalone_commands.test.ts
@@ -286,7 +286,10 @@ describe("script show command", () => {
 // =============================================================================
 
 describe("script run command", () => {
-  test("runs a script and returns result", { timeout: 60000 }, async () => {
+  // retry absorbs transient worker-side job failures on CI (notably the
+  // Windows standalone worker); the script is deterministic, so a failure is
+  // environmental rather than a real regression.
+  test("runs a script and returns result", { timeout: 60000, retry: 2 }, async () => {
     await withTestBackend(async (backend, tempDir) => {
       await setupWorkspaceProfile(backend);
 
@@ -301,12 +304,13 @@ describe("script run command", () => {
         tempDir
       );
 
-      expect(result.code).toEqual(0);
-      expect(result.stdout).toContain(`run_result_${uniqueId}`);
+      const diag = `code: ${result.code}\nstdout: ${result.stdout}\nstderr: ${result.stderr}`;
+      expect(result.code, diag).toEqual(0);
+      expect(result.stdout, diag).toContain(`run_result_${uniqueId}`);
     });
   });
 
-  test("exits with code 1 when script fails", { timeout: 60000 }, async () => {
+  test("exits with code 1 when script fails", { timeout: 60000, retry: 2 }, async () => {
     await withTestBackend(async (backend, tempDir) => {
       await setupWorkspaceProfile(backend);
 
diff --git a/cli/test/variable_ciphertext_shape_unit.test.ts b/cli/test/variable_ciphertext_shape_unit.test.ts
new file mode 100644
index 0000000000..0113929164
--- /dev/null
+++ b/cli/test/variable_ciphertext_shape_unit.test.ts
@@ -0,0 +1,42 @@
+import { expect, test } from "bun:test";
+
+import { looksLikeWorkspaceCiphertext } from "../src/commands/variable/variable.ts";
+
+// =============================================================================
+// looksLikeWorkspaceCiphertext drives whether single-file `variable push` treats
+// a secret's value as already-encrypted (store verbatim) or as plaintext to be
+// encrypted server-side. It must agree with the server guard
+// (validate_already_encrypted_secret in windmill-store/src/variables.rs): a value
+// is "ciphertext shaped" iff it is an external-backend marker, or standard base64
+// decoding to a non-zero multiple of the AES block size (16 bytes).
+// =============================================================================
+
+test("treats workspace-ciphertext-shaped values as already-encrypted", () => {
+  const ciphertextShaped = [
+    "MpYeXnSBBF7dzI6K8J89xQ==", // real magic_crypt output: 16 bytes
+    Buffer.alloc(16, 7).toString("base64"), // 16 bytes
+    Buffer.alloc(32, 7).toString("base64"), // 32 bytes
+    "$vault:f/x/cfg",
+    "$aws_sm:f/x/cfg",
+    "$azure_kv:f/x/cfg",
+  ];
+  for (const value of ciphertextShaped) {
+    expect(looksLikeWorkspaceCiphertext(value)).toBe(true);
+  }
+});
+
+test("treats hand-authored plaintext as NOT already-encrypted", () => {
+  const plaintext = [
+    "some: plaintext\n", // space, colon, newline
+    "original-secret", // hyphen, not length % 4
+    "hunter2",
+    '{"a": 1}',
+    "", // empty
+    "dGVzdA==", // valid base64 but decodes to 4 bytes (not % 16)
+    Buffer.alloc(17, 7).toString("base64"), // 17 bytes (not % 16)
+    "$omething-plain", // starts with $ but is not a real backend marker
+  ];
+  for (const value of plaintext) {
+    expect(looksLikeWorkspaceCiphertext(value)).toBe(false);
+  }
+});
diff --git a/cli/test/variable_resource_push.test.ts b/cli/test/variable_resource_push.test.ts
index e8b0dc9e26..e6bc84c326 100644
--- a/cli/test/variable_resource_push.test.ts
+++ b/cli/test/variable_resource_push.test.ts
@@ -219,6 +219,103 @@ describe("variable", () => {
     });
   });
 
+  test("push encrypts a plaintext secret value (no --plain-secrets) and round-trips", async () => {
+    await withTestBackend(async (backend, tempDir) => {
+      await setupWorkspaceProfile(backend);
+
+      const uniqueId = Date.now();
+      const varPath = `f/test/sec_push_${uniqueId}`;
+
+      // Existing secret variable (server-encrypted).
+      const createResp = await backend.apiRequest!(
+        `/api/w/${backend.workspace}/variables/create`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            path: varPath,
+            value: "original-secret",
+            is_secret: true,
+            description: "",
+          }),
+        }
+      );
+      expect(createResp.status).toBeLessThan(300);
+      await createResp.text();
+
+      // A hand-authored spec file: plaintext value, is_secret: true. Pushing it
+      // without --plain-secrets must encrypt the value server-side, not store the
+      // plaintext verbatim as ciphertext (which would make every read fail).
+      const specPath = join(tempDir, "v.yaml");
+      await writeFile(
+        specPath,
+        `value: |\n  some: plaintext\nis_secret: true\ndescription: ""\n`,
+        "utf-8"
+      );
+
+      const pushResult = await backend.runCLICommand(
+        ["variable", "push", specPath, varPath],
+        tempDir
+      );
+      expect(pushResult.code).toEqual(0);
+
+      // The value must decrypt cleanly to the pushed plaintext.
+      const apiResp = await backend.apiRequest!(
+        `/api/w/${backend.workspace}/variables/get/${varPath}?decrypt_secret=true`
+      );
+      expect(apiResp.status).toEqual(200);
+      const varData = await apiResp.json();
+      expect(varData.is_secret).toBe(true);
+      expect(varData.value).toBe("some: plaintext\n");
+    });
+  });
+
+  test("push flips is_secret from true to false", async () => {
+    await withTestBackend(async (backend, tempDir) => {
+      await setupWorkspaceProfile(backend);
+
+      const uniqueId = Date.now();
+      const varPath = `f/test/sec_down_${uniqueId}`;
+
+      const createResp = await backend.apiRequest!(
+        `/api/w/${backend.workspace}/variables/create`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            path: varPath,
+            value: "original-secret",
+            is_secret: true,
+            description: "",
+          }),
+        }
+      );
+      expect(createResp.status).toBeLessThan(300);
+      await createResp.text();
+
+      const specPath = join(tempDir, "v_down.yaml");
+      await writeFile(
+        specPath,
+        `value: "now-public"\nis_secret: false\ndescription: ""\n`,
+        "utf-8"
+      );
+
+      const pushResult = await backend.runCLICommand(
+        ["variable", "push", specPath, varPath],
+        tempDir
+      );
+      expect(pushResult.code).toEqual(0);
+
+      const apiResp = await backend.apiRequest!(
+        `/api/w/${backend.workspace}/variables/get/${varPath}?decrypt_secret=true`
+      );
+      expect(apiResp.status).toEqual(200);
+      const varData = await apiResp.json();
+      expect(varData.is_secret).toBe(false);
+      expect(varData.value).toBe("now-public");
+    });
+  });
+
   test("pull retrieves variables into local files", async () => {
     await withTestBackend(async (backend, tempDir) => {
       await setupWorkspaceProfile(backend);
diff --git a/cli/windmill-utils-internal/package.json b/cli/windmill-utils-internal/package.json
index 37cfbfaef4..525bb0fc0b 100644
--- a/cli/windmill-utils-internal/package.json
+++ b/cli/windmill-utils-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "windmill-utils-internal",
-  "version": "1.7.0",
+  "version": "1.8.2",
   "description": "Internal utility functions for Windmill",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/cli/windmill-utils-internal/src/deploy.ts b/cli/windmill-utils-internal/src/deploy.ts
index 990fd47edd..4c2bd735b3 100644
--- a/cli/windmill-utils-internal/src/deploy.ts
+++ b/cli/windmill-utils-internal/src/deploy.ts
@@ -21,6 +21,7 @@ export type DeployKind =
   | "resource_type"
   | "folder"
   | "schedule"
+  | "datatable_migration"
   | "http_trigger"
   | "websocket_trigger"
   | "kafka_trigger"
@@ -161,6 +162,24 @@ export interface DeployProvider {
     requestBody: any;
   }): Promise<any>;
   deleteFolder(p: { workspace: string; name: string }): Promise<any>;
+  // Datatable migrations. In the diff, an item's `path` is
+  // `<datatable>/<timestamp>_<name>` (see `parseDatatableMigrationDeployPath`).
+  listDatatableMigrations(p: { workspace: string }): Promise<any>;
+  upsertDatatableMigration(p: {
+    workspace: string;
+    datatableName: string;
+    requestBody: {
+      timestamp: number;
+      name: string;
+      code_up: string;
+      code_down?: string;
+    };
+  }): Promise<any>;
+  deleteDatatableMigration(p: {
+    workspace: string;
+    datatableName: string;
+    timestamp: number;
+  }): Promise<any>;
   // Triggers — per-kind dispatch is delegated to the implementor so the shared
   // module doesn't need to know about each of the 9 trigger services.
   existsTriggerByKind(
@@ -299,6 +318,40 @@ function toError(e: unknown): string {
   return err.body || err.message || String(e);
 }
 
+// A datatable-migration diff item's path is `<datatable>/<timestamp>_<name>`
+// (mirrors the backend, e.g. `mydt/20260101000001_create_users`).
+export function parseDatatableMigrationDeployPath(path: string): {
+  datatable: string;
+  timestamp: number;
+  name: string;
+} {
+  const slash = path.indexOf("/");
+  const underscore = slash >= 0 ? path.indexOf("_", slash + 1) : -1;
+  if (slash < 0 || underscore < 0) {
+    throw new Error(`Invalid datatable migration path: ${path}`);
+  }
+  const datatable = path.slice(0, slash);
+  const timestamp = Number(path.slice(slash + 1, underscore));
+  const name = path.slice(underscore + 1);
+  if (!datatable || !Number.isFinite(timestamp) || !name) {
+    throw new Error(`Invalid datatable migration path: ${path}`);
+  }
+  return { datatable, timestamp, name };
+}
+
+// The backend rejects `upsertDatatableMigration` when the target data table
+// hasn't opted in to migrations. Turn that opaque 400 into an explicit,
+// deploy-context message (falls back to the original error otherwise).
+function asMigrationsDisabledError(e: unknown, datatable: string): unknown {
+  const msg = (e as { body?: string; message?: string })?.body ?? ''
+  if (typeof msg === "string" && /migrations are not enabled/i.test(msg)) {
+    return new Error(
+      `Data table '${datatable}' has not opted in to migrations on the target workspace; enable migrations for it there before deploying its migrations.`
+    );
+  }
+  return e;
+}
+
 // ---------------------------------------------------------------------------
 // checkItemExists
 // ---------------------------------------------------------------------------
@@ -325,6 +378,12 @@ export async function checkItemExists(
     return provider.existsFolder({ workspace, name: folderName(path) });
   } else if (kind === "schedule") {
     return provider.existsSchedule({ workspace, path });
+  } else if (kind === "datatable_migration") {
+    const { datatable, timestamp } = parseDatatableMigrationDeployPath(path);
+    const migrations = await provider.listDatatableMigrations({ workspace });
+    return (migrations as { datatable: string; timestamp: number }[]).some(
+      (m) => m.datatable === datatable && m.timestamp === timestamp
+    );
   } else if (isTriggerKind(kind)) {
     return provider.existsTriggerByKind(kind, { workspace, path });
   }
@@ -639,6 +698,41 @@ export async function deployItem(
           requestBody,
         });
       }
+    } else if (kind === "datatable_migration") {
+      const { datatable, timestamp } = parseDatatableMigrationDeployPath(path);
+      const migrations = await provider.listDatatableMigrations({
+        workspace: workspaceFrom,
+      });
+      const migration = (
+        migrations as {
+          datatable: string;
+          timestamp: number;
+          name: string;
+          code_up: string;
+          code_down?: string;
+        }[]
+      ).find((m) => m.datatable === datatable && m.timestamp === timestamp);
+      if (!migration) {
+        throw new Error(
+          `Datatable migration ${path} not found in ${workspaceFrom}`
+        );
+      }
+      try {
+        await provider.upsertDatatableMigration({
+          workspace: workspaceTo,
+          datatableName: datatable,
+          requestBody: {
+            timestamp: migration.timestamp,
+            name: migration.name,
+            code_up: migration.code_up,
+            ...(migration.code_down != null
+              ? { code_down: migration.code_down }
+              : {}),
+          },
+        });
+      } catch (e) {
+        throw asMigrationsDisabledError(e, datatable);
+      }
     } else {
       throw new Error(`Unknown kind: ${kind}`);
     }
@@ -684,6 +778,13 @@ export async function deleteItemInWorkspace(
       await provider.deleteFolder({ workspace, name: folderName(path) });
     } else if (kind === "schedule") {
       await provider.deleteSchedule({ workspace, path });
+    } else if (kind === "datatable_migration") {
+      const { datatable, timestamp } = parseDatatableMigrationDeployPath(path);
+      await provider.deleteDatatableMigration({
+        workspace,
+        datatableName: datatable,
+        timestamp,
+      });
     } else if (isTriggerKind(kind)) {
       await provider.deleteTriggerByKind(kind, { workspace, path });
     } else {
@@ -767,6 +868,29 @@ export async function getItemValue(
     } else if (isTriggerKind(kind)) {
       const trigger = await provider.getTriggerValue(kind, { workspace, path });
       return stripTriggerOrScheduleRuntimeFields(trigger);
+    } else if (kind === "datatable_migration") {
+      // Surface the migration SQL so the diff drawer shows the up/down bodies a
+      // reviewer needs to inspect before deploying.
+      const { datatable, timestamp } = parseDatatableMigrationDeployPath(path);
+      const migrations = (await provider.listDatatableMigrations({
+        workspace,
+      })) as {
+        datatable: string;
+        timestamp: number;
+        name: string;
+        code_up: string;
+        code_down?: string;
+      }[];
+      const migration = migrations.find(
+        (m) => m.datatable === datatable && m.timestamp === timestamp
+      );
+      if (migration) {
+        return {
+          name: migration.name,
+          code_up: migration.code_up,
+          code_down: migration.code_down ?? null,
+        };
+      }
     }
   } catch {
     // Item may not exist
diff --git a/debugger/dap_debug_service.ts b/debugger/dap_debug_service.ts
index 0486814ff3..2b9ce46272 100644
--- a/debugger/dap_debug_service.ts
+++ b/debugger/dap_debug_service.ts
@@ -149,6 +149,22 @@ const logger = {
 const WINDMILL_BASE_URL = process.env.WINDMILL_BASE_URL || process.env.BASE_INTERNAL_URL // e.g., http://localhost:8000
 const REQUIRE_SIGNED_REQUESTS = process.env.REQUIRE_SIGNED_DEBUG_REQUESTS !== 'false'
 
+// Opt-in cross-origin protection (CSWSH defense-in-depth). When
+// DEBUG_ALLOWED_ORIGINS is set (comma-separated list of origins), browser
+// requests carrying a non-matching Origin header are rejected at the
+// handshake. Non-browser clients send no Origin and are unaffected; code
+// execution is independently gated by signed-token verification on launch.
+const ALLOWED_ORIGINS = (process.env.DEBUG_ALLOWED_ORIGINS || '')
+	.split(',')
+	.map(o => o.trim())
+	.filter(Boolean)
+
+function isOriginRejected(req: Request): boolean {
+	const origin = req.headers.get('origin')
+	if (!origin || ALLOWED_ORIGINS.length === 0) return false
+	return !ALLOWED_ORIGINS.includes(origin)
+}
+
 interface JWK {
 	kty: string
 	crv: string
@@ -897,9 +913,18 @@ class PythonDebugSession extends BaseDebugSession {
 		this.mainArgs = (args.args as Record<string, unknown>) || {}
 		this.envVars = (args.env as Record<string, string>) || {}
 
-		// Verify JWT token if code is provided (signed debug request)
-		// The token is passed in the launch arguments
-		if (code && REQUIRE_SIGNED_REQUESTS) {
+		// Enforce signing on every launch. The token is passed in the launch
+		// arguments and is verified against the inline `code` (see windmill-api-debug).
+		if (REQUIRE_SIGNED_REQUESTS) {
+			// The backend only signs inline `code`; a `program`-mode launch names an
+			// arbitrary server-side file path that gets read and executed and is never
+			// signed. Refuse it so it cannot bypass token verification entirely.
+			if (this.scriptPath) {
+				logger.error('Rejected program-mode launch: only signed inline code is permitted')
+				this.sendResponse(request, false, {}, 'program-mode launch is not permitted; submit signed code instead')
+				return
+			}
+
 			const token = args.token as string | undefined
 			if (!token) {
 				logger.error('No debug token provided but signed requests are required')
@@ -907,7 +932,7 @@ class PythonDebugSession extends BaseDebugSession {
 				return
 			}
 
-			const verificationError = await verifyDebugToken(token, code)
+			const verificationError = await verifyDebugToken(token, code ?? '')
 			if (verificationError) {
 				logger.error(`Token verification failed: ${verificationError}`)
 				this.sendResponse(request, false, {}, `Token verification failed: ${verificationError}`)
@@ -1067,6 +1092,11 @@ const server = Bun.serve({
 		const url = new URL(req.url)
 		const path = url.pathname
 
+		if (isOriginRejected(req)) {
+			logger.warn(`Rejected request from disallowed origin: ${req.headers.get('origin')}`)
+			return new Response('Forbidden origin', { status: 403 })
+		}
+
 		// Handle WebSocket upgrade with path-based routing
 		if (server.upgrade(req, { data: { path } })) {
 			logger.info(`WS upgrade: ${path}`)
diff --git a/debugger/dap_websocket_server_bun.ts b/debugger/dap_websocket_server_bun.ts
index 9caa0d4e61..d6ed8967ad 100644
--- a/debugger/dap_websocket_server_bun.ts
+++ b/debugger/dap_websocket_server_bun.ts
@@ -222,6 +222,21 @@ function generateMainCallArgs(code: string, args: Record<string, unknown>): stri
 const WINDMILL_BASE_URL = process.env.WINDMILL_BASE_URL || process.env.BASE_INTERNAL_URL // e.g., http://localhost:8000
 const REQUIRE_SIGNED_REQUESTS = process.env.REQUIRE_SIGNED_DEBUG_REQUESTS !== 'false'
 
+// Opt-in cross-origin protection (CSWSH defense-in-depth); see
+// dap_debug_service.ts for the rationale. Only enforced for this file's
+// standalone Bun.serve entrypoint (the windmill-extra runtime imports the
+// DebugSession class and runs the guarded server in dap_debug_service.ts).
+const ALLOWED_ORIGINS = (process.env.DEBUG_ALLOWED_ORIGINS || '')
+	.split(',')
+	.map(o => o.trim())
+	.filter(Boolean)
+
+function isOriginRejected(req: Request): boolean {
+	const origin = req.headers.get('origin')
+	if (!origin || ALLOWED_ORIGINS.length === 0) return false
+	return !ALLOWED_ORIGINS.includes(origin)
+}
+
 interface JWK {
 	kty: string
 	crv: string
@@ -1428,9 +1443,18 @@ export class DebugSession {
 		this.mainArgs = (args.args as Record<string, unknown>) || {}
 		this.envVars = (args.env as Record<string, string>) || {}
 
-		// Verify JWT token if code is provided (signed debug request)
-		// The token is passed in the launch arguments
-		if (code && REQUIRE_SIGNED_REQUESTS) {
+		// Enforce signing on every launch. The token is passed in the launch
+		// arguments and is verified against the inline `code` (see windmill-api-debug).
+		if (REQUIRE_SIGNED_REQUESTS) {
+			// The backend only signs inline `code`; a `program`-mode launch names an
+			// arbitrary server-side file path that gets read and executed and is never
+			// signed. Refuse it so it cannot bypass token verification entirely.
+			if (this.scriptPath) {
+				logger.error('Rejected program-mode launch: only signed inline code is permitted')
+				this.sendResponse(request, false, {}, 'program-mode launch is not permitted; submit signed code instead')
+				return
+			}
+
 			const token = args.token as string | undefined
 			if (!token) {
 				logger.error('No debug token provided but signed requests are required')
@@ -1438,7 +1462,7 @@ export class DebugSession {
 				return
 			}
 
-			const verificationError = await verifyDebugToken(token, code)
+			const verificationError = await verifyDebugToken(token, code ?? '')
 			if (verificationError) {
 				logger.error(`Token verification failed: ${verificationError}`)
 				this.sendResponse(request, false, {}, `Token verification failed: ${verificationError}`)
@@ -2535,6 +2559,10 @@ if (import.meta.main) {
 		hostname: host,
 		port,
 		fetch(req, server) {
+			if (isOriginRejected(req)) {
+				logger.warn(`Rejected request from disallowed origin: ${req.headers.get('origin')}`)
+				return new Response('Forbidden origin', { status: 403 })
+			}
 			// Upgrade to WebSocket
 			if (server.upgrade(req)) {
 				return undefined as unknown as Response
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b30479481..60be2185b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -182,8 +182,9 @@ services:
       - ENABLE_DEBUGGER=true # Set to true to enable debugger
       - DEBUGGER_PORT=3003 # Debugger service port
       - ENABLE_NSJAIL=false # Set to true for nsjail sandboxing (requires privileged: true)
-      - REQUIRE_SIGNED_DEBUG_REQUESTS=false # Set to true to require JWT tokens for debug sessions
+      - REQUIRE_SIGNED_DEBUG_REQUESTS=true # Require backend-signed JWT tokens for debug sessions. Do NOT set to false on any internet-reachable deployment: it exposes an unauthenticated code-execution debugger.
       - WINDMILL_BASE_URL=http://windmill_server:8000
+      # - DEBUG_ALLOWED_ORIGINS=https://your-windmill-host # Optional CSWSH hardening: comma-separated allowlist of browser Origins permitted to open debug WebSockets
     volumes:
       - lsp_cache:/pyls/.cache
     logging: *default-logging
diff --git a/docker/DockerfileFullEe b/docker/DockerfileFullEe
index 3fbb06da71..b82a45b89a 100644
--- a/docker/DockerfileFullEe
+++ b/docker/DockerfileFullEe
@@ -35,7 +35,10 @@ RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
 
 # Oracle DB Client
 COPY --from=oracledb-client /opt/oracle/23/lib /opt/oracle/23/lib
-RUN apt-get -y update && apt-get install -y libaio1
+# libaio1t64 only ships libaio.so.1t64; Oracle instantclient loads libaio.so.1, so add a compat symlink
+RUN apt-get -y update && apt-get install -y libaio1t64 \
+    && libaio="$(find /usr/lib -name 'libaio.so.1t64' -print -quit)" \
+    && ln -s "$(basename "$libaio")" "$(dirname "$libaio")/libaio.so.1"
 RUN echo /opt/oracle/23/lib > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
 
 # Nushell
diff --git a/docker/DockerfileSlim b/docker/DockerfileSlim
index aca18aea22..f7794f87bf 100644
--- a/docker/DockerfileSlim
+++ b/docker/DockerfileSlim
@@ -1,6 +1,6 @@
-ARG DEBIAN_IMAGE=debian:bookworm-slim
+ARG DEBIAN_IMAGE=debian:trixie-slim
 
-FROM debian:bookworm-slim AS nsjail
+FROM debian:trixie-slim AS nsjail
 
 WORKDIR /nsjail
 
@@ -9,12 +9,12 @@ RUN apt-get -y update \
     bison=2:3.8.* \
     ca-certificates \
     flex=2.6.* \
-    g++=4:12.2.* \
-    gcc=4:12.2.* \
-    git=1:2.39.* \
+    g++=4:14.2.* \
+    gcc=4:14.2.* \
+    git=1:2.47.* \
     libprotobuf-dev=3.21.* \
     libnl-route-3-dev=3.7.* \
-    make=4.3-4.1 \
+    make=4.4.* \
     pkg-config=1.8.* \
     protobuf-compiler=3.21.* \
     && apt-get clean \
@@ -39,7 +39,7 @@ ENV PATH=/usr/local/bin:/root/.local/bin:/tmp/.local/bin:$PATH
 
 # Install system dependencies
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates wget curl git jq unzip unixodbc xmlsec1 gnupg lsb-release libgnutls30 libgcrypt20 \
+    && apt-get install -y --no-install-recommends ca-certificates wget curl git jq unzip unixodbc xmlsec1 gnupg lsb-release libgnutls30t64 libgcrypt20 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -54,7 +54,7 @@ RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmo
 ENV TZ=Etc/UTC
 
 # Install UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.9.25/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.11.24/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
 
 # Preinstall python runtime to temp location (will copy with world-writable perms later)
 # --compile-bytecode precompiles the stdlib to .pyc so jobs don't recompile it on every run
@@ -86,13 +86,13 @@ COPY --from=docker:29-dind /usr/local/bin/docker /usr/local/bin/
 
 # nsjail runtime deps and binary
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends libprotobuf32 libnl-route-3-200 libnl-3-200 \
+    && apt-get install -y --no-install-recommends libprotobuf32t64 libnl-route-3-200 libnl-3-200 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
 # crane: pulls + flattens images for the sandboxed container runtime (`# sandbox <image>`).
 # Single static binary — no daemon/store/root needed. See docs/docker-v2-runtime.md.
-ARG CRANE_VERSION=v0.20.6
+ARG CRANE_VERSION=v0.21.7
 RUN arch="$(dpkg --print-architecture)"; \
     case "$arch" in amd64) crane_arch=x86_64 ;; arm64) crane_arch=arm64 ;; *) echo >&2 "error: unsupported arch '$arch' for crane"; exit 1 ;; esac; \
     wget -O /tmp/crane.tgz "https://github.com/google/go-containerregistry/releases/download/${CRANE_VERSION}/go-containerregistry_Linux_${crane_arch}.tar.gz" \
diff --git a/docker/DockerfileSlimEe b/docker/DockerfileSlimEe
index b8e5c06a01..e460797f4e 100644
--- a/docker/DockerfileSlimEe
+++ b/docker/DockerfileSlimEe
@@ -1,6 +1,6 @@
-ARG DEBIAN_IMAGE=debian:bookworm-slim
+ARG DEBIAN_IMAGE=debian:trixie-slim
 
-FROM debian:bookworm-slim AS nsjail
+FROM debian:trixie-slim AS nsjail
 
 WORKDIR /nsjail
 
@@ -9,12 +9,12 @@ RUN apt-get -y update \
     bison=2:3.8.* \
     ca-certificates \
     flex=2.6.* \
-    g++=4:12.2.* \
-    gcc=4:12.2.* \
-    git=1:2.39.* \
+    g++=4:14.2.* \
+    gcc=4:14.2.* \
+    git=1:2.47.* \
     libprotobuf-dev=3.21.* \
     libnl-route-3-dev=3.7.* \
-    make=4.3-4.1 \
+    make=4.4.* \
     pkg-config=1.8.* \
     protobuf-compiler=3.21.* \
     && apt-get clean \
@@ -39,7 +39,7 @@ ENV PATH=/usr/local/bin:/root/.local/bin:/tmp/.local/bin:$PATH
 
 # Install system dependencies
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates wget curl git jq unzip unixodbc xmlsec1 gnupg lsb-release libgnutls30 libgcrypt20 \
+    && apt-get install -y --no-install-recommends ca-certificates wget curl git jq unzip unixodbc xmlsec1 gnupg lsb-release libgnutls30t64 libgcrypt20 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -54,7 +54,7 @@ RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmo
 ENV TZ=Etc/UTC
 
 # Install UV
-RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.9.25/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
+RUN curl --proto '=https' --tlsv1.2 -LsSf https://github.com/astral-sh/uv/releases/download/0.11.24/uv-installer.sh | sh && mv /root/.local/bin/uv /usr/local/bin/uv
 
 # Preinstall python runtime to temp location (will copy with world-writable perms later)
 # --compile-bytecode precompiles the stdlib to .pyc so jobs don't recompile it on every run
@@ -86,13 +86,13 @@ COPY --from=docker:29-dind /usr/local/bin/docker /usr/local/bin/
 
 # nsjail runtime deps and binary
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends libprotobuf32 libnl-route-3-200 libnl-3-200 \
+    && apt-get install -y --no-install-recommends libprotobuf32t64 libnl-route-3-200 libnl-3-200 \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
 # crane: pulls + flattens images for the sandboxed container runtime (`# sandbox <image>`).
 # Single static binary — no daemon/store/root needed. See docs/docker-v2-runtime.md.
-ARG CRANE_VERSION=v0.20.6
+ARG CRANE_VERSION=v0.21.7
 RUN arch="$(dpkg --print-architecture)"; \
     case "$arch" in amd64) crane_arch=x86_64 ;; arm64) crane_arch=arm64 ;; *) echo >&2 "error: unsupported arch '$arch' for crane"; exit 1 ;; esac; \
     wget -O /tmp/crane.tgz "https://github.com/google/go-containerregistry/releases/download/${CRANE_VERSION}/go-containerregistry_Linux_${crane_arch}.tar.gz" \
diff --git a/docs/ducklake-materialization.md b/docs/ducklake-materialization.md
new file mode 100644
index 0000000000..32fff7ca23
--- /dev/null
+++ b/docs/ducklake-materialization.md
@@ -0,0 +1,635 @@
+# DuckLake-native materialization
+
+Design sketch for "managed, versioned, incremental" assets built on the
+DuckLake substrate. This is a companion to [`pipelines-vs-dbt.md`](./pipelines-vs-dbt.md)
+and extends its **Path C (hybrid, partition-first)** recommendation. For the
+extract-load side that feeds these materializations, see §"Ingestion (EL)"
+at the end of this doc (user-facing guide: windmilldocs
+`core_concepts/63_pipelines` → "Ingestion (EL)"). The new
+contribution here is leveraging DuckLake's snapshot/time-travel layer, which
+the earlier doc's incremental deep-dive did not use. The annotation grammar is
+reconciled with that doc — `// partitioned` + `// unique_key` + `// append`
+stay canonical; nothing here forks a competing vocabulary.
+
+## The core reframe
+
+dbt had to *build* a materialization engine (compile SQL → `CREATE TABLE AS` /
+incremental `MERGE` / SCD2 snapshots) because the warehouse gives it nothing
+but raw SQL over a mutable table. DuckLake hands us, at the storage layer, the
+four things that engine exists to provide:
+
+| Capability | Source |
+|---|---|
+| ACID multi-statement transactions | DuckLake |
+| A snapshot per commit + time-travel (`AT (VERSION => n)` / `AT (TIMESTAMP => ...)`) | DuckLake |
+| Physical partitioning + pruning (`ALTER TABLE … SET PARTITIONED BY (…)`) | DuckLake |
+| Schema evolution tracked in the catalog DB | DuckLake |
+
+Windmill already attaches DuckLake fully — see `transform_attach_ducklake`
+(`backend/windmill-worker/src/duckdb_executor.rs:661`), which rewrites a user's
+`ATTACH 'ducklake://name' AS dl` into the real
+`ATTACH 'ducklake:postgres:…' AS dl (DATA_PATH 's3://…', OVERRIDE_DATA_PATH
+TRUE, AUTOMATIC_MIGRATION TRUE)` at `duckdb_executor.rs:730`. But today every
+write is a destructive overwrite and **all four capabilities above are thrown
+away** — snapshots are never surfaced, partitioning is purely an orchestration
+concept disconnected from the physical layout.
+
+So the materialization engine we need is a thin layer — a write-strategy
+wrapper + snapshot capture — not a dbt rebuild. This is exactly the
+"buy A's 80% without B's dialect-rewriting tax" tradeoff `pipelines-vs-dbt.md`
+argued for; DuckLake is what makes the remaining 20% (versioning, reproducible
+reads, materialization history) nearly free instead of a second project.
+
+## Annotation grammar (final)
+
+One self-documenting line; managed-by-default. Strategy options live *on* the
+`materialize` line (they have no meaning without it), while `// partitioned`
+stays separate because it is cross-cutting (cascade + scheduling + materialize).
+
+```
+// materialize ducklake://analytics/orders_daily              → managed, replace (default)
+// materialize ducklake://analytics/orders_daily key=order_id → managed, merge (SCD type 1)
+// materialize ducklake://analytics/orders_daily append       → managed, append
+// materialize ducklake://analytics/dim_customer key=id history → managed, SCD type 2 history
+// materialize manual ducklake://analytics/orders_daily       → track-only escape hatch
+// materialize ducklake://analytics/raw_events on_schema_change=ignore
+//                                  → managed, downstream contract warnings muted
+```
+
+- **managed (default)** — the script is *setup + one trailing `SELECT`*; Windmill
+  generates the write DDL, captures the DuckLake snapshot, and records state.
+  DuckDB-only; validated at deploy (a non-SELECT script is rejected with a clear
+  error pointing to the `wmll.ducklake` helpers).
+- **`manual`** — escape hatch: the script writes its own DDL; Windmill only
+  records state (no snapshot capture, no idempotency guarantee). Rare; explicit.
+- **`key=<col>`** → MERGE (upsert-by-key within the slice, SCD type 1 —
+  overwrites history); **`append`** → INSERT-only; neither → DELETE-by-partition
+  + INSERT (replace). `append` wins over `key` if both are given (deploy warning).
+  - **Source must have unique keys.** The merge is delete-by-key + insert-all: it
+    reconciles the incoming rows against the *target* (rows whose key is in the
+    SELECT are replaced), but it does **not** deduplicate the *source*. Two
+    incoming rows sharing a key would therefore both land under that key, silently
+    breaking the "one row per key" contract. The managed write guards against this
+    — the run **fails** with a clear error when the SELECT returns more than one
+    row for a non-NULL key (`NULL` keys are exempt, matching the insert-only path).
+    Deduplicate in the SELECT (e.g. `QUALIFY row_number() OVER (PARTITION BY <key>
+    ORDER BY <recency-col> DESC) = 1`) or use `append` if duplicates are intended.
+- **`key=<col> history [track=<c1,c2,…>] [deletes=close]`** → upgrades the keyed
+  merge to managed SCD **type 2** history (the leading keyword `scd2` is an alias).
+  The SELECT is the *current snapshot* (one row per `key`), and the runtime adds
+  `valid_from`/`valid_to`/`is_current`; a change to any tracked column (`track=`,
+  default all non-key) closes the prior version and opens a new one, keeping full
+  history. Diff → close-old (`UPDATE`) → open-new (`INSERT`) in one transaction;
+  the effective timestamp is the transaction clock (`now()`), so a run is
+  self-consistent. v1 is **non-partitioned only** (`// partitioned` + history is
+  rejected **at deploy**), and it **requires `key=`** (also rejected at deploy).
+  Both misconfigurations fail fast at save with a clear message instead of on the
+  first run. Unlike `manual`, it is managed, so `// data_test` and schema capture
+  work.
+  - **Deletes.** By default a key that disappears from the snapshot stays current
+    (soft delete — dbt's `hard_deletes=ignore`). `deletes=close` opts into
+    hard-delete-close: the vanished key's current version is closed (`valid_to`
+    set, `is_current=false`) with no new version — dbt's `hard_deletes=close`. If
+    that key later reappears in the snapshot it opens a fresh version, leaving a
+    validity gap between the delete and the reactivation (correct SCD2).
+  - **Reserved names.** `valid_from`/`valid_to`/`is_current` are reserved column
+    names in this mode — a SELECT that already projects one fails at run time —
+    and the `<dim>_current` suffix is reserved for the companion view (below), so
+    don't separately materialize a table by that name in the same lake (the view
+    is created `IF NOT EXISTS` inside the write transaction, so such a collision
+    is skipped silently — the `_current` convenience is simply absent — rather
+    than erroring).
+  - **Key should be non-null.** A `NULL` natural key is ill-formed for a
+    dimension; the codegen matches keys null-safely so a `NULL`-key row is
+    materialized rather than silently dropped, but you should enforce it with
+    `// data_test not_null <key>`.
+  - **`track=` takes no spaces.** Like every `=`-option in the annotation grammar
+    (which is whitespace-tokenized), the `track=` value must be a bare
+    comma-separated list with no spaces: `track=name,tier`, not `track=name, tier`
+    (a space ends the value and the rest is silently ignored).
+  - **Schema is frozen at first run** (persist-and-mutate, like `merge`/`append`):
+    the history table is `CREATE TABLE IF NOT EXISTS`, so adding/removing a
+    projected column later fails the run — an append-only history can't retroactively
+    reshape closed versions. Changing the SELECT's columns needs a manual rebuild
+    (the `replace` strategy is the only one that re-derives schema each run).
+  - **Consumer convenience.** Each run (re)creates a `<dim>_current` view (`WHERE
+    is_current`) in the same catalog, so the common "latest version" read needs no
+    filter and downstream scripts can `// on ducklake://…/<dim>_current`. The
+    effective-dated payoff is a native DuckDB `ASOF JOIN` against the history
+    table: `… ASOF JOIN <dim> d ON fact.key = d.<key> AND fact.ts >= d.valid_from`
+    returns, for each fact, the dimension version that was current at `fact.ts` —
+    something neither `merge` nor DuckLake time-travel can do in one query.
+- **`// partitioned <kind>`** — unit of work + state + backfill (separate;
+  cross-cutting). Polyglot / multi-statement writes use the `wmll.ducklake`
+  helpers instead of `// materialize`.
+
+There is no `wrap` keyword — `materialize` *is* "manage the write," so it was
+redundant; the only reason for it was to carve out the weak track-only mode,
+which is now the explicit `manual` opt-out.
+
+DuckLake snapshots are **orthogonal to all of the above** — they apply to every
+strategy automatically because every write is a DuckLake commit. The user never
+annotates for versioning; they get it.
+
+## Executor codegen
+
+### The seam
+
+`run_duckdb` already splits the script into statement blocks and rewrites
+custom `ATTACH` blocks in a single pass before execution
+(`duckdb_executor.rs:114-160`):
+
+```rust
+let query_block_list = parse_sql_blocks(&query, true);
+// each block: remove_comments → if ducklake/datatable ATTACH, expand; else passthrough
+```
+
+All blocks run in order on one DuckDB connection. Materialize has two modes:
+
+1. **Managed (default).** The user writes *setup + one trailing `SELECT`*. Windmill
+   replaces that SELECT with generated statements, wrapped in an *explicit
+   DuckLake transaction it controls* — never textual `BEGIN/COMMIT` injected
+   around the user's other statements (fragile across their own `ATTACH`s and
+   multi-statement SQL). For a partitioned `replace` the SELECT block expands to:
+
+   ```sql
+   -- generated for: // partitioned daily ; target = dl.orders_daily ; partition = '2026-06-19'
+   CREATE TABLE IF NOT EXISTS dl.orders_daily AS
+     SELECT *, CAST(NULL AS VARCHAR) AS _wm_partition FROM (<user_select>) WHERE false;  -- first-run bootstrap
+   ALTER TABLE dl.orders_daily SET PARTITIONED BY (_wm_partition);
+   BEGIN TRANSACTION;
+   DELETE FROM dl.orders_daily WHERE _wm_partition = '2026-06-19';
+   INSERT INTO dl.orders_daily SELECT *, '2026-06-19' AS _wm_partition FROM (<user_select>);
+   COMMIT;
+   ```
+
+   The strategy variants are all DELETE+INSERT-shaped — no `MERGE INTO`, which
+   DuckLake can't reliably run on a fresh partition (it 404s writing the first
+   rows):
+   - **whole-table replace** (no `// partitioned`) → a single `CREATE OR REPLACE
+     TABLE … AS <user_select>` (handles schema changes, still snapshots).
+   - **`key=<col>`** → `DELETE FROM … WHERE [<partition> AND] <col> IN (SELECT
+     <col> FROM (<user_select>))` then `INSERT` (upsert within the slice).
+   - **`append`** → the `DELETE` is dropped (insert-only).
+
+2. **`manual`.** The user writes their own DDL inside their own `BEGIN … COMMIT`;
+   Windmill injects nothing into the body and only records state (no snapshot
+   capture, no idempotency guarantee).
+
+The `_wm_partition` column is the physical link the orchestration layer lacks: on
+first materialize Windmill runs `ALTER TABLE … SET PARTITIONED BY (_wm_partition)`
+so DuckLake prunes on read and DELETE-by-partition rewrites only that partition's
+Parquet files.
+
+> **`{partition}` in the user SELECT is the identity string, not a timestamp.**
+> The token substitutes to the partition's *identity* — the same string stored in
+> `_wm_partition` and used for dedup/backfill/state — as an escaped SQL literal
+> (`'2026-07-05T23'`, `'2026-W27'`, `'2026-07'`, `'2026-07-05'`). Only the daily
+> identity happens to be a valid DuckDB DATE/TIMESTAMP literal, so a naive
+> `WHERE ts = TIMESTAMP {partition}` works for daily but raises a `Conversion
+> Error` for hourly/weekly/monthly. Rather than make every author hand-write a
+> `strftime` format that must match the resolver's, the executor injects a
+> convenience macro as the first setup statement of a time-partitioned
+> materialize:
+>
+> ```sql
+> CREATE OR REPLACE TEMP MACRO wm_partition(ts) AS strftime(ts, '<fmt>');
+> ```
+>
+> so the filter is one grain-agnostic line: `WHERE wm_partition(<ts_col>) =
+> {partition}`. The `<fmt>` comes from **one source** —
+> `PartitionKind::default_time_format` in `windmill-parser` (respecting a custom
+> `format=` override) — which the EE resolver *also* reads to stamp the identity,
+> so the macro and `{partition}` can never drift (hourly `%Y-%m-%dT%H`, weekly
+> `%G-W%V`, monthly `%Y-%m`, daily `%Y-%m-%d`). By construction
+> `strftime(ts, fmt)` equals the identity for any row in the slice, so this both
+> parses and buckets the whole partition (not just the boundary instant a
+> timestamp cast would match). The macro is timezone-agnostic (it formats `ts` as
+> given, matching the raw-strftime idiom it replaces); when a non-UTC `tz=` is
+> set the author expresses `ts` in that zone. `dynamic` partitions get **no**
+> macro — their identity is a caller-supplied key, so the filter is
+> `WHERE <key_col> = {partition}` directly. The scaffold and the AI pipeline
+> prompt teach the `wm_partition` form.
+
+> Storage: DuckLake writes go to `s3://_default_/` through the windmill S3 proxy
+> (`/api/w/{ws}/s3_proxy`, gated behind the `parquet` + `private` features). The
+> proxy must sign the SigV4 canonical URI with **single** percent-encoding — the
+> SigV4 default (`Double`) 401s Hive-partition keys like `_wm_partition=2026-06-19`
+> (the `=` double-encodes to `%253D` vs the client's `%3D`).
+
+### Run summary capture
+
+After the generated blocks, Windmill appends one read block — it is both the job's
+result (a useful preview rendered as the materialized table) and the row it records:
+
+```sql
+SELECT 'ducklake://<name>/<table>' AS materialized,
+       '<partition>' AS partition,            -- only when partitioned
+       (SELECT count(*) FROM <target> [WHERE _wm_partition = '<partition>']) AS rows,
+       (SELECT max(snapshot_id) FROM ducklake_snapshots('<target>')) AS snapshot_id;
+```
+
+The `snapshot_id` and `rows` are persisted as `materialized_partition` metadata.
+One extra round-trip per materialization, no new infra.
+
+## Metadata schema
+
+Extends the `materialized_partitions` table proposed in `pipelines-vs-dbt.md`
+§"First implementation slice" with the DuckLake snapshot id:
+
+```
+materialized_partition (
+  workspace_id      TEXT,
+  asset_kind        TEXT,        -- 'ducklake'
+  asset_path        TEXT,        -- 'analytics/orders_daily'
+  partition         TEXT,        -- '2026-06-19'  (NULL for unpartitioned)
+  snapshot_id       BIGINT,      -- DuckLake snapshot produced by this materialize
+  row_count         BIGINT,
+  job_id            UUID,
+  materialized_at   TIMESTAMPTZ,
+  PRIMARY KEY (workspace_id, asset_kind, asset_path, partition)
+)
+```
+
+This one table drives four things at once:
+
+- **Observability** — "last materialized: snapshot 42, 1.2M rows, 09:14" per
+  asset node (closes the Dagster-catalog gap from the v1-readiness review).
+- **Run-stale / gap detection** — which partitions exist, which are missing.
+- **Backfill** — the missing/failed set *is* the backfill worklist.
+- **Snapshot pinning** — see below.
+
+## Reproducibility — the beyond-dbt part
+
+Because every materialization records the snapshot it produced, you can read any
+table *as of* a past version — a capability dbt has no native answer for (dbt
+models are always "whatever's in the warehouse now"). DuckLake gives us this for
+the cost of recording one integer per run, and it covers the three things people
+actually reach for: **debugging** ("what did this table look like at the failing
+run"), **rollback** (re-materialize a consumer from snapshot N), and ad-hoc
+**experimentation** on a historical state.
+
+### How it's surfaced (shipped): explicit, discoverable time-travel
+
+The version is exposed as a *user-driven* surface, not hidden plumbing. A
+consumer pins a read by writing the DuckLake clause directly:
+
+```sql
+FROM dl.orders_daily AT (VERSION => 42)
+```
+
+The asset node's **History** tab is a master-detail view: the snapshot list (id
++ time) on the left selects the version previewed in a read-only grid on the
+right, which surfaces — and copies — the catalog-qualified
+`FROM lake.<table> AT (VERSION => n)` clause. Snapshot ids are captured automatically; the user opts
+into pinning when they want it, and the clause degrades to "latest" if removed,
+so the same script still runs standalone. Mechanically this rides on
+time-travel **reads** (`make_select_query` / `make_count_query` emit the `AT`
+clause when a `version` is threaded through the `WM_INTERNAL_DB_*` markers) plus
+a `DUCKLAKE_SNAPSHOTS` read for the history list — capabilities DuckLake already
+has, no new write path.
+
+### Deferred: automatic snapshot pinning across the cascade
+
+An earlier sketch had the cascade *automatically* thread each producer's
+`snapshot_id` into the `trigger` blob and inject `AT (VERSION => $WM_UPSTREAM_SNAPSHOT)`
+into consumer reads, so a whole run is pinned to upstream state at dispatch time
+without anyone asking. This is deliberately **not** built, for three reasons:
+
+- **Not critical.** The only thing it adds over the explicit surface above is
+  *automatic per-run consistency* — protection against an upstream
+  re-materializing in the window between dispatch and a consumer reading. That
+  race only bites high-frequency event-driven cascades (rare today), and the
+  read is always a whole, ACID snapshot regardless — never corruption, just
+  "newer than the triggering version". Debugging and rollback are already
+  covered by the explicit surface.
+- **Implicit magic.** Auto-injecting an `AT` clause and stripping it on
+  standalone runs is invisible behaviour to debug when it misfires; the explicit
+  clause is inspectable.
+- **Multi-upstream ambiguity + EE coupling.** A consumer reading two ducklake
+  upstreams needs a per-ref snapshot *map* accumulated across the AND-join — and
+  the join-slot logic is EE. A single `$WM_UPSTREAM_SNAPSHOT` would silently pin
+  every read to one (the firing) producer's snapshot.
+
+If a workload ever shows the consistency race in practice, pinning can be layered
+on top — the capture and the snapshot surfacing built here are its foundation.
+
+What **is** built is the forensic slice of that sketch: when the cascade
+dispatches a consumer, it records the latest captured snapshot of each of the
+consumer's direct upstream assets into the job's `trigger` arg
+(`upstream_snapshots`, rendered read-only on the run detail page with a
+copyable `AT (VERSION => n)` clause). "What did the failing run actually see"
+stays answerable after the fact, with zero read-path changes — reads are
+*not* pinned to the recorded versions.
+
+This is distinct from **SCD2 history** (`// materialize … key=… history`), which *is* built:
+DuckLake time-travel answers "what did the whole table look like at snapshot N?"
+but not "give me each entity's version history as queryable rows"
+(`valid_from`/`valid_to`/`is_current`) — the shape dbt's `{% snapshot %}` produces
+and downstream dimensional queries join against. The scd2 strategy generates and
+manages that history table (see the strategy bullet above).
+
+## Data tests (`// data_test`) — and the extensible-annotation pattern
+
+Data tests are the first dbt-parity gap closed on top of materialization, and
+the **first deliberately extensible annotation**. The design goal was not just
+"add five test types" but to establish the convention a sibling family
+(column-lineage is the next one) follows, so the annotation vocabulary stops
+being a closed hardcoded list (`pipelines-vs-dbt.md` gap #7).
+
+### Grammar
+
+```
+// data_test unique <col>
+// data_test not_null <col>
+// data_test accepted_values <col> = a,b,c
+// data_test relationships <col> -> datatable://other/asset.<col>
+// data_test <script_path>            ← escape hatch (dbt's singular test)
+```
+
+`// data_test` lines **accumulate** (every well-formed line adds one check),
+unlike the single-value annotations (`// materialize`, `// partitioned`, …)
+which are first-write-wins. Malformed lines are dropped fail-safe — a typo
+becomes an *absent* check (visible in the graph), never a mis-parsed one.
+
+The keyword is `data_test`, **not `test`** — there is an unrelated, shipped
+`// test:` CI-test annotation (`windmill_common::schema::parse_ci_test_annotation`,
+tests a script's *logic* on deploy). `data_test` tests the *data* in the
+materialized asset at run time. This mirrors dbt 1.8's own `tests:` →
+`data_tests:` rename, made for exactly this disambiguation.
+
+### The pattern: annotation → verifier
+
+The reusable shape, in three layers, each a clean extension seam:
+
+1. **Parse** (`asset_parser.rs` + `parsePipelineAnnotations.ts`, kept in
+   lockstep by the parity corpus). A `data_test` line is dispatched on a
+   **keyword head** to a typed variant (`DataTest`). A new built-in is one
+   match arm + its sub-parser; the `Custom` arm is the open fallback. A sibling
+   family reuses this head-keyword dispatch rather than adding a parallel list.
+2. **Compile** (`sql_materialize.rs::build_data_test_checks`). Each test becomes
+   a **check**: `(name, probe)`, where the probe is a one-row query counting
+   *and sampling* the test's violating rows in a single scan. Built-ins differ
+   only in their violating-rows query; `Custom` supplies its own (the user's
+   SELECT of violating rows). Referenced assets (relationships) emit an
+   `ATTACH` resolved by the same transform pass as the user's own.
+3. **Execute** (`duckdb_executor.rs`). The materialize summary query embeds
+   every check's outcome in one `data_tests` list-of-struct column (probes are
+   lifted into one-row CTEs and cross-joined, since DuckDB rejects subqueries
+   inside struct literals), so **all tests run in a single pass** against the
+   freshly-materialized slice — no abort-on-first. The worker reads the
+   breakdown from the result and decides pass/fail: any violation **fails the
+   run** (record `Failed`, propagate up the cascade) with an error listing
+   *every* test (✓/✗ + counts); a clean run returns the per-test summary so
+   the UI can render a checklist.
+
+### Violating-row samples
+
+Each check's probe also captures a bounded **sample of its violating rows**
+(≤20 rows, ≤50KB serialized per test — over-cap samples are *dropped*, never
+truncated, since truncated JSON fails parsing after paying the bytes). The
+sample is **optional by contract** at every layer: enforcement reads only the
+count; NULL / dropped / unparseable samples degrade to "no sample" and can
+never flip pass/fail. Where they surface:
+
+- **Failed run**: the worker returns a structured error payload
+  (`Error::ExecutionRawError`), so the failed job's result carries
+  `error.data_tests: [{test, violating, sample?}]` with samples on failed
+  tests only. The error *message* stays counts-only, plus a pointer at the
+  payload — so run descriptions and `materialized_partition.error` carry no
+  row data. The full payload is the job *result*, and follows every failed
+  job's result wherever that already goes: the worker's failed-job log line
+  (`add_completed_job_error`) and, on EE, the args of configured
+  global/workspace error handlers — the same pre-existing paths that carry
+  e.g. a failed process's own `result.json`. A handler that formats only
+  `error.message` (the common alert shape) stays counts-only; one that wants
+  the offending rows can read `error.data_tests`. The duckdb executor's
+  password-sanitize catch-all must special-case `ExecutionRawError` —
+  flattening it to a string would silently strip the payload.
+- **UI**: `DataTestsResult.svelte` renders a per-failed-test expandable
+  `AutoDataTable`; `DisplayResult.svelte` prefers the structured payload and
+  falls back to text-parsing the breakdown for results predating it.
+- **Enterprise (write-audit-publish)**: samples only exist on the
+  commit-then-test path. Under the EE in-transaction guard a violation aborts
+  pre-commit and the slice rolls back, so the violating rows cease to exist —
+  WAP failures are counts-only by construction (the guard's in-SQL ✓/✗
+  message), and the guard projects only the probe's count column
+  (`pipeline_advanced_ee.rs::data_test_guard_sql`).
+
+Sample mechanics worth knowing:
+
+- The sample rides as a **JSON string** (`to_json(...)::VARCHAR`) through the
+  summary row, deliberately: expanded rows would be visible to the executor's
+  key-recursive `extract_i64(result, "rows"/"snapshot_id")` scans, which a
+  user column of the same name could corrupt. It is parsed only inside
+  `extract_data_tests`.
+- No `ORDER BY` on the violating rows — *which* rows land in the sample is
+  nondeterministic (labelled "sample" in the UI for that reason).
+- `unique` samples `{value, count}` pairs at its count's grain (number of
+  duplicated *values*), so count and sample can't contradict each other.
+- On partitioned targets the synthetic `_wm_partition` column is `EXCLUDE`d
+  from samples (same rule as schema capture).
+- A custom body joining with `SELECT *` can yield duplicate column names —
+  duplicate JSON keys keep the last value; harmless but visible.
+- The probe shape is gated by in-memory tests against the bundled engine in
+  `windmill-duckdb-ffi-internal` (json extension availability, zero-row NULL
+  degrade, exotic types) — a sample-expr runtime error would fail the summary
+  read after the write committed, so keep those green when touching the shape.
+
+A new annotation family that produces post-materialize checks (or, for
+column-lineage, post-materialize *metadata reads*) plugs into the same three
+seams: add a parsed variant, emit its check/reader SQL into the summary, read
+it back in the worker. Nothing about the closed set of *today's* keywords is
+load-bearing.
+
+### Cascade ordering (`test_edges`)
+
+A `relationships` test — and, best-effort, a custom test whose body reads a
+pipeline asset — needs the *referenced* asset to exist at test time, but it is
+**not** a data-consumption `// on`/read of that asset, so it contributes no
+lineage edge. Without an ordering constraint, a cold cascade can run the tested
+script before the referenced dimension is materialized and hard-fail
+(`Catalog Error: Table … does not exist`).
+
+`asset_graph` (`windmill-api-assets/src/lib.rs`) closes this by resolving the
+referenced asset's in-pipeline **producer** (from the write edges it already
+builds) and emitting an ordering-only `test_edges` entry
+`producer → testing_script`. It is:
+
+- **Only emitted when a producer exists in the graph.** An external table (no
+  in-pipeline producer) adds no edge — the missing dependency is real and the
+  runtime error is the correct signal. Self-edges (a script relationship-testing
+  its own output) are dropped.
+- **Rendered distinctly** — amber dashed "test needs" link on the canvas, apart
+  from lineage (blue/gray solid) and triggers (gray) — because the tested script
+  does not ingest the asset's rows.
+- **Fed into the cascade topo-sort** via `buildLineageDag`
+  (`AssetGraph/boundedCascade.ts`), routed *through* the referenced asset node
+  (`asset → testing_script`) so the existing `producer → asset` write edge
+  extends into `producer → asset → testing_script` and the two-hop
+  `buildLineageDownstreamMap` invariant holds. Bounded and full-pipeline runs
+  (`computeInducedSchedule`) then order the producer first.
+
+Scope caveat: this orders *within a single client-driven cascade* (dev run /
+bounded run / full-pipeline run). It does not change the production reactive
+asset-dispatch of two independently-scheduled roots — there, `relationships`
+targets on a disjoint root should still be co-scheduled or bound with an
+explicit `// on <dim>` if a hard ordering is required.
+
+### Scoping decisions (v1)
+
+- **Partition scope.** When `// partitioned`, built-in checks are scoped to the
+  slice just written (`WHERE _wm_partition = <value>`), so a rerun/backfill of
+  one partition is independent of other partitions' (possibly pre-existing)
+  data. Whole-table assertions are a follow-up.
+- **SCD2 scope.** On a `key=… history` target, built-in checks assert the
+  *current snapshot* (`WHERE is_current`): the history table legitimately
+  repeats the natural key across closed versions, so an unscoped
+  `unique(<key>)` would fail the run on the second change of any key. Custom
+  tests see the raw history and scope themselves.
+- **Commit-then-test (public) / write-audit-publish (enterprise).** In the
+  public build, like dbt, the write commits before tests run; a failed test
+  fails the *run* (and records `Failed`, so downstream cascade stops) but does
+  not roll back the committed snapshot — time-travel still lets you inspect
+  exactly what failed. Enterprise upgrades this to write-audit-publish: the
+  same checks also run *inside* the write transaction as a guard statement
+  that raises on any violation, aborting the run before `COMMIT` — a failing
+  slice is never published, readers keep the previous version, and no snapshot
+  is created (even a *first* run of a new asset rolls back to "no table").
+  The whole mechanism lives in the enterprise repo:
+  `sql_materialize::build_wrap_blocks` produces a typed statement plan
+  (`MaterializePlan` — statements plus structural kinds and the compiled
+  checks), and `pipeline_advanced::finalize_materialize_query` assembles it —
+  verbatim on the public build, restructured into the guarded transaction on
+  EE. The public build thus carries only plan metadata, not the
+  write-audit-publish transform itself.
+- **Custom = DuckDB SQL, server worker.** The escape hatch fetches the deployed
+  script's content (a single DuckDB `SELECT`/CTE returning the violating rows —
+  it's embedded as a subquery, so a multi-statement body is rejected with a
+  clear error) and inlines it as a check; `{partition}` is substituted and
+  `_wm_target` is in scope. Agent (Http) workers — which have no script cache —
+  get a clear error. Non-DuckDB custom tests (dispatched as sub-jobs, any
+  language) are the natural follow-up and fit the same verifier seam.
+- **Managed only.** `// materialize manual` + `// data_test` is rejected with a
+  clear error (we can't know the manual script's target alias / partition col).
+
+## Schema contracts (save-time, gap #2b)
+
+The captured schema (#2a) is read back as a *contract*: at save/deploy time,
+every consumer's asset references — body-read/written columns, `// column`
+lineage sources, `// data_test relationships` refs — are diffed against the
+latest `materialized_asset_schema` version of each referenced ducklake asset,
+and mismatches surface as **warnings** (deploy never blocks; dbt's
+`on_schema_change=fail` is deliberately absent in v1). The diff lives in
+`windmill_common::schema_contracts` (endpoint:
+`POST /w/{ws}/scripts/check_schema_contracts`, called by the UI right after a
+save) and is mirrored 1:1 by the editor (`schemaContracts.ts`): live Monaco
+warning squiggles from the WASM buffer parse, plus column-name completion for
+annotation refs fed by the same captured schemas.
+
+Comparison rules worth knowing: column names are case-insensitive (DuckDB
+unquoted-identifier semantics); `_wm_partition` is whitelisted (it's excluded
+from capture); `{partition}` tokens are stripped before lookup; a
+`<dim>_current` reference falls back to the scd2 base table's capture; a
+relationships join across two captured assets also flags a captured-type
+*difference* (the runtime probe coerces, so it's "differs", not "will fail").
+An asset with no capture (never materialized, `manual` mode, any
+`datatable://`) produces no warnings.
+
+The producer opts a deliberately unstable schema out with
+`// materialize … on_schema_change=ignore` — consumers then get a single
+informational "suppressed" note instead of per-column warnings. On `manual`
+materialize the option is inert (nothing is captured) and deploy logs a
+warning saying so.
+
+## Scoping decision: DuckLake vs DataTable
+
+**Make DuckLake the materialization/versioning substrate; keep DataTable as the
+live operational table with no versioning.** DataTable is plain Postgres
+(`transform_attach_datatable`, `duckdb_executor.rs:742`) — no native snapshots
+or time-travel — so giving *it* the versioned/incremental story means building
+MVCC-on-top ourselves (history tables, SCD2), precisely the complexity this
+DuckLake approach exists to avoid. Clean split:
+
+- `ducklake://` → analytics, versioned, reproducible, backfillable.
+- `datatable://` → mutable app/operational state; partition idempotency via
+  DELETE+INSERT still works, but no snapshot/time-travel layer.
+
+Don't try to give both the full treatment for v1.
+
+## v1 slice (smallest viable)
+
+1. **Partition runtime context** — resolve `(value, start, end)` and surface as
+   `WM_PARTITION*` bind/env (Path C step 1; partly built per the
+   pipeline-partition-runtime work).
+2. **Physical partition wiring** — `_wm_partition` column + `SET PARTITIONED BY`
+   on first materialize for `ducklake://` targets.
+3. **Strategy templates** — DELETE+INSERT default (`CREATE OR REPLACE` for the
+   whole table); delete-by-key + insert when `key=<col>`; INSERT-only when
+   `append`. Managed `// materialize` wraps a single-SELECT DuckDB script behind
+   these templates; `// materialize manual` opts out.
+4. **Snapshot + metadata capture** — append `ducklake_snapshots` read, persist
+   `materialized_partition` rows.
+5. **Surface it** — last-materialized/snapshot/row-count on the asset node;
+   missing-partition set feeds the backfill UI.
+6. *v1.x* — time-travel UX over the captured snapshots: a per-asset **History**
+   tab — a master-detail snapshot list + query-at-version preview that copies the
+   full `FROM lake.<table> AT (VERSION => n)` clause. Automatic cascade pinning
+   (`$WM_UPSTREAM_SNAPSHOT`) is deferred — see §"Reproducibility" for why.
+
+Steps 1–5 are a thin annotation+template layer plus one metadata table and one
+extra read per run. They deliver managed/incremental/versioned assets,
+idempotent partitioned materialization, the backfill substrate, and
+materialization observability together — and stay recognizably Windmill-shaped.
+
+## Open decisions
+
+These ride on top of the six in `pipelines-vs-dbt.md` §"Decisions either path
+forces"; DuckLake-specific:
+
+1. **Bootstrap of `SET PARTITIONED BY`.** First-materialize detection — table
+   absent vs. present-but-unpartitioned. Idempotent re-apply.
+2. **Snapshot retention / compaction.** DuckLake snapshots accumulate; when do
+   we expire old ones, and does pinning hold a snapshot alive past retention?
+3. **Pin scope.** Pin only direct producers, or the full transitive upstream
+   set per run? Storage and "stale pin" semantics differ.
+4. **Managed multi-statement.** *Resolved:* managed `// materialize` accepts
+   setup statements (ATTACH/SET/…) followed by exactly one trailing SELECT, and
+   rejects anything else at deploy with a clear error pointing to
+   `// materialize manual`. The classifier (`sql_materialize.rs`) is the single
+   source of truth.
+
+## Ingestion (EL): the sanctioned entry-node shape
+
+Design constraints for how external data enters the lake — the user-facing
+how-to (extract-engine choice, cursor recipes, schema-drift handling, worked
+examples) lives in windmilldocs `core_concepts/63_pipelines` → "Ingestion
+(EL)"; this section records only what future feature work must not break.
+
+- **`// materialize` is DuckDB-only** (deploy-rejected elsewhere, managed and
+  `manual` alike — `windmill-api-scripts/src/scripts.rs`), and the SDK
+  materialize helpers (`upsert_partition` / `upsertPartition`) build their SQL
+  inside the SDK, so the asset parsers cannot see the write. A polyglot node
+  that "writes the lake directly" therefore deploys with **no output edge** —
+  breaking lineage, cascade scheduling, and the backfill UI's producer lookup.
+- **The sanctioned polyglot shape is two scripts**: an entry node that lands
+  the raw batch as an object in workspace storage (`write_s3_file` — a
+  parser-visible write), and a DuckDB loader (`-- on s3:///<key>` +
+  `-- materialize`) that the asset dispatcher re-runs per batch. The landing
+  object is the seam; splitting E from L also keeps row work vectorized and
+  gives the load the full engine treatment (strategies, snapshots, partition
+  grid, `// data_test`).
+- **One string spelling: `s3:///<key>`.** SDK string params are strictly
+  `s3://…` URIs with a non-empty key; anything else raises (clients >
+  1.746.0 — older clients silently upload such strings to an auto-generated
+  `windmill_uploads/…` name, so keep URIs in code that must run on them).
+  The same URI is what
+  `// on` annotations and DuckDB SQL take, and all forms (URI, `{s3}` object,
+  `S3Object(s3=…)`) canonicalize to path `/<key>`. The asset parsers record
+  **no asset** for a bare-string SDK argument (the call can only error at
+  run time) — keep `parse_s3_object` (py client), `parseS3Object`
+  (ts client, `s3Types.ts`) and both `s3_object_arg_path` parsers in lockstep
+  when touching any of them.
+- DuckDB workers load no ICU extension: bare `TIMESTAMPTZ - INTERVAL`
+  arithmetic binder-errors. Incremental-pull SQL casts both sides
+  (`updated_at::TIMESTAMP > now()::TIMESTAMP - INTERVAL 7 DAY`).
diff --git a/docs/enterprise.md b/docs/enterprise.md
index 5ab869a651..229585ad25 100644
--- a/docs/enterprise.md
+++ b/docs/enterprise.md
@@ -47,3 +47,19 @@ cargo check --features enterprise,private
 # EE code that also requires license validation
 cargo check --features enterprise,private,license
 ```
+
+## Troubleshooting
+
+**`E0583: file not found for module <x>_ee` on `cargo check --features enterprise,private`**:
+the EE worktree is behind the OSS code it must satisfy. Fast-forward it to EE
+`origin/main` — EE worktrees are shallow clones, so run `git fetch --unshallow origin`
+first or the merge fails with "refusing to merge unrelated histories". After the
+fast-forward, any `*_ee.rs` file that is *new* since the worktree was created still
+needs its OSS symlink made by hand (worktree setup only links files that existed then).
+The EE repo has no `backend/` prefix — crates sit at its root. Use an absolute target
+(a relative one would resolve against the link's directory, not your cwd):
+
+```bash
+# from the windmill repo root
+ln -s ~/windmill-ee-private/<crate>/src/<x>_ee.rs backend/<crate>/src/<x>_ee.rs
+```
diff --git a/docs/pipeline-env-isolation.md b/docs/pipeline-env-isolation.md
new file mode 100644
index 0000000000..2b6b87ba68
--- /dev/null
+++ b/docs/pipeline-env-isolation.md
@@ -0,0 +1,219 @@
+# Fork data environments for pipeline materialization ("dev data")
+
+Status: **implemented** (branch `pipeline-env-isolation`). Companion to
+[`ducklake-materialization.md`](./ducklake-materialization.md).
+
+## The problem
+
+Workspace forks fork the CODE, but `// materialize ducklake://<lake>/<table>` targets are
+absolute pointers into shared physical storage. A fork clones `workspace_settings.ducklake`
+verbatim, so `transform_attach_ducklake` resolved a fork's `ducklake://main` to the **parent's
+catalog database and S3 data path** — deploying or running a materializing pipeline inside a
+fork wrote the production tables. dbt answers this with target schemas + `--defer`; datatables
+already have a fork answer (`forked_datatables` → `wm_fork_*` databases + a drop endpoint);
+ducklake had none. `wmill pipeline run --local` only covers preview runs, and previews still
+resolve targets against the real workspace.
+
+## The design
+
+Everything hangs off two DuckLake ATTACH capabilities (verified in a spike, DuckDB 1.5.4 +
+current ducklake extension): `METADATA_SCHEMA` (the catalog's metadata tables live in a chosen
+pg schema of the same catalog DB — auto-created on first attach; default is `public`) and
+`READ_ONLY`, plus catalog-stored views that may reference other attached catalogs and rebind
+per session.
+
+### Fork-time choice: isolated (default) vs shared, per lake
+
+The fork-creation dialog offers a per-lake data-environment choice (the section renders only
+when the parent workspace has lakes configured, mirroring the datatable section):
+
+- **Isolated** (default — also what unlisted lakes and API callers that omit the field get) —
+  the full behavior described below.
+- **Shared** — explicit opt-out: the fork reads and writes the parent's lake directly through
+  its cloned config, like a non-fork workspace (e.g. a fork meant to run prod-equivalent
+  backfills). Stamped as `fork_behavior: "shared"` on the lake entry in the fork's own
+  `workspace_settings.ducklake` at creation (`shared_ducklakes` on the create-fork request);
+  the resolver, the graph indicator, and (trivially — nothing registers) cleanup all key off
+  it. Shared also lifts the mysql-catalog restriction, since nothing needs namespacing.
+
+Absent-field-means-isolated keeps every pre-existing fork and API caller on the safe path.
+Sharing is a per-fork-creation choice, never inherited: the settings clone copies the source's
+config verbatim, so fork creation strips any cloned `fork_behavior` stamps before applying its
+own `shared_ducklakes` list — a fork of a shared fork defaults back to isolated. A
+shared fork ancestor in a fork chain resolves like a root (its data lives at its config's
+default location). Flipping a fork's lake to `shared` later (settings edit) orphans any
+namespace it already materialized until fork deletion cleans it — the registry row survives
+the flip.
+
+### Write redirect — one seam, no grammar changes
+
+`get_ducklake_from_db_unchecked` (windmill-common/src/workspaces.rs) is fork-aware: when the
+resolved workspace has a `parent_workspace_id` (throwaway `wm-fork-*` fork or standing dev
+workspace), the returned `DucklakeWithConnData` is namespaced **in its existing fields**:
+
+- `extra_args` += `METADATA_SCHEMA 'wm_fork_<mangled wid>_<mangled lake>_<hash8>'` —
+  injective, ≤63 chars, stable across releases (persisted state depends on it), and
+  **lake-scoped**: two lakes of one workspace may share a catalog database, and a
+  per-workspace schema would merge their namespaces in the fork;
+- `storage.path` = `__wm_forks/<fork segment>/<original path>` — the segment is the
+  mangled+hashed workspace id collapsed to ONE path component (fork ids are only
+  git-branch-safe and may contain `/`; used raw, `wm-fork-a/b` would nest inside sibling
+  `wm-fork-a`'s cleanup prefix) — a **bucket-root prefix**, not a
+  sub-path of the parent's DATA_PATH, because lake maintenance
+  (`ducklake_delete_orphaned_files`, snapshot expiry) scans everything under the parent's path
+  and would delete live fork files nested there.
+
+Folding the redirect into existing fields means the EE agent-worker endpoint (which just
+serializes this struct) needs **no changes**, and an agent worker running an older binary still
+writes the fork namespace — it only misses the defer views (reads fail loudly; never a prod
+write). Every ducklake access funnels through the same ATTACH transform — the managed
+materialize's synthetic `_wm_target` attach, `materialize manual`, raw user SQL, and all UI
+preview / History / backfill surfaces (they are `WM_INTERNAL_DB_*` marker preview jobs) — so a
+fork cannot reach the parent namespace through the managed path at all.
+
+Hardening: in fork mode, user- and settings-supplied `METADATA_SCHEMA` / `DATA_PATH` /
+`OVERRIDE_DATA_PATH` ATTACH options are stripped before injection (DuckDB silently keeps the
+*last* occurrence of a duplicated option, so a duplicate would escape the namespace).
+MySQL-catalog lakes error loudly in forks (no pg schemas to namespace with) rather than ever
+writing the shared catalog.
+
+### Read-defer — iterate on one node without rebuilding upstream
+
+In a fork, `transform_attach_ducklake` additionally emits:
+
+1. `ATTACH IF NOT EXISTS … AS __wm_dl_<lake>_<ancestor>_<hash> ([<ancestor's own args>, ]
+   DATA_PATH <ancestor's>, OVERRIDE_DATA_PATH TRUE, READ_ONLY[, METADATA_SCHEMA
+   <ancestor's>])` per fork-chain ancestor, resolved from the **ancestor's own settings**
+   (fork-side settings drift can't repoint what "parent" means). The ancestor config's
+   non-reserved `extra_args` (e.g. `ENCRYPTED true`) ride along — FIRST, so the fork-owned
+   options win under DuckDB's last-occurrence-wins. No
+   `AUTOMATIC_MIGRATION`/`CREATE_IF_NOT_EXISTS` — a fork job must never mutate an ancestor
+   lake. `READ_ONLY` makes prod writes *physically impossible* through ducklake, including in
+   `materialize manual` and raw SQL. Fork ancestors whose namespace was never bootstrapped are
+   skipped, with existence checked in each ancestor's OWN catalog database (a fork whose
+   catalog drifted away from an ancestor's must not misread that ancestor's namespace as
+   missing); an unreachable ancestor catalog only disables that ancestor's defer.
+2. `CREATE VIEW IF NOT EXISTS <alias>.<table> AS SELECT * FROM <owning ancestor
+   alias>.<table>` for every **deferred table**: (`materialized_partition` rows with
+   `status = 'materialized'` anywhere in the ancestor chain) MINUS (the fork's own rows). Each
+   view targets the NEAREST ancestor that physically owns the table
+   (`ForkDeferTable.ancestor_idx`): in a `fork → parent → root` chain where only the root
+   materialized a table, the parent has no copy (it defers too), so a view over the parent
+   would not bind. SCD2 owners (detected by the `is_current` column in the owning ancestor's
+   latest captured `materialized_asset_schema`) also get the `<table>_current` companion view.
+   So a consumer reading `dl.orders` transparently reads the nearest owning ancestor's current
+   data until the fork materializes `orders` itself.
+3. When the running job's managed materialize targets a table that currently exists **as a
+   view** in the fork namespace, the view (and its `_current` companion) is dropped after the
+   target attach — the first fork materialize replaces the defer view with a real fork table
+   (`CREATE [OR REPLACE] TABLE` refuses to replace a view — verified — so without the drop the
+   transition fails; with it, `sql_materialize.rs` codegen needs no fork awareness at all).
+   The is-it-a-view decision keys on the catalog's ACTUAL live views (`ducklake_view`, read at
+   resolution time into `fork_defer.fork_views`), **not** on recorded materialization status:
+   after a failed run the status cannot distinguish a defer view from a real table, and a
+   mismatched `DROP VIEW` (or skipped drop) would wedge the asset on every retry — found live
+   in e2e when a storage failure flipped a fork asset's status to `Failed`.
+
+The graph shows the state per ducklake asset in a fork: an amber ↗ chip = *deferred* (some ancestor in the chain
+owns the table),
+an emerald fork chip = *fork-materialized* (`fork_materialization` on the `/assets/graph`
+response, computed from fork + parent `materialized_partition`; the parent's rows are read on
+the plain pool since fork membership doesn't imply parent membership). The details pane shows
+the equivalent banner.
+
+### Lifecycle & cleanup
+
+A sidecar registry `fork_ducklake_namespace(workspace_id, ducklake_name,
+metadata_schema, catalog, storage, storage_ref, data_path)` is upserted (behind a TTL'd in-process cache, keyed
+per workspace and invalidated whenever a workspace's registry rows are cleaned up — a same-id fork recreated
+within the TTL must re-register or its namespace would be orphaned at its own deletion) on fork
+resolution, **one row per physical location ever attached** — its PK includes
+`(catalog, storage, storage_ref, data_path)`, so if the fork's lake settings drift, later attaches add rows rather
+than replace them and cleanup covers every location the fork wrote, not just the first — connecting to the
+REGISTERED catalog identity and deleting files from the REGISTERED storage identity
+(`storage_ref`, resolved from the logical storage name at attach time), never whatever the
+fork's settings point at by deletion time. Explicit
+`GRANT`s ship in the same migration; the registry is not cloned into sub-forks.
+
+The registry has deliberately **no FK to `workspace`**: rows are the durable cleanup ledger and
+outlive the workspace row when physical cleanup fails after the delete commits (unreachable
+catalog, storage outage) — each row is deleted only after its schema + data cleanup succeed.
+Fork **creation** retries any leftover rows for the reused id and refuses to proceed while a
+metadata schema still cannot be dropped, so a recreated same-id fork can never silently
+reattach stale tables. Data-file leftovers alone don't block: a deleted fork's `$res:` storage
+resource is gone forever, but once the schema is dropped the files are inert — the surviving
+row keeps them tracked and the next successful cleanup of the same prefix (typically the
+recreated fork's own deletion, with live credentials) sweeps them.
+
+Retries after the fork is gone get two aids: the row's `schema_dropped` phase flag (set when
+the schema dropped but data cleanup failed; retries then skip the schema phase and need no
+catalog credentials — registration resets it on re-attach, which recreates the schema), and
+`$res:` fallback resolution against the workspace being forked (the deleted fork's resources
+were clones of a parent's, so the new parent is the natural credential donor).
+
+`POST /w/{fork}/workspaces/drop_forked_ducklake_namespaces` (same permissions as
+`delete_workspace` via a shared gate: fork owner or superadmin, plus parent-prod-admin when the
+fork is an attached dev workspace) drops each registered pg metadata schema
+(`DROP SCHEMA … CASCADE` on the catalog connection, hard-guarded on the `wm_fork_` prefix) and
+deletes the `__wm_forks/<fork segment>/…` objects in the workspace storage (hard-guarded on that
+prefix; `parquet` feature). The fork-deletion UI calls it next to
+`drop_forked_datatable_databases`, for the fork and for deleted child forks. Registry rows are
+deleted per-lake only after both cleanups succeed, so a partial failure is retryable.
+
+## Semantics & caveats (by design)
+
+- **Orphaned forks stay isolated.** `parent_workspace_id` is `ON DELETE SET NULL`, so a
+  `wm-fork-*` workspace can outlive its parent. Its ancestor chain is then empty, but its cloned
+  config still points at the shared lake — so fork resolution keys on the `wm-fork-` prefix as
+  well as the chain (mirroring `workspace_is_fork`). An orphaned fork gets the write redirect,
+  registration and cleanup but no defer views; pre-orphaning defer views fail loudly at bind and
+  flip to real tables on first materialize. The same rule applies to a fork's *ancestors*: a
+  last-in-chain `wm-fork-*` ancestor is an orphaned fork (not a root) and its READ_ONLY attach
+  targets its fork namespace, not its cloned base config. Prefix-less dev workspaces cannot be
+  orphaned (deleting their prod is blocked while attached).
+- **Defer is live, not snapshot-pinned.** A deferred read sees the parent's *current* table —
+  the same trade dbt `--defer` makes. Snapshot-pinned defer could later ride on the recorded
+  `snapshot_id`s.
+- **Defer granularity is per-table.** Materializing one partition in the fork makes the fork's
+  table authoritative for *all* partitions (the rest are empty until backfilled in the fork).
+- **Incremental strategies start empty in a fork.** `merge`/`append`/SCD2 create a fresh table
+  on first fork run — no parent rows are inherited, and fork SCD2 history diverges from the
+  parent's. Copy-on-fork seeding would be a follow-up opt-in.
+- **Only tracked tables defer.** A parent table with no `materialized_partition` row (raw SQL
+  writes outside `// materialize`) or whose latest run `Failed` is not deferred — defer views
+  bind at CREATE against the parent catalog, and a view on a missing table would fail every
+  unrelated fork job. Such tables read as absent in the fork.
+- **Transient race.** Between a fork materialize's commit and its state recording, a concurrent
+  fork job may still emit `CREATE VIEW IF NOT EXISTS` for that table — which silently yields to
+  an existing table (verified), so the race is a no-op.
+- **Accident prevention, not a security boundary.** A fork holds the parent's cloned
+  credentials by design; a determined fork user can still `ATTACH 'postgres:…'` with the cloned
+  catalog resource or `COPY TO 's3://…'` directly. The isolation guarantees are scoped to the
+  managed ducklake path (where they are physical: READ_ONLY parent attach + separate metadata
+  schema + separate data prefix).
+- **Fork chains** compose: each ancestor namespace is attached under a deterministic alias, and
+  a parent's own defer views (referencing *its* parent's alias) rebind correctly in the
+  grandchild's session because the whole chain is attached.
+- **Datatables are out of scope** — the existing `forked_datatables` chooser at fork creation
+  covers them (`keep_original` remains their default, which shares the parent DB; picking
+  `schema_only` there is the datatable analog of this feature).
+
+## Key files
+
+- `backend/windmill-common/src/workspaces.rs` — fork resolution (`fork_scoped_ducklake`),
+  `fork_ancestor_chain`, naming (`fork_ducklake_metadata_schema`,
+  `fork_ducklake_ancestor_alias`, `fork_data_path`), option stripping, registry.
+- `backend/windmill-common/src/materialization.rs` — `list_fork_defer_tables`.
+- `backend/windmill-worker/src/duckdb_executor.rs` — `fork_defer_statements` (ancestor
+  attaches, defer views, target transition), user-arg stripping.
+- `backend/windmill-api-assets/src/lib.rs` — `fork_materialization` on the graph.
+- `backend/windmill-api-workspaces/src/workspaces_extra.rs` —
+  `drop_forked_ducklake_namespaces`.
+- `backend/windmill-api-workspaces/src/workspaces.rs` — `clone_asset_usages_and_triggers`:
+  `asset` + `script_trigger` rows are deploy-derived and were never cloned into forks, so a
+  fork's pipeline graph had no asset nodes/edges and its dispatch cascade never fired (fixed
+  here because this feature is unusable without it).
+- `backend/migrations/20260703170745_fork_ducklake_namespace.*` — registry + GRANTs.
+- Frontend: `AssetGraph/{types.ts,AssetNode.svelte,AssetGraphCanvas.svelte,
+  AssetGraphDetailsPane.svelte}`, `pipeline/[folder]/+page.svelte`,
+  `sidebar/SidebarContent.svelte` (fork-delete wiring).
diff --git a/docs/pipeline-local-dev.md b/docs/pipeline-local-dev.md
new file mode 100644
index 0000000000..6ee6a59a14
--- /dev/null
+++ b/docs/pipeline-local-dev.md
@@ -0,0 +1,171 @@
+# Local development for Data Pipelines
+
+Status: **draft PR, validated end-to-end.** Both the headless CLI paths and the live browser
+preview (`pipeline dev` → `/pipeline_dev`) have been exercised against a running EE + MinIO
+stack — headless `pipeline run --local`, browser `Run` / `Run + downstream` cascades writing
+real assets, live-reload on save, failure/cascade UX, parameterized run-forms, and the
+`--frontend` flag. This document captures the design and the remaining follow-ups.
+
+## What & why
+
+Windmill "data pipelines" are folders of scripts marked with a `// pipeline` comment, wired
+together by asset annotations (`// on <asset-uri>`, `// partitioned`, `// schedule`). Until now
+they could only be built/run in the browser at `/pipeline/<folder>` (the `PipelineGraphEditor`),
+and the CLI only inspected/ran the **deployed** workspace (`wmill pipeline list|show|run`).
+
+This adds the **local edit → preview → run** loop, the pipeline analog of `wmill dev`
+(flows/scripts) and `wmill app dev` (raw apps), usable both from a code editor and from an
+agentic loop — building a pipeline from working-tree files, seeing the same graph the UI shows,
+and running it, all **without deploying**.
+
+## The key design decision (no backend changes)
+
+Full body inference is obtained in the CLI from the **same wasm the frontend uses**:
+`windmill-parser-wasm-asset` (`parse_assets_ts | parse_assets_py | parse_assets_sql`). That wasm
+returns the entire serialized Rust `ParseAssetsOutput` — `assets` (with `r`/`w`/`rw` access)
+**and** the parsed pipeline annotations (`in_pipeline`, `triggers`, `partition`, …) in one call.
+The CLI already loads sibling wasm parsers via `loadParser()`; we just added the `-asset` dep.
+
+Running local content reuses the existing preview API:
+`runScriptPreview({ content, language, path, args: { _wmill_skip_asset_dispatch: true }, temp_script_refs })`
+per node in topological order. Data flows through real asset storage; `_wmill_skip_asset_dispatch`
+makes the client own the whole cascade so the backend dispatcher never double-fires.
+
+⇒ No new backend endpoint, no Rust changes, no TS re-port of the annotation parser.
+
+## Surfaces
+
+### Headless CLI (agentic loop) — `cli/src/commands/pipeline/`
+- `pipeline show <folder> --local` — render the DAG from working-tree files (fully offline).
+- `pipeline run <folder> --local [--from/--to/--dry-run/--json]` — run the cascade via preview of
+  local content, reusing the `boundedCascade.ts` topo/lineage engine. Scripts whose only trigger
+  needs caller input or per-event fanout (`data_upload`/`webhook`/kafka/…) are skipped by default.
+- `pipeline run … --upload <script>[:<param>]=<local-file|s3://storage/key>` — bind an object to a
+  `data_upload`/`webhook` entry point so it (and its downstream) runs: a local path is uploaded to
+  the workspace store; an `s3://<storage>/<key>` source binds an existing object (authority = named
+  storage, `s3:///key` for the default store). The target S3Object arg is inferred when the script
+  declares exactly one (else name it with `:<param>`). Repeatable.
+- `pipeline docs <folder> [--local]` — write `PIPELINE.md` + `AGENTS.md`/`CLAUDE.md` pointers
+  (graph + datatable schemas) so an editor/agent has the same context the UI surfaces.
+
+### Browser live-preview — `pipeline dev` + `/pipeline_dev`
+- `pipeline dev [folder]` — folder arg or cwd auto-detect; watches the folder, rebuilds the graph
+  on each save, pushes `{type:'pipeline', folder, graph, scripts, temp_script_refs}` over a
+  WebSocket (direct mode, default port 3201), opens the dev page.
+- `/pipeline_dev` route → `PipelineDevView.svelte` renders the **same** `PipelineGraphEditor`
+  (mode `view`) fed by the pushed graph; runs the cascade via preview. Editing stays in the
+  user's editor; each save live-reloads.
+
+## Files
+
+**New**
+- `cli/src/commands/pipeline/localGraph.ts` — the enabler. Walks `f/<folder>` scripts, wasm-infers
+  each (`parse_assets_<lang>`), assembles the `/assets/graph`-shaped payload (`runnables`,
+  `assets`, `edges`, `triggers`). Exports `buildLocalPipelineGraph`, `collectScripts`,
+  `inferScriptAssets`, `workspaceRoot`, and the canonical graph types.
+- `cli/src/commands/pipeline/docs.ts` — `pipeline docs`.
+- `cli/src/commands/pipeline/dev.ts` — `pipeline dev` watcher + WS server.
+- `cli/test/pipeline_local_graph_unit.test.ts` — unit tests for the builder.
+- `frontend/src/lib/components/assets/AssetGraph/cascadeRun.ts` — reusable run primitives
+  (`makeLaunch`, `makeWaitJobTerminal`, `runDownstreamCascade`, `runBoundedCascade`) wrapping
+  `cascadeOrchestrator` + `graphTraversal`.
+- `frontend/src/lib/components/assets/AssetGraph/PipelineDevView.svelte` + `frontend/src/routes/pipeline_dev/+page.svelte`.
+
+**Modified**
+- `cli/src/commands/pipeline/pipeline.ts` — `--local` on `show`/`run`; `show` split into graph
+  acquisition + `renderGraph()` + deployed-only `enrichRootMarkers()`; registers `docs`/`dev`;
+  graph types moved to `localGraph.ts`.
+- `cli/package.json` (+ `windmill-parser-wasm-asset`), `cli/package-lock.json`.
+- `system_prompts/auto-generated/*`, `cli/src/guidance/skills.gen.ts` — regenerated via
+  `python system_prompts/generate.py` (required by AGENTS.md for CLI command changes).
+
+## Language coverage
+
+`inferScriptAssets` mirrors `frontend/src/lib/infer.ts:inferAssets`: ts (bun/deno/nativets),
+python3, and SQL dialects all get wasm inference (SQL dialects route to `parse_assets_sql`; its
+comment-header annotation scan is dialect-independent). `go`/`bash` have no wasm asset parser, so
+they fall back to a minimal `// pipeline` + `// on` scan (annotation-only). Inferred asset paths
+must match to connect nodes, and all S3 URI forms canonicalize to one key: `parse_asset_syntax`
+(shared by the native and wasm parsers) strips leading slashes from S3 paths, so the SDK
+object forms — TS `writeS3File({s3:"x"})` and python `write_s3_file(S3Object(s3="x"))`, which
+resolve to `s3:///x` (empty default storage) — the triple-slash annotation `// on s3:///x`, DuckDB
+`read_csv('s3://x')` / `COPY ... TO 's3://x'`, and `// on s3://x` all yield path `x`. A TS/Python
+writer and a DuckDB reader of the same object therefore connect regardless of which URI form each
+side uses. (Only leading slashes are stripped — so a canonical key never starts with `/`, which
+keeps the identity stable through `// on` trigger-ref reconstruction — while Hive-partition keys
+like `s3://bucket/y=2024/f.parquet` and the explicit-storage form `s3://storage/key` keep their
+`bucket/…` / `storage/key` paths.) Tradeoff of collapsing to one canonical key: the explicit-storage
+form `s3://storage/key` and the default-storage nested-key form `s3:///storage/key` now alias to
+the same node `storage/key`, even though they name different objects (a bucket `storage` vs. an
+object under the `storage/` prefix in default storage). This only collides when a storage config is
+named to match a default-storage prefix — unlikely, and acceptable for a best-effort lineage graph
+that already doesn't split the first segment as a storage name.
+
+## How to test
+
+Run the CLI from source (`alias wmilld='bun run /home/rfiszel/windmill/cli/src/main.ts'`).
+
+Headless (works directly against any remote, e.g. internal.windmill.dev / `data-pipelines`):
+```
+wmilld workspace add internal data-pipelines https://internal.windmill.dev/   # paste a token
+# build an example (connected all-DuckDB DAG):
+mkdir -p ~/pl-demo/f/demo_pipeline && cd ~/pl-demo && printf 'defaultTs: bun\n' > wmill.yaml
+#   ingest.duckdb.sql:    -- pipeline\nCOPY (SELECT 1 id,'a' name) TO 's3://demo/raw.csv';
+#   transform.duckdb.sql: -- pipeline\n-- on s3://demo/raw.csv\nCOPY (SELECT * FROM read_csv('s3://demo/raw.csv')) TO 's3://demo/clean.csv';
+#   report.duckdb.sql:    -- pipeline\n-- on s3://demo/clean.csv\nSELECT count(*) FROM read_csv('s3://demo/clean.csv');
+wmilld pipeline show demo_pipeline --local
+wmilld pipeline run  demo_pipeline --local --dry-run
+wmilld pipeline run  demo_pipeline --local          # writes real s3 assets; needs object storage
+wmilld pipeline docs demo_pipeline --local   # --local: document the working tree (default path queries the deployed graph)
+```
+Or pull real pipelines: `wmilld sync pull --yes && wmilld pipeline list && wmilld pipeline show <folder> --local`.
+
+Browser preview: against a remote whose deployed frontend predates the `/pipeline_dev` route, the
+auto-opened `<remote>/pipeline_dev?…` 404s. Run THIS branch's frontend locally and point the dev
+page at it with `--frontend`:
+```
+cd frontend && REMOTE=https://internal.windmill.dev npm run dev      # or a local backend
+cd ~/pl-demo && wmilld pipeline dev demo_pipeline --frontend http://localhost:3000
+```
+`pipeline dev` then opens (and prints) the full URL — **copy that printed URL**, don't hand-write it.
+It carries both `wm_token` (workspace auth) and `ws_token` (the per-session WS token); the dev
+server rejects the WebSocket without `ws_token`, so the page would sit disconnected:
+```
+http://localhost:3000/pipeline_dev?workspace=<WS>&wm_token=<TOK>&folder=demo_pipeline&port=3201&ws_token=<WS_TOK>
+```
+
+## Validation status
+
+- ✅ `pipeline show --local` verified offline against a fixture (renders a connected DAG).
+- ✅ `localGraph` unit tests (7) + the CLI suite pass; CLI `tsc` clean; frontend `npm run check`
+  0 errors on changed files; svelte-autofixer clean.
+- ✅ CLI agent docs regenerated.
+- ✅ Live `pipeline dev` → `/pipeline_dev` browser preview **exercised against a running EE + MinIO
+  stack**: graph render + live-reload on save, single-node `Run` and `Run + downstream` cascades
+  writing real assets, parameterized run-forms, failure/cascade UX, responsive layout, and the
+  `--frontend` flag. Screenshots in the PR body.
+
+## TODO for the takeover agent
+
+(Items 1–2 below are **done**; left here for context.)
+
+1. ~~Verify the browser preview end-to-end~~ — done (see Validation status; screenshots in PR).
+2. ~~Dev-page route reachability on remotes~~ — done: added `--frontend <origin>` so `pipeline dev`
+   can open the page on a locally-run frontend while the API/token target the remote.
+3. **Route-page dedup**: optionally refactor `frontend/src/routes/(root)/(logged)/pipeline/[folder]/+page.svelte`
+   to consume `cascadeRun.ts` (its `launchCascadeScript`/`runDraftAwareCascade`/`waitJobTerminal`
+   are the source of the extraction) — eliminates duplication. Keep behavior identical.
+4. **Proxy mode for `pipeline dev`**: currently direct-mode only. Port `dev/dev.ts`'s
+   `startProxyServer` for embedders that need a localhost origin (e.g. Claude Code preview).
+5. **`pipeline dev` editing**: the dev page is view+run only (editing stays in the user's editor).
+   If in-browser editing with file round-trip is wanted, mirror flow-dev's `handleFlowRoundTrip`.
+6. **Asset-path normalization**: done — the python parser resolves the
+   `S3Object(s3=…, storage=…?)` constructor / dict-literal forms to the same canonical path as the
+   TS `{s3, storage}` object form, and `parse_asset_syntax` now strips leading slashes from
+   S3 keys so the SDK-form `s3:///x` (`/x`) and the bare-URI no-slash form (`x`, DuckDB and
+   `// on s3://x`) canonicalize to one key (see Language coverage). SDK writes and DuckDB reads of
+   the same object connect regardless of URI convention.
+
+## Plan reference
+
+Original plan: `/home/rfiszel/.claude/plans/tingly-wandering-whistle.md` (local to the author).
diff --git a/docs/pipelines-vs-dbt.md b/docs/pipelines-vs-dbt.md
index 9ec6dd11d3..d00a78aa7f 100644
--- a/docs/pipelines-vs-dbt.md
+++ b/docs/pipelines-vs-dbt.md
@@ -46,13 +46,13 @@ Asset-centric, polyglot, annotation-driven, event-aware:
 
 | Gap | Architectural blocker? | Verdict |
 |---|---|---|
-| Data tests | No | Pure TODO |
+| Data tests | No | **Shipped** (`// data_test`) |
 | Incremental materializations | No, but pick a philosophy | TODO with design decision |
-| Column lineage + docs site | No | Pure TODO |
-| Snapshots / SCD2 | No | New output kind |
+| Column lineage | No | **Shipped** (`// column`); docs site still TODO |
+| Snapshots / SCD2 | Yes (`key=… history`) | Managed strategy |
 | Selective execution grammar | No | UI/CLI surface |
-| Schema contracts | No, but design metadata model | TODO with design work |
-| Packages / community | Closed annotation parser starts to bind | Decide extensibility model |
+| Schema contracts | No, but design metadata model | **Shipped** (capture #2a + save-time check #2b) |
+| Packages / community / macros | No | **Shipped** (`// macros` workspace macro libraries) |
 | Semantic layer / metrics | No | Large additive scope |
 
 The three items where the current abstraction needs deliberate decisions
@@ -64,10 +64,22 @@ and annotation extensibility**. The rest is execution.
 dbt: `unique`, `not_null`, `accepted_values`, custom generic tests, plus
 singular tests. Run as `SELECT` statements that pass when they return 0 rows.
 
-Today: nothing. Annotation parser is the natural hook —
-`// test unique col_name`, `// test not_null col_name`,
-`// test <script_path>` for custom. Pipeline runtime already handles
-failure propagation. Lowest-risk, highest-payoff item.
+**Shipped** via the `// data_test` annotation (built on materialization):
+`// data_test unique <col>`, `not_null`, `accepted_values <col> = a,b,c`,
+`relationships <col> -> <asset>.<col>`, and `// data_test <script_path>` for
+the custom escape hatch (dbt's singular test). Each compiles to a SQL
+*verifier probe* that runs against the freshly-materialized asset and raises on
+violation, riding the existing failure-propagation path. This is also the first
+*extensible* annotation — see `ducklake-materialization.md` §"Data tests" for
+the annotation→verifier pattern that column-lineage will reuse. The keyword is
+`data_test`, not `test`, to stay clear of the unrelated `// test:` CI-test
+annotation.
+
+Enterprise goes one step *beyond* dbt here: write-audit-publish. dbt commits
+the model then tests it, so a failing test leaves the bad table live for BI
+readers; the enterprise build runs the same probes inside the write
+transaction and rolls back on violation, so a failing slice is never
+published (see `ducklake-materialization.md` §"Scoping decisions").
 
 ### 2. Incremental materializations
 
@@ -78,17 +90,56 @@ See [Incremental deep-dive](#incremental-deep-dive) below.
 dbt: SQL-AST parsing for column-level deps; `dbt docs serve` produces a
 static lineage site with descriptions.
 
-Today: graph is asset-level. `SqlQueryDetails` in the parser
-(`backend/parsers/windmill-parser/src/asset_parser.rs:44`) already has a
-column map — the scaffolding exists. No `// column` annotation, no docs
-surface. Pure TODO; no abstraction stands in the way.
+**Shipped**, inferred-first. For DuckDB scripts the column lineage is **derived
+automatically from the SQL AST** — `windmill-parser-sql-asset` walks each
+output-producing query's projection and maps every output column to the source
+columns its expression reads (passthroughs *and* computed columns like
+`amount + tax AS total`), resolving each input to its asset via the same
+`ATTACH`/alias machinery the asset parser already uses. This is the dbt-style
+AST lineage, and it needs no annotation.
 
-### 4. Snapshots / SCD2
+The `// column <out_col> <- <asset-uri>.<col>[, …]` annotation is the
+**override / escape hatch**, for the cases inference can't reach: polyglot
+transforms (Python/TS/Bash — no SQL AST), dynamic SQL (`${sql.raw(...)}`, flagged
+by `SqlQueryDetails.has_raw_interpolation`), or correcting a mis-inferred edge.
+Inferred and annotated lineage are merged per output column with the annotation
+winning (`merge_column_lineage`). The annotation is the second *extensible*
+annotation family after `// data_test` — same head-then-tail parse shape (see
+`ColumnLineage`/`ColumnRef` in `asset_parser.rs`) — and is pure metadata: it
+drives the graph surface, never a runtime probe.
+
+Surfaced two ways in the asset graph: a count badge on the
+producer→materialized-asset write-edge, and a **transitive column-lineage
+trace** (`ColumnLineageTrace.svelte`, over the cross-script graph built by
+`columnLineageGraph.ts`) in the asset details pane — select an asset to see its
+columns and their full upstream/downstream lineage, click any column to
+highlight its complete impact set across the pipeline (forward + backward).
+
+SQL-AST inference runs both **server-side** (the graph endpoint + deploy via
+`parse_assets`, for *deployed* members) and **in the live editor** — the same
+parser compiled to WASM (`windmill-parser-wasm-asset`) runs on the open draft's
+buffer, and `resolveGraph` merges its `column_lineage` with the buffer's
+`// column` annotations under the same annotation-wins precedence, so the draft
+preview matches what deploys. The `dbt docs serve`-style static lineage *site*
+is still TODO.
+
+### 4. Snapshots / SCD2 — **shipped**
 
 dbt: `{% snapshot %}` blocks with `strategy='timestamp'` or `'check'`.
-Today: nothing. Add as a new `PipelineOutputKind` + `// snapshot strategy=
-timestamp updated_at=updated_at unique_key=id` annotation. Same shape as
-other output kinds.
+Shipped as a modifier on the keyed merge: `// materialize ducklake://<lake>/<dim>
+key=<natural_key> history [track=<c1,c2,…>]` (the leading keyword `scd2` is an
+alias). The SELECT returns the current snapshot (one row per key); the runtime
+adds `valid_from`/`valid_to`/`is_current` and, on each run, diffs against the live
+current rows to close changed versions and open new ones (dbt's `strategy='check'`
+shape — `track=` is the check-columns list; empty ⇒ all non-key columns). Because
+it's a managed strategy (not a new output kind), it inherits `// data_test` and
+schema capture, and each run (re)creates a `<dim>_current` view; consumers get
+effective-dated joins via native `ASOF JOIN … >= valid_from`. Deletes follow dbt:
+soft by default (absent keys stay current), or `deletes=close` for
+`hard_deletes=close`. v1 is non-partitioned; partitioned history is a follow-up.
+Both misconfigurations — `history` without `key=`, and `history` + `//
+partitioned` — are rejected **at deploy** (fail-fast at save, not on the first
+run). See `ducklake-materialization.md`.
 
 ### 5. Selective execution grammar
 
@@ -97,47 +148,102 @@ Today: `requestRunCascadeSignal` in the canvas, `// tag` annotation parsed.
 Graph + tags + last-run state has all the inputs. UI/CLI surface, not
 abstraction work.
 
-### 6. Schema contracts
+### 6. Schema contracts — **shipped**
 
 dbt: `contract: enforced` + `columns: [{name, data_type}]`. Compile-time
 check that model output matches the declaration.
 
-Today: `// on datatable://users/active` is a string. Rename a column
-upstream → downstream breaks at runtime, silently.
+**Shipped**, capture-then-validate (no declaration to maintain): the schema a
+managed `// materialize` run captures post-DESCRIBE into the versioned
+`materialized_asset_schema` sidecar (#2a) *is* the contract, and every
+consumer save/deploy is validated against the latest capture. Three surfaces,
+same diff (`windmill_common::schema_contracts`, mirrored 1:1 in
+`schemaContracts.ts`):
 
-This is the item where the current asset abstraction is thinnest.
-To do contracts well: capture output schemas after a run (substrate-specific
-DESCRIBE), persist them as asset metadata, validate consumer references at
-save time. The asset-as-typed-node model accommodates it — but **where**
-schemas live (asset row, sidecar?), **when** they're captured (post-run?
-edit-time?), and **how** versioning works are non-trivial design choices.
-Worth doing intentionally now while the asset surface is still young.
+- **Save-time (authoritative)**: `POST /w/{ws}/scripts/check_schema_contracts`
+  runs on the deployed content right after a save and returns **warnings —
+  never errors**. A deliberate upstream reshape must not fail every consumer
+  save; that's why dbt's `on_schema_change=fail` is deliberately not offered
+  in v1 (a CI/CLI gate can layer it on later without touching the grammar).
+- **Editor flycheck**: the WASM parse that already runs on the open buffer
+  feeds the same diff, surfacing mismatches as live Monaco warning squiggles
+  anchored to the offending read / `// column` / `// data_test` line.
+- **Autocompletion**: annotation refs (`// column out <-
+  ducklake://lake/orders.`, `// data_test relationships … ->`) complete
+  column names from the captured schema — the broken ref never gets typed.
 
-### 7. Packages / community
+What's checked (ducklake-only — the only substrate with capture in v1;
+datatable refs have no captured schema and stay silent): body-read/written
+columns missing from the capture, `// column` lineage sources, and
+`// data_test relationships` refs — including a captured-type *difference* on
+the join columns when both sides are captured (phrased "differs", since the
+runtime probe's IN-subquery still coerces). Column names compare
+case-insensitively (DuckDB unquoted-identifier semantics); the managed
+`_wm_partition` column is whitelisted; a `<dim>_current` scd2 view falls back
+to its base table's capture (identical columns by construction).
+
+The producer-side escape hatch is `// materialize … on_schema_change=ignore`:
+it declares the schema deliberately unstable and collapses downstream
+warnings for that asset into a single informational note. Default is `warn`.
+
+### 7. Packages / community / macros — **shipped** (macro libraries)
 
 dbt: `dbt deps`, `dbt-utils`, `dbt-expectations`. Whole ecosystem on Jinja
-macros.
+macros — text templating that exists largely to paper over weak warehouse
+SQL and absent code reuse.
 
-Today: closed-vocabulary annotation parser — `parsePipelineAnnotations`
-hardcodes `pipeline`, `partitioned`, `freshness`, `trigger`, `debounce`,
-`tag`, `retry`, `on`. No way for a package to register
-`// test rows_between 100 1000000` or `// hook on_failure my_alert`.
+**Shipped** as workspace **DuckDB macro libraries** — engine-native
+`CREATE MACRO` (scalar + table-valued) instead of templating, resolved and
+injected by Windmill ("resolve-and-inject"):
 
-This is the one place the current abstraction starts to bind. Macros are
-also dbt's biggest pain source — we don't have to replicate them. Possible
-shapes:
+- A DuckDB script annotated `// macros` is a library: its body is
+  `CREATE OR REPLACE MACRO` statements (plus plain setup). Deploy parses each
+  macro into the `macro_definition` registry (workspace-unique names) —
+  available to consumers the moment the deploy transaction commits.
+- Any DuckDB script that *calls* a registered macro gets
+  `CREATE OR REPLACE TEMP MACRO …` blocks injected into its statement list at
+  job time — dependency-topo-ordered (DuckDB bind-checks macro bodies at
+  CREATE) and placed after the setup/ATTACH prefix. Each provider library's
+  own setup statements are injected ahead of the definitions (deduped across
+  libraries), so a macro body that references its lib's ATTACH binds on the
+  implicit path too. Late-bound: a lib redeploy applies to subsequent runs —
+  workers cache the registry per workspace and evict it via a transactional
+  `notify_macro_registry_change` event (worst-case staleness = the notify
+  poll interval, ~10s; 60s TTL as backstop) — dbt's semantics with a
+  deploy-time registry instead of a compile step.
+- `// use <lib_path>` force-injects a whole library (definitions + its setup
+  statements) — the escape hatch for dynamic SQL (e.g. calls inside
+  `query('…')` strings) that lexical detection can't see. A library's own
+  `// use` declarations are honored transitively: consuming a macro from lib B
+  pulls in whatever B `// use`s, so a dynamic dependency stays encapsulated in
+  the library instead of leaking to every consumer.
+- Deploy-time validation: builtin-shadow rejection (DuckDB silently allows
+  shadowing `concat`!), within-file forward references, cross-lib name
+  collisions, non-setup statements, managed-ATTACH setup.
+- Graph surface: the library renders as a node ("defines N macros" badge +
+  signature strip in the details pane) with violet lib→consumer edges from
+  deploy-recorded call detection (`macro_usage`) and `// use` annotations.
 
-- **Hooks-as-scripts**: `// on_failure f/lib/alert`, `// pre_run f/lib/setup`.
-  Value is a script path. Stays inside the closed annotation set; new
-  hook *types* still require parser changes but third-party *behavior*
-  ships as scripts.
-- **Test types as scripts**: a test is a script that returns 0/1, packaged
-  via the hub like anything else.
-- **Materialization plugins**: harder; template-generator would need to be
-  extensible.
+**Trust model (deliberate, dbt-package-like).** Macro libraries are
+workspace-trusted code: anyone who can deploy a script can publish macros,
+and implicit call detection injects them into other users' DuckDB jobs with
+the *consuming* job's credentials — the same trust boundary as a dbt package
+in the project (any committer changes every model). Two guardrails bound it:
+a script's **own** macro definitions always win (a library deploy can never
+replace a local `CREATE MACRO` — the name is excluded from injection
+entirely), and names are workspace-unique with built-in shadowing rejected
+at deploy. A call to a macro that doesn't exist yet is the residual surface
+(whoever first deploys a lib defining that name "captures" the call) — if
+workspaces ever need finer trust, per-consumer opt-in/opt-out or
+ACL-filtered injection can be layered on the same seam.
 
-Doing this *after* you've shipped 30 hardcoded annotations is much harder
-than doing it now.
+Table macros + `query_table(src)` cover most of dbt's *model factory*
+pattern (one parameterized transform, N thin per-asset scripts); DuckDB's
+richer SQL (`COLUMNS(*)`, native `PIVOT`, lambdas) absorbs much of
+dbt-utils outright. Parameterized custom data tests (dbt's generic tests)
+remain a follow-up on the `// data_test <script>` seam, as does the broader
+annotation-extensibility question (hooks-as-scripts etc.) — macros closed
+the reuse gap without opening the parser vocabulary.
 
 ### 8. Semantic layer / metrics
 
@@ -280,6 +386,11 @@ introspection per substrate is its own project.
 Ships A's 80% case first without committing to B's dialect-rewriting tax.
 Wrapping becomes opt-in convenience for users who want dbt-style ergonomics.
 
+> See [`ducklake-materialization.md`](./ducklake-materialization.md) for the
+> DuckLake-native realization of this path: how snapshots make the assets
+> versioned/reproducible for free, the executor codegen seam, and the
+> materialization-metadata schema.
+
 ### Decisions either path forces
 
 1. **Partition window provenance.** Scheduler tick? Trigger event time
@@ -325,6 +436,13 @@ DELETE-by-partition + INSERT works only if you reprocess from a
 source-of-truth source. If you're consuming amendments and need dedup
 *within* the slice, you need MERGE on `order_id`, not DELETE on partition.
 
+Note the boundary: the keyed merge reconciles the incoming rows against the
+*target* (delete-by-key + insert), but it does not deduplicate the *source*.
+"Latest version per `order_id`" is still your SELECT's job — pick one row per
+key (e.g. `QUALIFY row_number() OVER (PARTITION BY order_id ORDER BY updated_at
+DESC) = 1`). A source that still has two rows for one key is rejected at run
+time rather than double-written (see `ducklake-materialization.md`).
+
 This is what dbt's `unique_key` does. Orthogonal to partitioning:
 `partitioned` answers "which slice?"; `unique_key` answers "how do I dedup
 inside the slice?"
diff --git a/docs/validation.md b/docs/validation.md
index ba775d01cf..3bfd1325ce 100644
--- a/docs/validation.md
+++ b/docs/validation.md
@@ -10,6 +10,7 @@ After making changes, run the appropriate checks and fix all errors before consi
 | Enterprise code (`*_ee.rs`) | `cargo check --features enterprise,private` | Also do EE PR workflow (see `docs/enterprise.md`) |
 | Enterprise + license-gated code | `cargo check --features enterprise,private,license` | When the feature requires a valid license key |
 | Kafka trigger code | `cargo check --features kafka` | |
+| DuckDB executor code | `cargo check -p windmill-worker --features duckdb` | `duckdb_executor.rs` (and its `#[cfg(test)]` tests) only compile with this flag — a plain check/test silently skips them |
 | Native trigger code | `cargo check --features native_trigger` | |
 | Parquet code | `cargo check --features parquet` | |
 | Multiple gated modules | `cargo check --features enterprise,parquet` | Combine only the flags you need |
diff --git a/flake.lock b/flake.lock
index 486771d582..44274d0a30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1768377964,
+        "narHash": "sha256-RU35vQnfg9NwJUviGCfMH9ChgHANoNSiRaAn4/wINT4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "cadda13afe838615fb74b0a9720905920559c535",
         "type": "github"
       },
       "original": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index aee28ad0d5..979a02165a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@windmill-labs/components",
-	"version": "1.733.1",
+	"version": "1.753.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@windmill-labs/components",
-			"version": "1.733.1",
+			"version": "1.753.0",
 			"hasInstallScript": true,
 			"license": "AGPL-3.0",
 			"dependencies": {
@@ -52,6 +52,7 @@
 				"lru-cache": "^11.1.0",
 				"lucide-svelte": "^0.540.0",
 				"mdast-util-find-and-replace": "^3.0.2",
+				"mermaid": "^11.15.0",
 				"minimatch": "^10.0.1",
 				"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@=25.0.0",
 				"monaco-languageclient": "10.6.0",
@@ -78,7 +79,7 @@
 				"vscode-languageclient": "~9.0.1",
 				"vscode-uri": "~3.1.0",
 				"vscode-ws-jsonrpc": "~3.5.0",
-				"windmill-parser-wasm-asset": "1.728.1",
+				"windmill-parser-wasm-asset": "1.749.0",
 				"windmill-parser-wasm-csharp": "1.510.1",
 				"windmill-parser-wasm-go": "1.510.1",
 				"windmill-parser-wasm-java": "1.510.1",
@@ -93,7 +94,7 @@
 				"windmill-parser-wasm-wac": "1.668.6",
 				"windmill-parser-wasm-yaml": "1.593.0",
 				"windmill-sql-datatype-parser-wasm": "1.512.0",
-				"windmill-utils-internal": "^1.7.0",
+				"windmill-utils-internal": "1.8.2",
 				"xterm": "^5.3.0",
 				"xterm-readline": "^1.1.2",
 				"y-monaco": "^0.1.4",
@@ -179,6 +180,28 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@antfu/install-pkg": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.1.0.tgz",
+			"integrity": "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==",
+			"license": "MIT",
+			"dependencies": {
+				"package-manager-detector": "^1.3.0",
+				"tinyexec": "^1.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
+		"node_modules/@antfu/install-pkg/node_modules/tinyexec": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
+			"integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=18"
+			}
+		},
 		"node_modules/@anthropic-ai/sdk": {
 			"version": "0.60.0",
 			"resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.60.0.tgz",
@@ -298,6 +321,18 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@braintree/sanitize-url": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-7.1.2.tgz",
+			"integrity": "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==",
+			"license": "MIT"
+		},
+		"node_modules/@chevrotain/types": {
+			"version": "11.1.2",
+			"resolved": "https://registry.npmjs.org/@chevrotain/types/-/types-11.1.2.tgz",
+			"integrity": "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw==",
+			"license": "Apache-2.0"
+		},
 		"node_modules/@codingame/monaco-vscode-api": {
 			"version": "25.0.0",
 			"resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-25.0.0.tgz",
@@ -840,21 +875,21 @@
 			}
 		},
 		"node_modules/@emnapi/core": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
-			"integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
+			"version": "1.11.2",
+			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
+			"integrity": "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
-				"@emnapi/wasi-threads": "1.2.1",
+				"@emnapi/wasi-threads": "1.2.2",
 				"tslib": "^2.4.0"
 			}
 		},
 		"node_modules/@emnapi/runtime": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
-			"integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
+			"version": "1.11.2",
+			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz",
+			"integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
@@ -863,9 +898,9 @@
 			}
 		},
 		"node_modules/@emnapi/wasi-threads": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
-			"integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
+			"integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
@@ -1081,6 +1116,23 @@
 			"dev": true,
 			"license": "BSD-3-Clause"
 		},
+		"node_modules/@iconify/types": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+			"integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+			"license": "MIT"
+		},
+		"node_modules/@iconify/utils": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-3.1.3.tgz",
+			"integrity": "sha512-LPKOXPn/zV+zis1oOfGWogaXVpqUybF3ZS6SCZIsz8vg0ivVp9+fVqyYB7xq0aiST/VhUQYGO1qo6uoYSiEJqw==",
+			"license": "MIT",
+			"dependencies": {
+				"@antfu/install-pkg": "^1.1.0",
+				"@iconify/types": "^2.0.0",
+				"import-meta-resolve": "^4.2.0"
+			}
+		},
 		"node_modules/@internationalized/date": {
 			"version": "3.10.0",
 			"resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.0.tgz",
@@ -1352,6 +1404,15 @@
 				"svelte": "^3.0.0 || ^4.0.0 || ^5.0.0-next.118"
 			}
 		},
+		"node_modules/@mermaid-js/parser": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-1.1.1.tgz",
+			"integrity": "sha512-VuHdsYMK1bT6X2JbcAaWAhugTRvRBRyuZgd+c22swUeI9g/ntaxF7CY7dYarhZovofCbUNO0G7JesfmNtjYOCw==",
+			"license": "MIT",
+			"dependencies": {
+				"@chevrotain/types": "~11.1.1"
+			}
+		},
 		"node_modules/@napi-rs/wasm-runtime": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
@@ -1713,8 +1774,8 @@
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
-				"@emnapi/core": "1.10.0",
-				"@emnapi/runtime": "1.10.0",
+				"@emnapi/core": "1.11.2",
+				"@emnapi/runtime": "1.11.2",
 				"@napi-rs/wasm-runtime": "^1.1.4"
 			},
 			"engines": {
@@ -2080,7 +2141,6 @@
 			"version": "7.4.3",
 			"resolved": "https://registry.npmjs.org/@types/d3/-/d3-7.4.3.tgz",
 			"integrity": "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-array": "*",
@@ -2119,14 +2179,12 @@
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
 			"integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-axis": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/@types/d3-axis/-/d3-axis-3.0.6.tgz",
 			"integrity": "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
@@ -2136,7 +2194,6 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-3.0.6.tgz",
 			"integrity": "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-selection": "*"
@@ -2146,7 +2203,6 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/@types/d3-chord/-/d3-chord-3.0.6.tgz",
 			"integrity": "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-color": {
@@ -2159,7 +2215,6 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-3.0.6.tgz",
 			"integrity": "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-array": "*",
@@ -2170,14 +2225,12 @@
 			"version": "6.0.4",
 			"resolved": "https://registry.npmjs.org/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
 			"integrity": "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-dispatch": {
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
 			"integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-drag": {
@@ -2193,21 +2246,18 @@
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-3.0.7.tgz",
 			"integrity": "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-ease": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
 			"integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-fetch": {
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/@types/d3-fetch/-/d3-fetch-3.0.7.tgz",
 			"integrity": "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-dsv": "*"
@@ -2217,21 +2267,18 @@
 			"version": "3.0.10",
 			"resolved": "https://registry.npmjs.org/@types/d3-force/-/d3-force-3.0.10.tgz",
 			"integrity": "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-format": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-3.0.4.tgz",
 			"integrity": "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-geo": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
 			"integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/geojson": "*"
@@ -2241,7 +2288,6 @@
 			"version": "3.1.7",
 			"resolved": "https://registry.npmjs.org/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz",
 			"integrity": "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-interpolate": {
@@ -2257,35 +2303,30 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
 			"integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-polygon": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-polygon/-/d3-polygon-3.0.2.tgz",
 			"integrity": "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-quadtree": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz",
 			"integrity": "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-random": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-3.0.3.tgz",
 			"integrity": "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-scale": {
 			"version": "4.0.9",
 			"resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
 			"integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-time": "*"
@@ -2295,7 +2336,6 @@
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
 			"integrity": "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-selection": {
@@ -2308,7 +2348,6 @@
 			"version": "3.1.7",
 			"resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
 			"integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@types/d3-path": "*"
@@ -2318,21 +2357,18 @@
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
 			"integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-time-format": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz",
 			"integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-timer": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
 			"integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/d3-transition": {
@@ -2387,7 +2423,6 @@
 			"version": "7946.0.16",
 			"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
 			"integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
-			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@types/hammerjs": {
@@ -2795,6 +2830,16 @@
 			"integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
 			"license": "ISC"
 		},
+		"node_modules/@upsetjs/venn.js": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@upsetjs/venn.js/-/venn.js-2.0.0.tgz",
+			"integrity": "sha512-WbBhLrooyePuQ1VZxrJjtLvTc4NVfpOyKx0sKqioq9bX1C1m7Jgykkn8gLrtwumBioXIqam8DLxp88Adbue6Hw==",
+			"license": "MIT",
+			"optionalDependencies": {
+				"d3-selection": "^3.0.0",
+				"d3-transition": "^3.0.1"
+			}
+		},
 		"node_modules/@vitest/expect": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.0.tgz",
@@ -4084,6 +4129,15 @@
 			"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
 			"license": "MIT"
 		},
+		"node_modules/cose-base": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz",
+			"integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==",
+			"license": "MIT",
+			"dependencies": {
+				"layout-base": "^1.0.0"
+			}
+		},
 		"node_modules/cosmiconfig": {
 			"version": "8.3.6",
 			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
@@ -4338,11 +4392,99 @@
 			"dev": true,
 			"license": "CC0-1.0"
 		},
+		"node_modules/cytoscape": {
+			"version": "3.34.0",
+			"resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.34.0.tgz",
+			"integrity": "sha512-62rNSrioXw93uliKFBwjukeQyeWwH2PqDrTac31r2P6464u3AUvTk0xS4LVvT251g7IgkFunrI48ZEZGjywSOg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/cytoscape-cose-bilkent": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz",
+			"integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==",
+			"license": "MIT",
+			"dependencies": {
+				"cose-base": "^1.0.0"
+			},
+			"peerDependencies": {
+				"cytoscape": "^3.2.0"
+			}
+		},
+		"node_modules/cytoscape-fcose": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz",
+			"integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==",
+			"license": "MIT",
+			"dependencies": {
+				"cose-base": "^2.2.0"
+			},
+			"peerDependencies": {
+				"cytoscape": "^3.2.0"
+			}
+		},
+		"node_modules/cytoscape-fcose/node_modules/cose-base": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz",
+			"integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==",
+			"license": "MIT",
+			"dependencies": {
+				"layout-base": "^2.0.0"
+			}
+		},
+		"node_modules/cytoscape-fcose/node_modules/layout-base": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz",
+			"integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==",
+			"license": "MIT"
+		},
+		"node_modules/d3": {
+			"version": "7.9.0",
+			"resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+			"integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-array": "3",
+				"d3-axis": "3",
+				"d3-brush": "3",
+				"d3-chord": "3",
+				"d3-color": "3",
+				"d3-contour": "4",
+				"d3-delaunay": "6",
+				"d3-dispatch": "3",
+				"d3-drag": "3",
+				"d3-dsv": "3",
+				"d3-ease": "3",
+				"d3-fetch": "3",
+				"d3-force": "3",
+				"d3-format": "3",
+				"d3-geo": "3",
+				"d3-hierarchy": "3",
+				"d3-interpolate": "3",
+				"d3-path": "3",
+				"d3-polygon": "3",
+				"d3-quadtree": "3",
+				"d3-random": "3",
+				"d3-scale": "4",
+				"d3-scale-chromatic": "3",
+				"d3-selection": "3",
+				"d3-shape": "3",
+				"d3-time": "3",
+				"d3-time-format": "4",
+				"d3-timer": "3",
+				"d3-transition": "3",
+				"d3-zoom": "3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-array": {
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
 			"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-			"dev": true,
 			"license": "ISC",
 			"dependencies": {
 				"internmap": "1 - 2"
@@ -4351,6 +4493,43 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-axis": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+			"integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-brush": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+			"integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-drag": "2 - 3",
+				"d3-interpolate": "1 - 3",
+				"d3-selection": "3",
+				"d3-transition": "3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-chord": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+			"integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-path": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-color": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
@@ -4360,6 +4539,18 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-contour": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+			"integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-array": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-dag": {
 			"version": "0.11.5",
 			"resolved": "https://registry.npmjs.org/d3-dag/-/d3-dag-0.11.5.tgz",
@@ -4373,6 +4564,18 @@
 				"quadprog": "^1.6.1"
 			}
 		},
+		"node_modules/d3-delaunay": {
+			"version": "6.0.4",
+			"resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+			"integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+			"license": "ISC",
+			"dependencies": {
+				"delaunator": "5"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-dispatch": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
@@ -4395,6 +4598,40 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-dsv": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+			"integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+			"license": "ISC",
+			"dependencies": {
+				"commander": "7",
+				"iconv-lite": "0.6",
+				"rw": "1"
+			},
+			"bin": {
+				"csv2json": "bin/dsv2json.js",
+				"csv2tsv": "bin/dsv2dsv.js",
+				"dsv2dsv": "bin/dsv2dsv.js",
+				"dsv2json": "bin/dsv2json.js",
+				"json2csv": "bin/json2dsv.js",
+				"json2dsv": "bin/json2dsv.js",
+				"json2tsv": "bin/json2dsv.js",
+				"tsv2csv": "bin/dsv2dsv.js",
+				"tsv2json": "bin/dsv2json.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-dsv/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 10"
+			}
+		},
 		"node_modules/d3-ease": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
@@ -4404,6 +4641,62 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-fetch": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+			"integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-dsv": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-force": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+			"integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-dispatch": "1 - 3",
+				"d3-quadtree": "1 - 3",
+				"d3-timer": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-format": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+			"integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-geo": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+			"integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-array": "2.5.0 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-hierarchy": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+			"integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-interpolate": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
@@ -4416,6 +4709,111 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-path": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+			"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-polygon": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+			"integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-quadtree": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+			"integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-random": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+			"integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+			"license": "ISC",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-sankey": {
+			"version": "0.12.3",
+			"resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.12.3.tgz",
+			"integrity": "sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-array": "1 - 2",
+				"d3-shape": "^1.2.0"
+			}
+		},
+		"node_modules/d3-sankey/node_modules/d3-array": {
+			"version": "2.12.1",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+			"integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"internmap": "^1.0.0"
+			}
+		},
+		"node_modules/d3-sankey/node_modules/d3-path": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
+			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==",
+			"license": "BSD-3-Clause"
+		},
+		"node_modules/d3-sankey/node_modules/d3-shape": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
+			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+			"license": "BSD-3-Clause",
+			"dependencies": {
+				"d3-path": "1"
+			}
+		},
+		"node_modules/d3-sankey/node_modules/internmap": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
+			"integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
+			"license": "ISC"
+		},
+		"node_modules/d3-scale": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+			"integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-array": "2.10.0 - 3",
+				"d3-format": "1 - 3",
+				"d3-interpolate": "1.2.0 - 3",
+				"d3-time": "2.1.1 - 3",
+				"d3-time-format": "2 - 4"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-scale-chromatic": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+			"integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-color": "1 - 3",
+				"d3-interpolate": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-selection": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
@@ -4425,6 +4823,42 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/d3-shape": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+			"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-path": "^3.1.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-time": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+			"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-array": "2 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/d3-time-format": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+			"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+			"license": "ISC",
+			"dependencies": {
+				"d3-time": "1 - 3"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/d3-timer": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
@@ -4469,6 +4903,16 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/dagre-d3-es": {
+			"version": "7.0.14",
+			"resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.14.tgz",
+			"integrity": "sha512-P4rFMVq9ESWqmOgK+dlXvOtLwYg0i7u0HBGJER0LZDJT2VHIPAMZ/riPxqJceWMStH5+E61QxFra9kIS3AqdMg==",
+			"license": "MIT",
+			"dependencies": {
+				"d3": "^7.9.0",
+				"lodash-es": "^4.17.21"
+			}
+		},
 		"node_modules/date-fns": {
 			"version": "2.30.0",
 			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
@@ -4485,6 +4929,12 @@
 				"url": "https://opencollective.com/date-fns"
 			}
 		},
+		"node_modules/dayjs": {
+			"version": "1.11.21",
+			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz",
+			"integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==",
+			"license": "MIT"
+		},
 		"node_modules/debug": {
 			"version": "4.4.3",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -4695,6 +5145,15 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/delaunator": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.1.0.tgz",
+			"integrity": "sha512-AGrQ4QSgssa1NGmWmLPqN5NY2KajF5MqxetNEO+o0n3ZwZZeTmt7bBnvzHWrmkZFxGgr4HdyFgelzgi06otLuQ==",
+			"license": "ISC",
+			"dependencies": {
+				"robust-predicates": "^3.0.2"
+			}
+		},
 		"node_modules/delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -5094,6 +5553,16 @@
 				"node": ">= 0.4"
 			}
 		},
+		"node_modules/es-toolkit": {
+			"version": "1.48.1",
+			"resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.48.1.tgz",
+			"integrity": "sha512-wfnXlwd5I75eXRtdD2vuEs50xHHESECDsGD7yiQnfFVNoa5522NwXEbmgo98LfiukSQHs+mBM7/YG3qKJB9/mQ==",
+			"license": "MIT",
+			"workspaces": [
+				"docs",
+				"benchmarks"
+			]
+		},
 		"node_modules/escalade": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -6161,6 +6630,12 @@
 				"node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
 			}
 		},
+		"node_modules/hachure-fill": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/hachure-fill/-/hachure-fill-0.5.2.tgz",
+			"integrity": "sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==",
+			"license": "MIT"
+		},
 		"node_modules/hammerjs": {
 			"version": "2.0.8",
 			"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
@@ -6489,6 +6964,18 @@
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
+		"node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"license": "MIT",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/idb": {
 			"version": "8.0.3",
 			"resolved": "https://registry.npmjs.org/idb/-/idb-8.0.3.tgz",
@@ -6560,6 +7047,16 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/import-meta-resolve": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
+			"integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
+			"license": "MIT",
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
+		},
 		"node_modules/imurmurhash": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -6620,7 +7117,6 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
 			"integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-			"dev": true,
 			"license": "ISC",
 			"engines": {
 				"node": ">=12"
@@ -7058,6 +7554,31 @@
 				"safe-buffer": "~5.1.0"
 			}
 		},
+		"node_modules/katex": {
+			"version": "0.16.47",
+			"resolved": "https://registry.npmjs.org/katex/-/katex-0.16.47.tgz",
+			"integrity": "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg==",
+			"funding": [
+				"https://opencollective.com/katex",
+				"https://github.com/sponsors/katex"
+			],
+			"license": "MIT",
+			"dependencies": {
+				"commander": "^8.3.0"
+			},
+			"bin": {
+				"katex": "cli.js"
+			}
+		},
+		"node_modules/katex/node_modules/commander": {
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+			"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 12"
+			}
+		},
 		"node_modules/keyv": {
 			"version": "4.5.4",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -7068,6 +7589,11 @@
 				"json-buffer": "3.0.1"
 			}
 		},
+		"node_modules/khroma": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/khroma/-/khroma-2.1.0.tgz",
+			"integrity": "sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw=="
+		},
 		"node_modules/kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -7096,6 +7622,12 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/layout-base": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz",
+			"integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==",
+			"license": "MIT"
+		},
 		"node_modules/lerc": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
@@ -7623,6 +8155,12 @@
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 			"license": "MIT"
 		},
+		"node_modules/lodash-es": {
+			"version": "4.18.1",
+			"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+			"integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
+			"license": "MIT"
+		},
 		"node_modules/lodash.clonedeep": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -8075,6 +8613,47 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/mermaid": {
+			"version": "11.15.0",
+			"resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.15.0.tgz",
+			"integrity": "sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw==",
+			"license": "MIT",
+			"dependencies": {
+				"@braintree/sanitize-url": "^7.1.1",
+				"@iconify/utils": "^3.0.2",
+				"@mermaid-js/parser": "^1.1.1",
+				"@types/d3": "^7.4.3",
+				"@upsetjs/venn.js": "^2.0.0",
+				"cytoscape": "^3.33.1",
+				"cytoscape-cose-bilkent": "^4.1.0",
+				"cytoscape-fcose": "^2.2.0",
+				"d3": "^7.9.0",
+				"d3-sankey": "^0.12.3",
+				"dagre-d3-es": "7.0.14",
+				"dayjs": "^1.11.19",
+				"dompurify": "^3.3.1",
+				"es-toolkit": "^1.45.1",
+				"katex": "^0.16.25",
+				"khroma": "^2.1.0",
+				"marked": "^16.3.0",
+				"roughjs": "^4.6.6",
+				"stylis": "^4.3.6",
+				"ts-dedent": "^2.2.0",
+				"uuid": "^11.1.0 || ^12 || ^13 || ^14.0.0"
+			}
+		},
+		"node_modules/mermaid/node_modules/marked": {
+			"version": "16.4.2",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-16.4.2.tgz",
+			"integrity": "sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA==",
+			"license": "MIT",
+			"bin": {
+				"marked": "bin/marked.js"
+			},
+			"engines": {
+				"node": ">= 20"
+			}
+		},
 		"node_modules/methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -9351,6 +9930,12 @@
 			"dev": true,
 			"license": "BlueOak-1.0.0"
 		},
+		"node_modules/package-manager-detector": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.6.0.tgz",
+			"integrity": "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==",
+			"license": "MIT"
+		},
 		"node_modules/pako": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
@@ -9432,6 +10017,12 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/path-data-parser": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/path-data-parser/-/path-data-parser-0.1.0.tgz",
+			"integrity": "sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==",
+			"license": "MIT"
+		},
 		"node_modules/path-exists": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -9572,9 +10163,9 @@
 			"license": "ISC"
 		},
 		"node_modules/picomatch": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
+			"integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -9679,6 +10270,22 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/points-on-curve": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/points-on-curve/-/points-on-curve-0.2.0.tgz",
+			"integrity": "sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==",
+			"license": "MIT"
+		},
+		"node_modules/points-on-path": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/points-on-path/-/points-on-path-0.2.1.tgz",
+			"integrity": "sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==",
+			"license": "MIT",
+			"dependencies": {
+				"path-data-parser": "0.1.0",
+				"points-on-curve": "0.2.0"
+			}
+		},
 		"node_modules/postcss": {
 			"version": "8.5.14",
 			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz",
@@ -11083,6 +11690,12 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"node_modules/robust-predicates": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.3.tgz",
+			"integrity": "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA==",
+			"license": "Unlicense"
+		},
 		"node_modules/rolldown": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.1.tgz",
@@ -11117,6 +11730,18 @@
 				"@rolldown/binding-win32-x64-msvc": "1.0.1"
 			}
 		},
+		"node_modules/roughjs": {
+			"version": "4.6.6",
+			"resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz",
+			"integrity": "sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==",
+			"license": "MIT",
+			"dependencies": {
+				"hachure-fill": "^0.5.2",
+				"path-data-parser": "^0.1.0",
+				"points-on-curve": "^0.2.0",
+				"points-on-path": "^0.2.1"
+			}
+		},
 		"node_modules/run-parallel": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -11208,6 +11833,12 @@
 			],
 			"license": "MIT"
 		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+			"license": "MIT"
+		},
 		"node_modules/scule": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
@@ -11887,6 +12518,12 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/stylis": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.4.0.tgz",
+			"integrity": "sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==",
+			"license": "MIT"
+		},
 		"node_modules/sucrase": {
 			"version": "3.35.0",
 			"resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
@@ -12145,9 +12782,9 @@
 			}
 		},
 		"node_modules/svelte-check/node_modules/picomatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-			"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+			"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
 			"dev": true,
 			"license": "MIT",
 			"optional": true,
@@ -12715,9 +13352,9 @@
 			}
 		},
 		"node_modules/tinyglobby/node_modules/picomatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-			"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+			"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
 			"devOptional": true,
 			"license": "MIT",
 			"engines": {
@@ -12800,6 +13437,15 @@
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
+		"node_modules/ts-dedent": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.3.0.tgz",
+			"integrity": "sha512-JfJeIHke7y2egdGGgRAvpCwYFUsHlM2gPcrVOxFkznt/4uzQ7HFmvE63iFHVLBJNDuyDOQgijDK/tXH/f6Msjg==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.10"
+			}
+		},
 		"node_modules/ts-interface-checker": {
 			"version": "0.1.13",
 			"resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
@@ -13108,6 +13754,19 @@
 			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
 			"license": "MIT"
 		},
+		"node_modules/uuid": {
+			"version": "14.0.1",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.1.tgz",
+			"integrity": "sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==",
+			"funding": [
+				"https://github.com/sponsors/broofa",
+				"https://github.com/sponsors/ctavan"
+			],
+			"license": "MIT",
+			"bin": {
+				"uuid": "dist-node/bin/uuid"
+			}
+		},
 		"node_modules/validate-npm-package-license": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -13272,9 +13931,9 @@
 			}
 		},
 		"node_modules/vite/node_modules/picomatch": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-			"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+			"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
 			"devOptional": true,
 			"license": "MIT",
 			"engines": {
@@ -13408,9 +14067,9 @@
 			"license": "MIT"
 		},
 		"node_modules/vitest/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+			"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -13662,9 +14321,9 @@
 			}
 		},
 		"node_modules/windmill-parser-wasm-asset": {
-			"version": "1.728.1",
-			"resolved": "https://registry.npmjs.org/windmill-parser-wasm-asset/-/windmill-parser-wasm-asset-1.728.1.tgz",
-			"integrity": "sha512-73cyU6XM3gYEjFBx3qOKnv+VV1t70eAr6OiT+x0QobjFVNmqZFEdA7ayMYYVCnnix8OZxcsTNEF1hT61w1XiKw=="
+			"version": "1.749.0",
+			"resolved": "https://registry.npmjs.org/windmill-parser-wasm-asset/-/windmill-parser-wasm-asset-1.749.0.tgz",
+			"integrity": "sha512-gj8g9sWQ0tXKfXso7xJxR56sS8Loe/RsnFy+0af5R8siZeCag9ikquGbQ8d8kOqIK2U8eCNA0LqsU/xAFDJIOg=="
 		},
 		"node_modules/windmill-parser-wasm-csharp": {
 			"version": "1.510.1",
@@ -13737,9 +14396,9 @@
 			"integrity": "sha512-uHNL8F72/Tf96xF3hOHnPDjkEyqXw7fNjcPJiUhth9sTQkcwUIoJMOdwm8/cs+j9kKVRJ4tgNYMHEBLylazp6g=="
 		},
 		"node_modules/windmill-utils-internal": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/windmill-utils-internal/-/windmill-utils-internal-1.7.0.tgz",
-			"integrity": "sha512-K5kAiJKhavfGatmicbJyqT+KFspzFZK5Ou14pHj4Xg6Q2Z1a4ZgziBdrRNsaeAuBhB62yXWZA0OXDzg936Ymmw==",
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/windmill-utils-internal/-/windmill-utils-internal-1.8.2.tgz",
+			"integrity": "sha512-Otdn4iCE0QiOtMKPdHX5I89oECfZa3vmO2jdLdSETf7MBSv/gw9gvQm3oUQ29ymIHXLeuhQk/ebPD+WYolQJEA==",
 			"license": "Apache 2.0"
 		},
 		"node_modules/word-wrap": {
diff --git a/frontend/package.json b/frontend/package.json
index 8549d750fa..af806a494d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@windmill-labs/components",
-	"version": "1.733.1",
+	"version": "1.753.0",
 	"scripts": {
 		"dev": "vite dev",
 		"dev:ui-builder": "mv static/ui_builder static/ui_builder.dev-disabled 2>/dev/null || true ; trap 'mv static/ui_builder.dev-disabled static/ui_builder 2>/dev/null || true' EXIT ; vite dev",
@@ -127,6 +127,7 @@
 		"lru-cache": "^11.1.0",
 		"lucide-svelte": "^0.540.0",
 		"mdast-util-find-and-replace": "^3.0.2",
+		"mermaid": "^11.15.0",
 		"minimatch": "^10.0.1",
 		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@=25.0.0",
 		"monaco-languageclient": "10.6.0",
@@ -153,7 +154,7 @@
 		"vscode-languageclient": "~9.0.1",
 		"vscode-uri": "~3.1.0",
 		"vscode-ws-jsonrpc": "~3.5.0",
-		"windmill-parser-wasm-asset": "1.728.1",
+		"windmill-parser-wasm-asset": "1.749.0",
 		"windmill-parser-wasm-csharp": "1.510.1",
 		"windmill-parser-wasm-go": "1.510.1",
 		"windmill-parser-wasm-java": "1.510.1",
@@ -168,7 +169,7 @@
 		"windmill-parser-wasm-wac": "1.668.6",
 		"windmill-parser-wasm-yaml": "1.593.0",
 		"windmill-sql-datatype-parser-wasm": "1.512.0",
-		"windmill-utils-internal": "^1.7.0",
+		"windmill-utils-internal": "1.8.2",
 		"xterm": "^5.3.0",
 		"xterm-readline": "^1.1.2",
 		"y-monaco": "^0.1.4",
diff --git a/frontend/scripts/ui_builder_artifact.json b/frontend/scripts/ui_builder_artifact.json
index aa09b8730f..b901dc9bc0 100644
--- a/frontend/scripts/ui_builder_artifact.json
+++ b/frontend/scripts/ui_builder_artifact.json
@@ -1,5 +1,5 @@
 {
 	"baseUrl": "https://pub-06154ed168a24e73a86ab84db6bf15d8.r2.dev",
-	"version": "ad76918",
-	"sha256": "4c940570936a391c217a054b74c691587d7f27d012ccddbf5e3b3d25e7c1fe4a"
+	"version": "f8cecf9",
+	"sha256": "2a79b838e21e06abe06119263872afbe83c4a13f7aa72c722af3e34b819f0ce3"
 }
diff --git a/frontend/src/app.html b/frontend/src/app.html
index 718800105a..aad967fd91 100644
--- a/frontend/src/app.html
+++ b/frontend/src/app.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
@@ -23,6 +23,106 @@
 			}
 		</style>
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<script>
+			// WIN-2006: when the app is rendered inside an opaque-origin (sandboxed,
+			// no allow-same-origin) iframe, Web Storage access throws a SecurityError.
+			// Install an in-memory shim before the SvelteKit app boots so the app (and
+			// Windmill SPA code running inside the frame) keeps working within the
+			// session. No-op in normal real-origin contexts, so zero blast radius.
+			;(function () {
+				// `onOp` (localStorage only) relays each mutation up to the embedder,
+				// which backs a single store shared across all apps. sessionStorage
+				// stays in-memory/session-only.
+				function shim(onOp) {
+					var m = {}
+					return {
+						__hydrate: function (obj) {
+							if (obj) for (var k in obj) m['' + k] = '' + obj[k]
+						},
+						getItem: function (k) {
+							k = '' + k
+							return Object.prototype.hasOwnProperty.call(m, k) ? m[k] : null
+						},
+						setItem: function (k, v) {
+							m['' + k] = '' + v
+							if (onOp) onOp({ op: 'set', key: '' + k, value: '' + v })
+						},
+						removeItem: function (k) {
+							delete m['' + k]
+							if (onOp) onOp({ op: 'remove', key: '' + k })
+						},
+						clear: function () {
+							for (var k in m) delete m[k]
+							if (onOp) onOp({ op: 'clear' })
+						},
+						key: function (i) {
+							var ks = Object.keys(m)
+							return i < ks.length ? ks[i] : null
+						},
+						get length() {
+							return Object.keys(m).length
+						}
+					}
+				}
+				try {
+					window.localStorage.getItem('__wm_probe__')
+				} catch (e) {
+					var framed = window.parent !== window
+					function relayOp(o) {
+						if (framed)
+							try {
+								window.parent.postMessage(
+									{ type: 'wm_ls_op', op: o.op, key: o.key, value: o.value },
+									'*'
+								)
+							} catch (_) {}
+					}
+					var ls = shim(framed ? relayOp : null)
+					try {
+						Object.defineProperty(window, 'localStorage', { value: ls, configurable: true })
+					} catch (_) {}
+					try {
+						Object.defineProperty(window, 'sessionStorage', {
+							value: shim(null),
+							configurable: true
+						})
+					} catch (_) {}
+					// Persistence: ask the embedder for the shared store and hydrate the
+					// in-memory localStorage when it arrives.
+					if (framed) {
+						window.addEventListener('message', function (ev) {
+							if (ev.source === window.parent && ev.data && ev.data.type === 'wm_ls_hydrate') {
+								ls.__hydrate(ev.data.data)
+							}
+						})
+						try {
+							window.parent.postMessage({ type: 'wm_ls_req' }, '*')
+						} catch (_) {}
+					}
+					// `document.cookie` also throws in an opaque origin; back it with an
+					// in-memory jar so reads don't crash apps. This is NOT the real
+					// session cookie (unreachable here) — just an isolated client-side store.
+					try {
+						var jar = {}
+						Object.defineProperty(Document.prototype, 'cookie', {
+							configurable: true,
+							get: function () {
+								return Object.keys(jar)
+									.map(function (k) {
+										return k + '=' + jar[k]
+									})
+									.join('; ')
+							},
+							set: function (v) {
+								var p = String(v).split(';')[0]
+								var i = p.indexOf('=')
+								if (i > -1) jar[p.slice(0, i).trim()] = p.slice(i + 1).trim()
+							}
+						})
+					} catch (_) {}
+				}
+			})()
+		</script>
 		%sveltekit.head%
 	</head>
 	<body data-sveltekit-preload-code="viewport" class="outline-none focus:outline-none">
@@ -56,7 +156,7 @@
 							/>
 							<polygon
 								class="st3"
-								points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46 	
+								points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46
 		"
 							/>
 							<polygon
diff --git a/frontend/src/lib/aiStore.ts b/frontend/src/lib/aiStore.ts
index cb34b72be0..bd03f1baa4 100644
--- a/frontend/src/lib/aiStore.ts
+++ b/frontend/src/lib/aiStore.ts
@@ -77,13 +77,28 @@ function dedupeModels(models: AIProviderModel[]): AIProviderModel[] {
 	})
 }
 
+// copilotInfo/copilotSessionModel are global, so concurrent loads (e.g. a fast
+// session switch between workspaces) race: an earlier call resolving last would
+// clobber the active workspace's config. Apply only the most recent call's
+// result via a monotonic token — last invocation wins regardless of resolution
+// order. init() is synchronous so its ordering already matches.
+let loadCopilotToken = 0
+// The workspace copilotInfo currently reflects. A session send awaits this
+// matching its committed workspace so getCurrentModel() can't read the previous
+// workspace's provider/model while the scoped load is still in flight.
+export const copilotWorkspace = writable<string | undefined>(undefined)
 export async function loadCopilot(workspace: string) {
+	const token = ++loadCopilotToken
 	workspaceAIClients.init(workspace)
 	try {
 		const info = await WorkspaceService.getCopilotInfo({ workspace })
+		if (token !== loadCopilotToken) return
 		setCopilotInfo(info)
+		copilotWorkspace.set(workspace)
 	} catch (err) {
+		if (token !== loadCopilotToken) return
 		setCopilotInfo({})
+		copilotWorkspace.set(workspace)
 		console.error('Could not get copilot info', err)
 	}
 }
@@ -204,3 +219,12 @@ export function getCombinedCustomPrompt(mode: string): string | undefined {
 
 	return prompts.join('\n\n')
 }
+
+// Like getCombinedCustomPrompt but keeps the workspace and user slices separate so the
+// Global system prompt can label them distinctly — only the user slice is editable by the
+// update_user_instructions tool.
+export function getCustomPromptParts(mode: string): { workspace?: string; user?: string } {
+	const workspace = get(copilotInfo).customPrompts?.[mode]?.trim() || undefined
+	const user = getUserCustomPrompts()[mode]?.trim() || undefined
+	return { workspace, user }
+}
diff --git a/frontend/src/lib/assets/app.css b/frontend/src/lib/assets/app.css
index ae7efaaf60..23bf45c7fa 100644
--- a/frontend/src/lib/assets/app.css
+++ b/frontend/src/lib/assets/app.css
@@ -129,6 +129,36 @@
 			scrollbar-width: none; /* Firefox */
 		}
 	}
+
+	/* Subtle scrollbar: a thin, rounded thumb that only appears on hover, on both
+	   axes. Shared by ScrollableX (tab strips, code blocks) and the AI chat. Size
+	   via the `--wm-scrollbar-size` var (default 6px). Higher specificity than the
+	   app-wide `*::-webkit-scrollbar`, so it overrides it. */
+	.scrollbar-subtle {
+		scrollbar-width: thin;
+		scrollbar-color: transparent transparent;
+	}
+	.scrollbar-subtle:hover {
+		scrollbar-color: rgb(var(--color-text-hint) / 0.4) transparent;
+	}
+	.scrollbar-subtle::-webkit-scrollbar {
+		width: var(--wm-scrollbar-size, 6px);
+		height: var(--wm-scrollbar-size, 6px);
+	}
+	.scrollbar-subtle::-webkit-scrollbar-track {
+		background: transparent;
+	}
+	.scrollbar-subtle::-webkit-scrollbar-thumb {
+		background: transparent;
+		border-radius: 9999px;
+		transition: background-color 0.15s;
+	}
+	.scrollbar-subtle:hover::-webkit-scrollbar-thumb {
+		background: rgb(var(--color-text-hint) / 0.35);
+	}
+	.scrollbar-subtle:hover::-webkit-scrollbar-thumb:hover {
+		background: rgb(var(--color-text-secondary) / 0.55);
+	}
 }
 
 .driver-popover-title {
diff --git a/frontend/src/lib/components/AIProviderPicker.svelte b/frontend/src/lib/components/AIProviderPicker.svelte
index f6f2a4f43c..4392a2d513 100644
--- a/frontend/src/lib/components/AIProviderPicker.svelte
+++ b/frontend/src/lib/components/AIProviderPicker.svelte
@@ -11,6 +11,7 @@
 	import ToggleButtonMore from './common/toggleButton-v2/ToggleButtonMore.svelte'
 	import Toggle from './Toggle.svelte'
 	import { saveConfig, removeConfig, isSameAsStoredConfig } from './aiProviderStorage'
+	import AIReasoningEffortPicker from './AIReasoningEffortPicker.svelte'
 
 	interface Props {
 		value: ProviderConfig | undefined
@@ -106,6 +107,8 @@
 			value.kind = selectedProvider
 			value.resource = ''
 			value.model = ''
+			// Reasoning effort is model-specific; reset it with the model.
+			value.reasoning_effort = undefined
 		}
 	}
 
@@ -225,6 +228,18 @@
 			/>
 		</div>
 
+		<!-- Reasoning Effort (shown once a model is selected) -->
+		{#if value?.model}
+			<div class="flex flex-col gap-1">
+				<p class="text-xs font-normal text-primary">reasoning effort</p>
+				<AIReasoningEffortPicker
+					bind:value={() => value?.reasoning_effort, (v) => value && (value.reasoning_effort = v)}
+					providerConfig={value}
+					{disabled}
+				/>
+			</div>
+		{/if}
+
 		<!-- Use as Default Checkbox -->
 		<div class="flex justify-end pt-1">
 			<Toggle
diff --git a/frontend/src/lib/components/AIReasoningEffortPicker.svelte b/frontend/src/lib/components/AIReasoningEffortPicker.svelte
new file mode 100644
index 0000000000..3ebf94c9bf
--- /dev/null
+++ b/frontend/src/lib/components/AIReasoningEffortPicker.svelte
@@ -0,0 +1,106 @@
+<script lang="ts">
+	import { Brain, ChevronDown } from 'lucide-svelte'
+	import DropdownV2 from './DropdownV2.svelte'
+	import Button from './common/button/Button.svelte'
+	import type { Item } from '$lib/utils'
+	import type { AIProvider } from '$lib/gen'
+	import { getReasoningCapability, explicitOffToken } from './copilot/reasoningRegistry'
+
+	interface Props {
+		// The provider-native reasoning token sent to the model (e.g. `high`,
+		// `none`), or undefined to leave the provider default untouched.
+		value: string | undefined
+		// The selected provider config; only `kind` and `model` are read.
+		providerConfig: { kind?: AIProvider; model?: string } | string | undefined
+		disabled?: boolean
+	}
+
+	let { value = $bindable(), providerConfig, disabled = false }: Props = $props()
+
+	let provider = $derived(
+		typeof providerConfig === 'object'
+			? (providerConfig?.kind as AIProvider | undefined)
+			: undefined
+	)
+	let model = $derived(typeof providerConfig === 'object' ? providerConfig?.model : undefined)
+
+	let capability = $derived(
+		provider && model
+			? getReasoningCapability(provider, model)
+			: { supported: false, levels: [], canDisable: false }
+	)
+
+	// The token that turns reasoning off on a model that reasons by default
+	// (e.g. Gemini/OpenAI 'none'). Undefined means omission already disables it,
+	// so leaving the effort unset is itself off.
+	let offToken = $derived(provider && model ? explicitOffToken(provider, model) : undefined)
+
+	// When the model reasons only on request (Anthropic/Bedrock), an unset effort
+	// already means off, so the default choice is labelled "off". Models that
+	// reason by default keep a distinct "Model default" plus an explicit off.
+	let offViaOmission = $derived(capability.canDisable && offToken === undefined)
+
+	// Label shown on the trigger for the current selection.
+	let currentLabel = $derived(
+		!value ? (offViaOmission ? 'off' : 'Model default') : value === offToken ? 'off' : value
+	)
+
+	let items = $derived.by((): Item[] => {
+		const opts: Item[] = [
+			{
+				displayName: offViaOmission ? 'off' : 'Model default',
+				selected: !value,
+				action: () => (value = undefined)
+			}
+		]
+		if (capability.canDisable && offToken !== undefined) {
+			opts.push({
+				displayName: 'off',
+				selected: value === offToken,
+				action: () => (value = offToken)
+			})
+		}
+		for (const level of capability.levels) {
+			opts.push({ displayName: level, selected: value === level, action: () => (value = level) })
+		}
+		return opts
+	})
+
+	// Clear a stale selection once the model no longer accepts it — either it
+	// can't reason at all, or the token isn't a valid level/off for this model
+	// (e.g. carrying `xhigh` from Opus onto a model that tops out at `high`).
+	// Sending an unsupported token would be rejected by the provider.
+	$effect(() => {
+		if (!provider || !model || value === undefined) return
+		// Valid values are exactly the selectable options: the levels, plus the
+		// explicit off token only when this model can actually disable reasoning.
+		const valid =
+			capability.supported &&
+			(capability.levels.includes(value) ||
+				(capability.canDisable && offToken !== undefined && value === offToken))
+		if (!valid) value = undefined
+	})
+</script>
+
+{#if !provider || !model}
+	<div class="text-xs text-tertiary">Select a model to configure reasoning effort.</div>
+{:else if !capability.supported}
+	<div class="text-xs text-tertiary">The selected model does not support reasoning effort.</div>
+{:else}
+	<DropdownV2 {items} {disabled} placement="bottom-start" fixedHeight={false} class="justify-start">
+		{#snippet buttonReplacement()}
+			<Button
+				nonCaptureEvent
+				{disabled}
+				unifiedSize="xs"
+				variant="default"
+				startIcon={{ icon: Brain }}
+				endIcon={{ icon: ChevronDown }}
+				btnClasses="w-full justify-between font-normal text-secondary"
+				title="Reasoning effort"
+			>
+				<span class="truncate">{currentLabel}</span>
+			</Button>
+		{/snippet}
+	</DropdownV2>
+{/if}
diff --git a/frontend/src/lib/components/AppConnectInner.svelte b/frontend/src/lib/components/AppConnectInner.svelte
index 1046ee69b0..ef632f5738 100644
--- a/frontend/src/lib/components/AppConnectInner.svelte
+++ b/frontend/src/lib/components/AppConnectInner.svelte
@@ -162,6 +162,9 @@
 	let clientId = $state('')
 	let clientSecret = $state('')
 	let ccInstance = $state('')
+	/** Bring-your-own resource-level token endpoint override (optional). Only sent
+	 * for non-instance-templated providers, where it isn't host-pinned. */
+	let tokenUrl = $state('')
 
 	let resourceTypeInfo: ResourceType | undefined = $state(undefined)
 	let resourceTypeNotFound = $state(false)
@@ -222,6 +225,7 @@
 		clientId = ''
 		clientSecret = ''
 		ccInstance = ''
+		tokenUrl = ''
 		scopes = []
 	}
 
@@ -602,7 +606,13 @@
 									scopes: scopes,
 									cc_client_id: trimmedClientId,
 									cc_client_secret: trimmedClientSecret,
-									...(needsInstance ? { cc_instance: trimmedInstance } : {})
+									// Instance-templated providers are host-pinned via the instance
+									// name; only other providers accept a free-form token URL override.
+									...(needsInstance
+										? { cc_instance: trimmedInstance }
+										: tokenUrl.trim()
+											? { cc_token_url: tokenUrl.trim() }
+											: {})
 								}
 					})
 
@@ -734,10 +744,13 @@
 					accountData.cc_client_id = clientId.trim()
 					accountData.cc_client_secret = clientSecret.trim()
 					// Instance-templated providers send an instance name; the backend
-					// resolves and stores the host-pinned token URL. Other registry
-					// providers need nothing more (token URL comes from the registry).
+					// resolves and stores the host-pinned token URL. Other providers may
+					// send an optional token URL override (stored for refresh); without
+					// it the token URL comes from the registry/instance config.
 					if (ccInstanceMeta) {
 						accountData.cc_instance = ccInstance.trim()
+					} else if (tokenUrl.trim()) {
+						accountData.cc_token_url = tokenUrl.trim()
 					}
 				}
 
@@ -978,13 +991,15 @@
 		</div>
 	{:else if step == 2 && manual}
 		<div class="flex flex-col gap-8">
-			<Path
-				bind:error={pathError}
-				bind:path
-				initialPath=""
-				namePlaceholder={resourceType}
-				kind="resource"
-			/>
+			<Label label="Path">
+				<Path
+					bind:error={pathError}
+					bind:path
+					initialPath=""
+					namePlaceholder={resourceType}
+					kind="resource"
+				/>
+			</Label>
 			<LabelsInput bind:labels class="-mt-5" />
 			{#if deployTo}
 				<Label
@@ -1183,6 +1198,23 @@
 											bind:value={ccInstance}
 										/>
 									</label>
+								{:else}
+									<label class="flex flex-col gap-1">
+										<span class="text-xs font-semibold text-emphasis"
+											>Token URL override (optional)</span
+										>
+										<div class="text-xs text-secondary font-normal">
+											Override the provider's token endpoint for this resource, stored with the
+											connection and reused on token refresh
+										</div>
+										<TextInput
+											inputProps={{
+												type: 'url',
+												placeholder: 'https://provider.example.com/oauth/token'
+											}}
+											bind:value={tokenUrl}
+										/>
+									</label>
 								{/if}
 							</form>
 						{/if}
@@ -1217,13 +1249,15 @@
 			<span class="text-xs text-primary font-normal"> Finish connection in popup window </span>
 		{/if}
 	{:else}
-		<Path
-			initialPath=""
-			namePlaceholder={resourceType}
-			bind:error={pathError}
-			bind:path
-			kind="resource"
-		/>
+		<Label label="Path">
+			<Path
+				initialPath=""
+				namePlaceholder={resourceType}
+				bind:error={pathError}
+				bind:path
+				kind="resource"
+			/>
+		</Label>
 		<LabelsInput bind:labels class="-mt-5" />
 		{#if deployTo}
 			<Label
diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 368cfa6d8a..de5517add3 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -1070,7 +1070,14 @@
 				{/if}
 			</div>
 		{:else if inputCat == 'dynamic'}
-			<DynamicInput name={label} {otherArgs} {helperScript} bind:value format={format ?? ''} />
+			<DynamicInput
+				name={label}
+				{otherArgs}
+				{helperScript}
+				{workspace}
+				bind:value
+				format={format ?? ''}
+			/>
 		{:else if inputCat == 'resource-object' && resourceTypes == undefined}
 			<span class="text-2xs text-primary">Loading resource types...</span>
 		{:else if inputCat == 'resource-object' && (resourceTypes == undefined || (format && format?.split('-').length > 1 && resourceTypes.includes(format?.substring('resource-'.length))))}
@@ -1078,6 +1085,7 @@
 			<ObjectResourceInput
 				datatableAsPgResource={label === 'database'}
 				{disabled}
+				{workspace}
 				{defaultValue}
 				selectFirst={!noDefaultOnSelectFirst && required}
 				{disablePortal}
@@ -1423,6 +1431,7 @@
 			<ResourcePicker
 				selectFirst={noDefaultOnSelectFirst}
 				{disablePortal}
+				{workspace}
 				bind:value
 				initialValue={defaultValue}
 				resourceType={format && format.split('-').length > 1
diff --git a/frontend/src/lib/components/BreadcrumbSegment.svelte b/frontend/src/lib/components/BreadcrumbSegment.svelte
index 8b18503f75..8a266e4fc4 100644
--- a/frontend/src/lib/components/BreadcrumbSegment.svelte
+++ b/frontend/src/lib/components/BreadcrumbSegment.svelte
@@ -26,6 +26,9 @@ close siblings.
 		isCurrent?: boolean
 		currentItem?: WorkspaceItem & { savedPath?: string }
 		onPick: (item: WorkspaceItem) => void
+		/** Load the picker's items from this workspace (session editors pass their
+		 * acting workspace); falls back to $workspaceStore inside the picker. */
+		workspaceId?: string
 	}
 
 	let {
@@ -37,7 +40,8 @@ close siblings.
 		initialHighlight,
 		isCurrent = false,
 		currentItem,
-		onPick
+		onPick,
+		workspaceId
 	}: Props = $props()
 
 	let isOpen = $state(false)
@@ -71,6 +75,12 @@ close siblings.
 			>{:else}{label}{/if}
 	{/snippet}
 	{#snippet content()}
-		<WorkspaceItemDrillPicker {initialScope} {initialHighlight} {currentItem} onPick={handlePick} />
+		<WorkspaceItemDrillPicker
+			{initialScope}
+			{initialHighlight}
+			{currentItem}
+			{workspaceId}
+			onPick={handlePick}
+		/>
 	{/snippet}
 </Popover>
diff --git a/frontend/src/lib/components/CompareDrafts.svelte b/frontend/src/lib/components/CompareDrafts.svelte
index aca63e4b32..2614adf445 100644
--- a/frontend/src/lib/components/CompareDrafts.svelte
+++ b/frontend/src/lib/components/CompareDrafts.svelte
@@ -14,7 +14,13 @@
 	import { editUrlFor } from './sessions/forkEditUrl'
 	import { AppService, FlowService, ScriptService, type WorkspaceItemDiff } from '$lib/gen'
 	import { sendUserToast } from '$lib/toast'
-	import { getDraftDiffValues, deployDraft, discardDraft } from '$lib/utils_draft_deploy'
+	import {
+		getDraftDiffValues,
+		deployDraft,
+		discardDraft,
+		draftBaseIsStale
+	} from '$lib/utils_draft_deploy'
+	import { checkDeployPermission, type DeployPermission } from '$lib/utils_workspace_deploy'
 	import { type DraftItem, useWorkspaceDrafts } from '$lib/workspaceDrafts.svelte'
 	import type { Kind as LayoutKind } from '$lib/utils_deployable'
 	import { userStore } from '$lib/stores'
@@ -35,6 +41,15 @@
 		deployCount?: number
 		updateCount?: number
 		draftCount?: number
+		/** When set (reached via a session's Review button), preselect only the
+		 * rows this chat modified — `${UserDraftItemKind}:${path}` keys, matching
+		 * Row.key. Undefined → preselect all deployable rows (the default). All rows
+		 * are still shown either way. */
+		chatMask?: Set<string>
+		/** False while the (async) chatMask is still loading. The select-all default
+		 * waits for this so it doesn't race the mask and select everything. Defaults
+		 * to true for callers that don't pass a mask. */
+		chatMaskReady?: boolean
 		/** Selecting deploy_to/update asks the page to swap to CompareWorkspaces. */
 		onModeSelected?: (v: CompareMode) => void
 		/** Fired after a deploy/discard so the page can refresh the *fork*
@@ -52,6 +67,8 @@
 		deployCount = 0,
 		updateCount = 0,
 		draftCount = 0,
+		chatMask,
+		chatMaskReady = true,
 		onModeSelected,
 		onChanged
 	}: Props = $props()
@@ -192,7 +209,7 @@
 	// side to diff the name against. Raw apps are fetched via the apps endpoint too
 	// (it auto-detects raw from the deployed row and overlays the raw_app draft).
 	const summaryCache = $state<
-		Record<string, { deployed?: string; draft?: string; loading?: boolean }>
+		Record<string, { deployed?: string; draft?: string; stale?: boolean; loading?: boolean }>
 	>({})
 
 	async function fetchDraftSummary(item: Row) {
@@ -216,9 +233,11 @@
 							path: item.path,
 							getDraft: true
 						}))) as any
+			const draftBlob = r.draft as any
 			summaryCache[item.key] = {
 				deployed: r.summary,
-				draft: (r.draft as any)?.summary,
+				draft: draftBlob?.summary,
+				stale: draftBaseIsStale(item.draftKind, r),
 				loading: false
 			}
 		} catch (error) {
@@ -245,6 +264,21 @@
 
 	let selectedItems = $state<string[]>([])
 	let deploying = $state(false)
+
+	// Whether the user may deploy drafts into this workspace — fills the
+	// `RestrictDeployToDeployers` (+ operator) gap via the shared util, same as the
+	// fork compare page and the session review drawer. Fail-open while resolving.
+	let deployPerm = $state<DeployPermission>({ ok: true })
+	$effect(() => {
+		const ws = currentWorkspaceId
+		// Reset to fail-open on workspace change, and drop a stale resolution —
+		// otherwise the previous workspace's verdict lingers (or lands last) and
+		// gates the wrong workspace.
+		deployPerm = { ok: true }
+		void checkDeployPermission(ws).then((p) => {
+			if (ws === currentWorkspaceId) deployPerm = p
+		})
+	})
 	// Select all on the first non-empty load (deploy-all is the common intent);
 	// only once, so a refetch after a deploy doesn't re-select the leftovers.
 	let hasAutoSelected = $state(false)
@@ -268,8 +302,13 @@
 	})
 
 	$effect(() => {
-		if (!hasAutoSelected && visibleItems.length > 0) {
-			selectedItems = visibleItems.filter(isSelectable).map((i) => i.key)
+		if (!hasAutoSelected && chatMaskReady && visibleItems.length > 0) {
+			// Default intent is deploy-all; when reached from a session's Review
+			// (chatMask set), preselect only that chat's items instead.
+			const selectable = visibleItems.filter(isSelectable)
+			selectedItems = (chatMask ? selectable.filter((i) => chatMask.has(i.key)) : selectable).map(
+				(i) => i.key
+			)
 			hasAutoSelected = true
 		}
 	})
@@ -341,13 +380,10 @@
 		let deployedAny = false
 		for (const item of toDeploy) {
 			deploymentStatus[item.key] = { status: 'loading' }
-			const res = await deployDraft(
-				item.draftKind,
-				item.path,
-				currentWorkspaceId,
-				item.draft_only,
-				item.raw_app
-			)
+			const res = await deployDraft(item.draftKind, item.path, currentWorkspaceId, {
+				draftOnly: item.draft_only,
+				rawApp: item.raw_app
+			})
 			if (res.success) {
 				deploymentStatus[item.key] = { status: 'deployed' }
 				deployedAny = true
@@ -621,6 +657,19 @@
 						{/snippet}
 					</Popover>
 				{/if}
+				{#if draftItem.mine && summaryCache[draftItem.key]?.stale}
+					<Popover openOnHover debounceDelay={50}>
+						{#snippet trigger()}
+							<AlertTriangle size={16} class="text-orange-500" />
+						{/snippet}
+						{#snippet content()}
+							<div class="text-xs p-3 max-w-xs text-primary">
+								Started from an older deployed version. A newer version was deployed after this
+								draft began. Review the latest deploy before deploying.
+							</div>
+						{/snippet}
+					</Popover>
+				{/if}
 				{#if deploymentStatus[draftItem.key]?.status !== 'deployed'}
 					{#if draftItem.draftKind === 'data_pipeline'}
 						<!-- A bundle isn't diffable/deployable here — its scripts deploy
@@ -667,15 +716,19 @@
 			{/snippet}
 
 			{#snippet footer()}
-				<div class="flex items-center justify-end">
+				<div class="flex flex-col items-end gap-2">
 					<Button
 						variant="accent"
-						disabled={selectedCount === 0 || deploying}
+						disabled={selectedCount === 0 || deploying || !deployPerm.ok}
+						title={!deployPerm.ok ? deployPerm.reason : undefined}
 						loading={deploying}
 						onClick={deploySelected}
 					>
 						Deploy {selectedCount} draft{selectedCount !== 1 ? 's' : ''}
 					</Button>
+					{#if !deployPerm.ok}
+						<span class="text-xs text-yellow-600">{deployPerm.reason}</span>
+					{/if}
 				</div>
 			{/snippet}
 		</WorkspaceDeployLayout>
diff --git a/frontend/src/lib/components/CompareWorkspaces.svelte b/frontend/src/lib/components/CompareWorkspaces.svelte
index 06d787095e..a2453add27 100644
--- a/frontend/src/lib/components/CompareWorkspaces.svelte
+++ b/frontend/src/lib/components/CompareWorkspaces.svelte
@@ -20,8 +20,10 @@
 		AppService,
 		FlowService,
 		FolderService,
+		ResourceService,
 		ScriptService,
 		UserService,
+		VariableService,
 		WorkspaceService,
 		type WorkspaceComparison,
 		type WorkspaceItemDiff
@@ -35,10 +37,12 @@
 
 	import type { Kind } from '$lib/utils_deployable'
 	import {
+		checkDeployPermission,
 		deployItem,
 		deleteItemInWorkspace,
 		getItemValue,
 		getOnBehalfOf,
+		type DeployPermission,
 		type DeployResult
 	} from '$lib/utils_workspace_deploy'
 	import { isTriggerOrScheduleKind } from 'windmill-utils-internal'
@@ -56,6 +60,7 @@
 	import { base } from '$lib/base'
 	import CompareModeToggle, { type CompareMode } from './CompareModeToggle.svelte'
 	import { editUrlFor } from './sessions/forkEditUrl'
+	import { diffInMask } from './sessions/modifiedItemsMask'
 	import DatatableSchemaDiff from './DatatableSchemaDiff.svelte'
 
 	interface Props {
@@ -75,6 +80,14 @@
 		 * out of the default selection — deploying/updating moves the deployed
 		 * version, not the draft. The page derives this from the fork drafts. */
 		draftKeys?: Set<string>
+		/** When set (reached via a session's Review button), preselect only the
+		 * diffs this chat caused (matched via diffInMask). The deploy_to default
+		 * narrows to these; the update direction (parent→fork) preselects nothing,
+		 * since it's never chat-caused. All rows are still shown. */
+		chatMask?: Set<string>
+		/** False while the (async) chatMask is still loading. The select-all default
+		 * waits for this so it doesn't race the mask. Defaults to true. */
+		chatMaskReady?: boolean
 		/** Selecting `draft` asks the page to swap us out for CompareDrafts;
 		 * deploy_to/update are handled internally but reported so the page can
 		 * remember the direction. */
@@ -93,10 +106,249 @@
 		updateCount = 0,
 		draftCount = 0,
 		draftKeys = new Set<string>(),
+		chatMask,
+		chatMaskReady = true,
 		onModeSelected,
 		onChanged
 	}: Props = $props()
 
+	// Workspace-specific ("pinned") resources/variables. They keep their own
+	// value per environment and are suppressed from the diff, so the page fetches
+	// them separately to keep them visible and un-pinnable.
+	// `onCurrent`/`onParent` track which side carries the ws_specific marker — which, because marks
+	// are existence-guarded, also tells us which side the item exists on. An item present on only one
+	// side can be seeded onto the other via "Create in <other>".
+	type PinnedItem = { item_kind: string; path: string; onCurrent: boolean; onParent: boolean }
+	let pinnedItems = $state<PinnedItem[]>([])
+	let pinBusy = $state<Record<string, boolean>>({})
+	let createConfirm = $state<PinnedItem | undefined>(undefined)
+
+	// Whether this item is already workspace-specific (marked on either side); used to avoid offering
+	// to pin it again from a diff row.
+	const isPinned = (kind: string, path: string) =>
+		pinnedItems.some((it) => it.item_kind === kind && it.path === path)
+
+	// Bumped on each load so a response that resolves after the compared pair
+	// changed can't overwrite the newer pair's items.
+	let pinnedReqSeq = 0
+	async function loadPinned() {
+		const seq = ++pinnedReqSeq
+		try {
+			const [cur, par] = await Promise.all([
+				WorkspaceService.listWsSpecific({ workspace: currentWorkspaceId }),
+				WorkspaceService.listWsSpecific({ workspace: parentWorkspaceId })
+			])
+			if (seq !== pinnedReqSeq) return
+			const map = new Map<string, PinnedItem>()
+			const mark = (it: { item_kind: string; path: string }, side: 'cur' | 'par') => {
+				const k = `${it.item_kind}:${it.path}`
+				const e = map.get(k) ?? {
+					item_kind: it.item_kind,
+					path: it.path,
+					onCurrent: false,
+					onParent: false
+				}
+				if (side === 'cur') e.onCurrent = true
+				else e.onParent = true
+				map.set(k, e)
+			}
+			for (const it of cur) mark(it, 'cur')
+			for (const it of par) mark(it, 'par')
+			pinnedItems = [...map.values()].sort((a, b) =>
+				`${a.item_kind}:${a.path}`.localeCompare(`${b.item_kind}:${b.path}`)
+			)
+		} catch (e) {
+			console.error('Failed to load workspace-specific items', e)
+		}
+	}
+
+	$effect(() => {
+		// Re-fetch whenever the compared pair changes.
+		currentWorkspaceId
+		parentWorkspaceId
+		loadPinned()
+	})
+
+	// Flag both environments so each side marks the item workspace-specific, not
+	// only the workspace the compare is viewed from. `value=false` makes it
+	// shared again.
+	async function setPinned(kind: 'resource' | 'variable', path: string, value: boolean) {
+		const k = `${kind}:${path}`
+		pinBusy[k] = true
+		try {
+			const targets = [currentWorkspaceId, parentWorkspaceId]
+			const results = await Promise.allSettled(
+				targets.map((ws) =>
+					WorkspaceService.setWsSpecific({
+						workspace: ws,
+						requestBody: { item_kind: kind, path, value }
+					})
+				)
+			)
+			const verb = value ? 'workspace specific' : 'shared'
+			const failed = results.filter((r) => r.status === 'rejected').length
+			if (failed === targets.length) {
+				sendUserToast(`Failed to update workspace-specific for ${path}`, true)
+			} else if (failed > 0) {
+				sendUserToast(`Made ${path} ${verb} in one environment only (no access to the other)`)
+			} else {
+				sendUserToast(`Made ${path} ${verb}`)
+			}
+			await loadPinned()
+			onChanged?.()
+		} finally {
+			pinBusy[k] = false
+		}
+	}
+
+	// Collect `$var:` variable references from a resource value (mirrors the backend `collect_var_refs`).
+	function collectVarRefs(value: unknown, out: string[]) {
+		if (typeof value === 'string') {
+			if (value.startsWith('$var:')) out.push(value.slice('$var:'.length))
+		} else if (Array.isArray(value)) {
+			for (const v of value) collectVarRefs(v, out)
+		} else if (value && typeof value === 'object') {
+			for (const v of Object.values(value)) collectVarRefs(v, out)
+		}
+	}
+
+	// Create the item on the target from the source value, strictly create-only: the backend create
+	// endpoints reject an existing path (`check_path_conflict`), so unlike `deployItem` — which updates
+	// on conflict — this never overwrites a target created concurrently. Returns 'created', 'conflict'
+	// (already present on the target), or throws for a real error.
+	async function createItemOnly(
+		kind: 'resource' | 'variable',
+		path: string,
+		from: string,
+		to: string
+	): Promise<'created' | 'conflict'> {
+		try {
+			if (kind === 'resource') {
+				const r = await ResourceService.getResource({ workspace: from, path })
+				await ResourceService.createResource({
+					workspace: to,
+					requestBody: {
+						path,
+						value: r.value ?? '',
+						description: r.description ?? '',
+						resource_type: r.resource_type
+					}
+				})
+			} else {
+				const v = await VariableService.getVariable({ workspace: from, path, decryptSecret: true })
+				await VariableService.createVariable({
+					workspace: to,
+					requestBody: {
+						path,
+						value: v.value ?? '',
+						is_secret: v.is_secret ?? false,
+						description: v.description ?? ''
+					}
+				})
+			}
+			return 'created'
+		} catch (e) {
+			// Don't parse the error message: re-check existence. If the target now exists, the create
+			// lost a race (the backend create is create-only and rejected it), so report a conflict and
+			// leave it untouched rather than overwriting.
+			const existsNow =
+				kind === 'resource'
+					? await ResourceService.existsResource({ workspace: to, path })
+					: await VariableService.existsVariable({ workspace: to, path })
+			if (existsNow) return 'conflict'
+			throw e
+		}
+	}
+
+	// Seed a resource's linked `$var:` variables into the target environment, copying each one's value
+	// (incl. secrets) only where the target lacks it (create-only). Mirrors the backend's
+	// `mark_linked_variables_ws_specific` cascade so a seeded resource resolves its references and its
+	// secrets stay per-environment. Returns the paths that failed to seed.
+	async function seedMissingLinkedVars(
+		resourcePath: string,
+		from: string,
+		to: string
+	): Promise<string[]> {
+		const resource = await ResourceService.getResource({ workspace: from, path: resourcePath })
+		const refs: string[] = []
+		collectVarRefs(resource.value, refs)
+		const failed: string[] = []
+		for (const varPath of Array.from(new Set(refs))) {
+			if (await VariableService.existsVariable({ workspace: to, path: varPath })) continue
+			try {
+				// 'created' and 'conflict' (now present, created concurrently) are both the desired end
+				// state; only a real error counts as a failure to seed.
+				await createItemOnly('variable', varPath, from, to)
+			} catch (e) {
+				failed.push(varPath)
+			}
+		}
+		return failed
+	}
+
+	// Seed a workspace-specific item onto a side that lacks it, copying its current value (incl.
+	// secret values). Strictly create-only: markers can be one-sided (a pin can fail on a locked
+	// side), so a missing marker doesn't prove the item is missing — re-check actual existence and,
+	// if the target already has it, mark it workspace-specific there instead of overwriting its value.
+	async function createOnRemote(it: PinnedItem) {
+		const from = it.onCurrent ? currentWorkspaceId : parentWorkspaceId
+		const to = it.onCurrent ? parentWorkspaceId : currentWorkspaceId
+		const k = `${it.item_kind}:${it.path}`
+		const kindCast = it.item_kind as 'resource' | 'variable'
+		pinBusy[k] = true
+		try {
+			const existsOnTarget =
+				kindCast === 'resource'
+					? await ResourceService.existsResource({ workspace: to, path: it.path })
+					: await VariableService.existsVariable({ workspace: to, path: it.path })
+			if (existsOnTarget) {
+				// Don't overwrite — just mark the existing target item workspace-specific.
+				await WorkspaceService.setWsSpecific({
+					workspace: to,
+					requestBody: { item_kind: kindCast, path: it.path, value: true }
+				})
+				sendUserToast(
+					`${it.path} already exists in ${to} — marked it workspace-specific instead of overwriting`
+				)
+				await loadPinned()
+				onChanged?.()
+				return
+			}
+			// A resource owns its `$var:` secrets, so seed any linked variables the target lacks before
+			// creating the resource — otherwise it would reference variables that don't exist there. If
+			// any linked variable fails to seed, abort rather than create a resource with dangling refs.
+			const linkedFailed =
+				kindCast === 'resource' ? await seedMissingLinkedVars(it.path, from, to) : []
+			if (linkedFailed.length > 0) {
+				sendUserToast(
+					`Did not create ${it.path} in ${to}: failed to seed linked variable(s) ${linkedFailed.join(', ')}`,
+					true
+				)
+				return
+			}
+
+			// Create-only: a 'conflict' means the target appeared between the existence check above and
+			// the create, so it was left untouched rather than overwritten.
+			const result = await createItemOnly(kindCast, it.path, from, to)
+			// Marking cascades to mark a resource's now-present linked variables workspace-specific.
+			await WorkspaceService.setWsSpecific({
+				workspace: to,
+				requestBody: { item_kind: kindCast, path: it.path, value: true }
+			})
+			sendUserToast(
+				result === 'conflict'
+					? `${it.path} already exists in ${to}, marked it workspace-specific instead of overwriting`
+					: `Created ${it.path} in ${to}`
+			)
+			await loadPinned()
+			onChanged?.()
+		} catch (e) {
+			sendUserToast(`Failed to create ${it.path}: ${e}`, true)
+		} finally {
+			pinBusy[k] = false
+		}
+	}
+
 	// A fork row has a pending draft when its key is in the page-provided set.
 	function hasDraft(diff: WorkspaceItemDiff): boolean {
 		return draftKeys.has(getItemKey(diff))
@@ -394,7 +646,7 @@
 			deploymentStatus[statusKey] = { status: 'deployed' }
 		} else {
 			deploymentStatus[statusKey] = { status: 'failed', error: result.error }
-			sendUserToast(`Failed to deploy ${statusKey}: ${result.error}`)
+			sendUserToast(`Failed to deploy ${statusKey}: ${result.error}`, 'error')
 		}
 	}
 
@@ -444,7 +696,10 @@
 			if (!aIsFolder && bIsFolder) return 1
 			return 0
 		})
+		const to = mergeIntoParent ? parent : current
 		let anyFailed = false
+		// Datatables whose migrations deployed cleanly — candidates for a run prompt.
+		const deployedMigrationDatatables = new Set<string>()
 		for (const itemKey of sortedItems) {
 			const deployable = deployableItems.find((d) => d.key === itemKey)
 
@@ -453,32 +708,46 @@
 				continue
 			}
 
-			const to = mergeIntoParent ? parent : current
 			const from = mergeIntoParent ? current : parent
 			await deploy(deployable.kind, deployable.path, to, from, itemKey)
 			if (deploymentStatus[itemKey]?.status === 'failed') {
 				anyFailed = true
+			} else if (deployable.kind === 'datatable_migration') {
+				deployedMigrationDatatables.add(deployable.path.split('/')[0])
 			}
 		}
 		deploying = false
 		deselectAll()
 
+		await maybePromptRunMigrations(deployedMigrationDatatables, to)
+
 		// If every selected item deployed cleanly and the direction was
-		// merge-into-parent, close any open deployment request for this fork.
+		// merge-into-parent, resolve any open deployment request for this fork.
 		if (!anyFailed && mergeIntoParent) {
 			try {
 				const open = await WorkspaceService.getOpenDeploymentRequest({
 					workspace: currentWorkspaceId
 				})
 				if (open) {
-					await WorkspaceService.closeDeploymentRequestMerged({
-						workspace: currentWorkspaceId,
-						id: open.id
-					})
-					deploymentRequestPanel?.refresh()
+					if (comparison?.all_ahead_items_visible) {
+						await WorkspaceService.closeDeploymentRequestMerged({
+							workspace: currentWorkspaceId,
+							id: open.id
+						})
+						deploymentRequestPanel?.refresh()
+					} else {
+						// Hidden ahead changes remain: those items are excluded from the
+						// list and stay undeployed, so this deploy is only partial. Closing
+						// the request as "merged" (which marks its comments obsolete and
+						// notifies requester/assignees of a merge) would be a lie — leave it
+						// open so someone with full access can finish it.
+						sendUserToast(
+							'Deployed the changes visible to you. The deployment request stays open because some ahead changes are hidden from you and were not deployed.'
+						)
+					}
 				}
 			} catch (e) {
-				console.error('Failed to close open deployment request after merge', e)
+				console.error('Failed to resolve open deployment request after merge', e)
 			}
 		}
 
@@ -487,6 +756,51 @@
 		onChanged?.()
 	}
 
+	/**
+	 * After a deploy, offer to run the migrations of every cloned datatable that
+	 * received one. `forked_from` is set on the fork's datatable config only when
+	 * the datatable was cloned into a separate database — shared-DB datatables
+	 * have already had the schema change applied and must not be re-run.
+	 */
+	async function maybePromptRunMigrations(
+		deployedMigrationDatatables: Set<string>,
+		runTargetWorkspace: string
+	) {
+		if (deployedMigrationDatatables.size === 0) return
+		try {
+			const forkSettings = await WorkspaceService.getPublicSettings({
+				workspace: currentWorkspaceId
+			})
+			const datatables = forkSettings.datatable?.datatables ?? {}
+			const cloned = [...deployedMigrationDatatables].filter(
+				(dt) => datatables[dt]?.forked_from != null
+			)
+			if (cloned.length === 0) return
+			runMigrationsDatatables = cloned.sort()
+			runMigrationsTargetWorkspace = runTargetWorkspace
+			runMigrationsModalOpen = true
+		} catch (e) {
+			console.error('Failed to determine cloned datatables for migration run prompt', e)
+		}
+	}
+
+	async function runDeployedMigrations() {
+		runMigrationsModalOpen = false
+		for (const dt of runMigrationsDatatables) {
+			try {
+				const res = await WorkspaceService.runDatatableMigrations({
+					workspace: runMigrationsTargetWorkspace,
+					datatableName: dt
+				})
+				sendUserToast(
+					`Ran ${res.applied.length} migration${res.applied.length !== 1 ? 's' : ''} on ${dt}`
+				)
+			} catch (e: any) {
+				sendUserToast(`Failed to run migrations on ${dt}: ${e.body ?? e.message ?? e}`, true)
+			}
+		}
+	}
+
 	function toggleKey(key: string) {
 		if (selectedItems.includes(key)) {
 			selectedItems = selectedItems.filter((i) => i !== key)
@@ -502,11 +816,19 @@
 		// to parent" flow. The user picks them à la carte by clicking the row.
 		// Items with a pending draft are also left out by default: the deployed
 		// version (not the draft) is what moves, so we make the user opt in.
+		// The update direction (parent→fork) is never something the chat caused, so
+		// when scoped to a chat's items (chatMask set) preselect nothing there.
+		if (chatMask && !mergeIntoParent) {
+			selectedItems = []
+			return
+		}
 		const filtered = selectableDiffs.filter((d) => !isTriggerOrScheduleKind(d.kind) && !hasDraft(d))
 		const conflictSafe = mergeIntoParent
 			? filtered
 			: filtered.filter((d) => !(d.ahead > 0 && d.behind > 0))
-		selectedItems = conflictSafe
+		// When reached from a session's Review, narrow the default to this chat's items.
+		const scoped = chatMask ? conflictSafe.filter((d) => diffInMask(d, chatMask)) : conflictSafe
+		selectedItems = scoped
 			.map((d) => getItemKey(d))
 			.filter((k) => !(deploymentStatus[k]?.status == 'deployed'))
 	}
@@ -548,6 +870,21 @@
 		fetchPermissions()
 	})
 
+	// Can the user actually deploy into the target workspace? Fills the frontend
+	// gap for the `RestrictDeployToDeployers` rule (+ operator), shared with the
+	// session review drawer via the same checkDeployPermission util. Cached per
+	// workspace; `deployPerm` tracks whichever side the current direction targets.
+	let deployPerms = $state<Record<string, DeployPermission>>({})
+	const deployPermFetched = new Set<string>()
+	$effect(() => {
+		for (const ws of [currentWorkspaceId, parentWorkspaceId]) {
+			if (!ws || deployPermFetched.has(ws)) continue
+			deployPermFetched.add(ws)
+			void checkDeployPermission(ws).then((p) => (deployPerms = { ...deployPerms, [ws]: p }))
+		}
+	})
+	let deployPerm = $derived(deployPerms[deployTargetWorkspace] ?? { ok: true })
+
 	// Fetch summaries and on_behalf_of_email when comparison data loads
 	$effect(() => {
 		if (comparison?.diffs) {
@@ -558,7 +895,7 @@
 
 	// Auto-select items on initial load
 	$effect(() => {
-		if (comparison?.diffs && !hasAutoSelected && selectableDiffs.length > 0) {
+		if (comparison?.diffs && !hasAutoSelected && chatMaskReady && selectableDiffs.length > 0) {
 			selectDefault()
 			hasAutoSelected = true
 		}
@@ -644,6 +981,17 @@
 	let deploymentRequestPanel: DeploymentRequestPanel | undefined = $state(undefined)
 	let hasOpenDeploymentRequest = $state(false)
 
+	// After deploying datatable migrations to a cloned (separate-DB) datatable, we
+	// offer to run them in the target workspace. Shared-DB datatables are skipped:
+	// the schema change is already physically applied, so re-running is redundant.
+	let runMigrationsModalOpen = $state(false)
+	let runMigrationsDatatables = $state<string[]>([])
+	let runMigrationsTargetWorkspace = $state('')
+	let runMigrationsTargetWorkspaceName = $derived(
+		$userWorkspaces.find((w) => w.id == runMigrationsTargetWorkspace)?.name ??
+			runMigrationsTargetWorkspace
+	)
+
 	/** Display labels for trigger/schedule kinds in the merge UI. */
 	const KIND_DISPLAY_NAMES: Record<string, string> = {
 		schedule: 'Schedule',
@@ -656,7 +1004,30 @@
 		sqs_trigger: 'SQS trigger',
 		gcp_trigger: 'GCP trigger',
 		azure_trigger: 'Azure trigger',
-		email_trigger: 'Email trigger'
+		email_trigger: 'Email trigger',
+		datatable_migration: 'Data table migration'
+	}
+
+	// Human label for a diff kind, lowercased for inline use in the hidden-items
+	// summary ("2 scripts, 1 http route").
+	function hiddenKindLabel(kind: string): string {
+		const base: Record<string, string> = {
+			script: 'script',
+			flow: 'flow',
+			app: 'app',
+			raw_app: 'app',
+			resource: 'resource',
+			variable: 'variable',
+			resource_type: 'resource type',
+			folder: 'folder'
+		}
+		return base[kind] ?? KIND_DISPLAY_NAMES[kind]?.toLowerCase() ?? kind
+	}
+
+	function formatHiddenByKind(byKind: Record<string, number>): string {
+		return Object.entries(byKind)
+			.map(([kind, n]) => `${n} ${hiddenKindLabel(kind)}${n !== 1 ? 's' : ''}`)
+			.join(', ')
 	}
 </script>
 
@@ -756,6 +1127,20 @@
 						</div>
 					</div>
 				{/snippet}
+				{#snippet groupActions(groupItems)}
+					<!-- Conflicts stay visible at the folder level so a group can be
+					     (de)selected without scanning every row for orange badges. -->
+					{@const groupConflicts = groupItems.filter((i) => {
+						const d = i.diff as WorkspaceItemDiff
+						return d.ahead > 0 && d.behind > 0
+					}).length}
+					{#if groupConflicts > 0}
+						<Badge color="orange" size="xs">
+							<AlertTriangle class="w-3 h-3 inline mr-0.5" />
+							{groupConflicts} conflict{groupConflicts !== 1 ? 's' : ''}
+						</Badge>
+					{/if}
+				{/snippet}
 				{#if allCiTests.length > 0}
 					<div class="flex flex-col gap-1.5 mt-3 p-3 border bg-surface-secondary rounded text-xs">
 						<div class="flex items-center gap-1.5 font-semibold text-secondary">
@@ -846,22 +1231,31 @@
 							</span>
 						</Alert>
 					{/if}
-					{#if !comparison.all_ahead_items_visible || !comparison.all_behind_items_visible}
-						<Alert
-							title="This fork has changes not visible to your user"
-							type="warning"
-							class="my-2"
-						>
-							{#if !comparison.all_ahead_items_visible && !comparison.all_behind_items_visible}
-								This fork is ahead and behind its parent
-							{:else if !comparison.all_behind_items_visible}
-								This fork is behind of its parent
-							{:else if !comparison.all_ahead_items_visible}
-								This fork is ahead of its parent
-							{/if}
-							and some of the changes are not visible by you. Only a user with access to the whole context
-							may deploy or update this fork. You can share the link to this page to someone with proper
-							permissions to get it deployed.
+					{@const hiddenDir = mergeIntoParent ? comparison.hidden_ahead : comparison.hidden_behind}
+					{#if hiddenDir.items.length > 0}
+						<!-- Caller is an admin of this side, so the dropped items are provably
+						     stale/phantom diff rows (they can see every real item). List them with
+						     paths — useful for debugging the "why is this fork ahead" question. -->
+						<Alert title="Hidden diff rows (visible to you as admin)" type="info" class="my-2">
+							{hiddenDir.items.length}
+							{mergeIntoParent ? 'ahead' : 'behind'} item{hiddenDir.items.length !== 1 ? 's' : ''}
+							{hiddenDir.items.length !== 1 ? 'are' : 'is'} excluded from the list below — they are not
+							resolvable as live items and are most likely stale/phantom diff rows:
+							<ul class="mt-1 font-mono text-2xs">
+								{#each hiddenDir.items as it}
+									<li>{hiddenKindLabel(it.kind)} · {it.path}</li>
+								{/each}
+							</ul>
+						</Alert>
+					{:else if mergeIntoParent ? !comparison.all_ahead_items_visible : !comparison.all_behind_items_visible}
+						<Alert title="Some changes are hidden from you" type="warning" class="my-2">
+							{hiddenDir.total}
+							{mergeIntoParent ? 'ahead' : 'behind'} item{hiddenDir.total !== 1 ? 's' : ''}
+							({formatHiddenByKind(hiddenDir.by_kind)})
+							{hiddenDir.total !== 1 ? 'are' : 'is'} not visible to your user and
+							{hiddenDir.total !== 1 ? 'are' : 'is'} excluded from the list below. You can still
+							{mergeIntoParent ? 'deploy' : 'update'} the items you can see — share this page with someone
+							who has full access to include the rest.
 						</Alert>
 					{/if}
 				{/snippet}
@@ -1016,6 +1410,27 @@
 								Show diff
 							</Button>
 						</div>
+						{#if diff.kind === 'resource' || diff.kind === 'variable'}
+							{#if isPinned(diff.kind, diff.path)}
+								<Badge
+									color="gray"
+									size="xs"
+									title="Kept per environment, so it's excluded from the diff. Seed a missing copy or revert it in the Workspace-specific items list below."
+								>
+									workspace-specific
+								</Badge>
+							{:else}
+								<Button
+									unifiedSize="xs"
+									variant="subtle"
+									disabled={pinBusy[key]}
+									title="Keep this item's value per environment (excluded from the diff). Seed a missing copy from the Workspace-specific items list."
+									onClick={() => setPinned(diff.kind as 'resource' | 'variable', diff.path, true)}
+								>
+									Make workspace specific
+								</Button>
+							{/if}
+						{/if}
 					{/if}
 				{/snippet}
 
@@ -1025,44 +1440,51 @@
 							<div></div>
 
 							<div class="flex flex-col items-end gap-2">
-								{#if comparison.all_behind_items_visible && comparison.all_ahead_items_visible}
-									<div class="flex items-center gap-2">
-										{#if mergeIntoParent && !hasOpenDeploymentRequest && !deploymentRequestPanel?.isDialogOpen()}
-											<Button
-												variant="default"
-												startIcon={{ icon: UserPlus }}
-												on:click={() => deploymentRequestPanel?.openRequestDialog()}
-											>
-												Request deployment
-											</Button>
-										{/if}
+								<!-- Always show the deploy footer: only the items visible to the user are
+								     listed and selectable, so a partial-visibility user deploys the subset they
+								     can see. The hidden items are surfaced by the non-blocking banner above,
+								     not by removing the action. -->
+								<div class="flex items-center gap-2">
+									{#if mergeIntoParent && !hasOpenDeploymentRequest && !deploymentRequestPanel?.isDialogOpen()}
 										<Button
-											variant="accent"
-											disabled={selectedItems.length === 0 ||
-												deploying ||
-												(hasBehindChanges && !allowBehindChangesOverride) ||
-												(mergeIntoParent && !canDeployToParent) ||
-												hasUnselectedOnBehalfOf}
-											loading={deploying}
-											on:click={requestDeploy}
+											variant="default"
+											startIcon={{ icon: UserPlus }}
+											on:click={() => deploymentRequestPanel?.openRequestDialog()}
 										>
-											{mergeIntoParent ? 'Deploy' : 'Update'}
-											{selectedItems.length} Item{selectedItems.length !== 1 ? 's' : ''}
-											{#if selectedConflicts != 0}
-												({selectedConflicts} conflicts)
-											{/if}
+											Request deployment
 										</Button>
-									</div>
-									{#if !(mergeIntoParent && !canDeployToParent) && hasUnselectedOnBehalfOf}
-										<span class="text-xs text-yellow-600">
-											You must set the "on behalf of" user for all items before deploying
-											<Tooltip class="text-yellow-600">
-												The "run on behalf of" field defines which user's permissions will be
-												applied during execution. Make sure this is set to an appropriate user
-												before deploying.
-											</Tooltip>
-										</span>
 									{/if}
+									<Button
+										variant="accent"
+										disabled={selectedItems.length === 0 ||
+											deploying ||
+											(hasBehindChanges && !allowBehindChangesOverride) ||
+											(mergeIntoParent && !canDeployToParent) ||
+											!deployPerm.ok ||
+											hasUnselectedOnBehalfOf}
+										title={!deployPerm.ok ? deployPerm.reason : undefined}
+										loading={deploying}
+										on:click={requestDeploy}
+									>
+										{mergeIntoParent ? 'Deploy' : 'Update'}
+										{selectedItems.length} Item{selectedItems.length !== 1 ? 's' : ''}
+										{#if selectedConflicts != 0}
+											({selectedConflicts} conflicts)
+										{/if}
+									</Button>
+								</div>
+								{#if !deployPerm.ok}
+									<span class="text-xs text-yellow-600">{deployPerm.reason}</span>
+								{/if}
+								{#if !(mergeIntoParent && !canDeployToParent) && hasUnselectedOnBehalfOf}
+									<span class="text-xs text-yellow-600">
+										You must set the "on behalf of" user for all items before deploying
+										<Tooltip class="text-yellow-600">
+											The "run on behalf of" field defines which user's permissions will be applied
+											during execution. Make sure this is set to an appropriate user before
+											deploying.
+										</Tooltip>
+									</span>
 								{/if}
 
 								{#if deploymentErrorMessage != ''}
@@ -1094,9 +1516,54 @@
 			/>
 		</div>
 
-		<div class="bg-surface-tertiary p-4 rounded-md border">
-			<DatatableSchemaDiff {currentWorkspaceId} {parentWorkspaceId} />
-		</div>
+		<DatatableSchemaDiff {currentWorkspaceId} {parentWorkspaceId} />
+
+		{#if pinnedItems.length > 0}
+			<div class="bg-surface-tertiary p-4 rounded-md border flex flex-col gap-2">
+				<div class="flex items-center gap-1.5 font-semibold text-secondary text-sm">
+					Workspace-specific items
+				</div>
+				<p class="text-xs text-tertiary">
+					These resources and variables keep their own value in each environment and are excluded
+					from the diff. An item that exists on only one side can be seeded onto the other with
+					"Create in …" (copies the current value, including secrets); it will never overwrite an
+					existing value.
+				</p>
+				<div class="flex flex-col gap-1">
+					{#each pinnedItems as it (`${it.item_kind}:${it.path}`)}
+						{@const missingSide =
+							it.onCurrent && !it.onParent
+								? parentWorkspaceId
+								: !it.onCurrent && it.onParent
+									? currentWorkspaceId
+									: undefined}
+						<div class="flex items-center gap-2 text-sm">
+							<Badge color="transparent" small>{it.item_kind}</Badge>
+							<span class="text-secondary font-mono text-xs flex-1 truncate">{it.path}</span>
+							{#if missingSide}
+								<Button
+									unifiedSize="xs"
+									variant="subtle"
+									disabled={pinBusy[`${it.item_kind}:${it.path}`]}
+									title="Copy this item's current value (including secrets) into {missingSide}"
+									onClick={() => (createConfirm = it)}
+								>
+									Create in {missingSide}
+								</Button>
+							{/if}
+							<Button
+								unifiedSize="xs"
+								variant="subtle"
+								disabled={pinBusy[`${it.item_kind}:${it.path}`]}
+								onClick={() => setPinned(it.item_kind as 'resource' | 'variable', it.path, false)}
+							>
+								Make shared
+							</Button>
+						</div>
+					{/each}
+				</div>
+			</div>
+		{/if}
 	</div>
 
 	<DiffDrawer bind:this={diffDrawer} {isFlow} />
@@ -1129,6 +1596,47 @@
 			</ul>
 		</div>
 	</ConfirmationModal>
+
+	<ConfirmationModal
+		open={runMigrationsModalOpen}
+		title="Run datatable migrations?"
+		confirmationText="Run migrations"
+		onConfirmed={runDeployedMigrations}
+		onCanceled={() => (runMigrationsModalOpen = false)}
+	>
+		<div class="flex flex-col gap-2">
+			<p>
+				Run the deployed migrations in <b>{runMigrationsTargetWorkspaceName}</b> now? These data tables
+				use a separate database, so the schema changes won't apply until the migrations are run.
+			</p>
+			<ul class="list-disc pl-5 text-sm font-mono text-secondary">
+				{#each runMigrationsDatatables as dt (dt)}
+					<li>{dt}</li>
+				{/each}
+			</ul>
+		</div>
+	</ConfirmationModal>
+
+	<ConfirmationModal
+		open={!!createConfirm}
+		title="Create in {createConfirm?.onCurrent ? parentWorkspaceId : currentWorkspaceId}?"
+		confirmationText="Create"
+		onConfirmed={() => {
+			const it = createConfirm
+			createConfirm = undefined
+			if (it) createOnRemote(it)
+		}}
+		onCanceled={() => (createConfirm = undefined)}
+	>
+		<p class="text-sm">
+			This copies the current value of <span class="font-mono">{createConfirm?.path}</span>
+			(including any secret value) from
+			<b>{createConfirm?.onCurrent ? currentWorkspaceId : parentWorkspaceId}</b>
+			into <b>{createConfirm?.onCurrent ? parentWorkspaceId : currentWorkspaceId}</b>. It stays
+			workspace-specific afterward, so later promotes won't overwrite it. If it already exists
+			there, it's left untouched and just marked workspace-specific.
+		</p>
+	</ConfirmationModal>
 {:else}
 	<div class="flex items-center justify-center h-full">
 		<div class="text-gray-500">No comparison data available</div>
diff --git a/frontend/src/lib/components/CronInput.svelte b/frontend/src/lib/components/CronInput.svelte
index b7febcdaca..d2b629d33e 100644
--- a/frontend/src/lib/components/CronInput.svelte
+++ b/frontend/src/lib/components/CronInput.svelte
@@ -204,18 +204,20 @@
 		<div class="flex flex-col gap-1">
 			<label for="cron-schedule" class="text-xs font-semibold text-emphasis">Cron</label>
 
-			<div class="flex flex-row gap-2 items-center">
-				<TextInput
-					inputProps={{
-						type: 'text',
-						id: 'cron-schedule',
-						name: 'cron-schedule',
-						placeholder: '0 0 */1 * * *',
-						disabled: disabled
-					}}
-					bind:value={schedule}
-					error={!validCRON}
-				/>
+			<div class="flex flex-row flex-wrap gap-2 items-center">
+				<div class="flex-1 min-w-[160px]">
+					<TextInput
+						inputProps={{
+							type: 'text',
+							id: 'cron-schedule',
+							name: 'cron-schedule',
+							placeholder: '0 0 */1 * * *',
+							disabled: disabled
+						}}
+						bind:value={schedule}
+						error={!validCRON}
+					/>
+				</div>
 				{#if !disabled}
 					<div class="flex flex-row gap-2 shrink-0">
 						{@render cronBuilder()}
diff --git a/frontend/src/lib/components/DBManager.svelte b/frontend/src/lib/components/DBManager.svelte
index c1fdf475de..35bd88abec 100644
--- a/frontend/src/lib/components/DBManager.svelte
+++ b/frontend/src/lib/components/DBManager.svelte
@@ -370,7 +370,7 @@
 											refresh?.()
 											sendUserToast(`Schema '${schemaKey}' deleted successfully`)
 										} catch (e) {
-											let msg: string | undefined = (e as Error).message
+											let msg: string | undefined = (e as any).body ?? (e as Error).message
 											if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : undefined
 											sendUserToast(msg ?? 'Action failed!', true)
 										}
@@ -436,7 +436,7 @@
 												refresh?.()
 												sendUserToast(`Table '${tableKey}' deleted successfully`)
 											} catch (e) {
-												let msg: string | undefined = (e as Error).message
+												let msg: string | undefined = (e as any).body ?? (e as Error).message
 												if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : undefined
 												sendUserToast(msg ?? 'Action failed!', true)
 											}
@@ -502,7 +502,7 @@
 													refresh?.()
 													sendUserToast(`Table '${tableKey}' deleted successfully`)
 												} catch (e) {
-													let msg: string | undefined = (e as Error).message
+													let msg: string | undefined = (e as any).body ?? (e as Error).message
 													if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : undefined
 													sendUserToast(msg ?? 'Action failed!', true)
 												}
@@ -605,7 +605,9 @@
 					onConfirm={async ({ values }) => {
 						if (dbTableEditorState.alterTableKey && dbTableEditorAlterTableData.current) {
 							let diff = diffTableEditorValues(dbTableEditorAlterTableData.current, values)
-							await dbSchemaOps.onAlter({ schema: selected.schemaKey, values: diff })
+							// Reverse diff (new → old) so the migration's down undoes the alter.
+							let reverse = diffTableEditorValues(values, dbTableEditorAlterTableData.current)
+							await dbSchemaOps.onAlter({ schema: selected.schemaKey, values: diff, reverse })
 						} else {
 							await dbSchemaOps.onCreate({ values, schema: selected.schemaKey })
 						}
diff --git a/frontend/src/lib/components/DBManagerContent.svelte b/frontend/src/lib/components/DBManagerContent.svelte
index d84bdb862e..9332d7ad26 100644
--- a/frontend/src/lib/components/DBManagerContent.svelte
+++ b/frontend/src/lib/components/DBManagerContent.svelte
@@ -20,6 +20,10 @@
 	import type { SelectedTable } from './DBManager.svelte'
 	import { getDbFeatures } from './apps/components/display/dbtable/dbFeatures'
 	import { resource } from 'runed'
+	import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte'
+	import { createAsyncConfirmationModal } from './common/confirmationModal/asyncConfirmationModal.svelte'
+	import Portal from '$lib/components/Portal.svelte'
+	import { outOfOrderRunMessage } from './workspaceSettings/datatableMigrationUtils'
 
 	interface Props {
 		input?: DbInput
@@ -35,6 +39,10 @@
 		/** Tables that are already added and should show as disabled */
 		disabledTables?: SelectedTable[]
 		onImport?: (mode: 'schema_and_data' | 'schema_only') => void
+		/** Workspace the datatable/schema lookups run against. Defaults to the
+		 *  navigation `$workspaceStore`; pass the acting workspace when embedded in
+		 *  a session preview whose workspace differs from the top nav. */
+		workspace?: string
 	}
 
 	let {
@@ -47,10 +55,15 @@
 		multiSelectMode = false,
 		selectedTables = $bindable([]),
 		disabledTables = [],
-		onImport
+		onImport,
+		workspace = undefined
 	}: Props = $props()
 
-	let dbSchema: DBSchema | undefined = $derived(input && $dbSchemas[getDbSchemasPath(input)])
+	let ws = $derived(workspace ?? $workspaceStore)
+
+	let dbSchema: DBSchema | undefined = $derived(input && $dbSchemas[schemaCacheKey(input)])
+
+	const outOfOrderModal = createAsyncConfirmationModal()
 
 	function getDbSchemasPath(input: DbInput): string {
 		switch (input.type) {
@@ -61,28 +74,36 @@
 		}
 	}
 
+	// Scope the shared `dbSchemas` cache by the acting workspace: a datatable of
+	// the same name can exist in both the nav and the acting workspace, so the
+	// bare resource path alone would let one workspace's schema be reused for the
+	// other while DB operations target the acting one.
+	function schemaCacheKey(input: DbInput): string {
+		return `${ws}:${getDbSchemasPath(input)}`
+	}
+
 	let colDefs = resource(
-		() => [input],
+		() => [input, ws],
 		async () => {
 			if (!input) return
-			return await loadAllTablesMetaData($workspaceStore, input)
+			return await loadAllTablesMetaData(ws, input)
 		}
 	)
 	let dbSchemasPromise = resource(
-		() => [input],
+		() => [input, ws],
 		async () => {
 			if (!input) return
-			const dbSchemasPath = getDbSchemasPath(input)
+			const dbSchemasPath = schemaCacheKey(input)
 			if (input.type == 'database') {
 				$dbSchemas[dbSchemasPath] = await getDbSchemas(
 					input.resourceType,
 					input.resourcePath,
-					$workspaceStore,
+					ws,
 					(message: string) => sendUserToast(message, true)
 				)
 			} else if (input.type == 'ducklake') {
 				$dbSchemas[dbSchemasPath] = await getDucklakeSchema({
-					workspace: $workspaceStore!,
+					workspace: ws!,
 					ducklake: input.ducklake
 				})
 			}
@@ -124,7 +145,7 @@
 	}}
 />
 
-{#if dbSchema && $workspaceStore && input}
+{#if dbSchema && ws && input}
 	{@const _input = input}
 	{@const dbType = getDbType(_input)}
 	<Splitpanes horizontal>
@@ -159,11 +180,17 @@
 						colDefs,
 						tableKey,
 						input: _input,
-						workspace: $workspaceStore
+						workspace: ws
 					})}
 				dbSchemaOps={dbSchemaOpsWithPreviewScripts({
 					input: _input,
-					workspace: $workspaceStore
+					workspace: ws,
+					confirmRunOutOfOrder: (pending) =>
+						outOfOrderModal.ask({
+							title: 'Run migration out of order',
+							confirmationText: 'Run anyway',
+							children: outOfOrderRunMessage(pending)
+						})
 				})}
 				initialTableKey={input.specificTable}
 				initialSchemaKey={input.specificSchema}
@@ -189,9 +216,11 @@
 			<Pane bind:size={replPanelSize} minSize={REPL_MIN_SIZE} class="relative">
 				<SqlRepl
 					{input}
+					{workspace}
 					onData={(data) => {
 						replResultData = data
 					}}
+					onSchemaChange={() => refresh()}
 					placeholderTableName={sortArray(
 						Object.keys(
 							dbSchema?.schema[
@@ -214,3 +243,9 @@
 		</Pane>
 	</Splitpanes>
 {/if}
+
+<Portal>
+	<!-- Stacks above the DB table editor's own preview confirmation (z-[9999]),
+		which is still open when applyDdl asks for out-of-order confirmation. -->
+	<ConfirmationModal {...outOfOrderModal.props} zIndexClass="z-[10000]" />
+</Portal>
diff --git a/frontend/src/lib/components/DBManagerDrawer.svelte b/frontend/src/lib/components/DBManagerDrawer.svelte
index 6598103751..712c4fbccf 100644
--- a/frontend/src/lib/components/DBManagerDrawer.svelte
+++ b/frontend/src/lib/components/DBManagerDrawer.svelte
@@ -16,6 +16,7 @@
 		Upload
 	} from 'lucide-svelte'
 	import DBManagerContent from './DBManagerContent.svelte'
+	import DataTableMigrationsButton from './workspaceSettings/DataTableMigrationsButton.svelte'
 	import { resource } from 'runed'
 	import { untrack } from 'svelte'
 	import type { DbManagerUriState } from './dbManagerDrawerModel.svelte'
@@ -34,13 +35,15 @@
 
 	let open = $derived(uriState.open)
 
+	// The workspace the drawer's DB operations run against — the acting workspace of
+	// the editor that opened it (set via openDrawer), else the nav workspace.
+	let ws = $derived(uriState.workspace ?? $workspaceStore)
+
 	// Load available datatables when drawer opens with datatable input
 	const datatables = resource<string[]>([], async () => {
-		if (!$workspaceStore) return []
+		if (!ws) return []
 		try {
-			return (await WorkspaceService.listDataTables({ workspace: $workspaceStore })).map(
-				(d) => d.name
-			)
+			return (await WorkspaceService.listDataTables({ workspace: ws })).map((d) => d.name)
 		} catch (e) {
 			console.error('Failed to load datatables:', e)
 			return []
@@ -105,12 +108,17 @@
 		return toSourceIdentifier(input.resourcePath)
 	}
 
+	function refreshManager() {
+		dbManagerContent?.refresh()
+		dbManagerContent?.dbManager()?.dbTable()?.refresh()
+	}
+
 	async function handleExportSchema() {
 		const source = currentSourceIdentifier()
-		if (!source || !$workspaceStore) return
+		if (!source || !ws) return
 		try {
 			exportResult = await WorkspaceService.exportPgSchema({
-				workspace: $workspaceStore,
+				workspace: ws,
 				requestBody: { source }
 			})
 			exportDrawerOpen = true
@@ -120,13 +128,13 @@
 	}
 
 	async function handleImportDatabase() {
-		if (!importSource || !$workspaceStore) return
+		if (!importSource || !ws) return
 		const target = currentSourceIdentifier()
 		if (!target) return
 		importLoading = true
 		try {
 			await WorkspaceService.importPgDatabase({
-				workspace: $workspaceStore,
+				workspace: ws,
 				requestBody: {
 					source: toSourceIdentifier(importSource),
 					target,
@@ -167,11 +175,12 @@
 		noPadding
 		id="db-manager-drawer"
 	>
-		{#if uriState.effectiveInput && $workspaceStore}
+		{#if uriState.effectiveInput && ws}
 			{#key uriState.selectedDatatable}
 				<DBManagerContent
 					bind:this={dbManagerContent}
 					input={uriState.effectiveInput}
+					workspace={uriState.workspace}
 					bind:hasReplResult
 					bind:selectedSchemaKey={uriState.selectedSchema}
 					bind:selectedTableKey={uriState.selectedTable}
@@ -201,6 +210,13 @@
 			{/key}
 		{/if}
 		{#snippet actions()}
+			{#if uriState.isDatatableInput && uriState.selectedDatatable && ws}
+				<DataTableMigrationsButton
+					workspace={ws}
+					datatable={uriState.selectedDatatable}
+					onSchemaChanged={refreshManager}
+				/>
+			{/if}
 			{#if enableImportExport}
 				<Button startIcon={{ icon: Download }} onClick={handleExportSchema}>Export</Button>
 				<Button startIcon={{ icon: Upload }} onClick={() => (importDrawerOpen = true)}>
@@ -209,16 +225,13 @@
 			{/if}
 			<Button
 				loading={dbManagerContent?.isLoading() ?? false}
-				on:click={() => {
-					dbManagerContent?.refresh()
-					dbManagerContent?.dbManager()?.dbTable()?.refresh()
-				}}
+				on:click={refreshManager}
 				startIcon={{ icon: RefreshCcw }}
+				iconOnly
+				title="Refresh"
 				size="xs"
 				color="light"
-			>
-				Refresh
-			</Button>
+			/>
 
 			<Button
 				on:click={() => (expand = !expand)}
@@ -234,7 +247,9 @@
 	<DrawerContent title="Export Schemas" on:close={() => (exportDrawerOpen = false)}>
 		{#if exportResult}
 			<div class="flex flex-col gap-2 h-full relative">
-				<pre class="overflow-auto text-xs bg-surface-secondary p-4 rounded flex-1">{exportResult}</pre>
+				<pre class="overflow-auto text-xs bg-surface-secondary p-4 rounded flex-1"
+					>{exportResult}</pre
+				>
 				<Button
 					size="xs"
 					color="light"
@@ -262,7 +277,12 @@
 			</Alert>
 			<div class="flex flex-col gap-2">
 				<span class="text-sm font-medium">Source database</span>
-				<ResourcePicker datatableAsPgResource bind:value={importSource} resourceType="postgresql" />
+				<ResourcePicker
+					datatableAsPgResource
+					bind:value={importSource}
+					resourceType="postgresql"
+					workspace={ws}
+				/>
 			</div>
 			<div class="flex flex-col gap-2">
 				<span class="text-sm font-medium">Import mode</span>
diff --git a/frontend/src/lib/components/DBTableEditor.svelte b/frontend/src/lib/components/DBTableEditor.svelte
index 6b6efca289..de3106d5ad 100644
--- a/frontend/src/lib/components/DBTableEditor.svelte
+++ b/frontend/src/lib/components/DBTableEditor.svelte
@@ -52,6 +52,7 @@
 	import Popover from './meltComponents/Popover.svelte'
 	import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte'
 	import { sendUserToast } from '$lib/toast'
+	import { MigrationRunCancelled } from './dbOps'
 	import { getFlatTableNamesFromSchema, type DBSchema } from '$lib/stores'
 	import { twMerge } from 'tailwind-merge'
 	import DarkModeObserver from './DarkModeObserver.svelte'
@@ -460,9 +461,13 @@
 							askingForConfirmation && (askingForConfirmation.loading = true)
 							await onConfirm({ values })
 						} catch (e) {
-							let msg: string | undefined = (e as Error)?.message
-							if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : 'An error occurred'
-							sendUserToast(msg, true)
+							// User declined the out-of-order run warning: silent cancel,
+							// leave the editor open so they can adjust or run earlier first.
+							if (!(e instanceof MigrationRunCancelled)) {
+								let msg: string | undefined = (e as any)?.body ?? (e as Error)?.message
+								if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : 'An error occurred'
+								sendUserToast(msg, true)
+							}
 						}
 						askingForConfirmation = undefined
 					},
@@ -472,7 +477,7 @@
 					...(preview && { codeContent: preview.sql, alert: preview.alert })
 				}
 			} catch (e) {
-				let msg: string | undefined = (e as Error)?.message
+				let msg: string | undefined = (e as any)?.body ?? (e as Error)?.message
 				if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : 'An error occurred'
 				sendUserToast(msg, true)
 			} finally {
diff --git a/frontend/src/lib/components/DataTestsResult.svelte b/frontend/src/lib/components/DataTestsResult.svelte
new file mode 100644
index 0000000000..385af187df
--- /dev/null
+++ b/frontend/src/lib/components/DataTestsResult.svelte
@@ -0,0 +1,80 @@
+<script lang="ts">
+	// Renders the per-test breakdown a managed `// materialize` run attaches to
+	// its result as `data_tests: [{ test, violating, sample? }]`. Shown above
+	// the raw result so "which tests ran, and which passed/failed" is clear at
+	// a glance. A failed test may carry `sample` — a bounded, unordered sample
+	// of its violating rows — rendered as an expandable table. The sample is
+	// optional by contract: its absence only means no rows to show.
+	import { CheckCircle2, ChevronDown, ChevronRight, FlaskConical, XCircle } from 'lucide-svelte'
+	import { Button } from '$lib/components/common'
+	import AutoDataTable from '$lib/components/table/AutoDataTable.svelte'
+	import { SvelteSet } from 'svelte/reactivity'
+
+	let {
+		tests
+	}: { tests: Array<{ test: string; violating: number; sample?: Record<string, any>[] }> } =
+		$props()
+
+	let failed = $derived(tests.filter((t) => t.violating > 0).length)
+	let expanded = new SvelteSet<string>()
+</script>
+
+<div
+	class="mb-2 rounded-md border bg-surface-secondary text-xs overflow-hidden {failed > 0
+		? 'border-red-300 dark:border-red-900/60'
+		: 'border-border'}"
+>
+	<div class="flex items-center gap-1.5 px-2 py-1 border-b border-border text-secondary">
+		<FlaskConical size={13} />
+		<span class="font-medium">
+			{tests.length} data test{tests.length === 1 ? '' : 's'}
+		</span>
+		<span
+			class={failed > 0
+				? 'text-red-600 dark:text-red-400'
+				: 'text-emerald-600 dark:text-emerald-400'}
+		>
+			· {failed > 0 ? `${failed} failed` : 'all passed'}
+		</span>
+	</div>
+	<ul class="divide-y divide-border">
+		{#each tests as t (t.test)}
+			<li class="px-2 py-1">
+				<div class="flex items-center gap-1.5 font-mono">
+					{#if t.violating > 0}
+						<XCircle size={13} class="shrink-0 text-red-600 dark:text-red-400" />
+						<span class="sr-only">failed:</span>
+						<span class="text-primary">{t.test}</span>
+						<span class="text-red-600 dark:text-red-400"
+							>— {t.violating} violating row{t.violating === 1 ? '' : 's'}</span
+						>
+						{#if t.sample && t.sample.length > 0}
+							<Button
+								variant="subtle"
+								unifiedSize="sm"
+								startIcon={{ icon: expanded.has(t.test) ? ChevronDown : ChevronRight }}
+								onclick={() => {
+									if (!expanded.delete(t.test)) expanded.add(t.test)
+								}}
+							>
+								{expanded.has(t.test) ? 'hide sample' : `view sample (${t.sample.length})`}
+							</Button>
+						{/if}
+					{:else}
+						<CheckCircle2 size={13} class="shrink-0 text-emerald-600 dark:text-emerald-400" />
+						<span class="sr-only">passed:</span>
+						<span class="text-secondary">{t.test}</span>
+					{/if}
+				</div>
+				{#if t.violating > 0 && t.sample && t.sample.length > 0 && expanded.has(t.test)}
+					<div class="mt-1 mb-1">
+						<div class="text-2xs text-tertiary mb-1">
+							sample of the violating rows ({t.sample.length} of {t.violating}, unordered)
+						</div>
+						<AutoDataTable objects={t.sample} />
+					</div>
+				{/if}
+			</li>
+		{/each}
+	</ul>
+</div>
diff --git a/frontend/src/lib/components/DatatableSchemaDiff.svelte b/frontend/src/lib/components/DatatableSchemaDiff.svelte
index 037dc0acd5..9eccda8195 100644
--- a/frontend/src/lib/components/DatatableSchemaDiff.svelte
+++ b/frontend/src/lib/components/DatatableSchemaDiff.svelte
@@ -196,10 +196,17 @@
 	import Drawer from '$lib/components/common/drawer/Drawer.svelte'
 	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
 	import { sendUserToast } from '$lib/toast'
+	import { userWorkspaces } from '$lib/stores'
 	import { runScriptAndPollResult } from '$lib/components/jobs/utils'
 	import YAML from 'yaml'
 	import DrawerContent from './common/drawer/DrawerContent.svelte'
 	import ConfirmationModal from './common/confirmationModal/ConfirmationModal.svelte'
+	import { createAsyncConfirmationModal } from './common/confirmationModal/asyncConfirmationModal.svelte'
+	import Portal from '$lib/components/Portal.svelte'
+	import {
+		pendingMigrations,
+		outOfOrderRunMessage
+	} from './workspaceSettings/datatableMigrationUtils'
 	import Alert from './common/alert/Alert.svelte'
 	import ResizeTransitionWrapper from './common/ResizeTransitionWrapper.svelte'
 
@@ -213,6 +220,11 @@
 	let loading = $state(true)
 	let error: string | undefined = $state(undefined)
 	let diffs: DatatableDiff[] = $state([])
+	// Number of forked datatables this schema-diff section applies to: those that
+	// have NOT opted in to the migrations feature. When a datatable enables
+	// migrations, its changes flow through the normal item diff instead, so it is
+	// excluded here and the whole section hides once none remain.
+	let applicableCount = $state(0)
 	let expandedDatatables: Set<string> = $state(new Set())
 
 	// Drawer state
@@ -223,6 +235,7 @@
 	let migrationSql = $state('')
 	let migrationRunning = $state(false)
 	let confirmDeployOpen = $state(false)
+	const outOfOrderModal = createAsyncConfirmationModal()
 
 	async function loadDiffs() {
 		loading = true
@@ -233,7 +246,10 @@
 				workspace: currentWorkspaceId
 			})
 			const datatables = forkSettings.datatable?.datatables ?? {}
-			const forkedEntries = Object.entries(datatables).filter(([_, dt]) => dt.forked_from != null)
+			const forkedEntries = Object.entries(datatables).filter(
+				([_, dt]) => dt.forked_from != null && dt.migrations_enabled !== true
+			)
+			applicableCount = forkedEntries.length
 			if (forkedEntries.length === 0) {
 				loading = false
 				return
@@ -343,14 +359,68 @@
 		const dtName = drawerDiff.datatableName
 
 		try {
-			await runScriptAndPollResult({
+			// If the target data table opted in to migrations, record this merge as a
+			// tracked migration (named after the fork) and run it, instead of applying
+			// raw SQL that would bypass the target's migration history.
+			// Don't swallow a status-check failure by defaulting to raw apply: that
+			// would apply the DDL untracked (schema drift) — exactly what this feature
+			// prevents. Let the error propagate (fail closed, handled by the outer
+			// catch); only fall back to raw apply when the API explicitly returns
+			// enabled === false.
+			const status = await WorkspaceService.getDatatableMigrationsStatus({
 				workspace: targetWorkspace,
-				requestBody: {
-					args: { database: `datatable://${dtName}` },
-					language: 'postgresql',
-					content: migrationSql
-				}
+				datatableName: dtName
 			})
+
+			if (status.enabled) {
+				// The merge migration gets the highest timestamp, so any still-pending
+				// migration on the target is earlier: running only the merge applies it
+				// out of order. Warn like the row-level Run action does.
+				const pending = pendingMigrations(status.migrations)
+				if (pending.length > 0) {
+					const confirmed = await outOfOrderModal.ask({
+						title: 'Run migration out of order',
+						confirmationText: 'Run anyway',
+						children: outOfOrderRunMessage(pending.length)
+					})
+					if (!confirmed) {
+						migrationRunning = false
+						return
+					}
+				}
+				const forkName =
+					$userWorkspaces.find((w) => w.id === currentWorkspaceId)?.name || currentWorkspaceId
+				const migName = `merge_${forkName}`.replace(/[^a-zA-Z0-9_-]+/g, '_')
+				const created = await WorkspaceService.createDatatableMigration({
+					workspace: targetWorkspace,
+					datatableName: dtName,
+					requestBody: { name: migName, code_up: migrationSql }
+				})
+				try {
+					await WorkspaceService.runDatatableMigrations({
+						workspace: targetWorkspace,
+						datatableName: dtName,
+						only: created.timestamp
+					})
+				} catch (runErr: any) {
+					// Undo the insertion so the user can fix and retry from a clean state.
+					await WorkspaceService.deleteDatatableMigration({
+						workspace: targetWorkspace,
+						datatableName: dtName,
+						timestamp: created.timestamp
+					}).catch(() => {})
+					throw runErr
+				}
+			} else {
+				await runScriptAndPollResult({
+					workspace: targetWorkspace,
+					requestBody: {
+						args: { database: `datatable://${dtName}` },
+						language: 'postgresql',
+						content: migrationSql
+					}
+				})
+			}
 		} catch (e: any) {
 			sendUserToast(e?.body ?? e?.message ?? String(e), true)
 			migrationRunning = false
@@ -394,102 +464,107 @@
 	}
 </script>
 
-<h3 class="text-sm font-semibold">Datatable schema changes</h3>
-{#if loading}
-	<div class="flex items-center gap-2 text-xs text-tertiary py-2">
-		<Loader2 class="w-4 h-4 animate-spin" /> Loading datatable diffs...
-	</div>
-{:else if error}
-	<div class="text-xs text-red-500 py-2">Failed to load datatable diffs: {error}</div>
-{:else if diffs.length > 0}
-	<div class="flex flex-col gap-2 mt-3 mb-1">
-		{#each diffs as diff}
-			<ResizeTransitionWrapper class="border rounded-md" innerClass="w-full" vertical>
-				<button
-					class="w-full flex items-center justify-between px-3 py-2 hover:bg-surface-hover"
-					onclick={() => toggleExpanded(diff.datatableName)}
-				>
-					<span class="text-xs font-medium">{diff.datatableName}</span>
-					<div class="flex items-center gap-2 text-2xs text-tertiary">
-						{#if diff.aheadChanges.length > 0}
-							<span class="text-blue-500">{diff.aheadChanges.length} ahead</span>
-						{/if}
-						{#if diff.behindChanges.length > 0}
-							<span class="text-orange-500">{diff.behindChanges.length} behind</span>
-						{/if}
-						{#if expandedDatatables.has(diff.datatableName)}
-							<ChevronDown class="w-3 h-3" />
-						{:else}
-							<ChevronRight class="w-3 h-3" />
-						{/if}
-					</div>
-				</button>
+{#if applicableCount > 0}
+	<div class="bg-surface-tertiary p-4 rounded-md border">
+		<h3 class="text-sm font-semibold">Datatable schema changes</h3>
+		{#if loading}
+			<div class="flex items-center gap-2 text-xs text-tertiary py-2">
+				<Loader2 class="w-4 h-4 animate-spin" /> Loading datatable diffs...
+			</div>
+		{:else if error}
+			<div class="text-xs text-red-500 py-2">Failed to load datatable diffs: {error}</div>
+		{:else if diffs.length > 0}
+			<div class="flex flex-col gap-2 mt-3 mb-1">
+				{#each diffs as diff}
+					<ResizeTransitionWrapper class="border rounded-md" innerClass="w-full" vertical>
+						<button
+							class="w-full flex items-center justify-between px-3 py-2 hover:bg-surface-hover"
+							onclick={() => toggleExpanded(diff.datatableName)}
+						>
+							<span class="text-xs font-medium">{diff.datatableName}</span>
+							<div class="flex items-center gap-2 text-2xs text-tertiary">
+								{#if diff.aheadChanges.length > 0}
+									<span class="text-blue-500">{diff.aheadChanges.length} ahead</span>
+								{/if}
+								{#if diff.behindChanges.length > 0}
+									<span class="text-orange-500">{diff.behindChanges.length} behind</span>
+								{/if}
+								{#if expandedDatatables.has(diff.datatableName)}
+									<ChevronDown class="w-3 h-3" />
+								{:else}
+									<ChevronRight class="w-3 h-3" />
+								{/if}
+							</div>
+						</button>
 
-				{#if expandedDatatables.has(diff.datatableName)}
-					<div class="border-t divide-y">
-						{#if diff.aheadChanges.length > 0}
-							<div class="px-3 py-1.5">
-								<div class="text-2xs font-semibold text-blue-500 mb-1">Fork changes (ahead)</div>
-								{#each diff.aheadChanges as change}
-									<div class="flex items-center gap-2 text-xs py-0.5">
-										{#if change.kind === 'added'}
-											<Plus class="w-3 h-3 text-green-500 shrink-0" />
-										{:else if change.kind === 'removed'}
-											<Minus class="w-3 h-3 text-red-500 shrink-0" />
-										{:else}
-											<Pencil class="w-3 h-3 text-yellow-500 shrink-0" />
-										{/if}
-										<span class="text-tertiary">{change.schemaName}.</span>
-										<span class="font-medium">{change.tableName}</span>
-										<span class="text-tertiary text-2xs grow">{operationSummary(change)}</span>
-										<Button
-											size="xs"
-											variant="subtle"
-											startIcon={{ icon: Eye }}
-											onclick={() => openReview(change, diff, 'ahead')}
+						{#if expandedDatatables.has(diff.datatableName)}
+							<div class="border-t divide-y">
+								{#if diff.aheadChanges.length > 0}
+									<div class="px-3 py-1.5">
+										<div class="text-2xs font-semibold text-blue-500 mb-1">Fork changes (ahead)</div
 										>
-											Review
-										</Button>
+										{#each diff.aheadChanges as change}
+											<div class="flex items-center gap-2 text-xs py-0.5">
+												{#if change.kind === 'added'}
+													<Plus class="w-3 h-3 text-green-500 shrink-0" />
+												{:else if change.kind === 'removed'}
+													<Minus class="w-3 h-3 text-red-500 shrink-0" />
+												{:else}
+													<Pencil class="w-3 h-3 text-yellow-500 shrink-0" />
+												{/if}
+												<span class="text-tertiary">{change.schemaName}.</span>
+												<span class="font-medium">{change.tableName}</span>
+												<span class="text-tertiary text-2xs grow">{operationSummary(change)}</span>
+												<Button
+													size="xs"
+													variant="subtle"
+													startIcon={{ icon: Eye }}
+													onclick={() => openReview(change, diff, 'ahead')}
+												>
+													Review
+												</Button>
+											</div>
+										{/each}
 									</div>
-								{/each}
+								{/if}
+								{#if diff.behindChanges.length > 0}
+									<div class="px-3 py-1.5">
+										<div class="text-2xs font-semibold text-orange-500 mb-1">
+											Parent changes (behind)
+										</div>
+										{#each diff.behindChanges as change}
+											<div class="flex items-center gap-2 text-xs py-0.5">
+												{#if change.kind === 'added'}
+													<Plus class="w-3 h-3 text-green-500 shrink-0" />
+												{:else if change.kind === 'removed'}
+													<Minus class="w-3 h-3 text-red-500 shrink-0" />
+												{:else}
+													<Pencil class="w-3 h-3 text-yellow-500 shrink-0" />
+												{/if}
+												<span class="text-tertiary">{change.schemaName}.</span>
+												<span class="font-medium">{change.tableName}</span>
+												<span class="text-tertiary text-2xs grow">{operationSummary(change)}</span>
+												<Button
+													size="xs"
+													variant="subtle"
+													startIcon={{ icon: Eye }}
+													onclick={() => openReview(change, diff, 'behind')}
+												>
+													Review
+												</Button>
+											</div>
+										{/each}
+									</div>
+								{/if}
 							</div>
 						{/if}
-						{#if diff.behindChanges.length > 0}
-							<div class="px-3 py-1.5">
-								<div class="text-2xs font-semibold text-orange-500 mb-1">
-									Parent changes (behind)
-								</div>
-								{#each diff.behindChanges as change}
-									<div class="flex items-center gap-2 text-xs py-0.5">
-										{#if change.kind === 'added'}
-											<Plus class="w-3 h-3 text-green-500 shrink-0" />
-										{:else if change.kind === 'removed'}
-											<Minus class="w-3 h-3 text-red-500 shrink-0" />
-										{:else}
-											<Pencil class="w-3 h-3 text-yellow-500 shrink-0" />
-										{/if}
-										<span class="text-tertiary">{change.schemaName}.</span>
-										<span class="font-medium">{change.tableName}</span>
-										<span class="text-tertiary text-2xs grow">{operationSummary(change)}</span>
-										<Button
-											size="xs"
-											variant="subtle"
-											startIcon={{ icon: Eye }}
-											onclick={() => openReview(change, diff, 'behind')}
-										>
-											Review
-										</Button>
-									</div>
-								{/each}
-							</div>
-						{/if}
-					</div>
-				{/if}
-			</ResizeTransitionWrapper>
-		{/each}
+					</ResizeTransitionWrapper>
+				{/each}
+			</div>
+		{:else}
+			<span class="text-xs text-secondary"> No changes detected </span>
+		{/if}
 	</div>
-{:else}
-	<span class="text-xs text-secondary"> No changes detected </span>
 {/if}
 
 <Drawer bind:open={drawerOpen} size="900px">
@@ -580,3 +655,7 @@
 		>{migrationSql}</pre
 	>
 </ConfirmationModal>
+
+<Portal>
+	<ConfirmationModal {...outOfOrderModal.props} />
+</Portal>
diff --git a/frontend/src/lib/components/DdlMigrationGuard.svelte b/frontend/src/lib/components/DdlMigrationGuard.svelte
new file mode 100644
index 0000000000..b6833521f8
--- /dev/null
+++ b/frontend/src/lib/components/DdlMigrationGuard.svelte
@@ -0,0 +1,159 @@
+<script lang="ts">
+	import { Button } from './common'
+	import Modal2 from './common/modal/Modal2.svelte'
+	import NewDataTableMigrationModal from './workspaceSettings/NewDataTableMigrationModal.svelte'
+	import DataTableMigrationsButton from './workspaceSettings/DataTableMigrationsButton.svelte'
+	import { splitSqlStatements, isDdlStatement } from './sqlDdl'
+	import { CornerDownLeft } from 'lucide-svelte'
+
+	let { workspace, datatable }: { workspace: string; datatable: string } = $props()
+
+	type Choice = 'run' | 'migrate' | 'cancel'
+
+	let promptStatement = $state<string | undefined>(undefined)
+	let promptOpen = $state(false)
+	let resolvePrompt: ((choice: Choice) => void) | undefined = undefined
+	let resolveMigrationClosed: ((created: boolean) => void) | undefined = undefined
+	// Set when a migration is created *and run* during a guard() call, so the
+	// caller can refresh the schema afterwards.
+	let migrationRan = false
+	let newMigrationModal = $state<NewDataTableMigrationModal | undefined>(undefined)
+	// Triggerless Migrations modal, opened programmatically from the "See migration"
+	// toast action after a migration is created here.
+	let migrationsModal = $state<DataTableMigrationsButton | undefined>(undefined)
+
+	function finishPrompt(choice: Choice) {
+		const r = resolvePrompt
+		resolvePrompt = undefined
+		promptOpen = false
+		promptStatement = undefined
+		r?.(choice)
+	}
+
+	// Closing the modal (X / escape) while a prompt is pending counts as cancel.
+	$effect(() => {
+		if (!promptOpen && resolvePrompt) {
+			finishPrompt('cancel')
+		}
+	})
+
+	// Enter confirms the primary action ("Create a migration"). Ignore modified
+	// Enter so editor shortcuts (Cmd/Ctrl+Enter) keep working underneath.
+	function onKeyDown(event: KeyboardEvent) {
+		if (!promptOpen || event.metaKey || event.ctrlKey || event.altKey) return
+		if (event.key === 'Enter') {
+			event.stopPropagation()
+			event.preventDefault()
+			finishPrompt('migrate')
+		}
+	}
+
+	function promptDdl(statement: string): Promise<Choice> {
+		return new Promise((resolve) => {
+			resolvePrompt = resolve
+			promptStatement = statement
+			promptOpen = true
+		})
+	}
+
+	function handleMigrationClosed(result: { created: boolean; ran: boolean }) {
+		if (result.ran) migrationRan = true
+		const r = resolveMigrationClosed
+		resolveMigrationClosed = undefined
+		r?.(result.created)
+	}
+
+	// Open the prefilled new-migration modal. Resolves with whether a migration
+	// was actually created (false if the user cancelled / closed it).
+	function openMigrationModal(statement: string): Promise<boolean> {
+		return new Promise((resolve) => {
+			resolveMigrationClosed = (created: boolean) => resolve(created)
+			newMigrationModal?.open({ codeUp: statement })
+		})
+	}
+
+	/**
+	 * Inspect `code` for DDL statements. For each one, prompt the user to run it
+	 * anyway or turn it into a migration (prompts shown one at a time). Returns
+	 * whether to proceed and the code to run (with migrated statements stripped).
+	 */
+	export async function guard(
+		code: string
+	): Promise<{ proceed: boolean; code: string; ranMigration: boolean }> {
+		migrationRan = false
+		const statements = splitSqlStatements(code)
+		if (!statements.some((s) => isDdlStatement(s))) {
+			return { proceed: true, code, ranMigration: false }
+		}
+
+		const kept: string[] = []
+		for (const statement of statements) {
+			if (!isDdlStatement(statement)) {
+				kept.push(statement)
+				continue
+			}
+			// Re-prompt for this statement until the user makes a terminal choice;
+			// cancelling the migration modal returns to the prompt with the DDL intact.
+			for (;;) {
+				const choice = await promptDdl(statement)
+				if (choice === 'cancel') {
+					return { proceed: false, code, ranMigration: migrationRan }
+				}
+				if (choice === 'run') {
+					kept.push(statement)
+					break
+				}
+				// migrate: only strip the statement once a migration is actually
+				// created; if the modal was cancelled, loop back to the prompt.
+				const created = await openMigrationModal(statement)
+				if (created) {
+					break
+				}
+			}
+		}
+
+		return { proceed: true, code: kept.join(';\n'), ranMigration: migrationRan }
+	}
+</script>
+
+<svelte:window onkeydown={onKeyDown} />
+
+<Modal2
+	title="Schema change detected"
+	fixedWidth="md"
+	fixedHeight="adaptive"
+	bind:isOpen={promptOpen}
+	closeOnOutsideClick={false}
+>
+	<div class="flex flex-col gap-3 w-full">
+		<p class="text-sm text-secondary">
+			This looks like a schema-changing (DDL) statement. Schema changes are best tracked as
+			migrations rather than run ad-hoc. Create a migration for it instead?
+		</p>
+		<pre
+			class="text-xs whitespace-pre-wrap font-mono bg-surface-secondary rounded p-3 max-h-48 overflow-auto"
+			>{promptStatement ?? ''}</pre
+		>
+		<div class="flex justify-end gap-2 pt-2">
+			<Button variant="default" size="sm" on:click={() => finishPrompt('run')}>Run anyway</Button>
+			<Button
+				variant="accent"
+				size="sm"
+				shortCut={{ Icon: CornerDownLeft, withoutModifier: true }}
+				on:click={() => finishPrompt('migrate')}
+			>
+				Create a migration
+			</Button>
+		</div>
+	</div>
+</Modal2>
+
+<NewDataTableMigrationModal
+	bind:this={newMigrationModal}
+	{workspace}
+	{datatable}
+	onClose={handleMigrationClosed}
+	onSeeMigration={(m) => migrationsModal?.openMigration(m.timestamp)}
+/>
+
+<DataTableMigrationsButton bind:this={migrationsModal} hideTrigger {workspace} {datatable} />
diff --git a/frontend/src/lib/components/DeployButton.svelte b/frontend/src/lib/components/DeployButton.svelte
index d8828d515a..da1ba5dd42 100644
--- a/frontend/src/lib/components/DeployButton.svelte
+++ b/frontend/src/lib/components/DeployButton.svelte
@@ -6,7 +6,8 @@
 	const {
 		loading = false,
 		loadingSave = false,
-		dropdownItems = []
+		dropdownItems = [],
+		unifiedSize = 'md'
 	}: {
 		loading?: boolean
 		loadingSave?: boolean
@@ -14,6 +15,7 @@
 			label: string
 			onClick: () => void
 		}>
+		unifiedSize?: 'sm' | 'md' | 'lg'
 	} = $props()
 
 	const dispatch = createEventDispatcher()
@@ -28,7 +30,7 @@
 	disabled={loading}
 	loading={loadingSave}
 	variant="accent"
-	unifiedSize="md"
+	{unifiedSize}
 	startIcon={{ icon: Save }}
 	on:click={() => dispatch('save')}
 	{dropdownItems}
diff --git a/frontend/src/lib/components/DevWorkspaceSetting.svelte b/frontend/src/lib/components/DevWorkspaceSetting.svelte
new file mode 100644
index 0000000000..e6295d24cd
--- /dev/null
+++ b/frontend/src/lib/components/DevWorkspaceSetting.svelte
@@ -0,0 +1,240 @@
+<script lang="ts">
+	import { workspaceStore, userWorkspaces, usersWorkspaceStore } from '$lib/stores'
+	import { WorkspaceService } from '$lib/gen'
+	import { Badge, Button } from '$lib/components/common'
+	import Select from '$lib/components/select/Select.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import { sendUserToast } from '$lib/toast'
+	import { switchWorkspace } from '$lib/storeUtils'
+	import { goto } from '$app/navigation'
+	import { base } from '$lib/base'
+	import { findCanonicalDevWorkspace } from '$lib/utils/workspaceHierarchy'
+	import { devBadgeText, devLabelKey, devLabelNoun } from '$lib/utils/devWorkspaceLabel'
+	import { loadProtectionRules } from '$lib/workspaceProtectionRules.svelte'
+	import { GitFork, ExternalLink } from 'lucide-svelte'
+	import { resource } from 'runed'
+
+	let currentWs = $derived($userWorkspaces.find((w) => w.id === $workspaceStore))
+	let isDev = $derived(currentWs?.is_dev_workspace ?? false)
+	let currentLabel = $derived(devLabelKey(currentWs?.dev_workspace_label))
+	let parentId = $derived(currentWs?.parent_workspace_id ?? undefined)
+	let canonicalDev = $derived(findCanonicalDevWorkspace($workspaceStore, $userWorkspaces))
+
+	// A prod admin who isn't a member of the dev can't see it in their workspace list, so ask the
+	// server (only when the client list doesn't already have it) — otherwise the tab would show the
+	// attach form instead of the existing pairing and detach control.
+	const devWorkspaceResource = resource(
+		() => (!isDev && !parentId && !canonicalDev ? $workspaceStore : undefined),
+		async (ws) => (ws ? await WorkspaceService.getDevWorkspace({ workspace: ws }) : undefined)
+	)
+	// The paired dev to display: the client entry when we're a member (so "Go to dev workspace" works),
+	// else the server result (pairing + detach still available to a prod admin).
+	let pairedDev = $derived(
+		canonicalDev
+			? {
+					id: canonicalDev.id,
+					name: canonicalDev.name,
+					isMember: true,
+					label: canonicalDev.dev_workspace_label
+				}
+			: devWorkspaceResource.current
+				? {
+						id: devWorkspaceResource.current.id,
+						name: devWorkspaceResource.current.name,
+						isMember: false,
+						label: devWorkspaceResource.current.dev_workspace_label
+					}
+				: undefined
+	)
+
+	let selectedDevId = $state<string | undefined>(undefined)
+	let lockProdDeploy = $state(true)
+	let lockProdForking = $state(true)
+	// Cosmetic display label chosen when attaching an existing workspace as dev.
+	let attachLabel = $state<'dev' | 'staging'>('dev')
+	let busy = $state(false)
+	let labelBusy = $state(false)
+
+	// A standalone root workspace, or an existing fork of this prod (same family), can be attached.
+	// A fork parented to a different workspace can't (the backend rejects a parent that isn't this
+	// prod), so it's excluded here.
+	let attachCandidates = $derived(
+		$userWorkspaces
+			.filter(
+				(w) =>
+					w.id !== $workspaceStore &&
+					w.id !== 'admins' &&
+					(!w.parent_workspace_id || w.parent_workspace_id === $workspaceStore)
+			)
+			.map((w) => ({
+				label:
+					w.parent_workspace_id === $workspaceStore
+						? `${w.name} (${w.id}), fork of this workspace`
+						: `${w.name} (${w.id})`,
+				value: w.id
+			}))
+	)
+
+	async function refresh() {
+		usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
+		// Attach/detach changes this (root) workspace's protection rules; reload them so the
+		// direct-deploy / forking lock UI reflects the change without a workspace switch or reload.
+		if ($workspaceStore) {
+			await loadProtectionRules($workspaceStore)
+		}
+	}
+
+	async function attach() {
+		if (!selectedDevId || !$workspaceStore) return
+		busy = true
+		try {
+			await WorkspaceService.attachDevWorkspace({
+				workspace: $workspaceStore,
+				requestBody: {
+					dev_workspace_id: selectedDevId,
+					lock_prod_deploy: lockProdDeploy,
+					lock_prod_forking: lockProdForking,
+					dev_workspace_label: attachLabel
+				}
+			})
+			sendUserToast(`Attached ${selectedDevId} as ${attachLabel} workspace`)
+			selectedDevId = undefined
+			await refresh()
+		} catch (e: any) {
+			sendUserToast(`Failed to attach dev workspace: ${e?.body ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	async function setLabel(label: 'dev' | 'staging') {
+		if (!$workspaceStore || label === devLabelKey(currentWs?.dev_workspace_label)) return
+		labelBusy = true
+		try {
+			await WorkspaceService.setDevWorkspaceLabel({
+				workspace: $workspaceStore,
+				requestBody: { dev_workspace_label: label }
+			})
+			usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
+		} catch (e: any) {
+			sendUserToast(`Failed to update display label: ${e?.body ?? e}`, true)
+		} finally {
+			labelBusy = false
+		}
+	}
+
+	async function detach(devId: string) {
+		if (!$workspaceStore) return
+		busy = true
+		try {
+			await WorkspaceService.detachDevWorkspace({
+				workspace: $workspaceStore,
+				requestBody: { dev_workspace_id: devId }
+			})
+			sendUserToast(`Detached dev workspace ${devId}`)
+			await refresh()
+		} catch (e: any) {
+			sendUserToast(`Failed to detach dev workspace: ${e?.body ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+</script>
+
+{#if isDev && parentId}
+	<div class="flex flex-col gap-3 max-w-2xl">
+		<p class="text-sm">
+			This is a <b>{devLabelNoun(currentWs?.dev_workspace_label)}</b> paired with root workspace
+			<b>{parentId}</b>. Promote changes from the home page banner or the Compare &amp; Deploy page.
+		</p>
+		<div class="text-2xs text-secondary">
+			Cosmetic label: <Badge color="indigo" small>{devBadgeText(currentLabel)}</Badge>
+			<button
+				type="button"
+				disabled={labelBusy}
+				class="text-secondary hover:text-primary hover:underline disabled:opacity-50"
+				onclick={() => setLabel(currentLabel === 'staging' ? 'dev' : 'staging')}
+			>
+				Change to {currentLabel === 'staging' ? 'dev' : 'staging'}
+			</button>
+		</div>
+		<div>
+			<Button
+				variant="default"
+				startIcon={{ icon: ExternalLink }}
+				onclick={() => switchWorkspace(parentId)}
+			>
+				Go to root workspace
+			</Button>
+		</div>
+	</div>
+{:else if pairedDev}
+	<div class="flex flex-col gap-3 max-w-2xl">
+		<p class="text-sm">
+			This workspace's {devLabelNoun(pairedDev.label)} is <b>{pairedDev.name}</b> ({pairedDev.id}).
+			Edits to this workspace are redirected there.
+		</p>
+		<div class="flex gap-2">
+			{#if pairedDev.isMember}
+				<Button
+					variant="default"
+					startIcon={{ icon: GitFork }}
+					onclick={() => switchWorkspace(pairedDev.id)}
+				>
+					Go to {devLabelNoun(pairedDev.label)}
+				</Button>
+			{/if}
+			<Button color="red" disabled={busy} onclick={() => detach(pairedDev.id)}>Detach</Button>
+		</div>
+	</div>
+{:else if parentId}
+	<p class="text-sm text-secondary max-w-2xl">
+		Dev workspace pairing is only available for root workspaces. This workspace is a fork of
+		<b>{parentId}</b>.
+	</p>
+{:else}
+	<div class="flex flex-col gap-3 max-w-2xl">
+		<p class="text-sm text-secondary">
+			Pair this workspace with a dev workspace: the same code with a different environment (resource
+			and variable values). Edits are made in the dev workspace and promoted here.
+		</p>
+		<div class="flex flex-col gap-1">
+			<span class="text-xs font-semibold text-emphasis">Attach an existing workspace as dev</span>
+			<Select
+				items={attachCandidates}
+				bind:value={selectedDevId}
+				placeholder="Select a workspace"
+				clearable
+			/>
+		</div>
+		<div class="text-2xs text-secondary">
+			Cosmetic label: <Badge color="indigo" small>{devBadgeText(attachLabel)}</Badge>
+			<button
+				type="button"
+				class="text-secondary hover:text-primary hover:underline"
+				onclick={() => (attachLabel = attachLabel === 'staging' ? 'dev' : 'staging')}
+			>
+				Change to {attachLabel === 'staging' ? 'dev' : 'staging'}
+			</button>
+		</div>
+		<Toggle
+			bind:checked={lockProdDeploy}
+			options={{
+				right: 'Block direct edits in this workspace (deploy via the dev workspace)'
+			}}
+		/>
+		<Toggle bind:checked={lockProdForking} options={{ right: 'Prevent forking this workspace' }} />
+		<div class="flex gap-2">
+			<Button variant="accent" disabled={busy || !selectedDevId} onclick={attach}>
+				Attach dev workspace
+			</Button>
+			<Button
+				variant="default"
+				startIcon={{ icon: GitFork }}
+				onclick={() => goto(`${base}/user/fork_workspace`)}
+			>
+				Create a new dev workspace
+			</Button>
+		</div>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/DiffEditor.svelte b/frontend/src/lib/components/DiffEditor.svelte
index 59bc8a33a5..8ebfe1c23f 100644
--- a/frontend/src/lib/components/DiffEditor.svelte
+++ b/frontend/src/lib/components/DiffEditor.svelte
@@ -13,9 +13,7 @@
 	import EditorTheme from './EditorTheme.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { twMerge } from 'tailwind-merge'
-	import type { ButtonProp } from './diffEditorTypes'
-
-	const SIDE_BY_SIDE_MIN_WIDTH = 700
+	import { SIDE_BY_SIDE_MIN_WIDTH, type ButtonProp } from './diffEditorTypes'
 
 	interface Props {
 		open?: boolean
@@ -30,6 +28,10 @@
 		buttons?: ButtonProp[]
 		modifiedModel?: meditor.ITextModel | meditor.IEditorModel
 		inlineDiff?: boolean
+		// Opt out of Monaco's auto-inline fallback (see useInlineViewWhenSpaceIsLimited
+		// below). Only set this when the consumer fully owns the inline/side-by-side
+		// decision; otherwise the default keeps Monaco's built-in narrow fallback.
+		disableAutoInline?: boolean
 	}
 
 	let {
@@ -44,7 +46,8 @@
 		readOnly = false,
 		buttons = [],
 		modifiedModel,
-		inlineDiff = false
+		inlineDiff = false,
+		disableAutoInline = false
 	}: Props = $props()
 
 	let diffEditor: meditor.IStandaloneDiffEditor | undefined = $state(undefined)
@@ -62,6 +65,12 @@
 		diffEditor = meditor.createDiffEditor(diffDivEl!, {
 			automaticLayout,
 			renderSideBySide: inlineDiff ? false : editorWidth >= SIDE_BY_SIDE_MIN_WIDTH,
+			// Monaco forces the inline view below renderSideBySideInlineBreakpoint (900px),
+			// overriding our SIDE_BY_SIDE_MIN_WIDTH gate. Consumers that fully own the
+			// inline/side-by-side decision (e.g. the diff drawer's toggle) opt out via
+			// disableAutoInline; everyone else keeps Monaco's auto-inline fallback so
+			// narrow panels (inline scripts, flow modules) stay readable in unified view.
+			useInlineViewWhenSpaceIsLimited: !disableAutoInline,
 			originalEditable: false,
 			readOnly,
 			minimap: {
diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte
index 707cda66e1..efb1dd2da1 100644
--- a/frontend/src/lib/components/DisplayResult.svelte
+++ b/frontend/src/lib/components/DisplayResult.svelte
@@ -7,7 +7,7 @@
 	import { base } from '$lib/base'
 	import { downloadViaClient, shouldDownloadViaClient } from '$lib/utils/downloadFile'
 	import { appendViewToken } from '$lib/viewToken'
-	import { Button, Drawer, DrawerContent } from './common'
+	import { Badge, Button, Drawer, DrawerContent } from './common'
 	import {
 		ClipboardCopy,
 		Download,
@@ -16,8 +16,11 @@
 		Braces,
 		Highlighter,
 		ArrowDownFromLine,
+		Database,
 		Loader2
 	} from 'lucide-svelte'
+	import DucklakeResultPreview from './assets/AssetGraph/DucklakeResultPreview.svelte'
+	import DataTestsResult from './DataTestsResult.svelte'
 	import Portal from '$lib/components/Portal.svelte'
 	import DisplayResultControlBar from './DisplayResultControlBar.svelte'
 
@@ -68,6 +71,7 @@
 		| 'filename'
 		| 's3object'
 		| 's3object-list'
+		| 'materialized'
 		| 'plain'
 		| 'markdown'
 		| 'map'
@@ -195,6 +199,28 @@
 		return keys.includes('s3') && typeof result.s3 === 'string'
 	}
 
+	// The materialize-run summary — `[{ materialized: 'ducklake://…', rows,
+	// snapshot_id }]` or the bare object. The shape is narrow (a `ducklake://`
+	// value plus a `snapshot_id` key) so an ordinary user result isn't hijacked.
+	function parseMaterializedResult(
+		res: any
+	):
+		| { materialized: string; partition?: string; rows?: number; snapshot_id?: number | null }
+		| undefined {
+		const obj = Array.isArray(res) && res.length === 1 ? res[0] : res
+		if (
+			obj &&
+			typeof obj === 'object' &&
+			typeof obj.materialized === 'string' &&
+			obj.materialized.startsWith('ducklake://') &&
+			'snapshot_id' in obj
+		) {
+			return obj
+		}
+		return undefined
+	}
+
+	let showMaterializedPreview = $state(true)
 	let is_render_all = $state(false)
 	let download_as_csv = $state(false)
 	function inferResultKind(result: any) {
@@ -221,6 +247,13 @@
 			}
 			try {
 				let keys = result && typeof result === 'object' ? Object.keys(result) : []
+
+				if (parseMaterializedResult(result)) {
+					largeObject = false
+					is_render_all = false
+					return 'materialized'
+				}
+
 				is_render_all =
 					keys.length == 1 && keys.includes('render_all') && Array.isArray(result['render_all'])
 
@@ -532,10 +565,83 @@
 			resultHeaderHeight
 		)
 	})
+
+	// Per-test breakdown of a managed `// materialize` run, rendered as a
+	// checklist above the raw result. On success it rides the result
+	// (`data_tests: [{ test, violating }]`, a one-row array). On failure the job
+	// result is the error, whose message is the worker's breakdown text — parsed
+	// back into the same shape so the checklist shows on both outcomes. Both
+	// formats are produced by this repo's worker (see duckdb_executor.rs); the
+	// derivation is inert (undefined) for every other DisplayResult use.
+	let dataTests = $derived.by(() => {
+		// Both structured shapes carry `[{ test, violating, sample? }]`; the
+		// sample (bounded violating-row rows) may arrive as a JSON string (the
+		// worker keeps it string-typed through the summary row) and is optional
+		// by contract — anything malformed degrades to no sample, never to a
+		// dropped checklist.
+		const normalize = (
+			dt: any
+		): Array<{ test: string; violating: number; sample?: Record<string, any>[] }> | undefined => {
+			if (typeof dt === 'string') {
+				try {
+					dt = JSON.parse(dt)
+				} catch {
+					return undefined
+				}
+			}
+			if (
+				!Array.isArray(dt) ||
+				dt.length === 0 ||
+				!dt.every((x) => x && typeof x.test === 'string' && typeof x.violating === 'number')
+			) {
+				return undefined
+			}
+			return dt.map((x) => {
+				let sample = x.sample
+				if (typeof sample === 'string') {
+					try {
+						sample = JSON.parse(sample)
+					} catch {
+						sample = undefined
+					}
+				}
+				if (!Array.isArray(sample) || !sample.every((r) => r && typeof r === 'object')) {
+					sample = undefined
+				}
+				return { test: x.test, violating: x.violating, sample }
+			})
+		}
+		// Success: structured column on the summary row.
+		const row = Array.isArray(result) ? (result as any)?.[0] : (result as any)
+		const fromRow = normalize(row?.data_tests)
+		if (fromRow) return fromRow
+		// Failure: the worker attaches the same structured breakdown (plus
+		// per-failed-test samples) to the error payload.
+		const fromError = normalize((result as any)?.error?.data_tests)
+		if (fromError) return fromError
+		// Failure fallback for results predating the structured error payload:
+		// parse the worker's breakdown out of the error message.
+		const msg = (result as any)?.error?.message
+		if (typeof msg === 'string' && msg.includes('data tests failed on')) {
+			const out: Array<{ test: string; violating: number }> = []
+			for (const line of msg.split('\n')) {
+				const fail = line.match(/^\s*✗\s*(.+?)\s*—\s*(\d+)\s+violating/)
+				const pass = line.match(/^\s*✓\s*(.+?)\s*$/)
+				if (fail) out.push({ test: fail[1], violating: parseInt(fail[2], 10) })
+				else if (pass) out.push({ test: pass[1], violating: 0 })
+			}
+			if (out.length > 0) return out
+		}
+		return undefined
+	})
 </script>
 
 <HighlightTheme />
 
+{#if dataTests}
+	<DataTestsResult tests={dataTests} />
+{/if}
+
 {#if result_stream && result == undefined}
 	<div class="flex flex-col w-full gap-2">
 		<div class="flex items-center gap-2 text-secondary text-xs">
@@ -832,6 +938,43 @@
 							></div
 						>
 					</div>
+				{:else if !forceJson && resultKind === 'materialized'}
+					{@const m = parseMaterializedResult(result)}
+					{#if m}
+						<div class="flex flex-col gap-2 w-full">
+							<div class="flex items-center gap-2 flex-wrap text-xs">
+								<Database size={14} class="text-tertiary shrink-0" />
+								<span class="font-mono text-emphasis break-all">{m.materialized}</span>
+								{#if m.partition}
+									<Badge color="blue">partition {m.partition}</Badge>
+								{/if}
+								{#if typeof m.rows === 'number'}
+									<Badge color="green">
+										{m.rows}
+										{m.rows === 1 ? 'row' : 'rows'}{m.partition ? ' in partition' : ''}
+									</Badge>
+								{/if}
+								{#if m.snapshot_id != null}
+									<Badge color="gray">snapshot {m.snapshot_id}</Badge>
+								{/if}
+							</div>
+							<Toggle
+								class="flex"
+								bind:checked={showMaterializedPreview}
+								size="xs"
+								options={{ right: 'Preview rows' }}
+							/>
+							{#if showMaterializedPreview}
+								<div class="border rounded-md h-80 min-h-0 overflow-hidden">
+									<DucklakeResultPreview
+										assetUri={m.materialized}
+										partition={m.partition}
+										class="h-full"
+									/>
+								</div>
+							{/if}
+						</div>
+					{/if}
 				{:else if !forceJson && resultKind === 's3object'}
 					{@const s3object = parseS3Object(result) as typeof result}
 					<div
diff --git a/frontend/src/lib/components/DraftBadge.svelte b/frontend/src/lib/components/DraftBadge.svelte
index 75cc6cec0b..1527feef73 100644
--- a/frontend/src/lib/components/DraftBadge.svelte
+++ b/frontend/src/lib/components/DraftBadge.svelte
@@ -38,6 +38,10 @@
 		/** Offer "Load" alongside "View Diff" on other users' rows. The deploy /
 		 * review page sets this false: loading into a fresh editor is moot there. */
 		allowFork?: boolean
+		/** Compact variant: render only the avatar circles (no "Draft" pill text),
+		 * slightly smaller — for tight spots like the diff-tree sidebar. The hover
+		 * popover is unchanged. */
+		iconOnly?: boolean
 	}
 
 	let {
@@ -49,7 +53,8 @@
 		itemKind = undefined,
 		path = undefined,
 		onMigrated = undefined,
-		allowFork = true
+		allowFork = true,
+		iconOnly = false
 	}: Props = $props()
 
 	// Authed user lands first; everyone else keeps the backend's ordering.
@@ -193,6 +198,30 @@
 	}
 </script>
 
+{#snippet circleStack()}
+	<!-- `-space-x-1` overlaps the circles; the indigo ring tint makes the overlap read intentional. -->
+	<span class="flex -space-x-1">
+		{#each visibleUsers as u, i (i)}
+			<span
+				class="inline-flex h-3 w-3 items-center justify-center rounded-full text-[8px] font-semibold text-white ring-1 ring-indigo-100 dark:ring-indigo-700/40 {colorFor(
+					u
+				)}"
+				title={u.username === currentUsername ? `${fullLabel(u)} (you)` : fullLabel(u)}
+			>
+				{initials(u)}
+			</span>
+		{/each}
+		{#if overflowCount > 0}
+			<span
+				class="inline-flex h-3 w-3 items-center justify-center rounded-full bg-gray-500 text-[8px] font-semibold text-white ring-1 ring-indigo-100 dark:ring-indigo-700/40"
+				title="{overflowCount} more"
+			>
+				+{overflowCount}
+			</span>
+		{/if}
+	</span>
+{/snippet}
+
 {#if showBadge}
 	<!-- inline-flex/items-center so the trigger button hugs the badge and lines up
 	     with sibling badges (a plain button is taller, dropping the pill ~2px). -->
@@ -204,32 +233,23 @@
 		bind:isOpen={popoverOpen}
 	>
 		{#snippet trigger()}
-			<Badge small color="indigo">
-				{#if orderedUsers.length > 0}
-					<!-- `-space-x-1` overlaps the circles; the indigo ring tint makes the overlap read intentional. -->
-					<span class="flex -space-x-1">
-						{#each visibleUsers as u, i (i)}
-							<span
-								class="inline-flex h-3.5 w-3.5 items-center justify-center rounded-full text-[8px] font-semibold text-white ring-1 ring-indigo-100 dark:ring-indigo-700/40 {colorFor(
-									u
-								)}"
-								title={u.username === currentUsername ? `${fullLabel(u)} (you)` : fullLabel(u)}
-							>
-								{initials(u)}
-							</span>
-						{/each}
-						{#if overflowCount > 0}
-							<span
-								class="inline-flex h-3.5 w-3.5 items-center justify-center rounded-full bg-gray-500 text-[8px] font-semibold text-white ring-1 ring-indigo-100 dark:ring-indigo-700/40"
-								title="{overflowCount} more"
-							>
-								+{overflowCount}
-							</span>
-						{/if}
-					</span>
-				{/if}
-				{draft_only ? 'Draft only' : 'Draft'}
-			</Badge>
+			{#if iconOnly}
+				<!-- Compact "has a draft" marker for tight spots like the diff-tree
+				     sidebar: a small indigo pencil + the author avatar(s). -->
+				<span class="inline-flex items-center gap-0.5" title={draft_only ? 'Draft only' : 'Draft'}>
+					<Pencil class="h-3 w-3 shrink-0 text-indigo-500 dark:text-indigo-400" />
+					{#if orderedUsers.length > 0}
+						{@render circleStack()}
+					{/if}
+				</span>
+			{:else}
+				<Badge small color="indigo" class="px-1 py-0 gap-0.5">
+					{#if orderedUsers.length > 0}
+						{@render circleStack()}
+					{/if}
+					{draft_only ? 'Draft only' : 'Draft'}
+				</Badge>
+			{/if}
 		{/snippet}
 		{#snippet content()}
 			<div class="flex flex-col gap-2 min-w-[16rem] text-xs p-4 pb-1">
diff --git a/frontend/src/lib/components/DrillPicker.svelte b/frontend/src/lib/components/DrillPicker.svelte
index 1b6a161d02..a03a0af39e 100644
--- a/frontend/src/lib/components/DrillPicker.svelte
+++ b/frontend/src/lib/components/DrillPicker.svelte
@@ -412,7 +412,7 @@ leaves and ignores the current scope.
 	bind:this={pickerRoot}
 	class={flush
 		? 'flex flex-col w-full h-full'
-		: 'flex flex-col w-[min(420px,calc(100vw-20px))] max-h-[60vh]'}
+		: 'flex flex-col w-[min(420px,calc(100vw-20px))] max-h-[60vh] min-h-0'}
 	onkeydown={handleSearchKeydown}
 	onmousemove={() => (mouseActive = true)}
 >
diff --git a/frontend/src/lib/components/DropdownV2.svelte b/frontend/src/lib/components/DropdownV2.svelte
index 200f66f538..3a12198188 100644
--- a/frontend/src/lib/components/DropdownV2.svelte
+++ b/frontend/src/lib/components/DropdownV2.svelte
@@ -19,7 +19,7 @@
 	import { twMerge } from 'tailwind-merge'
 	import { triggerableByAI } from '$lib/actions/triggerableByAI.svelte'
 	import { untrack } from 'svelte'
-	import { fly } from 'svelte/transition'
+	import { placementFly } from '$lib/utils/placementFly'
 	import { ButtonType } from './common/button/model'
 
 	interface Props {
@@ -30,6 +30,10 @@
 		placement?: Placement
 		usePointerDownOutside?: boolean
 		closeOnOtherDropdownOpen?: boolean
+		// When false the menu stays open after an item is selected (melt's closeOnItemClick).
+		// Consumers that keep the menu open must close it themselves where appropriate.
+		// Read once at menu creation (like `placement`); changing it after mount has no effect.
+		closeOnItemClick?: boolean
 		fixedHeight?: boolean
 		hidePopup?: boolean
 		open?: boolean
@@ -41,10 +45,18 @@
 		size?: ButtonType.UnifiedSize
 		btnText?: string
 		buttonReplacement?: import('svelte').Snippet
-		// In customMenu mode the snippet receives the melt-ui `item` action
-		// store so consumers can wrap their own rows in <MenuItem> (or
-		// `use:melt={$item}`) and get arrow-key navigation + aria wiring.
-		menu?: import('svelte').Snippet<[{ item: MenubarMenuElements['item']; close: () => void }]>
+		// In customMenu mode the snippet receives the melt-ui `item` action store
+		// (so consumers can wrap rows in <MenuItem> for arrow-key navigation + aria)
+		// and `builders` (so they can compose melt submenus, e.g. via DropdownSubmenuItem).
+		menu?: import('svelte').Snippet<
+			[
+				{
+					item: MenubarMenuElements['item']
+					close: () => void
+					builders: ReturnType<typeof createDropdownMenu>['builders']
+				}
+			]
+		>
 		maxHeight?: string | undefined
 	}
 
@@ -56,6 +68,7 @@
 		placement = 'bottom-end',
 		usePointerDownOutside = false,
 		closeOnOtherDropdownOpen = true,
+		closeOnItemClick = true,
 		fixedHeight = true,
 		hidePopup = false,
 		open = $bindable(false),
@@ -82,6 +95,7 @@
 		positioning: {
 			placement: untrack(() => placement)
 		},
+		closeOnItemClick: untrack(() => closeOnItemClick),
 		loop: true,
 		onOpenChange: ({ next }) => {
 			if (closeOnOtherDropdownOpen) {
@@ -173,10 +187,10 @@
 		use:melt={$menuEl}
 		data-menu
 		class="z-[6000] transition-all duration-100"
-		transition:fly={{ duration: enableFlyTransition ? 100 : 0, y: -16 }}
+		transition:placementFly={{ duration: enableFlyTransition ? 100 : 0, placement }}
 	>
 		{#if customMenu}
-			{@render menu?.({ item, close })}
+			{@render menu?.({ item, close, builders })}
 		{:else}
 			<div
 				class="bg-surface-tertiary dark:border w-56 origin-top-right rounded-lg shadow-lg focus:outline-none overflow-y-auto py-1"
diff --git a/frontend/src/lib/components/DropdownV2Inner.svelte b/frontend/src/lib/components/DropdownV2Inner.svelte
index 71cbea82f9..1196589474 100644
--- a/frontend/src/lib/components/DropdownV2Inner.svelte
+++ b/frontend/src/lib/components/DropdownV2Inner.svelte
@@ -28,6 +28,58 @@
 	computeItems()
 </script>
 
+{#snippet menuItem(item: Item)}
+	<MenuItem
+		onClick={(e) => item?.action?.(e)}
+		href={item?.href}
+		target={item?.hrefTarget}
+		disabled={item?.disabled}
+		class={twMerge(
+			'px-4 py-2 text-primary font-normal hover:bg-surface-hover cursor-pointer text-xs transition-colors w-full',
+			'data-[highlighted]:bg-surface-hover',
+			'flex flex-row gap-2 items-center rounded-sm',
+			// `pointer-events-none` lets a hover fall through the natively-disabled button to the
+			// wrapper below, so a disabled item's `title` tooltip can still explain *why* it's disabled.
+			item?.disabled && 'text-disabled cursor-not-allowed pointer-events-none',
+			item?.type === 'delete' &&
+				!item?.disabled &&
+				'text-red-600 dark:text-red-400 data-[highlighted]:bg-red-500/10 dark:data-[highlighted]:bg-red-900/80 dark:data-[highlighted]:text-red-300 '
+		)}
+		item={meltItem}
+		aiId={`${aiId ? `${aiId}-${item.displayName}` : undefined}`}
+		aiDescription={item.displayName}
+	>
+		{#if item.icon}
+			<item.icon size={14} color={item.iconColor} class="shrink-0" />
+		{/if}
+		<p title={item.displayName} class="truncate grow min-w-0 whitespace-nowrap text-left">
+			{item.displayName}
+		</p>
+		{@render item.extra?.()}
+		{#if item.shortcut || item.selected}
+			<!-- Single trailing group so `shortcut` and `selected` can coexist:
+			     two `ml-auto` siblings would collapse to one right-aligned item. -->
+			<div class="ml-auto flex shrink-0 items-center gap-2">
+				{#if item.shortcut}
+					<span class="pl-4 text-2xs text-secondary">{item.shortcut}</span>
+				{/if}
+				{#if item.selected}
+					<Check size={14} class="text-primary" />
+				{/if}
+			</div>
+		{/if}
+		{#if item.tooltip && !item.disabled}
+			<!-- Enabled items get the rich ⓘ tooltip. Disabled items can't (a native disabled button
+			     swallows subtree pointer events), so they fall back to the wrapper `title` below. -->
+			<Tooltip>
+				{#snippet text()}
+					{item.tooltip}
+				{/snippet}
+			</Tooltip>
+		{/if}
+	</MenuItem>
+{/snippet}
+
 {#if computedItems}
 	<div class="flex flex-col">
 		{#each computedItems ?? [] as item}
@@ -36,52 +88,14 @@
 			{/if}
 			{#if item.submenuItems && builders}
 				<DropdownSubmenuItem {item} {builders} {meltItem} />
+			{:else if item.disabled && item.tooltip}
+				<!-- Wrapper carries the native `title`; the disabled button's `pointer-events-none`
+				     lets the hover reach it so the user learns why the item is disabled. -->
+				<div title={item.tooltip} class="w-full">
+					{@render menuItem(item)}
+				</div>
 			{:else}
-				<MenuItem
-					onClick={(e) => item?.action?.(e)}
-					href={item?.href}
-					target={item?.hrefTarget}
-					disabled={item?.disabled}
-					class={twMerge(
-						'px-4 py-2 text-primary font-normal hover:bg-surface-hover cursor-pointer text-xs transition-colors w-full',
-						'data-[highlighted]:bg-surface-hover',
-						'flex flex-row gap-2 items-center rounded-sm',
-						item?.disabled && 'text-disabled cursor-not-allowed',
-						item?.type === 'delete' &&
-							!item?.disabled &&
-							'text-red-600 dark:text-red-400 data-[highlighted]:bg-red-500/10 dark:data-[highlighted]:bg-red-900/80 dark:data-[highlighted]:text-red-300 '
-					)}
-					item={meltItem}
-					aiId={`${aiId ? `${aiId}-${item.displayName}` : undefined}`}
-					aiDescription={item.displayName}
-				>
-					{#if item.icon}
-						<item.icon size={14} color={item.iconColor} class="shrink-0" />
-					{/if}
-					<p title={item.displayName} class="truncate grow min-w-0 whitespace-nowrap text-left">
-						{item.displayName}
-					</p>
-					{@render item.extra?.()}
-					{#if item.shortcut || item.selected}
-						<!-- Single trailing group so `shortcut` and `selected` can coexist:
-						     two `ml-auto` siblings would collapse to one right-aligned item. -->
-						<div class="ml-auto flex shrink-0 items-center gap-2">
-							{#if item.shortcut}
-								<span class="pl-4 text-2xs text-secondary">{item.shortcut}</span>
-							{/if}
-							{#if item.selected}
-								<Check size={14} class="text-primary" />
-							{/if}
-						</div>
-					{/if}
-					{#if item.tooltip}
-						<Tooltip>
-							{#snippet text()}
-								{item.tooltip}
-							{/snippet}
-						</Tooltip>
-					{/if}
-				</MenuItem>
+				{@render menuItem(item)}
 			{/if}
 		{/each}
 	</div>
diff --git a/frontend/src/lib/components/DynamicInput.svelte b/frontend/src/lib/components/DynamicInput.svelte
index f4e2ba9c75..9f6f3b8261 100644
--- a/frontend/src/lib/components/DynamicInput.svelte
+++ b/frontend/src/lib/components/DynamicInput.svelte
@@ -33,9 +33,17 @@
 		format: string
 		otherArgs?: Record<string, any>
 		name: string
+		/** Workspace the helper script runs in; defaults to the nav workspace. */
+		workspace?: string
 	}
 
-	let { value = $bindable(), helperScript, format, otherArgs: otherArgs }: Props = $props()
+	let {
+		value = $bindable(),
+		helperScript,
+		format,
+		otherArgs: otherArgs,
+		workspace = undefined
+	}: Props = $props()
 
 	let [inputType, entrypoint] = $derived(format.includes('-') ? format.split('-', 2) : [format, ''])
 
@@ -173,7 +181,7 @@
 </script>
 
 {#if helperScript}
-	<JobLoader onlyResult bind:this={resultJobLoader} />
+	<JobLoader onlyResult workspaceOverride={workspace} bind:this={resultJobLoader} />
 
 	<div class="w-full flex-col flex">
 		{#if inputType === 'dynmultiselect'}
diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index 476869900d..8563190a89 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -43,6 +43,7 @@
 	import { editorFontSize } from '$lib/editorFontSize.svelte'
 	import { createHash as randomHash } from '$lib/editorLangUtils'
 	import { workspaceStore } from '$lib/stores'
+	import DdlMigrationGuard from './DdlMigrationGuard.svelte'
 	import {
 		type Preview,
 		ResourceService,
@@ -87,6 +88,15 @@
 	import { parseTypescriptDeps } from '$lib/relative_imports'
 
 	import { scriptLangToEditorLang } from '$lib/scripts'
+	import {
+		listWorkspaceMacrosCached,
+		macroDefinitionSql
+	} from '$lib/components/assets/workspaceMacros'
+	import {
+		fetchLatestSchema,
+		normalizeAssetPath,
+		type ContractMarker
+	} from '$lib/components/assets/AssetGraph/schemaContracts'
 	import * as htmllang from '$lib/svelteMonarch'
 	import { conf, language } from '$lib/vueMonarch'
 
@@ -158,11 +168,11 @@
 		preparedAssetsSqlQueries?: InferAssetsSqlQueryDetails[] | undefined
 		// To execute preview scripts with the right worker group
 		customTag?: string
-		// Opt-in: reflect external `code` prop mutations back into Monaco (see
-		// the effect below). One-way `code={...}` callers that need live
-		// external updates — e.g. the inline flow rawscript — set this. Off by
-		// default so every other caller's behavior is unchanged.
-		syncExternalCode?: boolean
+		// Live schema-contract diagnostics (pipelines gap #2b): owner-scoped
+		// warning markers computed by the caller (ScriptEditor's contract
+		// mirror) from the buffer's asset refs vs captured producer schemas.
+		// Warning severity only — contracts never block; empty clears.
+		schemaContractMarkers?: ContractMarker[]
 	}
 
 	let {
@@ -196,7 +206,7 @@
 		rawAppRunnableKey = undefined,
 		preparedAssetsSqlQueries,
 		customTag,
-		syncExternalCode = false
+		schemaContractMarkers = []
 	}: Props = $props()
 
 	$effect.pre(() => {
@@ -213,6 +223,35 @@
 
 	let lang = $state(scriptLangToEditorLang(untrack(() => scriptLang)))
 
+	// On a postgres script targeting a datatable, DDL statements are intercepted
+	// on run (cmd+enter) and offered as migrations instead.
+	let datatableForMigrations = $derived(
+		scriptLang === 'postgresql' &&
+			typeof args?.database === 'string' &&
+			args.database.startsWith('datatable://')
+			? args.database.slice('datatable://'.length).split('/')[0]
+			: undefined
+	)
+	let ddlGuard = $state<DdlMigrationGuard | undefined>(undefined)
+
+	// Run the DDL migration guard against the current code. Returns false when the
+	// user cancels (the run must be aborted); may rewrite the code (migrated
+	// statements stripped). Exported so run paths that bypass the Monaco
+	// Cmd+Enter binding (e.g. the Test button) can guard too.
+	export async function guardDdlBeforeRun(): Promise<boolean> {
+		if (datatableForMigrations && ddlGuard) {
+			const res = await ddlGuard.guard(getCode())
+			if (!res.proceed) return false
+			if (res.code !== getCode()) setCode(res.code)
+		}
+		return true
+	}
+
+	async function runCmdEnterWithDdlGuard() {
+		if (!(await guardDdlBeforeRun())) return
+		cmdEnterAction?.()
+	}
+
 	let filePath = $state(computePath(untrack(() => path)))
 
 	let initialPath: string | undefined = $state(untrack(() => path))
@@ -375,23 +414,12 @@
 			code = ncode
 		}
 
-		if (noHistory) {
-			editor?.setValue(ncode)
-		} else {
-			if (editor?.getModel()) {
-				// editor.setValue(ncode)
-				editor.pushUndoStop()
-
-				editor.executeEdits('set', [
-					{
-						range: editor.getModel()!.getFullModelRange(), // full range
-						text: ncode
-					}
-				])
-
-				editor.pushUndoStop()
-			}
-		}
+		// setCode is an authoritative overwrite (reset, AI apply, module switch).
+		// Cancel any in-flight keystroke debounce first: otherwise alignCodeWithEditor
+		// skips on the `timeoutModel` guard (leaving Monaco stale), and the pending
+		// updateCode later reads the old buffer and writes it back over `ncode`.
+		cancelPendingChanges()
+		alignCodeWithEditor(!noHistory)
 		// Dispatch change immediately when code actually changed. This ensures
 		// callers like the Reset button and copilot trigger on:change handlers.
 		// The debounced onDidChangeModelContent handler will no-op since code
@@ -425,6 +453,7 @@
 			return
 		}
 		code = ncode
+		lastEditorCode = ncode
 		dispatch('change', ncode)
 	}
 
@@ -436,12 +465,19 @@
 	 * see it. Clears the chain state so the next keystroke after this
 	 * flush is a fresh leading fire. */
 	export function flushPendingChanges(): void {
+		cancelPendingChanges()
+		updateCode()
+	}
+
+	/** Discard any in-flight keystroke debounce without materializing it, so a
+	 * deferred updateCode can't fire later. Resets chain state to a fresh leading
+	 * fire on the next keystroke. */
+	function cancelPendingChanges(): void {
 		if (timeoutModel !== undefined) {
 			clearTimeout(timeoutModel)
 			timeoutModel = undefined
 		}
 		changeChainStart = undefined
-		updateCode()
 	}
 
 	export function append(code: string): void {
@@ -634,6 +670,100 @@
 		})
 	}
 
+	let workspaceMacroCompletor: IDisposable | undefined = undefined
+
+	// Workspace DuckDB macros (deployed `// macros` libraries): suggest each
+	// macro while typing an identifier, with its signature + body as docs and
+	// a snippet insert that parks the cursor inside the call parens. Fetched
+	// via a short-TTL cache — macros are late-bound, so mild staleness is fine.
+	async function addWorkspaceMacroCompletions() {
+		workspaceMacroCompletor?.dispose()
+		const workspace = $workspaceStore
+		if (!workspace) return
+		let macros: Awaited<ReturnType<typeof listWorkspaceMacrosCached>> = []
+		try {
+			macros = await listWorkspaceMacrosCached(workspace)
+		} catch (e) {
+			console.error('error listing workspace macros', e)
+			return
+		}
+		if (macros.length === 0) return
+		workspaceMacroCompletor = languages.registerCompletionItemProvider('sql', {
+			provideCompletionItems: function (model, position) {
+				const word = model.getWordUntilPosition(position)
+				const range = {
+					startLineNumber: position.lineNumber,
+					endLineNumber: position.lineNumber,
+					startColumn: word.startColumn,
+					endColumn: word.endColumn
+				}
+				const suggestions = macros.map((m) => ({
+					label: `${m.name}(${m.params})`,
+					kind: m.is_table
+						? languages.CompletionItemKind.Interface
+						: languages.CompletionItemKind.Function,
+					detail: `${m.is_table ? 'table macro' : 'macro'} · ${m.provider_path}`,
+					documentation: {
+						value: '```sql\n' + macroDefinitionSql(m) + '\n```'
+					},
+					insertText: `${m.name}($0)`,
+					insertTextRules: languages.CompletionItemInsertTextRule.InsertAsSnippet,
+					filterText: m.name,
+					range,
+					sortText: 'b' + m.name
+				}))
+				return { suggestions }
+			}
+		})
+	}
+
+	let schemaContractCompletor: IDisposable | undefined = undefined
+
+	// Column-name completion for pipeline annotation refs (`// column out <-
+	// ducklake://lake/orders.|`, `// data_test relationships col ->
+	// ducklake://lake/customers.|`): suggests the referenced asset's *captured*
+	// columns (with types) so a broken ref never gets typed — the prevention
+	// side of the schema-contract check. Only fires on annotation comment lines
+	// with a ducklake URI right before the cursor's `.`; schemas come from the
+	// short-TTL contract cache, so per-keystroke cost is a map lookup.
+	function addSchemaContractCompletions() {
+		schemaContractCompletor?.dispose()
+		schemaContractCompletor = languages.registerCompletionItemProvider(lang, {
+			triggerCharacters: ['.'],
+			provideCompletionItems: async function (model, position) {
+				// Read the store per request, not at registration — the provider
+				// outlives a workspace switch.
+				const workspace = $workspaceStore
+				if (!workspace) return { suggestions: [] }
+				const before = model.getLineContent(position.lineNumber).slice(0, position.column - 1)
+				if (!/^\s*(\/\/|--|#)\s*(column|data_test|on|materialize)\b/.test(before)) {
+					return { suggestions: [] }
+				}
+				const uri = before.match(/ducklake:\/\/([\w/.{}-]+?)\.$/)
+				if (!uri) return { suggestions: [] }
+				const schema = await fetchLatestSchema(workspace, normalizeAssetPath(uri[1]))
+				if (!schema) return { suggestions: [] }
+				const word = model.getWordUntilPosition(position)
+				const range = {
+					startLineNumber: position.lineNumber,
+					endLineNumber: position.lineNumber,
+					startColumn: word.startColumn,
+					endColumn: word.endColumn
+				}
+				return {
+					suggestions: schema.columns.map((c) => ({
+						label: c.name,
+						kind: languages.CompletionItemKind.Field,
+						detail: `${c.type} · captured schema v${schema.version}`,
+						insertText: c.name,
+						range,
+						sortText: 'a' + c.name
+					}))
+				}
+			}
+		})
+	}
+
 	let sqlSchemaCompletor: IDisposable | undefined = undefined
 
 	async function updateSchema(newSchemaRes: string | undefined) {
@@ -1539,7 +1669,8 @@
 
 			editor?.addCommand(KeyMod.CtrlCmd | KeyCode.Enter, function () {
 				updateCode()
-				shouldBindKey && cmdEnterAction && cmdEnterAction()
+				if (!shouldBindKey || !cmdEnterAction) return
+				void runCmdEnterWithDdlGuard()
 			})
 
 			editor?.addCommand(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Digit7, function () {
@@ -1842,6 +1973,8 @@
 		autocompletor && autocompletor.dispose()
 		sqlTypeCompletor && sqlTypeCompletor.dispose()
 		resultCollectionCompletor && resultCollectionCompletor.dispose()
+		workspaceMacroCompletor && workspaceMacroCompletor.dispose()
+		schemaContractCompletor && schemaContractCompletor.dispose()
 		preprocessorCompletor && preprocessorCompletor.dispose()
 		timeoutModel && clearTimeout(timeoutModel)
 		changeChainStart = undefined
@@ -1901,29 +2034,6 @@
 		lang = scriptLangToEditorLang(scriptLang)
 	})
 
-	// Opt-in (syncExternalCode): reflect external `code` prop mutations into
-	// Monaco's model. Parents that pass `code={...}` one-way (no bind) — e.g.
-	// the inline rawscript in the flow editor — otherwise mutate the prop
-	// without Monaco ever showing the change (the AI chat editing a flow
-	// module's content in a session is the motivating case). Gated off by
-	// default: Editor is sensitive and most callers either bind:code (and
-	// carry their own external-sync) or treat code as init-only, so a blanket
-	// setValue would risk clobbering them. The `getValue() !== code` guard
-	// keeps the caret intact when the change originated from typing inside
-	// Monaco (which round-trips code back via `$bindable`, re-firing this
-	// effect with `code === getValue()`).
-	let lastExternalCodeSync = code
-	$effect(() => {
-		if (!syncExternalCode) return
-		if (code === lastExternalCodeSync) return
-		lastExternalCodeSync = code
-		if (!editor) return
-		untrack(() => {
-			if (editor!.getValue() !== code) {
-				editor!.setValue(code ?? '')
-			}
-		})
-	})
 	$effect(() => {
 		filePath = computePath(path)
 	})
@@ -1940,6 +2050,44 @@
 			: (sqlTypeCompletor?.dispose(), resultCollectionCompletor?.dispose())
 	})
 
+	$effect(() => {
+		initialized && lang === 'sql' && scriptLang === 'duckdb'
+			? untrack(() => {
+					addWorkspaceMacroCompletions()
+				})
+			: workspaceMacroCompletor?.dispose()
+	})
+
+	// Pipeline annotation grammar is language-agnostic (`//` / `--` / `#`
+	// comment headers), so contract-ref completions register for every script
+	// language that can be a pipeline member. The provider line-gates itself,
+	// so it is inert outside annotation lines.
+	$effect(() => {
+		initialized && ['duckdb', 'python3', 'bun', 'deno', 'nativets'].includes(scriptLang ?? '')
+			? untrack(() => addSchemaContractCompletions())
+			: schemaContractCompletor?.dispose()
+	})
+
+	// Schema-contract markers arrive as a prop because the mirror can finish
+	// computing before Monaco initializes on mount — reacting to `initialized`
+	// re-applies the pending set once the model exists. The ever-set latch
+	// keeps unrelated editors from calling setModelMarkers with [] forever.
+	let contractMarkersEverSet = false
+	$effect(() => {
+		const ms = schemaContractMarkers
+		if (!initialized || (ms.length === 0 && !contractMarkersEverSet)) return
+		contractMarkersEverSet = true
+		untrack(() => {
+			const model = editor?.getModel()
+			if (!model) return
+			meditor.setModelMarkers(
+				model,
+				'schema-contracts',
+				ms.map((m) => ({ ...m, severity: MarkerSeverity.Warning }))
+			)
+		})
+	})
+
 	$effect(() => {
 		initialized && canHavePreprocessor(lang) && enablePreprocessorSnippet
 			? untrack(() => addPreprocessorCompletions(lang))
@@ -2011,25 +2159,50 @@
 		})
 	})
 
-	// External `code` prop changes should flow into the Monaco editor. The
-	// `untrack` block reads/writes Monaco without subscribing — only the
-	// prop read above is tracked — so the editor's own change handler
-	// (`updateCode`) re-running with the same value short-circuits and we
-	// don't loop.
-	$effect(() => {
-		const next = code ?? ''
+	let applyExternalCode = useDebounce(() => alignCodeWithEditor(true), 800)
+
+	// Last `code` value the editor itself produced or aligned to. Used to tell an
+	// echo (the bindable changed because the user typed — Monaco is already
+	// ahead) from a genuine external write. Without this, a typing burst longer
+	// than the debounce window would sync the lagging `code` back over newer
+	// keystrokes. Must be kept in step with every editor↔`code` sync point.
+	let lastEditorCode = code
+
+	function alignCodeWithEditor(history: boolean) {
 		const ed = editor
 		if (!ed) return
-		untrack(() => {
-			if (ed.getValue() === next) return
-			const model = ed.getModel()
-			if (!model) return
+		const next = code ?? ''
+		const value = ed.getValue()
+		const model = ed.getModel()
+		// Some keystrokes are still being debounced, don't overwrite them.
+		// When the debounce is done, updateCode will be called and the code will be aligned with the editor.
+		if (timeoutModel !== undefined) return
+		if (!model) return
+		lastEditorCode = next
+		if (value === next) return
+		if (history) {
 			ed.pushUndoStop()
 			ed.executeEdits('external', [{ range: model.getFullModelRange(), text: next }])
 			ed.pushUndoStop()
+		} else {
+			ed.setValue(next)
+		}
+	}
+
+	// External `code` prop changes should flow into the Monaco editor. Skip
+	// echoes: when `code` matches what the editor last produced (`updateCode`)
+	// or aligned to, the change came from the editor itself, so syncing back
+	// would clobber input typed since. Only genuine external writes — where
+	// `code` diverges from `lastEditorCode` — schedule a sync. The `untrack`
+	// block reads/writes Monaco without subscribing, so we don't loop.
+	$effect(() => {
+		;[code, editor]
+		if (!editor) return
+		untrack(() => {
+			if (code === lastEditorCode) return
+			applyExternalCode()
 		})
 	})
-
 	let isTsWorkerInitialized = resource([() => lang, () => initialized], async () => {
 		if (lang !== 'typescript' || !initialized) return false
 		// Use the stable model URI (computed once at mount), not filePath which changes on rename
@@ -2067,6 +2240,13 @@
 
 <svelte:window onkeydown={onKeyDown} />
 <EditorTheme />
+{#if datatableForMigrations && $workspaceStore}
+	<DdlMigrationGuard
+		bind:this={ddlGuard}
+		workspace={$workspaceStore}
+		datatable={datatableForMigrations}
+	/>
+{/if}
 {#if !editor}
 	<div class="inset-0 absolute overflow-clip">
 		<FakeMonacoPlaceHolder {code} lineNumbersWidth={51} />
diff --git a/frontend/src/lib/components/EditorBar.svelte b/frontend/src/lib/components/EditorBar.svelte
index f5062bc008..1e6a29388f 100644
--- a/frontend/src/lib/components/EditorBar.svelte
+++ b/frontend/src/lib/components/EditorBar.svelte
@@ -117,6 +117,10 @@
 		right?: import('svelte').Snippet
 		openAiChat?: boolean
 		moduleId?: string
+		// Workspace to scope variable/resource/data-table lookups to. Defaults to
+		// the nav `$workspaceStore`; an AI-session live editor passes the session's
+		// acting workspace (a fork) so the helper pickers hit the right workspace.
+		workspace?: string
 	}
 
 	let {
@@ -141,9 +145,12 @@
 		showHistoryDrawer = $bindable(false),
 		right,
 		openAiChat = false,
-		moduleId = undefined
+		moduleId = undefined,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let contextualVariablePicker: ItemPicker | undefined = $state()
 	let variablePicker: ItemPicker | undefined = $state()
 	let resourcePicker: ItemPicker | undefined = $state()
@@ -350,12 +357,12 @@
 	})
 
 	async function loadVariables() {
-		return await VariableService.listVariable({ workspace: $workspaceStore ?? '' })
+		return await VariableService.listVariable({ workspace: ws ?? '' })
 	}
 
 	async function loadContextualVariables() {
 		return await VariableService.listContextualVariables({
-			workspace: $workspaceStore ?? 'NO_W'
+			workspace: ws ?? 'NO_W'
 		})
 	}
 
@@ -366,7 +373,7 @@
 	async function onScriptPick(e: { detail: { path: string } }) {
 		codeObj = undefined
 		codeViewer?.openDrawer?.()
-		codeObj = await getScriptByPath(e.detail.path ?? '')
+		codeObj = await getScriptByPath(e.detail.path ?? '', ws)
 	}
 
 	const dispatch = createEventDispatcher()
@@ -423,7 +430,7 @@
 	async function resourceTypePickCallback(name: string) {
 		if (!editor) return
 		const resourceType = await ResourceService.getResourceType({
-			workspace: $workspaceStore ?? 'NO_W',
+			workspace: ws ?? 'NO_W',
 			path: name
 		})
 
@@ -785,8 +792,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 	buttons={{ 'Edit/View': (x) => resourceEditor?.initEdit(x) }}
 	extraField="description"
 	extraField2="resource_type"
-	loadItems={async () =>
-		await ResourceService.listResource({ workspace: $workspaceStore ?? 'NO_W' })}
+	loadItems={async () => await ResourceService.listResource({ workspace: ws ?? 'NO_W' })}
 >
 	{#snippet submission()}
 		<div class="flex flex-row gap-x-1 mr-2">
@@ -812,12 +818,15 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 		documentationLink="https://www.windmill.dev/docs/core_concepts/resources_and_types"
 		itemName="Resource Type"
 		extraField="name"
-		loadItems={async () =>
-			await ResourceService.listResourceType({ workspace: $workspaceStore ?? 'NO_W' })}
+		loadItems={async () => await ResourceService.listResourceType({ workspace: ws ?? 'NO_W' })}
 	/>
 {/if}
-<ResourceEditorDrawer bind:this={resourceEditor} on:refresh={resourcePicker.openDrawer} />
-<VariableEditor bind:this={variableEditor} on:create={variablePicker.openDrawer} />
+<ResourceEditorDrawer
+	bind:this={resourceEditor}
+	workspace={ws}
+	on:refresh={resourcePicker.openDrawer}
+/>
+<VariableEditor bind:this={variableEditor} workspace={ws} on:create={variablePicker.openDrawer} />
 
 {#if showDucklakePicker}
 	<ItemPicker
@@ -842,9 +851,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 		documentationLink="https://www.windmill.dev/docs/core_concepts/persistent_storage/ducklake"
 		itemName="ducklake"
 		loadItems={async () =>
-			(await WorkspaceService.listDucklakes({ workspace: $workspaceStore ?? 'NO_W' })).map(
-				(path) => ({ path })
-			)}
+			(await WorkspaceService.listDucklakes({ workspace: ws ?? 'NO_W' })).map((path) => ({ path }))}
 	>
 		{#snippet submission()}
 			<div class="flex flex-row gap-x-1 mr-2">
@@ -885,9 +892,9 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 		documentationLink="https://www.windmill.dev/docs/core_concepts/persistent_storage/data_tables"
 		itemName="data table"
 		loadItems={async () =>
-			(await WorkspaceService.listDataTables({ workspace: $workspaceStore ?? 'NO_W' })).map(
-				(d) => ({ path: d.name })
-			)}
+			(await WorkspaceService.listDataTables({ workspace: ws ?? 'NO_W' })).map((d) => ({
+				path: d.name
+			}))}
 	>
 		{#snippet submission()}
 			<div class="flex flex-row gap-x-1 mr-2">
@@ -923,7 +930,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 		extraField2="resource_type"
 		loadItems={async () =>
 			await ResourceService.listResource({
-				workspace: $workspaceStore ?? 'NO_W',
+				workspace: ws ?? 'NO_W',
 				resourceType: 'postgresql,mysql,bigquery'
 			})}
 	></ItemPicker>
diff --git a/frontend/src/lib/components/EditorHeader.svelte b/frontend/src/lib/components/EditorHeader.svelte
index 87a0c6e1da..fdf18b4b50 100644
--- a/frontend/src/lib/components/EditorHeader.svelte
+++ b/frontend/src/lib/components/EditorHeader.svelte
@@ -43,6 +43,14 @@
 		 * inline. Breadcrumb navigation still works — only the rename UI is
 		 * gated. */
 		pathEditable?: boolean
+		/** When true, the whole path/breadcrumb row (and its pen popover) is
+		 * dropped, leaving only the summary. Used by the condensed session-
+		 * preview top bar to save vertical room. */
+		hidePath?: boolean
+		/** Workspace whose items the breadcrumb picker lists. Session live
+		 * editors pass their acting workspace so the picker isn't scoped to the
+		 * navigation workspace; falls back to $workspaceStore in the picker. */
+		workspaceId?: string
 	}
 
 	let {
@@ -55,7 +63,9 @@
 		onBehalfOfEmail,
 		penVisibility = 'hover',
 		summaryEditable = true,
-		pathEditable = true
+		pathEditable = true,
+		hidePath = false,
+		workspaceId
 	}: Props = $props()
 
 	let pathPopoverOpen = $state(false)
@@ -130,106 +140,112 @@
 
 <div class="inline-block max-w-full align-top group px-2 py-0.5 leading-tight">
 	<!-- Path row -->
-	<div class="flex items-center max-w-full text-2xs text-secondary font-mono">
-		<nav aria-label="Breadcrumb" class="contents">
-			<BreadcrumbSegment
-				label={KIND_LABEL_LOWER[kind]}
-				initialScope={undefined}
-				initialHighlight={kindKey(kind)}
-				isCurrent={!segments}
-				{currentItem}
-				onPick={handlePickerSelect}
-			/>
-			{#if segments}
-				{#each segments.dirs as dir, i (dir.fullPath)}
-					{@const dKey = dirKey('all', dir.fullPath)}
-					<BreadcrumbSegment
-						label={dir.name}
-						withChevron
-						extraClass={i === 0 ? 'gap-0.5 min-w-0 max-w-[40%]' : 'gap-0.5 min-w-0'}
-						initialScope={i === 0
-							? { kind: 'all' }
-							: { kind: 'all', dir: segments.dirs[i - 1].fullPath }}
-						initialHighlight={dKey}
-						{currentItem}
-						onPick={handlePickerSelect}
-					/>
-				{/each}
-				{@const leafKey = leafKeyFor(kind, segments.leaf.fullPath)}
-				{@const leafParent = segments.dirs[segments.dirs.length - 1]?.fullPath}
+	{#if !hidePath}
+		<div class="flex items-center max-w-full text-2xs text-secondary font-mono">
+			<nav aria-label="Breadcrumb" class="contents">
 				<BreadcrumbSegment
-					label={segments.leaf.name}
-					withChevron
-					extraClass="gap-0.5 min-w-0"
-					initialScope={leafParent ? { kind: 'all', dir: leafParent } : { kind: 'all' }}
-					initialHighlight={leafKey}
-					isCurrent
+					label={KIND_LABEL_LOWER[kind]}
+					initialScope={undefined}
+					initialHighlight={kindKey(kind)}
+					isCurrent={!segments}
 					{currentItem}
+					{workspaceId}
 					onPick={handlePickerSelect}
 				/>
-			{/if}
-		</nav>
-
-		<!-- Pen → path-edit popover. Skipped entirely when path editing is
-		     disabled so the user doesn't see an inert button. -->
-		{#if pathEditable}
-			<Popover
-				placement="bottom-start"
-				contentClasses="p-4"
-				usePointerDownOutside
-				excludeSelectors=".drawer"
-				disableFocusTrap
-				closeOnOtherPopoverOpen
-				bind:isOpen={() => pathPopoverOpen, setPathPopoverOpen}
-			>
-				{#snippet trigger()}
-					<Button
-						variant="subtle"
-						unifiedSize="xs"
-						iconOnly
-						startIcon={{ icon: Pencil }}
-						title="Edit path"
-						aria-label="Edit path"
-						btnClasses={penVisibility === 'hover' && !pathPopoverOpen
-							? 'opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100'
-							: ''}
+				{#if segments}
+					{#each segments.dirs as dir, i (dir.fullPath)}
+						{@const dKey = dirKey('all', dir.fullPath)}
+						<BreadcrumbSegment
+							label={dir.name}
+							withChevron
+							extraClass={i === 0 ? 'gap-0.5 min-w-0 max-w-[40%]' : 'gap-0.5 min-w-0'}
+							initialScope={i === 0
+								? { kind: 'all' }
+								: { kind: 'all', dir: segments.dirs[i - 1].fullPath }}
+							initialHighlight={dKey}
+							{currentItem}
+							{workspaceId}
+							onPick={handlePickerSelect}
+						/>
+					{/each}
+					{@const leafKey = leafKeyFor(kind, segments.leaf.fullPath)}
+					{@const leafParent = segments.dirs[segments.dirs.length - 1]?.fullPath}
+					<BreadcrumbSegment
+						label={segments.leaf.name}
+						withChevron
+						extraClass="gap-0.5 min-w-0"
+						initialScope={leafParent ? { kind: 'all', dir: leafParent } : { kind: 'all' }}
+						initialHighlight={leafKey}
+						isCurrent
+						{currentItem}
+						{workspaceId}
+						onPick={handlePickerSelect}
 					/>
-				{/snippet}
-				{#snippet content()}
-					<div class="flex flex-col gap-6 w-[480px]">
-						{#if own}
-							<Path
-								autofocus
-								bind:path
-								initialPath={snapshotPath ?? path ?? ''}
-								namePlaceholder={kind}
-								{kind}
-								size="sm"
-								drawerOffset={4000}
-							/>
-							{#if savedPath && path && path !== savedPath}
-								<Alert
-									type="info"
-									size="xs"
-									title="Deploy the {kind} to make the path change effective."
+				{/if}
+			</nav>
+
+			<!-- Pen → path-edit popover. Skipped entirely when path editing is
+		     disabled so the user doesn't see an inert button. -->
+			{#if pathEditable}
+				<Popover
+					placement="bottom-start"
+					contentClasses="p-4"
+					usePointerDownOutside
+					excludeSelectors=".drawer"
+					disableFocusTrap
+					closeOnOtherPopoverOpen
+					bind:isOpen={() => pathPopoverOpen, setPathPopoverOpen}
+				>
+					{#snippet trigger()}
+						<Button
+							variant="subtle"
+							unifiedSize="xs"
+							iconOnly
+							startIcon={{ icon: Pencil }}
+							title="Edit path"
+							aria-label="Edit path"
+							btnClasses={penVisibility === 'hover' && !pathPopoverOpen
+								? 'opacity-0 transition-opacity group-hover:opacity-100 focus-visible:opacity-100'
+								: ''}
+						/>
+					{/snippet}
+					{#snippet content()}
+						<div class="flex flex-col gap-6 w-[480px]">
+							{#if own}
+								<Path
+									autofocus
+									bind:path
+									initialPath={snapshotPath ?? path ?? ''}
+									namePlaceholder={kind}
+									{kind}
+									size="sm"
+									drawerOffset={4000}
+									workspaceOverride={workspaceId}
 								/>
+								{#if savedPath && path && path !== savedPath}
+									<Alert
+										type="info"
+										size="xs"
+										title="Deploy the {kind} to make the path change effective."
+									/>
+								{/if}
+								{#if onBehalfOfEmail}
+									<Alert type="info" title="Run on behalf of" size="xs">
+										This flow will be redeployed on behalf of you ({$userStore?.email}) instead of {onBehalfOfEmail}
+									</Alert>
+								{/if}
+							{:else}
+								<Label label="Path">
+									<span class="text-xs font-mono text-secondary">{path}</span>
+									<p class="text-2xs text-tertiary mt-1">Only the owner can change the path</p>
+								</Label>
 							{/if}
-							{#if onBehalfOfEmail}
-								<Alert type="info" title="Run on behalf of" size="xs">
-									This flow will be redeployed on behalf of you ({$userStore?.email}) instead of {onBehalfOfEmail}
-								</Alert>
-							{/if}
-						{:else}
-							<Label label="Path">
-								<span class="text-xs font-mono text-secondary">{path}</span>
-								<p class="text-2xs text-tertiary mt-1">Only the owner can change the path</p>
-							</Label>
-						{/if}
-					</div>
-				{/snippet}
-			</Popover>
-		{/if}
-	</div>
+						</div>
+					{/snippet}
+				</Popover>
+			{/if}
+		</div>
+	{/if}
 
 	<!-- Summary -->
 	<div class="max-w-full -mt-[2px]" title={summary}>
diff --git a/frontend/src/lib/components/ExploreAssetButton.svelte b/frontend/src/lib/components/ExploreAssetButton.svelte
index 4b67fd3abc..45d378fd86 100644
--- a/frontend/src/lib/components/ExploreAssetButton.svelte
+++ b/frontend/src/lib/components/ExploreAssetButton.svelte
@@ -33,7 +33,8 @@
 		noText = false,
 		buttonVariant = 'default',
 		btnClasses = '',
-		disabled = false
+		disabled = false,
+		workspace = undefined
 	}: {
 		asset: Asset
 		_resourceMetadata?: { resource_type?: string }
@@ -44,9 +45,12 @@
 		buttonVariant?: ButtonType.Variant
 		btnClasses?: string
 		disabled?: boolean
+		/** Workspace the explored asset lives in; defaults to the nav workspace. */
+		workspace?: string
 	} = $props()
 
 	let dbManagerDrawer = $derived(globalDbManagerDrawer.val)
+	let ws = $derived(workspace ?? $workspaceStore)
 	const assetUri = $derived(formatAsset(asset))
 </script>
 
@@ -60,18 +64,20 @@
 	on:click={async () => {
 		if (asset.kind === 'resource' && isDbType(_resourceMetadata?.resource_type)) {
 			let [resourcePath, specificTable] = asset.path.split('?table=')
-			dbManagerDrawer?.openDrawer({
-				type: 'database',
-				resourceType: _resourceMetadata.resource_type,
-				resourcePath,
-				specificTable
-			})
+			dbManagerDrawer?.openDrawer(
+				{
+					type: 'database',
+					resourceType: _resourceMetadata.resource_type,
+					resourcePath,
+					specificTable
+				},
+				ws
+			)
 		} else if (asset.kind === 's3object' && isS3Uri(assetUri)) {
 			s3FilePicker?.open(assetUri)
 		} else if (asset.kind === 'volume') {
-			const storage =
-				(await VolumeService.getVolumeStorage({ workspace: $workspaceStore! })) ?? undefined
-			s3FilePicker?.open({ s3: `volumes/${$workspaceStore}/${asset.path}/`, storage })
+			const storage = (await VolumeService.getVolumeStorage({ workspace: ws! })) ?? undefined
+			s3FilePicker?.open({ s3: `volumes/${ws}/${asset.path}/`, storage })
 		} else if (asset.kind === 'ducklake') {
 			let ducklake = asset.path.split('/')[0]
 			let specificTableSplit = asset.path.split('/')[1]?.split('.') as string[] | undefined
@@ -79,7 +85,7 @@
 				specificTableSplit?.length === 2
 					? [specificTableSplit[0], specificTableSplit[1]]
 					: [undefined, specificTableSplit?.[0]]
-			dbManagerDrawer?.openDrawer({ type: 'ducklake', ducklake, specificSchema, specificTable })
+			dbManagerDrawer?.openDrawer({ type: 'ducklake', ducklake, specificSchema, specificTable }, ws)
 		} else if (asset.kind === 'datatable') {
 			let datatable = asset.path.split('/')[0]
 			let specificTableSplit = asset.path.split('/')[1]?.split('.') as string[] | undefined
@@ -87,13 +93,16 @@
 				specificTableSplit?.length === 2
 					? [specificTableSplit[0], specificTableSplit[1]]
 					: [undefined, specificTableSplit?.[0]]
-			dbManagerDrawer?.openDrawer({
-				type: 'database',
-				resourceType: 'postgresql',
-				resourcePath: `datatable://${datatable}`,
-				specificTable,
-				specificSchema
-			})
+			dbManagerDrawer?.openDrawer(
+				{
+					type: 'database',
+					resourceType: 'postgresql',
+					resourcePath: `datatable://${datatable}`,
+					specificTable,
+					specificSchema
+				},
+				ws
+			)
 		}
 		onClick?.()
 	}}
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 4ba68d6586..b6a5c6611f 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -10,7 +10,13 @@
 		type Job
 	} from '$lib/gen'
 	import { initHistory, redo, undo } from '$lib/history.svelte'
-	import { enterpriseLicense, userStore, workspaceStore, usedTriggerKinds } from '$lib/stores'
+	import {
+		enterpriseLicense,
+		userStore,
+		userWorkspaces,
+		workspaceStore,
+		usedTriggerKinds
+	} from '$lib/stores'
 	import {
 		generateRandomString,
 		orderedJsonStringify,
@@ -92,8 +98,7 @@
 	import type { FlowBuilderProps } from './flow_builder'
 	import { ModulesTestStates } from './modulesTest.svelte'
 	import FlowAssetsHandler, { initFlowGraphAssetsCtx } from './flows/FlowAssetsHandler.svelte'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 	import { UserDraft } from '$lib/userDraft.svelte'
 
@@ -113,6 +118,7 @@
 		disabledFlowInputs = false,
 		savedPrimarySchedule = undefined,
 		version = undefined,
+		draftBaseVersion = undefined,
 		draftTriggersFromUrl = undefined,
 		selectedTriggerIndexFromUrl = undefined,
 		children,
@@ -130,13 +136,21 @@
 		loadedFromDraft = false,
 		othersDraftsCount = 0,
 		onOpenOthersDrafts,
-		onTestJob
+		onTestJob,
+		condensedHeader = false
 	}: FlowBuilderProps = $props()
 
-	// Key the AutosaveIndicator watches. Falls back to this component's own
-	// draft key, so the full-page editor is unchanged; the sessions preview
-	// overrides both to the (forked) workspace + path its autosave saves under.
-	const indicatorWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
+	// Top-bar button size + bar height. Condensed (session preview) uses the
+	// smallest well-supported unified size (`sm`) so the bar is thinner.
+	const headerBtnSize = $derived(condensedHeader ? 'sm' : 'md')
+
+	// The workspace this editor operates on: deploy, save-draft, trigger loading
+	// and the AutosaveIndicator all target it. Falls back to the global store, so
+	// the full-page editor is unchanged; the sessions preview overrides it to the
+	// session's (forked) workspace, so an embedded editor acts on the session's
+	// fork rather than the navigation workspace ($workspaceStore, which stays put).
+	// indicatorPath is the matching draft path.
+	const opWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
 	const indicatorPath = $derived(autosavePath ?? liveEditorDraftStoragePath)
 
 	let initialPathStore = writable(initialPath)
@@ -220,17 +234,22 @@
 	}
 	let onLatest = true
 	async function compareVersions() {
-		if (version === undefined) {
+		// Compare the draft's pinned fork base against the current head when editing
+		// a draft, else the load-time head. This catches both a concurrent deploy
+		// (head moved since open) AND a stale draft reopened after a deploy (head ==
+		// load-time head, but the draft was forked from an older version).
+		const base = draftBaseVersion ?? version
+		if (base === undefined) {
 			return
 		}
 		try {
 			if (initialPath && initialPath != '') {
 				const flowVersion = await FlowService.getFlowLatestVersion({
-					workspace: $workspaceStore!,
+					workspace: opWorkspace!,
 					path: initialPath
 				})
 
-				onLatest = version === flowVersion?.id
+				onLatest = base === flowVersion?.id
 			} else {
 				onLatest = true
 			}
@@ -278,9 +297,9 @@
 	// failure: `flush` never rejects (postSave catches and routes errors
 	// to the failures map), so the success branch fired regardless.
 	export async function saveDraft(): Promise<void> {
-		if (!$workspaceStore || !liveEditorDraftStoragePath) return
+		if (!opWorkspace || !liveEditorDraftStoragePath) return
 		await UserDraftDbSyncer.flush({
-			workspace: $workspaceStore,
+			workspace: opWorkspace,
 			itemKind: 'flow',
 			path: liveEditorDraftStoragePath
 		})
@@ -328,7 +347,7 @@
 	}
 	async function syncWithDeployed() {
 		const flow = await FlowService.getFlowByPath({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: initialPath,
 			withStarredInfo: true
 		})
@@ -385,7 +404,7 @@
 
 			if (newFlow) {
 				await FlowService.createFlow({
-					workspace: $workspaceStore!,
+					workspace: opWorkspace!,
 					requestBody: {
 						path: $pathStore,
 						summary: flow.summary ?? '',
@@ -403,7 +422,7 @@
 					}
 				})
 				await CaptureService.moveCapturesAndConfigs({
-					workspace: $workspaceStore!,
+					workspace: opWorkspace!,
 					path: fakeInitialPath,
 					requestBody: {
 						new_path: $pathStore
@@ -413,7 +432,7 @@
 				if (triggersToDeploy) {
 					await deployTriggers(
 						triggersToDeploy,
-						$workspaceStore,
+						opWorkspace,
 						!!$userStore?.is_admin || !!$userStore?.is_super_admin,
 						usedTriggerKinds,
 						$pathStore,
@@ -424,7 +443,7 @@
 				if (triggersToDeploy) {
 					await deployTriggers(
 						triggersToDeploy,
-						$workspaceStore,
+						opWorkspace,
 						!!$userStore?.is_admin || !!$userStore?.is_super_admin,
 						usedTriggerKinds,
 						initialPath
@@ -432,7 +451,7 @@
 				}
 
 				await FlowService.updateFlow({
-					workspace: $workspaceStore!,
+					workspace: opWorkspace!,
 					path: initialPath,
 					requestBody: {
 						path: $pathStore,
@@ -454,7 +473,7 @@
 
 			// New/updated path now exists server-side — drop the autocomplete
 			// cache so it shows up immediately instead of after the 60s TTL.
-			invalidateWorkspacePaths($workspaceStore!)
+			invalidateWorkspacePaths(opWorkspace!)
 
 			const { draft_triggers: _, ...newSavedFlow } = flowStore.val as OpenFlow & {
 				draft_triggers: Trigger[]
@@ -494,8 +513,8 @@
 	const pathStore = writable<string>(untrack(() => pathStoreInit) ?? initialPath)
 
 	$effect(() => {
-		if (liveEditorDraftStoragePath === undefined || !$workspaceStore) return
-		const workspace = $workspaceStore
+		if (liveEditorDraftStoragePath === undefined || !opWorkspace) return
+		const workspace = opWorkspace
 		UserDraft.setLiveEditorDraft({
 			workspace,
 			itemKind: 'flow',
@@ -550,7 +569,8 @@
 		modulesTestStates,
 		outputPickerOpenFns,
 		preserveOnBehalfOf,
-		savedOnBehalfOfEmail
+		savedOnBehalfOfEmail,
+		opWorkspace: () => opWorkspace
 	})
 
 	// Set up NoteEditor context for note editing capabilities
@@ -595,14 +615,14 @@
 	export async function loadTriggers() {
 		if (initialPath == '') return
 		$triggersCount = await FlowService.getTriggersCountOfFlow({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: initialPath
 		})
 
 		// Initialize triggers using utility function
 		await triggersState.fetchTriggers(
 			triggersCount,
-			$workspaceStore,
+			opWorkspace,
 			initialPath,
 			true,
 			$primaryScheduleStore,
@@ -726,9 +746,13 @@
 			})
 		}
 
-		if (!untrack(() => newFlow) && !isCloudHosted() && !isRuleActive('DisableWorkspaceForking')) {
+		if (
+			!untrack(() => newFlow) &&
+			!isCloudHosted() &&
+			editInForkAllowed(opWorkspace, $userWorkspaces)
+		) {
 			dropdownItems.push({
-				label: 'Edit in workspace fork',
+				label: editInForkLabel(opWorkspace, $userWorkspaces),
 				onClick: () => window.open(buildForkEditUrl('flow', initialPath))
 			})
 		}
@@ -965,7 +989,7 @@
 		selectedId && untrack(() => select(selectedId))
 	})
 	$effect.pre(() => {
-		initialPath && initialPath != '' && $workspaceStore && untrack(() => loadTriggers())
+		initialPath && initialPath != '' && opWorkspace && untrack(() => loadTriggers())
 	})
 	$effect.pre(() => {
 		const hasAiDiff = aiChatManager.flowAiChatHelpers?.hasPendingChanges() ?? false
@@ -976,7 +1000,7 @@
 		await stepHistoryLoader.loadIndividualStepsStates(
 			flowStore.val as Flow,
 			flowStateStore,
-			$workspaceStore!,
+			opWorkspace!,
 			$initialPathStore,
 			$pathStore
 		)
@@ -1078,23 +1102,29 @@
 		<ScriptEditorDrawer bind:this={$scriptEditorDrawer} />
 		<FlowEditorDrawer bind:this={$flowEditorDrawer} />
 
-		<div bind:this={flowBuilderRoot} class="flex flex-col h-screen">
+		<div bind:this={flowBuilderRoot} class="flex flex-col h-full">
 			<!-- Nav between steps-->
 			<div
 				bind:clientWidth={topbarWidth}
-				class="justify-between flex flex-row items-center pl-2 pr-4 space-x-4 scrollbar-hidden overflow-x-auto max-h-12 h-full relative"
+				class="justify-between flex flex-row items-center pl-2 pr-4 space-x-4 scrollbar-hidden overflow-x-auto h-full relative {condensedHeader
+					? 'max-h-9'
+					: 'max-h-12'}"
 			>
-				<div class="flex flex-row items-center gap-2 min-w-[200px] max-w-full">
-					<EditorHeader
-						bind:summary={flowStore.val.summary}
-						bind:path={$pathStore}
-						savedPath={initialPath}
-						onBehalfOfEmail={$savedOnBehalfOfEmail}
-						onNavigate={(item) => onNavigate?.(item)}
-					/>
-					{#if indicatorWorkspace && indicatorPath !== undefined}
+				<div class="flex flex-row items-center gap-2 min-w-0">
+					<div class="min-w-0 overflow-hidden">
+						<EditorHeader
+							bind:summary={flowStore.val.summary}
+							bind:path={$pathStore}
+							savedPath={initialPath}
+							onBehalfOfEmail={$savedOnBehalfOfEmail}
+							hidePath={condensedHeader}
+							workspaceId={autosaveWorkspace}
+							onNavigate={(item) => onNavigate?.(item)}
+						/>
+					</div>
+					{#if opWorkspace && indicatorPath !== undefined}
 						<AutosaveIndicator
-							workspace={indicatorWorkspace}
+							workspace={opWorkspace}
 							itemKind="flow"
 							path={indicatorPath}
 							draftOnly={newFlow}
@@ -1105,12 +1135,12 @@
 						/>
 					{/if}
 				</div>
-				<div class="flex flex-row gap-2 items-center">
+				<div class="flex flex-row gap-2 items-center shrink-0">
 					{#if $enterpriseLicense && !newFlow}
 						<Awareness />
 					{/if}
 					<div class="relative">
-						<Dropdown items={getMoreItems} />
+						<Dropdown items={getMoreItems} size={headerBtnSize} fixedHeight={!condensedHeader} />
 						{#if $tutorialsToDo.includes(getTutorialIndex('flow-live-tutorial')) || $tutorialsToDo.includes(getTutorialIndex('troubleshoot-flow'))}
 							<span
 								class="absolute top-0.5 right-0.5 block w-2 h-2 rounded-full bg-surface-accent-primary pointer-events-none"
@@ -1130,7 +1160,7 @@
 						<div title={diffTitle} class={diffDisabled ? 'flex cursor-not-allowed' : 'flex'}>
 							<Button
 								variant="default"
-								unifiedSize="md"
+								unifiedSize={headerBtnSize}
 								on:click={() => openDiffDrawer()}
 								disabled={diffDisabled}
 								btnClasses={diffDisabled ? 'pointer-events-none' : undefined}
@@ -1150,6 +1180,7 @@
 						on:save={async ({ detail }) => await handleSaveFlow(detail)}
 						{loading}
 						{loadingSave}
+						unifiedSize={headerBtnSize}
 						{dropdownItems}
 					/>
 				</div>
@@ -1160,6 +1191,7 @@
 			{#snippet previewButtons()}
 				<FlowPreviewButtons
 					{suspendStatus}
+					unifiedSize={headerBtnSize}
 					on:openTriggers={(e) => {
 						select('Trigger')
 						handleSelectTriggerFromKind(triggersState, triggersCount, initialPath, e.detail.kind)
@@ -1225,6 +1257,16 @@
 					aiChatOpen={aiChatManager.open}
 					showFlowAiButton={!disableAi && customUi?.topBar?.aiBuilder != false}
 					toggleAiChat={() => aiChatManager.toggleOpen()}
+					sessionOpen={$pathStore
+						? {
+								target: { kind: 'flow', path: $pathStore },
+								workspaceId: opWorkspace ?? undefined,
+								// Persist unsaved edits so the session preview
+								// (/flows/edit/<path>) opens the flow exactly as it is in the
+								// editor right now.
+								beforeOpen: saveDraft
+							}
+						: undefined}
 					onOpenPreview={flowPreviewButtons?.openPreview}
 					localModuleStates={showJobStatus ? localModuleStates : {}}
 					{showJobStatus}
diff --git a/frontend/src/lib/components/FlowDiffViewer.svelte b/frontend/src/lib/components/FlowDiffViewer.svelte
index 3539cbc5fe..56a15687a8 100644
--- a/frontend/src/lib/components/FlowDiffViewer.svelte
+++ b/frontend/src/lib/components/FlowDiffViewer.svelte
@@ -10,6 +10,8 @@
 		 * FlowGraphDiffViewer show its own user-facing toggle (matches the
 		 * pre-fork-diff-drawer behavior). */
 		inlineDiff?: boolean
+		/** Forward Monaco's auto-inline opt-out to the YAML-mode DiffEditor. */
+		disableAutoInline?: boolean
 		/** Forwarded to FlowGraphDiffViewer — render an empty surface
 		 * placeholder for the "before" / "after" pane when the item is
 		 * added / removed. */
@@ -21,6 +23,7 @@
 		beforeYaml,
 		afterYaml,
 		inlineDiff = undefined,
+		disableAutoInline = false,
 		beforeMissing = false,
 		afterMissing = false
 	}: Props = $props()
@@ -46,6 +49,7 @@
 					defaultOriginal={beforeYaml}
 					defaultModified={afterYaml}
 					{inlineDiff}
+					{disableAutoInline}
 					readOnly
 				/>
 			{/await}
diff --git a/frontend/src/lib/components/FlowLoopIterationPreview.svelte b/frontend/src/lib/components/FlowLoopIterationPreview.svelte
index f92072b5fd..b4dde43289 100644
--- a/frontend/src/lib/components/FlowLoopIterationPreview.svelte
+++ b/frontend/src/lib/components/FlowLoopIterationPreview.svelte
@@ -73,7 +73,8 @@
 		runPreview(previewArgs, undefined)
 	}
 
-	const { flowStateStore, pathStore } = getContext<FlowEditorContext>('FlowEditorContext')
+	const { flowStateStore, pathStore, opWorkspace } =
+		getContext<FlowEditorContext>('FlowEditorContext')
 	const dispatch = createEventDispatcher()
 
 	export async function runPreview(
@@ -82,7 +83,15 @@
 	) {
 		progressBar?.reset()
 		const newFlow = { value: { modules }, summary: '' }
-		jobId = await runFlowPreview(args, newFlow, $pathStore, restartedFrom)
+		jobId = await runFlowPreview(
+			args,
+			newFlow,
+			$pathStore,
+			restartedFrom,
+			undefined,
+			undefined,
+			opWorkspace?.()
+		)
 		isRunning = true
 	}
 
@@ -130,7 +139,7 @@
 					try {
 						jobId &&
 							(await JobService.cancelQueuedJob({
-								workspace: $workspaceStore ?? '',
+								workspace: opWorkspace?.() ?? $workspaceStore ?? '',
 								id: jobId,
 								requestBody: {}
 							}))
@@ -177,6 +186,7 @@
 			{#if jobId}
 				<FlowStatusViewer
 					bind:flowState={flowStateStore.val}
+					workspaceId={opWorkspace?.()}
 					{jobId}
 					onJobsLoaded={({ job: newJob }) => {
 						job = newJob
diff --git a/frontend/src/lib/components/FlowPreviewContent.svelte b/frontend/src/lib/components/FlowPreviewContent.svelte
index bf06628cc0..dd359fb006 100644
--- a/frontend/src/lib/components/FlowPreviewContent.svelte
+++ b/frontend/src/lib/components/FlowPreviewContent.svelte
@@ -133,8 +133,11 @@
 		fakeInitialPath,
 		customUi,
 		executionCount,
-		devTempScriptRefs
+		devTempScriptRefs,
+		opWorkspace
 	} = $state(getContext<FlowEditorContext>('FlowEditorContext'))
+	// Acting workspace when previewing inside an AI session; else the nav workspace.
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
 	const dispatch = createEventDispatcher()
 
 	let renderCount: number = $state(0)
@@ -193,14 +196,15 @@
 			lastPreviewFlow = JSON.stringify(flowStore.val)
 			flowProgressBar?.reset()
 			const newFlow = extractFlow(previewMode)
-			args = await processSecretArgs(args, flowStore.val.schema as any)
+			args = await processSecretArgs(args, flowStore.val.schema as any, opWs)
 			newJobId = await runFlowPreview(
 				args,
 				newFlow,
 				$pathStore,
 				restartedFrom,
 				conversationId,
-				devTempScriptRefs?.()
+				devTempScriptRefs?.(),
+				opWorkspace?.()
 			)
 			jobId = newJobId
 			isRunning = true
@@ -286,7 +290,7 @@
 			subJobIds.map(async (subId) => {
 				try {
 					const subJob = await JobService.getJob({
-						workspace: $workspaceStore!,
+						workspace: opWs!,
 						id: subId
 					})
 					flowRecording.addCompletedJob(subId, subJob)
@@ -332,11 +336,11 @@
 			untrack(() => {
 				for (const mod of modules) {
 					if (mod.job) {
-						flowRecording.watchSubJob(mod.job, $workspaceStore!)
+						flowRecording.watchSubJob(mod.job, opWs!)
 					}
 				}
 				if (job?.flow_status?.failure_module?.job) {
-					flowRecording.watchSubJob(job.flow_status.failure_module.job, $workspaceStore!)
+					flowRecording.watchSubJob(job.flow_status.failure_module.job, opWs!)
 				}
 			})
 		}
@@ -347,7 +351,7 @@
 		try {
 			jobId &&
 				(await JobService.cancelQueuedJob({
-					workspace: $workspaceStore ?? '',
+					workspace: opWs ?? '',
 					id: jobId,
 					requestBody: {}
 				}))
@@ -514,6 +518,7 @@
 						runnableId={$initialPathStore}
 						stablePathForCaptures={$initialPathStore || fakeInitialPath}
 						runnableType={'FlowPath'}
+						workspace={opWs}
 						previewArgs={previewArgs.val}
 						on:openTriggers
 						on:select={(e) => {
@@ -562,6 +567,7 @@
 									<SchemaForm
 										noVariablePicker
 										compact
+										workspace={opWs}
 										schema={flowStore.val.schema}
 										bind:args={previewArgs.val}
 										on:change={() => {
@@ -632,7 +638,7 @@
 				<div class="w-full my-6">
 					<FlowExecutionStatus
 						{job}
-						workspaceId={$workspaceStore}
+						workspaceId={opWs}
 						{isOwner}
 						innerModules={job?.flow_status?.modules}
 						{suspendStatus}
@@ -665,6 +671,7 @@
 					hideDownloadInGraph={customUi?.downloadLogs === false}
 					wideResults
 					bind:flowState={flowStateStore.val}
+					workspaceId={opWs}
 					{jobId}
 					onDone={async ({ job: completedJob }) => {
 						isRunning = false
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index d0bf66d61b..0bc47e4437 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -413,7 +413,12 @@
 	function updateRecursiveRefresh(jobId: string) {
 		if (jobId) {
 			updateRecursiveRefreshFn?.(jobId, async (clear, root) => {
-				if (globalModuleStates.length > 0 || isSubflow) {
+				// During a clear pass we must descend into children even when this
+				// subtree is currently deselected (globalModuleStates empty): clearing
+				// the parent loop's selection deselects its iteration viewers before the
+				// recursion reaches them, and their stale branch-step states would leak
+				// into the newly selected iteration otherwise.
+				if (clear || globalModuleStates.length > 0 || isSubflow) {
 					await refresh(clear, root)
 				}
 			})
@@ -1175,15 +1180,25 @@
 	export type FlowModuleForTimeline = {
 		id: string
 		type: FlowModuleValue['type']
+		suspend?: boolean
 	}
 
 	function allModulesForTimeline(
 		modules: FlowModule[],
 		expandedSubflows: Record<string, { modules: FlowModule[]; groups?: any[] }>
 	): FlowModuleForTimeline[] {
-		const ids = dfs(modules, (x) => ({ id: x.id, type: x.value.type }) as FlowModuleForTimeline, {
-			skipToolNodes: true
-		})
+		const ids = dfs(
+			modules,
+			(x) =>
+				({
+					id: x.id,
+					type: x.value.type,
+					suspend: x.suspend != undefined
+				}) as FlowModuleForTimeline,
+			{
+				skipToolNodes: true
+			}
+		)
 
 		function rec(
 			ids: FlowModuleForTimeline[],
@@ -1203,7 +1218,8 @@
 									fms,
 									(x) => ({
 										id: x.id.startsWith('subflow:') ? x.id : buildSubflowKey(x.id, nprefix),
-										type: x.value.type
+										type: x.value.type,
+										suspend: x.suspend != undefined
 									}),
 									{ skipToolNodes: true }
 								),
diff --git a/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte b/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte
index 1b219153da..0b311ebe60 100644
--- a/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte
+++ b/frontend/src/lib/components/FlowStatusWaitingForEvents.svelte
@@ -16,9 +16,12 @@
 		workspaceId: string | undefined
 		job: Job
 		light?: boolean
+		/** Fired after a successful resume/reject, before the next poll observes it —
+		 * lets a host (e.g. the AI chat jobs tray) close its modal optimistically. */
+		onAction?: (approved: boolean) => void
 	}
 
-	let { isOwner: _isOwner, workspaceId, job, light = false }: Props = $props()
+	let { isOwner: _isOwner, workspaceId, job, light = false, onAction }: Props = $props()
 
 	let default_payload: object = $state({})
 	let description: any = $state(undefined)
@@ -71,6 +74,7 @@
 				}
 			})
 			actionTaken = true
+			onAction?.(approve)
 		} catch (e: any) {
 			sendUserToast(e?.body ?? e?.message ?? 'Failed', true)
 		} finally {
diff --git a/frontend/src/lib/components/FlowTimeline.svelte b/frontend/src/lib/components/FlowTimeline.svelte
index f1610c874a..4ed13c1df1 100644
--- a/frontend/src/lib/components/FlowTimeline.svelte
+++ b/frontend/src/lib/components/FlowTimeline.svelte
@@ -72,6 +72,66 @@
 	}
 
 	const barHeight = 32
+
+	// Whole approval-wait machinery below is inert unless a step actually has a suspend config,
+	// so large suspend-free flows pay nothing for the flatten/sort and the per-tick recompute.
+	const hasSuspendModule = $derived(flowModules.some((m) => m.suspend))
+
+	// Push times of every job on the timeline, ascending. Used to locate when the step
+	// that follows an approval step started — i.e. the moment the approval was granted.
+	const allCreatedAts = $derived(
+		hasSuspendModule
+			? Object.values(items ?? {})
+					.flat()
+					.map((j) => j.created_at)
+					.filter((t): t is number => t != undefined)
+					.sort((a, b) => a - b)
+			: []
+	)
+
+	// Heuristic: the grant moment is approximated by the next job pushed anywhere on the
+	// timeline. Exact for sequential flows; for an approval step inside one branch of a
+	// parallel branchall a concurrent sibling job can land first and understate the wait.
+	function nextCreatedAtAfter(t: number): number | undefined {
+		return allCreatedAts.find((c) => c > t)
+	}
+
+	// For a completed suspend/approval step, the time spent waiting for the approval is the
+	// gap between the step finishing and the next step being pushed (or now, if still waiting).
+	function approvalWait(b: {
+		started_at?: number
+		duration_ms?: number
+	}): { start: number; len: number; running: boolean } | undefined {
+		if (b.started_at == undefined || b.duration_ms == undefined) {
+			return undefined
+		}
+		const end = b.started_at + b.duration_ms
+		const next = nextCreatedAtAfter(end)
+		const waitEnd = next ?? (flowDone ? undefined : now)
+		if (waitEnd == undefined) {
+			return undefined
+		}
+		const len = waitEnd - end
+		if (len < 100) {
+			return undefined
+		}
+		return { start: end, len, running: next == undefined }
+	}
+
+	// Approval wait per module id, computed once and consumed by both the rows and the legend.
+	const approvalWaitByModule = $derived.by(() => {
+		const result: Record<string, { start: number; len: number; running: boolean }> = {}
+		for (const m of flowModules) {
+			if (!m.suspend) continue
+			const sub = (items?.[m.id] ?? []).filter((x) => x.created_at && x.started_at)
+			if (sub.length !== 1) continue
+			const aw = approvalWait(sub[0])
+			if (aw) result[m.id] = aw
+		}
+		return result
+	})
+
+	const hasApprovalWait = $derived(Object.keys(approvalWaitByModule).length > 0)
 </script>
 
 <OnChange
@@ -95,6 +155,12 @@
 					<div class="h-2.5 w-2.5 rounded-sm bg-blue-500/90"></div>
 					<span>Execution</span>
 				</div>
+				{#if hasApprovalWait}
+					<div class="flex gap-1.5 items-center">
+						<div class="h-2.5 w-2.5 rounded-sm bg-purple-400/80"></div>
+						<span>Approval wait</span>
+					</div>
+				{/if}
 				{#if max && min}
 					<span class="font-mono">{msToSec(max - min, 1)}s</span>
 				{/if}
@@ -113,7 +179,7 @@
 				/>
 			</div>
 		{/if}
-		{#each flowModules as { id: k, type: typ } (k)}
+		{#each flowModules as { id: k, type: typ, suspend: isSuspend } (k)}
 			{@const subItems = items?.[k]?.filter((x) => x.created_at && x.started_at)}
 			<div class="relative px-3 py-1.5">
 				<div class="flex items-center justify-between mb-0.5">
@@ -161,6 +227,7 @@
 												? 0
 												: now - b?.created_at
 										: 0}
+									{@const aw = isSuspend ? approvalWaitByModule[k] : undefined}
 									<div class="flex w-full py-0.5 items-center" {style}>
 										<TimelineBar
 											position="left"
@@ -175,7 +242,7 @@
 										/>
 										{#if b.started_at}
 											<TimelineBar
-												position={waitingLen < 100 ? 'center' : 'right'}
+												position={aw || waitingLen < 100 ? 'center' : 'right'}
 												id={b?.id}
 												{total}
 												{min}
@@ -185,6 +252,20 @@
 												running={b?.duration_ms == undefined}
 											/>
 										{/if}
+										{#if aw}
+											<TimelineBar
+												position="right"
+												id={b?.id}
+												{total}
+												{min}
+												concat
+												colorClass="bg-purple-400/80"
+												tooltip={`Waiting for approval — ${msToSec(aw.len, 1)}s`}
+												started_at={aw.start}
+												len={aw.len}
+												running={aw.running}
+											/>
+										{/if}
 									</div>
 								{:else}
 									<div class="flex w-full py-0.5"></div>
@@ -196,7 +277,6 @@
 			</div>
 		{/each}
 	</div>
-
 {:else}
 	<Loader2 class="animate-spin" />
 {/if}
diff --git a/frontend/src/lib/components/ForkWorkspaceBanner.svelte b/frontend/src/lib/components/ForkWorkspaceBanner.svelte
index 56418c1988..e2bfae895e 100644
--- a/frontend/src/lib/components/ForkWorkspaceBanner.svelte
+++ b/frontend/src/lib/components/ForkWorkspaceBanner.svelte
@@ -7,15 +7,20 @@
 	import { goto } from '$app/navigation'
 	import { onMount, untrack } from 'svelte'
 	import { useWorkspaceDrafts } from '$lib/workspaceDrafts.svelte'
+	import { devLabelWord } from '$lib/utils/devWorkspaceLabel'
 
 	let loading = $state(false)
 	let comparison: WorkspaceComparison | undefined = $state(undefined)
 	let error: string | undefined = $state(undefined)
 
-	let isFork = $derived($workspaceStore?.startsWith('wm-fork-') ?? false)
 	let currentWorkspaceData = $derived($userWorkspaces.find((w) => w.id === $workspaceStore))
 	let parentWorkspaceId = $derived(currentWorkspaceData?.parent_workspace_id)
 	let parentWorkspaceData = $derived($userWorkspaces.find((w) => w.id === parentWorkspaceId))
+	// Detect fork/dev workspaces by their parent link, not the `wm-fork-` id prefix (dev
+	// workspaces have an ordinary, prefix-less id). Keying on the parent (rather than the
+	// prefix) also avoids a parentless "Fork of ()" banner when the linkage is dropped.
+	let isFork = $derived(parentWorkspaceId != null)
+	let isDevWorkspace = $derived(currentWorkspaceData?.is_dev_workspace ?? false)
 
 	// Drafts in this fork. When the fork is otherwise in sync with its parent, a
 	// user with only pending drafts should still get the draft CTA (mirrors the
@@ -166,7 +171,10 @@
 					<GitFork class="w-4 h-4 text-accent" />
 					<div class="text-sm">
 						<span class="font-medium text-blue-900 dark:text-blue-100">
-							Fork of <b>{parentWorkspaceData?.name}</b> ({parentWorkspaceId})
+							{isDevWorkspace
+								? `${devLabelWord(currentWorkspaceData?.dev_workspace_label)} workspace of`
+								: 'Fork of'}
+							<b>{parentWorkspaceData?.name}</b> ({parentWorkspaceId})
 						</span>
 					</div>
 
diff --git a/frontend/src/lib/components/GlobalUserOffboardingModal.svelte b/frontend/src/lib/components/GlobalUserOffboardingModal.svelte
index 12af797140..bc2cc5b996 100644
--- a/frontend/src/lib/components/GlobalUserOffboardingModal.svelte
+++ b/frontend/src/lib/components/GlobalUserOffboardingModal.svelte
@@ -34,6 +34,7 @@
 	let wsConfigs: Record<
 		string,
 		{
+			reassign: boolean
 			targetKind: 'user' | 'folder'
 			selectedUser: string | undefined
 			selectedFolder: string | undefined
@@ -71,16 +72,21 @@
 						UserService.listUsernames({ workspace: wp.workspace_id }),
 						FolderService.listFolders({ workspace: wp.workspace_id })
 					])
+					const users = usernamesList
+						.filter((u: string) => u !== wp.username)
+						.map((u: string) => ({ label: u, value: u }))
 					return {
 						workspace_id: wp.workspace_id,
 						config: {
+							// Reassignment requires another workspace user to own items and back
+							// triggers/runnables; with no other user (e.g. single-member forks) it
+							// is impossible, so default off and leave items as-is.
+							reassign: users.length > 0,
 							targetKind: 'user' as const,
 							selectedUser: undefined as string | undefined,
 							selectedFolder: undefined as string | undefined,
 							selectedOperator: undefined as string | undefined,
-							users: usernamesList
-								.filter((u: string) => u !== wp.username)
-								.map((u: string) => ({ label: u, value: u })),
+							users,
 							folders: foldersList.map((f: { name: string }) => ({
 								label: f.name,
 								value: f.name
@@ -112,15 +118,28 @@
 				: undefined
 	}
 
+	// At least one workspace can be reassigned (has another assignable user).
+	let anyReassignableWorkspace = $derived(
+		workspacesWithItems.some((wp) => (wsConfigs[wp.workspace_id]?.users.length ?? 0) > 0)
+	)
+	// At least one workspace is actually selected for reassignment.
+	let anyWorkspaceReassigned = $derived(
+		workspacesWithItems.some((wp) => wsConfigs[wp.workspace_id]?.reassign)
+	)
+
 	let canSubmit = $derived(
-		!doReassign ||
+		(!doReassign ||
 			workspacesWithItems.every((wp) => {
-				const target = getReassignTo(wp.workspace_id)
 				const cfg = wsConfigs[wp.workspace_id]
+				if (!cfg?.reassign) return true
+				const target = getReassignTo(wp.workspace_id)
 				if (!target) return false
 				if (!cfg?.selectedOperator) return false
 				return true
-			})
+			})) &&
+			// Reassign-only runs (no deletion) must reassign at least one workspace,
+			// otherwise the request is an empty no-op reported as success.
+			(deleteUser || anyWorkspaceReassigned)
 	)
 
 	async function submit() {
@@ -129,13 +148,16 @@
 		try {
 			const reassignments: Record<string, { reassign_to: string; new_on_behalf_of_user?: string }> =
 				{}
-			for (const wp of workspacesWithItems) {
-				const target = getReassignTo(wp.workspace_id)
-				const cfg = wsConfigs[wp.workspace_id]
-				if (target) {
-					reassignments[wp.workspace_id] = {
-						reassign_to: target,
-						new_on_behalf_of_user: cfg?.selectedOperator
+			if (doReassign) {
+				for (const wp of workspacesWithItems) {
+					const cfg = wsConfigs[wp.workspace_id]
+					if (!cfg?.reassign) continue
+					const target = getReassignTo(wp.workspace_id)
+					if (target) {
+						reassignments[wp.workspace_id] = {
+							reassign_to: target,
+							new_on_behalf_of_user: cfg?.selectedOperator
+						}
 					}
 				}
 			}
@@ -222,7 +244,7 @@
 								{/if}
 
 								{#if doReassign}
-									{#each workspacesWithItems as wp}
+									{#each workspacesWithItems as wp (wp.workspace_id)}
 										{@const cfg = wsConfigs[wp.workspace_id]}
 										<div class="border border-border rounded-md p-3 space-y-2">
 											<div class="flex items-center justify-between">
@@ -230,23 +252,39 @@
 													{wp.workspace_id}
 													<span class="text-secondary font-normal">({wp.username})</span>
 												</span>
+												{#if cfg}
+													<Toggle
+														bind:checked={cfg.reassign}
+														disabled={cfg.users.length === 0}
+														size="xs"
+														options={{ right: 'Reassign' }}
+													/>
+												{/if}
 											</div>
 
 											{#if cfg}
-												<OffboardWorkspaceSection
-													preview={wp.preview}
-													username={wp.username}
-													{deleteUser}
-													bind:targetKind={cfg.targetKind}
-													bind:selectedUser={cfg.selectedUser}
-													bind:selectedFolder={cfg.selectedFolder}
-													bind:selectedOperator={cfg.selectedOperator}
-													users={cfg.users}
-													folders={cfg.folders}
-													size="sm"
-													csvFilename="offboard-{email}-{wp.workspace_id}.csv"
-													instanceLevel
-												/>
+												{#if cfg.users.length === 0}
+													<p class="text-xs text-tertiary">
+														No other users in this workspace. Items will be left as-is.
+													</p>
+												{:else if cfg.reassign}
+													<OffboardWorkspaceSection
+														preview={wp.preview}
+														username={wp.username}
+														{deleteUser}
+														bind:targetKind={cfg.targetKind}
+														bind:selectedUser={cfg.selectedUser}
+														bind:selectedFolder={cfg.selectedFolder}
+														bind:selectedOperator={cfg.selectedOperator}
+														users={cfg.users}
+														folders={cfg.folders}
+														size="sm"
+														csvFilename="offboard-{email}-{wp.workspace_id}.csv"
+														instanceLevel
+													/>
+												{:else}
+													<p class="text-xs text-tertiary">Items will be left as-is.</p>
+												{/if}
 											{/if}
 										</div>
 									{/each}
@@ -283,7 +321,7 @@
 										different user/folder.</p
 									>
 									<ul class="text-xs list-disc list-inside max-h-32 overflow-y-auto">
-										{#each conflicts as conflict}
+										{#each conflicts as conflict, i (i)}
 											<li>{conflict}</li>
 										{/each}
 									</ul>
@@ -293,7 +331,11 @@
 					{/if}
 
 					<div class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4">
-						{#if workspacesWithItems.length > 0 || deleteUser}
+						{#if !deleteUser && workspacesWithItems.length > 0 && !anyReassignableWorkspace}
+							{#if !loading}
+								<Button onclick={onClose} variant="accent" size="sm">Close</Button>
+							{/if}
+						{:else if workspacesWithItems.length > 0 || deleteUser}
 							<Button
 								disabled={submitting || !canSubmit}
 								onclick={submit}
diff --git a/frontend/src/lib/components/HighlightCode.svelte b/frontend/src/lib/components/HighlightCode.svelte
index 909b8daca2..73c9a08c4a 100644
--- a/frontend/src/lib/components/HighlightCode.svelte
+++ b/frontend/src/lib/components/HighlightCode.svelte
@@ -17,6 +17,8 @@
 	import r from 'svelte-highlight/languages/r'
 	import type { Script } from '$lib/gen'
 	import { Button } from './common'
+	import CopyButton from './common/button/CopyButton.svelte'
+	import ScrollableX from './common/ScrollableX.svelte'
 	import { copyToClipboard } from '$lib/utils'
 	import { ClipboardCopy } from 'lucide-svelte'
 	import HighlightTheme from './HighlightTheme.svelte'
@@ -31,6 +33,10 @@
 		onApplyCode?: () => void
 		showApplyButton?: boolean
 		applyButtonIcon?: typeof ClipboardCopy
+		/** Keep the copy/apply buttons hidden until the block is hovered, and render them subtly. */
+		buttonsOnHover?: boolean
+		/** Wrap the code in ScrollableX (native scroll, subtle hover-revealed scrollbar) for horizontal overflow. */
+		customScrollbarX?: boolean
 	}
 
 	let {
@@ -41,9 +47,15 @@
 		className = '',
 		onApplyCode = undefined,
 		showApplyButton = false,
-		applyButtonIcon = undefined
+		applyButtonIcon = undefined,
+		buttonsOnHover = false,
+		customScrollbarX = false
 	}: Props = $props()
 
+	const hoverButtonClasses = buttonsOnHover
+		? 'opacity-0 group-hover:opacity-100 focus-within:opacity-100 transition-opacity duration-150'
+		: ''
+
 	function getLang(lang: Script['language'] | 'bunnative' | 'frontend' | 'json' | undefined) {
 		switch (lang) {
 			case 'python3':
@@ -107,21 +119,27 @@
 
 <HighlightTheme />
 
-<div class="relative">
-	<Button
-		wrapperClasses="absolute top-2 right-2 z-20"
-		onclick={() => copyToClipboard(code)}
-		color="light"
-		size="xs2"
-		startIcon={{
-			icon: ClipboardCopy
-		}}
-		iconOnly
-		title="Copy to clipboard"
-	/>
+<div class="relative group">
+	{#if buttonsOnHover}
+		<!-- Chat/markdown code blocks: subtle CopyButton on a surface chip. -->
+		<CopyButton
+			value={code}
+			class="absolute top-2 right-2 z-20 bg-surface rounded-md {hoverButtonClasses}"
+		/>
+	{:else}
+		<Button
+			wrapperClasses="absolute top-2 right-2 z-20"
+			onclick={() => copyToClipboard(code)}
+			color="light"
+			size="xs2"
+			startIcon={{ icon: ClipboardCopy }}
+			iconOnly
+			title="Copy to clipboard"
+		/>
+	{/if}
 	{#if showApplyButton}
 		<Button
-			wrapperClasses="absolute top-2 right-10 z-20"
+			wrapperClasses="absolute top-2 right-10 z-20 {hoverButtonClasses}"
 			onclick={onApplyCode}
 			color="light"
 			size="xs2"
@@ -132,19 +150,29 @@
 			title="Apply code"
 		/>
 	{/if}
-	<div class="overflow-x-auto">
-		{#if code?.length < 10000}
-			{#if !lines}
-				<Highlight class="nowrap {className}" language={lang} {code} />
-			{:else}
-				<Highlight class="nowrap {className}" language={lang} {code} let:highlighted>
-					<LineNumbers {highlighted} />
-				</Highlight>
-			{/if}
-		{:else}
-			<pre class="overflow-auto max-h-screen text-xs {className}"
-				><code class="language-{language}">{code}</code></pre
-			>
-		{/if}
-	</div>
+	{#if customScrollbarX}
+		<ScrollableX>
+			{@render codeBody()}
+		</ScrollableX>
+	{:else}
+		<div class="overflow-x-auto">
+			{@render codeBody()}
+		</div>
+	{/if}
 </div>
+
+{#snippet codeBody()}
+	{#if code?.length < 10000}
+		{#if !lines}
+			<Highlight class="nowrap {className}" language={lang} {code} />
+		{:else}
+			<Highlight class="nowrap {className}" language={lang} {code} let:highlighted>
+				<LineNumbers {highlighted} />
+			</Highlight>
+		{/if}
+	{:else}
+		<pre class="overflow-auto max-h-screen text-xs {className}"
+			><code class="language-{language}">{code}</code></pre
+		>
+	{/if}
+{/snippet}
diff --git a/frontend/src/lib/components/HistoricInputs.svelte b/frontend/src/lib/components/HistoricInputs.svelte
index 3c784f354f..85f2603005 100644
--- a/frontend/src/lib/components/HistoricInputs.svelte
+++ b/frontend/src/lib/components/HistoricInputs.svelte
@@ -17,6 +17,8 @@
 		placement?: 'bottom-start' | 'top-start' | 'bottom-end' | 'top-end'
 		limitPayloadSize?: boolean
 		searchArgs?: Record<string, any> | undefined
+		/** Workspace to read run history from; defaults to the nav workspace. */
+		workspace?: string
 	}
 
 	let {
@@ -26,9 +28,12 @@
 		showAuthor = false,
 		placement = 'top-end',
 		limitPayloadSize = false,
-		searchArgs = undefined
+		searchArgs = undefined,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let historicList: HistoricList | undefined = $state(undefined)
 	const dispatch = createEventDispatcher()
 
@@ -111,7 +116,7 @@
 				jobKinds: getJobKinds(runnableType),
 				syncQueuedRunsCount: false,
 				refreshRate: 10000,
-				currentWorkspace: $workspaceStore ?? '',
+				currentWorkspace: ws ?? '',
 				skip: !runnableId,
 				excludesEntrypointOverride: true
 			}) satisfies UseJobLoaderArgs
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 1e1416295a..b3d0ee1446 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -1063,6 +1063,14 @@
 						<li
 							>AI chat usage (provider, model, mode, session count, message count — last 30 days)</li
 						>
+						<li
+							>resource counts (workspaces, scripts per language, flows, workflows as code, low-code
+							apps, raw apps)</li
+						>
+						<li
+							>infrastructure info (container runtime, managed database provider, database version,
+							size and cluster size, max and active connections, object storage backend)</li
+						>
 					</ul>
 					<br />For air-gapped instances, you can download the telemetry data and send it manually.
 				</div>
@@ -1101,6 +1109,10 @@
 						<li
 							>AI chat usage (provider, model, mode, session count, message count — last 30 days)</li
 						>
+						<li
+							>resource counts (workspaces, scripts per language, flows, workflows as code, low-code
+							apps, raw apps)</li
+						>
 					</ul>
 				</div>
 			{/if}
diff --git a/frontend/src/lib/components/JobArgs.svelte b/frontend/src/lib/components/JobArgs.svelte
index 2c6d56f06f..eb6cc9bc97 100644
--- a/frontend/src/lib/components/JobArgs.svelte
+++ b/frontend/src/lib/components/JobArgs.svelte
@@ -29,13 +29,21 @@
 	// dispatcher. Not a real input: shown as a badge instead of a table row,
 	// but kept in the expanded JSON drawer and download.
 	const SKIP_ASSET_DISPATCH_ARG = '_wmill_skip_asset_dispatch'
+	// Internal map (path -> content digest) injected by local-dev previews so
+	// relative imports resolve from not-yet-deployed local content. Same
+	// treatment: badge, not a noisy table row.
+	const TEMP_SCRIPT_REFS_ARG = '_TEMP_SCRIPT_REFS'
+	const INTERNAL_ARGS = [SKIP_ASSET_DISPATCH_ARG, TEMP_SCRIPT_REFS_ARG]
 
 	let skippedAssetDispatch = $derived(
 		args != undefined && typeof args === 'object' && args[SKIP_ASSET_DISPATCH_ARG] === true
 	)
+	let hasTempScriptRefs = $derived(
+		args != undefined && typeof args === 'object' && args[TEMP_SCRIPT_REFS_ARG] != undefined
+	)
 	let displayArgs = $derived(
 		args != undefined && typeof args === 'object'
-			? Object.fromEntries(Object.entries(args).filter(([k]) => k !== SKIP_ASSET_DISPATCH_ARG))
+			? Object.fromEntries(Object.entries(args).filter(([k]) => !INTERNAL_ARGS.includes(k)))
 			: args
 	)
 
@@ -104,6 +112,15 @@ ${Object.entries(displayArgs)
 								asset dispatch skipped
 							</Badge>
 						{/if}
+						{#if hasTempScriptRefs}
+							<Badge
+								color="gray"
+								verySmall
+								title="This preview carried {TEMP_SCRIPT_REFS_ARG} so relative imports resolve from local (not-yet-deployed) script content"
+							>
+								local import refs
+							</Badge>
+						{/if}
 					</Cell>
 					<Cell head last>Value</Cell>
 				</tr>
diff --git a/frontend/src/lib/components/JobLoader.svelte b/frontend/src/lib/components/JobLoader.svelte
index b0d7dae0e0..c9eb2e7230 100644
--- a/frontend/src/lib/components/JobLoader.svelte
+++ b/frontend/src/lib/components/JobLoader.svelte
@@ -119,7 +119,7 @@
 				if (lastJobId && (job || lastCallbacks?.loadExtraLogs)) {
 					plimit(() =>
 						JobService.getCompletedJobLogsTail({
-							workspace: $workspaceStore!,
+							workspace: workspace!,
 							id: lastJobId
 						})
 					).then((res) => {
@@ -222,7 +222,7 @@
 		return abstractRun(
 			() =>
 				JobService.runScriptByPath({
-					workspace: $workspaceStore!,
+					workspace: workspace!,
 					path: path ?? '',
 					requestBody: args,
 					skipPreprocessor: true
@@ -239,7 +239,7 @@
 		return abstractRun(
 			() =>
 				JobService.runScriptByHash({
-					workspace: $workspaceStore!,
+					workspace: workspace!,
 					hash: hash ?? '',
 					requestBody: args,
 					skipPreprocessor: true
@@ -256,7 +256,7 @@
 		return abstractRun(
 			() =>
 				JobService.runFlowByPath({
-					workspace: $workspaceStore!,
+					workspace: workspace!,
 					path: path ?? '',
 					requestBody: args,
 					skipPreprocessor: true
@@ -274,7 +274,7 @@
 		return abstractRun(
 			() =>
 				JobService.runFlowPreview({
-					workspace: $workspaceStore!,
+					workspace: workspace!,
 					requestBody: {
 						args,
 						value: flow.value,
@@ -318,7 +318,7 @@
 		return abstractRun(
 			() =>
 				JobService.runDynamicSelect({
-					workspace: $workspaceStore!,
+					workspace: workspace!,
 					requestBody: { entrypoint_function, args, runnable_ref }
 				}),
 			callbacks
@@ -336,12 +336,14 @@
 		callbacks?: Callbacks,
 		flowPath?: string,
 		modules?: Record<string, import('$lib/gen').ScriptModule> | null,
-		tempScriptRefs?: Record<string, string>
+		tempScriptRefs?: Record<string, string>,
+		timeout?: number
 	): Promise<string> {
 		return abstractRun(
 			() =>
 				JobService.runScriptPreview({
-					workspace: $workspaceStore!,
+					workspace: workspace!,
+					timeout,
 					requestBody: {
 						path,
 						content: code,
@@ -369,7 +371,7 @@
 			currentEventSource = undefined
 			try {
 				await JobService.cancelQueuedJob({
-					workspace: $workspaceStore ?? '',
+					workspace: workspace ?? '',
 					id,
 					requestBody: {}
 				})
diff --git a/frontend/src/lib/components/LocalDraftBanner.svelte b/frontend/src/lib/components/LocalDraftBanner.svelte
index 4aa2206f5b..dff131b281 100644
--- a/frontend/src/lib/components/LocalDraftBanner.svelte
+++ b/frontend/src/lib/components/LocalDraftBanner.svelte
@@ -10,7 +10,7 @@
 	} from '$lib/utils'
 	import { AlertCircle, Diff } from 'lucide-svelte'
 	import { twMerge } from 'tailwind-merge'
-	import { slide } from 'svelte/transition'
+	import { fade } from 'svelte/transition'
 
 	interface Props {
 		/** Whether there are unsaved local changes relative to the deployed baseline. */
@@ -25,6 +25,12 @@
 		disabled?: boolean
 		/** Diff drawer title. */
 		title?: string
+		/**
+		 * Whether the banner can appear, so it partially reserves its slot to keep
+		 * the shift small. Pass when `getDeployed()` is non-reactive; else defaults
+		 * to `getDeployed() != null`.
+		 */
+		reserveSpace?: boolean
 	}
 
 	let {
@@ -33,7 +39,8 @@
 		getCurrent,
 		onDiscard,
 		disabled = false,
-		title = 'Deployed <> Local changes'
+		title = 'Deployed <> Local changes',
+		reserveSpace
 	}: Props = $props()
 
 	/** Same cleaning + YAML serialization the DiffDrawer applies before
@@ -49,6 +56,11 @@
 		}
 	}
 
+	// Whether the banner can appear (a deployed baseline exists). Gates the
+	// partially-reserved slot below (keeps the toggle shift small); new entities
+	// have none, so no slot and no gap.
+	let hasBaseline = $derived(reserveSpace ?? getDeployed() != null)
+
 	// Suppress the banner when:
 	//   • There's no deployed baseline (brand-new entity — "Show diff"
 	//     would early-return and "Discard" is semantically backwards),
@@ -58,10 +70,8 @@
 	//     from baseline" check that can stale-fire after a save lands
 	//     or when `false`/`undefined` toggle noise flips a field.
 	let visible = $derived.by(() => {
-		if (!show) return false
-		const deployed = getDeployed()
-		if (deployed == null) return false
-		return diffKey(deployed) !== diffKey(getCurrent())
+		if (!show || !hasBaseline) return false
+		return diffKey(getDeployed()) !== diffKey(getCurrent())
 	})
 
 	let diffDrawer: DiffDrawer | undefined = $state()
@@ -99,37 +109,44 @@
 
 <DiffDrawer bind:this={diffDrawer} />
 
-{#if visible}
-	<div
-		transition:slide|local={{ duration: 120 }}
-		class={twMerge(
-			'flex flex-row items-center justify-between gap-2 px-4 py-1',
-			classes.warning.bgClass,
-			'!border-0 !rounded-none'
-		)}
-	>
-		<div class="flex flex-row items-center gap-2 min-w-0">
-			<AlertCircle class={classes.warning.iconClass} size={16} />
-			<span class={twMerge('text-xs font-semibold truncate', classes.warning.titleClass)}>
-				You have unsaved changes
-			</span>
-		</div>
-		<div class="flex flex-row items-center gap-2 shrink-0">
-			<Button
-				unifiedSize="sm"
-				variant="default"
-				startIcon={{ icon: Diff }}
-				btnClasses={classes.warning.titleClass}
-				on:click={showDiff}>Show diff</Button
+{#if hasBaseline}
+	<!-- Reserve ~a third of the banner height when idle (h-2.5), grow to the full
+	     h-8 when it shows: small idle gap, ~22px animated shift on appear. h-8 =
+	     button height + a couple px so the buttons don't touch the edges. -->
+	<div class={twMerge('shrink-0 transition-[height] duration-150', visible ? 'h-8' : 'h-2.5')}>
+		{#if visible}
+			<div
+				transition:fade|local={{ duration: 120 }}
+				class={twMerge(
+					'flex flex-row items-center justify-between gap-2 px-4 h-full',
+					classes.warning.bgClass,
+					'!border-0 !rounded-none'
+				)}
 			>
-			{#if !disabled}
-				<Button
-					unifiedSize="sm"
-					variant="subtle"
-					btnClasses={classes.warning.titleClass}
-					on:click={onDiscard}>Discard</Button
-				>
-			{/if}
-		</div>
+				<div class="flex flex-row items-center gap-2 min-w-0">
+					<AlertCircle class={classes.warning.iconClass} size={16} />
+					<span class={twMerge('text-xs font-semibold truncate', classes.warning.titleClass)}>
+						You have unsaved changes
+					</span>
+				</div>
+				<div class="flex flex-row items-center gap-2 shrink-0">
+					<Button
+						unifiedSize="sm"
+						variant="default"
+						startIcon={{ icon: Diff }}
+						btnClasses={classes.warning.titleClass}
+						on:click={showDiff}>Show diff</Button
+					>
+					{#if !disabled}
+						<Button
+							unifiedSize="sm"
+							variant="subtle"
+							btnClasses={classes.warning.titleClass}
+							on:click={onDiscard}>Discard</Button
+						>
+					{/if}
+				</div>
+			</div>
+		{/if}
 	</div>
 {/if}
diff --git a/frontend/src/lib/components/MarkdownCodeBlock.svelte b/frontend/src/lib/components/MarkdownCodeBlock.svelte
new file mode 100644
index 0000000000..26022e21cf
--- /dev/null
+++ b/frontend/src/lib/components/MarkdownCodeBlock.svelte
@@ -0,0 +1,149 @@
+<script lang="ts">
+	import { getAstNode } from 'svelte-exmarkdown'
+	import HighlightCode from './HighlightCode.svelte'
+	import {
+		csharp,
+		go,
+		graphql,
+		javascript,
+		php,
+		plaintext,
+		python,
+		rust,
+		shell,
+		sql,
+		typescript,
+		yaml
+	} from 'svelte-highlight/languages'
+	import type { ClipboardCopy } from 'lucide-svelte'
+	import MermaidDisplay from './copilot/chat/script/MermaidDisplay.svelte'
+
+	// Shared `pre` renderer for fenced code blocks in svelte-exmarkdown markdown.
+	// Chat-agnostic: gives every markdown surface the highlighted panel + subtle
+	// hover copy button + custom horizontal scrollbar. The AI chat wraps this to
+	// add its Apply button (via the apply props) and mermaid diagrams.
+	let {
+		showApplyButton = false,
+		onApplyCode = undefined,
+		applyButtonIcon = undefined,
+		// Render ```mermaid blocks as diagrams. Off by default so untrusted
+		// markdown surfaces don't execute mermaid — the chat opts in.
+		renderMermaid = false
+	}: {
+		showApplyButton?: boolean
+		onApplyCode?: () => void
+		applyButtonIcon?: typeof ClipboardCopy
+		renderMermaid?: boolean
+	} = $props()
+
+	const astNode = getAstNode()
+
+	// Map a fence language to a known highlighter key, or undefined when the fence
+	// is unlabeled/unrecognized — those render as plaintext rather than being
+	// mis-colored as TypeScript (this renderer runs on all user markdown).
+	function getSmartLang(lang: string | undefined) {
+		switch (lang) {
+			case 'python':
+			case 'python3':
+			case 'py':
+				return 'python'
+			case 'deno':
+			case 'nativets':
+			case 'bun':
+			case 'bunnative':
+			case 'typescript':
+			case 'ts':
+			case 'tsx':
+				return 'typescript'
+			case 'go':
+			case 'golang':
+				return 'go'
+			case 'shell':
+			case 'bash':
+			case 'sh':
+			case 'zsh':
+			case 'console':
+				return 'shell'
+			case 'frontend':
+			case 'javascript':
+			case 'js':
+			case 'jsx':
+			case 'mjs':
+			case 'cjs':
+				return 'javascript'
+			case 'graphql':
+				return 'graphql'
+			case 'mysql':
+			case 'snowflake':
+			case 'bigquery':
+			case 'oracledb':
+			case 'postgresql':
+			case 'postgres':
+			case 'sql':
+				return 'sql'
+			case 'php':
+				return 'php'
+			case 'rust':
+			case 'rs':
+				return 'rust'
+			case 'csharp':
+			case 'cs':
+				return 'csharp'
+			case 'ansible':
+			case 'yaml':
+			case 'yml':
+				return 'yaml'
+			default:
+				return undefined
+		}
+	}
+
+	const SMART_LANG_TO_HIGHLIGHT_LANG = {
+		python: python,
+		typescript: typescript,
+		go: go,
+		shell: shell,
+		javascript: javascript,
+		graphql: graphql,
+		sql: sql,
+		php: php,
+		rust: rust,
+		csharp: csharp,
+		yaml: yaml
+	}
+
+	// Fenced code is `<pre><code>text</code></pre>` (text nested under <code>).
+	// Sanitized raw HTML through rehypeRaw is `<pre>text</pre>` — the text is a
+	// direct child of <pre> with no <code>, so fall back to it or the block would
+	// render empty now that this renderer handles every <pre>.
+	let code = $derived(
+		astNode.current.children?.[0]?.children?.[0]?.value ?? astNode.current.children?.[0]?.value
+	)
+
+	let language = $derived(
+		(astNode.current.children?.[0]?.properties?.class as string | undefined)?.split('-')[1]
+	)
+
+	let smartLang = $derived(getSmartLang(language))
+	let highlightLanguage = $derived(smartLang ? SMART_LANG_TO_HIGHLIGHT_LANG[smartLang] : plaintext)
+</script>
+
+<div class="flex flex-col gap-0.5 rounded-md relative not-prose !text-xs">
+	<div class="relative w-full bg-surface-secondary rounded-md overflow-hidden">
+		{#if renderMermaid && language === 'mermaid'}
+			<MermaidDisplay code={code ?? ''} />
+		{:else}
+			<HighlightCode
+				className="px-3 py-2.5 !text-xs"
+				code={code ?? ''}
+				{highlightLanguage}
+				language={undefined}
+				{onApplyCode}
+				{showApplyButton}
+				{applyButtonIcon}
+				buttonsOnHover
+				customScrollbarX
+			/>
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/ModuleTest.svelte b/frontend/src/lib/components/ModuleTest.svelte
index 02f51ae187..ed9b9a5694 100644
--- a/frontend/src/lib/components/ModuleTest.svelte
+++ b/frontend/src/lib/components/ModuleTest.svelte
@@ -39,9 +39,13 @@
 		stepsInputArgs,
 		previewArgs,
 		modulesTestStates,
-		devTempScriptRefs
+		devTempScriptRefs,
+		opWorkspace
 	} = getContext<FlowEditorContext>('FlowEditorContext')
 
+	// Acting workspace when the flow editor runs in an AI session; else the nav workspace.
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
+
 	let jobLoader: JobLoader | undefined = $state(undefined)
 	let jobProgressReset: () => void = () => {}
 	let stepHistoryLoader = getStepHistoryLoaderContext()
@@ -56,6 +60,16 @@
 		runTestWithStepArgs()
 	}
 
+	// A step's timeout is an InputTransform. Only a static numeric value can be applied
+	// to a single-step preview; dynamic expressions are evaluated server-side and only
+	// take effect when running the full flow.
+	function staticTimeout(timeout: FlowModule['timeout']): number | undefined {
+		if (timeout?.type === 'static' && typeof timeout.value === 'number') {
+			return timeout.value
+		}
+		return undefined
+	}
+
 	export async function runTest(args: any) {
 		// Not defined if JobProgressBar not loaded
 		if (jobProgressReset) jobProgressReset()
@@ -68,6 +82,7 @@
 		}
 
 		const val = mod.value
+		const timeout = staticTimeout(mod.timeout)
 		// let jobId: string | undefined = undefined
 		let callbacks: Callbacks = {
 			done: (x) => {
@@ -86,12 +101,13 @@
 				callbacks,
 				$pathStore,
 				undefined,
-				devTempScriptRefs?.()
+				devTempScriptRefs?.(),
+				timeout
 			)
 		} else if (val.type == 'script') {
 			const script = val.hash
-				? await ScriptService.getScriptByHash({ workspace: $workspaceStore!, hash: val.hash })
-				: await getScriptByPath(val.path)
+				? await ScriptService.getScriptByHash({ workspace: opWs!, hash: val.hash })
+				: await getScriptByPath(val.path, opWs)
 			await jobLoader?.runPreview(
 				val.path,
 				script.content,
@@ -101,7 +117,10 @@
 				script.lock,
 				val.hash ?? script.hash,
 				callbacks,
-				$pathStore
+				$pathStore,
+				undefined,
+				undefined,
+				timeout
 			)
 		} else if (val.type == 'flow') {
 			await jobLoader?.runFlowByPath(val.path, args, callbacks)
@@ -187,6 +206,7 @@
 <JobLoader
 	noCode={true}
 	toastError={noEditor}
+	workspaceOverride={opWs}
 	bind:scriptProgress
 	bind:this={jobLoader}
 	bind:isLoading={
diff --git a/frontend/src/lib/components/NoDirectDeployAlert.svelte b/frontend/src/lib/components/NoDirectDeployAlert.svelte
index 69964fb98f..c767ed835a 100644
--- a/frontend/src/lib/components/NoDirectDeployAlert.svelte
+++ b/frontend/src/lib/components/NoDirectDeployAlert.svelte
@@ -1,18 +1,30 @@
 <script lang="ts">
-	import { userStore } from '$lib/stores'
+	import { userStore, userWorkspaces, workspaceStore } from '$lib/stores'
 	import {
 		canUserBypassRuleKind,
 		getActiveRulesetsForKind,
 		isRuleActive
 	} from '$lib/workspaceProtectionRules.svelte'
-	import { Alert } from './common'
+	import { findCanonicalDevWorkspace } from '$lib/utils/workspaceHierarchy'
+	import { devLabelNoun } from '$lib/utils/devWorkspaceLabel'
+	import { canCreateFork } from '$lib/utils/editInFork'
+	import { switchWorkspace } from '$lib/storeUtils'
+	import { Alert, Button } from './common'
+	import { GitFork } from 'lucide-svelte'
 
 	let activeDeployRulesets = $derived(getActiveRulesetsForKind('DisableDirectDeployment'))
 	let canBypass = $derived(canUserBypassRuleKind('DisableDirectDeployment', $userStore))
-	let overrideChecked = $state(false)
-	let canEdit = $derived(
-		!isRuleActive('DisableDirectDeployment') || (canBypass && overrideChecked)
+	let canonicalDev = $derived(findCanonicalDevWorkspace($workspaceStore, $userWorkspaces))
+	// Forking may itself be blocked by DisableWorkspaceForking, so only suggest it
+	// when the user can actually fork this workspace.
+	let canFork = $derived(canCreateFork($userStore))
+	let editAdvice = $derived(
+		canFork
+			? 'You will need to either fork the workspace, or make your changes locally and submit a PR to an authorized user.'
+			: 'You will need to make your changes locally and submit a PR to an authorized user.'
 	)
+	let overrideChecked = $state(false)
+	let canEdit = $derived(!isRuleActive('DisableDirectDeployment') || (canBypass && overrideChecked))
 
 	let {
 		onUpdateCanEditStatus = (value) => {}
@@ -27,12 +39,39 @@
 
 {#if !$userStore?.operator && activeDeployRulesets.length > 0}
 	<div class="my-2">
-		<Alert type="info" title="Workspace protection active">
+		<Alert
+			type="info"
+			title={canonicalDev
+				? `Edits happen in the ${devLabelNoun(canonicalDev.dev_workspace_label)}`
+				: 'Workspace protection active'}
+		>
 			<div class="flex flex-col gap-2">
-				<p>
-					The rule{activeDeployRulesets.length > 1 ? "s" : ""} <b>{activeDeployRulesets.map((r) => r.name).join(', ')}</b> restrict{activeDeployRulesets.length > 1 ? "" : "s"} direct edits to
-					this workspace. You will need to either fork the workspace, or make your changes locally and submit a PR to an authorized user.
-				</p>
+				{#if canonicalDev}
+					<p>
+						Edits to this workspace are made in its {devLabelNoun(canonicalDev.dev_workspace_label)}
+						<b>{canonicalDev.name}</b> ({canonicalDev.id}) and promoted here.
+					</p>
+					<div>
+						<Button
+							btnClasses="w-auto"
+							size="xs"
+							variant="accent"
+							startIcon={{ icon: GitFork }}
+							onclick={() => {
+								if (canonicalDev) switchWorkspace(canonicalDev.id)
+							}}
+						>
+							Go to {devLabelNoun(canonicalDev.dev_workspace_label)}
+						</Button>
+					</div>
+				{:else}
+					<p>
+						The rule{activeDeployRulesets.length > 1 ? 's' : ''}
+						<b>{activeDeployRulesets.map((r) => r.name).join(', ')}</b>
+						restrict{activeDeployRulesets.length > 1 ? '' : 's'} direct edits to this workspace.
+						{editAdvice}
+					</p>
+				{/if}
 				{#if canBypass}
 					<label class="flex items-center gap-2 cursor-pointer">
 						<input class="rounded max-w-4" type="checkbox" bind:checked={overrideChecked} />
diff --git a/frontend/src/lib/components/ObjectResourceInput.svelte b/frontend/src/lib/components/ObjectResourceInput.svelte
index e9f6e4d6e3..e76a19c6da 100644
--- a/frontend/src/lib/components/ObjectResourceInput.svelte
+++ b/frontend/src/lib/components/ObjectResourceInput.svelte
@@ -20,6 +20,8 @@
 		disabled?: boolean
 		datatableAsPgResource?: boolean
 		onClear?: () => void
+		/** Workspace the resource picker lists from; defaults to the nav workspace. */
+		workspace?: string
 	}
 
 	let {
@@ -32,7 +34,8 @@
 		editor = $bindable(undefined),
 		disabled = false,
 		datatableAsPgResource = false,
-		onClear = undefined
+		onClear = undefined,
+		workspace = undefined
 	}: Props = $props()
 
 	function isResource() {
@@ -55,7 +58,7 @@
 <!-- {JSON.stringify({ value })} -->
 <div class="flex flex-row w-full flex-wrap gap-x-2 gap-y-0.5">
 	{#if format === 'resource-s3_object'}
-		<S3ObjectPicker bind:value />
+		<S3ObjectPicker bind:value {workspace} />
 	{:else if value == undefined || typeof value === 'string'}
 		<ResourcePicker
 			{datatableAsPgResource}
@@ -63,6 +66,7 @@
 			{selectFirst}
 			{disablePortal}
 			{onClear}
+			{workspace}
 			bind:value={
 				() => valueToPath(),
 				(v) => {
diff --git a/frontend/src/lib/components/ObjectStoreConfigSettings.svelte b/frontend/src/lib/components/ObjectStoreConfigSettings.svelte
index 5c96007d33..c7f7065565 100644
--- a/frontend/src/lib/components/ObjectStoreConfigSettings.svelte
+++ b/frontend/src/lib/components/ObjectStoreConfigSettings.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Database, HardDrive, Loader2, Trash2 } from 'lucide-svelte'
+	import { Database, Eye, EyeOff, HardDrive, Loader2, Trash2 } from 'lucide-svelte'
 	import { onDestroy } from 'svelte'
 	import Toggle from './Toggle.svelte'
 	import { Button, Tab, Tabs } from './common'
@@ -30,6 +30,7 @@
 		tenantId: string
 		clientId: string
 		accessKey: string
+		federatedTokenFile?: string
 		endpoint?: string
 	}
 
@@ -141,6 +142,7 @@
 		total_jobs: number
 		processed_jobs: number
 		s3_deleted: number
+		s3_not_found?: number
 		orphans_scanned: number
 		orphans_deleted: number
 		errors: number
@@ -227,6 +229,16 @@
 		stopUsagePolling()
 	})
 
+	// The GCS service account key JSON contains the secret `private_key`, so the
+	// editor that reveals it in plain text is hidden behind an explicit opt-in
+	// rather than rendered on page load whenever a key is already configured.
+	let showServiceAccountKey = $state(false)
+	let hasServiceAccountKey = $derived(
+		bucket_config?.type === 'Gcs' &&
+			!!bucket_config.serviceAccountKey &&
+			Object.keys(bucket_config.serviceAccountKey).length > 0
+	)
+
 	let simpleEditor: SimpleEditor | undefined = $state(undefined)
 	let serviceAccountKeyCode = $state(
 		bucket_config?.type === 'Gcs'
@@ -418,6 +430,9 @@
 						</span>
 						<span>
 							S3 deleted: {cleanupStatus.s3_deleted.toLocaleString()}
+							{#if (cleanupStatus.s3_not_found ?? 0) > 0}
+								&middot; already absent (404): {(cleanupStatus.s3_not_found ?? 0).toLocaleString()}
+							{/if}
 							{#if cleanupStatus.errors > 0}
 								&middot; errors: {cleanupStatus.errors.toLocaleString()}
 							{/if}
@@ -620,6 +635,26 @@
 						}
 					/>
 				</label>
+				<label class="block pb-2">
+					<span class="text-xs font-semibold text-emphasis"
+						>Federated token file <span class="text-2xs text-primary">(optional)</span></span
+					>
+					<span class="text-primary text-2xs"
+						>Path to the projected service account token when using AKS Workload Identity with the
+						tenant ID and client ID above</span
+					>
+					<TextInput
+						inputProps={{ placeholder: '/var/run/secrets/azure/tokens/azure-identity-token' }}
+						bind:value={
+							() => (bucket_config as AzureConfig).federatedTokenFile,
+							(v) =>
+								(bucket_config = {
+									...(bucket_config as AzureConfig),
+									federatedTokenFile: v === '' ? undefined : v
+								})
+						}
+					/>
+				</label>
 				<label class="block pb-2">
 					<span class="text-xs font-semibold text-emphasis"
 						>Endpoint <span class="text-2xs text-primary">(optional)</span></span
@@ -676,28 +711,61 @@
 					/>
 				</Label>
 				<Label label="Service Account Key">
-					<span class="text-primary text-2xs">JSON content of the service account key file</span>
-					<SimpleEditor
-						bind:this={simpleEditor}
-						lang="json"
-						bind:code={serviceAccountKeyCode}
-						on:change={(e) => {
-							if (bucket_config?.type === 'Gcs') {
-								if (e.detail.code === undefined || e.detail.code === '') {
-									bucket_config = { ...bucket_config, serviceAccountKey: undefined }
-									return
+					<span class="text-primary text-2xs">
+						JSON content of the service account key file. Leave empty to use the instance's ambient
+						credentials (e.g. GKE Workload Identity / the GCP metadata server).
+					</span>
+					{#if hasServiceAccountKey && !showServiceAccountKey}
+						<div class="flex items-center gap-3 mt-1">
+							<span class="text-tertiary text-xs">
+								A service account key is configured and hidden as it contains a private key.
+							</span>
+							<Button
+								spacingSize="sm"
+								size="xs"
+								variant="border"
+								startIcon={{ icon: Eye }}
+								on:click={() => (showServiceAccountKey = true)}
+							>
+								Show sensitive values
+							</Button>
+						</div>
+					{:else}
+						{#if hasServiceAccountKey}
+							<div class="flex justify-end mb-1">
+								<Button
+									spacingSize="sm"
+									size="xs"
+									variant="border"
+									startIcon={{ icon: EyeOff }}
+									on:click={() => (showServiceAccountKey = false)}
+								>
+									Hide
+								</Button>
+							</div>
+						{/if}
+						<SimpleEditor
+							bind:this={simpleEditor}
+							lang="json"
+							bind:code={serviceAccountKeyCode}
+							on:change={(e) => {
+								if (bucket_config?.type === 'Gcs') {
+									if (e.detail.code === undefined || e.detail.code === '') {
+										bucket_config = { ...bucket_config, serviceAccountKey: undefined }
+										return
+									}
+									try {
+										const parsed = JSON.parse(e.detail.code ?? '{}')
+										lastEditorSyncedJson = JSON.stringify(parsed)
+										bucket_config = { ...bucket_config, serviceAccountKey: parsed }
+									} catch (_) {
+										bucket_config = { ...bucket_config, serviceAccountKey: undefined }
+									}
 								}
-								try {
-									const parsed = JSON.parse(e.detail.code ?? '{}')
-									lastEditorSyncedJson = JSON.stringify(parsed)
-									bucket_config = { ...bucket_config, serviceAccountKey: parsed }
-								} catch (_) {
-									bucket_config = { ...bucket_config, serviceAccountKey: undefined }
-								}
-							}
-						}}
-						class="h-80"
-					/>
+							}}
+							class="h-80"
+						/>
+					{/if}
 				</Label>
 			{:else}
 				<div>Unknown bucket type {bucket_config['type']}</div>
diff --git a/frontend/src/lib/components/PageHeader.svelte b/frontend/src/lib/components/PageHeader.svelte
index 556ac1b0cc..9a927c52fa 100644
--- a/frontend/src/lib/components/PageHeader.svelte
+++ b/frontend/src/lib/components/PageHeader.svelte
@@ -2,12 +2,15 @@
 	import Tooltip from './Tooltip.svelte'
 
 	interface Props {
-		title: string;
-		tooltip?: string;
-		documentationLink?: string | undefined;
-		primary?: boolean;
-		childrenWrapperDivClasses?: string;
-		children?: import('svelte').Snippet;
+		title: string
+		tooltip?: string
+		documentationLink?: string | undefined
+		primary?: boolean
+		childrenWrapperDivClasses?: string
+		// Inline actions rendered right after the title (e.g. a copy-id button),
+		// as opposed to `children` which lands on the far right of the header row.
+		titleActions?: import('svelte').Snippet
+		children?: import('svelte').Snippet
 	}
 
 	let {
@@ -16,8 +19,9 @@
 		documentationLink = undefined,
 		primary = true,
 		childrenWrapperDivClasses = '',
+		titleActions,
 		children
-	}: Props = $props();
+	}: Props = $props()
 </script>
 
 <div class="flex flex-row flex-wrap justify-between items-center pb-2 my-4 mr-2 min-h-16">
@@ -31,6 +35,7 @@
 					{tooltip}
 				</Tooltip>
 			{/if}
+			{@render titleActions?.()}
 		</span>
 	{:else}
 		<span class="flex items-center gap-2">
@@ -40,6 +45,7 @@
 					{tooltip}
 				</Tooltip>
 			{/if}
+			{@render titleActions?.()}
 		</span>
 	{/if}
 
diff --git a/frontend/src/lib/components/ParentWorkspaceProtectionAlert.svelte b/frontend/src/lib/components/ParentWorkspaceProtectionAlert.svelte
index 9712062efb..994817f807 100644
--- a/frontend/src/lib/components/ParentWorkspaceProtectionAlert.svelte
+++ b/frontend/src/lib/components/ParentWorkspaceProtectionAlert.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
 	import type { ProtectionRuleset } from '$lib/gen'
-	import { userStore } from '$lib/stores'
+	import { userStore, type UserExt } from '$lib/stores'
+	import { getUserExt } from '$lib/user'
 	import {
 		fetchProtectionRulesForWorkspace,
 		isRuleActiveInRulesets,
 		canUserBypassRuleKindInRulesets,
-		getActiveRulesetsForKindInRulesets,
+		getActiveRulesetsForKindInRulesets
 	} from '$lib/workspaceProtectionRules.svelte'
 	import { Alert } from './common'
-	import { untrack } from 'svelte'
+	import { resource } from 'runed'
 
 	let {
 		parentWorkspaceId,
@@ -18,32 +19,42 @@
 		onUpdateCanDeploy?: (value: boolean) => void
 	} = $props()
 
-	let parentRulesets = $state<ProtectionRuleset[]>([])
 	let overrideChecked = $state(false)
 
+	// Fetch the parent's rules and the user's identity in the parent together. Both must come from the
+	// parent: bypass is judged with is_admin/groups in the PARENT (per-workspace), not the active/fork
+	// workspace's `$userStore`; getUserExt returns undefined for a non-member, treated as no bypass.
+	const parentDataResource = resource(
+		() => parentWorkspaceId,
+		async (wsId) => {
+			if (!wsId) return { rules: [] as ProtectionRuleset[], user: undefined as UserExt | undefined }
+			const [rules, user] = await Promise.all([
+				fetchProtectionRulesForWorkspace(wsId),
+				getUserExt(wsId)
+			])
+			return { rules, user }
+		}
+	)
+	let parentRulesets = $derived(parentDataResource.current?.rules ?? [])
+	let parentUserInfo = $derived(parentDataResource.current?.user)
+
 	let activeDeployRulesets = $derived(
 		getActiveRulesetsForKindInRulesets(parentRulesets, 'DisableDirectDeployment')
 	)
 
 	let canBypass = $derived(
-		canUserBypassRuleKindInRulesets(parentRulesets, 'DisableDirectDeployment', $userStore)
+		canUserBypassRuleKindInRulesets(parentRulesets, 'DisableDirectDeployment', parentUserInfo)
 	)
 
+	// Block deploy until the parent's rules/identity have loaded: while loading `parentRulesets` is
+	// empty, which would otherwise read as "no lock" and briefly enable deploy before the real
+	// lock/bypass check resolves.
 	let canDeploy = $derived(
-		!isRuleActiveInRulesets(parentRulesets, 'DisableDirectDeployment') ||
-			(canBypass && overrideChecked)
+		!parentDataResource.loading &&
+			(!isRuleActiveInRulesets(parentRulesets, 'DisableDirectDeployment') ||
+				(canBypass && overrideChecked))
 	)
 
-	// Fetch parent workspace rules
-	$effect(() => {
-		if (parentWorkspaceId) {
-			untrack(async () => {
-				const rules = await fetchProtectionRulesForWorkspace(parentWorkspaceId)
-				parentRulesets = rules
-			})
-		}
-	})
-
 	// Reset override when parent workspace changes
 	$effect(() => {
 		parentWorkspaceId
@@ -60,9 +71,13 @@
 	<Alert type="info" title="Parent workspace protection active" class="my-2">
 		<div class="flex flex-col gap-2">
 			<p>
-				The workspace {parentWorkspaceId} has a protection rule{activeDeployRulesets.length > 1 ? 's' : ''}
+				The workspace {parentWorkspaceId} has a protection rule{activeDeployRulesets.length > 1
+					? 's'
+					: ''}
 				<b>{activeDeployRulesets.map((r) => r.name).join(', ')}</b>
-				that restrict{activeDeployRulesets.length > 1 ? '' : 's'} direct deployments. You need to merge changes through the synced git repo with Git Sync, or by asking a user with the rights to bypass this rule.
+				that restrict{activeDeployRulesets.length > 1 ? '' : 's'} direct deployments. You need to merge
+				changes through the synced git repo with Git Sync, or by asking a user with the rights to bypass
+				this rule.
 			</p>
 			{#if canBypass}
 				<label class="flex items-center gap-2 cursor-pointer">
diff --git a/frontend/src/lib/components/Path.svelte b/frontend/src/lib/components/Path.svelte
index b8c37011bd..27d6b45e6c 100644
--- a/frontend/src/lib/components/Path.svelte
+++ b/frontend/src/lib/components/Path.svelte
@@ -78,6 +78,11 @@
 		disableEditing?: boolean
 		size?: 'sm' | 'md'
 		drawerOffset?: number
+		/** Workspace the folder list and path-existence checks run against.
+		 *  Defaults to the navigation `$workspaceStore`; pass the session's acting
+		 *  workspace when the editor operates on a workspace other than the one the
+		 *  top nav points at (see the sessions preview / dev-workspace flows). */
+		workspaceOverride?: string
 	}
 
 	let {
@@ -94,9 +99,12 @@
 		hideUser = false,
 		disableEditing = false,
 		size = 'md',
-		drawerOffset = 0
+		drawerOffset = 0,
+		workspaceOverride = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspaceOverride ?? $workspaceStore)
+
 	$effect.pre(() => {
 		if (path == undefined) {
 			path = ''
@@ -203,7 +211,7 @@
 		folders = initialFolders.concat(
 			(
 				await FolderService.listFolderNames({
-					workspace: $workspaceStore!
+					workspace: ws!
 				})
 			)
 				.filter((x) => !excludedFolders.includes(x))
@@ -244,74 +252,74 @@
 	async function pathExists(path: string, kind: PathKind): Promise<boolean> {
 		if (!path.length) return false
 		if (kind == 'flow') {
-			return await FlowService.existsFlowByPath({ workspace: $workspaceStore!, path: path })
+			return await FlowService.existsFlowByPath({ workspace: ws!, path: path })
 		} else if (kind == 'script') {
 			return await ScriptService.existsScriptByPath({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'resource') {
 			return await ResourceService.existsResource({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'variable') {
 			return await VariableService.existsVariable({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'schedule') {
-			return await ScheduleService.existsSchedule({ workspace: $workspaceStore!, path: path })
+			return await ScheduleService.existsSchedule({ workspace: ws!, path: path })
 		} else if (kind == 'app') {
-			return await AppService.existsApp({ workspace: $workspaceStore!, path: path })
+			return await AppService.existsApp({ workspace: ws!, path: path })
 		} else if (kind == 'http_trigger') {
 			return await HttpTriggerService.existsHttpTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'websocket_trigger') {
 			return await WebsocketTriggerService.existsWebsocketTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'kafka_trigger') {
 			return await KafkaTriggerService.existsKafkaTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'postgres_trigger') {
 			return await PostgresTriggerService.existsPostgresTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'nats_trigger') {
 			return await NatsTriggerService.existsNatsTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind === 'mqtt_trigger') {
 			return await MqttTriggerService.existsMqttTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind == 'sqs_trigger') {
 			return await SqsTriggerService.existsSqsTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind === 'gcp_trigger') {
 			return await GcpTriggerService.existsGcpTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind === 'azure_trigger') {
 			return await AzureTriggerService.existsAzureTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else if (kind === 'email_trigger') {
 			return await EmailTriggerService.existsEmailTrigger({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				path: path
 			})
 		} else {
@@ -398,7 +406,7 @@
 		})
 	})
 	$effect.pre(() => {
-		if ($workspaceStore && $userStore) {
+		if (ws && $userStore) {
 			untrack(() => {
 				loadFolders()
 				initPath()
@@ -412,30 +420,30 @@
 	)
 	let pathUsageInFlowsPromise = $derived(
 		(kind == 'script' || kind == 'flow') &&
-			$workspaceStore &&
+			ws &&
 			initialPath &&
 			FlowService.listFlowPathsFromWorkspaceRunnable({
-				workspace: $workspaceStore,
+				workspace: ws,
 				path: initialPath,
 				runnableKind: kind
 			})
 	)
 	let pathUsageInAppsPromise = $derived(
 		(kind == 'script' || kind == 'flow') &&
-			$workspaceStore &&
+			ws &&
 			initialPath &&
 			AppService.listAppPathsFromWorkspaceRunnable({
-				workspace: $workspaceStore,
+				workspace: ws,
 				path: initialPath,
 				runnableKind: kind
 			})
 	)
 	let pathUsageInScriptsPromise = $derived(
 		kind == 'script' &&
-			$workspaceStore &&
+			ws &&
 			initialPath &&
 			ScriptService.listScriptPathsFromWorkspaceRunnable({
-				workspace: $workspaceStore,
+				workspace: ws,
 				path: initialPath
 			})
 	)
@@ -525,6 +533,7 @@
 					bind:this={inputP}
 					bind:value={meta.name}
 					prefix={`${meta.ownerKind?.charAt(0) ?? ''}/${meta.owner ?? ''}/`}
+					workspace={ws}
 					{size}
 					{error}
 					{autofocus}
diff --git a/frontend/src/lib/components/PathNameAutocomplete.svelte b/frontend/src/lib/components/PathNameAutocomplete.svelte
index 9c31ef980a..10d5c10640 100644
--- a/frontend/src/lib/components/PathNameAutocomplete.svelte
+++ b/frontend/src/lib/components/PathNameAutocomplete.svelte
@@ -101,6 +101,10 @@
 		error?: string | boolean
 		textInputClass?: string
 		onkeyup?: (e: KeyboardEvent) => void
+		/** Workspace whose paths feed the autocomplete. Defaults to the navigation
+		 *  `$workspaceStore`; pass the acting workspace when the editor operates on
+		 *  a workspace other than the one the top nav points at. */
+		workspace?: string
 	}
 
 	let {
@@ -113,9 +117,12 @@
 		size = 'md',
 		error,
 		textInputClass,
-		onkeyup
+		onkeyup,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let inputEl: TextInput | undefined = $state(undefined)
 	export function focus() {
 		inputEl?.focus()
@@ -258,12 +265,12 @@
 	async function loadPaths(workspace: string) {
 		const paths = await fetchWorkspacePaths(workspace)
 		// Guard against workspace changing during the in-flight fetch.
-		if ($workspaceStore === workspace) allPaths = paths
+		if (ws === workspace) allPaths = paths
 	}
 
 	$effect(() => {
-		const ws = $workspaceStore
-		if (ws) void loadPaths(ws)
+		const w = ws
+		if (w) void loadPaths(w)
 	})
 
 	$effect(() => {
@@ -300,7 +307,7 @@
 	function onInputFocus() {
 		hasFocus = true
 		// Opportunistic refresh if the cache is stale.
-		if ($workspaceStore) void loadPaths($workspaceStore)
+		if (ws) void loadPaths(ws)
 	}
 	function onInputBlur() {
 		setTimeout(() => {
diff --git a/frontend/src/lib/components/PrefixedInput.svelte b/frontend/src/lib/components/PrefixedInput.svelte
index 2a1dccf386..adc578b545 100644
--- a/frontend/src/lib/components/PrefixedInput.svelte
+++ b/frontend/src/lib/components/PrefixedInput.svelte
@@ -1,139 +1,68 @@
 <script lang="ts">
-	import { untrack } from 'svelte'
+	import { tick } from 'svelte'
+	import { twMerge } from 'tailwind-merge'
+	import type { HTMLInputAttributes } from 'svelte/elements'
+
 	let {
 		prefix = '',
-		value = $bindable(''),
+		value = $bindable(),
 		placeholder = '',
+		error = false,
+		autofocus = false,
 		class: className = '',
 		...restProps
-	} = $props()
+	}: {
+		prefix?: string
+		value: string
+		placeholder?: string
+		// Red border, matching TextInput's error styling.
+		error?: boolean
+		autofocus?: boolean
+		class?: string
+	} & Omit<
+		HTMLInputAttributes,
+		'prefix' | 'value' | 'placeholder' | 'autofocus' | 'class'
+	> = $props()
 
-	let inputElement: HTMLInputElement = $state(null!)
-	let internalValue = $state(untrack(() => prefix) + value)
+	let inputElement: HTMLInputElement | undefined = $state()
 
-	// Update internal value when prop changes
+	// Programmatic focus: the native autofocus attribute is unreliable on content
+	// mounted after page load (e.g. inside a modal).
 	$effect(() => {
-		internalValue = prefix + value
+		if (!autofocus) return
+		void tick().then(() => {
+			inputElement?.focus()
+			inputElement?.select()
+		})
 	})
 
-	function handleInput(e) {
-		const newValue = e.target.value
-
-		// Ensure the value always starts with the prefix
-		if (newValue.startsWith(prefix)) {
-			internalValue = newValue
-			value = newValue.slice(prefix.length)
-		} else {
-			internalValue = prefix
-			value = ''
-			// Reset cursor position
-			if (inputElement) {
-				inputElement.value = prefix
-				inputElement.setSelectionRange(prefix.length, prefix.length)
-			}
-		}
-	}
-
-	function handleKeyDown(e) {
-		const cursorPos = e.target.selectionStart
-		const selectionEnd = e.target.selectionEnd
-
-		// Prevent backspace if cursor is at or before prefix end
-		if (e.key === 'Backspace') {
-			if (cursorPos <= prefix.length && selectionEnd <= prefix.length) {
-				e.preventDefault()
-			} else if (cursorPos <= prefix.length && selectionEnd > prefix.length) {
-				// If selection spans across prefix, only delete after prefix
-				e.preventDefault()
-				const newValue = prefix + internalValue.slice(selectionEnd)
-				internalValue = newValue
-				value = newValue.slice(prefix.length)
-				// Set cursor position after prefix
-				setTimeout(() => {
-					inputElement.setSelectionRange(prefix.length, prefix.length)
-				}, 0)
-			}
-		}
-
-		// Prevent delete key within prefix
-		if (e.key === 'Delete' && cursorPos < prefix.length) {
-			e.preventDefault()
-		}
-
-		// Prevent selecting all (Ctrl+A) from selecting the prefix
-		if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
-			e.preventDefault()
-			inputElement.setSelectionRange(prefix.length, internalValue.length)
-		}
-	}
-
-	function handleClick() {
-		// Prevent cursor from being placed within prefix
-		if ((inputElement.selectionStart ?? 0) < prefix.length) {
-			inputElement.setSelectionRange(prefix.length, prefix.length)
-		}
-	}
-
-	function handleFocus() {
-		// Ensure cursor starts after prefix when focusing
-		if ((inputElement.selectionStart ?? 0) < prefix.length) {
-			inputElement.setSelectionRange(prefix.length, prefix.length)
-		}
-	}
-
-	function handlePaste(e) {
-		e.preventDefault()
-		const pasteData = e.clipboardData.getData('text')
-		const cursorPos = inputElement.selectionStart ?? 0
-		const selectionEnd = inputElement.selectionEnd ?? 0
-
-		if (cursorPos < prefix.length) {
-			// Paste at the end of prefix
-			internalValue = prefix + pasteData + internalValue.slice(prefix.length)
-		} else {
-			// Normal paste
-			internalValue =
-				internalValue.slice(0, cursorPos) + pasteData + internalValue.slice(selectionEnd)
-		}
-
-		value = internalValue.slice(prefix.length)
-
-		// Set cursor position after pasted content
-		const newCursorPos = Math.max(prefix.length, cursorPos) + pasteData.length
-		setTimeout(() => {
-			inputElement.setSelectionRange(newCursorPos, newCursorPos)
-		}, 0)
-	}
+	const borderClasses = $derived(
+		error
+			? 'border !border-red-300 dark:!border-red-400/45 focus-within:!border-red-400 hover:!border-red-500 dark:hover:!border-red-400/75'
+			: 'border border-border-light hover:border-border-selected/50 focus-within:border-border-selected'
+	)
 </script>
 
-<input
-	bind:this={inputElement}
-	type="text"
-	{placeholder}
-	class="prefixed-input {className}"
-	value={internalValue}
-	oninput={handleInput}
-	onkeydown={handleKeyDown}
-	onclick={handleClick}
-	onfocus={handleFocus}
-	onpaste={handlePaste}
-	{...restProps}
-/>
-
-<style>
-	.prefixed-input {
-		/* Default styles - can be overridden by class prop */
-		padding: 8px 12px;
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		font-size: 14px;
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.prefixed-input:focus {
-		outline: none;
-		border-color: #4caf50;
-		box-shadow: 0 0 0 2px rgba(76, 175, 80, 0.1);
-	}
-</style>
+<!-- The prefix renders outside the <input> (non-editable) while the wrapper
+     carries the input look, so the two read as a single field. The bound value
+     is only the editable part after the prefix. The prefix is text-tertiary:
+     lighter than typed text but darker than the hint-colored placeholder, so
+     the fixed prefix doesn't read as placeholder. -->
+<div
+	class={twMerge(
+		'flex items-center w-full min-h-8 px-2 rounded-md text-xs font-normal cursor-text',
+		'bg-surface-input transition-colors',
+		borderClasses,
+		className
+	)}
+>
+	<span class="text-tertiary select-none shrink-0" aria-hidden="true">{prefix}</span>
+	<input
+		bind:this={inputElement}
+		type="text"
+		{placeholder}
+		bind:value
+		class="no-default-style grow min-w-0 !p-0 !border-none !outline-none focus:!ring-0 !bg-transparent text-xs text-primary !placeholder-hint"
+		{...restProps}
+	/>
+</div>
diff --git a/frontend/src/lib/components/ResourceEditor.svelte b/frontend/src/lib/components/ResourceEditor.svelte
index d503763a06..7acc4e485b 100644
--- a/frontend/src/lib/components/ResourceEditor.svelte
+++ b/frontend/src/lib/components/ResourceEditor.svelte
@@ -374,7 +374,7 @@
 </script>
 
 <div>
-	<div class="flex flex-col gap-6 py-2">
+	<div class="flex flex-col gap-6 pb-2">
 		{#if otherDirty.length > 0}
 			<Alert type="warning" title="Editing multiple workspaces">
 				You are going to edit the value in: {otherDirty.join(', ')}
@@ -402,6 +402,7 @@
 					{loadingSchema}
 					{resourceToEdit}
 					onLoadResourceType={() => resourceTypeResource.refetch()}
+					workspace={selected}
 				/>
 			{/key}
 		{/if}
diff --git a/frontend/src/lib/components/ResourceEditorDrawer.svelte b/frontend/src/lib/components/ResourceEditorDrawer.svelte
index 919f8edeff..6c0da69675 100644
--- a/frontend/src/lib/components/ResourceEditorDrawer.svelte
+++ b/frontend/src/lib/components/ResourceEditorDrawer.svelte
@@ -58,6 +58,7 @@
 <Drawer bind:this={drawer} size="50rem" {disableChatOffset}>
 	<DrawerContent
 		title={mode == 'edit' ? 'Edit ' + path : 'Add a resource'}
+		bannerReserved={mode == 'edit'}
 		on:close={drawer?.closeDrawer}
 	>
 		{#await import('./ResourceEditor.svelte')}
@@ -79,6 +80,7 @@
 		{#snippet banner()}
 			<LocalDraftBanner
 				show={hasLocalDraft}
+				reserveSpace={mode == 'edit'}
 				getDeployed={() => resourceEditor?.localDraftDeployed()}
 				getCurrent={() => resourceEditor?.localDraftCurrent()}
 				onDiscard={() => resourceEditor?.discardLocalDraft()}
diff --git a/frontend/src/lib/components/ResourceForm.svelte b/frontend/src/lib/components/ResourceForm.svelte
index ced60bf4dc..ef226501b7 100644
--- a/frontend/src/lib/components/ResourceForm.svelte
+++ b/frontend/src/lib/components/ResourceForm.svelte
@@ -42,6 +42,9 @@
 		loadingSchema: boolean
 		resourceToEdit: Resource | undefined
 		onLoadResourceType?: () => void
+		/** Workspace the path is validated against and the connection is tested in;
+		 * defaults to the nav workspace. */
+		workspace?: string | undefined
 	}
 
 	let {
@@ -62,9 +65,12 @@
 		resourceSchema,
 		loadingSchema,
 		resourceToEdit,
-		onLoadResourceType
+		onLoadResourceType,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let editDescription = $state(false)
 	let rawCode: string | undefined = $state(undefined)
 	let textFileContent: string = $state('')
@@ -131,11 +137,12 @@
 		{/if}
 		<Label label="Path">
 			<Path
-				disabled={initialPath != '' && !isOwner(initialPath, $userStore, $workspaceStore)}
+				disabled={initialPath != '' && !isOwner(initialPath, $userStore, ws)}
 				bind:path
 				{initialPath}
 				namePlaceholder="resource"
 				kind="resource"
+				workspaceOverride={workspace}
 			/>
 		</Label>
 	</div>
@@ -218,7 +225,11 @@
 		{#if resourceToEdit?.resource_type === 'nats' || resourceToEdit?.resource_type === 'kafka'}
 			<TestTriggerConnection kind={resourceToEdit?.resource_type} args={{ connection: args }} />
 		{:else}
-			<TestConnection resourceType={resourceToEdit?.resource_type} {args} />
+			<TestConnection
+				resourceType={resourceToEdit?.resource_type}
+				{args}
+				workspaceOverride={workspace}
+			/>
 		{/if}
 		{#if resource_type === 'git_repository' && $workspaceStore && ($userStore?.is_admin || $userStore?.is_super_admin)}
 			<GitHubAppIntegration
@@ -274,6 +285,7 @@
 					schema={resourceSchema}
 					bind:args
 					bind:isValid
+					{workspace}
 				/>
 			{/if}
 		{:else if !can_write}
diff --git a/frontend/src/lib/components/ResourcePicker.svelte b/frontend/src/lib/components/ResourcePicker.svelte
index 4df153cefa..e74e6f7285 100644
--- a/frontend/src/lib/components/ResourcePicker.svelte
+++ b/frontend/src/lib/components/ResourcePicker.svelte
@@ -26,6 +26,7 @@
 		placeholder?: string | undefined
 		selectInputClass?: string
 		class?: string
+		error?: boolean
 		onClear?: () => void
 		excludedValues?: string[]
 		datatableAsPgResource?: boolean
@@ -47,6 +48,7 @@
 		placeholder = undefined,
 		selectInputClass = '',
 		class: className = '',
+		error = false,
 		onClear = undefined,
 		excludedValues = undefined,
 		datatableAsPgResource = false,
@@ -236,6 +238,7 @@
 			}}
 			items={collection}
 			clearable
+			{error}
 			class="text-clip grow min-w-0"
 			inputClass={selectInputClass}
 			placeholder={placeholder ?? `${resourceType ?? 'any'} resource`}
diff --git a/frontend/src/lib/components/RunForm.svelte b/frontend/src/lib/components/RunForm.svelte
index b1b562b04d..89eaf8f7ab 100644
--- a/frontend/src/lib/components/RunForm.svelte
+++ b/frontend/src/lib/components/RunForm.svelte
@@ -114,6 +114,7 @@
 		scheduledForStr: string | undefined
 		invisible_to_owner: boolean | undefined
 		overrideTag: string | undefined
+		overrideTagNote?: string
 		args?: Record<string, any>
 		jsonView?: boolean
 		isValid?: boolean
@@ -132,6 +133,7 @@
 		scheduledForStr = $bindable(),
 		invisible_to_owner = $bindable(),
 		overrideTag = $bindable(),
+		overrideTagNote = undefined,
 		args = $bindable(),
 		jsonView = false,
 		isValid = $bindable(true)
@@ -160,7 +162,7 @@
 			debounced && clearTimeout(debounced)
 			debounced = setTimeout(() => {
 				const nurl = new URL(window.location.href)
-				nurl.hash = computeSharableHash(args)
+				nurl.hash = computeSharableHash(args, overrideTag)
 
 				try {
 					replaceState(nurl.toString(), page.state)
@@ -201,6 +203,7 @@
 		jsonEditor?.setCode(code)
 	}
 	$effect(() => {
+		overrideTag
 		Object.keys(args ?? {}).forEach((key) => {
 			args?.[key]
 		})
@@ -387,6 +390,10 @@
 				<div class="flex-row-reverse flex w-full text-primary text-sm">
 					tag override: {overrideTag}
 				</div>
+			{:else if overrideTagNote}
+				<div class="flex-row-reverse flex w-full text-secondary text-xs">
+					{overrideTagNote}
+				</div>
 			{/if}
 			{#if invisible_to_owner}
 				<div class="flex-row-reverse flex w-full text-primary text-sm">
diff --git a/frontend/src/lib/components/S3FilePicker.svelte b/frontend/src/lib/components/S3FilePicker.svelte
index 55bb25c5ef..8829660ea3 100644
--- a/frontend/src/lib/components/S3FilePicker.svelte
+++ b/frontend/src/lib/components/S3FilePicker.svelte
@@ -18,6 +18,9 @@
 		selectedFileKey?: { s3: string; storage?: string } | undefined
 		folderOnly?: boolean
 		regexFilter?: RegExp | undefined
+		/** Workspace to browse S3 storage in — the acting workspace of the editor that
+		 * opened the picker, else the nav workspace. */
+		workspace?: string | undefined
 		onClose?: () => void
 		onSelectAndClose?: (selected: { s3: string; storage: string | undefined }) => void
 	}
@@ -30,10 +33,13 @@
 		selectedFileKey = $bindable(undefined),
 		folderOnly = false,
 		regexFilter = undefined,
+		workspace = undefined,
 		onClose,
 		onSelectAndClose
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let drawer: Drawer | undefined = $state()
 	let s3FilePickerInner: S3FilePickerInner | undefined = $state()
 
@@ -55,8 +61,8 @@
 	> = $state({})
 
 	let secondaryStorageNames = resource(
-		() => $workspaceStore,
-		() => SettingService.getSecondaryStorageNames({ workspace: $workspaceStore! }),
+		() => ws,
+		() => SettingService.getSecondaryStorageNames({ workspace: ws! }),
 		{ lazy: true }
 	)
 
@@ -105,6 +111,7 @@
 			bind:uploadModalOpen
 			{folderOnly}
 			{regexFilter}
+			{workspace}
 		/>
 		{#snippet actions()}
 			<div class="flex gap-1">
diff --git a/frontend/src/lib/components/S3FilePickerInner.svelte b/frontend/src/lib/components/S3FilePickerInner.svelte
index 333857b7eb..9475c0041a 100644
--- a/frontend/src/lib/components/S3FilePickerInner.svelte
+++ b/frontend/src/lib/components/S3FilePickerInner.svelte
@@ -65,6 +65,8 @@
 		regexFilter?: RegExp | undefined
 		hideS3SpecificDetails?: boolean
 		rootPath?: string
+		/** Workspace to browse S3 storage in — defaults to the nav workspace. */
+		workspace?: string | undefined
 		workspaceSettingsInitialized?: boolean
 		storage?: string | undefined
 		uploadModalOpen?: boolean
@@ -103,6 +105,7 @@
 		regexFilter = undefined,
 		hideS3SpecificDetails = false,
 		rootPath: initialRootPath = '',
+		workspace = undefined,
 		workspaceSettingsInitialized = $bindable(true),
 		storage = $bindable(undefined),
 		uploadModalOpen = $bindable(false),
@@ -117,6 +120,8 @@
 		testConnectionRequest = HelpersService.datasetStorageTestConnection
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let rootPath = $state(initialRootPath)
 	let rootPathNestingLevel = $derived(1 * (rootPath.split('/').length - 1))
 
@@ -183,7 +188,7 @@
 	async function loadFiles() {
 		fileListLoading = true
 		let availableFiles = await listStoredFilesRequest({
-			workspace: $workspaceStore!,
+			workspace: ws!,
 			maxKeys: maxKeys, // fixed pages of 1000 files for now
 			marker: page == 0 ? undefined : listMarkers[page - 1],
 			prefix: rootPath ?? (filter.trim() != '' ? filter : undefined),
@@ -280,7 +285,7 @@
 		}
 		fileInfoLoading = true
 		let fileMetadataRaw = await loadFileMetadataRequest({
-			workspace: $workspaceStore!,
+			workspace: ws!,
 			fileKey: fileKey,
 			storage: storage
 		})
@@ -300,7 +305,7 @@
 
 	async function loadFilePreview(fileKey: string, fileSizeInBytes?: number, fileMimeType?: string) {
 		let filePreviewRaw = await loadFilePreviewRequest({
-			workspace: $workspaceStore!,
+			workspace: ws!,
 			fileKey: fileKey,
 			fileSizeInBytes: fileSizeInBytes,
 			fileMimeType: fileMimeType,
@@ -349,7 +354,7 @@
 		}
 		try {
 			await deleteS3FileRequest({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				fileKey: fileKey,
 				storage: storage
 			})
@@ -409,7 +414,7 @@
 		}
 		try {
 			await moveS3FileRequest({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				srcFileKey: srcFileKey,
 				destFileKey: destFileKey!,
 				storage: storage
@@ -457,7 +462,7 @@
 		fileListLoading = true
 		try {
 			await testConnectionRequest({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				storage: storage
 			})
 			workspaceSettingsInitialized = true
@@ -716,7 +721,7 @@
 						{#if filePreview !== undefined && (!hideS3SpecificDetails || !readOnlyMode || allowDelete)}
 							<div class="flex gap-2 shrink-0">
 								{#if !hideS3SpecificDetails}
-									{@const downloadApiPath = `/w/${$workspaceStore}/job_helpers/download_s3_file?file_key=${encodeURIComponent(fileMetadata?.fileKey ?? '')}${storage ? `&storage=${storage}` : ''}`}
+									{@const downloadApiPath = `/w/${ws}/job_helpers/download_s3_file?file_key=${encodeURIComponent(fileMetadata?.fileKey ?? '')}${storage ? `&storage=${storage}` : ''}`}
 									{@const downloadName =
 										fileMetadata?.fileKey.split('/').pop() ?? 'unnamed_download.file'}
 									{#if shouldDownloadViaClient()}
diff --git a/frontend/src/lib/components/S3ObjectPicker.svelte b/frontend/src/lib/components/S3ObjectPicker.svelte
index 1c461708cd..bb3e19599e 100644
--- a/frontend/src/lib/components/S3ObjectPicker.svelte
+++ b/frontend/src/lib/components/S3ObjectPicker.svelte
@@ -14,9 +14,15 @@
 	interface Props {
 		value: any
 		editor?: SimpleEditor | undefined
+		/** Workspace to browse/upload S3 objects in; defaults to the nav workspace. */
+		workspace?: string | undefined
 	}
 
-	let { value = $bindable(), editor = $bindable(undefined) }: Props = $props()
+	let {
+		value = $bindable(),
+		editor = $bindable(undefined),
+		workspace = undefined
+	}: Props = $props()
 
 	const dispatch = createEventDispatcher()
 
@@ -48,6 +54,7 @@
 		editor?.setCode(rawValue)
 	}}
 	readOnlyMode={false}
+	{workspace}
 />
 
 <div class="flex flex-col w-full gap-1">
@@ -85,6 +92,7 @@
 				}
 			}}
 			defaultValue={value?.s3}
+			{workspace}
 		/>
 	{/if}
 	<Button
diff --git a/frontend/src/lib/components/SaveInputsButton.svelte b/frontend/src/lib/components/SaveInputsButton.svelte
index 4bddde54ca..91b583e0da 100644
--- a/frontend/src/lib/components/SaveInputsButton.svelte
+++ b/frontend/src/lib/components/SaveInputsButton.svelte
@@ -11,12 +11,13 @@
 	const dispatch = createEventDispatcher()
 
 	interface Props {
-		runnableId: string | undefined;
-		runnableType: RunnableType | undefined;
-		args: object;
-		disabled?: boolean;
-		small?: boolean | undefined;
-		showTooltip?: boolean | undefined;
+		runnableId: string | undefined
+		runnableType: RunnableType | undefined
+		args: object
+		disabled?: boolean
+		small?: boolean | undefined
+		showTooltip?: boolean | undefined
+		workspace?: string | undefined
 	}
 
 	let {
@@ -25,8 +26,11 @@
 		args,
 		disabled = false,
 		small = undefined,
-		showTooltip = undefined
-	}: Props = $props();
+		showTooltip = undefined,
+		workspace = undefined
+	}: Props = $props()
+
+	let ws = $derived(workspace ?? $workspaceStore)
 
 	let savingInputs = $state(false)
 
@@ -40,7 +44,7 @@
 
 		try {
 			await InputService.createInput({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				runnableId,
 				runnableType,
 				requestBody
diff --git a/frontend/src/lib/components/SavedInputsPicker.svelte b/frontend/src/lib/components/SavedInputsPicker.svelte
index 87cdd8e2fc..a6a49e566e 100644
--- a/frontend/src/lib/components/SavedInputsPicker.svelte
+++ b/frontend/src/lib/components/SavedInputsPicker.svelte
@@ -21,6 +21,8 @@
 		noButton?: boolean
 		jsonView?: boolean
 		limitPayloadSize?: boolean
+		/** Workspace to read/write saved inputs from; defaults to the nav workspace. */
+		workspace?: string
 	}
 
 	let {
@@ -30,9 +32,12 @@
 		isValid = false,
 		noButton = false,
 		jsonView = false,
-		limitPayloadSize = false
+		limitPayloadSize = false,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	interface EditableInput extends Input {
 		isEditing?: boolean
 		isSaving?: boolean
@@ -58,7 +63,7 @@
 
 		try {
 			await InputService.updateInput({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				requestBody: {
 					id: input.id,
 					name: input.name,
@@ -76,7 +81,7 @@
 	function initLoadInputs() {
 		const loadInputsPageFn = async (page: number, perPage: number) => {
 			const inputs = await InputService.listInputs({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				runnableId,
 				runnableType,
 				page,
@@ -104,7 +109,7 @@
 
 		const deleteInputFn = async (id: string) => {
 			await InputService.deleteInput({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				input: id
 			})
 		}
@@ -119,7 +124,7 @@
 		if (!id) return
 		return await InputService.getArgsFromHistoryOrSavedInput({
 			jobOrInputId: id,
-			workspace: $workspaceStore!,
+			workspace: ws!,
 			input,
 			allowLarge
 		})
@@ -198,7 +203,7 @@
 	}
 
 	$effect(() => {
-		$workspaceStore &&
+		ws &&
 			runnableId &&
 			runnableType &&
 			(infiniteList && untrack(() => initLoadInputs()), (draft = false))
@@ -222,6 +227,7 @@
 					{runnableId}
 					{runnableType}
 					args={previewArgs ?? {}}
+					workspace={ws}
 					disabled={!previewArgs || !runnableId || !isValid || jsonView}
 					on:update={() => {
 						refresh()
diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte
index 27955e1fcf..4df7b4dc0b 100644
--- a/frontend/src/lib/components/SchemaForm.svelte
+++ b/frontend/src/lib/components/SchemaForm.svelte
@@ -121,6 +121,8 @@
 		actions: actions_render = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	const dispatch = createEventDispatcher()
 
 	let inputCheck: { [id: string]: boolean } = $state({})
@@ -502,7 +504,7 @@
 		documentationLink="https://www.windmill.dev/docs/core_concepts/variables_and_secrets"
 		extraField="path"
 		loadItems={async () =>
-			(await VariableService.listVariable({ workspace: $workspaceStore ?? '' })).map((x) => ({
+			(await VariableService.listVariable({ workspace: ws ?? '' })).map((x) => ({
 				name: x.path,
 				...x
 			}))}
@@ -521,5 +523,5 @@
 		{/snippet}
 	</ItemPicker>
 
-	<VariableEditor bind:this={variableEditor} />
+	<VariableEditor bind:this={variableEditor} workspace={ws} />
 {/if}
diff --git a/frontend/src/lib/components/SchemaFormWithArgPicker.svelte b/frontend/src/lib/components/SchemaFormWithArgPicker.svelte
index f1f7bae6e9..c4275f48b0 100644
--- a/frontend/src/lib/components/SchemaFormWithArgPicker.svelte
+++ b/frontend/src/lib/components/SchemaFormWithArgPicker.svelte
@@ -19,6 +19,9 @@
 		isValid?: boolean
 		jsonView?: boolean
 		children?: import('svelte').Snippet
+		/** Workspace the History / Saved inputs / Captures tabs read and mutate;
+		 * defaults to the nav workspace. Session editors pass their acting workspace. */
+		workspace?: string
 	}
 
 	let {
@@ -28,7 +31,8 @@
 		previewArgs,
 		isValid = true,
 		jsonView = false,
-		children
+		children,
+		workspace = undefined
 	}: Props = $props()
 
 	const dispatch = createEventDispatcher()
@@ -140,6 +144,7 @@
 								bind:this={historicInputs}
 								{runnableId}
 								{runnableType}
+								{workspace}
 								on:select={(e) => {
 									dispatch('select', { payload: e.detail?.args, type: 'history' })
 								}}
@@ -152,6 +157,7 @@
 								{runnableId}
 								{runnableType}
 								{previewArgs}
+								{workspace}
 								bind:this={savedInputsPicker}
 								on:select={(e) => {
 									dispatch('select', { payload: e.detail, type: 'saved' })
@@ -171,6 +177,7 @@
 							<div class="h-full">
 								<CaptureTable
 									path={stablePathForCaptures}
+									{workspace}
 									on:select={(e) => {
 										dispatch('select', { payload: e.detail, type: 'captures' })
 									}}
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 063a17f9d1..c6d48e5e89 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -26,6 +26,7 @@
 		enterpriseLicense,
 		usedTriggerKinds,
 		userStore,
+		userWorkspaces,
 		workerTags,
 		workspaceStore
 	} from '$lib/stores'
@@ -40,6 +41,7 @@
 	} from '$lib/utils'
 	import Path from './Path.svelte'
 	import { invalidateWorkspacePaths } from './PathNameAutocomplete.svelte'
+	import { notifyContractWarnings } from './assets/AssetGraph/schemaContracts'
 	import ScriptEditor from './ScriptEditor.svelte'
 	import { Alert, Button, Drawer, SecondsInput, Tab, TabContent, Tabs } from './common'
 	import LanguageIcon from './common/languageIcons/LanguageIcon.svelte'
@@ -55,6 +57,7 @@
 		Code,
 		DiffIcon,
 		EllipsisVertical,
+		Network,
 		Plus,
 		Rocket,
 		Settings,
@@ -62,6 +65,9 @@
 		Tag,
 		X
 	} from 'lucide-svelte'
+	import { base } from '$lib/base'
+	import { useLocalStorageValue } from '$lib/svelte5Utils.svelte'
+	import { parsePipelineAnnotations } from './assets/AssetGraph/parsePipelineAnnotations'
 	import DropdownV2 from './DropdownV2.svelte'
 	import { type Item } from '$lib/utils'
 	import { sendUserToast } from '$lib/toast'
@@ -97,8 +103,7 @@
 	import WorkerTagSelect from './WorkerTagSelect.svelte'
 	import type { ButtonType } from './common/button/model'
 	import DebounceLimit from './flows/DebounceLimit.svelte'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import OnBehalfOfSelector, { type OnBehalfOfChoice } from './OnBehalfOfSelector.svelte'
 	import WacExportDrawer from './scripts/WacExportDrawer.svelte'
 	import { UserDraft } from '$lib/userDraft.svelte'
@@ -135,9 +140,14 @@
 		onResetToDeployed,
 		loadedFromDraft = false,
 		othersDraftsCount = 0,
-		onOpenOthersDrafts
+		onOpenOthersDrafts,
+		condensedHeader = false
 	}: ScriptBuilderProps = $props()
 
+	// Top-bar button size + bar height. Condensed (session preview) uses the
+	// smallest well-supported unified size (`sm`) so the bar is thinner.
+	const headerBtnSize = $derived(condensedHeader ? 'sm' : 'md')
+
 	export function getInitialAndModifiedValues(): SavedAndModifiedValue {
 		return {
 			savedValue: savedScript,
@@ -168,15 +178,24 @@
 	let topbarWidth = $state(0)
 	const compactTopbar = $derived(topbarWidth > 0 && topbarWidth < 900)
 
-	// AutosaveIndicator watch key. Falls back to the full-page editor's
-	// global store + URL draft path; the sessions preview overrides both so the
-	// icon tracks the session's (forked) workspace + target path where autosave
-	// actually happens.
-	const indicatorWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
+	// The workspace this editor operates on: deploy, save-draft, trigger loading
+	// and the AutosaveIndicator all target it. Falls back to the full-page
+	// editor's global store; the sessions preview overrides it to the session's
+	// (forked) workspace, so an embedded editor acts on the session's fork rather
+	// than the navigation workspace ($workspaceStore, which stays put). indicatorPath
+	// is the matching draft path (URL path full-page, session target in preview).
+	const opWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
 	const indicatorPath = $derived(autosavePath ?? userDraftPath)
 
+	// The shared `workerTags` store caches tags for the navigation workspace. A
+	// session editor deploys to `opWorkspace` (a fork), so it keeps a local list to
+	// gate/populate the tag picker without reading or clobbering the shared cache.
+	const usesLocalTags = $derived(opWorkspace != undefined && opWorkspace !== $workspaceStore)
+	let localWorkerTags = $state<string[] | undefined>(undefined)
+	const scriptWorkerTags = $derived(usesLocalTags ? localWorkerTags : $workerTags)
+
 	function getCompactMenuItems(): Item[] {
-		const hasTags = ($workerTags?.length ?? 0) > 0
+		const hasTags = (scriptWorkerTags?.length ?? 0) > 0
 		return [
 			...(customUi?.topBar?.tagEdit != false && hasTags
 				? [
@@ -280,13 +299,13 @@
 			return
 		}
 		$triggersCount = await ScriptService.getTriggersCountOfScript({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: initialPath
 		})
 
 		await triggersState.fetchTriggers(
 			triggersCount,
-			$workspaceStore,
+			opWorkspace,
 			initialPath,
 			false,
 			$primaryScheduleStore,
@@ -314,6 +333,21 @@
 
 	const enterpriseLangs = ['bigquery', 'snowflake', 'mssql', 'oracledb']
 
+	// Languages the pipeline editor treats as warehouse/dataset transforms —
+	// the ones where a `-- pipeline` annotation is a natural next step.
+	const pipelineHintLangs = ['duckdb', 'postgresql', 'bigquery', 'snowflake', 'mysql', 'mssql']
+	const pipelineHintDismissed = useLocalStorageValue(
+		'pipelineScriptHintDismissed',
+		false,
+		'boolean'
+	)
+	let showPipelineHint = $derived(
+		!pipelineHintDismissed.val &&
+			(script.kind === 'script' || script.kind === undefined) &&
+			pipelineHintLangs.includes(script.language ?? '') &&
+			!parsePipelineAnnotations(script.content ?? '').inPipeline
+	)
+
 	export function setCode(code: string): void {
 		editor?.setCode(code)
 	}
@@ -423,7 +457,7 @@
 		}
 		try {
 			const templateScript = await PostgresTriggerService.getTemplateScript({
-				workspace: $workspaceStore!,
+				workspace: opWorkspace!,
 				id: templateId
 			})
 			return templateScript
@@ -477,7 +511,7 @@
 			if (initialPath && initialPath != '') {
 				actual_parent_hash = (
 					await ScriptService.getScriptLatestVersion({
-						workspace: $workspaceStore!,
+						workspace: opWorkspace!,
 						path: initialPath
 					})
 				)?.script_hash
@@ -524,7 +558,7 @@
 
 	async function syncWithDeployed() {
 		const latestScript = await ScriptService.getScriptByPath({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: initialPath,
 			withStarredInfo: true
 		})
@@ -588,7 +622,7 @@
 			}
 
 			const newHash = await ScriptService.createScript({
-				workspace: $workspaceStore!,
+				workspace: opWorkspace!,
 				requestBody: {
 					path: script.path,
 					summary: script.summary,
@@ -633,11 +667,16 @@
 
 			// New/updated path now exists server-side — drop the autocomplete
 			// cache so it shows up immediately instead of after the 60s TTL.
-			invalidateWorkspacePaths($workspaceStore!)
+			invalidateWorkspacePaths(opWorkspace!)
+
+			// Authoritative save-time schema-contract check (pipelines gap #2b):
+			// warn-only, post-commit so a self-produced target resolves to the
+			// content just deployed. Fire-and-forget — must never gate the deploy.
+			notifyContractWarnings(opWorkspace!, script.language, script.content)
 
 			if (!initialPath) {
 				await CaptureService.moveCapturesAndConfigs({
-					workspace: $workspaceStore!,
+					workspace: opWorkspace!,
 					path: fakeInitialPath,
 					requestBody: {
 						new_path: script.path
@@ -649,7 +688,7 @@
 			if (triggersToDeploy) {
 				await deployTriggers(
 					triggersToDeploy,
-					$workspaceStore,
+					opWorkspace,
 					!!$userStore?.is_admin || !!$userStore?.is_super_admin,
 					usedTriggerKinds,
 					script.path,
@@ -693,11 +732,11 @@
 	// syncer flushes. No toast — the AutosaveIndicator narrates the result, and
 	// `flush` never rejects (postSave routes errors to the failures map).
 	async function saveDraft(): Promise<void> {
-		if (!$workspaceStore || !userDraftPath) return
+		if (!opWorkspace || !userDraftPath) return
 		editor?.flushPendingChanges()
 		await tick()
 		await UserDraftDbSyncer.flush({
-			workspace: $workspaceStore,
+			workspace: opWorkspace,
 			itemKind: 'script',
 			path: userDraftPath
 		})
@@ -761,10 +800,10 @@
 											window.open(`/scripts/add?template=${initialPath}`)
 										}
 									},
-									...(!isCloudHosted() && !isRuleActive('DisableWorkspaceForking')
+									...(!isCloudHosted() && editInForkAllowed(opWorkspace, $userWorkspaces)
 										? [
 												{
-													label: 'Edit in workspace fork',
+													label: editInForkLabel(opWorkspace, $userWorkspaces),
 													onClick: () => {
 														window.open(buildForkEditUrl('script', initialPath))
 													}
@@ -952,9 +991,7 @@
 			}
 		})
 	})
-	$effect(() => {
-		readFieldsRecursively(script)
-	})
+
 	// Mirror the draft triggers (held in a separate `triggersState` $state)
 	// back into `script.draft_triggers` so the UserDraft autosave — which
 	// deep-tracks `script` — picks them up. Pre-PR ScriptBuilder ran its own
@@ -967,8 +1004,12 @@
 
 	loadWorkerTags()
 	async function loadWorkerTags() {
-		if (!$workerTags) {
-			$workerTags = await WorkerService.getCustomTagsForWorkspace({ workspace: $workspaceStore! })
+		if (usesLocalTags) {
+			if (!localWorkerTags) {
+				localWorkerTags = await WorkerService.getCustomTagsForWorkspace({ workspace: opWorkspace! })
+			}
+		} else if (!$workerTags) {
+			$workerTags = await WorkerService.getCustomTagsForWorkspace({ workspace: opWorkspace! })
 		}
 	}
 </script>
@@ -1110,6 +1151,7 @@
 													autofocus={false}
 													namePlaceholder="script"
 													kind="script"
+													workspaceOverride={opWorkspace}
 												/>
 												{#if initialPath && script.path && script.path !== initialPath}
 													<Alert
@@ -1725,7 +1767,7 @@
 												/>
 												{#if script.on_behalf_of_email && canPreserve}
 													&rarr; <OnBehalfOfSelector
-														targetWorkspace={$workspaceStore ?? ''}
+														targetWorkspace={opWorkspace ?? ''}
 														targetValue={originalOnBehalfOfEmail}
 														selected={onBehalfOfChoice}
 														onSelect={(choice, details) => {
@@ -1861,8 +1903,11 @@
 		</DrawerContent>
 	</Drawer>
 
-	<div class="flex flex-col h-screen">
-		<div bind:clientWidth={topbarWidth} class="flex h-12 items-center px-4">
+	<div class="flex flex-col h-full">
+		<div
+			bind:clientWidth={topbarWidth}
+			class="flex items-center px-4 {condensedHeader ? 'h-9' : 'h-12'}"
+		>
 			<div class="flex gap-2 lg:gap-2 w-full items-center">
 				<div class="flex flex-row items-center gap-2 min-w-0 shrink">
 					<button
@@ -1872,7 +1917,7 @@
 							metadataOpen = true
 						}}
 					>
-						<LanguageIcon lang={script.language} size={24} />
+						<LanguageIcon lang={script.language} size={condensedHeader ? 18 : 24} />
 					</button>
 					{#if customUi?.topBar?.path != false}
 						<div class="min-w-0 overflow-hidden">
@@ -1883,13 +1928,15 @@
 								kind="script"
 								summaryEditable={customUi?.topBar?.editableSummary != false}
 								pathEditable={customUi?.topBar?.editablePath != false}
+								hidePath={condensedHeader}
+								workspaceId={autosaveWorkspace}
 								onNavigate={(item) => onNavigate?.(item)}
 							/>
 						</div>
 					{/if}
-					{#if indicatorWorkspace}
+					{#if opWorkspace}
 						<AutosaveIndicator
-							workspace={indicatorWorkspace}
+							workspace={opWorkspace}
 							itemKind="script"
 							path={indicatorPath}
 							draftOnly={savedScript?.no_deployed === true}
@@ -1917,7 +1964,7 @@
 							aiId="script-builder-settings"
 							aiDescription="Script builder settings to configure metadata, runtime, triggers, and generated UI."
 							variant="default"
-							unifiedSize="md"
+							unifiedSize={headerBtnSize}
 							on:click={() => (metadataOpen = true)}
 							startIcon={{ icon: Settings }}
 							iconOnly={compactTopbar}
@@ -1940,7 +1987,7 @@
 						<div title={diffTitle} class={diffDisabled ? 'flex cursor-not-allowed' : 'flex'}>
 							<Button
 								variant="default"
-								unifiedSize="md"
+								unifiedSize={headerBtnSize}
 								on:click={() => openDiffDrawer()}
 								disabled={diffDisabled}
 								btnClasses={diffDisabled ? 'pointer-events-none' : undefined}
@@ -1958,7 +2005,7 @@
 						{#snippet buttonReplacement()}
 							<Button
 								nonCaptureEvent
-								unifiedSize="md"
+								unifiedSize={headerBtnSize}
 								variant="subtle"
 								startIcon={{ icon: EllipsisVertical }}
 								iconOnly
@@ -1971,13 +2018,15 @@
 				{:else}
 					{@render diffButton()}
 					{#if customUi?.topBar?.tagEdit != false}
-						{#if $workerTags}
-							{#if $workerTags?.length ?? 0 > 0}
+						{#if scriptWorkerTags}
+							{#if scriptWorkerTags?.length ?? 0 > 0}
 								<div class="max-w-[200px]">
 									<WorkerTagSelect
 										nullTag={script.language}
 										placeholder={customUi?.tagSelectPlaceholder}
 										bind:tag={script.tag}
+										size={headerBtnSize}
+										workspaceId={opWorkspace}
 									/>
 								</div>
 							{/if}
@@ -1989,14 +2038,61 @@
 				<DeployButton
 					loading={!fullyLoaded}
 					{loadingSave}
+					unifiedSize={headerBtnSize}
 					dropdownItems={computeDropdownItems(initialPath, savedScript)}
 					on:save={({ detail }) => handleEditScript(false, detail)}
 				/>
 			</div>
 		</div>
 
+		{#if showPipelineHint}
+			<div
+				class="flex items-center gap-2 px-4 py-1 border-y bg-surface-secondary text-xs text-secondary"
+			>
+				<Network size={14} class="shrink-0 text-tertiary" />
+				<span class="truncate">
+					This script can become a data pipeline step: annotate it with
+					<code class="font-mono text-2xs bg-surface px-1 py-0.5 rounded border">-- pipeline</code>
+					and
+					<code class="font-mono text-2xs bg-surface px-1 py-0.5 rounded border">
+						-- materialize
+					</code>
+					to materialize its result, or build it in the
+					<a href="{base}/pipeline" class="text-blue-500 hover:underline">pipeline editor</a>.
+					<a
+						href="https://www.windmill.dev/docs/pipelines"
+						target="_blank"
+						rel="noreferrer"
+						class="text-blue-500 hover:underline"
+					>
+						Learn more
+					</a>
+				</span>
+				<div class="ml-auto shrink-0">
+					<Button
+						iconOnly
+						variant="subtle"
+						unifiedSize="sm"
+						startIcon={{ icon: X }}
+						title="Dismiss pipelines hint"
+						onclick={() => (pipelineHintDismissed.val = true)}
+					/>
+				</div>
+			</div>
+		{/if}
+
 		<ScriptEditor
 			{disableAi}
+			workspaceOverride={opWorkspace}
+			sessionOpen={script.path
+				? {
+						target: { kind: 'script', path: script.path },
+						workspaceId: opWorkspace ?? undefined,
+						// Flush the per-user draft so the session preview opens the script
+						// exactly as it is in the editor right now.
+						beforeOpen: saveDraft
+					}
+				: undefined}
 			bind:selectedTab={selectedInputTab}
 			{customUi}
 			{onTestJob}
@@ -2018,6 +2114,7 @@
 			stablePathForCaptures={initialPath || fakeInitialPath}
 			bind:code={script.content}
 			lang={script.language}
+			timeout={script.timeout}
 			kind={script.kind}
 			autoKind={script.auto_kind}
 			{template}
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index a591e54324..dfff33a208 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -15,6 +15,7 @@
 	import { copyToClipboard, emptySchema, sendUserToast } from '$lib/utils'
 	import Editor from './Editor.svelte'
 	import { inferArgs, inferAssets, inferAnsibleExecutionMode } from '$lib/infer'
+	import { parsePipelineAnnotations } from '$lib/components/assets/AssetGraph/parsePipelineAnnotations'
 	import { isWorkflowAsCode } from '$lib/components/graph/wacToFlow'
 	import WacDiagram from '$lib/components/graph/WacDiagram.svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
@@ -51,6 +52,7 @@
 		Play,
 		PlayIcon,
 		Plus,
+		Target,
 		Terminal,
 		Pencil,
 		WandSparkles,
@@ -89,6 +91,9 @@
 	import { getStringError } from './copilot/chat/utils'
 	import type { ScriptOptions } from './copilot/chat/ContextManager.svelte'
 	import { aiChatManager, AIMode } from './copilot/chat/AIChatManager.svelte'
+	import OpenInSessionButton, {
+		type OpenInSessionSource
+	} from './sessions/OpenInSessionButton.svelte'
 
 	// Forward-looking hook for the upcoming session-pane feature: that PR will
 	// `setContext('aiChatManager', ...)` from the session wrapper so this editor
@@ -102,6 +107,12 @@
 	import AssetsDropdownButton from './assets/AssetsDropdownButton.svelte'
 	import { canHavePreprocessor } from '$lib/script_helpers'
 	import { assetEq, type AssetWithAltAccessType } from './assets/lib'
+	import type { ColumnLineage } from './assets/AssetGraph/parsePipelineAnnotations'
+	import {
+		computeContractMarkers,
+		type ContractMarker,
+		type SchemaContractGraphContext
+	} from './assets/AssetGraph/schemaContracts'
 	import { editor as meditor } from 'monaco-editor'
 	import type { ReviewChangesOpts } from './copilot/chat/monaco-adapter'
 	import GitRepoViewer from './GitRepoViewer.svelte'
@@ -156,6 +167,15 @@
 		// succeeded.
 		requireValidAssets?: boolean
 		args: Record<string, any>
+		// Emitted with the test-form's full-schema validity whenever it changes, so
+		// a host (the pipeline editor) can gate a data-upload entry's readiness on
+		// whether every required field is filled, not just the S3 file. A callback
+		// rather than a bindable so we don't hit the `$bindable(default)` ban.
+		onIsValidChange?: (isValid: boolean) => void
+		// Custom timeout (in seconds) from the script settings. Forwarded to the
+		// preview run so "Test" honors the same timeout a deployed run would,
+		// instead of silently falling back to the instance default.
+		timeout?: number
 		selectedTab?: 'main' | 'preprocessor' | 'diagram'
 		hasPreprocessor?: boolean
 		captureTable?: CaptureTable | undefined
@@ -165,6 +185,11 @@
 		lastDeployedCode?: string | undefined
 		disableAi?: boolean
 		assets?: AssetWithAltAccessType[]
+		// Body-inferred column lineage (DuckDB SQL AST), surfaced alongside
+		// `assets` so the pipeline editor can render inferred column lineage on
+		// the live graph. Empty/undefined for non-DuckDB or when the parser
+		// build predates the inference.
+		inferredColumnLineage?: ColumnLineage[]
 		modules?: { [key: string]: ScriptModule } | null
 		editorBarRight?: import('svelte').Snippet
 		enablePreprocessorSnippet?: boolean
@@ -190,6 +215,19 @@
 		// regular /scripts/edit route keeps its current open-by-default UX;
 		// the session preview opts in to save vertical real estate.
 		initialTestPanelCollapsed?: boolean
+		// Lets the AI toolbar button open the script in a fresh AI session
+		// instead of the inline chat panel (see OpenInSessionButton for gating).
+		sessionOpen?: OpenInSessionSource
+		// Producer-side facts for the live schema-contract diagnostics
+		// (`on_schema_change=ignore` suppression + scd2 `_current` fallback),
+		// built by the pipeline page from the resolved graph. Absent outside the
+		// pipeline editor — the check still runs, just without suppression.
+		schemaContractContext?: SchemaContractGraphContext
+		// Workspace to scope this editor's calls to. Defaults to the nav
+		// `$workspaceStore`; an AI-session live editor passes the session's
+		// acting workspace (a fork) so tests, captures and toolbar lookups hit
+		// the right workspace instead of the nav one.
+		workspaceOverride?: string
 	}
 
 	let {
@@ -213,6 +251,8 @@
 		customUi = undefined,
 		requireValidAssets = false,
 		args = $bindable(),
+		onIsValidChange,
+		timeout = undefined,
 		selectedTab = $bindable('main'),
 		hasPreprocessor = $bindable(false),
 		captureTable = $bindable(undefined),
@@ -222,15 +262,21 @@
 		lastDeployedCode = undefined,
 		disableAi = false,
 		assets = $bindable(),
+		inferredColumnLineage = $bindable(),
 		modules = $bindable(undefined),
 		editorBarRight,
 		enablePreprocessorSnippet = false,
 		previewLayout = 'right',
 		onTestStateChange,
 		onTestJob,
-		initialTestPanelCollapsed = false
+		initialTestPanelCollapsed = false,
+		sessionOpen = undefined,
+		schemaContractContext = undefined,
+		workspaceOverride = undefined
 	}: Props = $props()
 
+	let opWs = $derived(workspaceOverride ?? $workspaceStore)
+
 	$effect(() => {
 		onTestStateChange?.(testIsLoading)
 	})
@@ -267,6 +313,7 @@
 		if (activeModuleTab === null && code !== lastSyncedCode) {
 			editorCode = code
 			lastSyncedCode = code
+			editor?.setCode(editorCode) // immediate sync, don't wait for the 800ms debounce
 			untrack(() => inferSchema(code))
 		}
 	})
@@ -557,7 +604,7 @@
 	let inferAssetsRes = resource([() => lang, () => code, () => code], () => inferAssets(lang, code))
 	let preparedSqlQueries = usePreparedAssetSqlQueries(
 		() => inferAssetsRes.current?.sql_queries,
-		() => $workspaceStore
+		() => opWs
 	)
 	// Asset-parse validity for the editor badge. `undefined` while loading (so
 	// the badge doesn't flicker red); only an explicit parser error counts as
@@ -577,7 +624,13 @@
 	watch(
 		() => inferAssetsRes.current,
 		() => {
-			if (!inferAssetsRes.current || inferAssetsRes.current?.status === 'error') return
+			if (!inferAssetsRes.current || inferAssetsRes.current?.status === 'error') {
+				// Clear stale lineage on parse error / unset, so a script switch
+				// whose new body fails to parse can't leave the previous script's
+				// inferred column lineage bound to the new path.
+				if (inferredColumnLineage !== undefined) inferredColumnLineage = undefined
+				return
+			}
 			let newAssets = inferAssetsRes.current.assets as AssetWithAltAccessType[]
 			for (const asset of newAssets) {
 				const old = assets?.find((a) => assetEq(a, asset))
@@ -585,9 +638,43 @@
 			}
 			const normalizedAssets = newAssets.length > 0 ? newAssets : undefined
 			if (!deepEqual(assets, normalizedAssets)) assets = normalizedAssets
+
+			const newLineage = inferAssetsRes.current.column_lineage
+			const normalizedLineage = newLineage && newLineage.length > 0 ? newLineage : undefined
+			if (!deepEqual(inferredColumnLineage, normalizedLineage))
+				inferredColumnLineage = normalizedLineage
 		}
 	)
 
+	// Live schema-contract diagnostics (pipelines gap #2b): diff the buffer's
+	// asset refs against the captured producer schemas and surface mismatches
+	// as Monaco warning squiggles — the as-you-type mirror of the authoritative
+	// save-time check. The result is a prop on Editor (not an imperative call)
+	// because this can resolve before Monaco initializes on mount. Sequenced so
+	// a slow schema fetch can't overwrite the markers of a newer keystroke.
+	let contractMarkers: ContractMarker[] = $state([])
+	let contractCheckSeq = 0
+	watch([() => inferAssetsRes.current, () => schemaContractContext], () => {
+		const res = inferAssetsRes.current
+		const workspace = opWs
+		const seq = ++contractCheckSeq
+		if (!workspace || !res || res.status === 'error') {
+			contractMarkers = []
+			return
+		}
+		const bufferCode = code
+		computeContractMarkers(
+			workspace,
+			bufferCode,
+			(res.assets ?? []) as AssetWithAltAccessType[],
+			schemaContractContext
+		)
+			.then((markers) => {
+				if (seq === contractCheckSeq) contractMarkers = markers
+			})
+			.catch((e) => console.error('schema-contract diagnostics failed', e))
+	})
+
 	watch([() => code, () => lang], () => {
 		if (lang !== 'ansible') return
 		inferAnsibleExecutionMode(code).then((v) => {
@@ -612,6 +699,10 @@
 	let jobLoader: JobLoader | undefined = $state(undefined)
 
 	let isValid: boolean = $state(true)
+	// Mirror the test-form validity out to an optional host callback.
+	$effect(() => {
+		onIsValidChange?.(isValid)
+	})
 	let scriptProgress = $state(undefined)
 
 	let logPanel: LogPanel | undefined = $state(undefined)
@@ -717,7 +808,17 @@
 		args = nargs
 	}
 
-	export async function runTest(opts?: { cascade?: boolean }) {
+	export async function runTest(opts?: { cascade?: boolean; skipDdlGuard?: boolean }) {
+		// Intercept DDL statements (offer to turn them into data table migrations)
+		// on every run path, not just the editor's Cmd+Enter. `skipDdlGuard` is set
+		// by the Cmd+Enter action, which already guarded before calling us.
+		if (!opts?.skipDdlGuard) {
+			if ((await editor?.guardDdlBeforeRun()) === false) return
+			// The guard may have rewritten the code (migrated statements stripped);
+			// `editorCode` is kept in sync by the editor binding, so mirror the
+			// on:change handler and pull it into `code` before we run.
+			if (activeModuleTab === null) code = editorCode
+		}
 		// When the caller forces a cascade choice (e.g. the canvas runnable
 		// menu's "Run + trigger N downstream"), also flip the persistent
 		// `cascadeDownstream` state so the split button's label/icon reflect
@@ -744,7 +845,7 @@
 					? { _ENTRYPOINT_OVERRIDE: 'preprocessor', ...(args ?? {}) }
 					: (args ?? {})
 		const testSchema = activeModuleTab !== null ? testPanelSchema : schema
-		const testArgs = await processSecretArgs(rawTestArgs, testSchema)
+		const testArgs = await processSecretArgs(rawTestArgs, testSchema, opWs)
 		if (showPsCommonParams) {
 			for (const [k, v] of Object.entries(psCommonParams)) {
 				if (v !== undefined && v !== false && v !== '') {
@@ -788,7 +889,9 @@
 				}
 			},
 			undefined,
-			activeModuleTab !== null ? undefined : modules
+			activeModuleTab !== null ? undefined : modules,
+			undefined,
+			timeout
 		)
 		if (job) {
 			onTestJob?.({ jobId: job })
@@ -813,7 +916,7 @@
 	async function loadPastTests(): Promise<void> {
 		pastPreviewsRequest?.cancel()
 		const req = JobService.listCompletedJobs({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			jobKinds: 'preview',
 			createdBy: $userStore?.username,
 			scriptPathExact: path,
@@ -878,16 +981,67 @@
 				// we reapply initial args as the schema form might have cleared them between mount and the schema inference
 				args = initialArgs
 			}
+			injectPartitionArg(nschema, args, nlang ?? lang, code)
 			schema = nschema
 		} catch (e) {
 			validCode = false
 		}
 	}
 
+	// A `// partitioned` pipeline script is materialized one slice at a time and
+	// receives the slice as a runtime `partition` arg (the cascade injects it in
+	// production). It isn't a code parameter, so schema inference doesn't see it —
+	// surface it in the test form so a partitioned script can be run manually.
+	function injectPartitionArg(
+		s: any,
+		a: Record<string, any> | undefined,
+		l: string | undefined,
+		c: string
+	) {
+		try {
+			if (l !== 'duckdb' || !s?.properties) return
+			const part = parsePipelineAnnotations(c).partition
+			if (!part) return
+			// Date-based partition kinds render a date / datetime picker; a dynamic
+			// key is a free-form string.
+			const format =
+				part.kind === 'hourly'
+					? 'date-time'
+					: part.kind === 'daily' || part.kind === 'weekly' || part.kind === 'monthly'
+						? 'date'
+						: undefined
+			if (!s.properties['partition']) {
+				s.properties['partition'] = {
+					type: 'string',
+					...(format ? { format } : {}),
+					// ISO output so partition keys sort lexicographically (the date
+					// picker defaults to dd-MM-yyyy otherwise).
+					...(format === 'date' ? { dateFormat: 'yyyy-MM-dd' } : {}),
+					description:
+						part.kind === 'dynamic'
+							? 'Partition key value to materialize.'
+							: `Partition (${part.kind}) to materialize.`
+				}
+				if (Array.isArray(s.order) && !s.order.includes('partition')) {
+					s.order = ['partition', ...s.order]
+				}
+			}
+			// Pre-fill the *test* arg with the current slice for date kinds — a
+			// convenience default, kept on the args (not baked into the schema,
+			// where it would persist to the deployed script and go stale).
+			if (format && a && (a['partition'] == null || a['partition'] === '')) {
+				const now = new Date()
+				a['partition'] =
+					format === 'date' ? now.toISOString().slice(0, 10) : now.toISOString().slice(0, 16)
+			}
+		} catch (e) {}
+	}
+
 	async function inferModuleSchema() {
 		if (activeModuleTab === null) return
 		try {
 			await inferArgs(effectiveLang, editorCode, testPanelSchema)
+			injectPartitionArg(testPanelSchema, testPanelArgs, effectiveLang, editorCode)
 			moduleTestState[activeModuleTab] = { args: testPanelArgs, schema: testPanelSchema }
 		} catch (e) {
 			// Module code may be in-progress; silently ignore
@@ -1064,12 +1218,12 @@
 			dapClient = getDAPClient(dapServerUrl)
 
 			// Fetch contextual variables (WM_WORKSPACE, WM_TOKEN, etc.) from backend
-			const env = await fetchContextualVariables($workspaceStore ?? '')
+			const env = await fetchContextualVariables(opWs ?? '')
 
 			// Sign the debug request (creates audit log entry)
 			let signedPayload
 			try {
-				signedPayload = await signDebugRequest($workspaceStore ?? '', code ?? '', lang ?? 'python3')
+				signedPayload = await signDebugRequest(opWs ?? '', code ?? '', lang ?? 'python3')
 				debugSessionJobId = signedPayload.job_id
 			} catch (signError) {
 				sendUserToast(getDebugErrorMessage(signError), true)
@@ -1289,11 +1443,11 @@
 	// what's there" affordance, not a user action. Skipped when a test is
 	// already running so a live job's stream is never clobbered.
 	async function loadLastRunIntoTestPanel(): Promise<void> {
-		if (!path || !$workspaceStore) return
+		if (!path || !opWs) return
 		if (testIsLoading || testJob !== undefined) return
 		try {
 			const jobs = await JobService.listCompletedJobs({
-				workspace: $workspaceStore,
+				workspace: opWs,
 				scriptPathExact: path,
 				hasNullParent: true,
 				perPage: 1,
@@ -1325,7 +1479,7 @@
 
 		let token: string | undefined
 		try {
-			token = await signMultiplayerRequest($workspaceStore ?? '')
+			token = await signMultiplayerRequest(opWs ?? '')
 		} catch (e) {
 			console.error('Failed to sign multiplayer request:', e)
 			sendUserToast('Failed to authorize multiplayer session', true)
@@ -1340,7 +1494,7 @@
 
 		wsProvider = new WebsocketProvider(
 			buildWsUrl('/ws_mp/'),
-			$workspaceStore + '/' + (path ?? 'no-room-name'),
+			opWs + '/' + (path ?? 'no-room-name'),
 			ydoc,
 			{ connect: false, params: { token } }
 		)
@@ -1408,7 +1562,7 @@
 		let url = new URL(window.location.toString().split('#')[0])
 		url.search = ''
 		return (
-			`${url}?collab=1&workspace=${encodeURIComponent($workspaceStore ?? '')}&lang=${encodeURIComponent(lang ?? '')}` +
+			`${url}?collab=1&workspace=${encodeURIComponent(opWs ?? '')}&lang=${encodeURIComponent(lang ?? '')}` +
 			(edit ? '' : `&path=${path}`)
 		)
 	}
@@ -1539,18 +1693,29 @@
 	let error = $derived(getError(testJob))
 
 	$effect(() => {
-		const options: ScriptOptions = {
-			code,
-			lang: lang as ScriptLang,
-			error,
-			args: args ?? {},
-			path,
+		;[
+			editor,
 			lastSavedCode,
 			lastDeployedCode,
 			diffMode,
-			workflowAsCode: workflowAsCodeAiContext
-		}
+			workflowAsCodeAiContext,
+			args,
+			error,
+			lang,
+			path
+		]
 		untrack(() => {
+			const options: ScriptOptions = {
+				getCode: () => code,
+				lang: lang as ScriptLang,
+				error,
+				args: args ?? {},
+				path,
+				lastSavedCode,
+				lastDeployedCode,
+				diffMode,
+				workflowAsCode: workflowAsCodeAiContext
+			}
 			aiChatManager.scriptEditorOptions = options
 			aiChatManager.scriptEditorApplyCode = async (code: string, opts?: ReviewChangesOpts) => {
 				hideDiffMode()
@@ -1568,6 +1733,7 @@
 
 <JobLoader
 	noCode={true}
+	workspaceOverride={opWs}
 	bind:scriptProgress
 	bind:this={jobLoader}
 	bind:isLoading={testIsLoading}
@@ -1603,6 +1769,7 @@
 	<div class="flex justify-between space-x-2">
 		{#if args}
 			<EditorBar
+				workspace={opWs}
 				scriptPath={edit ? path : undefined}
 				on:toggleCollabMode={() => {
 					if (wsProvider?.shouldConnect) {
@@ -1821,7 +1988,7 @@
 						     it visually pinned to the top edge without
 						     relying on cross-browser overflow behaviour. -->
 							<div class="relative h-full pt-9 flex flex-col">
-								{#if testJob?.id && testJob.type === 'CompletedJob' && $workspaceStore}
+								{#if testJob?.id && testJob.type === 'CompletedJob' && opWs}
 									<!-- Right-side affordances when we're displaying a *completed*
 									     job (either the user just ran a test, or the on-mount
 									     last-run loader populated the panel). The job-id link
@@ -1832,7 +1999,7 @@
 									<div class="absolute top-1 right-2 z-10 flex items-center gap-2">
 										<a
 											class="text-3xs text-blue-600 hover:underline font-mono"
-											href={`${base}/run/${testJob.id}?workspace=${$workspaceStore}`}
+											href={`${base}/run/${testJob.id}?workspace=${opWs}`}
 											target="_blank"
 											rel="noopener noreferrer"
 											title="Open this run"
@@ -1840,7 +2007,7 @@
 											{testJob.id.slice(0, 8)}… ↗
 										</a>
 										<DispatchEventsButton
-											workspace={testJob.workspace_id ?? $workspaceStore}
+											workspace={testJob.workspace_id ?? opWs}
 											jobId={testJob.id}
 										/>
 									</div>
@@ -1848,15 +2015,18 @@
 								<div class="absolute top-1 left-2 z-10">
 									{#if testIsLoading}
 										{@render cancelTestButton('sm', 'shadow-md')}
-									{:else if (customUi?.previewPanel?.downstreamSubscribers ?? 0) > 0}
+									{:else if (customUi?.previewPanel?.downstreamSubscribers ?? 0) > 0 || customUi?.previewPanel?.onBoundedRun}
 										<!-- Split button: primary "Test" runs just this step
 									     (skips the asset-trigger cascade); the caret
 									     opens a popover with the cascade option labelled
 									     by the downstream count. The active mode is
 									     reflected in both the button label and the
 									     check-mark on the menu item so the user always
-									     knows whether the next run will fan out. -->
-										{@const downstream = customUi!.previewPanel!.downstreamSubscribers!}
+									     knows whether the next run will fan out. A
+									     pure-reader-only root has no subscriber downstream
+									     but still gets `onBoundedRun`, so the split button
+									     also opens for it (with the cascade item hidden). -->
+										{@const downstream = customUi?.previewPanel?.downstreamSubscribers ?? 0}
 										<div class="flex items-stretch shadow-md rounded-md overflow-hidden">
 											<Button
 												on:click={() => runTest()}
@@ -1919,31 +2089,55 @@
 																>
 															</div>
 														</button>
-														<button
-															type="button"
-															class="w-full text-left px-3 py-2 hover:bg-surface-hover flex items-start gap-2"
-															onclick={() => {
-																cascadeDownstream = true
-																close()
-																void runTest()
-															}}
-														>
-															<Zap
-																size={14}
-																class="mt-0.5 shrink-0 text-amber-600 dark:text-amber-400"
-															/>
-															<div class="flex flex-col min-w-0">
-																<span class="font-medium">
-																	Test + trigger {downstream} downstream {cascadeDownstream
-																		? '(current)'
-																		: ''}
-																</span>
-																<span class="text-2xs text-secondary">
-																	Let the asset-trigger cascade fan out to the {downstream}
-																	subscribed script{downstream === 1 ? '' : 's'} after this run succeeds.
-																</span>
-															</div>
-														</button>
+														{#if downstream > 0}
+															<button
+																type="button"
+																class="w-full text-left px-3 py-2 hover:bg-surface-hover flex items-start gap-2"
+																onclick={() => {
+																	cascadeDownstream = true
+																	close()
+																	void runTest()
+																}}
+															>
+																<Zap
+																	size={14}
+																	class="mt-0.5 shrink-0 text-amber-600 dark:text-amber-400"
+																/>
+																<div class="flex flex-col min-w-0">
+																	<span class="font-medium">
+																		Test + trigger {downstream} downstream {cascadeDownstream
+																			? '(current)'
+																			: ''}
+																	</span>
+																	<span class="text-2xs text-secondary">
+																		Let the asset-trigger cascade fan out to the {downstream}
+																		subscribed script{downstream === 1 ? '' : 's'} after this run succeeds.
+																	</span>
+																</div>
+															</button>
+														{/if}
+														{#if customUi?.previewPanel?.onBoundedRun}
+															<button
+																type="button"
+																class="w-full text-left px-3 py-2 hover:bg-surface-hover flex items-start gap-2 border-t"
+																onclick={() => {
+																	close()
+																	customUi!.previewPanel!.onBoundedRun!()
+																}}
+															>
+																<Target
+																	size={14}
+																	class="mt-0.5 shrink-0 text-blue-600 dark:text-blue-400"
+																/>
+																<div class="flex flex-col min-w-0">
+																	<span class="font-medium">Run downstream up to…</span>
+																	<span class="text-2xs text-secondary">
+																		Pick end node(s) on the graph, then run only the cascade between
+																		this script and them.
+																	</span>
+																</div>
+															</button>
+														{/if}
 													</div>
 												{/snippet}
 											</Popover>
@@ -1958,6 +2152,7 @@
 									>
 										{#key argsRender}
 											<SchemaForm
+												workspace={opWs}
 												helperScript={{
 													source: 'inline',
 													code,
@@ -2027,6 +2222,7 @@
 													{#key argsRender}
 														{#if activeModuleTab !== null}
 															<SchemaForm
+																workspace={opWs}
 																helperScript={{
 																	source: 'inline',
 																	code: editorCode,
@@ -2043,6 +2239,7 @@
 															/>
 														{:else}
 															<SchemaForm
+																workspace={opWs}
 																helperScript={{
 																	source: 'inline',
 																	code,
@@ -2147,6 +2344,7 @@
 			<div class="h-full p-2">
 				<CaptureTable
 					bind:this={captureTable}
+					workspace={opWs}
 					{hasPreprocessor}
 					canHavePreprocessor={canHavePreprocessor(lang)}
 					isFlow={false}
@@ -2415,37 +2613,41 @@
 				{/if}
 				{#if !aiChatManager.open && !disableAi && !inSessionPane}
 					{#if customUi?.editorBar?.aiGen != false && SUPPORTED_CHAT_SCRIPT_LANGUAGES.includes(lang ?? '')}
-						<HideButton
-							hidden={true}
-							direction="right"
-							panelName="AI"
-							shortcut="L"
-							unifiedSize="sm"
-							usePopoverOverride={!$copilotInfo.enabled}
-							customHiddenIcon={{
-								icon: WandSparkles
-							}}
-							btnClasses="!text-ai"
-							variant="default"
-							on:click={() => {
-								if (!aiChatManager.open) {
-									aiChatManager.changeMode(AIMode.SCRIPT)
-								}
-								aiChatManager.toggleOpen()
-							}}
-						>
-							{#snippet popoverOverride()}
-								<div class="text-sm">
-									Enable Windmill AI in the <a
-										href="{base}/workspace_settings?tab=ai"
-										target="_blank"
-										class="inline-flex flex-row items-center gap-1"
-									>
-										workspace settings <ExternalLink size={16} />
-									</a>
-								</div>
+						<OpenInSessionButton source={sessionOpen}>
+							{#snippet fallback()}
+								<HideButton
+									hidden={true}
+									direction="right"
+									panelName="AI"
+									shortcut="L"
+									unifiedSize="sm"
+									usePopoverOverride={!$copilotInfo.enabled}
+									customHiddenIcon={{
+										icon: WandSparkles
+									}}
+									btnClasses="!text-ai"
+									variant="default"
+									on:click={() => {
+										if (!aiChatManager.open) {
+											aiChatManager.changeMode(AIMode.SCRIPT)
+										}
+										aiChatManager.toggleOpen()
+									}}
+								>
+									{#snippet popoverOverride()}
+										<div class="text-sm">
+											Enable Windmill AI in the <a
+												href="{base}/workspace_settings?tab=ai"
+												target="_blank"
+												class="inline-flex flex-row items-center gap-1"
+											>
+												workspace settings <ExternalLink size={16} />
+											</a>
+										</div>
+									{/snippet}
+								</HideButton>
 							{/snippet}
-						</HideButton>
+						</OpenInSessionButton>
 					{/if}
 				{/if}
 			</div>
@@ -2461,7 +2663,7 @@
 							client={dapClient}
 							currentFrameId={currentDebugFrameId}
 							onClose={() => (showDebugConsole = false)}
-							workspace={$workspaceStore}
+							workspace={opWs}
 							jobId={debugSessionJobId ?? undefined}
 						/>
 					</Pane>
@@ -2485,6 +2687,7 @@
 			bind:code={editorCode}
 			bind:websocketAlive
 			bind:this={editor}
+			schemaContractMarkers={contractMarkers}
 			{yContent}
 			awareness={wsProvider?.awareness}
 			on:change={(e) => {
@@ -2509,7 +2712,8 @@
 				} else {
 					await inferModuleSchema()
 				}
-				runTest()
+				// The Editor already ran the DDL guard before invoking this action.
+				runTest({ skipDdlGuard: true })
 			}}
 			formatAction={async () => {
 				if (activeModuleTab === null) {
diff --git a/frontend/src/lib/components/Section.svelte b/frontend/src/lib/components/Section.svelte
index 218beec7fa..f1425c51b7 100644
--- a/frontend/src/lib/components/Section.svelte
+++ b/frontend/src/lib/components/Section.svelte
@@ -104,7 +104,7 @@
 			{#if description}
 				<div class="text-xs text-primary mt-1 mb-2">{@html description}</div>
 			{/if}
-			<div class="flex flex-col gap-6 grow min-h-0 mt-4">
+			<div class={twMerge('flex flex-col gap-6 grow min-h-0', headless ? '' : 'mt-4')}>
 				<div class={twMerge('grow min-h-0', clazz)}>
 					{@render children?.()}
 				</div>
diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index 741d874f81..f1c4daa962 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -95,6 +95,7 @@
 		loadAsync = false,
 		key,
 		disabled = false,
+		readOnly = false,
 		minHeight = 1000,
 		renderLineHighlight = 'none',
 		suggestion
@@ -123,6 +124,9 @@
 		initialCursorPos?: IPosition
 		key?: string
 		disabled?: boolean
+		/** Read-only Monaco mode: not editable, but still scrollable/selectable
+		 * (unlike `disabled`, which makes the editor non-interactive). */
+		readOnly?: boolean
 		minHeight?: number
 		renderLineHighlight?: 'all' | 'line' | 'gutter' | 'none'
 		suggestion?: string
@@ -239,6 +243,9 @@
 			lineNumbers: $relativeLineNumbers ? 'relative' : 'on'
 		})
 	})
+	$effect(() => {
+		editor?.updateOptions({ readOnly })
+	})
 
 	function onVimDisable() {
 		vimDisposable?.dispose()
@@ -342,6 +349,7 @@
 				),
 				model,
 				...(yPadding !== undefined ? { padding: { bottom: yPadding, top: yPadding } } : {}),
+				readOnly,
 				renderLineHighlight,
 				lineDecorationsWidth: 0,
 				lineNumbersMinChars: 2,
diff --git a/frontend/src/lib/components/SqlRepl.svelte b/frontend/src/lib/components/SqlRepl.svelte
index 661b0ccd2c..5ca069b5be 100644
--- a/frontend/src/lib/components/SqlRepl.svelte
+++ b/frontend/src/lib/components/SqlRepl.svelte
@@ -1,49 +1,3 @@
-<script module lang="ts">
-	// code may be composed of many sql statements separated by ';'
-	// this function splits them while taking into account that ';' may not
-	// be the end of a statement (string or escaped)
-	function splitSqlStatements(code: string) {
-		const statements: string[] = []
-		let currentStatement = ''
-		let inSingleQuote = false
-		let inDoubleQuote = false
-		let inBacktick = false
-
-		for (let i = 0; i < code.length; i++) {
-			const char = code[i]
-			const prevChar = i > 0 ? code[i - 1] : null
-
-			if (char === "'" && !inDoubleQuote && !inBacktick && prevChar !== '\\') {
-				inSingleQuote = !inSingleQuote
-			} else if (char === '"' && !inSingleQuote && !inBacktick && prevChar !== '\\') {
-				inDoubleQuote = !inDoubleQuote
-			} else if (char === '`' && !inSingleQuote && !inDoubleQuote && prevChar !== '\\') {
-				inBacktick = !inBacktick
-			}
-
-			if (char === ';' && !inSingleQuote && !inDoubleQuote && !inBacktick) {
-				statements.push(currentStatement.trim())
-				currentStatement = ''
-			} else {
-				currentStatement += char
-			}
-		}
-
-		if (currentStatement.trim()) {
-			statements.push(currentStatement.trim())
-		}
-
-		return statements
-	}
-
-	function pruneComments(code: string) {
-		return code
-			.replace(/--.*?(\r?\n|$)/g, '')
-			.replace(/\/\*[\s\S]*?\*\//g, '')
-			.trim()
-	}
-</script>
-
 <script lang="ts">
 	import { CornerDownLeft, Loader2 } from 'lucide-svelte'
 	import Button from './common/button/Button.svelte'
@@ -57,15 +11,39 @@
 	import { getDatabaseArg, getDbType } from './dbOps'
 	import type { DbInput } from './dbTypes'
 	import { wrapDucklakeQuery } from './ducklake'
+	import { splitSqlStatements, pruneComments } from './sqlDdl'
+	import DdlMigrationGuard from './DdlMigrationGuard.svelte'
 
 	type Props = {
 		input: DbInput
 		onData: (data: Record<string, any>[]) => void
 		placeholderTableName?: string
+		/** Called after a migration is run via the DDL guard, so the schema view
+		 * can be refreshed to reflect the applied change. */
+		onSchemaChange?: () => void
+		/** Workspace the REPL queries and DDL migrations run against; defaults to
+		 * the nav workspace. */
+		workspace?: string | undefined
 	}
-	let { input, onData, placeholderTableName }: Props = $props()
+	let {
+		input,
+		onData,
+		placeholderTableName,
+		onSchemaChange,
+		workspace = undefined
+	}: Props = $props()
+	let ws = $derived(workspace ?? $workspaceStore)
 	let dbType = $derived(getDbType(input))
 
+	// A datatable REPL targets `datatable://<name>`; surface DDL statements as
+	// migration prompts instead of running them ad-hoc.
+	let datatableName = $derived(
+		input.type === 'database' && input.resourcePath.startsWith('datatable://')
+			? input.resourcePath.slice('datatable://'.length).split('/')[0]
+			: undefined
+	)
+	let ddlGuard = $state<DdlMigrationGuard | undefined>(undefined)
+
 	const DEFAULT_SQL = 'SELECT * FROM _'
 	let code = $state(DEFAULT_SQL)
 	$effect(() => {
@@ -79,8 +57,20 @@
 	let runHistory: (StepHistoryData & { code: string; result: Record<string, any>[] })[] = $state([])
 
 	async function run({ doPostgresRowToJsonFix }: { doPostgresRowToJsonFix?: boolean } = {}) {
-		if (isRunning || !$workspaceStore) return
+		if (isRunning || !ws) return
 		const READ_OPS = ['SELECT', 'WITH', 'SHOW', 'EXPLAIN', 'DESCRIBE']
+
+		// On a datatable, intercept DDL statements and offer to make them
+		// migrations; the user may strip some, leaving the rest to run.
+		if (datatableName && ddlGuard && !doPostgresRowToJsonFix) {
+			const res = await ddlGuard.guard(code)
+			// A migration that was created and run changes the schema; refresh it.
+			if (res.ranMigration) onSchemaChange?.()
+			if (!res.proceed) return
+			if (res.code !== code) code = res.code
+			if (pruneComments(code).trim() === '') return
+		}
+
 		isRunning = true
 		try {
 			const statements = splitSqlStatements(pruneComments(code))
@@ -111,7 +101,7 @@
 
 			let { job, result } = (await runScriptAndPollResult(
 				{
-					workspace: $workspaceStore,
+					workspace: ws,
 					requestBody: {
 						language: getLanguageByResourceType(dbType),
 						content: transformedCode,
@@ -155,7 +145,10 @@
 				isRunning = false
 				return await run({ doPostgresRowToJsonFix: true })
 			}
-			sendUserToast('Error running query: ' + (e.message ?? e.error.message), true)
+			sendUserToast(
+				'Error running query: ' + (e?.body ?? e?.message ?? e?.error?.message ?? e),
+				true
+			)
 		} finally {
 			isRunning = false
 		}
@@ -197,3 +190,7 @@
 		/>
 	</Pane>
 </Splitpanes>
+
+{#if datatableName && ws}
+	<DdlMigrationGuard bind:this={ddlGuard} workspace={ws} datatable={datatableName} />
+{/if}
diff --git a/frontend/src/lib/components/SuperadminSettingsInner.svelte b/frontend/src/lib/components/SuperadminSettingsInner.svelte
index 700a5df2d7..e74154b406 100644
--- a/frontend/src/lib/components/SuperadminSettingsInner.svelte
+++ b/frontend/src/lib/components/SuperadminSettingsInner.svelte
@@ -10,7 +10,7 @@
 	import { base } from '$lib/base'
 	import SearchItems from './SearchItems.svelte'
 	import { page } from '$app/state'
-	import { goto as gotoUrl } from '$app/navigation'
+	import { replaceState } from '$app/navigation'
 	import Version from './Version.svelte'
 	import Uptodate from './Uptodate.svelte'
 	import InstanceSettings from './InstanceSettings.svelte'
@@ -70,7 +70,16 @@
 		const index = page.url.href.lastIndexOf('#')
 		if (index === -1) return
 		const hashRemoved = page.url.href.slice(0, index)
-		gotoUrl(hashRemoved)
+		// Strip the drawer's URL hash without a SvelteKit navigation: a `goto`
+		// here re-fires path-reactive effects on the underlying page (e.g. the
+		// script editor's load effect), wiping unsaved editor content.
+		try {
+			replaceState(hashRemoved, page.state)
+		} catch (e) {
+			// replaceState throws if the router isn't initialized yet — possible
+			// when onDestroy runs during router teardown.
+			console.error(e)
+		}
 	}
 
 	onDestroy(() => {
diff --git a/frontend/src/lib/components/TimelineBar.svelte b/frontend/src/lib/components/TimelineBar.svelte
index 5d1f53e961..1d8e05008d 100644
--- a/frontend/src/lib/components/TimelineBar.svelte
+++ b/frontend/src/lib/components/TimelineBar.svelte
@@ -15,6 +15,10 @@
 		concat?: boolean
 		gray?: boolean
 		spacerClass?: string
+		/** Overrides the default gray/blue bar color (e.g. to mark an approval wait). */
+		colorClass?: string
+		/** Tooltip label shown on hover instead of the default job link. */
+		tooltip?: string
 	}
 
 	let {
@@ -27,7 +31,9 @@
 		running,
 		concat = false,
 		gray = false,
-		spacerClass = ''
+		spacerClass = '',
+		colorClass = undefined,
+		tooltip = undefined
 	}: Props = $props()
 </script>
 
@@ -37,20 +43,26 @@
 	{/if}
 	<Popover
 		style="width: {(len / total) * 100}%"
-		class="h-5 relative {gray
-			? 'bg-gray-300 dark:bg-gray-600'
-			: running
-				? 'bg-blue-400/90'
-				: 'bg-blue-500/90'} {position == 'left'
+		class="h-5 relative {colorClass
+			? colorClass
+			: gray
+				? 'bg-gray-300 dark:bg-gray-600'
+				: running
+					? 'bg-blue-400/90'
+					: 'bg-blue-500/90'} {position == 'left'
 			? 'rounded-l-md'
 			: position == 'right'
 				? 'rounded-r-md'
 				: 'rounded-md'} center-center text-white text-2xs whitespace-nowrap hover:outline outline-1 outline-black"
 	>
 		{#snippet text()}
-			<a href="{base}/run/{id}" class="inline-flex items-center gap-1" target="_blank"
-				>{id} <ExternalLink size={14} /></a
-			>
+			{#if tooltip}
+				<span>{tooltip}</span>
+			{:else}
+				<a href="{base}/run/{id}" class="inline-flex items-center gap-1" target="_blank"
+					>{id} <ExternalLink size={14} /></a
+				>
+			{/if}
 		{/snippet}
 		{#if len > 0}
 			{@const narrow = len / total < 0.09}
diff --git a/frontend/src/lib/components/UserOffboardingModal.svelte b/frontend/src/lib/components/UserOffboardingModal.svelte
index 8f6d375ca0..26d4e83256 100644
--- a/frontend/src/lib/components/UserOffboardingModal.svelte
+++ b/frontend/src/lib/components/UserOffboardingModal.svelte
@@ -43,6 +43,7 @@
 	let ownedCount = $derived(preview ? countPaths(preview.owned) : 0)
 	let onBehalfCount = $derived(preview ? countPaths(preview.executing_on_behalf) : 0)
 	let hasItems = $derived(ownedCount > 0 || onBehalfCount > 0)
+	let canReassignHere = $derived(hasItems && users.length > 0)
 
 	let reassignTo = $derived(
 		targetKind === 'user'
@@ -83,6 +84,11 @@
 			preview = previewResult
 			users = usernamesList.filter((u) => u !== username).map((u) => ({ label: u, value: u }))
 			folders = foldersList.map((f) => ({ label: f.name, value: f.name }))
+			// Reassignment needs another workspace user as target/operator; with none
+			// (sole-member workspace) it is impossible, so fall back to plain removal.
+			if (!reassignOnly && users.length === 0) {
+				doReassign = false
+			}
 		} catch (e) {
 			sendUserToast('Failed to load offboard preview', true)
 			onClose()
@@ -173,33 +179,40 @@
 					{:else if preview}
 						<div class="mt-4 space-y-3">
 							{#if hasItems}
-								{#if !reassignOnly}
-									<Toggle
-										bind:checked={doReassign}
-										size="xs"
-										options={{ right: 'Reassign items before removing' }}
-									/>
-								{/if}
-
-								{#if doReassign}
-									<OffboardWorkspaceSection
-										{preview}
-										{username}
-										{deleteUser}
-										bind:targetKind
-										bind:selectedUser
-										bind:selectedFolder
-										bind:selectedOperator
-										{users}
-										{folders}
-									/>
+								{#if users.length === 0}
+									<p class="text-xs text-tertiary">
+										No other users in this workspace. Items will be left as-is.
+									</p>
 								{:else}
-									<Alert type="warning" title="Items will not be reassigned">
-										<p class="text-xs">
-											All items owned by {username} ({ownedCount} owned, {onBehalfCount} running on behalf)
-											will be left as-is. Triggers and runnables may stop working if the user is removed.
-										</p>
-									</Alert>
+									{#if !reassignOnly}
+										<Toggle
+											bind:checked={doReassign}
+											size="xs"
+											options={{ right: 'Reassign items before removing' }}
+										/>
+									{/if}
+
+									{#if doReassign}
+										<OffboardWorkspaceSection
+											{preview}
+											{username}
+											{deleteUser}
+											bind:targetKind
+											bind:selectedUser
+											bind:selectedFolder
+											bind:selectedOperator
+											{users}
+											{folders}
+										/>
+									{:else}
+										<Alert type="warning" title="Items will not be reassigned">
+											<p class="text-xs">
+												All items owned by {username} ({ownedCount} owned, {onBehalfCount} running on
+												behalf) will be left as-is. Triggers and runnables may stop working if the user
+												is removed.
+											</p>
+										</Alert>
+									{/if}
 								{/if}
 							{:else}
 								<p class="text-sm text-secondary">
@@ -214,7 +227,7 @@
 										different user/folder.</p
 									>
 									<ul class="text-xs list-disc list-inside max-h-32 overflow-y-auto">
-										{#each conflicts as conflict}
+										{#each conflicts as conflict, i (i)}
 											<li>{conflict}</li>
 										{/each}
 									</ul>
@@ -224,7 +237,7 @@
 					{/if}
 
 					<div class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4">
-						{#if hasItems || deleteUser}
+						{#if deleteUser || canReassignHere}
 							<Button
 								disabled={submitting || !canSubmit}
 								onclick={submit}
diff --git a/frontend/src/lib/components/VariableEditor.svelte b/frontend/src/lib/components/VariableEditor.svelte
index e26976f08c..7844d76bd9 100644
--- a/frontend/src/lib/components/VariableEditor.svelte
+++ b/frontend/src/lib/components/VariableEditor.svelte
@@ -29,6 +29,12 @@
 		wsSpecific: boolean
 	}
 
+	// The "current" workspace this editor defaults New/Edit actions to. Session
+	// editors pass their acting workspace so secrets are created/updated there
+	// rather than in the navigation workspace. Defaults to $workspaceStore.
+	let { workspace = undefined }: { workspace?: string } = $props()
+	let curWs = $derived(workspace ?? $workspaceStore)
+
 	let editPath: string | undefined = $state(undefined)
 
 	// Per-workspace handles are driven by `useMany`. We track the workspace
@@ -119,9 +125,7 @@
 	// that case.
 	const selectedDirty = $derived(!!selected && dirtyWorkspaces.includes(selected))
 	const otherDirty = $derived(
-		dirtyWorkspaces.length == 1
-			? dirtyWorkspaces.filter((ws) => ws !== $workspaceStore)
-			: dirtyWorkspaces
+		dirtyWorkspaces.length == 1 ? dirtyWorkspaces.filter((ws) => ws !== curWs) : dirtyWorkspaces
 	)
 	const dirtyValid = $derived(
 		dirtyWorkspaces.every((ws) => {
@@ -198,7 +202,7 @@
 	export function initNew(): void {
 		reset()
 		editPath = undefined
-		const ws = $workspaceStore!
+		const ws = curWs!
 		const s: VariableState = {
 			path: '',
 			variable: { value: '', is_secret: true, description: '' },
@@ -215,7 +219,7 @@
 	export function editVariable(edit_path: string): void {
 		reset()
 		editPath = edit_path
-		selected = $workspaceStore!
+		selected = curWs!
 		drawer?.openDrawer()
 	}
 
@@ -292,11 +296,13 @@
 <Drawer bind:this={drawer} size="50rem">
 	<DrawerContent
 		title={edit ? `Update variable at ${initialPath}` : 'Add a variable'}
+		bannerReserved={edit}
 		on:close={drawer?.closeDrawer}
 	>
 		{#snippet banner()}
 			<LocalDraftBanner
 				show={edit && selectedDirty}
+				reserveSpace={edit}
 				getDeployed={() => (selected ? initialStates[selected] : undefined)}
 				getCurrent={() => current}
 				onDiscard={() => {
@@ -308,7 +314,7 @@
 				disabled={!can_write}
 			/>
 		{/snippet}
-		<div class="flex flex-col gap-8">
+		<div class="flex flex-col gap-8 pb-2">
 			{#if !can_write}
 				<Alert type="warning" title="Only read access">
 					You only have read access to this resource and cannot edit it
@@ -335,18 +341,14 @@
 						{can_write}
 						{edit}
 						onLoadSecret={loadSecret}
+						{workspace}
 					/>
 				{/key}
 			{/if}
 		</div>
 		{#snippet actions()}
-			{#if edit && $workspaceStore}
-				<WsSpecificVersions
-					kind="variable"
-					workspaceId={$workspaceStore}
-					{initialPath}
-					bind:selected
-				/>
+			{#if edit && curWs}
+				<WsSpecificVersions kind="variable" workspaceId={curWs} {initialPath} bind:selected />
 			{/if}
 			<Button
 				on:click={save}
diff --git a/frontend/src/lib/components/VariableForm.svelte b/frontend/src/lib/components/VariableForm.svelte
index d19b87ca72..7f35c0435a 100644
--- a/frontend/src/lib/components/VariableForm.svelte
+++ b/frontend/src/lib/components/VariableForm.svelte
@@ -32,6 +32,8 @@
 		can_write: boolean
 		edit: boolean
 		onLoadSecret?: () => void
+		/** Workspace the path is validated against; defaults to the nav workspace. */
+		workspace?: string | undefined
 	}
 
 	let {
@@ -44,9 +46,12 @@
 		deployTo,
 		can_write,
 		edit,
-		onLoadSecret
+		onLoadSecret,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	const MAX_VARIABLE_LENGTH = 10000
 
 	let editorKind: 'plain' | 'json' | 'yaml' = $state('plain')
@@ -60,12 +65,13 @@
 <div class="flex flex-col gap-1">
 	<label for="path" class="text-xs font-semibold text-emphasis">Path</label>
 	<Path
-		disabled={initialPath != '' && !isOwner(initialPath, $userStore, $workspaceStore)}
+		disabled={initialPath != '' && !isOwner(initialPath, $userStore, ws)}
 		bind:error={pathError}
 		bind:path
 		{initialPath}
 		namePlaceholder="variable"
 		kind="variable"
+		workspaceOverride={workspace}
 	/>
 	<LabelsInput bind:labels />
 </div>
diff --git a/frontend/src/lib/components/WorkerTagPicker.svelte b/frontend/src/lib/components/WorkerTagPicker.svelte
index 1b316a61f5..ccc3266ced 100644
--- a/frontend/src/lib/components/WorkerTagPicker.svelte
+++ b/frontend/src/lib/components/WorkerTagPicker.svelte
@@ -11,28 +11,53 @@
 		popupPlacement?: 'bottom-end' | 'top-end'
 		disabled?: boolean
 		placeholder?: string
+		// Workspace to read tags from; defaults to $workspaceStore. A fork-scoped
+		// session passes its effective workspace so the picker matches the deploy target.
+		workspaceId?: string
 	}
 
 	let {
 		tag = $bindable(),
 		popupPlacement = 'bottom-end',
 		disabled = false,
-		placeholder
+		placeholder,
+		workspaceId = undefined
 	}: Props = $props()
 
+	// See WorkerTagSelect: the shared `workerTags` cache is navigation-scoped, so a
+	// different target workspace reads/writes a local list to avoid clobbering it.
+	let effectiveWorkspace = $derived(workspaceId ?? $workspaceStore)
+	let usesLocal = $derived(workspaceId != undefined && workspaceId !== $workspaceStore)
+	let localWorkerTags = $state<string[] | undefined>(undefined)
+	let currentTags = $derived(usesLocal ? localWorkerTags : $workerTags)
+
 	loadWorkerTags()
 	async function loadWorkerTags(force = false) {
-		if (!$workerTags || force) {
-			$workerTags = await WorkerService.getCustomTagsForWorkspace({ workspace: $workspaceStore! })
+		if (usesLocal) {
+			if (!localWorkerTags || force) {
+				localWorkerTags = await WorkerService.getCustomTagsForWorkspace({
+					workspace: effectiveWorkspace!
+				})
+			}
+		} else if (!$workerTags || force) {
+			$workerTags = await WorkerService.getCustomTagsForWorkspace({
+				workspace: effectiveWorkspace!
+			})
 		}
 	}
 </script>
 
 <div class="flex gap-2 items-center">
 	<div class="max-w-sm grow">
-		{#if $workerTags}
-			{#if $workerTags?.length ?? 0 > 0}
-				<WorkerTagSelect {placeholder} noLabel bind:tag {disabled} />
+		{#if currentTags}
+			{#if currentTags?.length ?? 0 > 0}
+				<WorkerTagSelect
+					{placeholder}
+					noLabel
+					bind:tag
+					{disabled}
+					workspaceId={usesLocal ? effectiveWorkspace : undefined}
+				/>
 			{:else}
 				<div class="text-sm text-secondary flex flex-row gap-2">
 					No custom worker group tag defined on this instance in "Workers {'->'} Custom tags"
@@ -56,7 +81,6 @@
 	<Button
 		variant="default"
 		on:click={() => {
-			$workerTags = undefined
 			loadWorkerTags(true)
 		}}
 		startIcon={{ icon: RotateCw }}
diff --git a/frontend/src/lib/components/WorkerTagSelect.svelte b/frontend/src/lib/components/WorkerTagSelect.svelte
index cd2bf0b49e..fe00f07f9d 100644
--- a/frontend/src/lib/components/WorkerTagSelect.svelte
+++ b/frontend/src/lib/components/WorkerTagSelect.svelte
@@ -16,7 +16,9 @@
 		nullTag = undefined,
 		disabled = false,
 		placeholder,
-		inputClass
+		inputClass,
+		size = 'md',
+		workspaceId = undefined
 	}: {
 		tag: string | undefined
 		noLabel?: boolean
@@ -26,6 +28,14 @@
 		language?: string
 		class?: string
 		inputClass?: string
+		/** Forwarded to the underlying Select — controls the input height. The
+		 * condensed session top bar passes `sm` to match its smaller buttons. */
+		size?: 'sm' | 'md' | 'lg'
+		// Workspace to read custom tags and worker availability from. Defaults to
+		// $workspaceStore. Session editors act on a workspace that differs from the
+		// navigation one, so they pass their effective workspace to keep the tag
+		// list and availability dots matching the deploy target.
+		workspaceId?: string
 	} = $props()
 
 	let loading = $state(false)
@@ -33,6 +43,14 @@
 	let timeout: number | undefined = undefined
 	let tagsToWorkerExists = $state<Record<string, boolean> | undefined>(undefined)
 
+	// The shared `workerTags` store caches tags for the navigation workspace. When
+	// this select targets a different workspace, read/write a local list instead so
+	// it neither shows the navigation workspace's tags nor clobbers the shared cache.
+	let effectiveWorkspace = $derived(workspaceId ?? $workspaceStore)
+	let usesLocal = $derived(workspaceId != undefined && workspaceId !== $workspaceStore)
+	let localWorkerTags = $state<string[] | undefined>(undefined)
+	let currentTags = $derived(usesLocal ? localWorkerTags : $workerTags)
+
 	onMount(() => {
 		visible = true
 	})
@@ -51,19 +69,31 @@
 	async function loadWorkerGroups(force = false) {
 		loading = true
 		try {
-			if (!$workerTags || force) {
-				$workerTags = await WorkerService.getCustomTagsForWorkspace({ workspace: $workspaceStore! })
+			if (usesLocal) {
+				if (!localWorkerTags || force) {
+					localWorkerTags = await WorkerService.getCustomTagsForWorkspace({
+						workspace: effectiveWorkspace!
+					})
+				}
+			} else if (!$workerTags || force) {
+				$workerTags = await WorkerService.getCustomTagsForWorkspace({
+					workspace: effectiveWorkspace!
+				})
 			}
 		} catch (e) {
-			$workerTags = []
+			if (usesLocal) {
+				localWorkerTags = []
+			} else {
+				$workerTags = []
+			}
 			sendUserToast('Error loading custom tags', true)
 		}
 		loading = false
 	}
 	let items = $derived([
 		// ...(tag ? ['reset to default'] : [nullTag ? `default: ${nullTag}` : '']),
-		...(tag && tag != '' && !($workerTags ?? []).includes(tag) ? [tag] : []),
-		...($workerTags ?? [])
+		...(tag && tag != '' && !(currentTags ?? []).includes(tag) ? [tag] : []),
+		...(currentTags ?? [])
 	])
 
 	let lastCheck: number | undefined = undefined
@@ -77,7 +107,7 @@
 		if (open) {
 			tagsToWorkerExists = await WorkerService.existsWorkersWithTags({
 				tags: tags.join(','),
-				workspace: $workspaceStore
+				workspace: effectiveWorkspace
 			})
 			lastCheck = Date.now()
 			if (visible) {
@@ -103,8 +133,8 @@
 	// )
 
 	$effect(() => {
-		if ($workerTags && open) {
-			loadTagsToWorkerExists($workerTags)
+		if (currentTags && open) {
+			loadTagsToWorkerExists(currentTags)
 		}
 	})
 
@@ -138,6 +168,7 @@
 		clearable
 		class="w-full"
 		bind:open
+		{size}
 		{inputClass}
 		{disabled}
 		placeholder={nullTag ? nullTag : (placeholder ?? 'lang default')}
diff --git a/frontend/src/lib/components/WorkspaceDeployLayout.svelte b/frontend/src/lib/components/WorkspaceDeployLayout.svelte
index 765c7f535a..b7d87d6321 100644
--- a/frontend/src/lib/components/WorkspaceDeployLayout.svelte
+++ b/frontend/src/lib/components/WorkspaceDeployLayout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Loader2 } from 'lucide-svelte'
+	import { Folder, Loader2, User } from 'lucide-svelte'
 	import { Badge } from './common'
 	import Checkbox from './common/checkbox/Checkbox.svelte'
 	import Row from './common/table/Row.svelte'
@@ -15,6 +15,14 @@
 		[key: string]: unknown
 	}
 
+	interface DeployGroup {
+		/** `f/<folder>` or `u/<user>`; '' for items outside both conventions. */
+		key: string
+		label: string
+		groupKind: 'folder' | 'user' | 'other'
+		items: DeployableItem[]
+	}
+
 	interface Props {
 		items: DeployableItem[]
 		selectedItems: string[]
@@ -33,6 +41,9 @@
 		alerts?: Snippet
 		/** Rendered on the right of the "Select all" row (e.g. a filter toggle). */
 		selectAllActions?: Snippet
+		/** Rendered on the right of each folder/user group header — receives the
+		 * group's items so pages can roll up their own badges (e.g. conflicts). */
+		groupActions?: Snippet<[DeployableItem[]]>
 		itemSummary?: Snippet<[DeployableItem]>
 		/** Overrides the secondary path line per item (e.g. to strike a renamed path). */
 		itemPath?: Snippet<[DeployableItem]>
@@ -56,6 +67,7 @@
 		header,
 		alerts,
 		selectAllActions,
+		groupActions,
 		itemSummary,
 		itemPath,
 		itemActions,
@@ -73,6 +85,56 @@
 	function handleSelect(item: DeployableItem) {
 		onToggleItem?.(item)
 	}
+
+	function groupOf(path: string): Pick<DeployGroup, 'key' | 'label' | 'groupKind'> {
+		const parts = path.split('/')
+		// >= 2 so a folder item itself (path `f/<name>`, kind 'folder') lands in
+		// its folder's group next to the items that need it, not in "other".
+		if (parts.length >= 2 && (parts[0] === 'f' || parts[0] === 'u')) {
+			const key = `${parts[0]}/${parts[1]}`
+			return { key, label: key, groupKind: parts[0] === 'f' ? 'folder' : 'user' }
+		}
+		return { key: '', label: 'other', groupKind: 'other' }
+	}
+
+	let groups = $derived.by((): DeployGroup[] => {
+		const byKey = new Map<string, DeployGroup>()
+		for (const item of items) {
+			const g = groupOf(item.path)
+			let group = byKey.get(g.key)
+			if (!group) {
+				group = { ...g, items: [] }
+				byKey.set(g.key, group)
+			}
+			group.items.push(item)
+		}
+		const rank = { folder: 0, user: 1, other: 2 }
+		return [...byKey.values()].sort(
+			(a, b) => rank[a.groupKind] - rank[b.groupKind] || a.key.localeCompare(b.key)
+		)
+	})
+
+	// A lone catch-all group would just duplicate "Select all" — skip headers then.
+	let showGroupHeaders = $derived(groups.some((g) => g.groupKind !== 'other'))
+
+	// Mirrors the per-row checkbox condition: already-deployed rows keep their
+	// selection frozen, so they don't count toward the group's tri-state.
+	function groupSelectable(group: DeployGroup): DeployableItem[] {
+		return group.items.filter(
+			(i) => selectablePredicate(i) && deploymentStatus[i.key]?.status !== 'deployed'
+		)
+	}
+
+	function toggleGroup(group: DeployGroup) {
+		const selectable = groupSelectable(group)
+		const target = !selectable.every((i) => selectedItems.includes(i.key))
+		// Snapshot which items need flipping before mutating: onToggleItem updates
+		// the parent's selection, which feeds back into `selectedItems` mid-loop.
+		const toToggle = selectable.filter((i) => selectedItems.includes(i.key) !== target)
+		for (const item of toToggle) {
+			onToggleItem?.(item)
+		}
+	}
 </script>
 
 <div class="flex flex-col h-full">
@@ -118,70 +180,108 @@
 		<!-- Items list -->
 		<div class="overflow-y-auto">
 			<div class="border rounded-md bg-surface-tertiary">
-				{#each items as item (item.key)}
-					{@const isSelectable = selectablePredicate(item)}
-					{@const isSelected = selectedItems.includes(item.key)}
-					{@const status = deploymentStatus[item.key]}
-					{@const isDeployed = status?.status === 'deployed'}
-					{@const blockedReason =
-						!isSelectable && !isDeployed ? selectBlockedReason?.(item) : undefined}
-
-					<Row
-						isSelectable={isSelectable && !isDeployed}
-						selectDisabledReason={blockedReason}
-						selectOnRowClick={true}
-						alignWithSelectable={true}
-						disabled={blockedReason ? false : !isSelectable}
-						selected={isSelected && !isDeployed}
-						onSelect={() => handleSelect(item)}
-						path={item.kind !== 'resource' &&
-						item.kind !== 'variable' &&
-						item.kind !== 'resource_type'
-							? item.path
-							: ''}
-						marked={undefined}
-						kind={item.kind}
-						triggerKind={item.triggerKind}
-						canFavorite={false}
-						workspaceId=""
-					>
-						{#snippet customSummary()}
-							{#if itemSummary}
-								{@render itemSummary(item)}
-							{:else}
-								{item.path}
+				{#each groups as group (group.key)}
+					{#if showGroupHeaders}
+						{@const selectable = groupSelectable(group)}
+						{@const selectedCount = selectable.filter((i) => selectedItems.includes(i.key)).length}
+						<!-- The disabled-state hint lives on the row: a disabled Checkbox is
+						     pointer-events-none, so a title on the input would never show. -->
+						<div
+							class="sticky top-0 z-10 flex items-center gap-2 px-4 py-1.5 bg-surface-secondary border-b first:rounded-t-md"
+							title={selectable.length === 0 ? 'No selectable items in this group' : undefined}
+						>
+							<Checkbox
+								checked={selectable.length > 0 && selectedCount === selectable.length}
+								indeterminate={selectedCount > 0 && selectedCount < selectable.length}
+								disabled={selectable.length === 0}
+								title={selectedCount === selectable.length
+									? `Deselect all in ${group.label}`
+									: `Select all in ${group.label}`}
+								onChange={() => toggleGroup(group)}
+							/>
+							{#if group.groupKind === 'folder'}
+								<Folder size={14} class="text-tertiary shrink-0" />
+							{:else if group.groupKind === 'user'}
+								<User size={14} class="text-tertiary shrink-0" />
 							{/if}
-						{/snippet}
-						{#snippet pathDisplay()}
-							{#if itemPath}
-								{@render itemPath(item)}
-							{:else}
-								{item.kind !== 'resource' &&
-								item.kind !== 'variable' &&
-								item.kind !== 'resource_type'
-									? item.path
+							<span class="text-xs font-semibold text-secondary truncate">{group.label}</span>
+							<span class="text-2xs text-tertiary whitespace-nowrap">
+								{group.items.length} item{group.items.length !== 1 ? 's' : ''}{selectedCount > 0
+									? ` · ${selectedCount} selected`
 									: ''}
+							</span>
+							{#if groupActions}
+								<div class="ml-auto flex items-center gap-1">
+									{@render groupActions(group.items)}
+								</div>
 							{/if}
-						{/snippet}
-						{#snippet actions()}
-							{#if itemActions}
-								{@render itemActions(item)}
-							{/if}
-							<!-- Deployment status always shown -->
-							{#if status}
-								{#if status.status === 'loading'}
-									<Loader2 class="animate-spin" />
-								{:else if status.status === 'deployed'}
-									<Badge color="green">Deployed</Badge>
-								{:else if status.status === 'failed'}
-									<div class="inline-flex gap-1">
-										<Badge color="red">Failed</Badge>
-										<Tooltip>{status.error}</Tooltip>
-									</div>
+						</div>
+					{/if}
+					{#each group.items as item (item.key)}
+						{@const isSelectable = selectablePredicate(item)}
+						{@const isSelected = selectedItems.includes(item.key)}
+						{@const status = deploymentStatus[item.key]}
+						{@const isDeployed = status?.status === 'deployed'}
+						{@const blockedReason =
+							!isSelectable && !isDeployed ? selectBlockedReason?.(item) : undefined}
+						{@const showPath =
+							item.kind !== 'resource' && item.kind !== 'variable' && item.kind !== 'resource_type'}
+						<!-- The group header already names the folder — the path line only
+						     carries what's below it. -->
+						{@const subPath =
+							group.key && item.path.startsWith(group.key + '/')
+								? item.path.slice(group.key.length + 1)
+								: item.path}
+
+						<Row
+							isSelectable={isSelectable && !isDeployed}
+							selectDisabledReason={blockedReason}
+							selectOnRowClick={true}
+							alignWithSelectable={true}
+							disabled={blockedReason ? false : !isSelectable}
+							selected={isSelected && !isDeployed}
+							onSelect={() => handleSelect(item)}
+							path={showPath ? item.path : ''}
+							marked={undefined}
+							kind={item.kind}
+							triggerKind={item.triggerKind}
+							canFavorite={false}
+							workspaceId=""
+						>
+							{#snippet customSummary()}
+								{#if itemSummary}
+									{@render itemSummary(item)}
+								{:else}
+									{item.path}
 								{/if}
-							{/if}
-						{/snippet}
-					</Row>
+							{/snippet}
+							{#snippet pathDisplay()}
+								{#if itemPath}
+									{@render itemPath(item)}
+								{:else}
+									{showPath ? (showGroupHeaders ? subPath : item.path) : ''}
+								{/if}
+							{/snippet}
+							{#snippet actions()}
+								{#if itemActions}
+									{@render itemActions(item)}
+								{/if}
+								<!-- Deployment status always shown -->
+								{#if status}
+									{#if status.status === 'loading'}
+										<Loader2 class="animate-spin" />
+									{:else if status.status === 'deployed'}
+										<Badge color="green">Deployed</Badge>
+									{:else if status.status === 'failed'}
+										<div class="inline-flex gap-1">
+											<Badge color="red">Failed</Badge>
+											<Tooltip>{status.error}</Tooltip>
+										</div>
+									{/if}
+								{/if}
+							{/snippet}
+						</Row>
+					{/each}
 				{/each}
 			</div>
 		</div>
diff --git a/frontend/src/lib/components/WorkspaceDraftsBanner.svelte b/frontend/src/lib/components/WorkspaceDraftsBanner.svelte
index e7c85469fe..0a9ab91075 100644
--- a/frontend/src/lib/components/WorkspaceDraftsBanner.svelte
+++ b/frontend/src/lib/components/WorkspaceDraftsBanner.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { workspaceStore } from '$lib/stores'
+	import { workspaceStore, userWorkspaces } from '$lib/stores'
+	import { workspaceIsFork } from '$lib/utils/workspaceHierarchy'
 	import { Button } from './common'
 	import { Pencil } from 'lucide-svelte'
 	import { goto } from '$app/navigation'
@@ -10,7 +11,7 @@
 	// ForkWorkspaceBanner: that one self-gates on `isFork`, this one on `!isFork`,
 	// so a fork workspace never shows both. In a fork, drafts are discovered via
 	// the on-page "Deployed ↔ draft (N)" toggle badge instead.
-	let isFork = $derived($workspaceStore?.startsWith('wm-fork-') ?? false)
+	let isFork = $derived(workspaceIsFork($workspaceStore, $userWorkspaces))
 
 	// Count comes from the shared Workspace Drafts resource (count ≡ the draft
 	// list; refreshes itself on deploy/discard). Pass undefined in a fork or with
diff --git a/frontend/src/lib/components/WorkspaceItemDiffViewer.svelte b/frontend/src/lib/components/WorkspaceItemDiffViewer.svelte
index 2ee01b4607..77aae182fa 100644
--- a/frontend/src/lib/components/WorkspaceItemDiffViewer.svelte
+++ b/frontend/src/lib/components/WorkspaceItemDiffViewer.svelte
@@ -4,6 +4,9 @@ Inline diff renderer for a single workspace item. Mirrors the per-kind
 rendering that DiffDrawer does in its body (`DiffDrawer.svelte:181-271`):
 
 - `flow` → `<FlowDiffViewer>` (its own Graph / YAML toggle inside)
+- `raw_app_file` → `<RawAppFileDiff>` (one synthesized raw-app file item: a
+  single diff with a per-file size guard; the metadata item adds a full-app
+  YAML expand). Raw apps are exploded into these items by `rawAppDiffToItems`.
 - has `content` (scripts) → Tabs(Content | Metadata) with two Monaco diffs
 - everything else (apps, resources, variables, schedules, triggers…) →
   a single Monaco YAML diff over the metadata
@@ -18,12 +21,15 @@ doesn't reflow the parent.
 	import Tabs from './common/tabs/Tabs.svelte'
 	import Tab from './common/tabs/Tab.svelte'
 	import FlowDiffViewer from './FlowDiffViewer.svelte'
+	import RawAppFileDiff from './raw_apps/RawAppFileDiff.svelte'
+	import type { RawAppFileItem } from './raw_apps/rawAppDiffUtils'
 	import { Loader2 } from 'lucide-svelte'
 	import { cleanValueProperties, orderedYamlStringify, replaceFalseWithUndefined } from '$lib/utils'
 	import { scriptLangToEditorLang } from '$lib/scripts'
 
 	interface Props {
-		/** Any WorkspaceItemDiff['kind'] — used only to special-case `flow`. */
+		/** Any WorkspaceItemDiff['kind'], plus the synthetic `raw_app_file`.
+		 * `flow` and `raw_app_file` are special-cased. */
 		kind: string
 		/** Raw value from `getItemValue(kind, path, parentWorkspace)`. Undefined
 		 * for "added" items (don't exist in the parent). */
@@ -33,9 +39,45 @@ doesn't reflow the parent.
 		currentRaw?: unknown
 		/** Force unified diff (Monaco renderSideBySide=false). Default false. */
 		inlineDiff?: boolean
+		/** Opt out of Monaco's auto-inline fallback so the parent's inlineDiff/width
+		 * decision fully controls the view (used by the drawer's toggle). Default false. */
+		disableAutoInline?: boolean
+		/** For `raw_app_file`: the synthesized per-file diff item to render. */
+		rawFile?: RawAppFileItem
+		/** Cap (px) on the rendered diff height; the drawer owns the rationale.
+		 * Ignored while ≤ 0 (unmeasured). */
+		maxHeight?: number
 	}
 
-	let { kind, originalRaw, currentRaw, inlineDiff = false }: Props = $props()
+	let {
+		kind,
+		originalRaw,
+		currentRaw,
+		inlineDiff = false,
+		disableAutoInline = false,
+		rawFile,
+		maxHeight
+	}: Props = $props()
+
+	// Applied alongside each block's content-sized `height` so the block never
+	// exceeds the drawer's visible height — Monaco then scrolls internally.
+	function capStyle(reserved: number): string {
+		if (!maxHeight || maxHeight <= 0) return ''
+		return `max-height: ${Math.max(0, maxHeight - reserved)}px;`
+	}
+	const maxHeightStyle = $derived(capStyle(0))
+	// FlowDiffViewer enforces its own `min-h-[500px]`; capping the flow below that
+	// makes its pane spill out of the card instead of scrolling, so never cap the
+	// flow diff below that minimum (a very short drawer just scrolls to it).
+	const FLOW_MIN_HEIGHT = 500
+	const flowMaxHeightStyle = $derived(
+		maxHeight && maxHeight > 0 ? `max-height: ${Math.max(FLOW_MIN_HEIGHT, maxHeight)}px;` : ''
+	)
+	// The Content|Metadata tab bar sits above the script editor and eats into the
+	// viewer's height; measure it so the editor's cap leaves room for it and the
+	// whole viewer still fits `maxHeight`.
+	let tabsChromeH = $state(0)
+	const contentMaxHeightStyle = $derived(capStyle(tabsChromeH))
 
 	type Prepared = { lang?: string; content?: string; metadata: string }
 
@@ -93,22 +135,37 @@ doesn't reflow the parent.
 </script>
 
 {#if kind === 'flow'}
-	<div class="h-[600px]">
+	<div class="h-[600px]" style={flowMaxHeightStyle}>
 		<FlowDiffViewer
 			beforeYaml={beforeFlowYaml}
 			afterYaml={afterFlowYaml}
 			beforeMissing={originalRaw == null}
 			afterMissing={currentRaw == null}
 			{inlineDiff}
+			{disableAutoInline}
 		/>
 	</div>
+{:else if kind === 'raw_app_file' && rawFile}
+	<RawAppFileDiff
+		original={rawFile.original}
+		current={rawFile.current}
+		lang={rawFile.lang}
+		isMetadata={rawFile.isMetadata}
+		fullYamlOriginal={rawFile.fullYamlOriginal}
+		fullYamlCurrent={rawFile.fullYamlCurrent}
+		{inlineDiff}
+		{disableAutoInline}
+		{maxHeight}
+	/>
 {:else if hasContent}
 	<div class="flex flex-col">
-		<Tabs bind:selected={contentTab}>
-			<Tab value="content" label="Content" />
-			<Tab value="metadata" label="Metadata" />
-		</Tabs>
-		<div style="height: {activeTabHeight}">
+		<div bind:clientHeight={tabsChromeH}>
+			<Tabs bind:selected={contentTab}>
+				<Tab value="content" label="Content" />
+				<Tab value="metadata" label="Metadata" />
+			</Tabs>
+		</div>
+		<div style="height: {activeTabHeight}; {contentMaxHeightStyle}">
 			{#if contentTab === 'content'}
 				{#await import('$lib/components/DiffEditor.svelte')}
 					<div class="p-3"><Loader2 class="w-3.5 h-3.5 animate-spin" /></div>
@@ -121,6 +178,7 @@ doesn't reflow the parent.
 						defaultOriginal={original.content ?? ''}
 						defaultModified={current.content ?? ''}
 						{inlineDiff}
+						{disableAutoInline}
 						readOnly
 					/>
 				{/await}
@@ -136,6 +194,7 @@ doesn't reflow the parent.
 						defaultOriginal={original.metadata}
 						defaultModified={current.metadata}
 						{inlineDiff}
+						{disableAutoInline}
 						readOnly
 					/>
 				{/await}
@@ -146,7 +205,7 @@ doesn't reflow the parent.
 	{#await import('$lib/components/DiffEditor.svelte')}
 		<div class="p-3"><Loader2 class="w-3.5 h-3.5 animate-spin" /></div>
 	{:then Module}
-		<div style="height: {metadataHeight}">
+		<div style="height: {metadataHeight}; {maxHeightStyle}">
 			<Module.default
 				open={true}
 				automaticLayout
@@ -155,6 +214,7 @@ doesn't reflow the parent.
 				defaultOriginal={original.metadata}
 				defaultModified={current.metadata}
 				{inlineDiff}
+				{disableAutoInline}
 				readOnly
 			/>
 		</div>
diff --git a/frontend/src/lib/components/WorkspaceItemDrillPicker.svelte b/frontend/src/lib/components/WorkspaceItemDrillPicker.svelte
index f9c538b50a..8ff680ef70 100644
--- a/frontend/src/lib/components/WorkspaceItemDrillPicker.svelte
+++ b/frontend/src/lib/components/WorkspaceItemDrillPicker.svelte
@@ -44,6 +44,10 @@ would be surprising.
 		externalFilter?: string
 		autoFocus?: boolean
 		flush?: boolean
+		// Load items and drafts from this workspace instead of the navigation
+		// workspace. Set by session live editors, whose acting workspace can
+		// differ from $workspaceStore; falls back to $workspaceStore otherwise.
+		workspaceId?: string
 	}
 
 	let {
@@ -54,9 +58,12 @@ would be surprising.
 		currentItem,
 		externalFilter,
 		autoFocus = true,
-		flush = false
+		flush = false,
+		workspaceId
 	}: Props = $props()
 
+	const effectiveWorkspace = $derived(workspaceId ?? $workspaceStore)
+
 	let inner = $state<DrillPickerHandle | undefined>(undefined)
 
 	export function focus() {
@@ -70,7 +77,7 @@ would be surprising.
 	}
 
 	const loader = useWorkspaceItemsLoader(
-		() => $workspaceStore,
+		() => effectiveWorkspace,
 		() => kinds
 	)
 
@@ -86,7 +93,7 @@ would be surprising.
 	// `listGlobalDrafts` is backend-backed (async); fetch once and derive the
 	// per-kind lists synchronously from the resolved snapshot.
 	const globalDraftsResource = resource(
-		() => ({ ws: $workspaceStore, enabled: isGlobalAiEnabled() }),
+		() => ({ ws: effectiveWorkspace, enabled: isGlobalAiEnabled() }),
 		async ({ ws, enabled }) => (enabled && ws ? await listGlobalDrafts(ws) : [])
 	)
 	function aiDraftsForKind(k: Kind): WorkspaceItem[] {
diff --git a/frontend/src/lib/components/WorkspaceItemRow.svelte b/frontend/src/lib/components/WorkspaceItemRow.svelte
index fe923b12ca..deb8ddc27d 100644
--- a/frontend/src/lib/components/WorkspaceItemRow.svelte
+++ b/frontend/src/lib/components/WorkspaceItemRow.svelte
@@ -3,7 +3,9 @@
 Visual row for a workspace item (script / flow / app / resource /
 schedule / trigger / …). Matches the leaf-row layout used by
 WorkspaceItemDrillPicker: RowIcon + summary line on top with mono path
-beneath, or just the mono path when there's no summary.
+beneath, or just the mono path when there's no summary. With `singleLine`,
+both collapse to one row showing `summary ?? secondary` (summary in normal
+text, the mono path as the fallback) — denser, for the diff tree.
 
 Pure presentation — the caller controls highlighting / current state via
 props, supplies the onclick/onmouseenter handlers, and can pass an
@@ -26,6 +28,9 @@ doesn't steal focus from a sibling search input (matches the picker).
 		/** For `kind: 'trigger'`, specifies the concrete trigger subtype.
 		 * Forwarded to RowIcon. */
 		triggerKind?: string
+		/** For `kind: 'raw_app_file'`, the file name/path — forwarded to RowIcon
+		 * to pick an extension-specific icon. */
+		iconPath?: string
 		/** Optional summary text shown above the path. */
 		summary?: string
 		/** Mono path (or any secondary identifier). When summary is empty
@@ -47,6 +52,9 @@ doesn't steal focus from a sibling search input (matches the picker).
 		/** Reserve two lines of height and vertically center the content so
 		 * summary and summary-less rows are the same height (diff viewer). */
 		uniformHeight?: boolean
+		/** Collapse to a single line showing `summary ?? secondary` (summary in
+		 * normal text, secondary in mono) instead of stacking both. */
+		singleLine?: boolean
 		/** Extra left padding (px) for tree-view indentation. Adds to the
 		 * default `px-3` horizontal padding. */
 		indent?: number
@@ -69,6 +77,7 @@ doesn't steal focus from a sibling search input (matches the picker).
 	let {
 		kind,
 		triggerKind,
+		iconPath,
 		summary,
 		secondary,
 		highlighted = false,
@@ -82,7 +91,8 @@ doesn't steal focus from a sibling search input (matches the picker).
 		onclick,
 		onmouseenter,
 		extras,
-		uniformHeight = false
+		uniformHeight = false,
+		singleLine = false
 	}: Props = $props()
 
 	const rootClass = $derived(
@@ -96,6 +106,39 @@ doesn't steal focus from a sibling search input (matches the picker).
 	)
 </script>
 
+{#snippet body()}
+	<RowIcon {kind} {triggerKind} path={iconPath} size={12} />
+	<div class={contentClass}>
+		{#if singleLine}
+			<!-- `||` not `??`: an empty-string summary (some draft rows carry `''`)
+			     must fall back to the path, otherwise the row renders blank. -->
+			<div
+				class="text-xs font-normal text-primary truncate {summary ? '' : 'font-mono'}"
+				title={summary || title || secondary}
+			>
+				{summary || secondary}
+			</div>
+		{:else if summary}
+			<div class="text-xs text-primary truncate" title={summary}>{summary}</div>
+			<div
+				class="text-2xs text-secondary font-normal font-mono truncate"
+				title={title ?? secondary}
+			>
+				{secondary}
+			</div>
+		{:else}
+			<div class="text-xs text-primary font-mono truncate" title={title ?? secondary}>
+				{secondary}
+			</div>
+		{/if}
+	</div>
+	{#if extras}
+		<div class="shrink-0 flex items-center gap-2">
+			{@render extras()}
+		</div>
+	{/if}
+{/snippet}
+
 {#if href}
 	<a
 		{href}
@@ -111,27 +154,7 @@ doesn't steal focus from a sibling search input (matches the picker).
 		{onclick}
 		{onmouseenter}
 	>
-		<RowIcon {kind} {triggerKind} size={12} />
-		<div class={contentClass}>
-			{#if summary}
-				<div class="text-xs text-primary truncate" title={summary}>{summary}</div>
-				<div
-					class="text-2xs text-secondary font-normal font-mono truncate"
-					title={title ?? secondary}
-				>
-					{secondary}
-				</div>
-			{:else}
-				<div class="text-xs text-primary font-mono truncate" title={title ?? secondary}>
-					{secondary}
-				</div>
-			{/if}
-		</div>
-		{#if extras}
-			<div class="shrink-0 flex items-center gap-2">
-				{@render extras()}
-			</div>
-		{/if}
+		{@render body()}
 	</a>
 {:else}
 	<button
@@ -147,26 +170,6 @@ doesn't steal focus from a sibling search input (matches the picker).
 		{onclick}
 		{onmouseenter}
 	>
-		<RowIcon {kind} {triggerKind} size={12} />
-		<div class={contentClass}>
-			{#if summary}
-				<div class="text-xs text-primary truncate" title={summary}>{summary}</div>
-				<div
-					class="text-2xs text-secondary font-normal font-mono truncate"
-					title={title ?? secondary}
-				>
-					{secondary}
-				</div>
-			{:else}
-				<div class="text-xs text-primary font-mono truncate" title={title ?? secondary}>
-					{secondary}
-				</div>
-			{/if}
-		</div>
-		{#if extras}
-			<div class="shrink-0 flex items-center gap-2">
-				{@render extras()}
-			</div>
-		{/if}
+		{@render body()}
 	</button>
 {/if}
diff --git a/frontend/src/lib/components/WorkspaceScopeTrigger.svelte b/frontend/src/lib/components/WorkspaceScopeTrigger.svelte
new file mode 100644
index 0000000000..ac132bdca2
--- /dev/null
+++ b/frontend/src/lib/components/WorkspaceScopeTrigger.svelte
@@ -0,0 +1,205 @@
+<script lang="ts">
+	import { userWorkspaces } from '$lib/stores'
+	import { findWorkspaceRoot } from '$lib/utils/workspaceHierarchy'
+	import { forkAccentStyle } from '$lib/utils/forkColor'
+	import { Badge, Button } from '$lib/components/common'
+	import { devBadgeText } from '$lib/utils/devWorkspaceLabel'
+	import { Building, ChevronDown, EllipsisVertical, GitFork } from 'lucide-svelte'
+	import DropdownV2 from '$lib/components/DropdownV2.svelte'
+	import { type Item } from '$lib/utils'
+
+	// Shared chip that displays the workspace a fork picker points at. A fork (or a staged pending fork)
+	// renders "<GitFork> <parent> → <fork>" with the fork accent-highlighted; a root renders
+	// "<Building> <name>". Used as the trigger for both the sidebar workspace header and the session
+	// "Run in" bar, so the two look identical — the only real difference between those consumers is how
+	// they create forks.
+	let {
+		workspaceId,
+		pendingFork,
+		isCollapsed = false,
+		showChevron = true,
+		rootLabel = undefined,
+		wrap = false,
+		color = undefined,
+		interactive = true,
+		menuItems = undefined,
+		disableTitle = false,
+		class: className = ''
+	}: {
+		workspaceId?: string
+		pendingFork?: { id: string; name: string; parent_workspace_id: string }
+		isCollapsed?: boolean
+		// The dropdown-affordance chevron. Off for read-only displays (e.g. the started-session header).
+		showChevron?: boolean
+		// Replaces the root workspace's name with a muted, icon-less label (e.g.
+		// "in root (2 forks)" in the sidebar, where the workspace menu right above
+		// already shows the family name). Fork display is unaffected; the title
+		// keeps the real name.
+		rootLabel?: string
+		// Two-row fork layout for narrow containers like the sidebar: "parent →" on
+		// the first row, the fork name on its own full row (so it isn't sacrificed
+		// to the parent). Each row truncates independently when even a full row is
+		// too narrow. Root display is unaffected.
+		wrap?: boolean
+		// Overrides the fork accent color (used by the creation form's live
+		// preview). Real forks read their workspace's `color` automatically.
+		color?: string
+		// False for read-only displays (e.g. the session header): keeps the chip
+		// visually inert — no hover/press feedback suggesting a click action.
+		interactive?: boolean
+		// Actions menu rendered as an ellipsis segment fused to the end of the
+		// chip (same pill background, own hover). Lets an inert chip carry
+		// workspace-scoped actions without becoming clickable itself. Ignored
+		// in collapsed (icon-only) mode.
+		menuItems?: Item[]
+		// Suppress the chip's native `title` so it doesn't double-pop when a
+		// consumer wraps the chip in a richer hover tooltip (e.g. NameIdTooltip).
+		disableTitle?: boolean
+		class?: string
+	} = $props()
+
+	const root = $derived(findWorkspaceRoot(workspaceId, $userWorkspaces))
+	const currentWs = $derived(
+		workspaceId ? $userWorkspaces.find((w) => w.id === workspaceId) : undefined
+	)
+	const isFork = $derived(!!currentWs && !!root && currentWs.id !== root.id)
+	const showFork = $derived(!!pendingFork || isFork)
+	const name = $derived(pendingFork?.name ?? currentWs?.name ?? workspaceId ?? 'Pick workspace')
+	const parentId = $derived(pendingFork?.parent_workspace_id ?? currentWs?.parent_workspace_id)
+	const parentName = $derived(
+		parentId ? ($userWorkspaces.find((w) => w.id === parentId)?.name ?? parentId) : undefined
+	)
+	// The parent segment only appears for a fork of a fork — forking off the
+	// root is the default and doesn't need spelling out.
+	const shownParent = $derived(parentId !== root?.id ? parentName : undefined)
+
+	// A fork with a workspace color re-themes the whole chip: forkAccentStyle
+	// derives light/dark bg+text at that hue (matching the default blue's
+	// profile) into CSS vars consumed by the accent classes below. Muted
+	// segments (parent, arrow, "(new)") use opacity so they follow whichever
+	// accent is active.
+	// A staged pending fork has no color of its own yet, and its `workspaceId`
+	// resolves to the parent (pending_workspace_id = parent), so reading
+	// `currentWs.color` here would paint it in the parent's hue. Use the default
+	// fork accent instead — unless the creation form passes an explicit `color`
+	// preview.
+	const accentStyle = $derived(
+		showFork ? forkAccentStyle(color ?? (pendingFork ? undefined : currentWs?.color)) : undefined
+	)
+	const forkAccentClasses = $derived(
+		accentStyle
+			? 'bg-[color:var(--fork-accent-bg)] dark:bg-[color:var(--fork-accent-bg-dark)] text-[color:var(--fork-accent-text)] dark:text-[color:var(--fork-accent-text-dark)] font-semibold'
+			: 'bg-surface-accent-selected text-accent font-semibold'
+	)
+	// Inert mode: pin the hover background to the resting one and drop the
+	// pointer/press affordances (the title tooltip still works).
+	const inertClasses = $derived(
+		interactive
+			? ''
+			: `cursor-default active:opacity-100 ${
+					accentStyle
+						? 'hover:bg-[color:var(--fork-accent-bg)] dark:hover:bg-[color:var(--fork-accent-bg-dark)]'
+						: showFork
+							? 'hover:bg-surface-accent-selected'
+							: 'hover:bg-surface-secondary'
+				}`
+	)
+</script>
+
+{#snippet chipButton(grouped: boolean)}
+	<Button
+		variant="subtle"
+		unifiedSize="xs"
+		title={disableTitle ? undefined : showFork && shownParent ? `${shownParent} → ${name}` : name}
+		tabindex={interactive ? undefined : -1}
+		style={accentStyle ?? ''}
+		startIcon={isCollapsed
+			? // Icon-only mode is the fork-picker affordance, whatever is selected.
+				{ icon: GitFork }
+			: !showFork && rootLabel
+				? undefined
+				: showFork && shownParent
+					? // Fork-of-a-fork renders a fork icon inline before EACH name (the
+						// parent is a fork too) — a third leading icon would be noise.
+						undefined
+					: { icon: showFork ? GitFork : Building }}
+		endIcon={showChevron && !isCollapsed ? { icon: ChevronDown } : undefined}
+		wrapperClasses={grouped ? 'min-w-0 flex-1' : className}
+		btnClasses="min-w-0 w-full rounded-md text-2xs {isCollapsed
+			? 'justify-center'
+			: 'justify-start'} {showFork ? forkAccentClasses : 'bg-surface-secondary'} {wrap
+			? // The unified size's fixed h-5 would clip the two-row layout — let the
+				// content set the height and breathe with vertical padding instead. The
+				// min height keeps the single-line variant from looking squashed next
+				// to the two-row one.
+				'h-auto py-1 min-h-6'
+			: ''} {grouped ? 'rounded-r-none' : ''} {inertClasses}"
+	>
+		{#if !isCollapsed}
+			{#if showFork && shownParent}
+				{#if wrap}
+					<!-- Hierarchy shown tree-style: the fork row indents under its parent. -->
+					<span class="min-w-0 flex-1 flex flex-col gap-0.5 text-left">
+						<span class="flex items-center gap-1 min-w-0 opacity-60 font-normal">
+							<GitFork size={12} class="shrink-0" />
+							<span class="truncate">{shownParent}</span>
+						</span>
+						<span class="flex items-center gap-1 min-w-0 pl-3">
+							<GitFork size={12} class="shrink-0" />
+							<span class="truncate">{name}</span>
+						</span>
+					</span>
+				{:else}
+					<span class="min-w-0 flex-1 flex items-center gap-1 text-left">
+						<GitFork size={12} class="shrink-0 opacity-60" />
+						<span class="truncate opacity-60 font-normal">{shownParent}</span>
+						<span class="shrink-0 opacity-40 font-normal">→</span>
+						<GitFork size={12} class="shrink-0" />
+						<span class="truncate">{name}</span>
+					</span>
+				{/if}
+			{:else}
+				<span class="truncate min-w-0 flex-1 text-left {!showFork && rootLabel ? 'text-hint' : ''}">
+					{showFork ? name : (rootLabel ?? name)}
+				</span>
+			{/if}
+			{#if pendingFork}
+				<span class="shrink-0 opacity-70 font-normal">(new)</span>
+			{:else if currentWs?.is_dev_workspace}
+				<Badge
+					color="dark-blue"
+					small
+					class="text-3xs px-1 py-0 dark:bg-surface-accent-primary text-white dark:text-white"
+					>{devBadgeText(currentWs.dev_workspace_label)}</Badge
+				>
+			{/if}
+		{/if}
+	</Button>
+{/snippet}
+
+{#if menuItems?.length && !isCollapsed}
+	<div class="inline-flex items-stretch min-w-0 {className}">
+		{@render chipButton(true)}
+		<DropdownV2
+			items={menuItems}
+			placement="bottom-end"
+			fixedHeight={false}
+			enableFlyTransition
+			class="shrink-0 flex"
+		>
+			{#snippet buttonReplacement()}
+				<span
+					style={accentStyle ?? ''}
+					title="Workspace actions"
+					class="h-full inline-flex items-center px-0.5 rounded-r-md {showFork
+						? forkAccentClasses
+						: 'bg-surface-secondary'} hover:brightness-95 dark:hover:brightness-110"
+				>
+					<EllipsisVertical size={12} />
+				</span>
+			{/snippet}
+		</DropdownV2>
+	</div>
+{:else}
+	{@render chipButton(false)}
+{/if}
diff --git a/frontend/src/lib/components/aiProviderStorage.ts b/frontend/src/lib/components/aiProviderStorage.ts
index ce6af230bb..7f6d705d3a 100644
--- a/frontend/src/lib/components/aiProviderStorage.ts
+++ b/frontend/src/lib/components/aiProviderStorage.ts
@@ -50,6 +50,7 @@ export function isSameAsStoredConfig(config: ProviderConfig | undefined): boolea
 		storedConfig !== undefined &&
 		storedConfig.kind === config?.kind &&
 		storedConfig.resource === config?.resource &&
-		storedConfig.model === config?.model
+		storedConfig.model === config?.model &&
+		storedConfig.reasoning_effort === config?.reasoning_effort
 	)
 }
diff --git a/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte b/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte
index 85f0e3193e..14832214b0 100644
--- a/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte
+++ b/frontend/src/lib/components/apps/components/display/AppNavbarItem.svelte
@@ -13,7 +13,7 @@
 	import { twMerge } from 'tailwind-merge'
 	import type { Output } from '../../rx'
 	import ResolveNavbarItemPath from './ResolveNavbarItemPath.svelte'
-	import { urlParamsToObject } from '$lib/utils'
+	import { urlParamsToObject, WINDMILL_RESERVED_QUERY_PARAMS } from '$lib/utils'
 
 	interface Props {
 		navbarItem: NavbarItem
@@ -54,8 +54,22 @@
 	let resolvedHidden: boolean | undefined = $state(undefined)
 
 	function extractPathDetails() {
-		const url = window.location.pathname + window.location.search + window.location.hash
-		const processedUrl = url.replace('/apps/edit/', '').replace('/apps/get/', '')
+		// Drop Windmill transport params (wm_embed, …) so they don't poison the
+		// comparison against the item's resolved path.
+		const params = new URLSearchParams(window.location.search)
+		const reserved: string[] = []
+		params.forEach((_v, k) => {
+			if (WINDMILL_RESERVED_QUERY_PARAMS.has(k)) reserved.push(k)
+		})
+		reserved.forEach((k) => params.delete(k))
+		const qs = params.toString()
+		const url = window.location.pathname + (qs ? `?${qs}` : '') + window.location.hash
+		// `/app_embed/{workspace}/` is the opaque in-workspace viewer route
+		// (WIN-2006) — same app-path suffix as `/apps/get/`.
+		const processedUrl = url
+			.replace('/apps/edit/', '')
+			.replace('/apps/get/', '')
+			.replace(/^\/app_embed\/[^/]+\//, '')
 		return processedUrl
 	}
 
diff --git a/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte b/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte
index ba17f6c7c3..8e068274b8 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte
+++ b/frontend/src/lib/components/apps/components/display/dbtable/AppDbExplorer.svelte
@@ -86,7 +86,10 @@
 	}
 
 	const resolvedConfig = $state(
-		initConfig(components['dbexplorercomponent'].initialData.configuration, untrack(() => configuration))
+		initConfig(
+			components['dbexplorercomponent'].initialData.configuration,
+			untrack(() => configuration)
+		)
 	)
 
 	let timeoutInput: number | undefined = undefined
@@ -180,18 +183,22 @@
 		)
 	}
 
-	let outputs = initOutput($worldStore, untrack(() => id), {
-		selectedRowIndex: 0,
-		selectedRow: {},
-		selectedRows: [] as any[],
-		result: [] as any[],
-		inputs: {},
-		loading: false,
-		page: 0,
-		newChange: { row: 0, column: '', value: undefined },
-		ready: undefined as boolean | undefined,
-		openedModalRow: {}
-	})
+	let outputs = initOutput(
+		$worldStore,
+		untrack(() => id),
+		{
+			selectedRowIndex: 0,
+			selectedRow: {},
+			selectedRows: [] as any[],
+			result: [] as any[],
+			inputs: {},
+			loading: false,
+			page: 0,
+			newChange: { row: 0, column: '', value: undefined },
+			ready: undefined as boolean | undefined,
+			openedModalRow: {}
+		}
+	)
 
 	let lastResource: string | undefined = undefined
 
@@ -260,9 +267,7 @@
 				resolvedConfig.type,
 				{
 					table: {
-						selectOptions: dbSchemas
-							? await getTablesByResource(dbSchemas, dbtype, dbPath, $workspaceStore!)
-							: [],
+						selectOptions: dbSchemas ? await getTablesByResource(dbSchemas, dbtype) : [],
 						loading: false
 					}
 				}
diff --git a/frontend/src/lib/components/apps/components/display/dbtable/metadata.ts b/frontend/src/lib/components/apps/components/display/dbtable/metadata.ts
index 3ec21a3801..1d0fa63342 100644
--- a/frontend/src/lib/components/apps/components/display/dbtable/metadata.ts
+++ b/frontend/src/lib/components/apps/components/display/dbtable/metadata.ts
@@ -1,4 +1,4 @@
-import { JobService, ResourceService } from '$lib/gen'
+import { JobService } from '$lib/gen'
 
 import { runScriptAndPollResult } from '$lib/components/jobs/utils'
 import type { DbInput } from '$lib/components/dbTypes'
@@ -39,17 +39,9 @@ export async function loadTableMetaData(
 	const ducklake = input.type === 'ducklake' ? input.ducklake : undefined
 	const dbArg = getDatabaseArg(input)
 
-	// MySQL needs the database name for metadata queries
-	let databaseName: string | undefined
-	if (input.type === 'database' && input.resourceType === 'mysql') {
-		const resourceObj = (await ResourceService.getResourceValue({
-			workspace,
-			path: input.resourcePath
-		})) as any
-		databaseName = resourceObj?.database
-	}
-
-	const content = makeMetadataMarker('LOAD_TABLE_METADATA', { table, databaseName }, ducklake)
+	// MySQL: the metadata query resolves the database name server-side (it falls
+	// back to `DATABASE()`), so we don't read the resource value client-side for it.
+	const content = makeMetadataMarker('LOAD_TABLE_METADATA', { table }, ducklake)
 
 	const job = await JobService.runScriptPreview({
 		workspace,
@@ -106,22 +98,10 @@ export async function loadAllTablesMetaData(
 		const dbArg = getDatabaseArg(input)
 		const ducklake = input.type === 'ducklake' ? input.ducklake : undefined
 
-		// MySQL needs the database name for metadata queries
-		let databaseName: string | undefined
-		if (input.type === 'database' && input.resourceType === 'mysql') {
-			const resourceObj = (await ResourceService.getResourceValue({
-				workspace,
-				path: input.resourcePath
-			})) as any
-			databaseName = resourceObj?.database
-		}
-
 		const language = getLanguageByResourceType(dbType)
-		const content = makeMetadataMarker(
-			'LOAD_TABLE_METADATA',
-			{ table: undefined, databaseName },
-			ducklake
-		)
+		// MySQL db name is resolved server-side via `DATABASE()` (see loadTableMetaData);
+		// no client-side resource-value read.
+		const content = makeMetadataMarker('LOAD_TABLE_METADATA', { table: undefined }, ducklake)
 
 		let result = (await runScriptAndPollResult({
 			workspace,
@@ -259,7 +239,11 @@ export async function getDbSchemas(
 			const dbSchema = {
 				lang: resourceTypeToLang(resourceType) as SQLSchema['lang'],
 				schema,
-				publicOnly: !!schema.public || !!schema.PUBLIC || !!schema.dbo
+				publicOnly: !!schema.public || !!schema.PUBLIC || !!schema.dbo,
+				// MySQL introspection selects `DATABASE() AS default_db_name`; carry it
+				// so the table picker can tell the default db apart from other visible
+				// schemas. Other dbs don't return it (stays undefined).
+				defaultDb: Array.isArray(result) ? (result[0] as any)?.default_db_name : undefined
 			}
 			return { ...dbSchema, stringified: stringifySchema(dbSchema) }
 		} else {
@@ -283,9 +267,7 @@ export async function getDbSchemas(
 
 export async function getTablesByResource(
 	schema: Partial<Record<string, DBSchema>>,
-	dbType: DbType | undefined,
-	dbPath: string,
-	workspace: string
+	dbType: DbType | undefined
 ): Promise<string[]> {
 	const s = Object.values(schema)?.[0]
 	switch (dbType) {
@@ -301,14 +283,15 @@ export async function getTablesByResource(
 			return paths
 		}
 		case 'mysql': {
-			const resourceObj = (await ResourceService.getResourceValue({
-				workspace,
-				path: dbPath.split('$res:')[1]
-			})) as any
+			// MySQL introspection lists DATABASE() plus any other visible non-system
+			// schemas. Show the default db's tables unprefixed and the rest as
+			// `db.table` — matching the pre-removal behavior (which matched the
+			// resource's `database`); `defaultDb` is the connection's DATABASE().
+			const defaultDb = s && 'defaultDb' in s ? s.defaultDb : undefined
 			const paths: string[] = []
 			for (const key in s?.schema) {
 				for (const subKey in s.schema[key]) {
-					if (key === resourceObj?.database) {
+					if (key === defaultDb) {
 						paths.push(`${subKey}`)
 					} else {
 						paths.push(`${key}.${subKey}`)
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte
index dd294be6af..c7c4e7d160 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableWrapper.svelte
@@ -3,7 +3,7 @@
 	import type { AppInput } from '../../inputType'
 	import type { Output } from '../../rx'
 	import type { AppViewerContext, ListContext } from '../../types'
-	import { isScriptByNameDefined, isScriptByPathDefined } from '../../utils'
+	import { appNavigateSameWindow, isScriptByNameDefined, isScriptByPathDefined } from '../../utils'
 	import NonRunnableComponent from './NonRunnableComponent.svelte'
 	import RunnableComponent from './RunnableComponent.svelte'
 	import { sendUserToast } from '$lib/toast'
@@ -261,7 +261,9 @@
 				if (newTab) {
 					window.open(gotoUrl, '_blank')
 				} else {
-					window.location.href = gotoUrl
+					// Top-level load; inside the opaque viewer iframe this targets the
+					// top page (pre-sandbox behavior) instead of the cookieless frame.
+					appNavigateSameWindow(gotoUrl)
 				}
 
 				break
diff --git a/frontend/src/lib/components/apps/components/helpers/eval.ts b/frontend/src/lib/components/apps/components/helpers/eval.ts
index 86523b2959..bacfb65b2d 100644
--- a/frontend/src/lib/components/apps/components/helpers/eval.ts
+++ b/frontend/src/lib/components/apps/components/helpers/eval.ts
@@ -2,6 +2,8 @@ import type { World } from '../../rx'
 import { sendUserToast } from '$lib/toast'
 import { waitJob } from '$lib/components/waitJob'
 import { base } from '$lib/base'
+import { appNavigateSameWindow } from '../../utils'
+import { OpenAPI } from '$lib/gen/core/OpenAPI'
 
 export function computeGlobalContext(
 	world: World | undefined,
@@ -200,7 +202,9 @@ export async function eval_like(
 				}
 				window.open(x, '_blank')
 			} else {
-				window.location.href = x
+				// Top-level load; inside the opaque viewer iframe this targets the
+				// top page (pre-sandbox behavior) instead of the cookieless frame.
+				appNavigateSameWindow(x)
 			}
 		},
 		(id, index) => {
@@ -292,10 +296,30 @@ export async function eval_like(
 
 			if (typeof input === 'object' && input.s3) {
 				const workspaceId = ((context ?? {}) as any).ctx?.workspace
-				const s3href = `${base}/api/w/${workspaceId}/job_helpers/download_s3_file?file_key=${encodeURIComponent(
-					input?.s3 ?? ''
-				)}${input?.storage ? `&storage=${input.storage}` : ''}`
-				downloadFile(s3href, filename || input.s3)
+				const appPath = ((context ?? {}) as any).ctx?.app_path
+				let inSandbox = false
+				try {
+					inSandbox =
+						window.parent !== window &&
+						new URLSearchParams(window.location.search).get('wm_embed') === '1'
+				} catch (_) {}
+				if (inSandbox && appPath && typeof OpenAPI.TOKEN === 'string' && OpenAPI.TOKEN) {
+					// Sandboxed viewer: the opaque iframe carries no cookie, so the
+					// cookie-authed job_helpers download fails. Route through the
+					// app-policy-confined apps_u endpoint with the embed token in the
+					// query (like the image/file components), scoped to this app's path.
+					const params = new URLSearchParams()
+					params.append('s3', input.s3 ?? '')
+					if (input.storage) params.append('storage', input.storage)
+					params.append('token', OpenAPI.TOKEN)
+					const s3href = `${base}/api/w/${workspaceId}/apps_u/download_s3_file/${appPath}?${params.toString()}`
+					downloadFile(s3href, filename || input.s3)
+				} else {
+					const s3href = `${base}/api/w/${workspaceId}/job_helpers/download_s3_file?file_key=${encodeURIComponent(
+						input?.s3 ?? ''
+					)}${input?.storage ? `&storage=${input.storage}` : ''}`
+					downloadFile(s3href, filename || input.s3)
+				}
 			} else if (typeof input === 'string') {
 				if (input.startsWith('data:')) {
 					downloadFile(input, filename)
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index 0cffdc2400..64cc94f551 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -69,6 +69,7 @@
 		path,
 		policy,
 		summary,
+		labels,
 		deployedBaseline = undefined,
 		fromHub = false,
 		diffDrawer = undefined,
@@ -83,7 +84,8 @@
 		onResetToDeployed,
 		loadedFromDraft = false,
 		othersDraftsCount = 0,
-		onOpenOthersDrafts
+		onOpenOthersDrafts,
+		onRestore
 	}: AppEditorProps = $props()
 
 	migrateApp(untrack(() => app))
@@ -885,12 +887,13 @@
 		<AppEditorHeader
 			{newPath}
 			{newApp}
+			{labels}
 			userDraftPath={appDraftPath}
 			{onResetToDeployed}
 			{loadedFromDraft}
 			{othersDraftsCount}
 			{onOpenOthersDrafts}
-			on:restore
+			{onRestore}
 			{policy}
 			{fromHub}
 			bind:this={appEditorHeader}
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index ca4ae77be4..84261bcf80 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -7,7 +7,13 @@
 	import { redo, undo } from '$lib/history.svelte'
 	import { discardDraftAfterDeploy } from '$lib/userDraftToast'
 	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
-	import { enterpriseLicense, tutorialsToDo, userStore, workspaceStore } from '$lib/stores'
+	import {
+		enterpriseLicense,
+		tutorialsToDo,
+		userStore,
+		userWorkspaces,
+		workspaceStore
+	} from '$lib/stores'
 	import { isMac, type Item, userPathPrefix } from '$lib/utils'
 	import { resetAllTodos, skipAllTodos } from '$lib/tutorialUtils'
 	import { getTutorialIndex } from '$lib/tutorials/config'
@@ -73,8 +79,7 @@
 	import AppEditorHeaderDeploy from './AppEditorHeaderDeploy.svelte'
 	import { computeSecretUrl } from './appDeploy.svelte'
 	import { updatePolicy } from './appPolicy'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 
 	interface Props {
@@ -88,6 +93,7 @@
 					summary: string
 					policy: any
 					custom_path?: string
+					labels?: string[]
 			  }
 			| undefined
 		version?: number | undefined
@@ -96,6 +102,8 @@
 		bottomPanelHidden?: boolean
 		newApp: boolean
 		newPath?: string
+		/** Initial labels for the app, threaded from the loaded app data via AppEditor. */
+		labels?: string[]
 		/** URL path the draft is keyed under; empty on `/apps/add` (no draft yet). */
 		userDraftPath?: string
 		onSavedNewAppPath?: (path: string) => void
@@ -112,6 +120,10 @@
 		loadedFromDraft?: boolean
 		othersDraftsCount?: number
 		onOpenOthersDrafts?: () => void
+		// Restoring an older deployment from the history drawer. A callback prop
+		// (not `on:restore` forwarding): forwarding a `createEventDispatcher`
+		// event up through these runes-mode components silently drops it.
+		onRestore?: (restoredApp: any) => void
 	}
 
 	let {
@@ -125,6 +137,7 @@
 		bottomPanelHidden = false,
 		newApp,
 		newPath = '',
+		labels: initialLabels = undefined,
 		userDraftPath = '',
 		onSavedNewAppPath,
 		onShowLeftPanel,
@@ -137,7 +150,8 @@
 		onResetToDeployed,
 		loadedFromDraft = false,
 		othersDraftsCount = 0,
-		onOpenOthersDrafts
+		onOpenOthersDrafts,
+		onRestore
 	}: Props = $props()
 
 	/** Mirror of the path the user is editing in the pen popover. Initialized
@@ -256,7 +270,8 @@
 					policy,
 					deployment_message: deploymentMsg,
 					custom_path: customPath,
-					preserve_on_behalf_of: preserveOnBehalfOf || undefined
+					preserve_on_behalf_of: preserveOnBehalfOf || undefined,
+					labels
 				}
 			})
 			// New path now exists server-side — drop the autocomplete cache so
@@ -267,7 +282,8 @@
 				value: structuredClone($state.snapshot($app)),
 				path: path,
 				policy: policy,
-				custom_path: customPath
+				custom_path: customPath,
+				labels: $state.snapshot(labels)
 			}
 			closeSaveDrawer()
 			sendUserToast('App deployed successfully')
@@ -310,7 +326,8 @@
 							value: $app,
 							path: newEditedPath || savedApp.path,
 							policy,
-							custom_path: customPath
+							custom_path: customPath,
+							labels
 						})
 					)
 			) {
@@ -361,7 +378,8 @@
 				// it also means that customPath needs to be set to '' instead of undefined to unset it (when admin)
 				custom_path:
 					$userStore?.is_admin || $userStore?.is_super_admin ? (customPath ?? '') : undefined,
-				preserve_on_behalf_of: preserveOnBehalfOf || undefined
+				preserve_on_behalf_of: preserveOnBehalfOf || undefined,
+				labels
 			}
 		})
 		invalidateWorkspacePaths($workspaceStore!)
@@ -370,13 +388,19 @@
 			value: structuredClone($state.snapshot($app)),
 			path: npath,
 			policy,
-			custom_path: customPath
+			custom_path: customPath,
+			labels: $state.snapshot(labels)
 		}
 		const appHistory = await AppService.getAppHistoryByPath({
 			workspace: $workspaceStore!,
 			path: npath
 		})
 		version = appHistory[0]?.version
+		// Re-pin the fork base to the just-deployed head: the editor stays open, so a
+		// follow-up deploy (or a new edit) would otherwise compare against the now-
+		// superseded base and falsely warn. parent_version is in
+		// DRAFT_COMPARE_IGNORED_FIELDS, so this write can't spawn a spurious draft.
+		if ($app) $app.parent_version = version
 
 		closeSaveDrawer()
 		sendUserToast('App deployed successfully')
@@ -395,14 +419,16 @@
 		}
 	}
 
-	async function setPublishState() {
+	async function setPublishState(message?: string) {
 		policy = await updatePolicy($app, policy)
 		await AppService.updateApp({
 			workspace: $workspaceStore!,
 			path: $appPath,
 			requestBody: { policy }
 		})
-		if (policy.execution_mode == 'anonymous') {
+		if (message) {
+			sendUserToast(message)
+		} else if (policy.execution_mode == 'anonymous') {
 			sendUserToast('App require no login to be accessed')
 		} else {
 			sendUserToast('App require login and read-access')
@@ -419,7 +445,12 @@
 
 	let onLatest = $state(true)
 	async function compareVersions() {
-		if (version === undefined) {
+		// Compare the draft's pinned fork base (`$app.parent_version`) against the
+		// current head when editing a draft, else the load-time head. Catches both a
+		// concurrent deploy (head moved since open) AND a stale draft reopened after a
+		// deploy (head == load-time head, but the draft was forked from an older one).
+		const base = $app?.parent_version ?? version
+		if (base === undefined) {
 			return
 		}
 		try {
@@ -427,7 +458,7 @@
 				workspace: $workspaceStore!,
 				path: $appPath
 			})
-			onLatest = appVersion?.version === undefined || version === appVersion?.version
+			onLatest = appVersion?.version === undefined || base === appVersion?.version
 		} catch (e) {
 			console.error('Error comparing versions', e)
 			onLatest = true
@@ -612,7 +643,8 @@
 						value: $app,
 						path: newEditedPath || savedApp.path,
 						policy,
-						custom_path: customPath
+						custom_path: customPath,
+						labels
 					}
 				})
 			},
@@ -711,6 +743,7 @@
 	})
 
 	let customPath = $state(savedApp?.custom_path)
+	let labels = $state(untrack(() => initialLabels))
 
 	$effect(() => {
 		if ($openDebugRun == undefined) {
@@ -740,7 +773,8 @@
 		value: $app,
 		path: newEditedPath || savedApp?.path,
 		policy,
-		custom_path: customPath
+		custom_path: customPath,
+		labels
 	}}
 />
 
@@ -784,7 +818,8 @@
 								value: $app,
 								path: newEditedPath || savedApp.path,
 								policy,
-								custom_path: customPath
+								custom_path: customPath,
+								labels
 							},
 							button: {
 								text: 'Looks good, deploy',
@@ -837,6 +872,7 @@
 			bind:pathError
 			bind:newEditedPath
 			bind:preserveOnBehalfOf
+			bind:labels
 			hideSecretUrl={false}
 		/>
 	</DrawerContent>
@@ -850,7 +886,7 @@
 
 <Drawer bind:open={historyBrowserDrawerOpen} size="1200px">
 	<DrawerContent title="Deployment History" on:close={() => (historyBrowserDrawerOpen = false)}>
-		<DeploymentHistory on:restore appPath={$appPath} />
+		<DeploymentHistory on:restore={(e) => onRestore?.(e.detail)} appPath={$appPath} />
 	</DrawerContent>
 </Drawer>
 
@@ -872,15 +908,22 @@
 	bind:clientWidth={topbarWidth}
 	class="flex flex-row justify-between gap-2 gap-y-2 px-2 items-center overflow-y-visible overflow-x-auto max-h-12 h-12 shrink-0"
 >
-	<div class="flex flex-row gap-2 items-center min-w-[200px]">
-		<EditorHeader
-			bind:summary={$summary}
-			bind:path={newEditedPath}
-			savedPath={$appPath || newPath || undefined}
-			kind="app"
-			onNavigate={(item) => (onNavigate ? onNavigate(item) : goto(editPathFor(item)))}
-		/>
-		<div class="flex gap-2 {compactTopbar ? 'hidden' : ''}">
+	<!-- Identity block shrinks/truncates first (min-w-0) so the cloud indicator
+	     and the pinned action groups (shrink-0 below) stay visible on narrow
+	     widths instead of the breadcrumb overflowing and hiding them. Kept at
+	     min-w-0 (not flex-1) so justify-between still positions the panel-hide
+	     buttons between the identity and the actions. -->
+	<div class="flex flex-row gap-2 items-center min-w-0">
+		<div class="min-w-0 overflow-hidden">
+			<EditorHeader
+				bind:summary={$summary}
+				bind:path={newEditedPath}
+				savedPath={$appPath || newPath || undefined}
+				kind="app"
+				onNavigate={(item) => (onNavigate ? onNavigate(item) : goto(editPathFor(item)))}
+			/>
+		</div>
+		<div class="flex gap-2 shrink-0 {compactTopbar ? 'hidden' : ''}">
 			{#if $app}
 				<ToggleButtonGroup
 					selected={$app.fullscreen ? 'true' : 'false'}
@@ -997,7 +1040,7 @@
 	</div>
 
 	{#if $mode !== 'preview'}
-		<div class="flex gap-1">
+		<div class="flex gap-1 shrink-0">
 			<HideButton
 				direction="left"
 				hidden={leftPanelHidden}
@@ -1034,9 +1077,11 @@
 		</div>
 	{/if}
 	{#if $enterpriseLicense && $appPath != ''}
-		<Awareness />
+		<div class="shrink-0">
+			<Awareness />
+		</div>
 	{/if}
-	<div class="flex flex-row gap-2 justify-end items-center overflow-visible">
+	<div class="flex flex-row gap-2 justify-end items-center overflow-visible shrink-0">
 		<div class="relative">
 			<Dropdown items={moreItems} />
 			{#if $tutorialsToDo.includes(getTutorialIndex('backgroundrunnables')) || $tutorialsToDo.includes(getTutorialIndex('connection'))}
@@ -1101,10 +1146,10 @@
 								window.open(`/apps/add?template=${appPath}`)
 							}
 						},
-						...(!isCloudHosted() && !isRuleActive('DisableWorkspaceForking')
+						...(!isCloudHosted() && editInForkAllowed($workspaceStore, $userWorkspaces)
 							? [
 									{
-										label: 'Edit in workspace fork',
+										label: editInForkLabel($workspaceStore, $userWorkspaces),
 										onClick: () => {
 											window.open(buildForkEditUrl('app', $appPath))
 										}
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte
index c344114404..f31339df70 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeaderDeploy.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { Alert } from '$lib/components/common'
+	import Badge from '$lib/components/common/badge/Badge.svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
 	import { Loader2 } from 'lucide-svelte'
@@ -15,6 +16,7 @@
 	import { isCloudHosted } from '$lib/cloud'
 	import EEOnly from '$lib/components/EEOnly.svelte'
 	import TextInput from '$lib/components/text_input/TextInput.svelte'
+	import LabelsInput from '$lib/components/LabelsInput.svelte'
 	import OnBehalfOfSelector, {
 		type OnBehalfOfChoice
 	} from '$lib/components/OnBehalfOfSelector.svelte'
@@ -37,11 +39,13 @@
 		newPath,
 		hideSecretUrl = false,
 		preserveOnBehalfOf = $bindable(false),
+		labels = $bindable(),
 		rawApp = false,
-		newApp = false
+		newApp = false,
+		operatingWorkspace = undefined
 	}: {
 		policy: any
-		setPublishState: () => void
+		setPublishState: (message?: string) => void
 		appPath: string
 		customPath: string | undefined
 		onLatest: boolean
@@ -54,6 +58,7 @@
 		newPath: string
 		hideSecretUrl?: boolean
 		preserveOnBehalfOf?: boolean
+		labels?: string[] | undefined
 		// Raw apps need cross-origin isolation (wm_coep) to be embeddable. Classic
 		// (low-code) apps must NOT get the flag — it would force COEP on the
 		// document and break no-CORP cross-origin subresources (external images,
@@ -64,8 +69,15 @@
 		 *  (`/secret_of/...` 404s with no `app` row) and renders a placeholder
 		 *  instead of the eternally-spinning link. */
 		newApp?: boolean
+		/** Workspace the app is deployed to — the session's acting workspace when
+		 *  embedded in a session preview, else the navigation `$workspaceStore`.
+		 *  The secret-URL / custom-path / folder / on-behalf-of lookups must target
+		 *  it, not `$workspaceStore` (which stays on the nav workspace in a session). */
+		operatingWorkspace?: string
 	} = $props()
 
+	const opWs = $derived(operatingWorkspace ?? $workspaceStore)
+
 	let isDeployer = $derived($userStore?.groups?.includes(WM_DEPLOYERS_GROUP) ?? false)
 	// Admins always pass the backend check. For everyone else, fail closed
 	// while the workspace protection rules are still loading so the toggle
@@ -89,7 +101,7 @@
 
 	async function appExists(customPath: string) {
 		return await AppService.customPathExists({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			customPath
 		})
 	}
@@ -111,7 +123,7 @@
 	let secretUrlHref = $derived(secretUrl ? computeSecretUrl(secretUrl) : undefined)
 	let fullCustomUrl = $derived(
 		`${window.location.origin}${base}/a/${
-			isCloudHosted() || globalWorkspacedRoute ? $workspaceStore + '/' : ''
+			isCloudHosted() || globalWorkspacedRoute ? opWs + '/' : ''
 		}${customPath}`
 	)
 
@@ -127,7 +139,7 @@
 	}
 	async function getSecretUrl() {
 		secretUrl = await AppService.getPublicSecretOfApp({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			path: appPath
 		})
 	}
@@ -200,6 +212,8 @@
 		bind:value={summary}
 	/>
 </div>
+<div class="pt-3"></div>
+<LabelsInput bind:labels class="-mt-4" />
 <div class="py-6"></div>
 <label for="deploymentMsg" class="text-emphasis text-xs font-semibold">Deployment message</label>
 <div class="w-full pt-1">
@@ -223,6 +237,7 @@
 	namePlaceholder="app"
 	kind="app"
 	autofocus={false}
+	workspaceOverride={operatingWorkspace}
 />
 
 <div class="py-2"></div>
@@ -241,7 +256,7 @@
 			Because you are either an admin or part of the {WM_DEPLOYERS_GROUP} group, you can select another
 			user to run this app on behalf of. Once deployed the app will be run on behalf of
 			<OnBehalfOfSelector
-				targetWorkspace={$workspaceStore ?? ''}
+				targetWorkspace={opWs ?? ''}
 				targetValue={savedOnBehalfOfEmail}
 				selected={onBehalfOfChoice}
 				onSelect={(choice, details) => {
@@ -274,6 +289,40 @@
 
 <div class="mt-10"></div>
 
+<div class="flex items-center gap-2">
+	<h2>Sandbox isolation</h2>
+	<Badge color="yellow">Alpha</Badge>
+</div>
+<div class="my-6">
+	<Toggle
+		options={{ right: "Isolate the app from the viewer's browser session" }}
+		checked={policy.sandbox == true}
+		on:change={(e) => {
+			policy.sandbox = e.detail || undefined
+			setPublishState(e.detail ? 'Sandbox isolation enabled' : 'Sandbox isolation disabled')
+		}}
+		disabled={!savedApp}
+	/>
+	<div class="text-xs text-secondary mt-1">
+		Controls what the app's browser-side code can reach in each viewer's browser — distinct from the
+		on-behalf-of model above (which sets who its runnables run as). Off by default, the app's code
+		uses the viewer's own session; enable it to confine the app to a narrowly-scoped token instead,
+		on every surface (public URL and in-workspace). Leave it off if the app needs full browser
+		features (IndexedDB, third-party auth/SDKs, OAuth redirects).
+	</div>
+	{#if !savedApp}
+		<div class="text-xs text-tertiary mt-1">Save the app once to change this setting.</div>
+	{/if}
+	{#if policy.sandbox == true}
+		<div class="mt-2">
+			<Alert type="warning" title="Alpha feature" size="xs">
+				Sandbox isolation is in alpha. After enabling, open the app from its public URL to confirm
+				it still works, and report any broken behavior.
+			</Alert>
+		</div>
+	{/if}
+</div>
+
 {#if !hideSecretUrl}
 	<h2>Public URL</h2>
 
diff --git a/frontend/src/lib/components/apps/editor/AppPreview.svelte b/frontend/src/lib/components/apps/editor/AppPreview.svelte
index 67c7ef4313..a33e26504d 100644
--- a/frontend/src/lib/components/apps/editor/AppPreview.svelte
+++ b/frontend/src/lib/components/apps/editor/AppPreview.svelte
@@ -78,7 +78,8 @@
 		workspace: untrack(() => workspace),
 		mode: 'viewer',
 		summary: untrack(() => summary),
-		author: untrack(() => policy).on_behalf_of_email
+		author: untrack(() => policy).on_behalf_of_email,
+		app_path: untrack(() => appPath)
 	}
 
 	function resizeWindow() {
diff --git a/frontend/src/lib/components/apps/editor/InWorkspaceAppViewer.svelte b/frontend/src/lib/components/apps/editor/InWorkspaceAppViewer.svelte
new file mode 100644
index 0000000000..cd50455a18
--- /dev/null
+++ b/frontend/src/lib/components/apps/editor/InWorkspaceAppViewer.svelte
@@ -0,0 +1,146 @@
+<script lang="ts">
+	/*
+	 * WIN-2006: shared in-workspace app viewer (low-code AND raw). Renders the app
+	 * through the same PublicAppFrame -> PublicApp machinery the public viewer uses,
+	 * so the sandbox behavior is identical on every page. PublicAppFrame picks the
+	 * rendering: an opaque /app_embed iframe for sandboxed low-code, or inline (with
+	 * the bundle isolated in RawAppPreview's own opaque iframe) for raw and for
+	 * unsandboxed apps. When the publisher opts an app into sandbox isolation, its
+	 * untrusted markup/JS must not run with the member's full session — hence the
+	 * scoped embed token / opaque isolation.
+	 */
+	import { base } from '$lib/base'
+	import PublicApp from '$lib/components/apps/editor/PublicApp.svelte'
+	import PublicAppFrame from '$lib/components/apps/editor/PublicAppFrame.svelte'
+	import { Button } from '$lib/components/common'
+	import { AppService, OpenAPI } from '$lib/gen'
+	import { userStore } from '$lib/stores'
+	import { canWrite } from '$lib/utils'
+	import { getUserExt } from '$lib/user'
+	import { Pen } from 'lucide-svelte'
+	import { page } from '$app/state'
+
+	let {
+		workspace,
+		path,
+		editHref
+	}: {
+		workspace: string
+		path: string
+		/** Where the Edit button points (low-code vs raw editor). */
+		editHref: string
+	} = $props()
+
+	let app: any = $state(undefined)
+	let notExists = $state(false)
+	let noPermission = $state(false)
+	let canWriteApp = $state(false)
+	let refresh: (() => void) | undefined
+
+	// The opaque iframe loads the dedicated cookieless, chrome-less viewer route.
+	// The page's query/hash are forwarded so the app sees the same `ctx.query` /
+	// `ctx.hash` as the pre-sandbox viewer did. Captured ONCE (not reactively):
+	// the embedder later mirrors the app's own hash/query changes back onto this
+	// page's URL (wm_embed_hash relay), and re-deriving the iframe src from them
+	// would reload the app on its every navigation.
+	const initialSearchHash = page.url.search + page.url.hash
+	let viewerUrl = $derived(`${base}/app_embed/${workspace}/${path}${initialSearchHash}`)
+
+	const hideEditBtn = page.url.searchParams.get('hideEditBtn') === 'true'
+	const hideRefreshBar = page.url.searchParams.get('hideRefreshBar') === 'true'
+
+	// Embedder side: mint a scoped embed token (by path) from the member's session.
+	async function fetchEmbedToken(): Promise<{ token?: string }> {
+		const headers: Record<string, string> = {}
+		if (typeof OpenAPI.TOKEN === 'string' && OpenAPI.TOKEN) {
+			headers['Authorization'] = `Bearer ${OpenAPI.TOKEN}`
+		}
+		const res = await fetch(`${OpenAPI.BASE}/w/${workspace}/apps/embed_token/p/${path}`, {
+			headers
+		})
+		if (!res.ok) {
+			const err: any = new Error('Failed to fetch embed token')
+			err.status = res.status
+			throw err
+		}
+		return await res.json()
+	}
+
+	// Viewer side — used for the inline renderings (raw, and unsandboxed low-code);
+	// the sandboxed low-code case loads inside the opaque /app_embed iframe instead.
+	// getAppByPath returns bundle_secret + runnables for raw apps, which
+	// PublicApp -> RawAppPreview needs.
+	async function loadApp() {
+		try {
+			userStore.set(await getUserExt(workspace))
+		} catch (e) {
+			console.warn('Anonymous user')
+		}
+		try {
+			const loaded: any = await AppService.getAppByPath({ workspace, path })
+			// Raw apps need the bundle secret to load their bundle. getAppByPath
+			// doesn't compute it (unlike the public handlers), so fetch it here — the
+			// same call the previous raw viewer used — and hand it to PublicApp ->
+			// RawAppPreview via bundle_secret.
+			if (loaded?.raw_app && !loaded.bundle_secret) {
+				try {
+					loaded.bundle_secret = await AppService.getPublicSecretOfLatestVersionOfApp({
+						workspace,
+						path
+					})
+				} catch (e) {
+					console.error('Failed to load raw app bundle secret', e)
+				}
+			}
+			app = loaded
+			noPermission = false
+			notExists = false
+		} catch (e: any) {
+			if (e.status == 401) refresh?.()
+			else if (e.status == 403) noPermission = true
+			else notExists = true
+		}
+	}
+
+	// Edit button: determine write access on this real-origin page (cookie).
+	async function loadPerms() {
+		try {
+			const lite: any = await AppService.getAppLiteByPath({ workspace, path })
+			canWriteApp = canWrite(lite?.path, lite?.extra_perms ?? {}, $userStore)
+		} catch (_) {
+			canWriteApp = false
+		}
+	}
+
+	$effect(() => {
+		if (workspace && path) loadPerms()
+	})
+</script>
+
+<PublicAppFrame
+	{fetchEmbedToken}
+	{viewerUrl}
+	onViewerReady={(_token, requestTokenRefresh) => {
+		refresh = requestTokenRefresh
+		loadApp()
+	}}
+>
+	{#snippet viewer()}
+		<PublicApp
+			{app}
+			{workspace}
+			{notExists}
+			{noPermission}
+			jwtError={false}
+			inWorkspace
+			{hideRefreshBar}
+			onLoginSuccess={() => loadApp()}
+		></PublicApp>
+	{/snippet}
+</PublicAppFrame>
+
+{#if canWriteApp && !hideEditBtn}
+	<div id="app-edit-btn" class="absolute bottom-4 z-50 right-4">
+		<Button size="sm" startIcon={{ icon: Pen }} variant="subtle" href={editHref}>Edit</Button>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/apps/editor/PublicApp.svelte b/frontend/src/lib/components/apps/editor/PublicApp.svelte
index fef6ba8fa3..92cde8788b 100644
--- a/frontend/src/lib/components/apps/editor/PublicApp.svelte
+++ b/frontend/src/lib/components/apps/editor/PublicApp.svelte
@@ -7,8 +7,13 @@
 	import { isCloudHosted } from '$lib/cloud'
 	import { Alert, Skeleton } from '$lib/components/common'
 	import { WindmillIcon } from '$lib/components/icons'
-	import { onMount, setContext } from 'svelte'
-	import { IS_APP_PUBLIC_CONTEXT_KEY, type EditorBreakpoint } from '../types'
+	import { getContext, onMount, setContext } from 'svelte'
+	import {
+		EMBED_NAV_CONTEXT_KEY,
+		IS_APP_PUBLIC_CONTEXT_KEY,
+		type EditorBreakpoint,
+		type EmbedNav
+	} from '../types'
 	import { UserService, type AppWithLastVersion, type GlobalWhoamiResponse } from '$lib/gen'
 	import { urlParamsToObject } from '$lib/utils'
 	import { goto } from '$app/navigation'
@@ -24,7 +29,9 @@
 		jwtError,
 		onLoginSuccess,
 		app,
-		workspace
+		workspace,
+		inWorkspace = false,
+		hideRefreshBar = false
 	}: {
 		notExists: boolean
 		noPermission: boolean
@@ -32,12 +39,27 @@
 		onLoginSuccess: () => void
 		app: (AppWithLastVersion & { value: any; workspace_id?: string }) | undefined
 		workspace: string | undefined
+		/**
+		 * In-workspace rendering (`/apps/get`, `/app_embed`): keep exact parity
+		 * with the pre-sandbox member viewer — no "Powered by Windmill" badge, no
+		 * user overlay, no HTML-result approval gate, column flex wrapper.
+		 */
+		inWorkspace?: boolean
+		hideRefreshBar?: boolean
 	} = $props()
 
 	// Use workspace from props or from app.workspace_id (for custom path responses)
 	let effectiveWorkspace = $derived(workspace ?? app?.workspace_id)
 
-	setContext(IS_APP_PUBLIC_CONTEXT_KEY, true)
+	// HTML results from runnables only need viewer approval on the public
+	// surfaces (untrusted distribution); the in-workspace viewer never gated them.
+	setContext(IS_APP_PUBLIC_CONTEXT_KEY, !inWorkspace)
+
+	// WIN-2006: inside the opaque viewer iframe, navigations to other routes
+	// (navbar "app" items) must happen on the TOP page — the iframe is cookieless,
+	// so navigating it would just show a login screen. PublicAppFrame provides the
+	// relay; outside the opaque viewer this is undefined and goto works directly.
+	const embedNav = getContext<EmbedNav | undefined>(EMBED_NAV_CONTEXT_KEY)
 
 	const breakpoint = writable<EditorBreakpoint>('lg')
 
@@ -71,27 +93,29 @@
 	})
 </script>
 
-<div
-	class="z-50 text-xs fixed bottom-1 right-2 {$enterpriseLicense && !isCloudHosted()
-		? 'transition-opacity delay-1000 duration-1000 opacity-20 hover:delay-0 hover:opacity-100'
-		: ''}"
->
-	<a href="https://windmill.dev" class="whitespace-nowrap text-primary inline-flex items-center"
-		>Powered by &nbsp;<WindmillIcon />&nbsp;Windmill</a
+{#if !inWorkspace}
+	<div
+		class="z-50 text-xs fixed bottom-1 right-2 {$enterpriseLicense && !isCloudHosted()
+			? 'transition-opacity delay-1000 duration-1000 opacity-20 hover:delay-0 hover:opacity-100'
+			: ''}"
 	>
-</div>
+		<a href="https://windmill.dev" class="whitespace-nowrap text-primary inline-flex items-center"
+			>Powered by &nbsp;<WindmillIcon />&nbsp;Windmill</a
+		>
+	</div>
 
-{#snippet userInfo(child)}
-	<div class="flex gap-1 items-center"><User size={14} />{child}</div>
-{/snippet}
+	{#snippet userInfo(child)}
+		<div class="flex gap-1 items-center"><User size={14} />{child}</div>
+	{/snippet}
 
-<div class="z-50 text-2xs text-primary absolute top-3 left-2"
-	>{#if $userStore}
-		{@render userInfo($userStore.username)}
-	{:else if globalUser}
-		{@render userInfo(globalUser.email)}
-	{:else}<UserRoundX size={14} />{/if}
-</div>
+	<div class="z-50 text-2xs text-primary absolute top-3 left-2"
+		>{#if $userStore}
+			{@render userInfo($userStore.username)}
+		{:else if globalUser}
+			{@render userInfo(globalUser.email)}
+		{:else}<UserRoundX size={14} />{/if}
+	</div>
+{/if}
 
 {#if notExists}
 	<div class="px-4 mt-20"
@@ -132,7 +156,11 @@
 		{:else}
 			<div
 				class={twMerge(
-					'min-h-screen h-full w-full flex',
+					// `flex-col` matches the pre-sandbox in-workspace viewer exactly;
+					// the public viewer always used a plain `flex` wrapper.
+					inWorkspace
+						? 'min-h-screen h-full w-full flex flex-col'
+						: 'min-h-screen h-full w-full flex',
 					app?.value?.['css']?.['app']?.['viewer']?.class,
 					'wm-app-viewer'
 				)}
@@ -140,6 +168,7 @@
 			>
 				<AppPreview
 					noBackend={false}
+					{hideRefreshBar}
 					context={{
 						email: $userStore?.email,
 						name: $userStore?.name,
@@ -156,7 +185,7 @@
 					policy={app.policy}
 					isEditor={false}
 					replaceStateFn={(path) => goto(path)}
-					gotoFn={(path, opt) => goto(path, opt)}
+					gotoFn={(path, opt) => (embedNav ? embedNav.navigateTop(path) : goto(path, opt))}
 				/>
 			</div>
 		{/if}
diff --git a/frontend/src/lib/components/apps/editor/PublicAppFrame.svelte b/frontend/src/lib/components/apps/editor/PublicAppFrame.svelte
new file mode 100644
index 0000000000..43dc937651
--- /dev/null
+++ b/frontend/src/lib/components/apps/editor/PublicAppFrame.svelte
@@ -0,0 +1,427 @@
+<script lang="ts">
+	/*
+	 * WIN-2006: published apps render arbitrary user-authored markup/JS. When the
+	 * publisher opts an app into sandbox isolation (alpha), that untrusted code (a
+	 * malicious author, or an XSS bug in the app) must not run with the viewer's
+	 * session. How it's contained depends on the app:
+	 *
+	 *  - Low-code, sandboxed: rendered in an **opaque-origin** (sandboxed, no
+	 *    `allow-same-origin`) iframe and handed a **narrowly-scoped embed token** —
+	 *    never the session cookie. This component is the embedder (top window:
+	 *    authenticates the viewer, mints the token, renders the opaque iframe) and,
+	 *    inside that iframe (`wm_embed=1`), the viewer (uses the token as its only
+	 *    credential, then renders the app).
+	 *  - Raw, sandboxed: rendered directly here as a **single** opaque bundle iframe
+	 *    (the author bundle is already isolated in its own opaque iframe); no opaque
+	 *    viewer / embed token needed.
+	 *  - Unsandboxed (default): the app runs same-origin with the viewer's full
+	 *    session, the pre-isolation behavior. Rendered directly here.
+	 *
+	 * No `PUBLIC_APP_DOMAIN` is required: the opaque origin is, for same-origin-policy
+	 * purposes, as foreign to the main app as a different domain. The opaque viewer's
+	 * API calls are cross-origin and rely on `Access-Control-Allow-Origin: *` + the
+	 * bearer token (no cookie); the raw wrapper document always carries `CSP: sandbox`.
+	 */
+	import { BROWSER } from 'esm-env'
+	import { OpenAPI } from '$lib/gen'
+	import { page } from '$app/state'
+	import { onDestroy, onMount, setContext, type Snippet } from 'svelte'
+	import { Alert, Skeleton } from '$lib/components/common'
+	import { base } from '$app/paths'
+	import { goto } from '$app/navigation'
+	import Login from '$lib/components/Login.svelte'
+	import { WINDMILL_RESERVED_QUERY_PARAMS } from '$lib/utils'
+	import { EMBED_NAV_CONTEXT_KEY, type EmbedNav } from '../types'
+
+	type EmbedToken = {
+		token?: string | null
+		raw_app?: boolean
+		sandbox?: boolean
+		app_path?: string | null
+		workspace_id?: string | null
+	}
+
+	let {
+		fetchEmbedToken,
+		onViewerReady,
+		viewer,
+		viewerUrl
+	}: {
+		/** Embedder-side: validate access + mint the scoped token. Throws with a
+		 * `.status` of 401 (login required) or 404 (not found). */
+		fetchEmbedToken: () => Promise<EmbedToken>
+		/** Viewer-side: fired (once per received token) when the embed token is
+		 * available, before the app renders. Use it to kick off data loading.
+		 * `requestTokenRefresh` asks the embedder for a fresh token on a 401. */
+		onViewerReady?: (token: string | undefined, requestTokenRefresh: () => void) => void
+		/** Viewer-side: renders the actual app once the embed token is available. */
+		viewer: Snippet
+		/** Embedder-side: override the opaque iframe src (the route that renders the
+		 * viewer). Defaults to the current route + `wm_embed=1` (public routes embed
+		 * themselves). The in-workspace viewer sets this because its embedder route
+		 * (`/apps/get`, auth-gated, with chrome) differs from the cookieless,
+		 * chrome-less viewer route (`/app_embed`). */
+		viewerUrl?: string
+	} = $props()
+
+	const EMBED_PARAM = 'wm_embed'
+	const ORIGIN_PARAM = 'wm_embedder_origin'
+
+	const framed = BROWSER && window.parent !== window
+	const isViewer = BROWSER && page.url.searchParams.get(EMBED_PARAM) === '1' && framed
+
+	// ----------------------------- viewer mode -----------------------------
+	let viewerToken: string | undefined = $state(undefined)
+	let viewerReady = $state(false)
+	// Set when viewer mode never receives a token (see the orphan timer in onMount):
+	// the page carries `wm_embed` but isn't actually framed by a Windmill embedder.
+	let viewerOrphaned = $state(false)
+	const expectedEmbedderOrigin = BROWSER ? page.url.searchParams.get(ORIGIN_PARAM) : null
+
+	// Components that embed the token in a URL (images, PDFs, downloads, SSE) read
+	// it from the `AuthToken` context. In viewer mode that must be the embed token;
+	// the getter keeps it in sync once the token arrives. In direct render
+	// (unsandboxed / raw — the viewer snippet runs on this page, not in the opaque
+	// iframe) expose the page's own bearer credential when there is one: JWT public
+	// URLs put it in `OpenAPI.TOKEN` (set before the app loads) and have no cookie
+	// to fall back on. Cookie sessions have no bearer here and keep using the cookie.
+	setContext<{ token?: string }>('AuthToken', {
+		get token() {
+			if (isViewer) return viewerToken
+			return typeof OpenAPI.TOKEN === 'string' && OpenAPI.TOKEN ? OpenAPI.TOKEN : undefined
+		}
+	})
+
+	function handleViewerMessage(e: MessageEvent) {
+		// The embedder has a real origin, so we can validate both the source and
+		// the origin of messages we receive.
+		if (e.source !== window.parent) return
+		if (expectedEmbedderOrigin && e.origin !== expectedEmbedderOrigin) return
+		if (e.data?.type === 'wm_embed_token') {
+			const token = e.data.token ?? undefined
+			viewerToken = token
+			// The bearer token (when present) is the credential the app uses; no
+			// cookie reaches this opaque origin.
+			OpenAPI.TOKEN = token
+			viewerReady = true
+			viewerOrphaned = false
+			onViewerReady?.(token, requestTokenRefresh)
+		}
+	}
+
+	/** Passed to the viewer: when the rendered app gets a 401 (e.g. the embed
+	 * token expired) it calls this to ask the embedder for a fresh token. */
+	function requestTokenRefresh() {
+		if (!isViewer) {
+			// Embedder-side direct render (raw app, or unsandboxed app): there is no
+			// opaque viewer to message — just re-run the access check / app load.
+			initEmbedder()
+			return
+		}
+		viewerReady = false
+		window.parent.postMessage({ type: 'wm_embed_unauthorized' }, expectedEmbedderOrigin ?? '*')
+	}
+
+	// WIN-2006: the app runs inside the (opaque) viewer iframe, so its in-app URL
+	// changes never reach the top address bar — breaking shareable deep links. Relay
+	// the hash + query up to the embedder, which mirrors them onto its own URL
+	// (e.g. the navbar component's same-app links set ?query and #hash). Never the
+	// path: the embedder keeps its own pathname, so a hostile app can't rewrite the
+	// address bar to an unrelated route. Transport params (wm_embed, …) are
+	// stripped before relaying.
+	let origPushState: typeof history.pushState | undefined
+	let origReplaceState: typeof history.replaceState | undefined
+	function relayHash() {
+		try {
+			const params = new URLSearchParams(window.location.search)
+			const reserved: string[] = []
+			params.forEach((_v, k) => {
+				if (WINDMILL_RESERVED_QUERY_PARAMS.has(k)) reserved.push(k)
+			})
+			reserved.forEach((k) => params.delete(k))
+			const qs = params.toString()
+			const search = qs ? `?${qs}` : ''
+			window.parent.postMessage(
+				{ type: 'wm_embed_hash', hash: window.location.hash, search },
+				expectedEmbedderOrigin ?? '*'
+			)
+		} catch (_) {}
+	}
+
+	// Top-level navigation relay (WIN-2006): in-app links to other apps (navbar
+	// "app" items) must navigate the top page — navigating inside the opaque
+	// iframe would load the SPA cookieless. Consumed by PublicApp via gotoFn.
+	setContext<EmbedNav | undefined>(
+		EMBED_NAV_CONTEXT_KEY,
+		isViewer
+			? {
+					navigateTop: (href: string) => {
+						try {
+							window.parent.postMessage(
+								{ type: 'wm_embed_navigate', href },
+								expectedEmbedderOrigin ?? '*'
+							)
+						} catch (_) {}
+					}
+				}
+			: undefined
+	)
+	function installHashRelay() {
+		origPushState = history.pushState
+		origReplaceState = history.replaceState
+		history.pushState = function (data, unused, url) {
+			origPushState?.call(history, data, unused, url ?? null)
+			relayHash()
+		}
+		history.replaceState = function (data, unused, url) {
+			origReplaceState?.call(history, data, unused, url ?? null)
+			relayHash()
+		}
+		window.addEventListener('hashchange', relayHash)
+		window.addEventListener('popstate', relayHash)
+	}
+	function uninstallHashRelay() {
+		if (origPushState) history.pushState = origPushState
+		if (origReplaceState) history.replaceState = origReplaceState
+		window.removeEventListener('hashchange', relayHash)
+		window.removeEventListener('popstate', relayHash)
+	}
+
+	// ---------------------------- embedder mode ----------------------------
+	let status: 'loading' | 'ready' | 'noPermission' | 'notExists' = $state('loading')
+	let embedToken: string | null = $state(null)
+	let iframeEl: HTMLIFrameElement | undefined = $state(undefined)
+
+	// WIN-2006: publisher opted this app into sandbox isolation (alpha). When false
+	// (the default) the app runs same-origin with the viewer's full session — the
+	// pre-isolation behavior.
+	let sandboxed = $state(false)
+
+	// WIN-2006 Variant A: raw apps render single-iframe. The author's bundle is
+	// already isolated in its own opaque iframe (served + CSP-sandboxed by the
+	// backend), so the viewer skips the opaque-viewer indirection and the embed
+	// token entirely — it renders the app directly on this (real) origin and the
+	// bridge calls the backend with the page credential (cookie / JWT / anonymous),
+	// matching the logged-in raw viewer. Low-code keeps the opaque viewer + token.
+	let isRaw = $state(false)
+
+	// WIN-2006: the resolved app path + workspace, used together to scope this app's
+	// backing localStorage (below) so sandboxed apps don't share one store (even two
+	// apps at the same path in different workspaces).
+	let appPath: string | undefined = $state(undefined)
+	let workspaceId: string | undefined = $state(undefined)
+
+	// Same-origin (full session) execution: every app that wasn't opted into
+	// sandbox isolation. RawAppPreview reads this to drop the bundle's opaque
+	// sandbox; an unsandboxed low-code app renders directly here.
+	let unsandboxed = $derived(!sandboxed)
+
+	// Read by RawAppPreview (and any app component) to render same-origin (full
+	// access) instead of the sandboxed bundle iframe.
+	setContext('IS_APP_UNSANDBOXED', {
+		get value() {
+			return unsandboxed
+		}
+	})
+
+	function buildViewerUrl(): string {
+		// Default: embed the current route. The in-workspace viewer overrides this
+		// with a dedicated cookieless, chrome-less viewer route (`/app_embed`).
+		const url = new URL(viewerUrl ?? window.location.href, window.location.origin)
+		url.searchParams.set(EMBED_PARAM, '1')
+		url.searchParams.set(ORIGIN_PARAM, window.location.origin)
+		// Same origin (no separate domain); the sandbox makes it opaque.
+		return url.pathname + url.search + url.hash
+	}
+
+	async function initEmbedder() {
+		status = 'loading'
+		try {
+			const resp = await fetchEmbedToken()
+			embedToken = resp.token ?? null
+			sandboxed = resp.sandbox ?? false
+			isRaw = resp.raw_app ?? false
+			appPath = resp.app_path ?? undefined
+			workspaceId = resp.workspace_id ?? undefined
+			status = 'ready'
+
+			if (unsandboxed || isRaw) {
+				// Render the app directly on this origin: same-origin when unsandboxed
+				// (the default), or a single opaque bundle iframe when it's a sandboxed
+				// raw app.
+				onViewerReady?.(undefined, requestTokenRefresh)
+			} else {
+				// Sandboxed low-code: hand the scoped token to the opaque viewer iframe.
+				postTokenToIframe()
+			}
+		} catch (e: any) {
+			status = e?.status === 401 ? 'noPermission' : 'notExists'
+		}
+	}
+
+	function postTokenToIframe() {
+		// The iframe is an opaque origin ("null"), which cannot be named as a
+		// targetOrigin, so we use '*'. This only relaxes the receiver-origin
+		// check; the message is still delivered solely to our own iframe's
+		// contentWindow, whose content we control.
+		iframeEl?.contentWindow?.postMessage({ type: 'wm_embed_token', token: embedToken }, '*')
+	}
+
+	// Persistence authority (WIN-2006): opaque app frames (the viewer SPA) have no
+	// real Web Storage, so the embedder — on the real origin — backs their
+	// `localStorage` here. The store is scoped PER APP (keyed by workspace + app path)
+	// so one sandboxed app cannot read or clobber another's storage. Updated with
+	// per-key ops so concurrent frames of the same app merge instead of clobbering.
+	function lsKey(): string {
+		return `wm_apps_localstorage:${workspaceId ?? ''}:${appPath ?? ''}`
+	}
+	function readSharedLs(): Record<string, string> {
+		try {
+			return JSON.parse(localStorage.getItem(lsKey()) || '{}')
+		} catch (_) {
+			return {}
+		}
+	}
+	function applyLsOp(d: any) {
+		const s = readSharedLs()
+		if (d.op === 'set') s[d.key] = String(d.value)
+		else if (d.op === 'remove') delete s[d.key]
+		else if (d.op === 'clear') for (const k in s) delete s[k]
+		try {
+			localStorage.setItem(lsKey(), JSON.stringify(s))
+		} catch (_) {}
+	}
+
+	function handleEmbedderMessage(e: MessageEvent) {
+		// The viewer is opaque-origin (e.origin === 'null'), so we authenticate
+		// the message by source identity only. Storage messages come from the opaque
+		// low-code viewer SPA's shim and are backed in this app's per-app store.
+		if (e.source !== iframeEl?.contentWindow) return
+		if (e.data?.type === 'wm_embed_ready') {
+			postTokenToIframe()
+		} else if (e.data?.type === 'wm_embed_unauthorized') {
+			initEmbedder()
+		} else if (e.data?.type === 'wm_ls_req') {
+			iframeEl?.contentWindow?.postMessage({ type: 'wm_ls_hydrate', data: readSharedLs() }, '*')
+		} else if (e.data?.type === 'wm_ls_op') {
+			applyLsOp(e.data)
+		} else if (e.data?.type === 'wm_embed_hash') {
+			// Mirror the viewer's in-app hash + query onto our own URL (shareable
+			// deep links). Keep our pathname (an app can't rewrite the address bar
+			// to another route) and our own transport params (e.g. wm_coep).
+			const hash = typeof e.data.hash === 'string' ? e.data.hash : ''
+			const relayed = new URLSearchParams(
+				typeof e.data.search === 'string' ? e.data.search : window.location.search
+			)
+			for (const k of WINDMILL_RESERVED_QUERY_PARAMS) {
+				relayed.delete(k)
+				const own = new URLSearchParams(window.location.search).get(k)
+				if (own !== null) relayed.set(k, own)
+			}
+			const qs = relayed.toString()
+			const search = qs ? `?${qs}` : ''
+			if (window.location.hash !== hash || window.location.search !== search) {
+				history.replaceState(null, '', window.location.pathname + search + hash)
+			}
+		} else if (e.data?.type === 'wm_embed_navigate') {
+			// App-initiated same-window navigation (navbar app items, frontend-script
+			// `goto`, button `gotoUrl`): this page navigates itself, exactly like when
+			// the app ran on it pre-sandbox. Same-origin paths use SPA navigation;
+			// full http(s) URLs do a real load (pre-sandbox apps could already do
+			// this via window.location, so it grants nothing new). Everything else —
+			// javascript:, data:, protocol-relative `//host` — is rejected.
+			const href = typeof e.data.href === 'string' ? e.data.href : ''
+			if (href.startsWith('/') && !href.startsWith('//')) {
+				goto(href)
+			} else if (/^https?:\/\//i.test(href)) {
+				window.location.href = href
+			}
+		}
+	}
+
+	onMount(() => {
+		if (isViewer) {
+			window.addEventListener('message', handleViewerMessage)
+			installHashRelay()
+			// Announce readiness so the embedder sends us the token.
+			window.parent.postMessage({ type: 'wm_embed_ready' }, expectedEmbedderOrigin ?? '*')
+			// This page is only ever loaded as the embedder's opaque iframe, which
+			// replies with the token within milliseconds. If none arrives, it was
+			// opened with `wm_embed` outside a Windmill embedder (e.g. its iframe src
+			// embedded directly in a third-party page); show a diagnostic instead of an
+			// indefinite skeleton.
+			const orphanTimer = setTimeout(() => {
+				if (!viewerReady) viewerOrphaned = true
+			}, 3000)
+			return () => clearTimeout(orphanTimer)
+		} else {
+			window.addEventListener('message', handleEmbedderMessage)
+			initEmbedder()
+		}
+	})
+
+	onDestroy(() => {
+		if (!BROWSER) return
+		window.removeEventListener('message', handleViewerMessage)
+		window.removeEventListener('message', handleEmbedderMessage)
+		if (isViewer) uninstallHashRelay()
+	})
+</script>
+
+{#if isViewer}
+	{#if viewerReady}
+		{@render viewer()}
+	{:else if viewerOrphaned}
+		<div class="px-4 mt-20 max-w-xl mx-auto">
+			<Alert type="info" title="Open this app from Windmill">
+				This is a Windmill app viewer and must be loaded by Windmill. If you embedded it in your own
+				page, use the app's public URL without the <code>wm_embed</code> parameter.
+			</Alert>
+		</div>
+	{:else}
+		<Skeleton layout={[[4], 0.5, [50]]} />
+	{/if}
+{:else if status === 'loading'}
+	<Skeleton layout={[[4], 0.5, [50]]} />
+{:else if status === 'notExists'}
+	<div class="px-4 mt-20">
+		<Alert type="error" title="Not found">
+			There was an error loading the app, is the url correct?
+			<a href={base}>Go to Windmill</a>
+		</Alert>
+	</div>
+{:else if status === 'noPermission'}
+	<!-- Login happens here, on the embedder (main) window, so the session cookie
+	     is set on the main origin only and never reaches the opaque iframe. -->
+	<div class="px-4 mt-20 w-full text-center font-bold text-xl">This app requires read access</div>
+	<div class="px-2 mx-auto mt-20 max-w-xl w-full">
+		<Login
+			onLoginSuccess={() => initEmbedder()}
+			popup
+			rd={page.url.pathname + page.url.search + page.url.hash}
+		/>
+	</div>
+{:else if unsandboxed}
+	<!-- Same-origin (full session): the app was not opted into sandbox isolation
+	     (the default). Rendered directly here; RawAppPreview reads
+	     IS_APP_UNSANDBOXED to drop the bundle's opaque sandbox. -->
+	{@render viewer()}
+{:else if isRaw}
+	<!-- Variant A: sandboxed raw app rendered directly on the real origin. The
+	     untrusted author bundle stays isolated in its own opaque iframe (inside
+	     RawAppPreview); no opaque viewer and no embed token are needed. -->
+	{@render viewer()}
+{:else}
+	<!-- referrerpolicy: the embedder page URL can carry a viewer credential (the
+	     JWT path segment of share links); without this, the same-origin iframe
+	     navigation would expose it to app-authored code via document.referrer. -->
+	<iframe
+		bind:this={iframeEl}
+		src={buildViewerUrl()}
+		title="App"
+		class="w-full h-screen border-0 block"
+		sandbox="allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-downloads allow-modals allow-top-navigation"
+		allow="clipboard-read; clipboard-write; fullscreen"
+		referrerpolicy="no-referrer"
+	></iframe>
+{/if}
diff --git a/frontend/src/lib/components/apps/editor/appPolicy.ts b/frontend/src/lib/components/apps/editor/appPolicy.ts
index 8c54926f1b..b6e35bd65e 100644
--- a/frontend/src/lib/components/apps/editor/appPolicy.ts
+++ b/frontend/src/lib/components/apps/editor/appPolicy.ts
@@ -180,12 +180,13 @@ export async function updatePolicy(app: App, currentPolicy: Policy | undefined):
 		})
 		.filter(Boolean) as { s3_path: string; storage?: string | undefined }[]
 
-	return {
+	const next = {
 		...(currentPolicy ?? {}),
 		allowed_s3_keys: s3FileKeys,
 		s3_inputs,
 		triggerables_v2: ntriggerables
 	}
+	return next
 }
 
 export async function processRunnable(
diff --git a/frontend/src/lib/components/apps/editor/component/components.ts b/frontend/src/lib/components/apps/editor/component/components.ts
index 707d992799..eb4028752d 100644
--- a/frontend/src/lib/components/apps/editor/component/components.ts
+++ b/frontend/src/lib/components/apps/editor/component/components.ts
@@ -1171,7 +1171,7 @@ export const components = {
 	chatcomponent: {
 		name: 'Chat',
 		icon: MessageSquare,
-		documentationLink: `${documentationBaseUrl}/chat`,
+		documentationLink: `${documentationBaseUrl}/app_component_library`,
 		dims: '3:8-6:12' as AppComponentDimensions,
 		customCss: {
 			container: { class: '', style: '' },
@@ -1299,7 +1299,7 @@ export const components = {
 	jobprogressbarcomponent: {
 		name: 'Progress Bar by Job Id',
 		icon: Monitor,
-		documentationLink: `${documentationBaseUrl}/progress_bar`,
+		documentationLink: `${documentationBaseUrl}/app_component_library`,
 		dims: '2:2-6:2' as AppComponentDimensions,
 		customCss: {
 			header: { class: '', style: '' },
@@ -1467,7 +1467,7 @@ export const components = {
 		name: 'Code Input',
 		icon: Code,
 		dims: '2:1-4:4' as AppComponentDimensions,
-		documentationLink: `${documentationBaseUrl}/code`,
+		documentationLink: `${documentationBaseUrl}/code_input`,
 		customCss: {
 			text: { class: '', style: '' },
 			container: { class: '', style: '' }
@@ -1810,7 +1810,7 @@ export const components = {
 	piechartcomponent: {
 		name: 'Pie Chart',
 		icon: PieChart,
-		documentationLink: `${documentationBaseUrl}/pie_chart`,
+		documentationLink: `${documentationBaseUrl}/chartjs`,
 		dims: '2:8-6:8' as AppComponentDimensions,
 		customCss: {
 			container: { class: '', style: '' }
@@ -1919,7 +1919,7 @@ export const components = {
 	barchartcomponent: {
 		name: 'Bar/Line Chart',
 		icon: BarChart4,
-		documentationLink: `${documentationBaseUrl}/bar_line_chart`,
+		documentationLink: `${documentationBaseUrl}/chartjs`,
 		dims: '2:8-6:8' as AppComponentDimensions,
 		customCss: {
 			container: { class: '', style: '' }
@@ -2132,7 +2132,7 @@ This is a paragraph.
 	timeseriescomponent: {
 		name: 'Timeseries',
 		icon: GripHorizontal,
-		documentationLink: `${documentationBaseUrl}/timeseries`,
+		documentationLink: `${documentationBaseUrl}/chartjs`,
 		dims: '2:8-6:8' as AppComponentDimensions,
 		customCss: {
 			container: { class: '', style: '' }
@@ -2206,7 +2206,7 @@ This is a paragraph.
 	scatterchartcomponent: {
 		name: 'Scatter Chart',
 		icon: GripHorizontal,
-		documentationLink: `${documentationBaseUrl}/scatter_chart`,
+		documentationLink: `${documentationBaseUrl}/chartjs`,
 		dims: '2:8-6:8' as AppComponentDimensions,
 		customCss: {
 			container: { class: '', style: '' }
diff --git a/frontend/src/lib/components/apps/types.ts b/frontend/src/lib/components/apps/types.ts
index e4e030de67..960e273ac3 100644
--- a/frontend/src/lib/components/apps/types.ts
+++ b/frontend/src/lib/components/apps/types.ts
@@ -144,6 +144,8 @@ export interface AppEditorProps {
 	path: string
 	policy: Policy
 	summary: string
+	/** Initial labels for the app, threaded from the loaded app data. */
+	labels?: string[]
 	/** Deployed app value the autosave `discardIf` compares against, so an
 	 * edit reverting to deployed clears the draft instead of leaving a no-op.
 	 * `undefined` for draft-only paths (no deployed baseline). */
@@ -157,6 +159,7 @@ export interface AppEditorProps {
 				summary: string
 				policy: any
 				custom_path?: string
+				labels?: string[]
 		  }
 		| undefined
 	version?: number | undefined
@@ -176,6 +179,10 @@ export interface AppEditorProps {
 	loadedFromDraft?: boolean
 	othersDraftsCount?: number
 	onOpenOthersDrafts?: () => void
+	// Restoring an older deployment from the history drawer. Threaded through
+	// AppEditorHeader as a callback prop rather than `on:restore` forwarding,
+	// which does not propagate through these runes-mode components.
+	onRestore?: (restoredApp: any) => void
 }
 
 export type App = {
@@ -198,6 +205,13 @@ export type App = {
 	hideLegacyTopBar?: boolean | undefined
 	mobileViewOnSmallerScreens?: boolean | undefined
 	version?: number
+	/**
+	 * Fork base for the stale-draft check: the deployed app version this draft
+	 * was started from, pinned at fork. Stamped on the draft seed in the editor;
+	 * compared against the deployed head (`versions[last]`) in the compare view.
+	 * In DRAFT_COMPARE_IGNORED_FIELDS so it never trips the autosave no-op check.
+	 */
+	parent_version?: number
 	/**
 	 * User-typed path persisted on the autosaved App when it differs from
 	 * the deployed/seeded baseline. The home list renders it so a friendly
@@ -370,6 +384,12 @@ export type EditorBreakpoint = 'sm' | 'lg'
 
 export const IS_APP_PUBLIC_CONTEXT_KEY = 'isAppPublicContext' as const
 
+// Set by PublicAppFrame in opaque-viewer mode (WIN-2006). Lets the app relay
+// top-level navigations (e.g. navbar links to another app) to the embedder,
+// since navigating inside the opaque iframe would load the SPA cookieless.
+export const EMBED_NAV_CONTEXT_KEY = 'appEmbedNav' as const
+export type EmbedNav = { navigateTop: (href: string) => void }
+
 type ComponentID = string
 
 export type ContextPanelContext = {
diff --git a/frontend/src/lib/components/apps/utils.ts b/frontend/src/lib/components/apps/utils.ts
index 85bdd774eb..2dfdd42e6b 100644
--- a/frontend/src/lib/components/apps/utils.ts
+++ b/frontend/src/lib/components/apps/utils.ts
@@ -20,6 +20,31 @@ import type {
 } from './types'
 import { allItems, BG_PREFIX } from './editor/appUtilsCore'
 
+/**
+ * Same-window navigation for app code (frontend-script `goto`, button
+ * `onSuccess: gotoUrl`). Inside the opaque viewer iframe (WIN-2006,
+ * `wm_embed=1`), navigating the current window would load the target inside
+ * the cookieless frame — so the navigation is relayed to the embedder page,
+ * which navigates itself (`wm_embed_navigate` in PublicAppFrame). That matches
+ * the pre-sandbox behavior exactly: the app used to run ON the embedder page,
+ * including when that page is itself inside a third-party iframe (where the
+ * embedder — not the third party's top — was what `window.location` changed).
+ * Outside the opaque viewer it keeps navigating the current window as before.
+ */
+export function appNavigateSameWindow(url: string) {
+	try {
+		const params = new URLSearchParams(window.location.search)
+		if (window.parent !== window && params.get('wm_embed') === '1') {
+			window.parent.postMessage(
+				{ type: 'wm_embed_navigate', href: url },
+				params.get('wm_embedder_origin') ?? '*'
+			)
+			return
+		}
+	} catch (_) {}
+	window.location.href = url
+}
+
 // `migrateApp` moved to its own light module so non-editor callers can reuse it
 // without pulling the whole `apps/utils` graph; re-exported here for existing
 // `from '../utils'` importers.
diff --git a/frontend/src/lib/components/assets/AssetGraph/ActivityHistogram.svelte b/frontend/src/lib/components/assets/AssetGraph/ActivityHistogram.svelte
index fcfd95a5d3..cd9548de59 100644
--- a/frontend/src/lib/components/assets/AssetGraph/ActivityHistogram.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/ActivityHistogram.svelte
@@ -147,9 +147,10 @@
 			></div>
 		{/if}
 	</div>
-	<!-- Always-on window axis: the period the bars span. -->
+	<!-- Always-on window axis: the period the bars span. The `from` prefix keeps
+	     the left edge from reading as a date header for the run list below it. -->
 	<div class="flex justify-between text-3xs text-tertiary tabular-nums mt-0.5">
-		<span>{fmtTime(from)}</span>
+		<span>from {fmtTime(from)}</span>
 		<span>now</span>
 	</div>
 </div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/AssetGraphCanvas.svelte b/frontend/src/lib/components/assets/AssetGraph/AssetGraphCanvas.svelte
index c9cc92f3b8..64bd2790cb 100644
--- a/frontend/src/lib/components/assets/AssetGraph/AssetGraphCanvas.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/AssetGraphCanvas.svelte
@@ -13,10 +13,14 @@
 	import RunnableNode from './RunnableNode.svelte'
 	import TriggerNode, { type TriggerNodeKind } from './TriggerNode.svelte'
 	import AddNode from './AddNode.svelte'
+	import DataTestNode from './DataTestNode.svelte'
 	import AssetGraphEdge from './AssetGraphEdge.svelte'
 	import PanToNode from './PanToNode.svelte'
+	import InitialFitView from './InitialFitView.svelte'
 	import { layoutAssetGraph } from './assetGraphLayout'
+	import { computeMutedReadKeys } from './resolveGraph'
 	import { buildDownstreamMap } from './graphTraversal'
+	import { buildLineageDownstreamMap } from './boundedCascade'
 	import type { AssetGraphResponse, AssetGraphSelection, NativeTriggerKind } from './types'
 	import type { RunnableRunState } from './activeRunnables.svelte'
 	import type { AssetKind } from '$lib/gen'
@@ -126,6 +130,9 @@
 		// form (with the auto-generated S3 picker) for the given script.
 		// data_upload has no trigger row; it's a UI-first entry point.
 		onOpenDataUpload?: (scriptPath: string) => void
+		// Data-upload entry scripts whose file has been staged in the run form —
+		// their source node renders green (ready) instead of the neutral prompt.
+		readyDataUploadPaths?: ReadonlySet<string>
 		// Script paths the cursor is over in the Activity panel — a thin neutral
 		// ring each. One entry for a single run row; the whole cascade's runs
 		// when hovering a group header. Distinct from `selectedRunPaths`.
@@ -139,6 +146,31 @@
 		// editor passes it, so the asset-graph page is unaffected. The page
 		// clears it once the pan has had time to settle.
 		panToNodeId?: string | undefined
+		// Script paths eligible to *start* a bounded-cascade run — roots AND
+		// mid-DAG models (see boundedCascade.validFromStarts). When a path is
+		// in this set and `onStartBoundedRun` is wired, its node's cascade menu
+		// gains a "Run downstream up to…" entry.
+		validStartPaths?: ReadonlySet<string>
+		onStartBoundedRun?: (startPath: string) => void
+		// Active bounded-run pick mode. Ids are in *canvas* space (`script:path`
+		// for runnables, `asset:${kind}:${path}` for assets). When set the canvas
+		// dims nodes outside `eligible ∪ {start}`, rings the `bounded` set, marks
+		// `ends`, and routes clicks on eligible nodes to `onPickEnd` instead of
+		// selecting.
+		boundPick?: {
+			start: string
+			eligible: ReadonlySet<string>
+			ends: ReadonlySet<string>
+			bounded: ReadonlySet<string>
+		}
+		onPickEnd?: (canvasNodeId: string) => void
+		/** Hide the minimap when the canvas is too narrow for it to be worth the
+		 * space (e.g. stacked layout in a side panel). Defaults to shown. */
+		showMinimap?: boolean
+		/** Identity of the displayed graph (e.g. the pipeline folder). The
+		 * initial viewport fit re-arms when it changes, so switching folders
+		 * in-place gets a fresh fit. */
+		viewportFitKey?: string
 	}
 	let {
 		graph,
@@ -158,9 +190,16 @@
 		onDeleteTrigger,
 		onOpenWebhook,
 		onOpenDataUpload,
+		readyDataUploadPaths,
 		hoveredPaths,
 		selectedRunPaths,
-		panToNodeId
+		panToNodeId,
+		validStartPaths,
+		onStartBoundedRun,
+		boundPick,
+		onPickEnd,
+		showMinimap = true,
+		viewportFitKey = ''
 	}: Props = $props()
 
 	// `${kind}:${path}` ids for the hovered / pinned runs (both script and flow
@@ -180,12 +219,35 @@
 		// the DAG. They force sugiyama to put + at layer 0 (top) and center
 		// it horizontally over the roots — same mechanism the flow editor
 		// uses for its Trigger node. Filtered out of rendered edges.
-		kind: 'lineage-write' | 'lineage-read' | 'trigger-asset' | 'trigger-native' | 'add-anchor'
+		kind:
+			| 'lineage-write'
+			| 'lineage-read'
+			| 'trigger-asset'
+			| 'trigger-native'
+			| 'add-anchor'
+			| 'data-test'
+			| 'macro'
+			| 'test-dependency'
 		unsaved?: boolean
+		// Muted read edge: a ducklake/s3 input read every run whose (default)
+		// auto cascade trigger is suppressed by `// mute` / `// mute all`.
+		// Rendered with a bell-off badge — auto-wiring is the norm, so we mark
+		// the read that deliberately does NOT cascade, not every derived edge.
+		muted?: boolean
 		// Edge from a missing-trigger placeholder — styled red dashed to
 		// signal "this script declared `// on kafka` but no trigger row
 		// targets it; create one or remove the annotation".
 		missing?: boolean
+		// Producer's `// data_test` checks, on the write-edge to the
+		// materialized asset — rendered as a flask badge on the link.
+		data_tests?: NonNullable<AssetGraphResponse['runnables'][number]['data_tests']>
+		// Producer's `// column` declared lineage, on the same write-edge —
+		// rendered as a columns badge on the link.
+		column_lineage?: NonNullable<AssetGraphResponse['runnables'][number]['column_lineage']>
+		// Macro-library edge payload: the macros the consumer calls (or the
+		// whole lib when pulled in via `// use`) — rendered as a ƒ badge.
+		macro_names?: string[]
+		via_use?: boolean
 	}
 
 	// Graph-id of the script the user just launched (zero-latency hint),
@@ -200,10 +262,14 @@
 	function build(g: AssetGraphResponse) {
 		const nodes: Array<{
 			id: string
-			type: 'asset' | 'runnable' | 'trigger' | 'add'
+			type: 'asset' | 'runnable' | 'trigger' | 'add' | 'data-test'
 			data: any
 		}> = []
 		const edges: BuiltEdge[] = []
+		// Custom (`// data_test <script_path>`) tests are deployed scripts, so we
+		// draw each as its own node hanging off the asset it validates (deduped
+		// by node id across producers).
+		const addedTestNodes = new Set<string>()
 
 		const hasAddNode = onAddPipelineScript != null
 		if (hasAddNode) {
@@ -259,20 +325,67 @@
 			downstreamByScript.set(path, set.size)
 			downstreamUnsavedByScript.set(path, [...set].filter((s) => unsavedRunnables.has(s)).length)
 		}
+		// Read-aware downstream presence for the bounded-run gate. The bounded
+		// engine treats pure-read `asset → script` edges as downstream, but the
+		// subscriber-only `downstreamByScript` above does not — so a start whose
+		// only downstream is a pure reader would otherwise be denied the menu
+		// item even though its bounded set is non-empty. Mirror of the engine's
+		// own adjacency (boundedCascade.buildLineageDownstreamMap).
+		const hasLineageDownstream = new Set<string>(buildLineageDownstreamMap(g).keys())
+
+		// Producers that declare `// data_test` checks, keyed by runnable id — the
+		// asset node uses this (plus the producer's run state) to render the
+		// data-test outcome badge. Tests only assert on ducklake `// materialize`
+		// targets (v1), so guard status is a ducklake-only concept below.
+		const producerHasTests = new Set<string>()
+		// Producer → its declared `// materialize` target, so a multi-output
+		// producer's guard badge lands only on the table its tests assert on —
+		// not on its other ducklake outputs. Mirrors the write-edge badge anchor.
+		const guardMaterializeTarget = new Map<
+			string,
+			NonNullable<AssetGraphResponse['runnables'][number]['materialize_target']>
+		>()
+		for (const r of g.runnables) {
+			if (r.data_tests && r.data_tests.length > 0) producerHasTests.add(`${r.usage_kind}:${r.path}`)
+			if (r.materialize_target)
+				guardMaterializeTarget.set(`${r.usage_kind}:${r.path}`, r.materialize_target)
+		}
 
 		for (const a of g.assets) {
 			const assetId = `asset:${a.kind}:${a.path}`
+			// Guard/outcome badge inputs: is a producer of this (ducklake) asset
+			// test-guarded, and did that guarded producer's latest run fail?
+			let dataTestGuarded = false
+			let producerFailed = false
+			if (a.kind === 'ducklake') {
+				for (const p of producersByAsset.get(`${a.kind}:${a.path}`) ?? []) {
+					const rid = `${p.kind}:${p.path}`
+					if (!producerHasTests.has(rid)) continue
+					// Tests assert on the producer's `// materialize` target; when the
+					// producer declares one, only that table is guarded (a multi-output
+					// producer must not badge its other ducklake writes). No declared
+					// target → single-output producer, so its lone ducklake write is it.
+					const mt = guardMaterializeTarget.get(rid)
+					if (mt && !(mt.kind === a.kind && mt.path === a.path)) continue
+					dataTestGuarded = true
+					if (runStates?.get(rid)?.status === 'failure') producerFailed = true
+				}
+			}
 			nodes.push({
 				id: assetId,
 				type: 'asset',
 				data: {
 					asset_kind: a.kind,
 					path: a.path,
+					fork_materialization: a.fork_materialization,
+					derived_from: a.derived_from,
 					onAddScript: onAddScriptForAsset,
 					pathPrefix,
 					defaultPathSuffix,
 					producers: producersByAsset.get(`${a.kind}:${a.path}`) ?? [],
-					onRunProducer
+					onRunProducer,
+					dataTestGuarded,
+					producerFailed
 				}
 			})
 		}
@@ -284,6 +397,40 @@
 		for (const r of g.runnables) {
 			if (r.unsaved) unsavedRunnablePaths.add(r.path)
 		}
+		// Producer → its `// data_test` checks, keyed by runnable id, so the
+		// write-edge to the materialized asset can carry the test badge: the
+		// edge *is* the transformation, and the tests assert on what it produces.
+		const producerTests = new Map<
+			string,
+			NonNullable<AssetGraphResponse['runnables'][number]['data_tests']>
+		>()
+		for (const r of g.runnables) {
+			if (r.data_tests && r.data_tests.length > 0) {
+				producerTests.set(`${r.usage_kind}:${r.path}`, r.data_tests)
+			}
+		}
+		// Producer → its `// column` declared lineage, keyed by runnable id, so
+		// the write-edge to the materialized asset can carry the columns badge —
+		// the edge *is* the transformation, and the lineage describes its output.
+		const producerColumnLineage = new Map<
+			string,
+			NonNullable<AssetGraphResponse['runnables'][number]['column_lineage']>
+		>()
+		// The `// materialize` target the lineage describes, so the badge lands
+		// only on that write-edge (a multi-output script writes several ducklake
+		// tables) — mirrors the anchor logic in `buildColumnGraph`.
+		const producerMaterializeTarget = new Map<
+			string,
+			NonNullable<AssetGraphResponse['runnables'][number]['materialize_target']>
+		>()
+		for (const r of g.runnables) {
+			if (r.column_lineage && r.column_lineage.length > 0) {
+				producerColumnLineage.set(`${r.usage_kind}:${r.path}`, r.column_lineage)
+			}
+			if (r.materialize_target) {
+				producerMaterializeTarget.set(`${r.usage_kind}:${r.path}`, r.materialize_target)
+			}
+		}
 		for (const r of g.runnables) {
 			const rid = `${r.usage_kind}:${r.path}`
 			// Optimistic badge: the moment a run is launched from this view
@@ -305,8 +452,10 @@
 					in_pipeline: r.in_pipeline ?? false,
 					partition_kind: r.partition_kind,
 					freshness: r.freshness,
+					last_success_at: r.last_success_at,
 					tag: r.tag,
 					retry: r.retry,
+					macros: r.macros,
 					unsaved: r.unsaved ?? false,
 					// Same dispatch the asset node uses, only routed when the
 					// runnable is a script (the page handler short-circuits
@@ -325,6 +474,16 @@
 					downstreamCount: downstreamByScript.get(r.path) ?? 0,
 					downstreamUnsavedCount: downstreamUnsavedByScript.get(r.path) ?? 0,
 					runState,
+					// Bounded-cascade entrypoint: only valid starts (schedule /
+					// manual roots) with downstream get the "Run downstream up
+					// to…" menu item.
+					onStartBoundedRun:
+						r.usage_kind === 'script' &&
+						onStartBoundedRun &&
+						validStartPaths?.has(r.path) &&
+						hasLineageDownstream.has(r.path)
+							? () => onStartBoundedRun(r.path)
+							: undefined,
 					onRequestRemove: onRunnableMenuRemove
 						? () =>
 								onRunnableMenuRemove({
@@ -337,18 +496,55 @@
 			})
 		}
 
+		// Read edges of a ducklake/s3 asset with no cascade trigger = muted
+		// (`// mute` / `// mute all` opted the default auto trigger out). Gated
+		// on pipeline scripts inside the helper (non-pipeline reads never derive).
+		const mutedReadKeys = computeMutedReadKeys(g.edges, g.triggers, g.runnables)
 		for (const e of g.edges) {
 			const runnableId = `${e.runnable_kind}:${e.runnable_path}`
 			const assetId = `asset:${e.asset_kind}:${e.asset_path}`
 			const access = e.access_type ?? 'r'
 			if (access === 'w' || access === 'rw') {
+				// Data tests assert on the `// materialize` target, which is always
+				// a ducklake asset (v1 enforces this), so only the ducklake
+				// write-edge carries the badge / custom-test nodes — a producer's
+				// other (e.g. S3/datatable) outputs must not show them.
+				const edgeTests = e.asset_kind === 'ducklake' ? producerTests.get(runnableId) : undefined
+				// Column lineage describes one materialized output, so the badge
+				// lands only on that asset's write-edge: the declared `// materialize`
+				// target when known (a multi-output script writes several ducklake
+				// tables), else the ducklake write-edge as the unambiguous fallback.
+				const matTarget = producerMaterializeTarget.get(runnableId)
+				const isOutputEdge = matTarget
+					? e.asset_kind === matTarget.kind && e.asset_path === matTarget.path
+					: e.asset_kind === 'ducklake'
+				const edgeColumnLineage = isOutputEdge ? producerColumnLineage.get(runnableId) : undefined
 				edges.push({
 					id: `prod:${runnableId}->${assetId}`,
 					source: runnableId,
 					target: assetId,
 					kind: 'lineage-write',
-					unsaved: e.unsaved
+					unsaved: e.unsaved,
+					data_tests: edgeTests,
+					column_lineage: edgeColumnLineage
 				})
+				// Each custom (`// data_test <script_path>`) test → its own node
+				// below the asset it validates, with a dashed "tests" edge.
+				for (const t of edgeTests ?? []) {
+					if (t.type !== 'custom') continue
+					const testNodeId = `datatest:${assetId}:${t.path}`
+					if (!addedTestNodes.has(testNodeId)) {
+						addedTestNodes.add(testNodeId)
+						nodes.push({ id: testNodeId, type: 'data-test', data: { path: t.path } })
+					}
+					edges.push({
+						id: `test:${assetId}->${testNodeId}`,
+						source: assetId,
+						target: testNodeId,
+						kind: 'data-test',
+						unsaved: e.unsaved
+					})
+				}
 			}
 			if (access === 'r' || access === 'rw') {
 				edges.push({
@@ -356,11 +552,53 @@
 					source: assetId,
 					target: runnableId,
 					kind: 'lineage-read',
-					unsaved: e.unsaved
+					unsaved: e.unsaved,
+					// Only a pure `'r'` read can be muted; `'rw'` is a self-read.
+					muted:
+						access === 'r' &&
+						mutedReadKeys.has(
+							`${e.asset_kind}:${e.asset_path}->${e.runnable_kind}:${e.runnable_path}`
+						)
 				})
 			}
 		}
 
+		// Macro-library → consumer edges (runnable→runnable, unlike the
+		// asset-mediated lineage above). Endpoints must exist as nodes — an
+		// undeployed `// use` target without a draft has none, so its edge is
+		// skipped (the annotation still shows in the script body itself).
+		const runnableNodeIds = new Set(g.runnables.map((r) => `${r.usage_kind}:${r.path}`))
+		for (const me of g.macro_edges ?? []) {
+			const libId = `script:${me.lib_path}`
+			const consumerId = `script:${me.consumer_path}`
+			if (!runnableNodeIds.has(libId) || !runnableNodeIds.has(consumerId)) continue
+			edges.push({
+				id: `macro:${libId}->${consumerId}`,
+				source: libId,
+				target: consumerId,
+				kind: 'macro',
+				unsaved: me.unsaved,
+				macro_names: me.macro_names,
+				via_use: me.via_use
+			})
+		}
+
+		// Data-test ordering edges (producer → tested script): the referenced
+		// asset must be materialized before the test runs, so the cascade orders
+		// the producer first. Rendered as a dashed "must run after" link, distinct
+		// from data flow — the tested script doesn't consume the asset's rows.
+		for (const te of g.test_edges ?? []) {
+			const producerId = `${te.producer_kind}:${te.producer_path}`
+			const testedId = `${te.runnable_kind}:${te.runnable_path}`
+			if (!runnableNodeIds.has(producerId) || !runnableNodeIds.has(testedId)) continue
+			edges.push({
+				id: `testdep:${producerId}->${testedId}`,
+				source: producerId,
+				target: testedId,
+				kind: 'test-dependency'
+			})
+		}
+
 		// Non-asset triggers (schedule + native) are rendered as source nodes
 		// above the pipeline script. Real (non-missing) nodes are
 		// deduplicated per (kind, ref) tuple so a single schedule shared
@@ -375,7 +613,13 @@
 				kind: TriggerNodeKind
 				ref: string
 				missing: boolean
+				// First target script (drives the per-script create/edit flows).
 				runnable_path?: string
+				// Every target script: a single (kind, ref) — e.g. one schedule —
+				// can be shared across scripts and dedupes to one node with N
+				// edges. The bounded-run action must consider all of them, not
+				// just the first.
+				runnable_paths: string[]
 			}
 		>()
 		function recordSourceTrigger(
@@ -388,9 +632,19 @@
 		) {
 			const prev = triggerSourceNodes.get(id)
 			if (!prev) {
-				triggerSourceNodes.set(id, { allUnsaved: unsaved, kind, ref, missing, runnable_path })
+				triggerSourceNodes.set(id, {
+					allUnsaved: unsaved,
+					kind,
+					ref,
+					missing,
+					runnable_path,
+					runnable_paths: runnable_path ? [runnable_path] : []
+				})
 			} else {
 				prev.allUnsaved = prev.allUnsaved && unsaved
+				if (runnable_path && !prev.runnable_paths.includes(runnable_path)) {
+					prev.runnable_paths.push(runnable_path)
+				}
 			}
 		}
 
@@ -449,6 +703,14 @@
 			})
 		}
 		for (const [id, info] of triggerSourceNodes) {
+			// Bounded-run targets among this trigger's scripts: valid starts that
+			// also have read-aware downstream. A shared schedule may have several
+			// targets; only offer the action when exactly one qualifies, so the
+			// run starts from an unambiguous script (rather than the arbitrary
+			// first-seen one). Multi-eligible nodes suppress it rather than guess.
+			const eligibleStarts = onStartBoundedRun
+				? info.runnable_paths.filter((p) => validStartPaths?.has(p) && hasLineageDownstream.has(p))
+				: []
 			nodes.push({
 				id,
 				type: 'trigger',
@@ -461,11 +723,23 @@
 					runnable_unsaved: info.runnable_path
 						? unsavedRunnablePaths.has(info.runnable_path)
 						: false,
+					// data_upload nodes go green once a file is staged for their
+					// target script (see readyDataUploadPaths / page dataUploadArgs).
+					ready: info.runnable_path
+						? (readyDataUploadPaths?.has(info.runnable_path) ?? false)
+						: false,
 					onCreateMissingTrigger,
 					onEditTrigger,
 					onDeleteTrigger,
 					onOpenWebhook,
-					onOpenDataUpload
+					onOpenDataUpload,
+					// View-mode bounded-run entry: offer it on the trigger node
+					// when exactly one target script is a valid start with
+					// downstream (see eligibleStarts above).
+					onStartBoundedRun:
+						onStartBoundedRun && eligibleStarts.length === 1
+							? () => onStartBoundedRun(eligibleStarts[0])
+							: undefined
 				}
 			})
 		}
@@ -518,11 +792,27 @@
 	// edges + paths → same layout. Renames *do* change the layout for
 	// the renamed entry, since its id moves in the sort, but that's
 	// expected: a rename is a path change, which is part of the input.
+	// A script with rw access to an asset yields both a write (script → asset)
+	// and a read/trigger (asset → script) edge — a 2-cycle. The layout resolves
+	// it producer-above-asset by omitting the backward direction from its
+	// input; the rendered edges are untouched (both arrows still drawn).
+	let writeEdgePairs = $derived(
+		new Set(
+			model.edges.filter((e) => e.kind === 'lineage-write').map((e) => `${e.source}\n${e.target}`)
+		)
+	)
 	let layoutInput = $derived({
 		nodes: model.nodes
 			.map((n) => ({ id: n.id, data: n.data }))
 			.sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0)),
 		edges: model.edges
+			.filter(
+				(e) =>
+					!(
+						(e.kind === 'lineage-read' || e.kind === 'trigger-asset') &&
+						writeEdgePairs.has(`${e.target}\n${e.source}`)
+					)
+			)
 			.map((e) => ({ source: e.source, target: e.target }))
 			.sort((a, b) =>
 				a.source === b.source
@@ -573,12 +863,22 @@
 					: assetEmph === 'input'
 						? 'wm-asset-input'
 						: undefined
+			// Bounded-run pick overlay takes precedence over the activity rings
+			// (it's a transient, modal selection). start ring > end mark > in-set
+			// ring > eligible (clickable, no style) > dimmed (out of reach).
+			let boundClass: string | undefined
+			if (boundPick && n.type !== 'add' && n.type !== 'trigger') {
+				if (n.id === boundPick.start) boundClass = 'wm-bound-start'
+				else if (boundPick.ends.has(n.id)) boundClass = 'wm-bound-end'
+				else if (boundPick.bounded.has(n.id)) boundClass = 'wm-bound-in'
+				else if (!boundPick.eligible.has(n.id)) boundClass = 'wm-bound-dim'
+			}
 			return {
 				id: n.id,
 				type: n.type,
 				position: { x: p.x + xCenter + xShift, y: p.y + 40 },
 				data: n.data,
-				class: runClass ?? assetClass,
+				class: boundClass ?? runClass ?? assetClass,
 				selected: n.id === selectedId,
 				// All nodes non-draggable: the layout is sugiyama-computed,
 				// dragging would fight the reactive re-layout. Selection is
@@ -701,6 +1001,13 @@
 						style = 'stroke: rgb(156 163 175); stroke-width: 1.25px;'
 						animated = flowAnimated
 						break
+					case 'data-test':
+						// Asset → its custom-test script: dashed, muted, no run
+						// animation (the test isn't a producing step).
+						style = 'stroke: rgb(156 163 175); stroke-width: 1.25px;'
+						strokeDasharray = '4 3'
+						markerColor = 'rgb(156 163 175)'
+						break
 					case 'trigger-asset':
 						style = 'stroke: rgb(107 114 128); stroke-width: 2px;'
 						animated = flowAnimated
@@ -715,6 +1022,26 @@
 						label = 'triggers'
 						labelStyle = 'fill: rgb(107 114 128); font-size: 10px; font-weight: 600;'
 						break
+					case 'macro':
+						// Library → consumer: violet dashed, visually apart from both
+						// lineage (blue/gray solid) and trigger (gray dashed) families —
+						// it's a code dependency, not data flow or execution.
+						style = 'stroke: rgb(139 92 246); stroke-width: 1.25px;'
+						strokeDasharray = '5 3'
+						markerColor = 'rgb(139 92 246)'
+						label = e.via_use ? 'uses lib' : 'macros'
+						labelStyle = 'fill: rgb(139 92 246); font-size: 10px; font-weight: 600;'
+						break
+					case 'test-dependency':
+						// Producer → tested script: amber dashed ordering link. Not
+						// data flow (blue/gray) nor execution trigger (gray "triggers")
+						// — it only says "the test needs this asset to exist first".
+						style = 'stroke: rgb(217 119 6); stroke-width: 1.25px;'
+						strokeDasharray = '5 3'
+						markerColor = 'rgb(217 119 6)'
+						label = 'test needs'
+						labelStyle = 'fill: rgb(217 119 6); font-size: 10px; font-weight: 600;'
+						break
 					default:
 						style = ''
 				}
@@ -755,7 +1082,23 @@
 					source: e.source,
 					target: e.target,
 					type: 'asset',
-					data: { detourX: detourForEdge(e.source, e.target) },
+					data: {
+						detourX: detourForEdge(e.source, e.target),
+						// Data-test badge on the producer→asset write-edge. The
+						// producer's last-run status (the script fails if any test
+						// fails) tints it green/red; neutral until it has run.
+						data_tests: e.data_tests,
+						testsRunStatus: e.data_tests?.length ? runStates?.get(e.source)?.status : undefined,
+						// Column-lineage badge on the same write-edge (the link is the
+						// transformation whose output columns the lineage describes).
+						column_lineage: e.column_lineage,
+						// Macro-edge badge: which of the library's macros the consumer
+						// calls (all of them when pulled in via `// use`).
+						macro_names: e.macro_names,
+						via_use: e.via_use,
+						// Muted read edge — bell-off badge on the read link.
+						muted: e.muted
+					},
 					animated,
 					label,
 					labelStyle,
@@ -784,7 +1127,8 @@
 		asset: AssetNode as any,
 		runnable: RunnableNode as any,
 		trigger: TriggerNode as any,
-		add: AddNode as any
+		add: AddNode as any,
+		'data-test': DataTestNode as any
 	}
 
 	const edgeTypes = {
@@ -792,12 +1136,26 @@
 	}
 
 	function handleNodeClick({ node }: { node: Node }) {
+		// Bounded-run pick mode intercepts clicks: an eligible (downstream)
+		// node toggles as an end bound; the start, dimmed nodes, and
+		// triggers/+ are inert. Selection (details pane) is suppressed so the
+		// modal pick stays focused.
+		if (boundPick && onPickEnd) {
+			if (node.type !== 'asset' && node.type !== 'runnable') return
+			if (node.id === boundPick.start) return
+			if (!boundPick.eligible.has(node.id)) return
+			onPickEnd(node.id)
+			return
+		}
 		if (!onselect) return
 		const data = node.data as any
 		if (node.type === 'asset') {
 			onselect({ kind: 'asset', asset_kind: data.asset_kind, path: data.path })
 		} else if (node.type === 'runnable') {
 			onselect({ kind: 'runnable', runnable_kind: data.runnable_kind, path: data.path })
+		} else if (node.type === 'data-test') {
+			// A custom test is a deployed script — open it like any runnable.
+			onselect({ kind: 'runnable', runnable_kind: 'script', path: data.path })
 		}
 		// 'schedule' doesn't produce a selection.
 	}
@@ -822,21 +1180,37 @@
 		--background-color={false}
 	>
 		<div class="absolute inset-0 !bg-surface-secondary h-full"></div>
+		<InitialFitView {nodes} fitKey={viewportFitKey} />
 		<PanToNode targetId={panToNodeId} {nodes} />
 		<Controls position="top-right" orientation="horizontal" showLock={false} class="!mr-10" />
-		<MiniMap
-			pannable
-			zoomable
-			class="!bg-surface !mb-10"
-			nodeColor={(n) =>
-				n.type === 'asset'
-					? 'rgb(96 165 250 / 0.5)'
-					: n.type === 'trigger'
-						? 'rgb(251 191 36 / 0.5)'
-						: 'rgb(52 211 153 / 0.5)'}
-			nodeStrokeColor="transparent"
-			maskColor="rgb(0 0 0 / 0.2)"
-		/>
+		{#if showMinimap}
+			<!-- Node hues mirror the canvas: blue asset cards, amber triggers,
+			     bordered neutral script cards. Visible strokes + rounded corners +
+			     a bordered container + the outlined viewport mask are what make
+			     this read as a minimap instead of a loading skeleton. -->
+			<MiniMap
+				pannable
+				zoomable
+				class="!bg-surface !mb-10 rounded-md border border-gray-200 dark:border-gray-700 shadow-sm overflow-hidden"
+				nodeBorderRadius={12}
+				nodeStrokeWidth={6}
+				nodeColor={(n) =>
+					n.type === 'asset'
+						? 'rgb(59 130 246 / 0.3)'
+						: n.type === 'trigger'
+							? 'rgb(245 158 11 / 0.3)'
+							: 'rgb(148 163 184 / 0.15)'}
+				nodeStrokeColor={(n) =>
+					n.type === 'asset'
+						? 'rgb(59 130 246 / 0.8)'
+						: n.type === 'trigger'
+							? 'rgb(245 158 11 / 0.8)'
+							: 'rgb(100 116 139 / 0.7)'}
+				maskColor="rgb(100 116 139 / 0.12)"
+				maskStrokeColor="rgb(59 130 246 / 0.5)"
+				maskStrokeWidth={4}
+			/>
+		{/if}
 	</SvelteFlow>
 </div>
 
@@ -870,4 +1244,20 @@
 	:global(.svelte-flow__node.wm-asset-input .drop-shadow-sm) {
 		@apply outline outline-2 outline-gray-400;
 	}
+	/* Bounded-run pick mode. The start is a solid blue ring; chosen end
+	   bounds get a thicker amber ring; nodes inside the path-between set ring
+	   blue; everything out of reach fades back so the matched subset reads at
+	   a glance. */
+	:global(.svelte-flow__node.wm-bound-start .drop-shadow-sm) {
+		@apply outline outline-2 outline-blue-500;
+	}
+	:global(.svelte-flow__node.wm-bound-in .drop-shadow-sm) {
+		@apply outline outline-2 outline-blue-400/70;
+	}
+	:global(.svelte-flow__node.wm-bound-end .drop-shadow-sm) {
+		@apply outline outline-[3px] outline-amber-500;
+	}
+	:global(.svelte-flow__node.wm-bound-dim) {
+		@apply opacity-30;
+	}
 </style>
diff --git a/frontend/src/lib/components/assets/AssetGraph/AssetGraphDetailsPane.svelte b/frontend/src/lib/components/assets/AssetGraph/AssetGraphDetailsPane.svelte
index 39a6a2ae72..425565353a 100644
--- a/frontend/src/lib/components/assets/AssetGraph/AssetGraphDetailsPane.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/AssetGraphDetailsPane.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { ScriptService, type Script } from '$lib/gen'
+	import { ScriptService, type Script, type ScriptLang } from '$lib/gen'
+	import { untrack } from 'svelte'
 	import { resource } from 'runed'
 	import { base } from '$lib/base'
 	import Button from '$lib/components/common/button/Button.svelte'
@@ -8,12 +9,15 @@
 	import { formatAssetKind, type AssetWithAltAccessType } from '$lib/components/assets/lib'
 	import {
 		AlertTriangle,
+		ArrowUpRight,
 		Code2,
 		ExternalLink,
 		GitBranch,
+		GitFork,
 		Loader2,
 		PanelRightClose,
 		Save,
+		SquareFunction,
 		Trash2,
 		X,
 		Pencil
@@ -25,10 +29,19 @@
 	import type { Schema } from '$lib/common'
 	import type { AssetGraphSelection, PipelineMode } from './types'
 	import PipelineScriptView from './PipelineScriptView.svelte'
-	import { parsePipelineAnnotations, type PipelineAnnotations } from './parsePipelineAnnotations'
+	import {
+		parsePipelineAnnotations,
+		type ColumnLineage,
+		type PipelineAnnotations
+	} from './parsePipelineAnnotations'
+	import ColumnLineageTrace from './ColumnLineageTrace.svelte'
+	import { extractDraftMacros } from './resolveGraph'
+	import { assetColumnNodes, type ColumnLineageGraph } from './columnLineageGraph'
 	import SummaryPathDisplay from '$lib/components/SummaryPathDisplay.svelte'
 	import S3FilePreview from '$lib/components/S3FilePreview.svelte'
 	import DataTablePreview from './DataTablePreview.svelte'
+	import DucklakeAssetPanel from './DucklakeAssetPanel.svelte'
+	import { notifyContractWarnings, type SchemaContractGraphContext } from './schemaContracts'
 	import AssetRunsPanel from './AssetRunsPanel.svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import { fade } from 'svelte/transition'
@@ -41,6 +54,23 @@
 		// `selection` when present. Used by the pipeline + menu so a new
 		// pipeline script opens inline instead of navigating to /scripts/add.
 		draftScript?: Script | undefined
+		// The draft entry's captured lineage — the teardown skip compares against
+		// these, since access overrides change lineage without a text edit and an
+		// uncaptured entry (inputAssets undefined) must still emit once.
+		draftOutputAssets?: Array<{ kind: AssetWithAltAccessType['kind']; path: string }>
+		draftInputAssets?: Array<{ kind: AssetWithAltAccessType['kind']; path: string }>
+		// Local-dev preview (`/pipeline_dev`): resolve a selected node to its
+		// working-tree content instead of fetching the deployed script (there is
+		// none — the pipeline is local-only). Returns a read-only `Script` so the
+		// pane renders the source + an ENABLED Run button (unlike `draftScript`,
+		// which is intentionally not-runnable until deployed). May be async so the
+		// caller can infer the args schema for the run form.
+		resolveLocalScript?: (path: string) => Script | undefined | Promise<Script | undefined>
+		// Bump this whenever `resolveLocalScript`'s backing content changes (a
+		// `pipeline dev` live-reload pushes a new bundle). It's in the `scriptRes`
+		// key so the open pane re-resolves the selected node's source even though
+		// `selection` is unchanged — otherwise the pane sticks on stale content.
+		localScriptsVersion?: unknown
 		workspace: string
 		onclose: () => void
 		// Optional: dismiss the pane while preserving the current selection /
@@ -71,7 +101,11 @@
 		// edges + synthesize asset nodes for drafts whose body has been
 		// edited past the seeded template. Fires on every keystroke that
 		// changes the inferred set.
-		onAssetsChange?: (scriptPath: string | undefined, assets: AssetWithAltAccessType[]) => void
+		onAssetsChange?: (
+			scriptPath: string | undefined,
+			assets: AssetWithAltAccessType[],
+			columnLineage?: ColumnLineage[]
+		) => void
 		// Emits the live editor buffer on every keystroke so the parent can
 		// autosave the in-flight content WITHOUT waiting for the pane teardown
 		// (`onDraftPersist`). `onDraftPersist` stays the authoritative commit on
@@ -91,6 +125,9 @@
 			snapshot: {
 				content: string
 				writes: { kind: AssetWithAltAccessType['kind']; path: string }[]
+				// Body-inferred reads, so the parent's draft keeps its input
+				// lineage while inactive (no live inference runs for it).
+				reads: { kind: AssetWithAltAccessType['kind']; path: string }[]
 				// Full edited script — set when the source is a persisted
 				// script (needed to seed a brand-new draft entry).
 				script?: Script
@@ -113,6 +150,23 @@
 			path: string
 			unsaved?: boolean
 		}>
+		// Pipeline-wide column-lineage graph (built by the parent page from the
+		// resolved graph). Drives the transitive column-lineage trace shown for a
+		// selected materialized asset.
+		selectionColumnGraph?: ColumnLineageGraph
+		// Whether the selected ducklake asset's schema can evolve (whole-table
+		// `replace` producer). Forwarded to the Schema tab: version history when
+		// true, a single fixed-schema view when false. Defaults to true (unknown).
+		schemaCanEvolve?: boolean
+		// Fork workspaces: data-environment state of the selected ducklake asset
+		// ('fork' = materialized here, 'deferred' = reads the parent's current
+		// data). Pulled from the graph node by the parent page, like
+		// `schemaCanEvolve`. Undefined outside forks.
+		selectionForkMaterialization?: 'fork' | 'deferred'
+		// Producer-side facts for the editor's live schema-contract diagnostics
+		// (ignore suppression + scd2 `_current` fallback), built by the page from
+		// the resolved graph and forwarded to ScriptEditor.
+		schemaContractContext?: SchemaContractGraphContext
 		// Bumped by the parent after dispatching a run so the runs panel
 		// re-fetches the listing immediately (rather than waiting on its
 		// background poll tick).
@@ -164,6 +218,11 @@
 		// cascade option when > 0. The page computes this from the graph
 		// edges + triggers + currently-open path.
 		downstreamSubscribers?: number
+		// Pipeline-only: set when the currently-open script is a valid
+		// bounded-run start (schedule / manual root). Surfaces a "Run downstream
+		// up to…" entry on the Test split's caret that enters the canvas
+		// end-node pick mode rooted at this script. Undefined → no entry.
+		onStartBoundedRun?: () => void
 		// Sister to `requestRunSignal`. When bumped, the bridge calls
 		// `ScriptEditor.runTest({ cascade: true })` — used by the canvas
 		// runnable menu's "Run + trigger N downstream" item when the chosen
@@ -191,10 +250,26 @@
 		// NO _wmill_skip_asset_dispatch, so the backend asset-trigger
 		// dispatcher cascades downstream for real.
 		onRunByPath?: (path: string, args: Record<string, any>) => Promise<string | undefined>
+		// Run the open script AND its downstream closure with the form args (dev
+		// preview only — the client orchestrates the chain). Unset on the deployed
+		// pane, whose single run already cascades via the backend dispatcher.
+		onRunCascadeByPath?: (path: string, args: Record<string, any>) => Promise<string | undefined>
+		// Persisted run-form args for the open data-upload entry (its staged
+		// S3Object), so re-opening the node restores the picked file.
+		runFormInitialArgs?: Record<string, any>
+		// Emitted when the run form's args (or validity) change (read-only
+		// PipelineScriptView OR the edit-mode ScriptEditor test form), so the page
+		// can persist a data-upload entry's staged input (drives node readiness).
+		// `isValid` is the full-schema validity, not just "file present".
+		onRunFormArgsChange?: (path: string, args: Record<string, any>, isValid: boolean) => void
 	}
 	let {
 		selection,
 		draftScript,
+		draftOutputAssets,
+		draftInputAssets,
+		resolveLocalScript,
+		localScriptsVersion,
 		workspace,
 		onclose,
 		onHide,
@@ -208,6 +283,10 @@
 		onScriptRenamed,
 		onScriptRemoved,
 		selectionProducers = [],
+		selectionColumnGraph,
+		schemaCanEvolve = true,
+		selectionForkMaterialization = undefined,
+		schemaContractContext = undefined,
 		runsRefreshKey,
 		runsPendingJobId,
 		onRunCompleted,
@@ -218,12 +297,16 @@
 		onDraftPathChange,
 		requestRemoveSignal,
 		downstreamSubscribers = 0,
+		onStartBoundedRun,
 		requestRunCascadeSignal,
 		focusUploadSignal,
 		mode = 'edit',
 		onRequestEdit,
 		canRunByPath = false,
-		onRunByPath
+		onRunByPath,
+		onRunCascadeByPath,
+		runFormInitialArgs,
+		onRunFormArgsChange
 	}: Props = $props()
 
 	let readOnly = $derived(mode !== 'edit')
@@ -348,6 +431,10 @@
 	// edges as the user edits the body (e.g. renaming a CREATE TABLE
 	// target updates the output asset node in real time).
 	let liveBodyAssets = $state<AssetWithAltAccessType[] | undefined>(undefined)
+	// Body-inferred column lineage (DuckDB SQL AST), bound out of ScriptEditor
+	// alongside `liveBodyAssets` and forwarded so the live graph can show
+	// inferred column lineage on the edited script before it deploys.
+	let liveColumnLineage = $state<ColumnLineage[] | undefined>(undefined)
 
 	// Bumped when the runs panel reports a watched job has reached a
 	// terminal state. Drives S3FilePreview's refreshKey so the preview
@@ -359,10 +446,13 @@
 	// When `draftScript` is provided we bypass the fetch entirely and edit
 	// it locally; saving calls ScriptService.createScript to deploy it.
 	let scriptRes = resource(
-		[() => workspace, () => selection, () => draftScript],
+		[() => workspace, () => selection, () => draftScript, () => localScriptsVersion],
 		async ([ws, sel, draft]) => {
 			if (draft) return undefined
 			if (!sel || sel.kind !== 'runnable' || sel.runnable_kind !== 'script') return undefined
+			// Local-dev: serve the working-tree script (no deployed row exists).
+			const local = await resolveLocalScript?.(sel.path)
+			if (local) return local
 			return await ScriptService.getScriptByPath({ workspace: ws, path: sel.path })
 		}
 	)
@@ -394,6 +484,32 @@
 		script = undefined
 	})
 
+	// Data-upload capture (edit mode): the ScriptEditor test form binds `args`, so
+	// mirror it up to the page — that stages a data-upload entry's uploaded /
+	// entered input, driving the node's green "ready" state and seeding the
+	// whole-pipeline run. Reset per script in a pre-effect (before the keyed
+	// ScriptEditor remounts) so switching nodes never leaks one node's input into
+	// the next, seeding from the page's persisted staging so re-opening a node
+	// restores its input. Guarded on the path so a staging round-trip
+	// (emit → page → runFormInitialArgs) doesn't re-seed and loop. The read-only
+	// branch uses PipelineScriptView's own onArgsChange instead.
+	let args = $state<Record<string, any>>({})
+	let argsSeedPath: string | undefined = undefined
+	$effect.pre(() => {
+		const p = script?.path
+		if (p === argsSeedPath) return
+		argsSeedPath = p
+		args = runFormInitialArgs ? structuredClone($state.snapshot(runFormInitialArgs)) : {}
+	})
+	// Bound out of ScriptEditor's test-form SchemaForm — full-schema validity of
+	// the edit-mode run form, so the page's readiness check sees whether every
+	// required field (not just the S3 file) is satisfied.
+	let runFormIsValid = $state(true)
+	$effect(() => {
+		if (readOnly || !script) return
+		onRunFormArgsChange?.(script.path, $state.snapshot(args), runFormIsValid)
+	})
+
 	// Persist draft edits back to the parent's drafts Map on transitions
 	// (selection change, pane close), not on every keystroke — a per-key
 	// sync triggered drafts → activeDraft → draftScript → re-clone → emit
@@ -416,7 +532,41 @@
 		const origAtRegister = isDraftRun ? undefined : scriptRes.current
 		if (!isDraftRun && !origAtRegister) return
 		const captured = script
+		// Untracked — tracked reads here would re-run (and emit) per keystroke.
+		// Snapshotted at registration so the cleanup compares against ITS entry
+		// (at cleanup time the props may already point at the next draft).
+		const contentAtRegister = untrack(() => captured.content ?? '')
+		const writesAtRegister = untrack(() => draftOutputAssets)
+		const readsAtRegister = untrack(() => draftInputAssets)
+		const refsEq = (
+			a: Array<{ kind: string; path: string }>,
+			b: Array<{ kind: string; path: string }>
+		) => a.length === b.length && a.every((x, i) => x.kind === b[i]?.kind && x.path === b[i]?.path)
 		return () => {
+			const writes = (liveBodyAssets ?? [])
+				.filter((a) => {
+					const t = a.access_type ?? a.alt_access_type
+					return t === 'w' || t === 'rw'
+				})
+				.map((a) => ({ kind: a.kind, path: a.path }))
+			const reads = (liveBodyAssets ?? [])
+				.filter((a) => {
+					const t = a.access_type ?? a.alt_access_type
+					return t === 'r' || t === 'rw'
+				})
+				.map((a) => ({ kind: a.kind, path: a.path }))
+			// Draft runs: emit only when content or lineage changed in THIS clone.
+			// An unconditional emit ping-pongs forever when the entry is rewritten
+			// externally while the pane stays mounted (rename rekey, AI edit):
+			// stale-generation emit → entry rewrite → re-clone → emit, pinning the tab.
+			if (
+				isDraftRun &&
+				(captured.content ?? '') === contentAtRegister &&
+				refsEq(writesAtRegister ?? [], writes) &&
+				readsAtRegister != undefined &&
+				refsEq(readsAtRegister, reads)
+			)
+				return
 			if (!isDraftRun) {
 				// Prefer the freshest fetch when it's still this script
 				// (cleanup reads are untracked): after the pane's own Save +
@@ -428,23 +578,31 @@
 				const orig = latest && latest.path === captured.path ? latest : origAtRegister
 				if (!orig || orig.path !== captured.path) return
 				if ((captured.content ?? '') === (orig.content ?? '')) return
+				// The effect can re-run mid-save — after createScript resolved
+				// but before the refetch lands — with `orig` still holding the
+				// pre-deploy version. The buffer isn't "unsaved edits" then, it
+				// IS the new deployed head; emitting would resurrect it as a
+				// phantom draft identical to what was just deployed.
+				if (
+					deployedFromPane?.path === captured.path &&
+					(captured.content ?? '') === deployedFromPane.content
+				)
+					return
 			}
-			const writes = (liveBodyAssets ?? [])
-				.filter((a) => {
-					const t = a.access_type ?? a.alt_access_type
-					return t === 'w' || t === 'rw'
-				})
-				.map((a) => ({ kind: a.kind, path: a.path }))
 			onDraftPersist?.(captured.path, {
 				content: captured.content ?? '',
 				writes,
+				reads,
 				script: isDraftRun ? undefined : (structuredClone($state.snapshot(captured)) as Script)
 			})
 		}
 	})
 
-	let args = $state<Record<string, any>>({})
 	let saving = $state(false)
+	// What this pane last deployed, so the persist-back cleanup can tell "the
+	// buffer equals the new deployed head" from real unsaved edits (plain
+	// variable: only read inside the untracked cleanup).
+	let deployedFromPane: { path: string; content: string } | undefined = undefined
 	let isDraft = $derived(draftScript != undefined)
 
 	// Single trash-bin button opens one modal that exposes both Archive
@@ -528,9 +686,21 @@
 			: {
 					inPipeline: false,
 					triggerAssets: [],
-					nativeTriggers: []
+					nativeTriggers: [],
+					dataTests: [],
+					columnLineage: [],
+					macros: false,
+					useLibs: [],
+					muteAssets: [],
+					muteAll: false
 				}
 	)
+	// `// macros` library: the defined signatures for the strip above the
+	// source. Regex-light extraction (display only; deploy runs the strict
+	// Rust parser).
+	let macroDefs = $derived(
+		script && liveAnnotations.macros ? extractDraftMacros(script.content ?? '') : []
+	)
 	$effect(() => {
 		// Live-overlay emits are an edit-mode concern: in read-only modes
 		// the loaded content is the deployed version (already covered by
@@ -541,7 +711,7 @@
 	})
 	$effect(() => {
 		if (readOnly) return
-		onAssetsChange?.(script?.path, liveBodyAssets ?? [])
+		onAssetsChange?.(script?.path, liveBodyAssets ?? [], liveColumnLineage)
 	})
 	$effect(() => {
 		if (readOnly) return
@@ -560,10 +730,17 @@
 			} catch {
 				sendUserToast(`Could not parse code, are you sure it is valid?`, true)
 			}
+			// Pin the exact content this deploy ships: the editor stays live during
+			// the network round-trip, so `script.content` can advance past what was
+			// sent — `deployedFromPane` must record the shipped version, not the
+			// buffer at response time, or mid-deploy keystrokes match the guard and
+			// are never promoted to a draft.
+			const contentAtDeploy = script.content ?? ''
 			const newHash = await ScriptService.createScript({
 				workspace,
 				requestBody: {
 					...script,
+					content: contentAtDeploy,
 					language: script.language,
 					description: script.description ?? '',
 					// Brand-new drafts have no prior hash (buildDraft seeds ''
@@ -571,6 +748,12 @@
 					// deployed script, or a draft promoted from unsaved edits
 					// to a deployed script) chains off it.
 					parent_hash: script.hash ? String(script.hash) : undefined,
+					// Let the backend resolve the parent to the current head for
+					// this path (atomically, under an advisory lock) instead of
+					// rejecting a stale parent_hash with a "lineage must be
+					// linear" error — the pane is opened from a graph snapshot
+					// that can fall behind the deployed head between renders.
+					auto_parent: true,
 					is_template: false,
 					tag: script.tag,
 					kind: script.kind as Script['kind'] | undefined,
@@ -592,7 +775,11 @@
 			// backend rejects as a lineage fork ("no 2 scripts can have the
 			// same parent").
 			if (typeof newHash === 'string' && newHash) script.hash = newHash
+			deployedFromPane = { path: script.path, content: contentAtDeploy }
 			sendUserToast(`Saved ${script.path}`)
+			// Authoritative save-time schema-contract check (pipelines gap #2b):
+			// warn-only, post-commit. Fire-and-forget — must never gate the save.
+			notifyContractWarnings(workspace, script.language as ScriptLang, script.content)
 			if (isDraft) {
 				onDraftSaved?.(script.path)
 			} else {
@@ -907,14 +1094,18 @@
 				/>
 			{/if}
 			{#if !readOnly && isScriptView && script && !atLatestSavePoint}
+				{@const isCreate = isDraft && !script?.hash}
 				<Button
 					variant="accent"
 					unifiedSize="sm"
 					startIcon={{ icon: Save }}
 					onclick={save}
 					disabled={saving}
+					title={isCreate
+						? 'Deploy this new script to the workspace'
+						: 'Deploy your changes to this script'}
 				>
-					{saving ? 'Saving…' : isDraft && !script?.hash ? 'Create' : 'Save'}
+					{saving ? 'Deploying…' : 'Deploy'}
 				</Button>
 			{/if}
 			{#if onHide}
@@ -976,6 +1167,51 @@
 									class="h-full"
 									refreshKey={previewRefreshKey}
 								/>
+							{:else if selection.asset_kind === 'ducklake'}
+								<!-- Key on path so switching ducklake assets resets the panel's
+								     selected snapshot / tab instead of carrying state across. -->
+								{#key selection.path}
+									<div class="flex flex-col h-full overflow-auto">
+										{#if selectionForkMaterialization === 'deferred'}
+											<!-- Fork data environment: this asset has no fork copy yet;
+											     jobs here read the PARENT's live table through a defer
+											     view. Partition grid / history below reflect the (empty)
+											     fork namespace, hence the explicit callout. -->
+											<div
+												class="shrink-0 flex items-center gap-2 px-3 py-1.5 text-2xs bg-amber-50 dark:bg-amber-950/40 border-b border-amber-200 dark:border-amber-900/60 text-amber-700 dark:text-amber-300"
+											>
+												<ArrowUpRight size={12} class="shrink-0" />
+												<span class="truncate">
+													Deferred to parent workspace — reads its current data (not
+													snapshot-pinned). Materialize this node in the fork to iterate on it.
+												</span>
+											</div>
+										{:else if selectionForkMaterialization === 'fork'}
+											<div
+												class="shrink-0 flex items-center gap-2 px-3 py-1.5 text-2xs bg-emerald-50 dark:bg-emerald-950/40 border-b border-emerald-200 dark:border-emerald-900/60 text-emerald-700 dark:text-emerald-300"
+											>
+												<GitFork size={12} class="shrink-0" />
+												<span class="truncate">
+													Materialized in this fork — reads and writes use the fork's isolated
+													namespace; the parent workspace's table is untouched.
+												</span>
+											</div>
+										{/if}
+										{#if selectionColumnGraph && assetColumnNodes(selectionColumnGraph, selection.asset_kind, selection.path).length > 0}
+											<div class="border-b shrink-0">
+												<ColumnLineageTrace
+													graph={selectionColumnGraph}
+													assetKind={selection.asset_kind}
+													assetPath={selection.path}
+													targetLabel={selection.path}
+												/>
+											</div>
+										{/if}
+										<div class="flex-1 min-h-0">
+											<DucklakeAssetPanel path={selection.path} {workspace} {schemaCanEvolve} />
+										</div>
+									</div>
+								{/key}
 							{:else}
 								<div class="p-3 text-xs text-secondary">
 									No inline preview yet for {selection.asset_kind}. Use the producer/consumer arrows
@@ -1023,18 +1259,27 @@
 			     the legitimate data-upload run form when applicable, and the
 			     same runs panel as the asset branch. -->
 			{#key script.path}
-				<PipelineScriptView
-					{script}
-					{isDraft}
-					canRun={canRunByPath}
-					onRun={onRunByPath}
-					{runsRefreshKey}
-					{runsPendingJobId}
-					onRunCompleted={() => {
-						previewRefreshKey += 1
-						onRunCompleted?.()
-					}}
-				/>
+				<div class="flex flex-col h-full">
+					{@render macroLibStrip()}
+					<div class="flex-1 min-h-0">
+						<PipelineScriptView
+							{script}
+							{isDraft}
+							canRun={canRunByPath}
+							onRun={onRunByPath}
+							onRunCascade={onRunCascadeByPath}
+							downstreamCount={downstreamSubscribers}
+							{runsRefreshKey}
+							{runsPendingJobId}
+							initialArgs={runFormInitialArgs}
+							onArgsChange={onRunFormArgsChange}
+							onRunCompleted={() => {
+								previewRefreshKey += 1
+								onRunCompleted?.()
+							}}
+						/>
+					</div>
+				</div>
 			{/key}
 		{:else if script}
 			<!-- Key on path alone, NOT hash: deploying a draft or re-saving turns
@@ -1045,52 +1290,80 @@
 			     remounts while a same-script save doesn't. History is disabled
 			     here, so there's no revert-to-old-hash case needing a reset. -->
 			{#key script.path}
-				<ScriptEditor
-					bind:this={scriptEditorRef}
-					showCaptures={false}
-					noSyncFromGithub
-					requireValidAssets
-					lang={script.language}
-					path={script.path}
-					tag={script.tag}
-					fixedOverflowWidgets={false}
-					previewLayout="bottom"
-					customUi={{
-						previewPanel: {
-							disableHistory: true,
-							disableTracing: true,
-							disableTriggerCaptures: true,
-							disableJsonView: true,
-							// Drop the full args column (most pipeline scripts take
-							// no inputs), render the LogPanel full-width with
-							// logs|result side by side, and float the Test/Cancel
-							// button onto the editor band above. But when the
-							// script *does* declare inputs (e.g. a partitioned
-							// script that needs a `partition` arg to run), show a
-							// compact SchemaForm between the Test button and the
-							// logs so the run can actually be parameterised.
-							hideArgs: true,
-							argsAboveLogs: true,
-							logsResultSideBySide: true,
-							downstreamSubscribers,
-							// Selecting a script node should immediately show
-							// "what happened last time it ran" — pulling the
-							// latest top-level completed job into the preview
-							// pane is far more useful than an empty placeholder.
-							loadLastRunOnMount: true
-						}
-					}}
-					bind:code={script.content}
-					bind:schema={script.schema}
-					bind:assets={liveBodyAssets}
-					{onTestStateChange}
-					{args}
-				/>
+				<div class="flex flex-col h-full">
+					{@render macroLibStrip()}
+					<div class="flex-1 min-h-0 relative">
+						<ScriptEditor
+							bind:this={scriptEditorRef}
+							showCaptures={false}
+							noSyncFromGithub
+							requireValidAssets
+							{schemaContractContext}
+							lang={script.language}
+							path={script.path}
+							tag={script.tag}
+							fixedOverflowWidgets={false}
+							previewLayout="bottom"
+							customUi={{
+								previewPanel: {
+									disableHistory: true,
+									disableTracing: true,
+									disableTriggerCaptures: true,
+									disableJsonView: true,
+									// Drop the full args column (most pipeline scripts take
+									// no inputs), render the LogPanel full-width with
+									// logs|result side by side, and float the Test/Cancel
+									// button onto the editor band above. But when the
+									// script *does* declare inputs (e.g. a partitioned
+									// script that needs a `partition` arg to run), show a
+									// compact SchemaForm between the Test button and the
+									// logs so the run can actually be parameterised.
+									hideArgs: true,
+									argsAboveLogs: true,
+									logsResultSideBySide: true,
+									downstreamSubscribers,
+									onBoundedRun: onStartBoundedRun,
+									// Selecting a script node should immediately show
+									// "what happened last time it ran" — pulling the
+									// latest top-level completed job into the preview
+									// pane is far more useful than an empty placeholder.
+									loadLastRunOnMount: true
+								}
+							}}
+							bind:code={script.content}
+							bind:schema={script.schema}
+							bind:assets={liveBodyAssets}
+							bind:inferredColumnLineage={liveColumnLineage}
+							{onTestStateChange}
+							bind:args
+							onIsValidChange={(v) => (runFormIsValid = v)}
+						/>
+					</div>
+				</div>
 			{/key}
 		{/if}
 	</div>
 </div>
 
+{#snippet macroLibStrip()}
+	{#if macroDefs.length > 0}
+		<!-- `// macros` library: the defined signatures, always visible above the
+		     source so consumers can see what the lib provides at a glance. -->
+		<div class="shrink-0 px-3 py-1.5 border-b bg-surface-secondary flex items-start gap-2">
+			<SquareFunction size={12} class="shrink-0 mt-0.5 text-violet-600 dark:text-violet-400" />
+			<div class="flex flex-wrap gap-x-3 gap-y-0.5 text-2xs font-mono text-secondary min-w-0">
+				<!-- Index-keyed: a live buffer can transiently hold two defs with
+				     the same name mid-edit, which would crash a name-keyed each. -->
+				{#each macroDefs as m, i (i)}
+					<span class="truncate" title={m.is_table ? 'table macro' : 'scalar macro'}>
+						{m.name}({m.params}){m.is_table ? ' → table' : ''}
+					</span>
+				{/each}
+			</div>
+		</div>
+	{/if}
+{/snippet}
+
 {#if removeOpen}
 	<!-- Single combined modal. Archive is the always-available default;
 	     Delete shows only for workspace/super admins because it's
diff --git a/frontend/src/lib/components/assets/AssetGraph/AssetGraphEdge.svelte b/frontend/src/lib/components/assets/AssetGraph/AssetGraphEdge.svelte
index 0c66513559..f39c2d8d18 100644
--- a/frontend/src/lib/components/assets/AssetGraph/AssetGraphEdge.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/AssetGraphEdge.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
 	import { BaseEdge, getBezierPath, type EdgeProps } from '@xyflow/svelte'
 	import { NODE } from '$lib/components/graph/util'
+	import { FlaskConical, Columns3, SquareFunction, BellOff } from 'lucide-svelte'
+	import type { ColumnLineage, DataTest } from './parsePipelineAnnotations'
 
 	let {
 		sourceX,
@@ -14,6 +16,88 @@
 		data
 	}: EdgeProps = $props()
 
+	// Data-test badge on the producer→asset write-edge: the edge *is* the
+	// transformation, so the tests that assert on its output belong here. The
+	// producer's last-run status tints it (the script fails if any test fails).
+	let tests = $derived((data as { data_tests?: DataTest[] } | undefined)?.data_tests)
+	let testsStatus = $derived(
+		(data as { testsRunStatus?: 'running' | 'success' | 'failure' } | undefined)?.testsRunStatus
+	)
+	// Badge position on the link. A detoured edge runs its vertical segment in
+	// the gutter lane at `detourX`, so anchor the badge there (not on the
+	// straight-line midpoint, which would float off the routed path).
+	let detourX = $derived((data as { detourX?: number } | undefined)?.detourX)
+	let labelX = $derived(detourX ?? (sourceX + targetX) / 2)
+	let labelY = $derived((sourceY + targetY) / 2)
+
+	function fmtTest(t: DataTest): string {
+		switch (t.type) {
+			case 'unique':
+				return `unique(${t.column})`
+			case 'not_null':
+				return `not_null(${t.column})`
+			case 'accepted_values':
+				return `accepted_values(${t.column} = ${t.values.join(',')})`
+			case 'relationships':
+				return `relationships(${t.column} → ${t.to_path}.${t.to_column})`
+			case 'custom':
+				return `custom(${t.path})`
+		}
+	}
+	let badgeTitle = $derived(
+		tests && tests.length > 0
+			? `${tests.length} data test${tests.length > 1 ? 's' : ''}${
+					testsStatus === 'success'
+						? ' · last run passed'
+						: testsStatus === 'failure'
+							? ' · last run failed'
+							: ''
+				}:\n${tests.map((t) => `• ${fmtTest(t)}`).join('\n')}`
+			: ''
+	)
+
+	// Column-lineage badge on the same write-edge: a `// column` declaration
+	// maps each output column to its upstream source columns. Count = declared
+	// output columns; the title lists each mapping.
+	let columnLineage = $derived(
+		(data as { column_lineage?: ColumnLineage[] } | undefined)?.column_lineage
+	)
+	let columnsBadgeTitle = $derived(
+		columnLineage && columnLineage.length > 0
+			? `${columnLineage.length} column${columnLineage.length > 1 ? 's' : ''} mapped:\n${columnLineage
+					.map(
+						(c) =>
+							`• ${c.column} ← ${c.inputs.map((i) => `${i.from_path}.${i.from_column}`).join(', ')}`
+					)
+					.join('\n')}`
+			: ''
+	)
+	// Stack the columns badge below the data-test badge when both are present so
+	// they don't overlap on the link (each badge is 18px tall; +18 clears it).
+	let columnsBadgeY = $derived(tests && tests.length > 0 ? labelY + 18 : labelY)
+
+	// Muted read edge: a ducklake/s3 input the script reads every run but that
+	// does NOT cascade — `// mute <asset>` or `// mute all` opted it out of the
+	// (default) auto-derived trigger. Auto-wiring is the norm, so we badge the
+	// exception (a read with no trigger) rather than every derived edge.
+	let isMuted = $derived((data as { muted?: boolean } | undefined)?.muted ?? false)
+	const mutedBadgeTitle =
+		'Read but not cascaded — `// mute` (or `// mute all`) suppresses the auto trigger, so changes to this asset do not re-run this script.'
+
+	// Macro-edge badge: which of the library's macros the consumer calls (all
+	// of them when the whole lib is pulled in via `// use`).
+	let macroNames = $derived((data as { macro_names?: string[] } | undefined)?.macro_names)
+	let macroViaUse = $derived((data as { via_use?: boolean } | undefined)?.via_use ?? false)
+	let macroBadgeTitle = $derived(
+		macroNames && macroNames.length > 0
+			? `${macroViaUse ? 'uses the whole library' : `calls ${macroNames.length} macro${macroNames.length > 1 ? 's' : ''}`}:\n${macroNames
+					.map((n) => `• ${n}()`)
+					.join('\n')}`
+			: macroViaUse
+				? 'uses the whole library'
+				: ''
+	)
+
 	// An edge that skips at least one full layer (source-bottom → target-top
 	// gap larger than gap + node row) while staying near-vertical runs
 	// straight under the nodes in between — the child-and-grandchild-of-the-
@@ -98,3 +182,97 @@
 	label={undefined}
 	labelStyle={undefined}
 />
+
+{#if tests && tests.length > 0}
+	<!-- Badge centered on the link midpoint. Edges render in the SVG layer, so
+	     the HTML badge is wrapped in a foreignObject (no EdgeLabelRenderer in
+	     this @xyflow/svelte version). -->
+	<foreignObject x={labelX - 28} y={labelY - 9} width="56" height="18" class="overflow-visible">
+		<div
+			xmlns="http://www.w3.org/1999/xhtml"
+			class="w-full h-full flex items-center justify-center"
+			style="pointer-events: none;"
+		>
+			<div
+				class="flex items-center gap-0.5 px-1 py-0.5 rounded-sm border shadow-sm text-3xs leading-none font-mono cursor-default {testsStatus ===
+				'failure'
+					? 'bg-red-50 dark:bg-red-950/50 border-red-300 dark:border-red-900/60 text-red-700 dark:text-red-300'
+					: testsStatus === 'success'
+						? 'bg-emerald-50 dark:bg-emerald-950/50 border-emerald-300 dark:border-emerald-900/60 text-emerald-700 dark:text-emerald-300'
+						: 'bg-surface border-border text-secondary'}"
+				style="pointer-events: all;"
+				title={badgeTitle}
+			>
+				<FlaskConical size={10} />
+				<span>×{tests.length}</span>
+			</div>
+		</div>
+	</foreignObject>
+{/if}
+
+{#if (macroNames && macroNames.length > 0) || macroViaUse}
+	<!-- Macro-edge badge, centered on the link like the data-test badge. -->
+	<foreignObject x={labelX - 28} y={labelY - 9} width="56" height="18" class="overflow-visible">
+		<div
+			xmlns="http://www.w3.org/1999/xhtml"
+			class="w-full h-full flex items-center justify-center"
+			style="pointer-events: none;"
+		>
+			<div
+				class="flex items-center gap-0.5 px-1 py-0.5 rounded-sm border shadow-sm text-3xs leading-none font-mono cursor-default bg-surface border-violet-300 dark:border-violet-900/60 text-violet-700 dark:text-violet-300"
+				style="pointer-events: all;"
+				title={macroBadgeTitle}
+			>
+				<SquareFunction size={10} />
+				<span>×{macroNames?.length ?? 0}</span>
+			</div>
+		</div>
+	</foreignObject>
+{/if}
+
+{#if isMuted}
+	<!-- Muted-read badge, centered on the read link. Bell-off = this input is
+	     read but its auto cascade trigger is suppressed (`// mute`). Icon-only;
+	     the tooltip carries the explanation. -->
+	<foreignObject x={labelX - 9} y={labelY - 9} width="18" height="18" class="overflow-visible">
+		<div
+			xmlns="http://www.w3.org/1999/xhtml"
+			class="w-full h-full flex items-center justify-center"
+			style="pointer-events: none;"
+		>
+			<div
+				class="flex items-center px-1 py-0.5 rounded-sm border shadow-sm leading-none cursor-default bg-surface border-amber-300 dark:border-amber-900/60 text-amber-700 dark:text-amber-300"
+				style="pointer-events: all;"
+				title={mutedBadgeTitle}
+			>
+				<BellOff size={10} />
+			</div>
+		</div>
+	</foreignObject>
+{/if}
+
+{#if columnLineage && columnLineage.length > 0}
+	<!-- Column-lineage badge, stacked below the data-test badge when both exist. -->
+	<foreignObject
+		x={labelX - 28}
+		y={columnsBadgeY - 9}
+		width="56"
+		height="18"
+		class="overflow-visible"
+	>
+		<div
+			xmlns="http://www.w3.org/1999/xhtml"
+			class="w-full h-full flex items-center justify-center"
+			style="pointer-events: none;"
+		>
+			<div
+				class="flex items-center gap-0.5 px-1 py-0.5 rounded-sm border shadow-sm text-3xs leading-none font-mono cursor-default bg-surface border-blue-300 dark:border-blue-900/60 text-blue-700 dark:text-blue-300"
+				style="pointer-events: all;"
+				title={columnsBadgeTitle}
+			>
+				<Columns3 size={10} />
+				<span>×{columnLineage.length}</span>
+			</div>
+		</div>
+	</foreignObject>
+{/if}
diff --git a/frontend/src/lib/components/assets/AssetGraph/AssetNode.svelte b/frontend/src/lib/components/assets/AssetGraph/AssetNode.svelte
index b5cba208e1..762bdbc0fc 100644
--- a/frontend/src/lib/components/assets/AssetGraph/AssetNode.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/AssetNode.svelte
@@ -5,9 +5,19 @@
 	import { formatShortAssetPath, type AssetKind } from '$lib/components/assets/lib'
 	import { NODE } from '$lib/components/graph/util'
 	import PipelineInsertMenu, { type PipelineInsertPick } from './PipelineInsertMenu.svelte'
-	import { Code2, Play, Loader2, Plus } from 'lucide-svelte'
+	import {
+		ArrowUpRight,
+		Code2,
+		GitFork,
+		History,
+		Play,
+		Loader2,
+		Plus,
+		ShieldCheck,
+		ShieldAlert
+	} from 'lucide-svelte'
 	import type { ScriptLang } from '$lib/gen'
-	import { workspaceStore } from '$lib/stores'
+	import { enterpriseLicense, workspaceStore } from '$lib/stores'
 	import { sendUserToast } from '$lib/utils'
 	import { PIPELINE_LANGUAGES } from './pipelineLanguages'
 	import type { PipelineOutputKind } from './pipelineTemplates'
@@ -26,6 +36,14 @@
 		data: {
 			asset_kind: AssetKind
 			path: string
+			// Fork workspaces: 'fork' = materialized in this fork, 'deferred' =
+			// reads fall back to the parent workspace's current data.
+			fork_materialization?: 'fork' | 'deferred'
+			// Set on an SCD2 `<dim>_current` companion view: the base `<dim>` path
+			// its producer materializes with `// materialize … history`. Drives the
+			// "current view of <dim>" marker so it reads as a derived node, not an
+			// unrelated table.
+			derived_from?: string
 			onAddScript?: (
 				asset: { kind: AssetKind; path: string },
 				language: ScriptLang,
@@ -47,6 +65,15 @@
 			// cached draft content). Without this callback, the play button
 			// is hidden — runs only make sense in editor contexts.
 			onRunProducer?: (producer: AssetProducer) => Promise<string | undefined>
+			// True when a producer materializing this asset declares `// data_test`
+			// checks — the asset's write is guarded. Drives the data-test outcome
+			// badge, whose meaning differs by edition (EE rolls a failing write
+			// back; CE publishes it anyway).
+			dataTestGuarded?: boolean
+			// True when the latest observed run of a producer materializing this
+			// asset failed. Escalates the guard badge from "protected" to a
+			// failed-run outcome (rolled-back on EE, published-anyway on CE).
+			producerFailed?: boolean
 		}
 		// SvelteFlow injects this on the node component when the user clicks
 		// the node. Combined with our own `hovered` state to drive the
@@ -101,6 +128,37 @@
 	}
 
 	let showAdd = $derived(data.onAddScript != undefined)
+
+	// Data-test outcome badge. Only guarded assets show it. The write's fate on a
+	// failing test differs by edition — surface which one applies so a shared
+	// parent/fork table name can't hide a silently-published bad version.
+	let isEE = $derived(!!$enterpriseLicense)
+	let showGuardBadge = $derived(data.dataTestGuarded === true)
+	let guardFailed = $derived(data.producerFailed === true)
+	let GuardIcon = $derived(isEE ? ShieldCheck : ShieldAlert)
+	// Filled + colored when the last run failed (the actionable state); a quiet
+	// ring at rest so the badge doesn't shout on every healthy guarded asset.
+	let guardClass = $derived(
+		guardFailed
+			? isEE
+				? 'bg-amber-500 text-white border-amber-600'
+				: 'bg-red-500 text-white border-red-600'
+			: isEE
+				? 'bg-surface-secondary text-emerald-600 dark:text-emerald-400 border-emerald-500/60'
+				: 'bg-surface-secondary text-amber-600 dark:text-amber-400 border-amber-500/60'
+	)
+	// Failed copy speaks to the edition's write policy, not the failure cause:
+	// `producerFailed` is a generic job failure (could be a runtime/worker error,
+	// not a data-test violation), so we don't assert "failed its data tests".
+	let guardTitle = $derived(
+		guardFailed
+			? isEE
+				? 'Last run failed — Enterprise rolls a failed materialize back, so the previous version is left live.'
+				: 'Last run failed — Community Edition does not roll a failed materialize back (Enterprise does), so a failing write may be left live. Verify the table.'
+			: isEE
+				? 'Guarded by data tests: a failing write is rolled back, keeping the previous version live.'
+				: 'Guarded by data tests, but Community Edition does not block on failure — a failing write is still published. Rollback is Enterprise-only.'
+	)
 </script>
 
 <!-- onmouseenter/leave on the wrapper (not the inner card) so the run
@@ -134,7 +192,55 @@
 		<span class="flex-1 min-w-0 pr-1 py-0.5 text-2xs font-mono text-emphasis truncate">
 			{formatShortAssetPath(asset)}
 		</span>
+		<!-- Fork data-environment chip: in a fork every asset shares its parent's
+		     name, so the env it resolves to must read at a glance. Labeled + tinted
+		     (amber "parent" = deferred read of the parent's current table via a
+		     view; emerald "fork" = the fork's own materialized copy) rather than a
+		     bare icon, which was too easy to miss. The title carries the detail. -->
+		{#if data.fork_materialization === 'deferred'}
+			<span
+				class="shrink-0 mr-1.5 flex items-center gap-0.5 rounded px-1 py-px text-3xs font-semibold uppercase tracking-wide bg-amber-100 dark:bg-amber-900/40 text-amber-700 dark:text-amber-300 border border-amber-300 dark:border-amber-700"
+				title="Deferred to parent workspace: reads the parent's current data. Materialize it in this fork to iterate on it."
+			>
+				<ArrowUpRight size={10} />
+				parent
+			</span>
+		{:else if data.fork_materialization === 'fork'}
+			<span
+				class="shrink-0 mr-1.5 flex items-center gap-0.5 rounded px-1 py-px text-3xs font-semibold uppercase tracking-wide bg-emerald-100 dark:bg-emerald-900/40 text-emerald-700 dark:text-emerald-300 border border-emerald-300 dark:border-emerald-700"
+				title="Materialized in this fork: reads and writes use the fork's isolated copy."
+			>
+				<GitFork size={10} />
+				fork
+			</span>
+		{/if}
+		<!-- SCD2 companion marker: this node is the `<dim>_current` "latest row
+		     per key" view its producer maintains alongside the base dimension.
+		     Icon-only (the pill already truncates); the title names the base. -->
+		{#if data.derived_from}
+			<span
+				class="shrink-0 mr-1.5 text-violet-600 dark:text-violet-400"
+				title={`SCD2 current view of ${data.derived_from}: latest row per key, maintained by the same producer as the base dimension.`}
+			>
+				<History size={12} />
+			</span>
+		{/if}
 	</div>
+	{#if showGuardBadge}
+		<!-- Data-test outcome badge. Floats off the TOP-RIGHT corner (opposite the
+		     left-edge run button and the bottom + inserter) so it never collides
+		     with the other node affordances. Shield = guarded; its fill escalates to
+		     amber/red when the last run failed, encoding the edition's write policy. -->
+		<div
+			class={twMerge(
+				'absolute -top-2 -right-2 z-10 rounded-full w-5 h-5 grid place-items-center border shadow-sm',
+				guardClass
+			)}
+			title={guardTitle}
+		>
+			<GuardIcon size={12} strokeWidth={2.25} />
+		</div>
+	{/if}
 	{#if showActions}
 		<!-- Run button revealed on hover/select. Floats off the LEFT edge —
 		     visually closer to the upstream producer it triggers (which lays
diff --git a/frontend/src/lib/components/assets/AssetGraph/BackfillRangeDialog.svelte b/frontend/src/lib/components/assets/AssetGraph/BackfillRangeDialog.svelte
new file mode 100644
index 0000000000..e4390fe503
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/BackfillRangeDialog.svelte
@@ -0,0 +1,218 @@
+<script lang="ts">
+	import { Button } from '$lib/components/common'
+	import Modal from '$lib/components/common/modal/Modal.svelte'
+	import DateInput from '$lib/components/DateInput.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import { Loader2 } from 'lucide-svelte'
+	import { resource } from 'runed'
+	import { AssetService } from '$lib/gen'
+	import { enterpriseLicense } from '$lib/stores'
+	import type { BackfillSliceState } from './backfillRun'
+
+	// Range backfill of a partitioned ducklake asset (enterprise). The dialog
+	// previews the expected partitions in [from, to] against what
+	// `materialized_partition` records (the missing/failed set is the
+	// worklist), then hands the worklist to the parent, which runs the
+	// producer once per slice (see `backfillRun.ts`). Progress state lives in
+	// the parent so a run survives closing the dialog.
+	interface Props {
+		// Controlled by the parent. `$bindable()` without a default per the
+		// AGENTS.md ban on `$bindable(default)` for optional props.
+		open?: boolean
+		assetPath: string
+		workspace: string
+		// Live per-slice states of the in-flight (or last finished) backfill.
+		slices?: BackfillSliceState[]
+		running?: boolean
+		// Cancellation was requested but the in-flight slice hasn't finished yet.
+		cancelRequested?: boolean
+		onStart: (producerPath: string, partitions: string[]) => void
+		onCancel: () => void
+		// Clear the finished run so the range picker shows again.
+		onReset: () => void
+	}
+
+	let {
+		open = $bindable(),
+		assetPath,
+		workspace,
+		slices,
+		running,
+		cancelRequested,
+		onStart,
+		onCancel,
+		onReset
+	}: Props = $props()
+
+	let fromDate = $state<string | undefined>(undefined)
+	let toDate = $state<string | undefined>(undefined)
+	let onlyMissing = $state(true)
+
+	let preview = resource(
+		[() => workspace, () => assetPath, () => fromDate, () => toDate, () => open ?? false],
+		async ([ws, path, from, to, isOpen]) => {
+			if (!isOpen || !ws || !path || !from || !to) return undefined
+			return await AssetService.listAssetPartitionsInRange({ workspace: ws, path, from, to })
+		}
+	)
+
+	let worklist = $derived.by(() => {
+		const parts = preview.current?.partitions ?? []
+		const picked = onlyMissing
+			? parts.filter((p) => p.status === 'missing' || p.status === 'failed')
+			: parts
+		return picked.map((p) => p.partition)
+	})
+	let counts = $derived.by(() => {
+		const c = { missing: 0, materialized: 0, failed: 0, running: 0 }
+		for (const p of preview.current?.partitions ?? []) c[p.status]++
+		return c
+	})
+	let canStart = $derived(
+		!!$enterpriseLicense && !running && !preview.loading && worklist.length > 0
+	)
+
+	// Backend errors come back as a plain-text body (windmill_common::error).
+	function errText(e: unknown): string {
+		const err = e as { body?: unknown; message?: string }
+		if (typeof err?.body === 'string' && err.body) return err.body
+		return err?.message ?? String(e)
+	}
+
+	const previewChipClass: Record<string, string> = {
+		missing: 'bg-amber-100 text-amber-800 dark:bg-amber-900/40 dark:text-amber-300',
+		failed: 'bg-red-100 text-red-800 dark:bg-red-900/40 dark:text-red-300',
+		materialized: 'bg-green-100 text-green-800 dark:bg-green-900/40 dark:text-green-300',
+		running: 'bg-blue-100 text-blue-800 dark:bg-blue-900/40 dark:text-blue-300'
+	}
+	const sliceChipClass: Record<BackfillSliceState['status'], string> = {
+		pending: 'bg-surface-secondary text-tertiary',
+		running: 'bg-blue-100 text-blue-800 dark:bg-blue-900/40 dark:text-blue-300',
+		success: 'bg-green-100 text-green-800 dark:bg-green-900/40 dark:text-green-300',
+		failure: 'bg-red-100 text-red-800 dark:bg-red-900/40 dark:text-red-300'
+	}
+</script>
+
+<Modal
+	bind:open={() => open ?? false, (v) => (open = v)}
+	title={`Backfill ${assetPath}`}
+	cancelText="Close"
+>
+	<div class="flex flex-col gap-4">
+		{#if !$enterpriseLicense}
+			<p class="text-sm text-secondary">
+				Partition backfill is an enterprise feature. Materializing a single partition is available
+				in the open-source edition; reprocessing a historical range requires an enterprise license.
+			</p>
+		{:else if slices?.length}
+			<!-- A run is in flight (or just finished): show per-slice progress. -->
+			<p class="text-sm text-secondary">
+				{#if running && cancelRequested}
+					Cancelling — waiting for the current partition to finish; the rest will not run.
+				{:else if running}
+					Materializing {slices.filter((s) => s.status === 'success' || s.status === 'failure')
+						.length}/{slices.length} partitions sequentially — each run gets its partition as an explicit
+					arg.
+				{:else}
+					Backfill finished: {slices.filter((s) => s.status === 'success').length} succeeded,
+					{slices.filter((s) => s.status === 'failure').length} failed,
+					{slices.filter((s) => s.status === 'pending').length} not run.
+				{/if}
+			</p>
+			<div class="flex flex-col gap-1 max-h-64 overflow-auto">
+				{#each slices as s (s.partition)}
+					<div class="flex items-center gap-2 text-xs">
+						<span class="px-1.5 py-0.5 rounded text-3xs font-medium {sliceChipClass[s.status]}">
+							{s.status}
+						</span>
+						<span class="font-mono">{s.partition}</span>
+						{#if s.status === 'running'}
+							<Loader2 size={12} class="animate-spin text-tertiary" />
+						{/if}
+						{#if s.error}
+							<span class="text-3xs text-red-600 truncate" title={s.error}>{s.error}</span>
+						{/if}
+					</div>
+				{/each}
+			</div>
+		{:else}
+			<p class="text-sm text-secondary">
+				Re-runs the producing script once per partition in the range, each with an explicit
+				<span class="font-mono">partition</span> arg. Re-running a partition is idempotent, so this is
+				safe to repeat.
+			</p>
+			<div class="flex gap-3 items-end">
+				<div class="flex flex-col gap-1">
+					<span class="text-xs font-semibold">From</span>
+					<DateInput bind:value={fromDate} dateFormat="yyyy-MM-dd" />
+				</div>
+				<div class="flex flex-col gap-1">
+					<span class="text-xs font-semibold">To</span>
+					<DateInput bind:value={toDate} dateFormat="yyyy-MM-dd" />
+				</div>
+			</div>
+			{#if preview.loading}
+				<div class="flex items-center gap-2 text-tertiary text-xs">
+					<Loader2 size={14} class="animate-spin" /> Computing partitions in range…
+				</div>
+			{:else if preview.error}
+				<p class="text-sm text-red-600">{errText(preview.error)}</p>
+			{:else if preview.current}
+				<div class="flex flex-col gap-2">
+					<p class="text-xs text-secondary">
+						{preview.current.partitions.length}
+						{preview.current.partition_kind} partitions in range — {counts.missing} missing,
+						{counts.failed} failed, {counts.materialized} materialized. Producer:
+						<span class="font-mono">{preview.current.producer_path}</span>
+					</p>
+					<div class="flex flex-wrap gap-1 max-h-40 overflow-auto">
+						{#each preview.current.partitions as p (p.partition)}
+							<span
+								class="px-1.5 py-0.5 rounded text-3xs font-mono {previewChipClass[p.status]}"
+								title={p.status}
+							>
+								{p.partition}
+							</span>
+						{/each}
+					</div>
+					<Toggle
+						bind:checked={onlyMissing}
+						size="xs"
+						options={{ right: 'Only run missing and failed partitions' }}
+					/>
+				</div>
+			{/if}
+		{/if}
+	</div>
+
+	{#snippet actions()}
+		{#if running}
+			<Button variant="default" disabled={cancelRequested} onclick={onCancel}>
+				{cancelRequested ? 'Cancelling…' : 'Cancel backfill'}
+			</Button>
+		{:else if slices?.length}
+			<!-- The finished run just changed partition statuses — refresh the
+			     range preview along with clearing the run. -->
+			<Button
+				variant="default"
+				onclick={() => {
+					onReset()
+					preview.refetch()
+				}}
+			>
+				New backfill
+			</Button>
+		{:else}
+			<Button
+				variant="accent"
+				disabled={!canStart}
+				onclick={() => {
+					const producer = preview.current?.producer_path
+					if (producer) onStart(producer, worklist)
+				}}
+			>
+				Backfill {worklist.length} partition{worklist.length === 1 ? '' : 's'}
+			</Button>
+		{/if}
+	{/snippet}
+</Modal>
diff --git a/frontend/src/lib/components/assets/AssetGraph/ColumnLineageTrace.svelte b/frontend/src/lib/components/assets/AssetGraph/ColumnLineageTrace.svelte
new file mode 100644
index 0000000000..2cf28ba401
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/ColumnLineageTrace.svelte
@@ -0,0 +1,173 @@
+<script lang="ts">
+	// Transitive column-lineage explorer for a selected asset. Renders the
+	// connected neighborhood of the asset's columns — sources on the left,
+	// derived columns progressively right, laid out by hop depth — as a
+	// node-edge diagram. Clicking any column traces its full upstream +
+	// downstream impact set across the whole pipeline (not just one hop) and
+	// dims everything else, turning the static diagram into impact analysis
+	// ("what feeds, or is fed by, this column?"). Deterministic depth layout so
+	// the SVG edges line up with the absolutely-positioned boxes without
+	// measuring the DOM.
+	import type { AssetKind } from '$lib/gen'
+	import {
+		assetColumnNodes,
+		computeDepths,
+		connectedComponent,
+		traceColumn,
+		type ColumnLineageGraph,
+		type ColumnNodeId
+	} from './columnLineageGraph'
+	import { Columns3, ArrowRight, X } from 'lucide-svelte'
+
+	let {
+		graph,
+		assetKind,
+		assetPath,
+		targetLabel
+	}: {
+		graph: ColumnLineageGraph
+		assetKind: AssetKind
+		assetPath: string
+		targetLabel?: string
+	} = $props()
+
+	const ROW_H = 34
+	const COL_W = 150
+	const GAP = 80
+
+	// The selected asset's own column nodes — highlighted as the focus, and the
+	// seed of the rendered neighborhood.
+	let seeds = $derived(assetColumnNodes(graph, assetKind, assetPath))
+	let seedSet = $derived(new Set(seeds))
+	let component = $derived(connectedComponent(seeds, graph))
+	let depths = $derived(computeDepths(component, graph))
+	let maxDepth = $derived(component.size ? Math.max(0, ...depths.values()) : 0)
+
+	// Group nodes into vertical lanes by hop depth (sources at depth 0, left).
+	let lanes = $derived.by(() => {
+		const byDepth: ColumnNodeId[][] = []
+		for (const id of [...component].sort()) {
+			const d = depths.get(id) ?? 0
+			;(byDepth[d] ??= []).push(id)
+		}
+		return byDepth
+	})
+	let pos = $derived.by(() => {
+		const m = new Map<ColumnNodeId, { x: number; y: number }>()
+		lanes.forEach((lane, depth) =>
+			lane.forEach((id, i) => m.set(id, { x: depth * (COL_W + GAP), y: i * ROW_H }))
+		)
+		return m
+	})
+	let width = $derived((maxDepth + 1) * COL_W + maxDepth * GAP)
+	let height = $derived(Math.max(1, ...lanes.map((l) => l?.length ?? 0)) * ROW_H)
+
+	// One connector per (source → derived) edge within the neighborhood.
+	let edges = $derived.by(() => {
+		const es: { from: ColumnNodeId; to: ColumnNodeId }[] = []
+		for (const out of component)
+			for (const src of graph.up.get(out) ?? [])
+				if (component.has(src)) es.push({ from: src, to: out })
+		return es
+	})
+
+	let selected = $state<ColumnNodeId | undefined>(undefined)
+	// The active trace: the selected column's full transitive impact set. Reset
+	// if the selection no longer exists in the current graph (asset switched).
+	let traced = $derived(
+		selected && graph.nodes.has(selected) ? traceColumn(selected, graph) : undefined
+	)
+
+	function nodeCenterY(id: ColumnNodeId): number {
+		return (pos.get(id)?.y ?? 0) + (ROW_H - 6) / 2 + 3
+	}
+	function edgePath(e: { from: ColumnNodeId; to: ColumnNodeId }): string {
+		const x1 = (pos.get(e.from)?.x ?? 0) + COL_W
+		const x2 = pos.get(e.to)?.x ?? 0
+		const y1 = nodeCenterY(e.from)
+		const y2 = nodeCenterY(e.to)
+		const mx = (x1 + x2) / 2
+		return `M ${x1} ${y1} C ${mx} ${y1}, ${mx} ${y2}, ${x2} ${y2}`
+	}
+
+	const dimmed = (id: ColumnNodeId) => traced !== undefined && !traced.has(id)
+	const onFocus = (id: ColumnNodeId) => traced !== undefined && traced.has(id)
+</script>
+
+<div class="flex flex-col gap-2 p-3">
+	<div class="flex items-center gap-1.5 text-2xs uppercase tracking-wide text-tertiary">
+		<Columns3 size={12} />
+		<span>Column lineage</span>
+		{#if targetLabel}
+			<ArrowRight size={10} class="text-tertiary" />
+			<span class="font-mono normal-case tracking-normal text-secondary truncate"
+				>{targetLabel}</span
+			>
+		{/if}
+		<span class="flex-1"></span>
+		{#if selected}
+			<button
+				type="button"
+				class="flex items-center gap-0.5 normal-case tracking-normal text-2xs text-secondary hover:text-primary"
+				onclick={() => (selected = undefined)}
+			>
+				<X size={11} /> clear trace
+			</button>
+		{:else if component.size > 1}
+			<span class="normal-case tracking-normal text-3xs text-tertiary">click a column to trace</span
+			>
+		{/if}
+	</div>
+
+	{#if component.size === 0}
+		<span class="text-2xs text-tertiary">No column lineage for this asset.</span>
+	{:else}
+		<div class="relative overflow-auto" style="width: {width}px; height: {height}px;">
+			<svg
+				class="absolute inset-0 pointer-events-none overflow-visible"
+				{width}
+				{height}
+				viewBox={`0 0 ${width} ${height}`}
+			>
+				{#each edges as e (`${e.from}->${e.to}`)}
+					{@const hot = traced !== undefined && traced.has(e.from) && traced.has(e.to)}
+					{@const cold = traced !== undefined && !hot}
+					<path
+						d={edgePath(e)}
+						fill="none"
+						class={hot ? 'stroke-blue-500' : 'stroke-blue-400 dark:stroke-blue-500'}
+						stroke-width={hot ? 2 : 1.5}
+						opacity={cold ? 0.15 : 1}
+					/>
+				{/each}
+			</svg>
+
+			{#each [...component] as id (id)}
+				{@const n = graph.nodes.get(id)}
+				{@const p = pos.get(id)}
+				{#if n && p}
+					{@const isSeed = seedSet.has(id)}
+					<button
+						type="button"
+						class="absolute flex flex-col justify-center rounded-md border px-2 leading-tight text-left transition-opacity
+							{isSeed
+							? 'border-blue-400 dark:border-blue-600 bg-blue-50 dark:bg-blue-950/40'
+							: 'border-border bg-surface-secondary'}
+							{onFocus(id) ? 'ring-1 ring-blue-500' : ''}"
+						style="left: {p.x}px; top: {p.y + 3}px; width: {COL_W}px; height: {ROW_H -
+							6}px; opacity: {dimmed(id) ? 0.3 : 1};"
+						title={`${n.path}.${n.column}`}
+						onclick={() => (selected = selected === id ? undefined : id)}
+					>
+						<span
+							class="text-2xs font-mono truncate {isSeed
+								? 'text-blue-700 dark:text-blue-300'
+								: 'text-primary'}">{n.column}</span
+						>
+						<span class="text-3xs font-mono text-tertiary truncate">{n.path}</span>
+					</button>
+				{/if}
+			{/each}
+		</div>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/DataTestNode.svelte b/frontend/src/lib/components/assets/AssetGraph/DataTestNode.svelte
new file mode 100644
index 0000000000..9c46fd1795
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/DataTestNode.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	// A custom (`// data_test <script_path>`) test rendered as its own node,
+	// hanging off the asset it validates. Clicking it opens the test script
+	// (handled by AssetGraphCanvas.handleNodeClick, like any runnable). Styled
+	// distinct from producer nodes — dashed, flask-marked — so it reads as a
+	// check on the data, not a step that produces it.
+	import { Handle, Position } from '@xyflow/svelte'
+	import { NODE } from '$lib/components/graph/util'
+	import { FlaskConical } from 'lucide-svelte'
+
+	let { data, selected = false }: { data: { path: string }; selected?: boolean } = $props()
+</script>
+
+<Handle type="target" position={Position.Top} isConnectable={false} />
+<div
+	class="flex items-center rounded-md border border-dashed bg-surface-secondary transition-colors cursor-pointer
+		{selected
+		? 'border-border-selected'
+		: 'border-gray-400 dark:border-gray-600 hover:border-gray-500'}"
+	style="width: {NODE.width}px; min-height: 28px;"
+	title={`data test: ${data.path}`}
+>
+	<FlaskConical
+		size={12}
+		class={`shrink-0 ml-2 mr-1.5 ${selected ? 'text-accent' : 'text-secondary'}`}
+	/>
+	<span class="text-3xs uppercase tracking-wide text-tertiary mr-1.5">test</span>
+	<span class="flex-1 min-w-0 pr-2 py-0.5 text-2xs font-mono text-secondary truncate">
+		{data.path}
+	</span>
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/DucklakeAssetPanel.svelte b/frontend/src/lib/components/assets/AssetGraph/DucklakeAssetPanel.svelte
new file mode 100644
index 0000000000..5f7ad050e4
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/DucklakeAssetPanel.svelte
@@ -0,0 +1,123 @@
+<script lang="ts">
+	// Top pane for a selected ducklake asset: tabs over the views of a versioned
+	// table. "Partitions" is the materialization status grid; "History" is a
+	// master-detail time-travel surface — the snapshot list on the left, a
+	// read-only preview of the table at the selected snapshot on the right.
+	//
+	// The snapshot list is fetched here (not in the list child) so both the list
+	// and the preview share one source of truth: `effectiveVersion` derives to
+	// the user's pick, or the newest snapshot until they pick one. The list is
+	// scoped to the table (catalog-wide snapshots predating the table's creation
+	// can't be read), so a selectable version always exists in the table.
+	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
+	import { Table2, History, Columns3 } from 'lucide-svelte'
+	import { Pane, Splitpanes } from 'svelte-splitpanes'
+	import { resource } from 'runed'
+	import { fetchDucklakeSnapshots } from '$lib/components/dbOps'
+	import { parseDbInputFromAssetSyntax } from '$lib/utils'
+	import PartitionStatusGrid from './PartitionStatusGrid.svelte'
+	import DucklakeSnapshotHistory from './DucklakeSnapshotHistory.svelte'
+	import DucklakeVersionPreview from './DucklakeVersionPreview.svelte'
+	import SchemaHistoryPanel from './SchemaHistoryPanel.svelte'
+
+	interface Props {
+		// The materialized ducklake asset path (`<ducklake>/<table>`).
+		path: string
+		workspace: string
+		// Whether this asset's schema can evolve (whole-table `replace` producer);
+		// drives the Schema tab between version history and a single fixed schema.
+		schemaCanEvolve?: boolean
+	}
+	let { path, workspace, schemaCanEvolve = true }: Props = $props()
+
+	let tab = $state<'partitions' | 'history' | 'schema'>('partitions')
+	// The user's explicit snapshot pick (undefined until they click a row).
+	let selectedVersion = $state<number | undefined>(undefined)
+
+	let parsed = $derived(parseDbInputFromAssetSyntax(`ducklake://${path}`))
+	let ducklake = $derived(parsed && 'ducklake' in parsed ? parsed.ducklake : undefined)
+	// Schema-qualified table name (schema defaults to `main`) used to scope the
+	// snapshot list to versions where the table exists.
+	let qualifiedTable = $derived.by(() => {
+		if (!parsed || !('specificTable' in parsed) || !parsed.specificTable) return undefined
+		const schema = 'specificSchema' in parsed ? parsed.specificSchema : undefined
+		return `${schema ?? 'main'}.${parsed.specificTable}`
+	})
+
+	let snapshots = resource(
+		[() => workspace, () => ducklake, () => qualifiedTable],
+		async ([ws, dl, table]) => {
+			if (!ws || !dl) return []
+			return await fetchDucklakeSnapshots({ workspace: ws, ducklake: dl, table })
+		}
+	)
+	// Newest snapshot is the default preview until the user picks one. If the
+	// pick is no longer in the list (snapshots refetched, or it was stale from a
+	// previously-viewed asset), fall back to newest rather than reading a version
+	// that isn't in this table.
+	let effectiveVersion = $derived.by(() => {
+		const list = snapshots.current
+		const picked = list?.some((s) => s.snapshot_id === selectedVersion)
+		return picked ? selectedVersion : list?.[0]?.snapshot_id
+	})
+
+	// Keep the list pane to a roughly fixed width rather than a fixed fraction,
+	// so it stays compact on wide panels instead of sprawling. Falls back to a
+	// usable fraction on narrow ones and before the width is measured.
+	let paneWidth = $state(0)
+	let listSize = $derived(
+		paneWidth > 0 ? Math.max(24, Math.min(46, Math.round((260 / paneWidth) * 100))) : 36
+	)
+</script>
+
+<div class="flex flex-col h-full">
+	{#if !qualifiedTable}
+		<!-- Catalog-level ducklake node (no table segment, e.g. `ducklake://main`):
+		     snapshot history / time-travel are per-table, so only the partition
+		     grid applies here. -->
+		<PartitionStatusGrid {path} {workspace} />
+	{:else}
+		<div class="flex items-center gap-2 px-3 py-2 border-b shrink-0">
+			<ToggleButtonGroup selected={tab} on:selected={(e) => (tab = e.detail)}>
+				{#snippet children({ item })}
+					<ToggleButton size="sm" value="partitions" label="Partitions" icon={Table2} {item} />
+					<ToggleButton size="sm" value="schema" label="Schema" icon={Columns3} {item} />
+					<ToggleButton size="sm" value="history" label="History" icon={History} {item} />
+				{/snippet}
+			</ToggleButtonGroup>
+		</div>
+
+		<div class="flex-1 min-h-0">
+			{#if tab === 'partitions'}
+				<PartitionStatusGrid {path} {workspace} />
+			{:else if tab === 'schema'}
+				<SchemaHistoryPanel {path} {workspace} canEvolve={schemaCanEvolve} />
+			{:else}
+				<div class="h-full" bind:clientWidth={paneWidth}>
+					<Splitpanes class="!h-full">
+						<Pane size={listSize} minSize={20}>
+							<DucklakeSnapshotHistory
+								items={snapshots.current ?? []}
+								loading={snapshots.loading}
+								error={snapshots.error?.message}
+								onRefresh={() => snapshots.refetch()}
+								selectedVersion={effectiveVersion}
+								onSelect={(v) => (selectedVersion = v)}
+							/>
+						</Pane>
+						<Pane size={100 - listSize} minSize={30}>
+							<div class="h-full p-3 overflow-auto">
+								<DucklakeVersionPreview
+									assetUri={`ducklake://${path}`}
+									version={effectiveVersion}
+									class="h-full"
+								/>
+							</div>
+						</Pane>
+					</Splitpanes>
+				</div>
+			{/if}
+		</div>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/DucklakeResultPreview.svelte b/frontend/src/lib/components/assets/AssetGraph/DucklakeResultPreview.svelte
new file mode 100644
index 0000000000..403a100aa2
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/DucklakeResultPreview.svelte
@@ -0,0 +1,136 @@
+<script lang="ts">
+	// Live row preview for a ducklake table, used inside the materialize result
+	// display (DisplayResult). Loads the table's column metadata then renders the
+	// shared read-only DBTable grid (paged). Mirrors DataTablePreview but for the
+	// `ducklake` input type — a ducklake catalog is always attachable, so there
+	// is no "configure connection" branch.
+	//
+	// For a partitioned target the preview can scope to the just-written slice
+	// ("This partition") or show the full table ("Whole table") via a toggle.
+	import DBTable from '$lib/components/DBTable.svelte'
+	import { resource } from 'runed'
+	import { workspaceStore } from '$lib/stores'
+	import { loadAllTablesMetaData } from '$lib/components/apps/components/display/dbtable/metadata'
+	import { dbTableOpsWithPreviewScripts } from '$lib/components/dbOps'
+	import type { DbInput } from '$lib/components/dbTypes'
+	import { parseDbInputFromAssetSyntax } from '$lib/utils'
+	import { AlertTriangle, Loader2 } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
+	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
+
+	interface Props {
+		// Full asset URI, e.g. `ducklake://main/orders_daily`.
+		assetUri: string
+		// When set the target is partitioned and the preview can scope to this slice.
+		partition?: string
+		// Bump to force a re-fetch (parallel to DataTablePreview's refreshKey).
+		refreshKey?: any
+		class?: string
+	}
+	let { assetUri, partition, refreshKey, class: className = '' }: Props = $props()
+
+	// Default to the just-written slice; `scoped` is a no-op without a partition
+	// (the toggle is only shown when there is one).
+	let scope = $state<'partition' | 'whole'>('partition')
+	let scoped = $derived(!!partition && scope === 'partition')
+
+	let input = $derived<DbInput | undefined>(parseDbInputFromAssetSyntax(assetUri) ?? undefined)
+	let table = $derived(
+		input && 'specificTable' in input ? (input.specificTable as string | undefined) : undefined
+	)
+	// Explicit schema from `ducklake://<lake>/<schema>.<table>` (default `main`).
+	// The preview SELECT is `FROM <tableKey>` unquoted, so a `schema.table` key
+	// resolves to the right schema — without this the read hits the default one.
+	let schema = $derived(
+		input && 'specificSchema' in input ? (input.specificSchema as string | undefined) : undefined
+	)
+	let tableKey = $derived(schema && table ? `${schema}.${table}` : table)
+
+	// Scope rows to the partition slice via the preview SELECT's whereClause.
+	// The value is single-quote-escaped (it's raw-injected server-side).
+	let whereClause = $derived(
+		scoped && partition ? `_wm_partition = '${partition.replaceAll("'", "''")}'` : undefined
+	)
+
+	let colDefs = resource(
+		() => [input, refreshKey] as const,
+		async ([_input]) => {
+			if (!_input || !$workspaceStore) return undefined
+			try {
+				return await loadAllTablesMetaData($workspaceStore, _input)
+			} catch {
+				// A load failure reads the same as "table missing" from the preview's
+				// POV; the underlying error is surfaced by loadAllTablesMetaData.
+				return undefined
+			}
+		}
+	)
+
+	let tableColDefs = $derived.by(() => {
+		const defs = colDefs.current
+		if (!table || !defs) return undefined
+		const direct = defs[`${schema ?? 'main'}.${table}`] ?? defs[table]
+		const found =
+			direct ??
+			(() => {
+				const key = Object.keys(defs).find((k) => k === table || k.endsWith(`.${table}`))
+				return key ? defs[key] : undefined
+			})()
+		if (!found) return undefined
+		// Hide the internal partition column when scoped to one partition (every
+		// row has the same value); keep it in whole-table view so the rows from
+		// different partitions are distinguishable.
+		return scoped ? found.filter((c: { field?: string }) => c.field !== '_wm_partition') : found
+	})
+
+	let dbTableOps = $derived.by(() => {
+		if (!(input && tableColDefs && tableKey && $workspaceStore)) return undefined
+		const ops = dbTableOpsWithPreviewScripts({
+			input,
+			tableKey,
+			colDefs: tableColDefs,
+			workspace: $workspaceStore,
+			whereClause
+		})
+		// Read-only preview: drop the mutation handlers so DBTable hides its
+		// edit / delete / insert affordances — this is a result view, not a
+		// table editor (and the table is overwritten on the next materialize).
+		const readOnly = { ...ops }
+		delete readOnly.onUpdate
+		delete readOnly.onDelete
+		delete readOnly.onInsert
+		return readOnly
+	})
+</script>
+
+<div class={twMerge('flex flex-col min-h-0 relative', className)}>
+	{#if partition}
+		<div class="pb-2">
+			<ToggleButtonGroup selected={scope} on:selected={(e) => (scope = e.detail)}>
+				{#snippet children({ item })}
+					<ToggleButton size="sm" value="partition" label="This partition" {item} />
+					<ToggleButton size="sm" value="whole" label="Whole table" {item} />
+				{/snippet}
+			</ToggleButtonGroup>
+		</div>
+	{/if}
+	{#if colDefs.loading && !colDefs.current}
+		<div class="flex items-center justify-center p-4 text-tertiary">
+			<Loader2 class="animate-spin" size={18} />
+		</div>
+	{:else if !tableColDefs}
+		<div class="flex items-center gap-2 p-3 text-2xs text-tertiary">
+			<AlertTriangle size={14} class="text-amber-500" />
+			Couldn't load a preview of this table.
+		</div>
+	{:else if dbTableOps}
+		<!-- Re-mount when the scope toggles so DBTable re-fetches with the new
+		     whereClause / column set. -->
+		{#key [refreshKey, scope]}
+			<div class="grow min-h-0">
+				<DBTable {dbTableOps} />
+			</div>
+		{/key}
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/DucklakeSnapshotHistory.svelte b/frontend/src/lib/components/assets/AssetGraph/DucklakeSnapshotHistory.svelte
new file mode 100644
index 0000000000..e95be118ee
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/DucklakeSnapshotHistory.svelte
@@ -0,0 +1,79 @@
+<script lang="ts">
+	// Time-travel snapshot list for a ducklake table (presentational): the
+	// catalog's DuckLake snapshots, newest first. Selecting a row drives the
+	// adjacent preview pane via `onSelect`; the selected row is highlighted. The
+	// list data + selection default are owned by the parent; the preview pane
+	// carries the copy-able `FROM lake.<table> AT (VERSION => n)` clause.
+	import { Button } from '$lib/components/common'
+	import { Loader2, RefreshCw } from 'lucide-svelte'
+	import type { DucklakeSnapshot } from '$lib/components/dbOps'
+
+	interface Props {
+		items: DucklakeSnapshot[]
+		loading: boolean
+		error?: string
+		onRefresh?: () => void
+		// Snapshot currently shown in the preview pane (highlighted in the list).
+		selectedVersion?: number
+		// Select a snapshot to preview.
+		onSelect?: (version: number) => void
+	}
+	let { items, loading, error, onRefresh, selectedVersion, onSelect }: Props = $props()
+
+	// DuckLake serializes `snapshot_time` as microseconds-since-epoch (a numeric
+	// string), not an ISO date — `new Date(µs)` would be Invalid Date. Detect the
+	// µs magnitude and convert to ms; fall back to direct parsing otherwise.
+	function fmtSnapshotTime(t: string | number | undefined): string {
+		if (t == undefined || t === '') return '—'
+		const n = typeof t === 'number' ? t : Number(t)
+		const d = Number.isFinite(n) && n > 1e14 ? new Date(n / 1000) : new Date(t)
+		return isNaN(d.getTime()) ? String(t) : d.toLocaleString()
+	}
+</script>
+
+<div class="flex flex-col h-full">
+	<div class="flex items-center justify-between gap-2 px-3 py-2 border-b shrink-0">
+		<span class="text-xs font-semibold text-secondary">Snapshot history</span>
+		<Button
+			variant="subtle"
+			unifiedSize="sm"
+			startIcon={{ icon: RefreshCw }}
+			iconOnly
+			onclick={() => onRefresh?.()}
+			title="Refresh"
+		/>
+	</div>
+
+	<div class="flex-1 min-h-0 overflow-auto p-3">
+		{#if loading && !items.length}
+			<div class="flex items-center gap-2 text-tertiary text-xs">
+				<Loader2 size={14} class="animate-spin" /> Loading snapshots…
+			</div>
+		{:else if error}
+			<p class="text-xs text-red-600">Failed to load: {error}</p>
+		{:else if !items.length}
+			<p class="text-xs text-secondary">
+				No snapshots yet. DuckLake records one on every <span class="font-mono"
+					>// materialize</span
+				> write; each becomes a version you can time-travel to.
+			</p>
+		{:else}
+			<div class="flex flex-col gap-1.5">
+				{#each items as s (s.snapshot_id)}
+					{@const selected = s.snapshot_id === selectedVersion}
+					<button
+						type="button"
+						class="flex items-center justify-between gap-2 rounded border px-2 py-1.5 text-left {selected
+							? 'border-blue-400 bg-blue-50 dark:border-blue-500 dark:bg-blue-950/30'
+							: 'hover:bg-surface-hover'}"
+						onclick={() => onSelect?.(s.snapshot_id)}
+						title="Preview the table at this version"
+					>
+						<span class="text-xs font-mono">v{s.snapshot_id}</span>
+						<span class="text-3xs text-tertiary shrink-0">{fmtSnapshotTime(s.snapshot_time)}</span>
+					</button>
+				{/each}
+			</div>
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/DucklakeVersionPreview.svelte b/frontend/src/lib/components/assets/AssetGraph/DucklakeVersionPreview.svelte
new file mode 100644
index 0000000000..5afb51fe66
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/DucklakeVersionPreview.svelte
@@ -0,0 +1,133 @@
+<script lang="ts">
+	// Read-only grid preview of a ducklake table AT a chosen DuckLake snapshot
+	// ("time-travel"). Mirrors DucklakeResultPreview but, instead of scoping to a
+	// partition, pins every read to a catalog version via `AT (VERSION => n)`
+	// (threaded server-side through the SELECT/COUNT markers). This is the
+	// "query this version" scratchpad — the rendered SQL the user would write by
+	// hand is shown above the grid so the affordance is self-documenting.
+	import DBTable from '$lib/components/DBTable.svelte'
+	import { resource } from 'runed'
+	import { workspaceStore } from '$lib/stores'
+	import {
+		fetchDucklakeColumnsAtVersion,
+		dbTableOpsWithPreviewScripts
+	} from '$lib/components/dbOps'
+	import type { DbInput } from '$lib/components/dbTypes'
+	import { parseDbInputFromAssetSyntax, copyToClipboard } from '$lib/utils'
+	import { AlertTriangle, Loader2, ClipboardCopy } from 'lucide-svelte'
+	import { Button } from '$lib/components/common'
+	import { twMerge } from 'tailwind-merge'
+
+	interface Props {
+		// Full asset URI, e.g. `ducklake://main/orders_daily`.
+		assetUri: string
+		// DuckLake snapshot to pin reads to. Undefined renders nothing (the
+		// parent prompts the user to pick a version from the history first).
+		version?: number
+		class?: string
+	}
+	let { assetUri, version, class: className = '' }: Props = $props()
+
+	let input = $derived<DbInput | undefined>(parseDbInputFromAssetSyntax(assetUri) ?? undefined)
+	let ducklake = $derived(input?.type === 'ducklake' ? input.ducklake : undefined)
+	let table = $derived(
+		input && 'specificTable' in input ? (input.specificTable as string | undefined) : undefined
+	)
+	let schema = $derived(
+		input && 'specificSchema' in input ? (input.specificSchema as string | undefined) : undefined
+	)
+	let tableKey = $derived(schema && table ? `${schema}.${table}` : table)
+
+	// A paste-able consumer-script form of this read — `lake` matches the alias
+	// the duckdb scaffold ATTACHes the ducklake under, so the reference is
+	// catalog-qualified — surfaced so the user learns the time-travel syntax.
+	let exampleSql = $derived(
+		version != undefined && tableKey
+			? `FROM lake.${tableKey} AT (VERSION => ${version})`
+			: undefined
+	)
+
+	// Load the column set *at the pinned version* — a table's schema can differ
+	// across snapshots, so enumerating the current columns against an older
+	// version would reference columns that didn't exist then and break the read.
+	// The result carries the version it was loaded for so the read never uses a
+	// stale column set from the previously-viewed snapshot (the resource keeps
+	// the prior value while re-fetching).
+	let columns = resource(
+		() => [ducklake, tableKey, version] as const,
+		async ([_ducklake, _tableKey, _version]) => {
+			if (!_ducklake || !_tableKey || _version == undefined || !$workspaceStore) return undefined
+			const colDefs = await fetchDucklakeColumnsAtVersion({
+				workspace: $workspaceStore,
+				ducklake: _ducklake,
+				tableKey: _tableKey,
+				version: _version
+			})
+			return { version: _version, colDefs }
+		}
+	)
+	// Only ready once the loaded columns are for the version currently shown.
+	let ready = $derived(
+		columns.current?.version === version && (columns.current?.colDefs.length ?? 0) > 0
+	)
+	let tableColDefs = $derived(ready ? columns.current!.colDefs : undefined)
+
+	let dbTableOps = $derived.by(() => {
+		if (!(input && tableColDefs && tableKey && $workspaceStore && version != undefined))
+			return undefined
+		const ops = dbTableOpsWithPreviewScripts({
+			input,
+			tableKey,
+			colDefs: tableColDefs,
+			workspace: $workspaceStore,
+			version
+		})
+		// Historical reads are immutable: drop every mutation handler so DBTable
+		// renders without edit/delete/insert affordances.
+		const readOnly = { ...ops }
+		delete readOnly.onUpdate
+		delete readOnly.onDelete
+		delete readOnly.onInsert
+		return readOnly
+	})
+</script>
+
+<div class={twMerge('flex flex-col min-h-0 relative', className)}>
+	{#if version == undefined}
+		<div class="flex items-center gap-2 p-3 text-2xs text-tertiary">
+			Select a snapshot from the list to preview the table as of that version.
+		</div>
+	{:else}
+		{#if exampleSql}
+			<div class="flex items-center gap-1 pb-2">
+				<span class="text-2xs font-mono text-tertiary truncate" title={exampleSql}>
+					{exampleSql}
+				</span>
+				<Button
+					variant="subtle"
+					unifiedSize="sm"
+					startIcon={{ icon: ClipboardCopy }}
+					iconOnly
+					onclick={() => copyToClipboard(exampleSql)}
+					title="Copy {exampleSql}"
+				/>
+			</div>
+		{/if}
+		{#if ready && dbTableOps}
+			{#key version}
+				<div class="grow min-h-0">
+					<DBTable {dbTableOps} />
+				</div>
+			{/key}
+		{:else if columns.error}
+			<div class="flex items-center gap-2 p-3 text-2xs text-tertiary">
+				<AlertTriangle size={14} class="text-amber-500" />
+				Couldn't load this table at version {version}.
+			</div>
+		{:else}
+			<div class="flex items-center justify-center p-4 text-tertiary">
+				<Loader2 class="animate-spin" size={18} />
+			</div>
+		{/if}
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/InitialFitView.svelte b/frontend/src/lib/components/assets/AssetGraph/InitialFitView.svelte
new file mode 100644
index 0000000000..eea1fb306d
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/InitialFitView.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+	import { useNodesInitialized, useSvelteFlow, type Node } from '@xyflow/svelte'
+
+	// One-shot initial fit of the viewport to the laid-out graph. The graph
+	// arrives async after the canvas mounts (the first render often holds only
+	// the + node), so SvelteFlow's own init-time `fitView` prop would fit the
+	// wrong content — instead wait for the first real node set to be measured.
+	// `maxZoom: 1` means small graphs are centered at natural scale and only
+	// oversized ones zoom out. Lives inside <SvelteFlow> so useSvelteFlow()
+	// has the flow context (same pattern as PanToNode).
+	//
+	// `fitKey` re-arms the fit when it changes: the in-app folder switcher
+	// swaps the whole graph without remounting the canvas, and the new
+	// pipeline deserves its own initial fit.
+	let { nodes, fitKey = '' }: { nodes: Node[]; fitKey?: string } = $props()
+
+	const { fitView } = useSvelteFlow()
+	const nodesInitialized = useNodesInitialized()
+
+	let fittedFor: string | undefined = $state(undefined)
+	$effect(() => {
+		if (fittedFor === fitKey) return
+		// useNodesInitialized flips false while any node is unmeasured, so by
+		// the time it's true again the fresh nodes have real dimensions.
+		if (!nodesInitialized.current) return
+		if (!nodes.some((n) => n.type !== 'add')) return
+		fittedFor = fitKey
+		void fitView({ padding: 0.1, maxZoom: 1 })
+	})
+</script>
diff --git a/frontend/src/lib/components/assets/AssetGraph/MacroExplorerDrawer.svelte b/frontend/src/lib/components/assets/AssetGraph/MacroExplorerDrawer.svelte
new file mode 100644
index 0000000000..32ac65bb2c
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/MacroExplorerDrawer.svelte
@@ -0,0 +1,159 @@
+<script lang="ts">
+	import { Drawer, DrawerContent } from '$lib/components/common'
+	import Button from '$lib/components/common/button/Button.svelte'
+	import TextInput from '$lib/components/text_input/TextInput.svelte'
+	import { workspaceStore } from '$lib/stores'
+	import { sendUserToast } from '$lib/utils'
+	import { Copy, ExternalLink, Loader2, RefreshCw, SquareFunction } from 'lucide-svelte'
+	import { resource } from 'runed'
+	import {
+		invalidateWorkspaceMacros,
+		listWorkspaceMacrosCached,
+		macroDefinitionSql,
+		macroSignature,
+		type WorkspaceMacro
+	} from '../workspaceMacros'
+
+	let {
+		// Called with the library script path when the user clicks "open" on a
+		// group header. The pipeline page selects the lib node when it's on the
+		// current canvas and falls back to the script page otherwise.
+		onOpenLib
+	}: { onOpenLib?: (path: string) => void } = $props()
+
+	let open = $state(false)
+	let refreshKey = $state(0)
+	let filter = $state('')
+
+	export function openDrawer() {
+		open = true
+	}
+
+	let macrosRes = resource(
+		() => (open ? { ws: $workspaceStore, key: refreshKey } : undefined),
+		(params) => {
+			if (!params?.ws) return Promise.resolve([] as WorkspaceMacro[])
+			return listWorkspaceMacrosCached(params.ws)
+		}
+	)
+
+	let filtered = $derived.by(() => {
+		const all = macrosRes.current ?? []
+		const q = filter.trim().toLowerCase()
+		if (!q) return all
+		return all.filter((m) => m.name.includes(q) || m.provider_path.toLowerCase().includes(q))
+	})
+
+	// provider_path → its macros, preserving the endpoint's (provider, name) order.
+	let byProvider = $derived.by(() => {
+		const groups = new Map<string, WorkspaceMacro[]>()
+		for (const m of filtered) {
+			const g = groups.get(m.provider_path)
+			if (g) g.push(m)
+			else groups.set(m.provider_path, [m])
+		}
+		return groups
+	})
+
+	function copyCall(m: WorkspaceMacro) {
+		navigator.clipboard.writeText(`${m.name}(${m.params})`)
+		sendUserToast(`Copied ${m.name}(…) call`)
+	}
+</script>
+
+<Drawer {open} size="700px" on:close={() => (open = false)}>
+	<DrawerContent title="Workspace macros" on:close={() => (open = false)}>
+		{#snippet actions()}
+			<Button
+				unifiedSize="sm"
+				variant="subtle"
+				startIcon={{ icon: RefreshCw }}
+				iconOnly
+				title="Refresh"
+				onclick={() => {
+					if ($workspaceStore) invalidateWorkspaceMacros($workspaceStore)
+					refreshKey++
+				}}
+			/>
+		{/snippet}
+		<div class="flex flex-col gap-3 h-full">
+			<div class="text-xs text-secondary">
+				DuckDB macros from deployed <span class="font-mono">// macros</span> libraries. Call them by
+				name from any DuckDB script in this workspace — Windmill injects the definitions at run
+				time. Add
+				<span class="font-mono">// use &lt;library path&gt;</span> to pull in a whole library when the
+				call is built dynamically.
+			</div>
+			<TextInput
+				size="md"
+				inputProps={{ placeholder: 'Filter by macro name or library path…' }}
+				bind:value={filter}
+			/>
+			{#if macrosRes.loading && !macrosRes.current}
+				<div class="flex items-center gap-2 text-tertiary text-xs py-8 justify-center">
+					<Loader2 size={14} class="animate-spin" /> Loading macros…
+				</div>
+			{:else if (macrosRes.current ?? []).length === 0}
+				<div class="text-xs text-tertiary py-8 text-center">
+					No macro libraries deployed yet. Create one from the pipeline editor's “+” menu (output
+					kind “Macro library”), or deploy a DuckDB script whose header starts with
+					<span class="font-mono">// macros</span>.
+				</div>
+			{:else if filtered.length === 0}
+				<div class="text-xs text-tertiary py-8 text-center">No macros match the filter.</div>
+			{:else}
+				<div class="flex-1 min-h-0 overflow-y-auto flex flex-col gap-4 pr-1">
+					{#each [...byProvider.entries()] as [provider, macros] (provider)}
+						<div class="flex flex-col gap-1.5">
+							<div class="flex items-center gap-2 sticky top-0 bg-surface py-1">
+								<SquareFunction size={14} class="shrink-0 text-violet-600 dark:text-violet-400" />
+								<span class="text-xs font-mono font-semibold text-emphasis truncate">
+									{provider}
+								</span>
+								<span class="text-2xs text-tertiary">
+									{macros.length} macro{macros.length > 1 ? 's' : ''}
+								</span>
+								{#if onOpenLib}
+									<Button
+										unifiedSize="sm"
+										variant="subtle"
+										startIcon={{ icon: ExternalLink }}
+										iconOnly
+										title="Open this library"
+										onclick={() => onOpenLib?.(provider)}
+									/>
+								{/if}
+							</div>
+							{#each macros as m (m.name)}
+								<div class="flex flex-col gap-1 border rounded-md px-2.5 py-1.5">
+									<div class="flex items-center gap-2 min-w-0">
+										<span class="flex-1 min-w-0 text-xs font-mono text-emphasis truncate">
+											{macroSignature(m)}
+										</span>
+										<span
+											class="shrink-0 text-3xs px-1 py-0.5 rounded-sm bg-surface-secondary text-secondary"
+										>
+											{m.is_table ? 'table' : 'scalar'}
+										</span>
+										<Button
+											unifiedSize="sm"
+											variant="subtle"
+											startIcon={{ icon: Copy }}
+											iconOnly
+											title={`Copy ${m.name}(${m.params})`}
+											onclick={() => copyCall(m)}
+										/>
+									</div>
+									<pre
+										class="text-2xs font-mono text-secondary whitespace-pre-wrap break-words max-h-32 overflow-y-auto bg-surface-secondary rounded-sm px-2 py-1"
+										title={macroDefinitionSql(m)}>{m.body}</pre
+									>
+								</div>
+							{/each}
+						</div>
+					{/each}
+				</div>
+			{/if}
+		</div>
+	</DrawerContent>
+</Drawer>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PartitionArgControl.svelte b/frontend/src/lib/components/assets/AssetGraph/PartitionArgControl.svelte
new file mode 100644
index 0000000000..dac1ecdb02
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PartitionArgControl.svelte
@@ -0,0 +1,250 @@
+<script lang="ts">
+	import { resource } from 'runed'
+	import { AssetService, type AssetKind, type MaterializedPartition } from '$lib/gen'
+	import TextInput from '$lib/components/text_input/TextInput.svelte'
+	import { CalendarClock, CircleCheck, CircleDashed, TriangleAlert } from 'lucide-svelte'
+	import type { PartitionSpec } from './parsePipelineAnnotations'
+	import { untrack } from 'svelte'
+	import {
+		bucketFromInputValue,
+		defaultBucket,
+		inputValueFromBucket,
+		isBeforeStart,
+		partitionInputType,
+		partitionMetadataError,
+		recentBuckets,
+		recentWindow,
+		startBucketOf,
+		usesCalendarPicker
+	} from './partitionBuckets'
+
+	interface Props {
+		// The partition cadence parsed from the script's `// partitioned` header.
+		spec: PartitionSpec
+		// Bound to `args.partition`. `$bindable()` without a default per the
+		// AGENTS.md ban on `$bindable(default)` for optional props.
+		value?: string | undefined
+		workspace: string
+		// The `// materialize` ducklake target, if any — enables the
+		// "already materialized / recently missing" hints against this
+		// producer's own output.
+		materializeTarget?: { kind: AssetKind; path: string }
+		// Partitioned ducklake inputs (`// on ducklake://…`) — enables the
+		// "no upstream data for this bucket yet" hint.
+		upstreamAssets?: { kind: AssetKind; path: string }[]
+	}
+
+	let {
+		value = $bindable(),
+		spec,
+		workspace,
+		materializeTarget,
+		upstreamAssets = []
+	}: Props = $props()
+
+	const inputType = $derived(partitionInputType(spec))
+	const calendarPicker = $derived(usesCalendarPicker(spec))
+	// Non-undefined when the `// partitioned` metadata is unusable (bad tz/start).
+	const metadataError = $derived(partitionMetadataError(spec))
+
+	// Seed the default bucket on (re)mount. The run form is keyed on the schema
+	// AND the partition spec (PipelineScriptView), so a real change to either
+	// remounts this and reseeds — an identical re-resolve keeps the user's
+	// in-progress pick. `defaultBucket` honours the `start=` anchor (never seeds
+	// a pre-start bucket the worker would take verbatim). We deliberately do NOT
+	// auto-seed when the metadata is invalid (bad tz/start): the worker takes an
+	// explicit `partition` arg verbatim, so seeding one would bypass the
+	// backend's own tz/start validation — leave it empty and let the backend
+	// surface the error. Dynamic / custom-format specs also stay empty (free
+	// text). `untrack` so this fires once per mount, not on every `value` edit.
+	$effect(() => {
+		untrack(() => {
+			value = calendarPicker && !metadataError ? defaultBucket(spec, new Date()) : undefined
+		})
+	})
+
+	// Whether the producer hasn't reached its `start=` anchor yet — explains why
+	// the default bucket is the start rather than today.
+	let beforeStart = $derived(calendarPicker && !metadataError && isBeforeStart(spec, new Date()))
+
+	// The native <input> string mirrors `value`; hourly carries an extra minute
+	// component that the canonical bucket drops.
+	let inputValue = $derived(value ? inputValueFromBucket(spec, value) : '')
+	function onNativeInput(raw: string) {
+		value = raw ? bucketFromInputValue(spec, raw) : ''
+	}
+
+	function listPartitions(kind: AssetKind, path: string) {
+		// Only ducklake assets carry materialized-partition rows.
+		if (kind !== 'ducklake' || !path) return Promise.resolve([] as MaterializedPartition[])
+		return AssetService.listAssetPartitions({ workspace, path }).catch(
+			() => [] as MaterializedPartition[]
+		)
+	}
+
+	// This producer's own materialized partitions — powers the selected-bucket
+	// status and the recently-missing list.
+	let ownPartitions = resource(
+		[() => workspace, () => materializeTarget?.kind, () => materializeTarget?.path],
+		async ([ws, kind, path]) => {
+			if (!ws || !kind || !path) return [] as MaterializedPartition[]
+			return listPartitions(kind, path)
+		}
+	)
+	let materializedSet = $derived(
+		new Set(
+			(ownPartitions.current ?? [])
+				.filter((p) => p.status === 'materialized')
+				.map((p) => p.partition)
+		)
+	)
+
+	let selectedMaterialized = $derived(!!value && materializedSet.has(value))
+
+	// Recently-missing buckets: the last N cadence buckets not yet materialized.
+	// Pre-`start=` buckets are dropped — they never materialize on their own, so
+	// offering them as run chips would let a click launch a pre-start partition.
+	let recentlyMissing = $derived.by(() => {
+		if (!materializeTarget || materializeTarget.kind !== 'ducklake' || !calendarPicker) return []
+		if (metadataError || ownPartitions.loading) return []
+		const startBucket = startBucketOf(spec)
+		return recentBuckets(spec, new Date(), recentWindow(spec.kind)).filter(
+			(b) => !materializedSet.has(b) && (!startBucket || b >= startBucket)
+		)
+	})
+
+	// Upstream ducklake inputs, one materialized-set PER input (not unioned).
+	// A per-input `tracked` flag (has ≥1 non-empty partition) distinguishes a
+	// partitioned input from a whole-table one, so a non-partitioned upstream
+	// (single whole-table row) never false-alarms as "no data for this bucket".
+	let ducklakeUpstreams = $derived(upstreamAssets.filter((a) => a.kind === 'ducklake'))
+	let upstream = resource(
+		[() => workspace, () => ducklakeUpstreams.map((a) => a.path).join('\n')],
+		async ([ws, joined]) => {
+			const paths = joined ? joined.split('\n') : []
+			if (!ws || paths.length === 0) return [] as { tracked: boolean; materialized: Set<string> }[]
+			return await Promise.all(
+				paths.map(async (p) => {
+					const rows = await listPartitions('ducklake', p)
+					return {
+						tracked: rows.some((r) => r.partition !== ''),
+						materialized: new Set(
+							rows.filter((r) => r.status === 'materialized').map((r) => r.partition)
+						)
+					}
+				})
+			)
+		}
+	)
+	// Warn when ANY partition-tracked upstream is missing the selected bucket —
+	// checked per-input so a fan-in where one input has the bucket doesn't mask
+	// another that lacks it. Never fires while loading or for untracked inputs.
+	let upstreamMissing = $derived(
+		!!value &&
+			calendarPicker &&
+			!upstream.loading &&
+			(upstream.current ?? []).some((u) => u.tracked && !u.materialized.has(value!))
+	)
+
+	const MAX_MISSING_CHIPS = 8
+</script>
+
+<div class="flex flex-col gap-1.5">
+	<span class="text-xs font-semibold text-emphasis inline-flex items-center gap-1.5">
+		<CalendarClock size={13} class="text-fuchsia-600 dark:text-fuchsia-400" />
+		Partition
+		<span class="text-3xs font-medium text-tertiary px-1 py-0.5 rounded bg-surface-secondary">
+			{spec.kind}
+		</span>
+	</span>
+
+	{#if calendarPicker}
+		<input
+			type={inputType}
+			class="app-editor-input !w-full text-xs"
+			value={inputValue}
+			onchange={(e) => onNativeInput(e.currentTarget.value)}
+		/>
+		{#if metadataError}
+			<span class="text-3xs inline-flex items-start gap-1 text-amber-700 dark:text-amber-400">
+				<TriangleAlert size={12} class="mt-0.5 shrink-0" />
+				<span>
+					The <span class="font-mono">// partitioned</span> header has {metadataError} — fix it in the
+					script; no default is filled in.
+				</span>
+			</span>
+		{:else if beforeStart}
+			<span class="text-3xs text-tertiary">
+				Partitioning starts <span class="font-mono">{spec.start}</span> — defaulted to the first partition.
+			</span>
+		{/if}
+	{:else}
+		<TextInput
+			bind:value={() => value ?? '', (v) => (value = v)}
+			size="sm"
+			inputProps={{
+				placeholder: spec.kind === 'dynamic' ? 'Partition key value' : 'Partition bucket'
+			}}
+		/>
+		<span class="text-3xs text-tertiary">
+			{#if spec.kind === 'dynamic'}
+				Dynamic partition — leave blank to let the run resolve it from the payload.
+			{:else}
+				Custom partition format — enter the bucket exactly as the producer renders it.
+			{/if}
+		</span>
+	{/if}
+
+	<!-- Selected-bucket status against this producer's own materialized set. -->
+	{#if calendarPicker && materializeTarget?.kind === 'ducklake' && value}
+		{#if selectedMaterialized}
+			<span class="text-3xs inline-flex items-center gap-1 text-green-700 dark:text-green-400">
+				<CircleCheck size={12} />
+				<span class="font-mono">{value}</span> is already materialized — running replaces it.
+			</span>
+		{:else}
+			<span class="text-3xs inline-flex items-center gap-1 text-tertiary">
+				<CircleDashed size={12} />
+				<span class="font-mono">{value}</span> not materialized yet — running creates it.
+			</span>
+		{/if}
+	{/if}
+
+	<!-- No upstream data for the selected bucket. -->
+	{#if upstreamMissing}
+		<span class="text-3xs inline-flex items-start gap-1 text-amber-700 dark:text-amber-400">
+			<TriangleAlert size={12} class="mt-0.5 shrink-0" />
+			<span>
+				No upstream data for <span class="font-mono">{value}</span> yet — this run may materialize an
+				empty partition.
+			</span>
+		</span>
+	{/if}
+
+	<!-- Recently-missing buckets, a compact "what's not filled in" hint. -->
+	{#if recentlyMissing.length > 0}
+		<div class="flex flex-col gap-1">
+			<span class="text-3xs text-tertiary">
+				{recentlyMissing.length} of the last {recentWindow(spec.kind)}
+				{spec.kind} partitions are not materialized:
+			</span>
+			<div class="flex flex-wrap gap-1">
+				{#each recentlyMissing.slice(0, MAX_MISSING_CHIPS) as b (b)}
+					<button
+						type="button"
+						class="px-1.5 py-0.5 rounded text-3xs font-mono bg-amber-100 text-amber-800 dark:bg-amber-900/40 dark:text-amber-300 hover:ring-1 hover:ring-amber-400"
+						title="Set the partition to {b}"
+						onclick={() => (value = b)}
+					>
+						{b}
+					</button>
+				{/each}
+				{#if recentlyMissing.length > MAX_MISSING_CHIPS}
+					<span class="text-3xs text-tertiary self-center">
+						+{recentlyMissing.length - MAX_MISSING_CHIPS} more
+					</span>
+				{/if}
+			</div>
+		</div>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PartitionStatusGrid.svelte b/frontend/src/lib/components/assets/AssetGraph/PartitionStatusGrid.svelte
new file mode 100644
index 0000000000..4be0bb8b6c
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PartitionStatusGrid.svelte
@@ -0,0 +1,209 @@
+<script lang="ts">
+	import { resource } from 'runed'
+	import { AssetService, JobService, type MaterializedPartition } from '$lib/gen'
+	import { Button } from '$lib/components/common'
+	import { Loader2, RefreshCw, History } from 'lucide-svelte'
+	import { enterpriseLicense } from '$lib/stores'
+	import BackfillRangeDialog from './BackfillRangeDialog.svelte'
+	import { runBackfill, type BackfillSliceState } from './backfillRun'
+	import { makeWaitJobTerminal } from './cascadeRun'
+
+	interface Props {
+		// The materialized ducklake asset path (`<ducklake>/<table>`).
+		path: string
+		workspace: string
+	}
+	let { path, workspace }: Props = $props()
+
+	let partitions = resource([() => workspace, () => path], async ([ws, p]) => {
+		if (!ws || !p) return [] as MaterializedPartition[]
+		return await AssetService.listAssetPartitions({ workspace: ws, path: p })
+	})
+
+	let backfillOpen = $state(false)
+	// Slice states of the in-flight (or last finished) backfill. Owned here —
+	// not in the dialog — so progress keeps streaming in the header when the
+	// dialog is closed mid-run.
+	let backfillSlices = $state<BackfillSliceState[] | undefined>(undefined)
+	let backfillRunning = $state(false)
+	let backfillCancelRequested = $state(false)
+
+	let backfillDone = $derived(
+		backfillSlices?.filter((s) => s.status === 'success' || s.status === 'failure').length ?? 0
+	)
+	let backfillFailed = $derived(backfillSlices?.filter((s) => s.status === 'failure').length ?? 0)
+
+	// Never throws: the job may already be terminal, and the sequential loop
+	// stops on the cancel flag regardless.
+	async function cancelJobById(jobId: string) {
+		try {
+			await JobService.cancelQueuedJob({
+				workspace,
+				id: jobId,
+				requestBody: { reason: 'backfill cancelled' }
+			})
+		} catch {}
+	}
+
+	// Stop scheduling further slices and cancel the in-flight run (its slice
+	// then reports failure); already-materialized slices are unaffected. A
+	// cancel that lands while a launch is in flight (no job id yet) is
+	// finished by the runner via its `cancelJob` hook.
+	async function cancelBackfill() {
+		backfillCancelRequested = true
+		const running = backfillSlices?.find((s) => s.status === 'running')
+		if (running?.jobId) {
+			await cancelJobById(running.jobId)
+		}
+	}
+
+	async function startBackfill(producerPath: string, worklist: string[]) {
+		if (backfillRunning || worklist.length === 0) return
+		backfillRunning = true
+		backfillCancelRequested = false
+		try {
+			await runBackfill({
+				partitions: worklist,
+				// Backend asset dispatch stays ON (unlike client-orchestrated dev
+				// cascades, which pass `_wmill_skip_asset_dispatch`): a backfilled
+				// slice refreshes its deployed consumers like any deployed run,
+				// carrying its partition down the chain.
+				launch: async (partition) =>
+					await JobService.runScriptByPath({
+						workspace,
+						path: producerPath,
+						requestBody: { partition }
+					}),
+				waitTerminal: async (jobId) => {
+					const term = await makeWaitJobTerminal(workspace)(jobId)
+					// The run just recorded (or failed to record) its
+					// materialized_partition row — stream it into the grid.
+					partitions.refetch()
+					return term
+				},
+				onUpdate: (s) => (backfillSlices = s),
+				isCancelled: () => backfillCancelRequested,
+				cancelJob: cancelJobById
+			})
+		} finally {
+			backfillRunning = false
+			partitions.refetch()
+		}
+	}
+
+	const statusClass: Record<MaterializedPartition['status'], string> = {
+		materialized: 'bg-green-100 text-green-800 dark:bg-green-900/40 dark:text-green-300',
+		running: 'bg-blue-100 text-blue-800 dark:bg-blue-900/40 dark:text-blue-300',
+		failed: 'bg-red-100 text-red-800 dark:bg-red-900/40 dark:text-red-300'
+	}
+</script>
+
+<div class="flex flex-col h-full">
+	<div class="flex items-center justify-between gap-2 px-3 py-2 border-b shrink-0">
+		<span class="text-xs font-semibold text-secondary">Materialized partitions</span>
+		<div class="flex items-center gap-2">
+			{#if backfillRunning}
+				<button
+					class="flex items-center gap-1 text-3xs text-tertiary hover:text-primary"
+					onclick={() => (backfillOpen = true)}
+					title="Show backfill progress"
+				>
+					<Loader2 size={12} class="animate-spin" />
+					Backfilling {backfillDone}/{backfillSlices?.length ?? 0}
+				</button>
+			{:else if backfillSlices?.length}
+				<button
+					class="text-3xs {backfillFailed > 0
+						? 'text-red-600'
+						: 'text-tertiary'} hover:text-primary"
+					onclick={() => (backfillOpen = true)}
+					title="Show backfill result"
+				>
+					Backfill: {backfillDone - backfillFailed}/{backfillSlices.length} ok{backfillFailed > 0
+						? `, ${backfillFailed} failed`
+						: ''}
+				</button>
+			{/if}
+			<div class="flex items-center gap-1">
+				<Button
+					variant="subtle"
+					unifiedSize="sm"
+					startIcon={{ icon: RefreshCw }}
+					iconOnly
+					onclick={() => partitions.refetch()}
+					title="Refresh"
+				/>
+				<Button
+					variant="default"
+					unifiedSize="sm"
+					startIcon={{ icon: History }}
+					disabled={!$enterpriseLicense}
+					onclick={() => (backfillOpen = true)}
+					title={$enterpriseLicense
+						? 'Backfill a range of partitions'
+						: 'Backfill a range of partitions (enterprise feature)'}
+				>
+					Backfill
+				</Button>
+			</div>
+		</div>
+	</div>
+
+	<div class="flex-1 min-h-0 overflow-auto p-3">
+		{#if partitions.loading}
+			<div class="flex items-center gap-2 text-tertiary text-xs">
+				<Loader2 size={14} class="animate-spin" /> Loading partitions…
+			</div>
+		{:else if partitions.error}
+			<p class="text-xs text-red-600">Failed to load: {partitions.error.message}</p>
+		{:else if !partitions.current?.length}
+			<p class="text-xs text-secondary">
+				No partitions materialized yet. They appear here after a <span class="font-mono"
+					>// materialize</span
+				> run.
+			</p>
+		{:else}
+			<table class="w-full text-xs">
+				<thead class="text-tertiary text-left">
+					<tr>
+						<th class="font-medium pb-1 pr-2">Partition</th>
+						<th class="font-medium pb-1 pr-2">Status</th>
+						<th class="font-medium pb-1 pr-2">Snapshot</th>
+						<th class="font-medium pb-1 pr-2">Rows</th>
+						<th class="font-medium pb-1">Materialized</th>
+					</tr>
+				</thead>
+				<tbody>
+					{#each partitions.current as p (p.partition)}
+						<tr class="border-t">
+							<td class="py-1 pr-2 font-mono">{p.partition || '(whole table)'}</td>
+							<td class="py-1 pr-2">
+								<span class="px-1.5 py-0.5 rounded text-3xs font-medium {statusClass[p.status]}">
+									{p.status}
+								</span>
+							</td>
+							<td class="py-1 pr-2 font-mono">{p.snapshot_id ?? '—'}</td>
+							<td class="py-1 pr-2">{p.row_count ?? '—'}</td>
+							<td class="py-1 text-tertiary">{new Date(p.materialized_at).toLocaleString()}</td>
+						</tr>
+						{#if p.error}
+							<tr><td colspan="5" class="pb-1 text-3xs text-red-600 font-mono">{p.error}</td></tr>
+						{/if}
+					{/each}
+				</tbody>
+			</table>
+		{/if}
+	</div>
+</div>
+
+<BackfillRangeDialog
+	bind:open={backfillOpen}
+	assetPath={path}
+	{workspace}
+	slices={backfillSlices}
+	running={backfillRunning}
+	cancelRequested={backfillCancelRequested}
+	onStart={startBackfill}
+	onCancel={cancelBackfill}
+	onReset={() => (backfillSlices = undefined)}
+/>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineActivityPanel.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineActivityPanel.svelte
index 90e531e858..7e6c34adc2 100644
--- a/frontend/src/lib/components/assets/AssetGraph/PipelineActivityPanel.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineActivityPanel.svelte
@@ -36,8 +36,12 @@
 		// History preload hit its page cap before the days cutoff.
 		truncated?: boolean
 		error?: string | undefined
-		days: number
-		onDaysChange: (days: number) => void
+		days?: number
+		onDaysChange?: (days: number) => void
+		// Live-only surfaces (local-dev preview) have no historical fetch: hide
+		// the day-range Select + histogram (both are history-window concepts) and
+		// show only the live run stream.
+		liveOnly?: boolean
 		// Hover a run row → emphasize its node(s) on the canvas; a group header
 		// passes the whole cascade's paths. `undefined` clears.
 		onHoverRun?: (paths: string[] | undefined) => void
@@ -51,8 +55,9 @@
 		loading = false,
 		truncated = false,
 		error,
-		days,
+		days = 30,
 		onDaysChange,
+		liveOnly = false,
 		onHoverRun,
 		onSelectRun
 	}: Props = $props()
@@ -99,7 +104,7 @@
 	// Quick reset: drop the brush and return to the default 30-day window.
 	function resetWindow() {
 		selectedRange = undefined
-		if (days !== 30) onDaysChange(30)
+		if (days !== 30) onDaysChange?.(30)
 	}
 	function fmtRange(r: { from: number; to: number }): string {
 		const opt: Intl.DateTimeFormatOptions = {
@@ -236,7 +241,9 @@
 		{ label: 'Last 30 days', value: 30 },
 		{ label: 'Last 90 days', value: 90 }
 	]
-	let windowLabel = $derived(DAY_OPTIONS.find((o) => o.value === days)?.label ?? `Last ${days} days`)
+	let windowLabel = $derived(
+		DAY_OPTIONS.find((o) => o.value === days)?.label ?? `Last ${days} days`
+	)
 
 	// Excludes future-scheduled queued jobs (a schedule's next planned run
 	// is not activity) — see isActiveEvent.
@@ -341,17 +348,19 @@
 				<Loader2 size={12} class="animate-spin text-tertiary" />
 			{/if}
 		</span>
-		<div class="w-36 shrink-0">
-			<Select
-				items={DAY_OPTIONS}
-				size="sm"
-				clearable={false}
-				bind:value={() => days, (v) => onDaysChange(v ?? 30)}
-			/>
-		</div>
+		{#if !liveOnly}
+			<div class="w-36 shrink-0">
+				<Select
+					items={DAY_OPTIONS}
+					size="sm"
+					clearable={false}
+					bind:value={() => days, (v) => onDaysChange?.(v ?? 30)}
+				/>
+			</div>
+		{/if}
 	</div>
 
-	{#if events.length > 0}
+	{#if events.length > 0 && !liveOnly}
 		<div class="border-b shrink-0">
 			<ActivityHistogram
 				{events}
@@ -390,8 +399,12 @@
 				</div>
 			{:else}
 				<div class="px-3 py-6 text-center text-xs text-tertiary">
-					No runs in this window ({windowLabel.toLowerCase()}) — executions of this pipeline will
-					appear here live.
+					{#if liveOnly}
+						No runs yet — executions of this pipeline will appear here live.
+					{:else}
+						No runs in this window ({windowLabel.toLowerCase()}) — executions of this pipeline will
+						appear here live.
+					{/if}
 				</div>
 			{/if}
 		{:else}
@@ -555,7 +568,8 @@
 								title={`Join fed by ${g.extraTriggers + 1} triggers`}>+{g.extraTriggers}</span
 							>
 						{/if}
-						<span class="shrink-0 text-3xs text-tertiary tabular-nums">{g.members.length} runs</span>
+						<span class="shrink-0 text-3xs text-tertiary tabular-nums">{g.members.length} runs</span
+						>
 						<span class="shrink-0 text-3xs text-tertiary tabular-nums w-14 text-right">
 							{ago(g.latestAt)}
 						</span>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineDevView.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineDevView.svelte
new file mode 100644
index 0000000000..8b10e54ce3
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineDevView.svelte
@@ -0,0 +1,411 @@
+<script lang="ts">
+	import { untrack } from 'svelte'
+	import { Loader2, Workflow } from 'lucide-svelte'
+	import { page } from '$app/state'
+	import PipelineGraphEditor from './PipelineGraphEditor.svelte'
+	import PipelineActivityPanel from './PipelineActivityPanel.svelte'
+	import { PipelineEditorState } from './pipelineEditorState.svelte'
+	import { useActiveRunnableIds } from './activeRunnables.svelte'
+	import { makeLaunch, makeWaitJobTerminal, runDownstreamCascade } from './cascadeRun'
+	import { assetProducers, buildDownstreamMap } from './graphTraversal'
+	import type { AssetGraphResponse, AssetGraphSelection } from './types'
+	import { JobService, OpenAPI, type Preview, type Script } from '$lib/gen'
+	import { workspaceStore } from '$lib/stores'
+	import { emptySchema, sendUserToast } from '$lib/utils'
+	import { inferArgs } from '$lib/infer'
+
+	// A local-dev pipeline preview driven by `wmill pipeline dev`. The CLI watches
+	// an `f/<folder>` of `// pipeline` scripts, builds the asset graph from the
+	// working tree, and pushes it over a WebSocket; this page renders that graph
+	// with the same editor the UI uses and runs the cascade by PREVIEWING the
+	// pushed local content (no deploy). Editing happens in the user's own editor;
+	// each save live-reloads the graph here.
+
+	type PushedScript = {
+		path: string
+		content: string
+		language: Preview['language']
+		tag?: string
+	}
+	type PipelineBundle = {
+		type: 'pipeline'
+		folder: string
+		graph: AssetGraphResponse
+		scripts: PushedScript[]
+		temp_script_refs?: Record<string, string>
+	}
+
+	const sp = page.url.searchParams
+	const token = sp.get('wm_token') ?? undefined
+	const workspace = sp.get('workspace') ?? undefined
+	const port = sp.get('port') ?? '3201'
+	const folder = sp.get('folder') ?? ''
+	// Per-session token gating the dev WS — the server rejects connections without
+	// it so a stray localhost page can't read the pushed script source.
+	const wsToken = sp.get('ws_token') ?? undefined
+
+	$effect.pre(() => {
+		if (token) {
+			OpenAPI.WITH_CREDENTIALS = true
+			OpenAPI.TOKEN = token
+		}
+	})
+	$effect.pre(() => {
+		if (workspace) $workspaceStore = workspace
+	})
+
+	const EMPTY_GRAPH: AssetGraphResponse = { assets: [], runnables: [], edges: [], triggers: [] }
+
+	let bundle = $state<PipelineBundle | undefined>(undefined)
+	let wsState = $state<'connecting' | 'open' | 'closed'>('connecting')
+
+	// Externalized editor state (selection only — this view has no DB drafts; the
+	// local files are the source of truth).
+	const pe = new PipelineEditorState()
+	$effect(() => {
+		const f = folder
+		untrack(() => {
+			if (pe.folder !== f) pe.folder = f
+		})
+	})
+
+	const displayGraph = $derived((bundle?.graph ?? EMPTY_GRAPH) as AssetGraphResponse)
+	const pathPrefix = $derived(`f/${folder}/`)
+
+	// Producers of the selected asset — the local scripts that write it (`w`/`rw`
+	// edge, incl. the `// materialize` target). Shared `assetProducers` keeps this
+	// in lockstep with the route page so the details pane shows the producer + its
+	// runs instead of "No producer for this asset" (which only holds for the
+	// deployed graph, absent here).
+	const selectionProducers = $derived(assetProducers(displayGraph, pe.selection))
+
+	// Subscriber count of the open script — gates the detail form's "Run +
+	// downstream" (only meaningful when the script has a chain to fan out to).
+	const openScriptPath = $derived(
+		pe.selection?.kind === 'runnable' && pe.selection.runnable_kind === 'script'
+			? pe.selection.path
+			: undefined
+	)
+	const selectionDownstreamCount = $derived(
+		openScriptPath ? (buildDownstreamMap(displayGraph).get(openScriptPath)?.size ?? 0) : 0
+	)
+
+	// path -> pushed local content, for preview-running each node.
+	const scriptByPath = $derived(
+		new Map<string, PushedScript>((bundle?.scripts ?? []).map((s) => [s.path, s]))
+	)
+
+	// Selecting a node must render its working-tree source + Run button, NOT
+	// fetch the deployed script (this pipeline is local-only — that fetch 404s).
+	// Synthesize a read-only `Script` from the pushed content and infer its args
+	// schema (same wasm the script editor uses) so a parameterized node shows its
+	// run-form inputs. The details pane only reads path/language/content/schema.
+	async function resolveLocalScript(path: string): Promise<Script | undefined> {
+		const s = scriptByPath.get(path)
+		if (!s) return undefined
+		const schema = emptySchema()
+		try {
+			await inferArgs(s.language as any, s.content ?? '', schema)
+		} catch {
+			// Inference failure (unsupported lang / parse error) → no inputs, still runnable.
+		}
+		return {
+			hash: '',
+			path,
+			summary: '',
+			description: '',
+			content: s.content,
+			schema,
+			is_template: false,
+			extra_perms: {},
+			language: s.language as Script['language'],
+			kind: 'script',
+			created_by: '',
+			created_at: '',
+			archived: false,
+			deleted: false,
+			starred: false
+		} as unknown as Script
+	}
+
+	// Live run state (node badges + event log), shared with the route page's poll.
+	const activeRunnables = useActiveRunnableIds(
+		() => workspace,
+		() => pathPrefix
+	)
+	let activeRunnable = $state<{ kind: 'script' | 'flow'; path: string } | undefined>(undefined)
+	let activeRunnableJobId = $state<string | undefined>(undefined)
+
+	// Drive the selected node's runs pane (AssetRunsPanel): a just-launched
+	// preview is `runsPendingJobId` (shown immediately), and bumping
+	// `runsRefreshKey` re-fetches the list — mirrors the route page so a local run
+	// appears + selects in the pane instead of only updating the node badge.
+	let runsPendingJobId = $state<string | undefined>(undefined)
+	let runsRefreshKey = $state(0)
+
+	// Activity-panel cross-highlighting: hovering/expanding a run row emphasizes
+	// its node(s) on the canvas (same wiring the route page uses).
+	let activityHoverPaths = $state<string[]>([])
+	let activitySelectPaths = $state<string[]>([])
+
+	// Collapse the details/activity pane to give the graph full width/height —
+	// works in both side-by-side and stacked layouts.
+	let panelHidden = $state(false)
+	$effect(() => {
+		pathPrefix
+		activeRunnables.setObserving(true)
+		return () => activeRunnables.dispose()
+	})
+	$effect(() => {
+		if (!activeRunnableJobId) return
+		const ev = activeRunnables.events.find((e) => e.id === activeRunnableJobId)
+		if (ev && (ev.status === 'success' || ev.status === 'failure')) {
+			activeRunnable = undefined
+			activeRunnableJobId = undefined
+			// The job reached a terminal state — refetch the runs pane so it shows
+			// the completed run + result, and drop the pending placeholder.
+			runsPendingJobId = undefined
+			runsRefreshKey += 1
+		}
+	})
+
+	// Connect to the `wmill pipeline dev` WS, auto-reconnecting while mounted —
+	// the dev server may bounce (the agent/user restarts it after changing config
+	// or the folder), and the page should recover without a manual reload.
+	$effect(() => {
+		const _port = port
+		let socket: WebSocket | undefined
+		let retry: ReturnType<typeof setTimeout> | undefined
+		let disposed = false
+
+		function scheduleReconnect() {
+			if (disposed) return
+			wsState = 'closed'
+			if (retry) return
+			retry = setTimeout(() => {
+				retry = undefined
+				open()
+			}, 1500)
+		}
+		function open() {
+			if (disposed) return
+			wsState = 'connecting'
+			try {
+				const q = wsToken ? `?token=${encodeURIComponent(wsToken)}` : ''
+				socket = new WebSocket(`ws://localhost:${_port}/ws${q}`)
+			} catch {
+				scheduleReconnect()
+				return
+			}
+			socket.addEventListener('open', () => (wsState = 'open'))
+			socket.addEventListener('message', (event) => {
+				try {
+					const data = JSON.parse(event.data)
+					if (data?.type === 'pipeline') bundle = data as PipelineBundle
+				} catch {
+					// ignore malformed frames
+				}
+			})
+			socket.addEventListener('close', scheduleReconnect)
+			socket.addEventListener('error', () => socket?.close())
+		}
+		open()
+		return () => {
+			disposed = true
+			if (retry) clearTimeout(retry)
+			socket?.close()
+		}
+	})
+
+	function resolveLocal(
+		path: string
+	): { content: string; language: Preview['language']; tag?: string } | undefined {
+		const s = scriptByPath.get(path)
+		return s ? { content: s.content, language: s.language, tag: s.tag } : undefined
+	}
+
+	// Run a single node as a preview of its local content. Never fans out to
+	// downstream deployed subscribers (skip-dispatch) — single-node runs stay local.
+	async function runNode(
+		nodePath: string,
+		args: Record<string, any> = {}
+	): Promise<string | undefined> {
+		const local = resolveLocal(nodePath)
+		if (!local || !workspace) {
+			sendUserToast(`No local content for ${nodePath}`, true)
+			return undefined
+		}
+		activeRunnables.arm(`script:${nodePath}`)
+		try {
+			const jobId = await JobService.runScriptPreview({
+				workspace,
+				requestBody: {
+					content: local.content,
+					language: local.language,
+					path: nodePath,
+					args: { ...args, _wmill_skip_asset_dispatch: true },
+					...(local.tag ? { tag: local.tag } : {}),
+					...(bundle?.temp_script_refs ? { temp_script_refs: bundle.temp_script_refs } : {})
+				}
+			})
+			activeRunnable = { kind: 'script', path: nodePath }
+			activeRunnableJobId = jobId
+			runsPendingJobId = jobId
+			runsRefreshKey += 1
+			return jobId
+		} catch (e: any) {
+			sendUserToast(`Run failed: ${e?.body ?? e?.message ?? e}`, true)
+			return undefined
+		}
+	}
+
+	let cascadeRunningRoot = $state<string | undefined>(undefined)
+
+	// "Run + downstream" — the client orchestrates the closure (preview each node
+	// in topological order) since the backend dispatcher only resolves deployed rows.
+	// `rootArgs` feeds the root node its inputs (e.g. an uploaded S3Object from the
+	// detail-pane form) so a `data_upload` entry can seed the whole chain.
+	async function runCascadeFrom(
+		rootPath: string,
+		rootArgs: Record<string, any> = {}
+	): Promise<string | undefined> {
+		if (!workspace) return undefined
+		if (cascadeRunningRoot) {
+			sendUserToast(`A chain run from ${cascadeRunningRoot} is still in progress`, true)
+			return undefined
+		}
+		cascadeRunningRoot = rootPath
+		let rootJobId: string | undefined
+		const launch = makeLaunch({
+			workspace,
+			resolveLocal,
+			tempScriptRefs: bundle?.temp_script_refs,
+			argsFor: (p) => (p === rootPath ? rootArgs : undefined),
+			onLaunched: (p, jobId) => {
+				activeRunnables.arm(`script:${p}`)
+				if (p === rootPath) {
+					rootJobId = jobId
+					activeRunnable = { kind: 'script', path: p }
+					activeRunnableJobId = jobId
+					runsPendingJobId = jobId
+					runsRefreshKey += 1
+				}
+			}
+		})
+		try {
+			const res = await runDownstreamCascade({
+				graph: displayGraph,
+				root: rootPath,
+				launch,
+				waitTerminal: makeWaitJobTerminal(workspace)
+			})
+			if (res.cyclic.length > 0) {
+				sendUserToast(
+					`Skipped ${res.cyclic.length} script(s) on a cycle: ${res.cyclic.join(', ')}`,
+					true
+				)
+			}
+			const n = res.statuses.size
+			if (res.ok) {
+				sendUserToast(`Chain run complete — ${n} script${n === 1 ? '' : 's'} succeeded`)
+			} else {
+				const failed = [...res.statuses.entries()].filter(([, s]) => s.status === 'failure')
+				sendUserToast(`Chain run failed at ${failed.map(([p]) => p).join(', ')}`, true)
+			}
+		} finally {
+			cascadeRunningRoot = undefined
+		}
+		return rootJobId
+	}
+
+	function runProducer(producer: { kind: 'script' | 'flow'; path: string; cascade?: boolean }) {
+		if (producer.kind !== 'script') return Promise.resolve(undefined)
+		return producer.cascade ? runCascadeFrom(producer.path) : runNode(producer.path)
+	}
+
+	function handleCanvasSelect(s: AssetGraphSelection | undefined) {
+		pe.selection = s
+	}
+</script>
+
+<div class="flex flex-col h-full w-full bg-surface">
+	<div
+		class="flex items-center gap-2 px-3 py-1.5 border-b border-light text-xs text-secondary shrink-0"
+	>
+		<Workflow size={14} />
+		<span class="font-mono text-emphasis truncate">f/{folder}</span>
+		<span class="text-tertiary">· local pipeline dev</span>
+		<span class="ml-auto flex items-center gap-1.5">
+			<span
+				class="inline-block w-2 h-2 rounded-full {wsState === 'open'
+					? 'bg-green-500'
+					: wsState === 'connecting'
+						? 'bg-yellow-500'
+						: 'bg-red-500'}"
+			></span>
+			<span class="text-tertiary"
+				>{wsState === 'open'
+					? 'watching'
+					: wsState === 'connecting'
+						? 'connecting…'
+						: 'disconnected'}</span
+			>
+		</span>
+	</div>
+	<div class="flex-1 min-h-0">
+		{#if !bundle}
+			<div class="h-full flex items-center justify-center gap-2 text-tertiary">
+				<Loader2 size={18} class="animate-spin" />
+				<span>Connecting to <code>wmill pipeline dev</code>…</span>
+			</div>
+		{:else if displayGraph.runnables.length === 0}
+			<div class="h-full flex items-center justify-center text-sm text-tertiary px-4 text-center">
+				No <code class="mx-1">// pipeline</code> scripts found in f/{folder}. Mark a script with a
+				bare
+				<code class="mx-1">// pipeline</code> comment.
+			</div>
+		{:else}
+			<PipelineGraphEditor
+				editor={pe}
+				{folder}
+				{displayGraph}
+				mode="view"
+				{workspace}
+				{pathPrefix}
+				{activeRunnable}
+				{runsPendingJobId}
+				{runsRefreshKey}
+				activeRunnableIds={activeRunnables.ids}
+				runStates={activeRunnables.states}
+				eventLogEvents={activeRunnables.events}
+				hoveredPaths={activityHoverPaths}
+				selectedRunPaths={activitySelectPaths}
+				{panelHidden}
+				onTogglePanelHidden={() => (panelHidden = !panelHidden)}
+				onRunProducer={runProducer}
+				onRunByPath={(path, args) => runNode(path, args)}
+				onRunCascadeByPath={(path, args) => runCascadeFrom(path, args)}
+				downstreamSubscribers={selectionDownstreamCount}
+				{resolveLocalScript}
+				localScriptsVersion={bundle}
+				{selectionProducers}
+				canRunByPath
+				onRunCompleted={() => {
+					activeRunnable = undefined
+					activeRunnableJobId = undefined
+				}}
+				onSelect={handleCanvasSelect}
+				onClose={() => (pe.selection = undefined)}
+			>
+				{#snippet idlePane()}
+					<PipelineActivityPanel
+						events={activeRunnables.events}
+						liveOnly
+						onHoverRun={(p) => (activityHoverPaths = p ?? [])}
+						onSelectRun={(p) => (activitySelectPaths = p ?? [])}
+					/>
+				{/snippet}
+			</PipelineGraphEditor>
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineFolderList.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineFolderList.svelte
new file mode 100644
index 0000000000..d35b4f21d6
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineFolderList.svelte
@@ -0,0 +1,111 @@
+<script lang="ts">
+	import { userStore, workspaceStore } from '$lib/stores'
+	import { base } from '$lib/base'
+	import { goto } from '$app/navigation'
+	import Button from '$lib/components/common/button/Button.svelte'
+	import FolderPicker from '$lib/components/FolderPicker.svelte'
+	import { AssetService, type ListPipelineFoldersResponse } from '$lib/gen'
+	import { resource } from 'runed'
+	import { ArrowRight, Loader2 } from 'lucide-svelte'
+
+	interface Props {
+		// When provided, the current folder is dropped from the existing list
+		// so users don't "switch" to the folder they're already on.
+		currentFolder?: string | undefined
+		// Carried over to the target URL so switching folders from the
+		// editor keeps the user in edit mode; the default view mode needs
+		// no param.
+		mode?: 'view' | 'edit'
+		// Called right before navigating — lets a wrapping modal close itself.
+		onOpen?: () => void
+	}
+	let { currentFolder = undefined, mode = 'view', onOpen = undefined }: Props = $props()
+
+	let pipelines = resource(
+		() => $workspaceStore,
+		async (ws) => {
+			if (!ws) return [] as ListPipelineFoldersResponse
+			return await AssetService.listPipelineFolders({ workspace: ws })
+		}
+	)
+
+	let pickedFolder = $state('')
+
+	let visiblePipelines = $derived(
+		(pipelines.current ?? []).filter((p) => p.folder !== currentFolder)
+	)
+
+	async function openExistingPipeline(folder: string) {
+		onOpen?.()
+		const modeQuery = mode !== 'view' ? `?mode=${mode}` : ''
+		await goto(`${base}/pipeline/${encodeURIComponent(folder)}${modeQuery}`)
+	}
+
+	async function openPicked() {
+		const name = pickedFolder.trim()
+		if (!name) return
+		await openExistingPipeline(name)
+	}
+</script>
+
+<div class="flex flex-col gap-6 w-full min-w-0">
+	<section class="flex flex-col gap-2">
+		<h3 class="text-xs font-semibold text-secondary uppercase tracking-wide">
+			Existing pipelines
+		</h3>
+		{#if pipelines.loading && !pipelines.current}
+			<div class="text-tertiary text-sm flex items-center gap-2">
+				<Loader2 size={14} class="animate-spin" />
+				Loading…
+			</div>
+		{:else if pipelines.error}
+			<div class="text-red-500 text-sm">Failed: {pipelines.error.message}</div>
+		{:else if visiblePipelines.length === 0}
+			<div class="text-tertiary text-sm">
+				{currentFolder
+					? 'No other pipelines in this workspace.'
+					: 'No pipelines yet. A pipeline is any folder whose scripts carry pipeline annotations.'}
+			</div>
+		{:else}
+			<div class="flex flex-col border rounded-md overflow-hidden max-h-64 overflow-y-auto">
+				{#each visiblePipelines as p (p.folder)}
+					<button
+						type="button"
+						class="flex items-center justify-between px-3 py-2 border-b last:border-b-0 bg-surface hover:bg-surface-hover transition-colors text-left"
+						onclick={() => openExistingPipeline(p.folder)}
+					>
+						<span class="font-mono text-sm">f/{p.folder}</span>
+						<span class="text-2xs text-tertiary">
+							{p.script_count}
+							{p.script_count === 1 ? 'script' : 'scripts'}
+						</span>
+					</button>
+				{/each}
+			</div>
+		{/if}
+	</section>
+
+	{#if !$userStore?.operator}
+		<!-- Operators only view existing pipelines — opening an arbitrary
+		     folder is a build-a-new-pipeline affordance. -->
+		<section class="flex flex-col gap-2">
+			<h3 class="text-xs font-semibold text-secondary uppercase tracking-wide">
+				Pick or create a folder
+			</h3>
+			<div class="flex items-center gap-2">
+				<div class="flex-1 min-w-0">
+					<FolderPicker bind:folderName={pickedFolder} />
+				</div>
+				<Button
+					variant="accent"
+					unifiedSize="sm"
+					disabled={!pickedFolder.trim()}
+					onclick={openPicked}
+					startIcon={{ icon: ArrowRight }}
+				>
+					Open
+				</Button>
+			</div>
+		</section>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineGraphEditor.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineGraphEditor.svelte
new file mode 100644
index 0000000000..7db35c2353
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineGraphEditor.svelte
@@ -0,0 +1,555 @@
+<script lang="ts">
+	import { untrack, type Snippet } from 'svelte'
+	import { Loader2 } from 'lucide-svelte'
+	import { Pane, Splitpanes } from 'svelte-splitpanes'
+	import { DraftService } from '$lib/gen'
+	import { decodeState, encodeState } from '$lib/utils'
+	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
+	import { extractReads, extractWrites } from '$lib/components/assets/lib'
+	import type { PipelineDraft } from './pipelineAiHelpers'
+	import type { ColumnLineageGraph } from './columnLineageGraph'
+	import HideButton from '$lib/components/apps/editor/settingsPanel/HideButton.svelte'
+	import AssetGraphCanvas from './AssetGraphCanvas.svelte'
+	import AssetGraphDetailsPane from './AssetGraphDetailsPane.svelte'
+	import PipelineEventLog from './PipelineEventLog.svelte'
+	import type {
+		AssetGraphResponse,
+		AssetGraphSelection,
+		NativeTriggerKind,
+		PipelineMode
+	} from './types'
+	import type { AssetKind, Script, ScriptLang } from '$lib/gen'
+	import type { RunnableRunState, PipelineEvent } from './activeRunnables.svelte'
+	import type { PipelineOutputKind } from './pipelineTemplates'
+	import type { PipelineEditorState } from './pipelineEditorState.svelte'
+	import type { SchemaContractGraphContext } from './schemaContracts'
+
+	type RunProducer = { kind: 'script' | 'flow'; path: string; unsaved?: boolean; cascade?: boolean }
+
+	let {
+		editor,
+		displayGraph,
+		mode,
+		workspace,
+		folder,
+		viewportFitKey = undefined,
+		stackBelow = 680,
+		persistDrafts = false,
+		pathPrefix,
+		defaultPathSuffix = 'new_pipeline_script',
+		panelHidden = false,
+		onTogglePanelHidden,
+		prefetchingAssets = false,
+		hoveredPaths = [],
+		selectedRunPaths = [],
+		activeRunnable,
+		activeRunnableIds,
+		runStates,
+		eventLogEvents = [],
+		runsRefreshKey = 0,
+		runsPendingJobId,
+		boundPick,
+		validStartPaths,
+		onStartBoundedRun,
+		onPickEnd,
+		panToNodeId,
+		boundBar,
+		onCreateMissingTrigger,
+		onEditTrigger,
+		onDeleteTrigger,
+		onOpenWebhook,
+		onOpenDataUpload,
+		onSelect,
+		onAddScriptForAsset,
+		onAddPipelineScript,
+		onRunnableMenuRemove,
+		onRunProducer,
+		idlePane,
+		onRequestEdit,
+		canRunByPath = false,
+		onRunByPath,
+		onRunCascadeByPath,
+		runFormInitialArgs,
+		onRunFormArgsChange,
+		readyDataUploadPaths,
+		resolveLocalScript,
+		localScriptsVersion,
+		selectionProducers = [],
+		selectionColumnGraph,
+		schemaCanEvolve = true,
+		selectionForkMaterialization = undefined,
+		schemaContractContext = undefined,
+		downstreamSubscribers = 0,
+		onStartBoundedRunForOpen,
+		canBoundedRunOpenScript = false,
+		onRunCompleted,
+		onTestStateChange,
+		requestRemoveSignal = 0,
+		requestRunSignal = 0,
+		requestRunCascadeSignal = 0,
+		focusUploadSignal = 0,
+		onDraftPathChange,
+		onClose = () => {},
+		onDiscard,
+		onDraftSaved,
+		onPersistedSaved,
+		onScriptRenamed,
+		onScriptRemoved
+	}: {
+		editor: PipelineEditorState
+		displayGraph: AssetGraphResponse
+		mode: PipelineMode
+		workspace: string | undefined
+		/** Folder the pipeline is scoped to — drives the autosave draft path. */
+		folder: string
+		/** Folder whose graph is actually *loaded* (not the route param). On an
+		 * in-place folder switch the stale graph stays rendered while the new
+		 * fetch is in flight, so keying the canvas's one-shot initial fit on
+		 * `folder` would consume the new folder's fit on the old graph. Pages
+		 * that stale-while-revalidate should pass the folder captured when the
+		 * fetch resolved; defaults to `folder`. */
+		viewportFitKey?: string
+		/** Below this container width (px) the graph/details split stacks
+		 * vertically instead of side-by-side — for narrow side panels / AI
+		 * session previews. Defaults to 680. */
+		stackBelow?: number
+		/** Persist drafts as a per-folder `data_pipeline` DraftService bundle (enabled
+		 * by both the route page and the in-session preview). FlowBuilder's autosave
+		 * analogue. */
+		persistDrafts?: boolean
+		pathPrefix: string
+		defaultPathSuffix?: string
+		panelHidden?: boolean
+		onTogglePanelHidden?: () => void
+		prefetchingAssets?: boolean
+		hoveredPaths?: string[]
+		selectedRunPaths?: string[]
+		activeRunnable?: { kind: 'script' | 'flow'; path: string } | undefined
+		activeRunnableIds?: ReadonlySet<string>
+		runStates?: ReadonlyMap<string, RunnableRunState>
+		eventLogEvents?: PipelineEvent[]
+		runsRefreshKey?: any
+		runsPendingJobId?: string | undefined
+		boundPick?: any
+		validStartPaths?: Set<string>
+		onStartBoundedRun?: (path: string) => void
+		onPickEnd?: (id: string) => void
+		panToNodeId?: string | undefined
+		boundBar?: Snippet
+		onCreateMissingTrigger?: (kind: NativeTriggerKind, scriptPath: string) => void
+		onEditTrigger?: (...args: any[]) => void
+		onDeleteTrigger?: (...args: any[]) => void
+		onOpenWebhook?: (...args: any[]) => void
+		onOpenDataUpload?: (...args: any[]) => void
+		onSelect: (selection: AssetGraphSelection | undefined) => void
+		onAddScriptForAsset?: (
+			asset: { kind: AssetKind; path: string },
+			language: ScriptLang,
+			scriptPath: string,
+			outputKind: PipelineOutputKind,
+			aiPrompt?: string
+		) => void
+		onAddPipelineScript?: (
+			language: ScriptLang,
+			path: string,
+			source: { kind: NativeTriggerKind; path: string | undefined },
+			outputKind: PipelineOutputKind,
+			aiPrompt?: string
+		) => void
+		onRunnableMenuRemove?: (...args: any[]) => void
+		onRunProducer?: (producer: RunProducer) => Promise<string | undefined>
+		idlePane?: Snippet
+		onRequestEdit?: () => void
+		canRunByPath?: boolean
+		onRunByPath?: (path: string, args: Record<string, any>) => Promise<string | undefined>
+		// Run the open script AND its downstream closure (dev preview only; the
+		// deployed pane leaves this unset — its single run cascades via the backend).
+		onRunCascadeByPath?: (path: string, args: Record<string, any>) => Promise<string | undefined>
+		// Persisted run-form args for the currently-open data-upload entry, and a
+		// callback to persist them as they change — see the page's dataUploadArgs.
+		runFormInitialArgs?: Record<string, any>
+		onRunFormArgsChange?: (path: string, args: Record<string, any>, isValid: boolean) => void
+		// Data-upload entry scripts whose staged upload is ready (green node).
+		readyDataUploadPaths?: Set<string>
+		/** Local-dev (`/pipeline_dev`): resolve a node to its working-tree content
+		 * so the details pane skips the (nonexistent) deployed-script fetch. May
+		 * be async (to infer the args schema for the run form). */
+		resolveLocalScript?: (path: string) => Script | undefined | Promise<Script | undefined>
+		/** Bumped on each `pipeline dev` bundle so the open details pane re-resolves
+		 * the selected node's source on live-reload. */
+		localScriptsVersion?: unknown
+		selectionProducers?: Array<{ kind: 'script' | 'flow'; path: string; unsaved?: boolean }>
+		/** Transitive column-lineage trace for a selected ducklake asset (route page). */
+		selectionColumnGraph?: ColumnLineageGraph
+		schemaCanEvolve?: boolean
+		/** Fork workspaces: data-environment state of the selected ducklake asset (route page). */
+		selectionForkMaterialization?: 'fork' | 'deferred'
+		/** Producer-side facts for the editor's live schema-contract diagnostics
+		 * (ignore suppression + scd2 `_current` fallback), from the route page. */
+		schemaContractContext?: SchemaContractGraphContext
+		downstreamSubscribers?: number
+		onStartBoundedRunForOpen?: (path: string) => void
+		canBoundedRunOpenScript?: boolean
+		onRunCompleted?: () => void
+		onTestStateChange?: (running: boolean) => void
+		requestRemoveSignal?: number
+		requestRunSignal?: number
+		requestRunCascadeSignal?: number
+		focusUploadSignal?: number
+		onDraftPathChange?: (oldPath: string, newPath: string) => boolean | string
+		onClose?: () => void
+		onDiscard?: () => void
+		onDraftSaved?: (savedPath: string) => void
+		onPersistedSaved?: (savedPath: string) => void
+		onScriptRenamed?: (oldPath: string, newPath: string) => void
+		onScriptRemoved?: (removedPath: string) => void
+	} = $props()
+
+	let leftPaneSize = $state(60)
+	let rightPaneSize = $state(40)
+	// 0 = "no user-chosen size yet" so the orientation-aware default (55% stacked /
+	// 40% side-by-side) applies on first open; a real drag overwrites it below.
+	let storedRightPaneSize = $state(0)
+
+	// Container width drives the split orientation: stack vertically (graph over
+	// details) when too narrow for a comfortable side-by-side split.
+	let containerWidth = $state(0)
+	let stacked = $derived(containerWidth > 0 && containerWidth < stackBelow)
+
+	let effectiveSelection = $derived<AssetGraphSelection | undefined>(
+		editor.activeDraftPath
+			? { kind: 'runnable', runnable_kind: 'script', path: editor.activeDraftPath }
+			: editor.selection
+	)
+	let activeDraft = $derived(editor.activeDraft)
+	// Edit mode opens the right pane only for a selection/draft; view mode keeps it
+	// open permanently (it shows the activity idlePane when nothing is selected,
+	// and swaps to the details pane on node select). Matches the route page's
+	// original behaviour — NOT "always open in edit mode".
+	let detailsPaneOpen = $derived(
+		mode === 'edit'
+			? (editor.selection != undefined || editor.activeDraftPath != undefined) && !panelHidden
+			: !panelHidden
+	)
+	let idleView = $derived(
+		mode !== 'edit' && editor.selection == undefined && editor.activeDraftPath == undefined
+	)
+
+	// Wrap the writes (and the rightPaneSize read in the else branch) in untrack so
+	// the effect tracks only `detailsPaneOpen` / `storedRightPaneSize` — without it,
+	// the Pane `bind:size` feedback loops the effect and pegs the main thread.
+	$effect(() => {
+		// Stacked (vertical) splits give the details pane more room — the run
+		// form + result need height more than the graph needs it.
+		const fallback = stacked ? 55 : 40
+		if (detailsPaneOpen) {
+			const restore = storedRightPaneSize
+			untrack(() => {
+				rightPaneSize = restore > 0 ? restore : fallback
+				leftPaneSize = 100 - (restore > 0 ? restore : fallback)
+			})
+		} else {
+			untrack(() => {
+				if (rightPaneSize > 0) storedRightPaneSize = rightPaneSize
+				leftPaneSize = 100
+			})
+		}
+	})
+
+	// ===================== Draft autosave (persistDrafts only) =====================
+	// All of this folder's in-flight drafts live in ONE per-user DB draft (typ
+	// `data_pipeline`) keyed at the folder, syncing across devices + surfacing in
+	// the global drafts list. localStorage is a synchronous crash mirror, READ only
+	// for the one-time migration below; the DB is the source of truth on load.
+	// FlowBuilder's autosave analogue — gated by `persistDrafts`.
+	const PIPELINE_DRAFT_KIND = 'data_pipeline' as const
+	let pipelineDraftPath = $derived(`f/${folder}/data_pipeline`)
+	let storageKey = $derived(`pipeline-${folder}`)
+	type PipelineDraftBundle = { drafts: Array<[string, PipelineDraft]>; activeDraftPath?: string }
+	// Hydration is tracked on the editor instance (`editor.hydratedFromDb`), not a
+	// component flag: the in-session preview reuses one instance across editor
+	// hide/show, and it must hydrate ONCE per instance, not on every remount.
+	let lastPersistedBundle: string | undefined = undefined
+
+	function restoreBundle(bundle: PipelineDraftBundle) {
+		if (Array.isArray(bundle.drafts)) {
+			const loaded = new Map<string, PipelineDraft>()
+			for (const entry of bundle.drafts) {
+				if (entry && typeof entry[0] === 'string' && entry[1]?.script) {
+					const d = entry[1] as PipelineDraft
+					if (typeof d.localId !== 'string' || d.localId === '')
+						d.localId = editor.newDraftLocalId()
+					loaded.set(entry[0], d)
+				}
+			}
+			if (loaded.size > 0) editor.drafts = loaded
+		}
+		if (typeof bundle.activeDraftPath === 'string') editor.activeDraftPath = bundle.activeDraftPath
+	}
+
+	function readLocalBundle(): PipelineDraftBundle | undefined {
+		if (typeof localStorage === 'undefined') return undefined
+		const raw = localStorage.getItem(storageKey)
+		if (!raw) return undefined
+		try {
+			const s = decodeState(raw)
+			if (s && (Array.isArray(s.drafts) || typeof s.activeDraftPath === 'string')) {
+				return {
+					drafts: Array.isArray(s.drafts) ? s.drafts : [],
+					activeDraftPath: typeof s.activeDraftPath === 'string' ? s.activeDraftPath : undefined
+				}
+			}
+		} catch (e) {
+			console.warn('failed to read local pipeline state', e)
+		}
+		return undefined
+	}
+
+	async function hydrateDrafts() {
+		const ws = workspace
+		const path = pipelineDraftPath
+		try {
+			let bundle: PipelineDraftBundle | undefined
+			let serverSavedAt: string | undefined
+			let fromServer = false
+			if (ws) {
+				const row = await DraftService.getOwnDraft({
+					workspace: ws,
+					kind: PIPELINE_DRAFT_KIND,
+					path
+				})
+				if (row?.value) {
+					bundle = row.value as PipelineDraftBundle
+					serverSavedAt = row.created_at
+					fromServer = true
+				}
+			}
+			// A folder retarget during the await (the route-page header switcher, or a
+			// session retarget) changed the target and reset hydratedFromDb. Don't
+			// apply this now-stale folder's bundle or mark the new folder hydrated —
+			// otherwise the stale result blocks the new folder's hydrate and its
+			// drafts bleed across folders.
+			if (path !== pipelineDraftPath) return
+			let migratedFromLocal = false
+			if (!bundle) {
+				const local = readLocalBundle()
+				if (local) {
+					bundle = local
+					migratedFromLocal = true
+				}
+			}
+			if (fromServer) editor.loadedFromDbDraft = true
+			if (bundle) restoreBundle(bundle)
+			UserDraftDbSyncer.recordRemoteSync(
+				{ workspace: ws ?? '', itemKind: PIPELINE_DRAFT_KIND, path },
+				migratedFromLocal ? undefined : serverSavedAt
+			)
+			if (!migratedFromLocal) lastPersistedBundle = bundle ? JSON.stringify(bundle) : undefined
+		} catch (e) {
+			console.warn('failed to load pipeline drafts', e)
+		} finally {
+			if (path === pipelineDraftPath) editor.hydratedFromDb = true
+		}
+	}
+
+	// Hydrate when persistence is on and this editor instance hasn't been hydrated
+	// for the current folder yet. An effect (not onMount) so a folder retarget —
+	// which resets `hydratedFromDb` — re-hydrates the new folder's draft bundle.
+	$effect(() => {
+		if (!persistDrafts || editor.hydratedFromDb) return
+		void hydrateDrafts()
+	})
+
+	$effect(() => {
+		if (!persistDrafts) return
+		// For the active draft, snapshot the latest live body writes + editor buffer
+		// at serialize time so edits since the last pane-transition aren't lost on reload.
+		const liveWritesSnapshot =
+			editor.liveBodyAssets.scriptPath != undefined &&
+			editor.drafts.has(editor.liveBodyAssets.scriptPath)
+				? extractWrites(editor.liveBodyAssets.assets)
+				: undefined
+		const liveReadsSnapshot =
+			editor.liveBodyAssets.scriptPath != undefined &&
+			editor.drafts.has(editor.liveBodyAssets.scriptPath)
+				? extractReads(editor.liveBodyAssets.assets)
+				: undefined
+		const liveWritesPath = editor.liveBodyAssets.scriptPath
+		const liveContentPath =
+			editor.liveContent.scriptPath != undefined && editor.drafts.has(editor.liveContent.scriptPath)
+				? editor.liveContent.scriptPath
+				: undefined
+		const liveContentValue = editor.liveContent.content
+		const serialized = Array.from(editor.drafts.entries()).map(([p, d]) => {
+			const outputAssets =
+				liveWritesSnapshot != undefined && liveWritesPath === p
+					? liveWritesSnapshot.length > 0
+						? liveWritesSnapshot
+						: undefined
+					: d.outputAssets
+			const inputAssets =
+				liveReadsSnapshot != undefined && liveWritesPath === p ? liveReadsSnapshot : d.inputAssets
+			const script =
+				liveContentPath === p && d.script.content !== liveContentValue
+					? { ...d.script, content: liveContentValue }
+					: d.script
+			if (script === d.script && outputAssets === d.outputAssets && inputAssets === d.inputAssets)
+				return [p, d] as [string, PipelineDraft]
+			return [p, { ...d, script, outputAssets, inputAssets }] as [string, PipelineDraft]
+		})
+		const activePath = editor.activeDraftPath
+		const key = storageKey
+		const ws = workspace
+		const path = pipelineDraftPath
+		const hydrated = editor.hydratedFromDb
+		untrack(() => {
+			if (!hydrated) return
+			const isEmpty = serialized.length === 0 && !activePath
+			const bundle: PipelineDraftBundle | undefined = isEmpty
+				? undefined
+				: { drafts: serialized, activeDraftPath: activePath }
+			try {
+				if (typeof localStorage !== 'undefined') {
+					if (isEmpty) localStorage.removeItem(key)
+					else
+						localStorage.setItem(
+							key,
+							encodeState({ drafts: serialized, activeDraftPath: activePath })
+						)
+				}
+			} catch (e) {
+				console.warn('failed to mirror pipeline state', e)
+			}
+			const serializedBundle = bundle ? JSON.stringify(bundle) : undefined
+			if (serializedBundle === lastPersistedBundle) return
+			lastPersistedBundle = serializedBundle
+			if (!ws) return
+			void UserDraftDbSyncer.save({
+				workspace: ws,
+				itemKind: PIPELINE_DRAFT_KIND,
+				path,
+				value: bundle ?? null,
+				auto: true
+			})
+		})
+	})
+</script>
+
+<div class="h-full w-full" bind:clientWidth={containerWidth}>
+	<Splitpanes class="!h-full" horizontal={stacked}>
+		<Pane bind:size={leftPaneSize}>
+			<div class="relative h-full">
+				<AssetGraphCanvas
+					graph={displayGraph}
+					selection={effectiveSelection}
+					{hoveredPaths}
+					{selectedRunPaths}
+					{activeRunnable}
+					{activeRunnableIds}
+					{runStates}
+					{pathPrefix}
+					{defaultPathSuffix}
+					{onCreateMissingTrigger}
+					{onEditTrigger}
+					{onDeleteTrigger}
+					{onOpenWebhook}
+					{onOpenDataUpload}
+					{readyDataUploadPaths}
+					onselect={onSelect}
+					{onAddScriptForAsset}
+					{onAddPipelineScript}
+					{onRunnableMenuRemove}
+					{onRunProducer}
+					{validStartPaths}
+					{onStartBoundedRun}
+					{boundPick}
+					{onPickEnd}
+					{panToNodeId}
+					showMinimap={!stacked}
+					viewportFitKey={viewportFitKey ?? folder}
+				/>
+				{#if boundBar}{@render boundBar()}{/if}
+				{#if mode === 'edit'}
+					<PipelineEventLog events={eventLogEvents} />
+				{/if}
+				{#if prefetchingAssets}
+					<div
+						class="absolute top-2 left-1/2 -translate-x-1/2 z-20 flex items-center gap-1.5 px-2 py-1 rounded-md bg-surface/95 backdrop-blur-sm border border-gray-200 dark:border-gray-700 text-2xs text-secondary shadow-sm"
+						title="Inferring assets for every script in this folder so the graph is complete"
+					>
+						<Loader2 size={11} class="animate-spin" />
+						Parsing assets…
+					</div>
+				{/if}
+				{#if onTogglePanelHidden && (mode !== 'edit' || editor.selection != undefined || editor.activeDraftPath != undefined)}
+					<div
+						class="absolute top-2 right-2 z-50 rounded-md bg-surface shadow-sm border border-gray-200 dark:border-gray-700"
+					>
+						<HideButton
+							hidden={panelHidden}
+							direction={stacked ? 'bottom' : 'right'}
+							on:click={onTogglePanelHidden}
+						/>
+					</div>
+				{/if}
+			</div></Pane
+		>
+		{#if detailsPaneOpen && workspace}
+			<Pane bind:size={rightPaneSize} minSize={25}>
+				{#if idleView && idlePane}
+					{@render idlePane()}
+				{:else}
+					<AssetGraphDetailsPane
+						{mode}
+						{onRequestEdit}
+						{canRunByPath}
+						{onRunByPath}
+						{onRunCascadeByPath}
+						{runFormInitialArgs}
+						{onRunFormArgsChange}
+						{resolveLocalScript}
+						{localScriptsVersion}
+						selection={activeDraft ? undefined : editor.selection}
+						selectionProducers={activeDraft ? [] : selectionProducers}
+						{selectionColumnGraph}
+						{schemaCanEvolve}
+						{selectionForkMaterialization}
+						{schemaContractContext}
+						{runsRefreshKey}
+						{runsPendingJobId}
+						{activeRunnable}
+						{downstreamSubscribers}
+						onStartBoundedRun={canBoundedRunOpenScript &&
+						editor.openScriptPath &&
+						onStartBoundedRunForOpen
+							? () => onStartBoundedRunForOpen?.(editor.openScriptPath!)
+							: undefined}
+						{onRunCompleted}
+						{onTestStateChange}
+						{requestRemoveSignal}
+						{requestRunSignal}
+						{requestRunCascadeSignal}
+						{focusUploadSignal}
+						draftScript={activeDraft?.script}
+						draftOutputAssets={activeDraft?.outputAssets}
+						draftInputAssets={activeDraft?.inputAssets}
+						{pathPrefix}
+						{onDraftPathChange}
+						{workspace}
+						onAnnotationsChange={editor.handleAnnotationsChange}
+						onAssetsChange={editor.handleAssetsChange}
+						onContentChange={editor.handleContentChange}
+						onDraftPersist={editor.handleDraftPersist}
+						onclose={onClose}
+						onHide={onTogglePanelHidden}
+						{onDiscard}
+						{onDraftSaved}
+						{onPersistedSaved}
+						{onScriptRenamed}
+						{onScriptRemoved}
+					/>
+				{/if}
+			</Pane>
+		{/if}
+	</Splitpanes>
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineInsertMenu.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineInsertMenu.svelte
index 847f682049..e3c6c04378 100644
--- a/frontend/src/lib/components/assets/AssetGraph/PipelineInsertMenu.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineInsertMenu.svelte
@@ -231,7 +231,7 @@
 	<div
 		bind:this={outputEl}
 		class={twMerge(
-			'flex flex-col gap-1 p-2 grow w-56 overflow-auto transition-opacity',
+			'flex flex-col gap-1 p-2 grow w-80 overflow-auto transition-opacity',
 			selected.triggerId && selected.language ? '' : 'opacity-20'
 		)}
 		{@attach arrowTabNav({ onKeyDown: selectAndAdvanceTo(() => pathEl, { timeout: 50 }) })}
@@ -240,7 +240,7 @@
 		{#each visibleOutputKinds.length ? visibleOutputKinds : PIPELINE_OUTPUT_KINDS as k}
 			{@const isSelected = selected.outputId === k.id}
 			<Button variant="subtle" selected={isSelected} onClick={() => (selected.outputId = k.id)}>
-				<span class="flex flex-col items-start flex-1 min-w-0">
+				<span class="flex flex-col items-start flex-1 min-w-0 text-left">
 					<span class="text-xs font-normal leading-tight">{k.label}</span>
 					{#if k.description}
 						<span
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelinePickerModal.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelinePickerModal.svelte
index ded1013e25..b2183eec77 100644
--- a/frontend/src/lib/components/assets/AssetGraph/PipelinePickerModal.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelinePickerModal.svelte
@@ -1,13 +1,6 @@
 <script lang="ts">
-	import { userStore, workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
-	import { goto } from '$app/navigation'
-	import Button from '$lib/components/common/button/Button.svelte'
-	import FolderPicker from '$lib/components/FolderPicker.svelte'
 	import Modal from '$lib/components/common/modal/Modal.svelte'
-	import { AssetService, type ListPipelineFoldersResponse } from '$lib/gen'
-	import { resource } from 'runed'
-	import { ArrowRight, Loader2 } from 'lucide-svelte'
+	import PipelineFolderList from './PipelineFolderList.svelte'
 
 	interface Props {
 		open: boolean
@@ -20,90 +13,8 @@
 		mode?: 'view' | 'edit'
 	}
 	let { open = $bindable(), currentFolder = undefined, mode = 'view' }: Props = $props()
-
-	let pipelines = resource(
-		() => $workspaceStore,
-		async (ws) => {
-			if (!ws) return [] as ListPipelineFoldersResponse
-			return await AssetService.listPipelineFolders({ workspace: ws })
-		}
-	)
-
-	let pickedFolder = $state('')
-
-	let visiblePipelines = $derived(
-		(pipelines.current ?? []).filter((p) => p.folder !== currentFolder)
-	)
-
-	async function openExistingPipeline(folder: string) {
-		open = false
-		const modeQuery = mode !== 'view' ? `?mode=${mode}` : ''
-		await goto(`${base}/pipeline/${encodeURIComponent(folder)}${modeQuery}`)
-	}
-
-	async function openPicked() {
-		const name = pickedFolder.trim()
-		if (!name) return
-		await openExistingPipeline(name)
-	}
 </script>
 
 <Modal bind:open title="Open a pipeline">
-	<div class="flex flex-col gap-6 w-full min-w-0">
-		{#if visiblePipelines.length > 0 || pipelines.loading}
-			<section class="flex flex-col gap-2">
-				<h3 class="text-xs font-semibold text-secondary uppercase tracking-wide">
-					Existing pipelines
-				</h3>
-				{#if pipelines.loading && !pipelines.current}
-					<div class="text-tertiary text-sm flex items-center gap-2">
-						<Loader2 size={14} class="animate-spin" />
-						Loading…
-					</div>
-				{:else if pipelines.error}
-					<div class="text-red-500 text-sm">Failed: {pipelines.error.message}</div>
-				{:else}
-					<div class="flex flex-col border rounded-md overflow-hidden max-h-64 overflow-y-auto">
-						{#each visiblePipelines as p}
-							<button
-								type="button"
-								class="flex items-center justify-between px-3 py-2 border-b last:border-b-0 bg-surface hover:bg-surface-hover transition-colors text-left"
-								onclick={() => openExistingPipeline(p.folder)}
-							>
-								<span class="font-mono text-sm">f/{p.folder}</span>
-								<span class="text-2xs text-tertiary">
-									{p.script_count}
-									{p.script_count === 1 ? 'script' : 'scripts'}
-								</span>
-							</button>
-						{/each}
-					</div>
-				{/if}
-			</section>
-		{/if}
-
-		{#if !$userStore?.operator}
-			<!-- Operators only view existing pipelines — opening an arbitrary
-			     folder is a build-a-new-pipeline affordance. -->
-			<section class="flex flex-col gap-2">
-				<h3 class="text-xs font-semibold text-secondary uppercase tracking-wide">
-					Pick or create a folder
-				</h3>
-				<div class="flex items-center gap-2">
-					<div class="flex-1 min-w-0">
-						<FolderPicker bind:folderName={pickedFolder} />
-					</div>
-					<Button
-						variant="accent"
-						unifiedSize="sm"
-						disabled={!pickedFolder.trim()}
-						onclick={openPicked}
-						startIcon={{ icon: ArrowRight }}
-					>
-						Open
-					</Button>
-				</div>
-			</section>
-		{/if}
-	</div>
+	<PipelineFolderList {currentFolder} {mode} onOpen={() => (open = false)} />
 </Modal>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineRunForm.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineRunForm.svelte
new file mode 100644
index 0000000000..4384f125ba
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineRunForm.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	import SchemaForm from '$lib/components/SchemaForm.svelte'
+	import { emptySchema } from '$lib/utils'
+	import type { AssetKind } from '$lib/gen'
+	import type { PartitionSpec } from './parsePipelineAnnotations'
+	import PartitionArgControl from './PartitionArgControl.svelte'
+
+	interface Props {
+		// The script's schema to render inputs for. SchemaForm normalizes/mutates
+		// its schema in place, so we clone it into local state below.
+		schema: any
+		args: Record<string, any>
+		isValid: boolean
+		// When the script is `// partitioned`, the bare `partition` string arg is
+		// pulled out of the SchemaForm and rendered by PartitionArgControl (a
+		// cadence-appropriate date picker + missing/upstream hints) instead.
+		partitionSpec?: PartitionSpec
+		workspace?: string
+		materializeTarget?: { kind: AssetKind; path: string }
+		upstreamAssets?: { kind: AssetKind; path: string }[]
+	}
+
+	let {
+		schema,
+		args = $bindable(),
+		isValid = $bindable(),
+		partitionSpec,
+		workspace = '',
+		materializeTarget,
+		upstreamAssets = []
+	}: Props = $props()
+
+	// Drop the `partition` property from the schema clone so SchemaForm doesn't
+	// also render it as a bare string — PartitionArgControl owns `args.partition`.
+	function stripPartition(s: any): any {
+		if (!s || typeof s !== 'object') return s
+		if (s.properties && 'partition' in s.properties) {
+			delete s.properties.partition
+		}
+		if (Array.isArray(s.order)) {
+			s.order = s.order.filter((k: string) => k !== 'partition')
+		}
+		if (Array.isArray(s.required)) {
+			s.required = s.required.filter((k: string) => k !== 'partition')
+		}
+		return s
+	}
+
+	// Mutable clone SchemaForm can normalize without touching the parent's script.
+	// Seeded ONCE per mount — the parent remounts this via `{#key <schema content>}`
+	// when a local edit adds/removes args, so the clone reseeds without a prop→state
+	// $effect, and an unchanged re-resolve (a WS bundle with the same schema) keeps
+	// in-progress input.
+	// svelte-ignore state_referenced_locally
+	let formSchema = $state<any>(
+		partitionSpec
+			? stripPartition(structuredClone($state.snapshot(schema) ?? emptySchema()))
+			: structuredClone($state.snapshot(schema) ?? emptySchema())
+	)
+</script>
+
+<div class="flex flex-col gap-2">
+	{#if partitionSpec}
+		<PartitionArgControl
+			spec={partitionSpec}
+			bind:value={() => args.partition, (v) => (args.partition = v)}
+			{workspace}
+			{materializeTarget}
+			{upstreamAssets}
+		/>
+	{/if}
+	<SchemaForm bind:schema={formSchema} bind:args bind:isValid compact />
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineScriptView.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineScriptView.svelte
index bb0fbd4d27..79a1cf6d47 100644
--- a/frontend/src/lib/components/assets/AssetGraph/PipelineScriptView.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineScriptView.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
-	import type { Script } from '$lib/gen'
-	import { Loader2, Play, Upload } from 'lucide-svelte'
+	import type { AssetKind, Script } from '$lib/gen'
+	import { CalendarClock, Loader2, Play, Upload, Zap } from 'lucide-svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import HighlightCode from '$lib/components/HighlightCode.svelte'
-	import SchemaForm from '$lib/components/SchemaForm.svelte'
+	import PipelineRunForm from './PipelineRunForm.svelte'
 	import AssetRunsPanel from './AssetRunsPanel.svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
-	import { emptySchema } from '$lib/utils'
+	import { workspaceStore } from '$lib/stores'
+	import { parsePipelineAnnotations } from './parsePipelineAnnotations'
 
 	interface Props {
 		script: Script
@@ -20,11 +21,27 @@
 		// Legitimate dispatch (runScriptByPath, real cascade) owned by the
 		// page. Returns the launched job id.
 		onRun?: (path: string, args: Record<string, any>) => Promise<string | undefined>
+		// Run this script AND its downstream closure with the same form args (dev
+		// preview: the client orchestrates the chain). When unset — the deployed
+		// pane — the single `onRun` already cascades via the backend dispatcher, so
+		// no separate "Run + downstream" affordance is shown.
+		onRunCascade?: (path: string, args: Record<string, any>) => Promise<string | undefined>
+		// Downstream subscriber count; the cascade button is offered only when > 0.
+		downstreamCount?: number
 		// Threaded through to AssetRunsPanel — same semantics as the asset
 		// selection branch of the details pane.
 		runsRefreshKey?: any
 		runsPendingJobId?: string | undefined
 		onRunCompleted?: () => void
+		// Seed the run form with previously-staged args (e.g. a data-upload entry
+		// whose S3Object was picked earlier and persisted at the page level). Lets
+		// a re-opened node show the file it already has instead of a blank form.
+		initialArgs?: Record<string, any>
+		// Emitted whenever the run form's args (or validity) change, so the page can
+		// persist a data-upload entry's staged input — that drives the node's
+		// "green / ready" state and seeds the whole-pipeline run. `isValid` is the
+		// full-schema validity (all required fields, not just the S3 file).
+		onArgsChange?: (path: string, args: Record<string, any>, isValid: boolean) => void
 	}
 
 	let {
@@ -32,27 +49,87 @@
 		isDraft = false,
 		canRun = false,
 		onRun,
+		onRunCascade,
+		downstreamCount = 0,
 		runsRefreshKey,
 		runsPendingJobId,
-		onRunCompleted
+		onRunCompleted,
+		initialArgs,
+		onArgsChange
 	}: Props = $props()
 
-	let args = $state<Record<string, any>>({})
+	// Seed once from the persisted args (see initialArgs). Cloned so the run
+	// form mutates its own copy, not the page's stored snapshot.
+	// svelte-ignore state_referenced_locally
+	let args = $state<Record<string, any>>(
+		initialArgs ? structuredClone($state.snapshot(initialArgs)) : {}
+	)
 	let isValid = $state(true)
 	let running = $state(false)
+	// Push args + validity back up so the page can persist a staged data-upload
+	// entry. Reading the deep snapshot tracks nested changes (e.g. an S3Object's
+	// `s3` field, or items added to a required array).
+	$effect(() => {
+		onArgsChange?.(script.path, $state.snapshot(args), isValid)
+	})
+	// Offer "Run + downstream" only when a cascade dispatch is wired (dev preview)
+	// and the script actually has subscribers to fan out to.
+	let hasCascade = $derived(!!onRunCascade && downstreamCount > 0)
 
-	// Local clone for SchemaForm's bindable schema prop — the incoming
-	// script is owned by the parent and must not be mutated from here.
-	// Seeded once: the details pane keys this component on script.path, so
-	// switching scripts remounts with a fresh clone.
-	// svelte-ignore state_referenced_locally
-	let formSchema = $state<any>(structuredClone($state.snapshot(script.schema) ?? emptySchema()))
+	// Parse the pipeline header for the partition cadence + materialize target +
+	// ducklake inputs, so a partitioned producer's run form swaps the bare
+	// `partition` string for a cadence-aware date picker with missing/upstream
+	// hints (see PartitionArgControl).
+	let annotations = $derived(parsePipelineAnnotations(script.content ?? ''))
+	let partitionSpec = $derived(annotations.partition)
+	let materializeTarget = $derived<{ kind: AssetKind; path: string } | undefined>(
+		annotations.materialize
+			? { kind: annotations.materialize.targetKind, path: annotations.materialize.targetPath }
+			: undefined
+	)
+	let upstreamAssets = $derived(
+		annotations.triggerAssets.map((a) => ({ kind: a.kind, path: a.path }))
+	)
 
-	async function run() {
-		if (!onRun || running) return
+	// Whether the script declares any inputs — a run then needs the SchemaForm
+	// to collect them, so the form must render even for a plain (non-upload,
+	// non-partitioned) script rather than firing with empty args.
+	let hasInputs = $derived(Object.keys(script.schema?.properties ?? {}).length > 0)
+	// The run form appears for data-upload entry points (S3 picker), for any
+	// partitioned producer (materialize a single partition — available in OSS,
+	// and the picker is where the user chooses which one), and whenever the
+	// script takes inputs the run needs.
+	let showRunForm = $derived(canRun || !!partitionSpec || hasInputs)
+	// A partitioned producer that isn't a data-upload entry is materializing a
+	// partition rather than uploading data — reflect that in the header.
+	let partitionOnly = $derived(!canRun && !!partitionSpec)
+	// `isValid` is only meaningful while a form is mounted to vouch for it; with
+	// no form the run fires with `{}`, which is always valid. Deriving this rather
+	// than reading `isValid` directly avoids a stuck-disabled Run button when a
+	// required-input form leaves `isValid=false` behind as it unmounts on a
+	// same-path re-resolve to an input-less script (we're keyed on script.path).
+	let runValid = $derived(showRunForm ? isValid : true)
+
+	// The details pane keys this component on script.path only, so a same-path
+	// re-resolve (in /pipeline_dev the selected node re-resolves on every WS
+	// bundle) does NOT remount us. `PipelineRunForm` owns the SchemaForm clone and
+	// is keyed on the serialized schema + partition spec below: a local edit that
+	// adds/removes args OR changes the `// partitioned` header (which the schema
+	// alone wouldn't capture) reseeds the run form and re-strips the `partition`
+	// field, while an unchanged re-resolve keeps in-progress input (else the form
+	// could run against a stale schema/spec — e.g. keep a pre-`start=` bucket).
+	let schemaKey = $derived(
+		JSON.stringify(script.schema ?? null) + '|' + JSON.stringify(partitionSpec ?? null)
+	)
+
+	async function run(cascade = false) {
+		const dispatch = cascade ? onRunCascade : onRun
+		if (!dispatch || running) return
 		running = true
 		try {
-			await onRun(script.path, $state.snapshot(args))
+			// No form rendered ⇒ no inputs to collect: run with {} rather than args a
+			// prior (input-carrying) resolve of this same path left behind unmounted.
+			await dispatch(script.path, showRunForm ? $state.snapshot(args) : {})
 		} finally {
 			running = false
 		}
@@ -70,29 +147,67 @@
 	<Splitpanes horizontal class="!h-full">
 		<Pane size={55} minSize={20}>
 			<div class="flex flex-col h-full overflow-auto">
-				{#if canRun}
-					<div class="shrink-0 flex flex-col gap-2 p-3 border-b" data-run-form>
-						<div class="flex items-center justify-between gap-2">
-							<span class="text-xs font-semibold text-emphasis inline-flex items-center gap-1.5">
+				<!-- Run affordance is always the first thing in the node panel so
+				     it's discoverable the moment a script is selected — never
+				     buried below the source. The parameter form renders under it
+				     only when the run actually needs inputs (upload/partition/args). -->
+				<div class="shrink-0 flex flex-col gap-2 p-3 border-b" data-run-form>
+					<div class="flex items-center justify-between gap-2">
+						<span class="text-xs font-semibold text-emphasis inline-flex items-center gap-1.5">
+							{#if partitionOnly}
+								<CalendarClock size={13} class="text-fuchsia-600 dark:text-fuchsia-400" />
+								Materialize a partition
+							{:else if canRun}
 								<Upload size={13} class="text-fuchsia-600 dark:text-fuchsia-400" />
 								Run pipeline
-							</span>
+							{:else}
+								<Play size={13} class="text-fuchsia-600 dark:text-fuchsia-400" />
+								Run this step
+							{/if}
+						</span>
+						<div class="flex items-center gap-1.5">
+							{#if hasCascade}
+								<Button
+									variant="accent-secondary"
+									unifiedSize="sm"
+									startIcon={{ icon: running ? Loader2 : Zap }}
+									onclick={() => run(true)}
+									disabled={isDraft || running || !runValid}
+									title={`Run this script with these inputs, then run its ${downstreamCount} downstream pipeline script${downstreamCount === 1 ? '' : 's'} in order`}
+								>
+									Run + downstream
+								</Button>
+							{/if}
 							<Button
 								variant="accent"
 								unifiedSize="sm"
 								startIcon={{ icon: running ? Loader2 : Play }}
-								onclick={run}
-								disabled={isDraft || running || !isValid || !onRun}
+								onclick={() => run(false)}
+								disabled={isDraft || running || !runValid || !onRun}
 								title={isDraft
 									? 'Deploy this draft to run it for real'
-									: 'Run the deployed script — downstream pipeline scripts cascade for real'}
+									: hasCascade
+										? 'Run just this step — downstream scripts are not triggered'
+										: 'Run the deployed script — downstream pipeline scripts cascade for real'}
 							>
 								{running ? 'Starting…' : 'Run'}
 							</Button>
 						</div>
-						<SchemaForm bind:schema={formSchema} bind:args bind:isValid compact />
 					</div>
-				{/if}
+					{#if showRunForm}
+						{#key schemaKey}
+							<PipelineRunForm
+								schema={script.schema}
+								bind:args
+								bind:isValid
+								{partitionSpec}
+								workspace={$workspaceStore ?? ''}
+								{materializeTarget}
+								{upstreamAssets}
+							/>
+						{/key}
+					{/if}
+				</div>
 				<div class="flex-1 min-h-0 overflow-auto text-xs p-3">
 					<HighlightCode code={script.content ?? ''} language={script.language} />
 				</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/PipelineSetupSignpost.svelte b/frontend/src/lib/components/assets/AssetGraph/PipelineSetupSignpost.svelte
new file mode 100644
index 0000000000..751ecbbdc8
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/PipelineSetupSignpost.svelte
@@ -0,0 +1,120 @@
+<script lang="ts">
+	import { resource } from 'runed'
+	import { WorkspaceService } from '$lib/gen'
+	import { base } from '$lib/base'
+	import { CircleCheck, CircleAlert, Database, HardDrive, ArrowRight } from 'lucide-svelte'
+
+	interface Props {
+		workspace: string
+	}
+	let { workspace }: Props = $props()
+
+	// A pipeline can't materialize anything until the workspace has (a) object
+	// storage for the parquet files and (b) at least one DuckLake catalog. A
+	// brand-new user has no signal these are prerequisites — this first-run
+	// checklist surfaces them and links straight to the settings that fix them.
+	//
+	// Both probes fail SAFE: an errored settings read (e.g. non-admin) resolves
+	// to `undefined`, and an undefined state never renders a red "missing" —
+	// the signpost only asserts "not configured" when it positively knows so.
+	let storage = resource([() => workspace], async ([ws]) => {
+		if (!ws) return undefined
+		try {
+			const s = await WorkspaceService.getSettings({ workspace: ws })
+			return !!s.large_file_storage
+		} catch {
+			return undefined
+		}
+	})
+	let ducklakes = resource([() => workspace], async ([ws]) => {
+		if (!ws) return undefined
+		try {
+			return (await WorkspaceService.listDucklakes({ workspace: ws })).length > 0
+		} catch {
+			return undefined
+		}
+	})
+
+	// Only surface the signpost once we have a definite "not configured" for at
+	// least one prerequisite — never while loading, and never on an errored
+	// probe (which would nag a user who can't act on it anyway).
+	let storageMissing = $derived(storage.current === false)
+	let ducklakeMissing = $derived(ducklakes.current === false)
+	let show = $derived(storageMissing || ducklakeMissing)
+
+	type Step = {
+		done: boolean | undefined
+		icon: typeof Database
+		title: string
+		description: string
+		href: string
+		cta: string
+	}
+	let steps = $derived<Step[]>([
+		{
+			done: storage.current,
+			icon: HardDrive,
+			title: 'Workspace object storage',
+			description:
+				'Materialized partitions and DuckLake data files are written to S3 / object storage.',
+			href: `${base}/workspace_settings?tab=windmill_lfs`,
+			cta: 'Configure object storage'
+		},
+		{
+			done: ducklakes.current,
+			icon: Database,
+			title: 'A DuckLake catalog',
+			description:
+				'DuckLake is the table format pipelines materialize into — add at least one catalog.',
+			href: `${base}/workspace_settings?tab=ducklake`,
+			cta: 'Configure DuckLake'
+		}
+	])
+</script>
+
+{#if show}
+	<div
+		class="flex flex-col gap-3 rounded-lg border border-amber-300 dark:border-amber-900/60 bg-amber-50 dark:bg-amber-950/30 p-4"
+	>
+		<div class="flex items-start gap-2">
+			<CircleAlert size={18} class="text-amber-600 dark:text-amber-400 mt-0.5 shrink-0" />
+			<div class="flex flex-col gap-0.5">
+				<h3 class="text-sm font-semibold text-emphasis">Finish setting up pipelines</h3>
+				<p class="text-xs text-tertiary">
+					Pipelines materialize data into DuckLake tables backed by object storage. Configure the
+					following before your first pipeline can run.
+				</p>
+			</div>
+		</div>
+
+		<ul class="flex flex-col gap-2">
+			{#each steps as step (step.title)}
+				{@const Icon = step.icon}
+				<li class="flex items-center gap-3 rounded-md border bg-surface px-3 py-2">
+					{#if step.done === true}
+						<CircleCheck size={16} class="text-green-600 dark:text-green-400 shrink-0" />
+					{:else if step.done === false}
+						<CircleAlert size={16} class="text-amber-600 dark:text-amber-400 shrink-0" />
+					{:else}
+						<Icon size={16} class="text-tertiary shrink-0" />
+					{/if}
+					<div class="flex flex-col min-w-0 flex-1">
+						<span class="text-xs font-semibold text-primary">{step.title}</span>
+						<span class="text-2xs text-tertiary">{step.description}</span>
+					</div>
+					{#if step.done !== true}
+						<a
+							href={step.href}
+							class="shrink-0 inline-flex items-center gap-1 text-xs text-blue-500 hover:underline whitespace-nowrap"
+						>
+							{step.cta}
+							<ArrowRight size={12} />
+						</a>
+					{:else}
+						<span class="shrink-0 text-2xs text-green-700 dark:text-green-400">Configured</span>
+					{/if}
+				</li>
+			{/each}
+		</ul>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/assets/AssetGraph/RunnableNode.svelte b/frontend/src/lib/components/assets/AssetGraph/RunnableNode.svelte
index 93eeb04163..4cb65ee8f3 100644
--- a/frontend/src/lib/components/assets/AssetGraph/RunnableNode.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/RunnableNode.svelte
@@ -10,7 +10,9 @@
 		Loader2,
 		Play,
 		RotateCw,
+		SquareFunction,
 		Tag,
+		Target,
 		Timer,
 		Trash2,
 		XCircle,
@@ -20,12 +22,13 @@
 	import { preventDefault, stopPropagation } from 'svelte/legacy'
 	import type { GraphUsageKind } from './types'
 	import type { RunnableRunState } from './activeRunnables.svelte'
+	import { parseDurationSecs } from './parsePipelineAnnotations'
 	import { NODE } from '$lib/components/graph/util'
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import type { Item } from '$lib/utils'
 	import { workspaceStore } from '$lib/stores'
-	import { sendUserToast } from '$lib/utils'
+	import { sendUserToast, msToReadableTimeShort } from '$lib/utils'
 
 	interface Props {
 		data: {
@@ -34,8 +37,14 @@
 			in_pipeline?: boolean
 			partition_kind?: 'daily' | 'hourly' | 'weekly' | 'monthly' | 'dynamic'
 			freshness?: string
+			// Completion time (ISO) of the newest successful run visible to
+			// the caller. With `freshness`, drives the fresh/stale chip state.
+			last_success_at?: string
 			tag?: string
 			retry?: { count: number; delay?: string }
+			// Macros this script provides (deployed/drafted `// macros` library).
+			// Non-empty renders the ƒ chip marking the node as a macro library.
+			macros?: { name: string; params: string; is_table: boolean }[]
 			// Last-run status + run count observed this session (from the
 			// folder queue poll). Undefined until the first observed run.
 			runState?: RunnableRunState
@@ -67,6 +76,10 @@
 			// "Discard" for drafts, "Delete…" (which the page maps to its
 			// archive/delete confirmation flow) for persisted scripts.
 			onRequestRemove?: () => void
+			// Wired only for valid bounded-run starts (schedule / manual roots
+			// with downstream). Enters the page's end-node pick mode for a
+			// bounded cascade rooted at this script.
+			onStartBoundedRun?: () => void
 		}
 		// SvelteFlow injects this when the user clicks the node. Combined with
 		// hover state to drive the run-button visibility (same pattern as
@@ -113,9 +126,47 @@
 		}
 	}
 
-	// Cascade option is surfaced directly on the Run button (via a caret +
-	// popover) when `downstreamCount > 0`, so the kebab menu stays focused
-	// on lifecycle actions only.
+	// Freshness verdict: newest successful run (server `last_success_at`,
+	// or a newer one the session poll observed) vs the `// freshness`
+	// window. No verdict (undefined) for drafts — no run history — and for
+	// unparseable windows; the chip then stays neutral like the other
+	// annotation chips.
+	let freshnessWindowS = $derived(data.freshness ? parseDurationSecs(data.freshness) : undefined)
+	// Ticks so a node crosses fresh→stale while the canvas stays open (the
+	// graph payload is static between refetches). Armed only when a verdict
+	// is rendered.
+	let nowMs = $state(Date.now())
+	$effect(() => {
+		if (freshnessWindowS === undefined || data.unsaved) return
+		const id = setInterval(() => (nowMs = Date.now()), 30_000)
+		return () => clearInterval(id)
+	})
+	let lastSuccessMs = $derived.by(() => {
+		const server = data.last_success_at ? new Date(data.last_success_at).getTime() : undefined
+		const polled = data.runState?.lastSuccessAt
+			? new Date(data.runState.lastSuccessAt).getTime()
+			: undefined
+		if (server === undefined) return polled
+		return polled === undefined ? server : Math.max(server, polled)
+	})
+	let freshnessState = $derived.by((): 'fresh' | 'stale' | undefined => {
+		if (freshnessWindowS === undefined || data.unsaved) return undefined
+		if (lastSuccessMs === undefined) return 'stale'
+		return nowMs - lastSuccessMs <= freshnessWindowS * 1000 ? 'fresh' : 'stale'
+	})
+	let freshnessTooltip = $derived.by(() => {
+		const base = `// freshness ${data.freshness}`
+		if (freshnessState === undefined) return base
+		if (lastSuccessMs === undefined) return `${base} — stale: no successful run yet`
+		const ago = msToReadableTimeShort(Math.max(0, nowMs - lastSuccessMs))
+		return freshnessState === 'fresh'
+			? `${base} — fresh: last successful run ${ago} ago`
+			: `${base} — stale: last successful run ${ago} ago`
+	})
+
+	// Cascade + bounded-run options live on the Run button's caret popover
+	// (whenever there's a cascade OR a bounded-run start — see `hasCaret`
+	// below), so the kebab menu stays focused on lifecycle actions only.
 	let menuItems: Item[] = $derived(
 		data.onRequestRemove
 			? [
@@ -155,8 +206,8 @@
 		</span>
 		<!-- Annotation chips share one neutral treatment — the icon carries
 		     the meaning (colors are reserved for feedback, per the brand
-		     guidelines). Only the run-state chip below keeps semantic
-		     colors. -->
+		     guidelines). Only the freshness chip (when it has a verdict)
+		     and the run-state chip below use semantic colors. -->
 		{#if data.partition_kind}
 			<div
 				class="shrink-0 flex items-center gap-0.5 px-1 py-0.5 mr-1 rounded-sm bg-surface-secondary text-secondary"
@@ -166,10 +217,22 @@
 				<span class="text-3xs leading-none">{data.partition_kind}</span>
 			</div>
 		{/if}
+		<!-- Freshness is the one annotation chip that carries feedback (a
+		     fresh/stale verdict against real run history), so like the
+		     run-state chip it uses semantic colors: emerald = within window,
+		     amber = stale. Neutral when there's no verdict (drafts, bad
+		     window value). -->
 		{#if data.freshness}
 			<div
-				class="shrink-0 flex items-center gap-0.5 px-1 py-0.5 mr-1 rounded-sm bg-surface-secondary text-secondary"
-				title={`// freshness ${data.freshness}`}
+				class={twMerge(
+					'shrink-0 flex items-center gap-0.5 px-1 py-0.5 mr-1 rounded-sm',
+					freshnessState === 'fresh'
+						? 'bg-emerald-100 dark:bg-emerald-900/40 text-emerald-700 dark:text-emerald-300'
+						: freshnessState === 'stale'
+							? 'bg-amber-100 dark:bg-amber-900/40 text-amber-700 dark:text-amber-300'
+							: 'bg-surface-secondary text-secondary'
+				)}
+				title={freshnessTooltip}
 			>
 				<Timer size={10} />
 				<span class="text-3xs leading-none">{data.freshness}</span>
@@ -194,6 +257,17 @@
 				<span class="text-3xs leading-none">×{r.count}</span>
 			</div>
 		{/if}
+		{#if data.macros && data.macros.length > 0}
+			<div
+				class="shrink-0 flex items-center gap-0.5 px-1 py-0.5 mr-1 rounded-sm bg-surface-secondary text-secondary"
+				title={`// macros — defines ${data.macros.length} macro${data.macros.length > 1 ? 's' : ''}:\n${data.macros
+					.map((m) => `• ${m.name}(${m.params})${m.is_table ? ' → table' : ''}`)
+					.join('\n')}`}
+			>
+				<SquareFunction size={10} />
+				<span class="text-3xs leading-none">×{data.macros.length}</span>
+			</div>
+		{/if}
 		{#if data.runState}
 			{@const rs = data.runState}
 			<div
@@ -238,6 +312,11 @@
 		     + trigger N downstream". Matches the editor Test split button
 		     so the affordance is identical on both surfaces. -->
 		{@const hasCascade = (data.downstreamCount ?? 0) > 0}
+		<!-- The caret popover opens for either a subscriber cascade OR a
+		     bounded-run start. A pure-reader-only root has no subscriber
+		     downstream (`downstreamCount === 0`) but still gets `onStartBoundedRun`
+		     — without this it would have no visible "Run downstream up to…". -->
+		{@const hasCaret = hasCascade || !!data.onStartBoundedRun}
 		<div class="absolute -left-3 top-1/2 -translate-y-1/2 z-10 flex items-stretch">
 			<button
 				type="button"
@@ -245,7 +324,7 @@
 				disabled={running}
 				class={twMerge(
 					'bg-blue-500 hover:bg-blue-600 disabled:opacity-60 text-white grid place-items-center shadow border-2 border-surface-secondary leading-none',
-					hasCascade ? 'rounded-l-full w-6 h-6 border-r-0' : 'rounded-full w-6 h-6'
+					hasCaret ? 'rounded-l-full w-6 h-6 border-r-0' : 'rounded-full w-6 h-6'
 				)}
 				title={`Run ${data.path}${data.unsaved ? ' (draft, runs as preview)' : ''}`}
 			>
@@ -255,7 +334,7 @@
 					<Play size={14} strokeWidth={2.5} class="translate-x-px" />
 				{/if}
 			</button>
-			{#if hasCascade}
+			{#if hasCaret}
 				<Popover
 					placement="bottom-start"
 					bind:isOpen={cascadeMenuOpen}
@@ -287,36 +366,58 @@
 									</span>
 								</div>
 							</button>
-							<button
-								type="button"
-								class="w-full text-left px-3 py-2 hover:bg-surface-hover flex items-start gap-2"
-								onclick={(e) => {
-									close()
-									void runSelf(e, true)
-								}}
-							>
-								<Zap size={14} class="mt-0.5 shrink-0 text-secondary" />
-								<div class="flex flex-col min-w-0">
-									<span class="font-medium">
-										Run + trigger {data.downstreamCount} downstream
-									</span>
-									<span class="text-2xs text-secondary">
-										Let the asset-trigger cascade fan out to the {data.downstreamCount}
-										subscribed script{data.downstreamCount === 1 ? '' : 's'} after this run succeeds.
-									</span>
-									{#if data.unsaved || (data.downstreamUnsavedCount ?? 0) > 0}
-										<span class="text-2xs text-amber-700 dark:text-amber-400">
-											{#if data.unsaved}
-												Unsaved chain — runs as previews in dependency order.
-											{:else}
-												{data.downstreamUnsavedCount} unsaved — chain runs as previews in dependency
-												order.
-											{/if}
-											Deploy to enable automatic triggering.
+							{#if hasCascade}
+								<button
+									type="button"
+									class="w-full text-left px-3 py-2 hover:bg-surface-hover flex items-start gap-2"
+									onclick={(e) => {
+										close()
+										void runSelf(e, true)
+									}}
+								>
+									<Zap size={14} class="mt-0.5 shrink-0 text-secondary" />
+									<div class="flex flex-col min-w-0">
+										<span class="font-medium">
+											Run + trigger {data.downstreamCount} downstream
 										</span>
-									{/if}
-								</div>
-							</button>
+										<span class="text-2xs text-secondary">
+											Let the asset-trigger cascade fan out to the {data.downstreamCount}
+											subscribed script{data.downstreamCount === 1 ? '' : 's'} after this run succeeds.
+										</span>
+										{#if data.unsaved || (data.downstreamUnsavedCount ?? 0) > 0}
+											<span class="text-2xs text-amber-700 dark:text-amber-400">
+												{#if data.unsaved}
+													Unsaved chain — runs as previews in dependency order.
+												{:else}
+													{data.downstreamUnsavedCount} unsaved — chain runs as previews in dependency
+													order.
+												{/if}
+												Deploy to enable automatic triggering.
+											</span>
+										{/if}
+									</div>
+								</button>
+							{/if}
+							{#if data.onStartBoundedRun}
+								<button
+									type="button"
+									class="w-full text-left px-3 py-2 hover:bg-surface-hover flex items-start gap-2 border-t"
+									onclick={(e) => {
+										e.stopPropagation()
+										cascadeMenuOpen = false
+										data.onStartBoundedRun?.()
+									}}
+								>
+									<Target size={14} class="mt-0.5 shrink-0 text-secondary" />
+									<div class="flex flex-col min-w-0">
+										<span class="font-medium">Run + downstream…</span>
+										<span class="text-2xs text-secondary">
+											Run this script and everything downstream. Or pick end node(s) on the graph to
+											bound the cascade between this script and them.
+										</span>
+									</div>
+								</button>
+							{/if}
 						</div>
 					{/snippet}
 				</Popover>
diff --git a/frontend/src/lib/components/assets/AssetGraph/SchemaHistoryPanel.svelte b/frontend/src/lib/components/assets/AssetGraph/SchemaHistoryPanel.svelte
new file mode 100644
index 0000000000..fc49fd0f33
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/SchemaHistoryPanel.svelte
@@ -0,0 +1,160 @@
+<script lang="ts">
+	// Captured output schema of a managed `// materialize` ducklake asset (parity
+	// gap #2a). Read-only — schema is captured automatically after each
+	// materialize.
+	//
+	// Two shapes, driven by `canEvolve`:
+	// - Whole-table `replace` producer → the schema can change run-to-run, so this
+	//   is a master-detail evolution history: version list (newest first, newest
+	//   auto-selected) on the left, the selected version's columns on the right.
+	// - `append` / `merge` / partitioned producer → the write INSERTs into a
+	//   fixed-schema table, so the schema is pinned at first materialize; there's
+	//   only ever one version, shown as a single current-schema table.
+	import { resource } from 'runed'
+	import { AssetService, type AssetSchemaVersion } from '$lib/gen'
+	import { Button } from '$lib/components/common'
+	import { Loader2, RefreshCw, Lock } from 'lucide-svelte'
+	import { Pane, Splitpanes } from 'svelte-splitpanes'
+
+	interface Props {
+		// The materialized ducklake asset path (`<ducklake>/<table>`).
+		path: string
+		workspace: string
+		// Whether the producer's strategy lets the schema evolve (whole-table
+		// `replace`). False → single fixed-schema view. Defaults to true.
+		canEvolve?: boolean
+	}
+	let { path, workspace, canEvolve = true }: Props = $props()
+
+	// One column of a captured schema version (the generated `columns` element).
+	type SchemaColumn = { name: string; type: string }
+
+	let schemas = resource([() => workspace, () => path], async ([ws, p]) => {
+		if (!ws || !p) return [] as AssetSchemaVersion[]
+		return await AssetService.listAssetSchemas({ workspace: ws, path: p })
+	})
+
+	// The user's explicit pick (undefined until they click). Falls back to the
+	// newest version when unset or when the pick is no longer in the list.
+	let picked = $state<number | undefined>(undefined)
+	let selected = $derived.by(() => {
+		const list = schemas.current
+		const inList = list?.find((s) => s.version === picked)
+		return inList ?? list?.[0]
+	})
+
+	// Keep the version-list pane compact on wide panels (fixed-ish width rather
+	// than a fixed fraction), mirroring the History tab.
+	let paneWidth = $state(0)
+	let listSize = $derived(
+		paneWidth > 0 ? Math.max(24, Math.min(46, Math.round((220 / paneWidth) * 100))) : 34
+	)
+</script>
+
+{#snippet columnsTable(cols: SchemaColumn[])}
+	<table class="w-full text-xs">
+		<thead class="text-tertiary text-left">
+			<tr>
+				<th class="font-medium pb-1 pr-2">Column</th>
+				<th class="font-medium pb-1">Type</th>
+			</tr>
+		</thead>
+		<tbody>
+			{#each cols as col (col.name)}
+				<tr class="border-t">
+					<td class="py-1 pr-2 font-mono">{col.name}</td>
+					<td class="py-1 font-mono text-tertiary">{col.type}</td>
+				</tr>
+			{/each}
+		</tbody>
+	</table>
+{/snippet}
+
+<div class="flex flex-col h-full">
+	<div class="flex items-center justify-between gap-2 px-3 py-2 border-b shrink-0">
+		<span class="text-xs font-semibold text-secondary">Captured schema</span>
+		<Button
+			variant="subtle"
+			unifiedSize="sm"
+			startIcon={{ icon: RefreshCw }}
+			iconOnly
+			onclick={() => schemas.refetch()}
+			title="Refresh"
+		/>
+	</div>
+
+	<div class="flex-1 min-h-0">
+		{#if schemas.loading}
+			<div class="flex items-center gap-2 text-tertiary text-xs p-3">
+				<Loader2 size={14} class="animate-spin" /> Loading schema…
+			</div>
+		{:else if schemas.error}
+			<p class="text-xs text-red-600 p-3">Failed to load: {schemas.error.message}</p>
+		{:else if !schemas.current?.length}
+			<p class="text-xs text-secondary p-3">
+				No schema captured yet. The output schema is recorded automatically after a <span
+					class="font-mono">// materialize</span
+				> run.
+			</p>
+		{:else if !canEvolve}
+			<!-- Fixed-schema producer (append / merge / partitioned): one schema,
+			     no evolution. Show the current columns + why it can't change. -->
+			<div class="h-full overflow-auto p-3">
+				<div
+					class="flex items-start gap-2 text-3xs text-tertiary mb-3 p-2 rounded bg-surface-secondary"
+				>
+					<Lock size={12} class="mt-0.5 shrink-0" />
+					<span
+						>This asset's schema is fixed — an append / merge / partitioned materialize INSERTs into
+						a fixed-schema table, so the columns can't change run-to-run.</span
+					>
+				</div>
+				{#if selected}
+					{@render columnsTable(selected.columns)}
+				{/if}
+			</div>
+		{:else}
+			<div class="h-full" bind:clientWidth={paneWidth}>
+				<Splitpanes class="!h-full">
+					<Pane size={listSize} minSize={20}>
+						<div class="h-full overflow-auto">
+							{#each schemas.current as s, i (s.version)}
+								<button
+									type="button"
+									class="w-full text-left px-3 py-2 border-b {selected?.version === s.version
+										? 'border-blue-400 bg-blue-50 dark:border-blue-500 dark:bg-blue-950/30'
+										: 'hover:bg-surface-hover'}"
+									onclick={() => (picked = s.version)}
+								>
+									<div class="flex items-center justify-between gap-2">
+										<span class="text-xs font-semibold">v{s.version}</span>
+										{#if i === 0}
+											<span
+												class="px-1.5 py-0.5 rounded text-3xs font-medium bg-green-100 text-green-800 dark:bg-green-900/40 dark:text-green-300"
+												>current</span
+											>
+										{/if}
+									</div>
+									<div class="text-3xs text-tertiary mt-0.5">
+										{s.columns.length} column{s.columns.length === 1 ? '' : 's'}
+										{#if s.snapshot_id != null}· snapshot {s.snapshot_id}{/if}
+									</div>
+									<div class="text-3xs text-tertiary">
+										{new Date(s.captured_at).toLocaleString()}
+									</div>
+								</button>
+							{/each}
+						</div>
+					</Pane>
+					<Pane size={100 - listSize} minSize={30}>
+						<div class="h-full overflow-auto p-3">
+							{#if selected}
+								{@render columnsTable(selected.columns)}
+							{/if}
+						</div>
+					</Pane>
+				</Splitpanes>
+			</div>
+		{/if}
+	</div>
+</div>
diff --git a/frontend/src/lib/components/assets/AssetGraph/TriggerNode.svelte b/frontend/src/lib/components/assets/AssetGraph/TriggerNode.svelte
index 6d8f1224ae..98307013c4 100644
--- a/frontend/src/lib/components/assets/AssetGraph/TriggerNode.svelte
+++ b/frontend/src/lib/components/assets/AssetGraph/TriggerNode.svelte
@@ -60,7 +60,7 @@
 	import { Handle, Position } from '@xyflow/svelte'
 	import { NODE } from '$lib/components/graph/util'
 	import { twMerge } from 'tailwind-merge'
-	import { AlertTriangle, EllipsisVertical, Trash2 } from 'lucide-svelte'
+	import { AlertTriangle, CheckCircle2, EllipsisVertical, Target, Trash2 } from 'lucide-svelte'
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
 	import { stopPropagation, preventDefault } from 'svelte/legacy'
 	import type { Item } from '$lib/utils'
@@ -101,6 +101,9 @@
 			// auto-generated S3 picker lets the user upload + run) instead of
 			// rendering a "missing" placeholder.
 			onOpenDataUpload?: (scriptPath: string) => void
+			// True once a file is staged for this data_upload entry — renders the
+			// node green so the user knows the pipeline can run (see WIN-2129).
+			ready?: boolean
 			// Page-supplied dispatcher to open the matching native trigger
 			// drawer in edit mode for an attached (non-missing) trigger.
 			// `triggerPath` is the trigger row's path (e.g. the mqtt_trigger
@@ -113,6 +116,12 @@
 			// trigger. Confirmation is the caller's responsibility — the
 			// node just exposes the entry point on the kebab menu.
 			onDeleteTrigger?: (kind: NativeTriggerKind, triggerPath: string) => void
+			// Wired by the canvas only when this trigger's target script is a
+			// valid bounded-run start (schedule / manual root) with downstream.
+			// Entering the page's end-node pick mode rooted at that script — the
+			// View-mode entry point for bounded runs (the script's own Run-button
+			// caret is Edit-only).
+			onStartBoundedRun?: () => void
 		}
 	}
 	let { data }: Props = $props()
@@ -143,6 +152,10 @@
 	// data_upload routes through its own handler — clicking opens the target
 	// script's run form (with the auto-generated S3 picker).
 	let canOpenDataUpload = $derived(isDataUpload && !!data.runnable_path && !!data.onOpenDataUpload)
+	// A staged upload turns the node green (ready to run); before that it stays
+	// on the neutral surface with the "upload a file" prompt.
+	let dataUploadReady = $derived(isDataUpload && data.ready === true)
+	let DataUploadIcon = $derived(dataUploadReady ? CheckCircle2 : style.icon)
 	// Schedule + the other native kinds all have dedicated editors. Webhook and
 	// data_upload are excluded — they route through their own open handlers.
 	let canCreate = $derived(
@@ -173,8 +186,17 @@
 			!!data.onDeleteTrigger
 	)
 
-	let menuItems: Item[] = $derived(
-		canDelete
+	let menuItems: Item[] = $derived([
+		...(data.onStartBoundedRun
+			? [
+					{
+						displayName: 'Run + downstream…',
+						icon: Target,
+						action: () => data.onStartBoundedRun?.()
+					}
+				]
+			: []),
+		...(canDelete
 			? [
 					{
 						displayName: 'Delete…',
@@ -182,12 +204,12 @@
 						type: 'delete' as const,
 						action: () => {
 							if (!data.ref || !data.onDeleteTrigger) return
-							data.onDeleteTrigger(data.kind as NativeTriggerKind, data.ref)
+							data.onDeleteTrigger?.(data.kind as NativeTriggerKind, data.ref)
 						}
 					}
 				]
-			: []
-	)
+			: [])
+	])
 
 	function handleMissingClick() {
 		if (!canCreate || !data.runnable_path || !data.onCreateMissingTrigger) return
@@ -291,26 +313,47 @@
 	{:else if canOpenDataUpload}
 		<!-- Data upload: UI-first entry point (no trigger row). Clicking the
 		     node opens the target script's run form, where the auto-generated
-		     S3 picker lets the user upload a file and run the pipeline. Styled
-		     like an attached trigger, never the red "missing" state. -->
+		     S3 picker lets the user upload a file and run the pipeline. Goes
+		     green once a file is staged (ready), so "Run pipeline" can proceed;
+		     until then it stays neutral with an "upload a file" prompt. Never
+		     the red "missing" state. -->
 		<button
 			type="button"
 			onclick={handleDataUploadClick}
 			class={twMerge(
 				'flex items-center rounded-md drop-shadow-sm overflow-hidden outline outline-1 w-full text-left',
-				style.bg,
-				data.unsaved ? `opacity-80 ${style.borderUnsaved}` : style.border,
+				dataUploadReady
+					? 'bg-green-50 dark:bg-green-900/30 outline-green-500 dark:outline-green-600'
+					: style.bg,
+				dataUploadReady ? '' : data.unsaved ? `opacity-80 ${style.borderUnsaved}` : style.border,
 				'hover:brightness-95 dark:hover:brightness-110 transition-[filter]'
 			)}
 			style="width: {NODE.width}px; min-height: {NODE.height}px;"
-			title={`Data upload for ${data.runnable_path ?? ''} — click to open the run form and upload a file`}
+			title={dataUploadReady
+				? `Data upload for ${data.runnable_path ?? ''} — a file is staged; the pipeline is ready to run. Click to change it.`
+				: `Data upload for ${data.runnable_path ?? ''} — click to open the run form and upload a file`}
 		>
-			<Icon size={14} class={`shrink-0 ml-2 mr-2 ${style.iconText}`} />
+			<DataUploadIcon
+				size={14}
+				class={`shrink-0 ml-2 mr-2 ${dataUploadReady ? 'text-green-600 dark:text-green-400' : style.iconText}`}
+			/>
 			<div class="flex flex-col min-w-0 flex-1 pr-2 py-0.5 leading-tight">
-				<span class="text-3xs uppercase tracking-wide truncate text-tertiary">
-					{style.label}
+				<span
+					class={twMerge(
+						'text-3xs uppercase tracking-wide truncate',
+						dataUploadReady ? 'text-green-700 dark:text-green-400' : 'text-tertiary'
+					)}
+				>
+					{style.label}{dataUploadReady ? ' · ready' : ''}
+				</span>
+				<span
+					class={twMerge(
+						'text-2xs font-mono truncate',
+						dataUploadReady ? 'text-green-700 dark:text-green-400' : 'text-emphasis'
+					)}
+				>
+					{dataUploadReady ? 'File staged' : 'Upload & run'}
 				</span>
-				<span class="text-2xs font-mono truncate text-emphasis"> Upload & run </span>
 			</div>
 		</button>
 	{:else}
diff --git a/frontend/src/lib/components/assets/AssetGraph/activeRunnables.svelte.ts b/frontend/src/lib/components/assets/AssetGraph/activeRunnables.svelte.ts
index 917e21766a..f6682804c7 100644
--- a/frontend/src/lib/components/assets/AssetGraph/activeRunnables.svelte.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/activeRunnables.svelte.ts
@@ -1,8 +1,15 @@
 import { JobService } from '$lib/gen'
 
 export type RunStatus = 'running' | 'success' | 'failure'
-/** Per-runnable badge state: latest run status + runs observed this session. */
-export type RunnableRunState = { status: RunStatus; runs: number }
+/**
+ * Per-runnable badge state: latest run status + runs observed this session.
+ * `lastSuccessAt` is the completion time (start + duration when the listing
+ * carries it, else start as a conservative lower bound) of the newest
+ * successful run seen by the poll — lets the freshness chip go green right
+ * after an in-session run, ahead of the next graph refetch (whose
+ * `last_success_at` would carry it).
+ */
+export type RunnableRunState = { status: RunStatus; runs: number; lastSuccessAt?: string }
 
 export type EventStatus = 'queued' | 'running' | 'success' | 'failure'
 /** One folder activity-log row (a job observed by the poll). */
@@ -14,6 +21,12 @@ export type PipelineEvent = {
 	/** What started it, as far as the job listing reveals. */
 	source: 'schedule' | 'run'
 	at: string
+	/**
+	 * Completion time (start + duration) for completed rows. The freshness
+	 * chip compares against completion — `at` is the start time and would
+	 * read a long run as older than its output actually is.
+	 */
+	completedAt?: string
 	/**
 	 * Queued jobs: when the job is due to start. A future value means a
 	 * scheduled run waiting for its cron tick, not pipeline activity.
@@ -45,7 +58,8 @@ function statesEq(a: Map<string, RunnableRunState>, b: Map<string, RunnableRunSt
 	if (a.size !== b.size) return false
 	for (const [k, v] of a) {
 		const w = b.get(k)
-		if (!w || w.status !== v.status || w.runs !== v.runs) return false
+		if (!w || w.status !== v.status || w.runs !== v.runs || w.lastSuccessAt !== v.lastSuccessAt)
+			return false
 	}
 	return true
 }
@@ -128,7 +142,7 @@ export function useActiveRunnableIds(
 	// keeps showing the last status while idle; only `dispose()` clears them.
 	const completedHistory = new Map<
 		string,
-		{ runs: number; lastStatus: RunStatus; lastTs: string }
+		{ runs: number; lastStatus: RunStatus; lastTs: string; lastSuccessTs?: string }
 	>()
 	const countedJobIds = new Set<string>()
 	// Job ids we've observed in-flight at least once. The catch-up pulse is
@@ -241,10 +255,25 @@ export function useActiveRunnableIds(
 						const prev = completedHistory.get(id)
 						const status: RunStatus = (j as any).success === true ? 'success' : 'failure'
 						const ts = startedTs ?? new Date(pollStartedMs).toISOString()
+						// Freshness compares against COMPLETION time (that's
+						// when the output materialized — the server-side
+						// last_success_at is completed_at too). The listing
+						// only carries started_at, so add duration_ms; when
+						// absent, the start is a conservative lower bound
+						// (errs stale, never false-fresh).
+						const durationMs = (j as any).duration_ms
+						const doneTs =
+							typeof durationMs === 'number' && startedTs
+								? new Date(new Date(startedTs).getTime() + durationMs).toISOString()
+								: ts
 						completedHistory.set(id, {
 							runs: (prev?.runs ?? 0) + 1,
 							lastStatus: !prev || ts >= prev.lastTs ? status : prev.lastStatus,
-							lastTs: !prev || ts >= prev.lastTs ? ts : prev.lastTs
+							lastTs: !prev || ts >= prev.lastTs ? ts : prev.lastTs,
+							lastSuccessTs:
+								status === 'success' && (!prev?.lastSuccessTs || doneTs >= prev.lastSuccessTs)
+									? doneTs
+									: prev?.lastSuccessTs
 						})
 					}
 				}
@@ -267,6 +296,10 @@ export function useActiveRunnableIds(
 								: 'failure',
 						source: (j as any).schedule_path ? 'schedule' : 'run',
 						at: startedTs ?? new Date(pollStartedMs).toISOString(),
+						completedAt:
+							!isQueued && typeof (j as any).duration_ms === 'number' && startedTs
+								? new Date(new Date(startedTs).getTime() + (j as any).duration_ms).toISOString()
+								: undefined,
 						scheduledFor: isQueued ? ((j as any).scheduled_for as string | undefined) : undefined
 					})
 				}
@@ -289,7 +322,11 @@ export function useActiveRunnableIds(
 		// previous badge state until a worker picks the job up.
 		const snap = new Map<string, RunnableRunState>()
 		for (const [id, h] of completedHistory) {
-			snap.set(id, { status: runningThisTick.has(id) ? 'running' : h.lastStatus, runs: h.runs })
+			snap.set(id, {
+				status: runningThisTick.has(id) ? 'running' : h.lastStatus,
+				runs: h.runs,
+				lastSuccessAt: h.lastSuccessTs
+			})
 		}
 		for (const id of runningThisTick) {
 			if (!snap.has(id)) snap.set(id, { status: 'running', runs: 0 })
diff --git a/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.test.ts b/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.test.ts
index a5a92f61c2..24e7d4c2da 100644
--- a/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.test.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.test.ts
@@ -38,7 +38,14 @@ describe('layoutAssetGraph (tidy-tree with join breaks)', () => {
 		// stays strictly left of every node of the right branch.
 		const pos = layoutAssetGraph({
 			nodes: [n('root'), n('a'), n('b'), n('a1'), n('a2'), n('a3'), n('b1')],
-			edges: [e('root', 'a'), e('root', 'b'), e('a', 'a1'), e('a', 'a2'), e('a', 'a3'), e('b', 'b1')]
+			edges: [
+				e('root', 'a'),
+				e('root', 'b'),
+				e('a', 'a1'),
+				e('a', 'a2'),
+				e('a', 'a3'),
+				e('b', 'b1')
+			]
 		})
 		const leftMax = Math.max(...['a', 'a1', 'a2', 'a3'].map((id) => pos.get(id)!.x))
 		const rightMin = Math.min(...['b', 'b1'].map((id) => pos.get(id)!.x))
@@ -83,14 +90,37 @@ describe('layoutAssetGraph (tidy-tree with join breaks)', () => {
 		}
 	})
 
-	it('falls back to a grid on cyclic input', () => {
+	it('lays a 2-cycle out as a chain (feedback edge dropped, no grid)', () => {
 		const pos = layoutAssetGraph({
 			nodes: [n('a'), n('b')],
 			edges: [e('a', 'b'), e('b', 'a')]
 		})
-		expect(pos.size).toBe(2)
-		expect(pos.get('a')).toBeDefined()
-		expect(pos.get('b')).toBeDefined()
+		// First-in-input wins the top slot; the b→a feedback edge is ignored.
+		expect(pos.get('a')!.y).toBeLessThan(pos.get('b')!.y)
+		expect(pos.get('a')!.x).toBe(pos.get('b')!.x)
+	})
+
+	it('keeps the acyclic part of a graph layered when one cycle exists', () => {
+		// root → a ⇄ b → leaf: the a⇄b cycle must not degrade root/leaf layering.
+		const pos = layoutAssetGraph({
+			nodes: [n('root'), n('a'), n('b'), n('leaf')],
+			edges: [e('root', 'a'), e('a', 'b'), e('b', 'a'), e('b', 'leaf')]
+		})
+		expect(pos.get('root')!.y).toBeLessThan(pos.get('a')!.y)
+		expect(pos.get('a')!.y).toBeLessThan(pos.get('b')!.y)
+		expect(pos.get('b')!.y).toBeLessThan(pos.get('leaf')!.y)
+		// A linear chain stays in one column.
+		expect(new Set(['root', 'a', 'b', 'leaf'].map((id) => pos.get(id)!.x)).size).toBe(1)
+	})
+
+	it('handles a longer cycle without dropping nodes', () => {
+		const pos = layoutAssetGraph({
+			nodes: [n('a'), n('b'), n('c')],
+			edges: [e('a', 'b'), e('b', 'c'), e('c', 'a')]
+		})
+		expect(pos.size).toBe(3)
+		const ys = ['a', 'b', 'c'].map((id) => pos.get(id)!.y)
+		expect(new Set(ys).size).toBe(3)
 	})
 
 	it('packs disjoint components side by side without overlap', () => {
diff --git a/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.ts b/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.ts
index cf55db6e0a..c9d7d60355 100644
--- a/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/assetGraphLayout.ts
@@ -53,8 +53,8 @@ interface Band {
 //
 // y comes from longest-path layering (same top-down orientation as before:
 // producers above, assets in the middle, consumers below). Returns positions
-// (band centers) normalized so the component's min x,y = 0. Throws on cyclic
-// input (caller falls back to a grid for the whole graph).
+// (band centers) normalized so the component's min x,y = 0. Cyclic input is
+// handled by dropping feedback edges (see the Kahn step below).
 function layoutComponent(
 	nodes: GraphInput['nodes'],
 	edges: GraphInput['edges']
@@ -76,21 +76,42 @@ function layoutComponent(
 		if (!parents.get(e.target)!.includes(e.source)) parents.get(e.target)!.push(e.source)
 	}
 
-	// Kahn topological order — also the cycle guard.
+	// Kahn topological order. Cycles don't abort the layout: when the queue
+	// drains with nodes left, the unplaced node with the fewest outstanding
+	// parents (first in input order on ties) is forced into the order and its
+	// not-yet-placed parent edges are dropped as feedback edges — layering and
+	// tree-building then operate on the resulting DAG while the rendered graph
+	// keeps every edge. (The caller already resolves write⇄read 2-cycles by
+	// omitting the read direction; this handles any longer cycle.)
 	const indeg = new Map<string, number>()
 	for (const n of nodes) indeg.set(n.id, parents.get(n.id)!.length)
 	const queue = nodes.filter((n) => indeg.get(n.id) === 0).map((n) => n.id)
+	const placed = new Set<string>()
 	const topo: string[] = []
-	while (queue.length) {
+	while (topo.length < nodes.length) {
+		if (queue.length === 0) {
+			let pick: string | undefined
+			for (const n of nodes) {
+				if (placed.has(n.id)) continue
+				if (pick === undefined || indeg.get(n.id)! < indeg.get(pick)!) pick = n.id
+			}
+			parents.set(
+				pick!,
+				parents.get(pick!)!.filter((p) => placed.has(p))
+			)
+			queue.push(pick!)
+		}
 		const cur = queue.shift()!
+		if (placed.has(cur)) continue
+		placed.add(cur)
 		topo.push(cur)
 		for (const c of children.get(cur)!) {
+			if (placed.has(c)) continue
 			const d = indeg.get(c)! - 1
 			indeg.set(c, d)
 			if (d === 0) queue.push(c)
 		}
 	}
-	if (topo.length !== nodes.length) throw new Error('cyclic asset graph')
 
 	// Longest-path layering: a node sits one layer below its lowest parent.
 	const layer = new Map<string, number>()
@@ -141,8 +162,7 @@ function layoutComponent(
 		out.set(id, { x: left + w / 2, y: layer.get(id)! * LAYER_H })
 		const kids = treeChildren.get(id)!
 		if (kids.length === 0) return
-		const kidsW =
-			kids.reduce((acc, k) => acc + W.get(k)!, 0) + SIBLING_GAP * (kids.length - 1)
+		const kidsW = kids.reduce((acc, k) => acc + W.get(k)!, 0) + SIBLING_GAP * (kids.length - 1)
 		let cursor = left + (w - kidsW) / 2
 		for (const k of kids) {
 			placeTree(k, cursor)
@@ -221,7 +241,8 @@ function layoutComponent(
 // disjoint components, so it's excluded from component detection and instead
 // re-placed centered one layer above the whole packed graph.
 //
-// Falls back to a stable grid if the component layout throws (cyclic inputs).
+// Falls back to a stable grid if the component layout throws (defensive —
+// cycles are already absorbed by feedback-edge dropping in layoutComponent).
 export function layoutAssetGraph(graph: GraphInput, anchorId?: string): Map<string, Positioned> {
 	const byId = new Map<string, Positioned>()
 	if (graph.nodes.length === 0) return byId
diff --git a/frontend/src/lib/components/assets/AssetGraph/backfillRun.test.ts b/frontend/src/lib/components/assets/AssetGraph/backfillRun.test.ts
new file mode 100644
index 0000000000..69fc6f9728
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/backfillRun.test.ts
@@ -0,0 +1,118 @@
+import { describe, expect, it } from 'vitest'
+import { runBackfill, type BackfillSliceState } from './backfillRun'
+
+// Deterministic fake backend: launch resolves with `job:<partition>`,
+// waitTerminal resolves per the `results` table (default success), recording
+// launch order.
+function fakeRunner(results: Record<string, 'success' | 'failure'> = {}) {
+	const launched: string[] = []
+	return {
+		launched,
+		launch: async (partition: string) => {
+			launched.push(partition)
+			return `job:${partition}`
+		},
+		waitTerminal: async (jobId: string) => results[jobId.slice(4)] ?? ('success' as const)
+	}
+}
+
+describe('runBackfill', () => {
+	it('runs slices sequentially in order and reports ok', async () => {
+		const r = fakeRunner()
+		const res = await runBackfill({
+			partitions: ['2026-06-26', '2026-06-27', '2026-06-29'],
+			launch: r.launch,
+			waitTerminal: r.waitTerminal
+		})
+		expect(r.launched).toEqual(['2026-06-26', '2026-06-27', '2026-06-29'])
+		expect(res.ok).toBe(true)
+		expect(res.cancelled).toBe(false)
+		expect(res.slices.map((s) => s.status)).toEqual(['success', 'success', 'success'])
+		expect(res.slices.map((s) => s.jobId)).toEqual([
+			'job:2026-06-26',
+			'job:2026-06-27',
+			'job:2026-06-29'
+		])
+	})
+
+	it('continues past a failed slice — each slice is independent', async () => {
+		const r = fakeRunner({ '2026-06-27': 'failure' })
+		const res = await runBackfill({
+			partitions: ['2026-06-26', '2026-06-27', '2026-06-29'],
+			launch: r.launch,
+			waitTerminal: r.waitTerminal
+		})
+		expect(r.launched).toEqual(['2026-06-26', '2026-06-27', '2026-06-29'])
+		expect(res.ok).toBe(false)
+		expect(res.slices.map((s) => s.status)).toEqual(['success', 'failure', 'success'])
+	})
+
+	it('records a launch error as slice failure and keeps going', async () => {
+		const r = fakeRunner()
+		const res = await runBackfill({
+			partitions: ['a', 'b'],
+			launch: async (p) => {
+				if (p === 'a') throw new Error('boom')
+				return r.launch(p)
+			},
+			waitTerminal: r.waitTerminal
+		})
+		expect(res.slices[0]).toMatchObject({ status: 'failure', error: 'boom' })
+		expect(res.slices[1].status).toBe('success')
+	})
+
+	it('stops before the next launch when cancelled, leaving the rest pending', async () => {
+		const r = fakeRunner()
+		let done = 0
+		const res = await runBackfill({
+			partitions: ['a', 'b', 'c'],
+			launch: r.launch,
+			waitTerminal: async (id) => {
+				done++
+				return r.waitTerminal(id)
+			},
+			isCancelled: () => done >= 1
+		})
+		expect(r.launched).toEqual(['a'])
+		expect(res.cancelled).toBe(true)
+		expect(res.ok).toBe(false)
+		expect(res.slices.map((s) => s.status)).toEqual(['success', 'pending', 'pending'])
+	})
+
+	it('cancels a job whose launch raced the cancellation', async () => {
+		let cancelled = false
+		const cancelledJobs: string[] = []
+		const res = await runBackfill({
+			partitions: ['a', 'b'],
+			launch: async (p) => {
+				// The user clicks cancel while the launch request is in flight —
+				// there is no job id to cancel yet.
+				cancelled = true
+				return `job:${p}`
+			},
+			waitTerminal: async () => 'failure',
+			isCancelled: () => cancelled,
+			cancelJob: async (id) => {
+				cancelledJobs.push(id)
+			}
+		})
+		expect(cancelledJobs).toEqual(['job:a'])
+		expect(res.cancelled).toBe(true)
+		expect(res.slices.map((s) => s.status)).toEqual(['failure', 'pending'])
+	})
+
+	it('emits a snapshot per transition, never mutating earlier snapshots', async () => {
+		const r = fakeRunner()
+		const snapshots: BackfillSliceState[][] = []
+		await runBackfill({
+			partitions: ['a'],
+			launch: r.launch,
+			waitTerminal: r.waitTerminal,
+			onUpdate: (s) => snapshots.push(s)
+		})
+		// initial pending, running, running+jobId, terminal
+		expect(snapshots.map((s) => s[0].status)).toEqual(['pending', 'running', 'running', 'success'])
+		expect(snapshots[1][0].jobId).toBeUndefined()
+		expect(snapshots[2][0].jobId).toBe('job:a')
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/backfillRun.ts b/frontend/src/lib/components/assets/AssetGraph/backfillRun.ts
new file mode 100644
index 0000000000..51fbc9664b
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/backfillRun.ts
@@ -0,0 +1,83 @@
+// Client-side orchestration of a partition-range backfill (enterprise): one
+// deployed run of the producing script per slice, launched with an explicit
+// `partition` arg (the worker only resolves a partition when the arg is
+// absent, so the caller-provided value wins). Slices run sequentially —
+// concurrent materializations of the same ducklake table would contend on
+// the catalog commit — and a failed slice does not stop the rest: each slice
+// is independent, and the missing/failed set is simply the next worklist.
+//
+// Pure module (no Svelte runes) so the loop is unit-testable; reactive
+// progress is delivered via `onUpdate` snapshots, mirroring
+// `cascadeOrchestrator.ts`.
+
+export type BackfillSliceStatus = 'pending' | 'running' | 'success' | 'failure'
+
+export type BackfillSliceState = {
+	partition: string
+	status: BackfillSliceStatus
+	jobId?: string
+	error?: string
+}
+
+export type BackfillRunOptions = {
+	/** Partition values to materialize, in run order. */
+	partitions: string[]
+	/** Launch one run of the producer with the given partition arg; returns the job id. */
+	launch: (partition: string) => Promise<string>
+	/** Resolve once the job reaches a terminal state. */
+	waitTerminal: (jobId: string) => Promise<'success' | 'failure'>
+	/** Snapshot of all slice states, emitted on every transition. */
+	onUpdate?: (slices: BackfillSliceState[]) => void
+	/** Checked before each launch; a true stop leaves the remaining slices 'pending'. */
+	isCancelled?: () => boolean
+	/**
+	 * Cancel a job whose launch raced the cancellation — the cancel click had
+	 * no job id to act on yet, so the loop cancels it as soon as the id
+	 * arrives. Must not throw (the job may already be terminal).
+	 */
+	cancelJob?: (jobId: string) => Promise<void>
+}
+
+export type BackfillRunResult = {
+	/** True when every slice ran and succeeded. */
+	ok: boolean
+	/** True when the loop stopped early on `isCancelled`. */
+	cancelled: boolean
+	slices: BackfillSliceState[]
+}
+
+export async function runBackfill(opts: BackfillRunOptions): Promise<BackfillRunResult> {
+	const { partitions, launch, waitTerminal, onUpdate, isCancelled, cancelJob } = opts
+	const slices: BackfillSliceState[] = partitions.map((partition) => ({
+		partition,
+		status: 'pending'
+	}))
+	const emit = () => onUpdate?.(slices.map((s) => ({ ...s })))
+	emit()
+	let cancelled = false
+	for (const slice of slices) {
+		if (isCancelled?.()) {
+			cancelled = true
+			break
+		}
+		slice.status = 'running'
+		emit()
+		try {
+			slice.jobId = await launch(slice.partition)
+			emit()
+			if (isCancelled?.() && cancelJob) {
+				await cancelJob(slice.jobId)
+			}
+			slice.status = await waitTerminal(slice.jobId)
+		} catch (e) {
+			slice.status = 'failure'
+			slice.error = e instanceof Error ? e.message : String(e)
+		}
+		emit()
+	}
+	return {
+		ok: !cancelled && slices.every((s) => s.status === 'success'),
+		cancelled,
+		slices
+	}
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/boundedCascade.test.ts b/frontend/src/lib/components/assets/AssetGraph/boundedCascade.test.ts
new file mode 100644
index 0000000000..e4692de6b8
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/boundedCascade.test.ts
@@ -0,0 +1,523 @@
+import { describe, expect, it } from 'vitest'
+import type { AssetGraphResponse, AssetGraphTrigger, NativeTriggerKind } from './types'
+import {
+	ancestors,
+	assetUriToNodeId,
+	boundedSet,
+	buildLineageDag,
+	buildLineageDownstreamMap,
+	descendants,
+	nonAutorunTriggerScripts,
+	reachableCutting,
+	scriptNodeId,
+	scriptsOf,
+	validStarts,
+	validFromStarts
+} from './boundedCascade'
+import { computeInducedSchedule } from './graphTraversal'
+
+type W = [script: string, asset: string] // producer write edge (datatable)
+type R = [script: string, asset: string] // pure-read edge (datatable)
+type S = [script: string, asset: string] // `// on <asset>` subscription
+type T = [producer: string, tested: string, asset: string] // `// data_test` ordering edge
+
+function graph(opts: {
+	scripts?: string[]
+	writes?: W[]
+	reads?: R[]
+	subs?: S[]
+	tests?: T[]
+	native?: Array<[kind: NativeTriggerKind, script: string]>
+}): AssetGraphResponse {
+	const { scripts = [], writes = [], reads = [], subs = [], tests = [], native = [] } = opts
+	const triggers: AssetGraphTrigger[] = [
+		...subs.map(
+			([s, a]) =>
+				({
+					trigger_kind: 'asset',
+					asset_kind: 'datatable',
+					asset_path: a,
+					runnable_kind: 'script',
+					runnable_path: s
+				}) as const
+		),
+		...native.map(
+			([kind, s]) =>
+				({ trigger_kind: kind, runnable_kind: 'script', runnable_path: s }) as AssetGraphTrigger
+		)
+	]
+	return {
+		assets: [],
+		runnables: scripts.map((p) => ({ path: p, usage_kind: 'script' as const })),
+		edges: [
+			...writes.map(([s, a]) => ({
+				runnable_path: s,
+				runnable_kind: 'script' as const,
+				asset_kind: 'datatable' as const,
+				asset_path: a,
+				access_type: 'w' as const
+			})),
+			...reads.map(([s, a]) => ({
+				runnable_path: s,
+				runnable_kind: 'script' as const,
+				asset_kind: 'datatable' as const,
+				asset_path: a,
+				access_type: 'r' as const
+			}))
+		],
+		triggers,
+		test_edges: tests.map(([producer, tested, a]) => ({
+			producer_kind: 'script' as const,
+			producer_path: producer,
+			runnable_kind: 'script' as const,
+			runnable_path: tested,
+			asset_kind: 'datatable' as const,
+			asset_path: a
+		}))
+	}
+}
+
+const sn = scriptNodeId
+const asset = (p: string) => `datatable:${p}`
+
+describe('buildLineageDag', () => {
+	it('links producer → asset → subscriber and asset → reader', () => {
+		// a writes x; b subscribes to x; c reads x.
+		const g = graph({ writes: [['a', 'x']], subs: [['b', 'x']], reads: [['c', 'x']] })
+		const dag = buildLineageDag(g)
+		expect([...(dag.down.get(sn('a')) ?? [])]).toEqual([asset('x')])
+		expect([...(dag.down.get(asset('x')) ?? [])].sort()).toEqual([sn('b'), sn('c')])
+	})
+
+	it('treats rw as production only (no self-cycle through the asset)', () => {
+		const g: AssetGraphResponse = {
+			assets: [],
+			runnables: [{ path: 'u', usage_kind: 'script' }],
+			edges: [
+				{
+					runnable_path: 'u',
+					runnable_kind: 'script',
+					asset_kind: 'datatable',
+					asset_path: 'x',
+					access_type: 'rw'
+				}
+			],
+			triggers: []
+		}
+		const dag = buildLineageDag(g)
+		expect([...(dag.down.get(sn('u')) ?? [])]).toEqual([asset('x')])
+		expect(dag.up.get(sn('u'))).toBeUndefined() // asset is not upstream of its own writer
+	})
+
+	it('routes a data_test ordering edge through the referenced asset', () => {
+		// prod writes x; tested has a `// data_test` against x (prod → tested edge).
+		// The DAG must place x (and thus prod) upstream of tested so a cascade
+		// materializes x first.
+		const g = graph({
+			scripts: ['prod', 'tested'],
+			writes: [['prod', 'x']],
+			tests: [['prod', 'tested', 'x']]
+		})
+		const dag = buildLineageDag(g)
+		// asset x → tested (routed through the asset, not a direct prod → tested hop)
+		expect([...(dag.down.get(asset('x')) ?? [])]).toEqual([sn('tested')])
+		// prod → x → tested makes prod an ancestor of tested.
+		expect(ancestors(dag, sn('tested'))).toEqual(new Set([asset('x'), sn('prod')]))
+	})
+})
+
+describe('ancestors / descendants', () => {
+	it('walks transitively over scripts and assets', () => {
+		// a → x → b → y → c
+		const g = graph({
+			writes: [
+				['a', 'x'],
+				['b', 'y']
+			],
+			subs: [
+				['b', 'x'],
+				['c', 'y']
+			]
+		})
+		const dag = buildLineageDag(g)
+		expect(descendants(dag, sn('a'))).toEqual(new Set([asset('x'), sn('b'), asset('y'), sn('c')]))
+		expect(ancestors(dag, sn('c'))).toEqual(new Set([asset('y'), sn('b'), asset('x'), sn('a')]))
+	})
+
+	it('excludes the start node even on a cycle back to it', () => {
+		// a → x → b → y → a (cycle): descendants(a) must not contain a.
+		const g = graph({
+			writes: [
+				['a', 'x'],
+				['b', 'y']
+			],
+			subs: [
+				['b', 'x'],
+				['a', 'y']
+			]
+		})
+		const dag = buildLineageDag(g)
+		expect(descendants(dag, sn('a')).has(sn('a'))).toBe(false)
+		expect(ancestors(dag, sn('a')).has(sn('a'))).toBe(false)
+	})
+})
+
+describe('boundedSet', () => {
+	// a → x → b → y → c → z → d  (linear chain through assets)
+	const chain = () =>
+		graph({
+			writes: [
+				['a', 'x'],
+				['b', 'y'],
+				['c', 'z']
+			],
+			subs: [
+				['b', 'x'],
+				['c', 'y'],
+				['d', 'z']
+			]
+		})
+
+	it('stops at a single end node (script)', () => {
+		const dag = buildLineageDag(chain())
+		const res = boundedSet(dag, sn('a'), [sn('c')])
+		// path a..c includes a,x,b,y,c — not z or d.
+		expect(scriptsOf(res.nodes).sort()).toEqual(['a', 'b', 'c'])
+		expect(res.nodes.has(asset('z'))).toBe(false)
+		expect(res.droppedEnds).toEqual([])
+	})
+
+	it('supports an asset as the end bound', () => {
+		const dag = buildLineageDag(chain())
+		const res = boundedSet(dag, sn('a'), [asset('y')])
+		// up to datatable://y → a, b produced it.
+		expect(scriptsOf(res.nodes).sort()).toEqual(['a', 'b'])
+	})
+
+	it('unions multiple ends', () => {
+		// diamond: a → b and a → c, both → d. Bound to {b, c} excludes d.
+		const g = graph({
+			writes: [
+				['a', 'xa'],
+				['b', 'xb'],
+				['c', 'xc']
+			],
+			subs: [
+				['b', 'xa'],
+				['c', 'xa'],
+				['d', 'xb'],
+				['d', 'xc']
+			]
+		})
+		const dag = buildLineageDag(g)
+		const res = boundedSet(dag, sn('a'), [sn('b'), sn('c')])
+		expect(scriptsOf(res.nodes).sort()).toEqual(['a', 'b', 'c'])
+	})
+
+	it('drops ends not downstream of start', () => {
+		const dag = buildLineageDag(chain())
+		const res = boundedSet(dag, sn('c'), [sn('a')])
+		expect(res.droppedEnds).toEqual([sn('a')])
+		expect(res.reachableEnds).toEqual([])
+		expect([...res.nodes]).toEqual([sn('c')])
+	})
+
+	it('is cycle-safe', () => {
+		// b ↔ c cycle downstream of a; bounding to c terminates.
+		const g = graph({
+			writes: [
+				['a', 'x'],
+				['b', 'y'],
+				['c', 'z']
+			],
+			subs: [
+				['b', 'x'],
+				['c', 'y'],
+				['b', 'z']
+			]
+		})
+		const dag = buildLineageDag(g)
+		const res = boundedSet(dag, sn('a'), [sn('c')])
+		expect(scriptsOf(res.nodes).sort()).toEqual(['a', 'b', 'c'])
+	})
+})
+
+describe('validStarts', () => {
+	it('includes schedule-rooted scripts', () => {
+		const g = graph({ scripts: ['s'], native: [['schedule', 's']] })
+		expect(validStarts(g)).toEqual(new Set([sn('s')]))
+	})
+
+	it('includes manual roots (no trigger, not a subscriber)', () => {
+		const g = graph({ scripts: ['m'] })
+		expect(validStarts(g)).toEqual(new Set([sn('m')]))
+	})
+
+	it('excludes event-only roots', () => {
+		const g = graph({ scripts: ['k'], native: [['kafka', 'k']] })
+		expect(validStarts(g).has(sn('k'))).toBe(false)
+	})
+
+	it('excludes pure asset subscribers but keeps a schedule subscriber', () => {
+		// sub is `// on x`; sched is both a subscriber and schedule-triggered.
+		const g = graph({
+			scripts: ['a', 'sub', 'sched'],
+			writes: [['a', 'x']],
+			subs: [
+				['sub', 'x'],
+				['sched', 'x']
+			],
+			native: [['schedule', 'sched']]
+		})
+		const starts = validStarts(g)
+		expect(starts.has(sn('a'))).toBe(true) // manual root
+		expect(starts.has(sn('sub'))).toBe(false) // event-less but a subscriber
+		expect(starts.has(sn('sched'))).toBe(true) // schedule overrides subscriber
+	})
+})
+
+describe('validFromStarts (mid-DAG selective execution)', () => {
+	// a → x → sub (subscriber) → y → reader (pure read). `k` is event-triggered.
+	const g = () =>
+		graph({
+			scripts: ['a', 'sub', 'reader', 'k'],
+			writes: [
+				['a', 'x'],
+				['sub', 'y']
+			],
+			reads: [['reader', 'y']],
+			subs: [['sub', 'x']],
+			native: [['kafka', 'k']]
+		})
+
+	it('includes mid-DAG subscribers and pure readers, not just roots', () => {
+		const from = validFromStarts(g())
+		expect(from.has(sn('a'))).toBe(true) // root
+		expect(from.has(sn('sub'))).toBe(true) // mid-DAG subscriber — NOT a validStart
+		expect(from.has(sn('reader'))).toBe(true) // pure reader
+		// The old root-only gate would have rejected the mid-DAG nodes.
+		expect(validStarts(g()).has(sn('sub'))).toBe(false)
+	})
+
+	it('excludes event-triggered scripts (no run-now gesture)', () => {
+		expect(validFromStarts(g()).has(sn('k'))).toBe(false)
+	})
+
+	it('excludes webhook/data_upload mid-DAG subscribers (need caller input)', () => {
+		// a → x → upload_mid (subscribes x AND `// on data_upload`) → y → consumer.
+		// upload_mid must NOT be an eligible start (empty-arg run has no S3Object),
+		// and must be a barrier so `consumer` isn't run with a skipped producer.
+		const g2 = graph({
+			scripts: ['a', 'upload_mid', 'hook_mid', 'consumer'],
+			writes: [
+				['a', 'x'],
+				['upload_mid', 'y']
+			],
+			subs: [
+				['upload_mid', 'x'],
+				['hook_mid', 'x'],
+				['consumer', 'y']
+			],
+			native: [
+				['data_upload', 'upload_mid'],
+				['webhook', 'hook_mid']
+			]
+		})
+		const from = validFromStarts(g2)
+		expect(from.has(sn('upload_mid'))).toBe(false)
+		expect(from.has(sn('hook_mid'))).toBe(false)
+		expect(from.has(sn('a'))).toBe(true) // the plain root is still eligible
+		// and they're barriers, so running downstream from `a` cuts them + consumer.
+		const bars = nonAutorunTriggerScripts(g2)
+		expect(bars.has(sn('upload_mid'))).toBe(true)
+		expect(bars.has(sn('hook_mid'))).toBe(true)
+		expect(scriptsOf(reachableCutting(buildLineageDag(g2), [sn('a')], bars)).sort()).toEqual(['a'])
+	})
+
+	it('keeps a scheduled root that also carries an event trigger', () => {
+		// schedule wins over the secondary kafka trigger in validStarts, so the
+		// scheduled root stays --from-eligible (regression guard).
+		const g2 = graph({
+			scripts: ['sched_evt', 'consumer'],
+			writes: [['sched_evt', 'x']],
+			subs: [['consumer', 'x']],
+			native: [
+				['schedule', 'sched_evt'],
+				['kafka', 'sched_evt']
+			]
+		})
+		expect(validStarts(g2).has(sn('sched_evt'))).toBe(true)
+		expect(nonAutorunTriggerScripts(g2).has(sn('sched_evt'))).toBe(true)
+		expect(validFromStarts(g2).has(sn('sched_evt'))).toBe(true) // union with roots
+	})
+
+	it('runs a mid-DAG start plus its downstream WITHOUT re-running upstream', () => {
+		// Starting at `sub`, the unbounded downstream is {sub, y, reader} — `a`/`x`
+		// upstream are never pulled in (dbt `--select sub+`).
+		const dag = buildLineageDag(g())
+		const downstream = new Set([sn('sub'), ...descendants(dag, sn('sub'))])
+		expect(scriptsOf(downstream).sort()).toEqual(['reader', 'sub'])
+		expect(downstream.has(sn('a'))).toBe(false)
+		expect(downstream.has(asset('x'))).toBe(false)
+	})
+})
+
+describe('reachableCutting (barrier cut for "Run + downstream")', () => {
+	// a → x → k(kafka, also reads x) → z → consumer. Starting at `a` and running
+	// downstream must cut the event handler `k` AND `consumer` (only reachable
+	// through it) — else they'd launch with empty args. Mirrors the CLI cut.
+	const g = () =>
+		graph({
+			scripts: ['a', 'k', 'consumer'],
+			writes: [
+				['a', 'x'],
+				['k', 'z']
+			],
+			reads: [['k', 'x']],
+			subs: [['consumer', 'z']],
+			native: [['kafka', 'k']]
+		})
+
+	it('detects event-triggered scripts as barriers', () => {
+		expect(nonAutorunTriggerScripts(g()).has(sn('k'))).toBe(true)
+		expect(nonAutorunTriggerScripts(g()).has(sn('a'))).toBe(false)
+	})
+
+	it('cuts an event descendant and its event-only downstream from a run set', () => {
+		const dag = buildLineageDag(g())
+		const barriers = nonAutorunTriggerScripts(g())
+		const runNodes = reachableCutting(dag, [sn('a')], barriers)
+		expect(scriptsOf(runNodes).sort()).toEqual(['a']) // k + consumer cut
+		expect(runNodes.has(sn('k'))).toBe(false)
+		expect(runNodes.has(sn('consumer'))).toBe(false)
+	})
+
+	it('protects an explicit start even if it carries an event trigger', () => {
+		const dag = buildLineageDag(g())
+		// start = k itself (user named it); it runs, and so does its downstream.
+		const barriers = new Set([...nonAutorunTriggerScripts(g())].filter((id) => id !== sn('k')))
+		const runNodes = reachableCutting(dag, [sn('k')], barriers)
+		expect(scriptsOf(runNodes).sort()).toEqual(['consumer', 'k'])
+	})
+
+	it('keeps a scheduled event root (and its downstream) reachable from an upstream start', () => {
+		// a → x → sched_evt(schedule + kafka) → y → consumer. Running downstream
+		// from `a`, sched_evt is a scheduled root so it must NOT be a barrier even
+		// though it carries an event trigger — matching the CLI, which excludes all
+		// valid roots (`starts`), not just the picked start. Mirror of the page's
+		// barrier construction: nonAutorunTriggerScripts minus validStarts minus start.
+		const g2 = graph({
+			scripts: ['a', 'sched_evt', 'consumer'],
+			writes: [
+				['a', 'x'],
+				['sched_evt', 'y']
+			],
+			subs: [
+				['sched_evt', 'x'],
+				['consumer', 'y']
+			],
+			native: [
+				['schedule', 'sched_evt'],
+				['kafka', 'sched_evt']
+			]
+		})
+		const dag = buildLineageDag(g2)
+		const roots = validStarts(g2)
+		const barriers = new Set(
+			[...nonAutorunTriggerScripts(g2)].filter((id) => !roots.has(id) && id !== sn('a'))
+		)
+		const runNodes = reachableCutting(dag, [sn('a')], barriers)
+		expect(scriptsOf(runNodes).sort()).toEqual(['a', 'consumer', 'sched_evt'])
+		// Without the validStarts exclusion, sched_evt (a kafka handler) would be a
+		// barrier and `consumer` would be dropped — the bug this guards.
+		const naiveBarriers = new Set([...nonAutorunTriggerScripts(g2)].filter((id) => id !== sn('a')))
+		expect(scriptsOf(reachableCutting(dag, [sn('a')], naiveBarriers)).sort()).toEqual(['a'])
+	})
+})
+
+describe('buildLineageDownstreamMap (read-aware scheduling)', () => {
+	// a writes x; c only *reads* x (no `// on x`). c must still run after a.
+	const g = graph({
+		scripts: ['a', 'c'],
+		writes: [['a', 'x']],
+		reads: [['c', 'x']]
+	})
+
+	it('links a producer to a pure reader of its asset', () => {
+		const map = buildLineageDownstreamMap(g)
+		expect([...(map.get('a') ?? [])]).toEqual(['c'])
+	})
+
+	it('orders the reader after the producer through computeInducedSchedule', () => {
+		const selected = new Set(['a', 'c'])
+		// Subscriber-only map (default) misses the read dep → c is a stray root.
+		const subscriberOnly = computeInducedSchedule(g, selected)
+		expect(subscriberOnly.roots.sort()).toEqual(['a', 'c'])
+		// Read-aware map orders c strictly after a.
+		const readAware = computeInducedSchedule(g, selected, buildLineageDownstreamMap(g))
+		expect(readAware.roots).toEqual(['a'])
+		expect(readAware.indegree.get('c')).toBe(1)
+		expect(readAware.nodes).toEqual(['a', 'c'])
+	})
+
+	it('orders a disjoint-root producer before a data_test that references it', () => {
+		// Two disjoint roots (the HD-1 repro): `dim` produces the dimension
+		// `dimc`; `fct` produces `fcto` and has a `// data_test relationships`
+		// against `dimc`. Without the test edge they are unordered and a cold
+		// cascade can run `fct` first ("table dimc does not exist"). The test
+		// edge must place `dim` strictly before `fct`.
+		const g = graph({
+			scripts: ['dim', 'fct'],
+			writes: [
+				['dim', 'dimc'],
+				['fct', 'fcto']
+			],
+			tests: [['dim', 'fct', 'dimc']]
+		})
+		const selected = new Set(['dim', 'fct'])
+		const map = buildLineageDownstreamMap(g)
+		expect([...(map.get('dim') ?? [])]).toEqual(['fct'])
+		const schedule = computeInducedSchedule(g, selected, map)
+		expect(schedule.roots).toEqual(['dim'])
+		expect(schedule.indegree.get('fct')).toBe(1)
+		expect(schedule.nodes).toEqual(['dim', 'fct'])
+		expect(schedule.cyclic).toEqual([])
+	})
+
+	it('adds no ordering when the referenced asset has no in-pipeline producer', () => {
+		// `fct` tests against an external `ext` table nothing produces — the
+		// backend emits no test edge, so the frontend sees none and `fct` stays
+		// an independent root (the runtime error stands, as designed).
+		const g = graph({
+			scripts: ['dim', 'fct'],
+			writes: [['fct', 'fcto']],
+			tests: [] // no producer for `ext` ⇒ backend omitted the edge
+		})
+		const schedule = computeInducedSchedule(
+			g,
+			new Set(['dim', 'fct']),
+			buildLineageDownstreamMap(g)
+		)
+		expect(schedule.roots.sort()).toEqual(['dim', 'fct'])
+	})
+})
+
+describe('assetUriToNodeId', () => {
+	it('maps s3 prefix to the s3object kind, others verbatim', () => {
+		expect(assetUriToNodeId('s3://bucket/key')).toBe('s3object:bucket/key')
+		expect(assetUriToNodeId('datatable://prod/users')).toBe('datatable:prod/users')
+		expect(assetUriToNodeId('ducklake://lake/t')).toBe('ducklake:lake/t')
+		expect(assetUriToNodeId('not-a-uri')).toBeUndefined()
+	})
+	it('strips leading slashes from S3 keys so s3:/// and s3:// share a node', () => {
+		// Mirror of Rust `parse_asset_syntax`: `--to s3:///exports/x` must resolve
+		// to the same canonical node as the graph's `s3object:exports/x`.
+		expect(assetUriToNodeId('s3:///exports/x')).toBe('s3object:exports/x')
+		expect(assetUriToNodeId('s3:///exports/x')).toBe(assetUriToNodeId('s3://exports/x'))
+		// All leading slashes are stripped so a canonical key never starts with
+		// `/` (the quad-slash `S3Object(s3="/x")` form collapses to `x`).
+		expect(assetUriToNodeId('s3:////x')).toBe('s3object:x')
+		// Hive-partition keys and non-S3 kinds are untouched.
+		expect(assetUriToNodeId('s3:///t/y=2024/f.parquet')).toBe('s3object:t/y=2024/f.parquet')
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/boundedCascade.ts b/frontend/src/lib/components/assets/AssetGraph/boundedCascade.ts
new file mode 100644
index 0000000000..6fcabbe71f
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/boundedCascade.ts
@@ -0,0 +1,346 @@
+import type { AssetGraphResponse, NativeTriggerKind } from './types'
+import { assetKey, isWriteEdge } from './lib'
+
+// Bounded-cascade selective execution: instead of a dbt-style `--select`
+// grammar (a compile-time file selector dbt needs because it has no runtime
+// DAG), Windmill already runs a live cascade. So the primitive here is to
+// *bound* that cascade — start at a pipeline entrypoint, fan downstream, but
+// stop at one or more chosen end node(s). The matched set is the "path
+// between" start and the ends:
+//
+//     descendants(start) ∩ (ancestors(ends) ∪ ends) ∪ {start}
+//
+// Pure module (no Svelte runes) so the graph algebra is unit-testable and can
+// be ported verbatim to the CLI. See `boundedCascade.test.ts`, and the mirror
+// at `cli/src/commands/pipeline/boundedCascade.ts` (keep them in sync).
+
+// Unified lineage-DAG node ids. Assets use `${asset_kind}:${asset_path}`
+// (identical to `assetKey`); runnables are prefixed so a script path can never
+// collide with an asset key. Flows are excluded — they aren't cascade members
+// (mirrors graphTraversal/asset_dispatch).
+export const SCRIPT_PREFIX = 'script:'
+
+export function scriptNodeId(path: string): string {
+	return `${SCRIPT_PREFIX}${path}`
+}
+export function isScriptNode(id: string): boolean {
+	return id.startsWith(SCRIPT_PREFIX)
+}
+export function scriptPathOf(id: string): string {
+	return id.slice(SCRIPT_PREFIX.length)
+}
+
+/** Resolve an asset URI (`datatable://x`, `s3://b/k`, …) to its node id. */
+export function assetUriToNodeId(uri: string): string | undefined {
+	const m = uri.match(/^([a-z0-9_]+):\/\/(.+)$/i)
+	if (!m) return undefined
+	const prefix = m[1].toLowerCase()
+	// `s3` is the URI prefix for the `s3object` asset kind (mirrors the CLI
+	// `assetUri` and the canvas). All other kinds use their name verbatim.
+	const kind = prefix === 's3' ? 's3object' : prefix
+	// Mirror Rust `parse_asset_syntax`: strip all leading slashes from S3 keys so
+	// `s3:///key` (default storage) and `s3://key` resolve to the same node id
+	// and a canonical key never starts with `/`.
+	const path = kind === 's3object' ? m[2].replace(/^\/+/, '') : m[2]
+	return `${kind}:${path}`
+}
+
+// Native trigger kinds that fan out *per event*: a single event always flows
+// through the whole reactive downstream, so "run up to X now" is not a
+// meaningful gesture and these are never offered as bounded-run starts.
+const EVENT_TRIGGER_KINDS: ReadonlySet<string> = new Set<NativeTriggerKind>([
+	'kafka',
+	'mqtt',
+	'nats',
+	'postgres',
+	'sqs',
+	'gcp',
+	'email'
+])
+
+// Trigger kinds a cascade must NOT auto-run: the per-event kinds above PLUS the
+// input-only entrypoints `webhook`/`data_upload`, which need caller-supplied
+// input (a request body / an uploaded S3Object) and would run the wrong thing
+// with empty args. Mirror of the CLI `NON_AUTORUN_TRIGGER_KINDS`. When the
+// deployed `/assets/graph` omits a `webhook`/`data_upload` row (it has none for
+// them), such a script simply reads as a manual root here — but whenever the
+// marker IS visible (editor overlay / draft), it's excluded from bounded-run
+// starts and cut as a barrier, exactly as the CLI does.
+const NON_AUTORUN_TRIGGER_KINDS: ReadonlySet<string> = new Set<string>([
+	...EVENT_TRIGGER_KINDS,
+	'webhook',
+	'data_upload'
+])
+
+export type LineageDag = {
+	/** upstream node id → set of direct downstream node ids. */
+	down: Map<string, Set<string>>
+	/** downstream node id → set of direct upstream node ids. */
+	up: Map<string, Set<string>>
+	/** Every node id (scripts + assets), including isolated ones. */
+	nodes: Set<string>
+}
+
+/**
+ * Build the directed upstream→downstream lineage DAG over scripts ∪ assets:
+ *   - producer script → asset   (write / rw edges)
+ *   - asset → reader script      (pure-read edges — a data dependency)
+ *   - asset → subscriber script  (`// on <asset>` triggers)
+ *   - asset → testing script     (`// data_test` ordering edges)
+ *
+ * An `rw` edge is treated as production only (script → asset); emitting the
+ * reverse asset → script too would make every upsert a 2-cycle through its own
+ * asset.
+ *
+ * `test_edges` are modeled through the referenced asset (asset → testing
+ * script), NOT as a direct producer → testing-script hop: the producer already
+ * has a write edge to that asset, so this yields producer → asset → testing
+ * script and keeps the two-hop (script → asset → script) invariant that
+ * `buildLineageDownstreamMap` relies on.
+ */
+export function buildLineageDag(g: AssetGraphResponse): LineageDag {
+	const down = new Map<string, Set<string>>()
+	const up = new Map<string, Set<string>>()
+	const nodes = new Set<string>()
+
+	const addEdge = (a: string, b: string) => {
+		if (a === b) return
+		nodes.add(a)
+		nodes.add(b)
+		;(down.get(a) ?? down.set(a, new Set()).get(a)!).add(b)
+		;(up.get(b) ?? up.set(b, new Set()).get(b)!).add(a)
+	}
+
+	// Register every node up front so isolated scripts/assets still appear.
+	for (const r of g.runnables ?? []) {
+		if (r.usage_kind === 'script') nodes.add(scriptNodeId(r.path))
+	}
+	for (const a of g.assets ?? []) nodes.add(`${a.kind}:${a.path}`)
+
+	for (const e of g.edges ?? []) {
+		if (e.runnable_kind !== 'script') continue
+		const aid = assetKey(e)
+		if (isWriteEdge(e)) {
+			addEdge(scriptNodeId(e.runnable_path), aid)
+		} else if ((e.access_type ?? 'r') === 'r') {
+			addEdge(aid, scriptNodeId(e.runnable_path))
+		}
+	}
+	for (const t of g.triggers ?? []) {
+		if (t.trigger_kind !== 'asset' || t.runnable_kind !== 'script') continue
+		addEdge(assetKey(t), scriptNodeId(t.runnable_path))
+	}
+	// Data-test ordering edges: the referenced asset must exist before the
+	// tested script runs. Routed through the asset node so the existing
+	// producer → asset write edge extends into producer → asset → testing script.
+	for (const t of g.test_edges ?? []) {
+		if (t.runnable_kind !== 'script') continue
+		addEdge(assetKey(t), scriptNodeId(t.runnable_path))
+	}
+
+	return { down, up, nodes }
+}
+
+/** BFS closure over an adjacency map, excluding `start`. */
+function closure(adj: Map<string, Set<string>>, start: string): Set<string> {
+	const seen = new Set<string>()
+	const queue = [start]
+	while (queue.length > 0) {
+		const cur = queue.shift()!
+		for (const n of adj.get(cur) ?? []) {
+			if (seen.has(n)) continue
+			seen.add(n)
+			queue.push(n)
+		}
+	}
+	// A cycle back to `start` would have re-added it; the contract is to
+	// exclude the node itself.
+	seen.delete(start)
+	return seen
+}
+
+/** Transitive downstream of `n` (excludes `n`). Cycle-safe. */
+export function descendants(dag: LineageDag, n: string): Set<string> {
+	return closure(dag.down, n)
+}
+/** Transitive upstream of `n` (excludes `n`). Cycle-safe. */
+export function ancestors(dag: LineageDag, n: string): Set<string> {
+	return closure(dag.up, n)
+}
+
+/**
+ * Nodes reachable from `starts` over the lineage DAG, treating `barriers` as cut
+ * points: a barrier node is neither included NOR traversed through, so a node
+ * reachable ONLY via a barrier is excluded while one also reachable via another
+ * path stays. Mirror of the CLI `reachableCutting`. Used to keep event handlers
+ * (and their event-only downstream) out of a cascade run — running such a
+ * consumer whose producer was skipped would feed it missing/stale inputs.
+ */
+export function reachableCutting(
+	dag: LineageDag,
+	starts: Iterable<string>,
+	barriers: Set<string>
+): Set<string> {
+	const seen = new Set<string>()
+	const queue: string[] = []
+	for (const s of starts) {
+		if (barriers.has(s) || seen.has(s)) continue
+		seen.add(s)
+		queue.push(s)
+	}
+	while (queue.length > 0) {
+		const n = queue.shift()!
+		for (const next of dag.down.get(n) ?? []) {
+			if (barriers.has(next) || seen.has(next)) continue
+			seen.add(next)
+			queue.push(next)
+		}
+	}
+	return seen
+}
+
+export type BoundedResult = {
+	/** Path-between node set (scripts + assets), always including `start`. */
+	nodes: Set<string>
+	/** Ends that are actually reachable downstream of `start`. */
+	reachableEnds: string[]
+	/** Ends passed in that are not downstream of `start` (ignored, surfaced). */
+	droppedEnds: string[]
+}
+
+/**
+ * Nodes on any path from `start` to any of `ends` (inclusive of both). Ends
+ * not reachable from `start` are dropped and reported. With no reachable end
+ * the result is just `{start}` — the caller decides whether to warn or fall
+ * back to the full downstream.
+ */
+export function boundedSet(dag: LineageDag, start: string, ends: string[]): BoundedResult {
+	const desc = descendants(dag, start)
+	const downSet = new Set(desc)
+	downSet.add(start)
+
+	const reachableEnds = ends.filter((e) => downSet.has(e))
+	const droppedEnds = ends.filter((e) => !downSet.has(e))
+	if (reachableEnds.length === 0) {
+		return { nodes: new Set([start]), reachableEnds, droppedEnds }
+	}
+
+	const upClosure = new Set<string>()
+	for (const e of reachableEnds) {
+		upClosure.add(e)
+		for (const a of ancestors(dag, e)) upClosure.add(a)
+	}
+	const nodes = new Set<string>()
+	for (const n of downSet) if (upClosure.has(n)) nodes.add(n)
+	nodes.add(start)
+	return { nodes, reachableEnds, droppedEnds }
+}
+
+/**
+ * Script node ids eligible to *start* a bounded run: schedule-triggered
+ * scripts, or manual roots (not an asset subscriber and not event-triggered).
+ * Event-driven entrypoints are excluded — they have no "run up to X" gesture.
+ */
+export function validStarts(g: AssetGraphResponse): Set<string> {
+	const subscribers = new Set<string>()
+	const scheduleScripts = new Set<string>()
+	const eventScripts = new Set<string>()
+	for (const t of g.triggers ?? []) {
+		if (t.runnable_kind !== 'script') continue
+		if (t.trigger_kind === 'asset') subscribers.add(t.runnable_path)
+		else if (t.trigger_kind === 'schedule') scheduleScripts.add(t.runnable_path)
+		else if (EVENT_TRIGGER_KINDS.has(t.trigger_kind)) eventScripts.add(t.runnable_path)
+	}
+
+	const out = new Set<string>()
+	for (const r of g.runnables ?? []) {
+		if (r.usage_kind !== 'script') continue
+		const p = r.path
+		if (scheduleScripts.has(p)) out.add(scriptNodeId(p))
+		else if (!subscribers.has(p) && !eventScripts.has(p)) out.add(scriptNodeId(p))
+	}
+	return out
+}
+
+/**
+ * Script node ids eligible as an EXPLICIT bounded-run start from *anywhere* in
+ * the DAG (dbt's `--select model+`): every script that can run with empty args —
+ * i.e. all scripts except event-triggered ones (kafka/mqtt/nats/postgres/sqs/
+ * gcp/email fan out per event and have no "run now" gesture). Unlike
+ * `validStarts` (schedule/manual roots only), this INCLUDES mid-DAG asset
+ * subscribers and pure readers, so "Run + downstream" can begin at any model —
+ * that node plus its transitive downstream runs, upstream is never re-run.
+ * (`webhook`/`data_upload` have no trigger row here — same as `validStarts` they
+ * read as manual roots and are already included.)
+ */
+export function validFromStarts(g: AssetGraphResponse): Set<string> {
+	const nonAutorunScripts = new Set<string>()
+	for (const t of g.triggers ?? []) {
+		if (t.runnable_kind !== 'script') continue
+		if (NON_AUTORUN_TRIGGER_KINDS.has(t.trigger_kind)) nonAutorunScripts.add(t.runnable_path)
+	}
+	// Seed with schedule/manual roots: `validStarts` lets a schedule identity win
+	// over a secondary non-autorun trigger, so a scheduled root that also carries
+	// e.g. a `// on kafka` stays `--from`-eligible. The mid-DAG loop then adds only
+	// scripts that can run with empty args — a `webhook`/`data_upload` subscriber
+	// is NOT added (it needs caller-supplied input).
+	const out = new Set<string>(validStarts(g))
+	for (const r of g.runnables ?? []) {
+		if (r.usage_kind !== 'script') continue
+		if (!nonAutorunScripts.has(r.path)) out.add(scriptNodeId(r.path))
+	}
+	return out
+}
+
+/**
+ * Script node ids carrying a non-autorun trigger (event kinds kafka/mqtt/…/email
+ * PLUS input-only webhook/data_upload) — they fan out per event or need
+ * caller-supplied input, so a cascade must cut them (as `barriers` for
+ * `reachableCutting`) even when they're a lineage descendant of the start.
+ * Mirror of the CLI `nonAutorunTriggerScripts`. Only detects what the graph
+ * surfaces: the deployed `/assets/graph` omits `webhook`/`data_upload` rows, so
+ * such a handler is only cut when its marker is visible (editor overlay / draft)
+ * — the same limitation as `validStarts`; the CLI closes it via graph enrichment.
+ */
+export function nonAutorunTriggerScripts(g: AssetGraphResponse): Set<string> {
+	const out = new Set<string>()
+	for (const t of g.triggers ?? []) {
+		if (t.runnable_kind === 'script' && NON_AUTORUN_TRIGGER_KINDS.has(t.trigger_kind)) {
+			out.add(scriptNodeId(t.runnable_path))
+		}
+	}
+	return out
+}
+
+/** Project a node-id set to the script paths it contains (run targets). */
+export function scriptsOf(nodes: Iterable<string>): string[] {
+	const out: string[] = []
+	for (const id of nodes) if (isScriptNode(id)) out.push(scriptPathOf(id))
+	return out
+}
+
+/**
+ * Producer→consumer adjacency (script path → downstream script paths) over the
+ * lineage DAG: one hop through a single asset, following BOTH `// on`
+ * subscribers *and* pure-read data dependencies. Unlike
+ * `graphTraversal.buildDownstreamMap` (subscriber-only, which models the
+ * production dispatch), this orders a script that merely reads an upstream
+ * asset after its producer — so a bounded selection containing such a reader
+ * schedules correctly. Mirror of the CLI `topoOrder` adjacency.
+ */
+export function buildLineageDownstreamMap(g: AssetGraphResponse): Map<string, Set<string>> {
+	const dag = buildLineageDag(g)
+	const map = new Map<string, Set<string>>()
+	for (const id of dag.nodes) {
+		if (!isScriptNode(id)) continue
+		const s = scriptPathOf(id)
+		const subs = new Set<string>()
+		for (const asset of dag.down.get(id) ?? []) {
+			for (const sub of dag.down.get(asset) ?? []) {
+				if (isScriptNode(sub) && scriptPathOf(sub) !== s) subs.add(scriptPathOf(sub))
+			}
+		}
+		if (subs.size > 0) map.set(s, subs)
+	}
+	return map
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.test.ts b/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.test.ts
index 5509839dab..3a0fd4fbd3 100644
--- a/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.test.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { runCascade } from './cascadeOrchestrator'
-import type { DownstreamClosure } from './graphTraversal'
+import { runCascade, runSelection } from './cascadeOrchestrator'
+import type { DownstreamClosure, InducedSchedule } from './graphTraversal'
 
 function closure(edges: Array<[from: string, to: string]>, nodes: string[]): DownstreamClosure {
 	const e = new Map<string, Set<string>>()
@@ -161,3 +161,101 @@ describe('runCascade', () => {
 		expect(res.statuses.get('c')?.status).toBe('skipped')
 	})
 })
+
+function schedule(
+	edges: Array<[from: string, to: string]>,
+	nodes: string[],
+	roots: string[]
+): InducedSchedule {
+	const e = new Map<string, Set<string>>()
+	const indegree = new Map<string, number>()
+	for (const n of nodes) indegree.set(n, 0)
+	for (const [from, to] of edges) {
+		const set = e.get(from) ?? new Set()
+		set.add(to)
+		e.set(from, set)
+		indegree.set(to, (indegree.get(to) ?? 0) + 1)
+	}
+	return { nodes, edges: e, indegree, roots, cyclic: [] }
+}
+
+describe('runSelection', () => {
+	it('runs every selected node, seeding all roots', async () => {
+		// two independent roots a, b each → c.
+		const sched = schedule(
+			[
+				['a', 'c'],
+				['b', 'c']
+			],
+			['a', 'b', 'c'],
+			['a', 'b']
+		)
+		const r = fakeRunner()
+		const res = await runSelection({ schedule: sched, ...r })
+		expect(res.ok).toBe(true)
+		// Sort a copy for the membership check — mutating `r.launched` here
+		// would invalidate the launch-order assertions below.
+		expect([...r.launched].sort()).toEqual(['a', 'b', 'c'])
+		// c only after both upstreams.
+		expect(r.launched.indexOf('c')).toBeGreaterThan(r.launched.indexOf('a'))
+		expect(r.launched.indexOf('c')).toBeGreaterThan(r.launched.indexOf('b'))
+	})
+
+	it('skips a failed node’s descendants but keeps independent branches running', async () => {
+		// Two independent chains: a → b and c → d. `a` fails; `b` (its descendant)
+		// must be skipped, but `d` depends only on the successful `c`, so it must
+		// still run — a failure must not stall unrelated branches.
+		const sched = schedule(
+			[
+				['a', 'b'],
+				['c', 'd']
+			],
+			['a', 'b', 'c', 'd'],
+			['a', 'c']
+		)
+		const r = fakeRunner({ a: 'failure' })
+		const res = await runSelection({ schedule: sched, ...r })
+		expect(res.ok).toBe(false)
+		expect(res.statuses.get('a')?.status).toBe('failure')
+		expect(res.statuses.get('b')?.status).toBe('skipped')
+		expect(res.statuses.get('c')?.status).toBe('success')
+		expect(res.statuses.get('d')?.status).toBe('success')
+		expect(r.launched).toContain('d')
+		expect(r.launched).not.toContain('b')
+	})
+
+	it('skips a join node when any one of its upstreams fails', async () => {
+		// {a, b} → c. `a` fails; `c` needs both, so it must be skipped even though
+		// `b` succeeds — a poisoned lineage isn’t rescued by a sibling success.
+		const sched = schedule(
+			[
+				['a', 'c'],
+				['b', 'c']
+			],
+			['a', 'b', 'c'],
+			['a', 'b']
+		)
+		const r = fakeRunner({ a: 'failure' })
+		const res = await runSelection({ schedule: sched, ...r })
+		expect(res.ok).toBe(false)
+		expect(res.statuses.get('c')?.status).toBe('skipped')
+		expect(r.launched).not.toContain('c')
+	})
+
+	it('stops scheduling a failed node’s chain', async () => {
+		const sched = schedule([['a', 'b']], ['a', 'b'], ['a'])
+		const r = fakeRunner({ a: 'failure' })
+		const res = await runSelection({ schedule: sched, ...r })
+		expect(res.ok).toBe(false)
+		expect(r.launched).toEqual(['a'])
+		expect(res.statuses.get('b')?.status).toBe('skipped')
+	})
+
+	it('a single-node selection runs that node', async () => {
+		const sched = schedule([], ['a'], ['a'])
+		const r = fakeRunner()
+		const res = await runSelection({ schedule: sched, ...r })
+		expect(res.ok).toBe(true)
+		expect(r.launched).toEqual(['a'])
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.ts b/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.ts
index 7e6a6029ed..424f1581ec 100644
--- a/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/cascadeOrchestrator.ts
@@ -1,4 +1,4 @@
-import type { DownstreamClosure } from './graphTraversal'
+import type { DownstreamClosure, InducedSchedule } from './graphTraversal'
 
 // Client-side orchestration of a pipeline chain dev-run ("Run + downstream"
 // over a graph that contains drafts). The backend asset-trigger dispatcher
@@ -112,3 +112,104 @@ export async function runCascade(opts: CascadeRunOptions): Promise<CascadeRunRes
 	const ok = !failed && [...statuses.values()].every((s) => s.status === 'success')
 	return { ok, statuses }
 }
+
+export type SelectionRunOptions = {
+	/** Multi-root induced schedule of the selected scripts (computeInducedSchedule). */
+	schedule: InducedSchedule
+	/** Launch one script (preview for drafts, by-path for deployed); returns the job id. */
+	launch: (path: string) => Promise<string>
+	/** Resolve once the job reaches a terminal state. */
+	waitTerminal: (jobId: string) => Promise<'success' | 'failure'>
+	/** Snapshot of all node states, emitted on every transition. */
+	onUpdate?: (statuses: Map<string, CascadeNodeState>) => void
+}
+
+/**
+ * Execute an arbitrary selected set of scripts (e.g. a bounded-cascade
+ * selection) in topological order. Unlike `runCascade` there is no single
+ * privileged root — every `schedule.roots` entry is seeded at once and a node
+ * runs as soon as its in-set upstreams all succeed. A failure abandons only
+ * that node's lineage (its transitive descendants end 'skipped'); INDEPENDENT
+ * branches keep running. In-flight jobs always finish.
+ */
+export async function runSelection(opts: SelectionRunOptions): Promise<CascadeRunResult> {
+	const { schedule, launch, waitTerminal, onUpdate } = opts
+	const statuses = new Map<string, CascadeNodeState>()
+	for (const n of schedule.nodes) statuses.set(n, { status: 'pending' })
+	const remaining = new Map(schedule.indegree)
+	let failed = false
+	// Nodes a failed prerequisite has made unrunnable — the transitive descendants
+	// of every failure. Gating scheduling on this (rather than a single global
+	// fail-fast flag) is what lets independent branches finish: only the lineage
+	// below a failure is skipped, not every node that happens to become ready
+	// afterwards. Poisoned nodes are never scheduled, so they end 'skipped' below.
+	const poisoned = new Set<string>()
+	const inFlight = new Set<Promise<void>>()
+
+	const emit = () => onUpdate?.(new Map(statuses))
+
+	function poison(path: string) {
+		const stack = [path]
+		while (stack.length > 0) {
+			const n = stack.pop()!
+			for (const s of schedule.edges.get(n) ?? []) {
+				if (!poisoned.has(s)) {
+					poisoned.add(s)
+					stack.push(s)
+				}
+			}
+		}
+	}
+
+	function schedule_(path: string) {
+		const p = runNode(path).finally(() => inFlight.delete(p))
+		inFlight.add(p)
+	}
+
+	async function runNode(path: string): Promise<void> {
+		statuses.set(path, { status: 'running' })
+		emit()
+		let jobId: string | undefined
+		try {
+			jobId = await launch(path)
+			statuses.set(path, { status: 'running', jobId })
+			emit()
+			const term = await waitTerminal(jobId)
+			statuses.set(path, { status: term, jobId })
+			emit()
+			if (term === 'failure') {
+				failed = true
+				poison(path)
+				return
+			}
+		} catch (e) {
+			statuses.set(path, {
+				status: 'failure',
+				jobId,
+				error: e instanceof Error ? e.message : String(e)
+			})
+			emit()
+			failed = true
+			poison(path)
+			return
+		}
+		for (const s of schedule.edges.get(path) ?? []) {
+			const d = (remaining.get(s) ?? 0) - 1
+			remaining.set(s, d)
+			if (d === 0 && !poisoned.has(s)) schedule_(s)
+		}
+	}
+
+	for (const r of schedule.roots) schedule_(r)
+	while (inFlight.size > 0) {
+		await Promise.race(inFlight)
+	}
+
+	for (const [n, st] of statuses) {
+		if (st.status === 'pending') statuses.set(n, { status: 'skipped' })
+	}
+	emit()
+
+	const ok = !failed && [...statuses.values()].every((s) => s.status === 'success')
+	return { ok, statuses }
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/cascadeRun.test.ts b/frontend/src/lib/components/assets/AssetGraph/cascadeRun.test.ts
new file mode 100644
index 0000000000..b180a8cd9f
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/cascadeRun.test.ts
@@ -0,0 +1,35 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { JobService } from '$lib/gen'
+import { makeLaunch } from './cascadeRun'
+
+afterEach(() => vi.restoreAllMocks())
+
+// The client orchestrates the cascade closure, so every launch must carry
+// `_wmill_skip_asset_dispatch: true`. A caller arg (e.g. the run form for the
+// root node) must NOT be able to override that guard back to false and let the
+// backend also dispatch deployed subscribers.
+describe('makeLaunch dispatch guard', () => {
+	it('local preview: a caller `_wmill_skip_asset_dispatch: false` cannot re-enable dispatch', async () => {
+		const spy = vi.spyOn(JobService, 'runScriptPreview').mockResolvedValue('job-1' as any)
+		const launch = makeLaunch({
+			workspace: 'w',
+			resolveLocal: () => ({ content: 'x', language: 'bun' as any }),
+			argsFor: () => ({ _wmill_skip_asset_dispatch: false, foo: 1 })
+		})
+		await launch('f/x/root')
+		const body = (spy.mock.calls[0][0] as any).requestBody
+		expect(body.args._wmill_skip_asset_dispatch).toBe(true) // guard wins
+		expect(body.args.foo).toBe(1) // other caller args preserved
+	})
+
+	it('deployed by-path: a caller `_wmill_skip_asset_dispatch: false` cannot re-enable dispatch', async () => {
+		const spy = vi.spyOn(JobService, 'runScriptByPath').mockResolvedValue('job-2' as any)
+		const launch = makeLaunch({
+			workspace: 'w',
+			argsFor: () => ({ _wmill_skip_asset_dispatch: false })
+		})
+		await launch('f/x/deployed')
+		const body = (spy.mock.calls[0][0] as any).requestBody
+		expect(body._wmill_skip_asset_dispatch).toBe(true)
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/cascadeRun.ts b/frontend/src/lib/components/assets/AssetGraph/cascadeRun.ts
new file mode 100644
index 0000000000..ede66ebe4b
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/cascadeRun.ts
@@ -0,0 +1,149 @@
+// Reusable cascade-execution primitives shared by the pipeline route page and
+// the local-dev preview (`PipelineDevView`). The backend asset-trigger
+// dispatcher only resolves DEPLOYED rows, so whenever a run involves local /
+// draft content the client must orchestrate the closure itself: topological
+// order over the graph the user is looking at, each node launched with
+// `_wmill_skip_asset_dispatch` so the backend never double-fires the deployed
+// part of a mixed chain.
+
+import { JobService, type Preview } from '$lib/gen'
+import {
+	runCascade,
+	runSelection,
+	type CascadeRunResult,
+	type CascadeNodeState
+} from './cascadeOrchestrator'
+import { computeDownstreamClosure, computeInducedSchedule } from './graphTraversal'
+import { buildLineageDownstreamMap } from './boundedCascade'
+import type { AssetGraphResponse } from './types'
+
+export const CASCADE_POLL_INTERVAL_MS = 1000
+export const CASCADE_JOB_TIMEOUT_MS = 30 * 60 * 1000
+
+export type LocalScriptContent = {
+	content: string
+	language: Preview['language']
+	// `// tag <worker-tag>` — routes the preview to that worker (deployed parity).
+	tag?: string
+}
+
+// Poll a launched cascade job to a terminal state. Capped so a never-terminating
+// job can't pin a run guard forever; on timeout it throws, surfaced as a chain
+// failure by the orchestrator.
+export function makeWaitJobTerminal(
+	workspace: string
+): (jobId: string) => Promise<'success' | 'failure'> {
+	return async function waitJobTerminal(jobId: string): Promise<'success' | 'failure'> {
+		const deadline = Date.now() + CASCADE_JOB_TIMEOUT_MS
+		while (Date.now() < deadline) {
+			try {
+				const r = await JobService.getCompletedJobResultMaybe({
+					workspace,
+					id: jobId,
+					getStarted: false
+				})
+				if (r.completed) return r.success ? 'success' : 'failure'
+			} catch {
+				// transient — retry on the next tick
+			}
+			await new Promise((res) => setTimeout(res, CASCADE_POLL_INTERVAL_MS))
+		}
+		throw new Error(
+			`Timed out after ${Math.round(CASCADE_JOB_TIMEOUT_MS / 60000)}min waiting for job ${jobId} to finish`
+		)
+	}
+}
+
+// Build a per-script launch function. When `resolveLocal(path)` yields content,
+// the script runs as a preview of that local content (no deploy); otherwise it
+// runs the deployed version by path. Always passes `_wmill_skip_asset_dispatch`.
+export function makeLaunch(opts: {
+	workspace: string
+	resolveLocal?: (path: string) => LocalScriptContent | undefined
+	tempScriptRefs?: Record<string, string>
+	// Extra run args for a specific node (e.g. the uploaded S3Object bound to a
+	// `data_upload` cascade root). Merged over `_wmill_skip_asset_dispatch`; all
+	// other nodes run with empty inputs as before.
+	argsFor?: (path: string) => Record<string, any> | undefined
+	onLaunched?: (path: string, jobId: string) => void
+}): (path: string) => Promise<string> {
+	return async function launch(path: string): Promise<string> {
+		const local = opts.resolveLocal?.(path)
+		// Caller args (e.g. the run form for the cascade root) must NOT be able to
+		// re-enable backend asset dispatch while the client orchestrates the closure
+		// — that would double-run downstream / run deployed subscribers. Drop any
+		// `_wmill_skip_asset_dispatch` a caller supplied, and always spread it LAST.
+		const { _wmill_skip_asset_dispatch: _reserved, ...extra } = opts.argsFor?.(path) ?? {}
+		void _reserved
+		let jobId: string
+		if (local) {
+			if (!local.content || !local.language) {
+				throw new Error(`local script ${path} has no content/language`)
+			}
+			jobId = await JobService.runScriptPreview({
+				workspace: opts.workspace,
+				requestBody: {
+					content: local.content,
+					language: local.language,
+					path,
+					args: { ...extra, _wmill_skip_asset_dispatch: true },
+					...(local.tag ? { tag: local.tag } : {}),
+					...(opts.tempScriptRefs ? { temp_script_refs: opts.tempScriptRefs } : {})
+				}
+			})
+		} else {
+			jobId = await JobService.runScriptByPath({
+				workspace: opts.workspace,
+				path,
+				requestBody: { ...extra, _wmill_skip_asset_dispatch: true }
+			})
+		}
+		opts.onLaunched?.(path, jobId)
+		return jobId
+	}
+}
+
+// Run `root` plus its full downstream closure over the given graph.
+export async function runDownstreamCascade(opts: {
+	graph: AssetGraphResponse
+	root: string
+	launch: (path: string) => Promise<string>
+	waitTerminal: (jobId: string) => Promise<'success' | 'failure'>
+	onUpdate?: (statuses: Map<string, CascadeNodeState>) => void
+}): Promise<CascadeRunResult & { cyclic: string[] }> {
+	const closure = computeDownstreamClosure(opts.graph, opts.root)
+	const res = await runCascade({
+		closure,
+		root: opts.root,
+		launch: opts.launch,
+		waitTerminal: opts.waitTerminal,
+		onUpdate: opts.onUpdate
+	})
+	return { ...res, cyclic: closure.cyclic }
+}
+
+// Run a bounded selection of scripts (the induced schedule over the lineage DAG).
+export async function runBoundedCascade(opts: {
+	graph: AssetGraphResponse
+	scripts: Set<string>
+	launch: (path: string) => Promise<string>
+	waitTerminal: (jobId: string) => Promise<'success' | 'failure'>
+	onUpdate?: (statuses: Map<string, CascadeNodeState>) => void
+}): Promise<CascadeRunResult & { cyclic: string[] }> {
+	// Read-aware adjacency (NOT the default write-edge map) so a pure-reader
+	// member runs after its producer — parity with the route page's bounded run
+	// and the CLI `topoOrder`. `cyclic` is surfaced so callers can warn instead of
+	// silently dropping scripts stuck on a dependency cycle.
+	const schedule = computeInducedSchedule(
+		opts.graph,
+		opts.scripts,
+		buildLineageDownstreamMap(opts.graph)
+	)
+	const res = await runSelection({
+		schedule,
+		launch: opts.launch,
+		waitTerminal: opts.waitTerminal,
+		onUpdate: opts.onUpdate
+	})
+	return { ...res, cyclic: schedule.cyclic }
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/columnLineageGraph.test.ts b/frontend/src/lib/components/assets/AssetGraph/columnLineageGraph.test.ts
new file mode 100644
index 0000000000..6842dcfd86
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/columnLineageGraph.test.ts
@@ -0,0 +1,162 @@
+import { describe, expect, it } from 'vitest'
+import type { AssetGraphResponse } from './types'
+import {
+	buildColumnGraph,
+	colNodeId,
+	traceColumn,
+	connectedComponent,
+	assetColumnNodes,
+	computeDepths
+} from './columnLineageGraph'
+
+// Two scripts chained through an intermediate ducklake table:
+//   s1: orders.amount      -> staging.amt
+//   s2: staging.amt        -> daily.total
+//   s2: customers.name     -> daily.cust   (a second source into the sink)
+function chainGraph(): AssetGraphResponse {
+	return {
+		assets: [],
+		triggers: [],
+		runnables: [
+			{
+				path: 's1',
+				usage_kind: 'script',
+				column_lineage: [
+					{
+						column: 'amt',
+						inputs: [{ from_kind: 'ducklake', from_path: 'wh/orders', from_column: 'amount' }]
+					}
+				]
+			},
+			{
+				path: 's2',
+				usage_kind: 'script',
+				column_lineage: [
+					{
+						column: 'total',
+						inputs: [{ from_kind: 'ducklake', from_path: 'wh/staging', from_column: 'amt' }]
+					},
+					{
+						column: 'cust',
+						inputs: [{ from_kind: 'ducklake', from_path: 'wh/customers', from_column: 'name' }]
+					}
+				]
+			}
+		],
+		edges: [
+			{
+				runnable_path: 's1',
+				runnable_kind: 'script',
+				asset_kind: 'ducklake',
+				asset_path: 'wh/staging',
+				access_type: 'w'
+			},
+			{
+				runnable_path: 's2',
+				runnable_kind: 'script',
+				asset_kind: 'ducklake',
+				asset_path: 'wh/daily',
+				access_type: 'w'
+			}
+		]
+	}
+}
+
+const ORDERS_AMOUNT = colNodeId('ducklake', 'wh/orders', 'amount')
+const STAGING_AMT = colNodeId('ducklake', 'wh/staging', 'amt')
+const DAILY_TOTAL = colNodeId('ducklake', 'wh/daily', 'total')
+const DAILY_CUST = colNodeId('ducklake', 'wh/daily', 'cust')
+const CUSTOMERS_NAME = colNodeId('ducklake', 'wh/customers', 'name')
+
+describe('buildColumnGraph', () => {
+	it('stitches per-script lineage into a transitive graph via shared columns', () => {
+		const g = buildColumnGraph(chainGraph())
+		// orders.amount feeds staging.amt feeds daily.total
+		expect(g.up.get(STAGING_AMT)).toEqual(new Set([ORDERS_AMOUNT]))
+		expect(g.up.get(DAILY_TOTAL)).toEqual(new Set([STAGING_AMT]))
+		expect(g.down.get(ORDERS_AMOUNT)).toEqual(new Set([STAGING_AMT]))
+		expect(g.down.get(STAGING_AMT)).toEqual(new Set([DAILY_TOTAL]))
+	})
+
+	it('anchors to the // materialize target, not a guessed write-edge', () => {
+		const graph = chainGraph()
+		// s1 declares its materialize target and also has unordered extra
+		// ducklake writes; the lineage must anchor to the declared target.
+		const s1 = graph.runnables.find((r) => r.path === 's1')!
+		s1.materialize_target = { kind: 'ducklake', path: 'wh/staging' }
+		graph.edges.unshift({
+			runnable_path: 's1',
+			runnable_kind: 'script',
+			asset_kind: 'ducklake',
+			asset_path: 'wh/other',
+			access_type: 'w'
+		})
+		const g = buildColumnGraph(graph)
+		expect(g.nodes.has(STAGING_AMT)).toBe(true) // anchored to the declared target
+		expect(g.nodes.has(colNodeId('ducklake', 'wh/other', 'amt'))).toBe(false)
+	})
+
+	it('falls back to a ducklake write-edge when there is no materialize target', () => {
+		// chainGraph's runnables carry no materialize_target, so s1's lineage is
+		// anchored via its (single) ducklake write-edge.
+		const g = buildColumnGraph(chainGraph())
+		expect(g.nodes.has(STAGING_AMT)).toBe(true)
+	})
+
+	it('node ids are collision-proof across `#` / `:` in paths and columns', () => {
+		// A delimiter-concatenated id would merge these; the JSON-encoded id must not.
+		expect(colNodeId('ducklake', 'a#b', 'c')).not.toBe(colNodeId('ducklake', 'a', 'b#c'))
+		expect(colNodeId('ducklake', 'a:b', 'c')).not.toBe(colNodeId('ducklake', 'a', 'b:c'))
+	})
+
+	it('skips producers with no ducklake output asset (columns unanchorable)', () => {
+		const graph = chainGraph()
+		graph.edges = graph.edges.filter((e) => e.runnable_path !== 's1') // s1 loses its output edge
+		const g = buildColumnGraph(graph)
+		// staging.amt is no longer produced as a node by s1...
+		expect(g.up.has(STAGING_AMT)).toBe(false)
+		// ...but s2 still anchors daily.total ← staging.amt (staging.amt as a source).
+		expect(g.up.get(DAILY_TOTAL)).toEqual(new Set([STAGING_AMT]))
+	})
+})
+
+describe('traceColumn', () => {
+	it('returns the full upstream + downstream impact set of a source column', () => {
+		const g = buildColumnGraph(chainGraph())
+		// from the root source, the whole chain downstream is impacted
+		expect(traceColumn(ORDERS_AMOUNT, g)).toEqual(
+			new Set([ORDERS_AMOUNT, STAGING_AMT, DAILY_TOTAL])
+		)
+	})
+
+	it('traces backward from a sink to every contributing source', () => {
+		const g = buildColumnGraph(chainGraph())
+		expect(traceColumn(DAILY_TOTAL, g)).toEqual(new Set([DAILY_TOTAL, STAGING_AMT, ORDERS_AMOUNT]))
+		// the sibling output `cust` and its source are NOT in total's trace
+		expect(traceColumn(DAILY_TOTAL, g).has(DAILY_CUST)).toBe(false)
+		expect(traceColumn(DAILY_TOTAL, g).has(CUSTOMERS_NAME)).toBe(false)
+	})
+
+	it('traces an intermediate column both directions', () => {
+		const g = buildColumnGraph(chainGraph())
+		expect(traceColumn(STAGING_AMT, g)).toEqual(new Set([STAGING_AMT, ORDERS_AMOUNT, DAILY_TOTAL]))
+	})
+})
+
+describe('connectedComponent + depths', () => {
+	it('collects the neighborhood of an asset and lays it out by hop depth', () => {
+		const g = buildColumnGraph(chainGraph())
+		const seeds = assetColumnNodes(g, 'ducklake', 'wh/daily') // the sink asset
+		expect(new Set(seeds)).toEqual(new Set([DAILY_TOTAL, DAILY_CUST]))
+		const comp = connectedComponent(seeds, g)
+		expect(comp).toEqual(
+			new Set([DAILY_TOTAL, DAILY_CUST, STAGING_AMT, ORDERS_AMOUNT, CUSTOMERS_NAME])
+		)
+		const depths = computeDepths(comp, g)
+		expect(depths.get(ORDERS_AMOUNT)).toBe(0)
+		expect(depths.get(STAGING_AMT)).toBe(1)
+		expect(depths.get(DAILY_TOTAL)).toBe(2)
+		expect(depths.get(CUSTOMERS_NAME)).toBe(0)
+		expect(depths.get(DAILY_CUST)).toBe(1)
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/columnLineageGraph.ts b/frontend/src/lib/components/assets/AssetGraph/columnLineageGraph.ts
new file mode 100644
index 0000000000..50fa1c4e7b
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/columnLineageGraph.ts
@@ -0,0 +1,169 @@
+import type { AssetKind } from '$lib/gen'
+import type { AssetGraphResponse } from './types'
+
+// A node in the column-level lineage graph: one column of one asset.
+export type ColumnNode = { kind: AssetKind; path: string; column: string }
+export type ColumnNodeId = string
+
+// Collision-proof node id — JSON-encoded tuple, so a `#`/`:` inside a path or
+// (quoted) column name can't merge two distinct columns into one node.
+export function colNodeId(kind: AssetKind, path: string, column: string): ColumnNodeId {
+	return JSON.stringify([kind, path, column])
+}
+
+// The pipeline-wide column-lineage graph, stitched across every producer. Each
+// producer's `column_lineage` contributes single-hop edges (its output column ←
+// its source columns); shared (asset,column) nodes chain those hops into the
+// full transitive graph (`orders.amount → staging.amt → daily.total`).
+export type ColumnLineageGraph = {
+	nodes: Map<ColumnNodeId, ColumnNode>
+	// outputColumn → the source columns it derives from (walk upstream).
+	up: Map<ColumnNodeId, Set<ColumnNodeId>>
+	// sourceColumn → the output columns derived from it (walk downstream).
+	down: Map<ColumnNodeId, Set<ColumnNodeId>>
+}
+
+// Build the column graph from a resolved asset graph. A producer's
+// `column_lineage` describes the columns of the asset it materializes; that
+// output asset is the ducklake target it writes (v1 materialize target), found
+// from its write-edge. Producers without a known ducklake output are skipped
+// (their columns can't be anchored to an asset node).
+export function buildColumnGraph(graph: AssetGraphResponse): ColumnLineageGraph {
+	const nodes = new Map<ColumnNodeId, ColumnNode>()
+	const up = new Map<ColumnNodeId, Set<ColumnNodeId>>()
+	const down = new Map<ColumnNodeId, Set<ColumnNodeId>>()
+
+	const addNode = (n: ColumnNode): ColumnNodeId => {
+		const id = colNodeId(n.kind, n.path, n.column)
+		if (!nodes.has(id)) nodes.set(id, n)
+		return id
+	}
+	const addEdge = (src: ColumnNodeId, out: ColumnNodeId) => {
+		if (src === out) return
+		;(up.get(out) ?? up.set(out, new Set()).get(out)!).add(src)
+		;(down.get(src) ?? down.set(src, new Set()).get(src)!).add(out)
+	}
+
+	// The output asset a runnable's `column_lineage` describes. The declared
+	// `// materialize` target is authoritative (a multi-output script writes
+	// several ducklake tables, and the deployed write-edges are unordered, so
+	// picking "a" write-edge can anchor to the wrong asset). Fall back to a
+	// ducklake write-edge only for producers with no materialize annotation
+	// (e.g. a literal single-output CTAS).
+	const outputAsset = new Map<string, { kind: AssetKind; path: string }>()
+	for (const r of graph.runnables ?? []) {
+		if (r.materialize_target) {
+			outputAsset.set(`${r.usage_kind}:${r.path}`, r.materialize_target)
+		}
+	}
+	for (const e of graph.edges ?? []) {
+		const access = e.access_type ?? 'r'
+		const key = `${e.runnable_kind}:${e.runnable_path}`
+		if (
+			(access === 'w' || access === 'rw') &&
+			e.asset_kind === 'ducklake' &&
+			!outputAsset.has(key)
+		) {
+			outputAsset.set(key, { kind: e.asset_kind, path: e.asset_path })
+		}
+	}
+
+	for (const r of graph.runnables ?? []) {
+		const lineage = r.column_lineage
+		if (!lineage || lineage.length === 0) continue
+		const out = outputAsset.get(`${r.usage_kind}:${r.path}`)
+		if (!out) continue
+		for (const cl of lineage) {
+			const outId = addNode({ kind: out.kind, path: out.path, column: cl.column })
+			for (const inp of cl.inputs) {
+				const srcId = addNode({
+					kind: inp.from_kind,
+					path: inp.from_path,
+					column: inp.from_column
+				})
+				addEdge(srcId, outId)
+			}
+		}
+	}
+
+	return { nodes, up, down }
+}
+
+// Every node reachable from `start` by following `adj` (transitive closure,
+// excluding `start` itself). Iterative to avoid deep-recursion limits.
+function reach(start: ColumnNodeId, adj: Map<ColumnNodeId, Set<ColumnNodeId>>): Set<ColumnNodeId> {
+	const seen = new Set<ColumnNodeId>()
+	const stack = [start]
+	while (stack.length) {
+		const n = stack.pop()!
+		for (const m of adj.get(n) ?? []) {
+			if (!seen.has(m)) {
+				seen.add(m)
+				stack.push(m)
+			}
+		}
+	}
+	return seen
+}
+
+// The full transitive trace of a column: itself + all upstream ancestors + all
+// downstream descendants. This is the impact set — "everything that feeds, or
+// is fed by, this column".
+export function traceColumn(id: ColumnNodeId, g: ColumnLineageGraph): Set<ColumnNodeId> {
+	const out = new Set<ColumnNodeId>([id])
+	for (const a of reach(id, g.up)) out.add(a)
+	for (const d of reach(id, g.down)) out.add(d)
+	return out
+}
+
+// The connected neighborhood of a set of seed columns (an asset's columns):
+// the seeds plus everything upstream and downstream of any of them. This is the
+// subgraph the trace view renders around a selected asset.
+export function connectedComponent(
+	seeds: ColumnNodeId[],
+	g: ColumnLineageGraph
+): Set<ColumnNodeId> {
+	const out = new Set<ColumnNodeId>()
+	for (const s of seeds) {
+		if (!g.nodes.has(s)) continue
+		out.add(s)
+		for (const a of reach(s, g.up)) out.add(a)
+		for (const d of reach(s, g.down)) out.add(d)
+	}
+	return out
+}
+
+// All column-node ids belonging to one asset (its seed set for a trace).
+export function assetColumnNodes(
+	g: ColumnLineageGraph,
+	kind: AssetKind,
+	path: string
+): ColumnNodeId[] {
+	const ids: ColumnNodeId[] = []
+	for (const [id, n] of g.nodes) if (n.kind === kind && n.path === path) ids.push(id)
+	return ids
+}
+
+// Longest-path depth of each node within `ids`, sources at depth 0 and depth
+// increasing downstream — so a left→right layout reads upstream→downstream.
+// Cycle-guarded (lineage is a DAG, but be defensive).
+export function computeDepths(
+	ids: Set<ColumnNodeId>,
+	g: ColumnLineageGraph
+): Map<ColumnNodeId, number> {
+	const depth = new Map<ColumnNodeId, number>()
+	const visiting = new Set<ColumnNodeId>()
+	const d = (id: ColumnNodeId): number => {
+		const memo = depth.get(id)
+		if (memo !== undefined) return memo
+		if (visiting.has(id)) return 0
+		visiting.add(id)
+		let m = 0
+		for (const u of g.up.get(id) ?? []) if (ids.has(u)) m = Math.max(m, d(u) + 1)
+		visiting.delete(id)
+		depth.set(id, m)
+		return m
+	}
+	for (const id of ids) d(id)
+	return depth
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/graphTraversal.test.ts b/frontend/src/lib/components/assets/AssetGraph/graphTraversal.test.ts
index 08da865d61..197d7eca6c 100644
--- a/frontend/src/lib/components/assets/AssetGraph/graphTraversal.test.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/graphTraversal.test.ts
@@ -1,6 +1,10 @@
 import { describe, expect, it } from 'vitest'
 import type { AssetGraphResponse } from './types'
-import { buildDownstreamMap, computeDownstreamClosure } from './graphTraversal'
+import {
+	buildDownstreamMap,
+	computeDownstreamClosure,
+	computeInducedSchedule
+} from './graphTraversal'
 
 /** Direct (one-hop) subscriber script paths of `scriptPath`. */
 function downstreamSubscribers(g: AssetGraphResponse, scriptPath: string): string[] {
@@ -170,3 +174,54 @@ describe('computeDownstreamClosure', () => {
 		expect(cl.cyclic).toEqual([])
 	})
 })
+
+describe('computeInducedSchedule', () => {
+	// a → b → c → d linear chain through assets.
+	const chain = () =>
+		graph(
+			[
+				['a', 'xa'],
+				['b', 'xb'],
+				['c', 'xc']
+			],
+			[
+				['b', 'xa'],
+				['c', 'xb'],
+				['d', 'xc']
+			]
+		)
+
+	it('orders a subset topologically and keeps only in-set edges', () => {
+		const sched = computeInducedSchedule(chain(), new Set(['a', 'b', 'c']))
+		expect(sched.nodes).toEqual(['a', 'b', 'c'])
+		expect(sched.roots).toEqual(['a'])
+		expect(sched.indegree.get('b')).toBe(1)
+		expect([...(sched.edges.get('c') ?? [])]).toEqual([]) // d is out of set
+		expect(sched.cyclic).toEqual([])
+	})
+
+	it('a gap in the selected set produces two independent roots', () => {
+		// pick a and c (skip b): with b excluded there is no in-set edge, so both
+		// are roots.
+		const sched = computeInducedSchedule(chain(), new Set(['a', 'c']))
+		expect(sched.roots.sort()).toEqual(['a', 'c'])
+		expect(sched.indegree.get('c')).toBe(0)
+	})
+
+	it('reports cyclic members instead of hanging', () => {
+		// b ↔ c cycle.
+		const g = graph(
+			[
+				['b', 'y'],
+				['c', 'z']
+			],
+			[
+				['c', 'y'],
+				['b', 'z']
+			]
+		)
+		const sched = computeInducedSchedule(g, new Set(['b', 'c']))
+		expect(sched.nodes).toEqual([])
+		expect(sched.cyclic.sort()).toEqual(['b', 'c'])
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/graphTraversal.ts b/frontend/src/lib/components/assets/AssetGraph/graphTraversal.ts
index 6b53020ddb..cc59e8f3a8 100644
--- a/frontend/src/lib/components/assets/AssetGraph/graphTraversal.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/graphTraversal.ts
@@ -1,6 +1,31 @@
-import type { AssetGraphResponse } from './types'
+import type { AssetGraphResponse, AssetGraphSelection } from './types'
 import { assetKey, buildAssetSubscribers, isWriteEdge } from './lib'
 
+// Scripts that WRITE the selected asset (its producers), from the graph's
+// `w`/`rw` lineage edges. `[]` for a non-asset selection. Shared by the route
+// page and the dev preview so "who writes this asset" is defined once and can't
+// drift between the two surfaces.
+export function assetProducers(
+	graph: AssetGraphResponse,
+	selection: AssetGraphSelection | undefined
+): Array<{ kind: 'script' | 'flow'; path: string; unsaved?: boolean }> {
+	if (!selection || selection.kind !== 'asset') return []
+	return graph.edges
+		.filter((e) => {
+			const access = e.access_type ?? 'r'
+			return (
+				(access === 'w' || access === 'rw') &&
+				e.asset_kind === selection.asset_kind &&
+				e.asset_path === selection.path
+			)
+		})
+		.map((e) => ({
+			kind: e.runnable_kind as 'script' | 'flow',
+			path: e.runnable_path,
+			unsaved: e.unsaved
+		}))
+}
+
 // Execution-DAG traversal over the resolved asset graph (drafts included).
 //
 // The execution edges are producer→subscriber: a script S1 *produces* an
@@ -117,3 +142,87 @@ export function computeDownstreamClosure(g: AssetGraphResponse, root: string): D
 	}
 	return { nodes: ordered, edges: cleanEdges, indegree: cleanIndegree, cyclic }
 }
+
+export type InducedSchedule = {
+	/** Selected scripts that are schedulable, in a topological order. */
+	nodes: string[]
+	/** In-set dependency edges: `edges.get(p)` = in-set subscribers of `p`. */
+	edges: Map<string, Set<string>>
+	/** In-set upstream count per node. */
+	indegree: Map<string, number>
+	/** Schedulable scripts with no in-set upstream — the schedule's seeds. */
+	roots: string[]
+	/**
+	 * Selected scripts on (or fed only through) a cycle. Excluded from
+	 * `nodes`/`edges`/`indegree`/`roots`; surfaced so callers can warn.
+	 */
+	cyclic: string[]
+}
+
+/**
+ * Topological schedule of an arbitrary *set* of scripts (e.g. a bounded-cascade
+ * selection), respecting only the dependency edges that fall *inside* the set.
+ * Multi-root: every selected script with no in-set upstream is a seed.
+ * Cycle-safe in the same way as `computeDownstreamClosure`.
+ *
+ * `oneHop` is the producer→consumer adjacency (script path → downstream script
+ * paths). It defaults to the `// on` subscriber map — but a bounded run passes
+ * a *read-aware* map (boundedCascade.buildLineageDownstreamMap) so a selected
+ * script that merely *reads* an upstream asset still runs after its producer,
+ * matching the CLI's `topoOrder`. Keep the default subscriber-only: it mirrors
+ * the production asset-trigger dispatch the unbounded cascade simulates.
+ */
+export function computeInducedSchedule(
+	g: AssetGraphResponse,
+	selected: Set<string>,
+	oneHop: Map<string, Set<string>> = buildDownstreamMap(g)
+): InducedSchedule {
+	// In-set edges + indegrees.
+	const edges = new Map<string, Set<string>>()
+	const indegree = new Map<string, number>()
+	for (const n of selected) indegree.set(n, 0)
+	for (const p of selected) {
+		const subs = new Set<string>()
+		for (const s of oneHop.get(p) ?? []) {
+			if (!selected.has(s)) continue
+			subs.add(s)
+			indegree.set(s, (indegree.get(s) ?? 0) + 1)
+		}
+		if (subs.size > 0) edges.set(p, subs)
+	}
+
+	// Kahn from every indegree-0 node.
+	const seeds = [...selected].filter((n) => (indegree.get(n) ?? 0) === 0)
+	const remaining = new Map(indegree)
+	const ready = [...seeds]
+	const ordered: string[] = []
+	while (ready.length > 0) {
+		const n = ready.shift()!
+		ordered.push(n)
+		for (const s of edges.get(n) ?? []) {
+			const d = (remaining.get(s) ?? 0) - 1
+			remaining.set(s, d)
+			if (d === 0) ready.push(s)
+		}
+	}
+
+	const orderedSet = new Set(ordered)
+	const cyclic = [...selected].filter((n) => !orderedSet.has(n))
+	if (cyclic.length === 0) {
+		return { nodes: ordered, edges, indegree, roots: seeds, cyclic }
+	}
+
+	// Strip cyclic nodes from the schedulable structures.
+	const cyclicSet = new Set(cyclic)
+	const cleanEdges = new Map<string, Set<string>>()
+	const cleanIndegree = new Map<string, number>()
+	for (const n of ordered) cleanIndegree.set(n, 0)
+	for (const [p, subs] of edges) {
+		if (cyclicSet.has(p)) continue
+		const kept = new Set([...subs].filter((s) => !cyclicSet.has(s)))
+		if (kept.size > 0) cleanEdges.set(p, kept)
+		for (const s of kept) cleanIndegree.set(s, (cleanIndegree.get(s) ?? 0) + 1)
+	}
+	const roots = ordered.filter((n) => (cleanIndegree.get(n) ?? 0) === 0)
+	return { nodes: ordered, edges: cleanEdges, indegree: cleanIndegree, roots, cyclic }
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.parity.test.ts b/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.parity.test.ts
index dfb5385253..82047e9528 100644
--- a/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.parity.test.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.parity.test.ts
@@ -17,7 +17,14 @@ const ASSERTED_TS_FIELDS: Record<keyof PipelineAnnotations, true> = {
 	partition: true,
 	freshness: true,
 	tag: true,
-	retry: true
+	retry: true,
+	materialize: true,
+	dataTests: true,
+	columnLineage: true,
+	macros: true,
+	useLibs: true,
+	muteAssets: true,
+	muteAll: true
 }
 
 // Parser-parity guard: this TS parser (drives the live graph preview) and
@@ -58,6 +65,34 @@ type Fixture = {
 		freshness: string | null
 		tag: string | null
 		retry: { count: number; delay: string | null } | null
+		materialize?: {
+			target_kind: string
+			target_path: string
+			manual?: boolean
+			append?: boolean
+			unique_key?: string | null
+			scd2?: boolean
+			track?: string[]
+			close_deleted?: boolean
+			// "warn" | "ignore"; absent === "warn" (the default)
+			on_schema_change?: string
+		} | null
+		// Snake_case form matching the Rust `DataTest` serde output, so the one
+		// corpus drives both sides. The TS parser emits this shape verbatim
+		// (snake_case fields), so the comparison is 1:1. Absent === [].
+		data_tests?: Array<Record<string, unknown>>
+		// Snake_case `ColumnLineage` serde shape — TS parser emits it verbatim,
+		// so the comparison is 1:1. Absent === [].
+		column_lineage?: Array<Record<string, unknown>>
+		// `// macros` marker. Absent === false.
+		macros?: boolean
+		// `// use <lib_path>` accumulation, declaration order, deduped. Absent === [].
+		use_libs?: string[]
+		// `// mute <asset>` accumulation as `kind:path`, declaration order, deduped.
+		// Absent === [].
+		mute?: string[]
+		// `// mute all` marker. Absent === false.
+		mute_all?: boolean
 	}
 }
 
@@ -126,6 +161,53 @@ describe('parsePipelineAnnotations matches the shared Rust fixture corpus', () =
 				expect(got.retry?.count, 'retry count').toBe(f.expected.retry.count)
 				expect(got.retry?.delay, 'retry delay').toEqual(f.expected.retry.delay ?? undefined)
 			}
+
+			if (f.expected.materialize == null) {
+				expect(got.materialize, 'materialize').toBeUndefined()
+			} else {
+				expect(got.materialize?.targetKind, 'materialize target kind').toBe(
+					f.expected.materialize.target_kind
+				)
+				expect(got.materialize?.targetPath, 'materialize target path').toBe(
+					f.expected.materialize.target_path
+				)
+				expect(got.materialize?.manual ?? false, 'materialize manual').toBe(
+					f.expected.materialize.manual ?? false
+				)
+				expect(got.materialize?.append ?? false, 'materialize append').toBe(
+					f.expected.materialize.append ?? false
+				)
+				expect(got.materialize?.uniqueKey, 'materialize key').toEqual(
+					f.expected.materialize.unique_key ?? undefined
+				)
+				expect(got.materialize?.scd2 ?? false, 'materialize scd2').toBe(
+					f.expected.materialize.scd2 ?? false
+				)
+				expect(got.materialize?.track ?? [], 'materialize track').toEqual(
+					f.expected.materialize.track ?? []
+				)
+				expect(got.materialize?.closeDeleted ?? false, 'materialize close_deleted').toBe(
+					f.expected.materialize.close_deleted ?? false
+				)
+				expect(got.materialize?.onSchemaChange ?? 'warn', 'materialize on_schema_change').toBe(
+					f.expected.materialize.on_schema_change ?? 'warn'
+				)
+			}
+
+			expect(got.dataTests, 'data tests').toEqual(f.expected.data_tests ?? [])
+
+			expect(got.columnLineage, 'column lineage').toEqual(f.expected.column_lineage ?? [])
+
+			expect(got.macros, 'macros').toBe(f.expected.macros ?? false)
+
+			expect(got.useLibs, 'use_libs').toEqual(f.expected.use_libs ?? [])
+
+			expect(
+				got.muteAssets.map((a) => `${a.kind}:${a.path}`),
+				'mute'
+			).toEqual(f.expected.mute ?? [])
+
+			expect(got.muteAll, 'mute_all').toBe(f.expected.mute_all ?? false)
 		})
 	}
 })
diff --git a/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.test.ts b/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.test.ts
index f73819b959..51aaf97f52 100644
--- a/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.test.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.test.ts
@@ -1,5 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import { parsePipelineAnnotations } from './parsePipelineAnnotations'
+import {
+	mergeColumnLineage,
+	parseDurationSecs,
+	parsePipelineAnnotations,
+	type ColumnLineage
+} from './parsePipelineAnnotations'
 
 // Unit-test the TS mirror of the backend `parse_pipeline_annotations`. The
 // two implementations MUST stay behaviorally identical — these tests are
@@ -25,6 +30,45 @@ describe('parsePipelineAnnotations: tag', () => {
 		const out = parsePipelineAnnotations('// tagged heavy')
 		expect(out.tag).toBeUndefined()
 	})
+
+	it('skips a tag value containing whitespace (regular comment false-positive)', () => {
+		const out = parsePipelineAnnotations('# tag this function so we remember to refactor it later')
+		expect(out.tag).toBeUndefined()
+	})
+
+	it('skips a tag value longer than 50 chars', () => {
+		const out = parsePipelineAnnotations('// tag ' + 'x'.repeat(51))
+		expect(out.tag).toBeUndefined()
+	})
+})
+
+describe('parsePipelineAnnotations: header scan', () => {
+	it('ignores annotations in the body once code has started', () => {
+		const code = [
+			'import pandas as pd',
+			'',
+			'def main():',
+			'    # tag each row with its source so downstream steps can filter',
+			'    # on s3://should/not/parse',
+			'    return pd.DataFrame()'
+		].join('\n')
+		const out = parsePipelineAnnotations(code)
+		expect(out.tag).toBeUndefined()
+		expect(out.triggerAssets).toHaveLength(0)
+	})
+
+	it('tolerates blank lines before code but stops at the first code line', () => {
+		const code = ['#!/usr/bin/env python', '', '# tag heavy', 'import os', '# tag light'].join('\n')
+		const out = parsePipelineAnnotations(code)
+		expect(out.tag).toBe('heavy')
+	})
+
+	it('strips trailing key=value opts from a // on asset ref', () => {
+		// The path must be the bare asset, not `main.orders debounce=60s`, so it
+		// dedups against body inference and matches the deploy path.
+		const out = parsePipelineAnnotations('// on ducklake://main.orders debounce=60s')
+		expect(out.triggerAssets).toEqual([{ kind: 'ducklake', path: 'main.orders' }])
+	})
 })
 
 describe('parsePipelineAnnotations: retry', () => {
@@ -59,6 +103,33 @@ describe('parsePipelineAnnotations: retry', () => {
 	})
 })
 
+describe('parsePipelineAnnotations: macros + use', () => {
+	it('parses the bare macros marker', () => {
+		const out = parsePipelineAnnotations('// macros\nCREATE MACRO m(a) AS a;')
+		expect(out.macros).toBe(true)
+	})
+
+	it('macros marker is strict — trailing prose and variants rejected', () => {
+		expect(parsePipelineAnnotations('// macros are defined below\n').macros).toBe(false)
+		expect(parsePipelineAnnotations('// macros_v2\n').macros).toBe(false)
+		expect(parsePipelineAnnotations('-- macros   \nSELECT 1;').macros).toBe(true)
+	})
+
+	it('use accumulates in order and dedups', () => {
+		const out = parsePipelineAnnotations(
+			'// use f/lib/stats\n// use f/lib/dates\n// use f/lib/stats\n'
+		)
+		expect(out.useLibs).toEqual(['f/lib/stats', 'f/lib/dates'])
+	})
+
+	it('use rejects prose, slashless and multi-token values', () => {
+		const out = parsePipelineAnnotations(
+			'// use this script to compute\n// use standalone\n// use f/lib/ok extra\n'
+		)
+		expect(out.useLibs).toEqual([])
+	})
+})
+
 describe('parsePipelineAnnotations: combined', () => {
 	it('parses all keywords together', () => {
 		const code = [
@@ -99,3 +170,66 @@ describe('parsePipelineAnnotations: data_upload', () => {
 		expect(out.nativeTriggers).toEqual([])
 	})
 })
+
+describe('mergeColumnLineage', () => {
+	const ref = (path: string, col: string): ColumnLineage['inputs'][number] => ({
+		from_kind: 'ducklake',
+		from_path: path,
+		from_column: col
+	})
+
+	it('annotation wins per output column; inferred fills the rest (mirrors Rust)', () => {
+		const inferred: ColumnLineage[] = [
+			{ column: 'total', inputs: [ref('w/o', 'amount')] },
+			{ column: 'qty', inputs: [ref('w/o', 'qty')] }
+		]
+		const annotated: ColumnLineage[] = [{ column: 'total', inputs: [ref('w/manual', 'grand')] }]
+		const merged = mergeColumnLineage(inferred, annotated)
+		expect(merged).toEqual([
+			{ column: 'total', inputs: [ref('w/manual', 'grand')] }, // annotation, first + authoritative
+			{ column: 'qty', inputs: [ref('w/o', 'qty')] } // inferred, not overridden
+		])
+	})
+
+	it('returns annotations unchanged when there is no inferred lineage', () => {
+		const annotated: ColumnLineage[] = [{ column: 'a', inputs: [ref('w/o', 'a')] }]
+		expect(mergeColumnLineage([], annotated)).toEqual(annotated)
+	})
+})
+
+// Mirror of the Rust `parse_duration_secs` tests (windmill-common assets.rs)
+// — the freshness chip's staleness verdict depends on identical parsing.
+describe('parseDurationSecs', () => {
+	it('parses suffixed durations', () => {
+		expect(parseDurationSecs('30s')).toBe(30)
+		expect(parseDurationSecs('5m')).toBe(300)
+		expect(parseDurationSecs('2h')).toBe(7200)
+		expect(parseDurationSecs('1d')).toBe(86400)
+	})
+
+	it('bare integer means seconds', () => {
+		expect(parseDurationSecs('45')).toBe(45)
+	})
+
+	it('tolerates surrounding whitespace', () => {
+		expect(parseDurationSecs(' 5 m ')).toBe(300)
+	})
+
+	it('accepts an explicit plus sign (Rust i64 parsing does)', () => {
+		expect(parseDurationSecs('+5m')).toBe(300)
+		expect(parseDurationSecs('+45')).toBe(45)
+	})
+
+	it('rejects malformed / non-positive input', () => {
+		expect(parseDurationSecs('')).toBeUndefined()
+		expect(parseDurationSecs('h')).toBeUndefined()
+		expect(parseDurationSecs('1.5h')).toBeUndefined()
+		expect(parseDurationSecs('-5m')).toBeUndefined()
+		expect(parseDurationSecs('0')).toBeUndefined()
+		expect(parseDurationSecs('fast')).toBeUndefined()
+	})
+
+	it('rejects values beyond i32 seconds (mirrors backend cap)', () => {
+		expect(parseDurationSecs('999999999d')).toBeUndefined()
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.ts b/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.ts
index 88e30def4e..f9e53494ff 100644
--- a/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/parsePipelineAnnotations.ts
@@ -67,6 +67,28 @@ export type FreshnessSpec = {
 	duration: string
 }
 
+// Mirrors backend `parse_duration_secs` (windmill-common assets.rs): a bare
+// integer means seconds, otherwise `<n>` with an `s`/`m`/`h`/`d` suffix
+// (e.g. `30s`, `5m`, `2h`, `1d`). Returns undefined for malformed or
+// non-positive input so a typo'd `// freshness` window fails safe (the chip
+// stays neutral instead of guessing a staleness verdict).
+export function parseDurationSecs(s: string): number | undefined {
+	const t = s.trim()
+	if (!t) return undefined
+	const last = t[t.length - 1]
+	const mult =
+		last === 's' ? 1 : last === 'm' ? 60 : last === 'h' ? 3600 : last === 'd' ? 86400 : undefined
+	const num = (mult !== undefined ? t.slice(0, -1) : t).trim()
+	// `+?`: Rust's i64 parsing accepts an explicit plus sign (`+5m`), so the
+	// mirror must too — divergence here would leave the chip neutral for a
+	// window the deploy path and watchdog honor.
+	if (mult === undefined && !/^\+?\d+$/.test(t)) return undefined
+	if (!/^\+?\d+$/.test(num)) return undefined
+	const secs = Number(num) * (mult ?? 1)
+	if (!Number.isSafeInteger(secs) || secs <= 0 || secs > 2147483647) return undefined
+	return secs
+}
+
 // `// retry <count> [<delay>]` — see backend RetrySpec. Delay is kept as the
 // raw duration string and resolved to seconds at deploy.
 export type RetrySpec = {
@@ -74,6 +96,105 @@ export type RetrySpec = {
 	delay?: string
 }
 
+// `// materialize [manual] <asset> [append] [key=<col>]` — see backend
+// MaterializeSpec. Managed by default (the runtime generates the write DDL
+// around a single SELECT); `manual` opts out (the script writes its own DDL,
+// track-only). `append` / `key` / `history` / `track` are managed-mode strategy
+// options; `key=<col> history` (or the `scd2` alias) selects SCD type-2 history,
+// and `deletes=close` opts scd2 into hard-delete-close.
+export type MaterializeSpec = {
+	targetKind: AssetKind
+	targetPath: string
+	// track-only escape hatch; absent === false (managed)
+	manual?: boolean
+	// INSERT-only strategy; absent === false
+	append?: boolean
+	// merge key; absent === replace (or append). Also the SCD2 natural key.
+	uniqueKey?: string
+	// SCD2 managed history mode (valid_from/valid_to/is_current); absent === false
+	scd2?: boolean
+	// SCD2 tracked columns (change ⇒ new version); empty ⇒ all non-key columns
+	track?: string[]
+	// SCD2 hard-delete-close (`deletes=close`): close absent keys; absent === false
+	closeDeleted?: boolean
+	// `on_schema_change=ignore` opts the produced asset out of downstream
+	// schema-contract warnings (save-time metadata only). Default `warn`;
+	// `fail` is deliberately unrecognized in v1 (saves never hard-block).
+	onSchemaChange?: 'warn' | 'ignore'
+}
+
+// The `<targetPath>_current` SCD2 companion view this managed materialize also
+// produces, or `undefined` when it isn't a managed scd2 target. Mirrors Rust
+// `MaterializeSpec::scd2_current_target`: managed scd2 creates the base table
+// *and* the `_current` view each run; `manual` mode owns its own DDL and creates
+// no companion. The graph surfaces register it as a second write of the producer
+// so a read of the view links back instead of orphaning.
+export function scd2CurrentTargetPath(m: MaterializeSpec): string | undefined {
+	return m.scd2 && !m.manual ? `${m.targetPath}_current` : undefined
+}
+
+// `// data_test <kind> …` — a data-quality assertion run against the
+// freshly-materialized asset, failing the run on violation. See backend
+// `DataTest`. The first extensible annotation family: a keyword head selects
+// the variant, the rest is parsed per-variant; a sibling family (e.g.
+// column-lineage) follows the same shape. Built-ins mirror dbt's generic data
+// tests; `custom` is dbt's singular-test escape hatch (a DuckDB script path).
+// Keyword is `data_test`, NOT `test`, to stay clear of the unrelated `// test:`
+// CI-test annotation.
+// Field names are snake_case to match the Rust `DataTest` serde output verbatim
+// — the same type is populated both by this parser (live drafts) and by the
+// backend graph endpoint (deployed nodes), so the two must be wire-identical.
+export type DataTest =
+	| { type: 'unique'; column: string }
+	| { type: 'not_null'; column: string }
+	| { type: 'accepted_values'; column: string; values: string[] }
+	| {
+			type: 'relationships'
+			column: string
+			to_kind: AssetKind
+			to_path: string
+			to_column: string
+	  }
+	| { type: 'custom'; path: string }
+
+// `// column <out_col> <- <asset-uri>.<col>[, …]` — declared column-level
+// lineage: one output column and the upstream source columns it derives from.
+// See backend `ColumnLineage`. A sibling of `DataTest` in the extensible
+// annotation family — same parse shape, accumulating (one line per output
+// column) — but pure metadata: drives the column-lineage graph view, runs no
+// probe. Field names are snake_case to match the Rust `ColumnLineage` serde
+// output verbatim, so the live-draft parse and the backend graph endpoint
+// (deployed nodes) produce wire-identical shapes.
+export type ColumnRef = {
+	from_kind: AssetKind
+	from_path: string
+	from_column: string
+}
+export type ColumnLineage = {
+	column: string
+	inputs: ColumnRef[]
+}
+
+// Combine body-inferred column lineage with `// column` annotations, the
+// annotation winning per output column. Mirrors the Rust `merge_column_lineage`
+// (`asset_parser.rs`) so the live-draft preview matches what deploys: the
+// backend already merges inferred + annotated server-side, and the live graph
+// must apply the same precedence to the WASM-inferred lineage.
+export function mergeColumnLineage(
+	inferred: ColumnLineage[],
+	annotated: ColumnLineage[]
+): ColumnLineage[] {
+	const seen = new Set(annotated.map((c) => c.column))
+	const out = [...annotated]
+	for (const c of inferred) {
+		if (!seen.has(c.column)) {
+			seen.add(c.column)
+			out.push(c)
+		}
+	}
+	return out
+}
+
 export type PipelineAnnotations = {
 	inPipeline: boolean
 	triggerAssets: PipelineTriggerAsset[]
@@ -82,6 +203,26 @@ export type PipelineAnnotations = {
 	freshness?: FreshnessSpec
 	tag?: string
 	retry?: RetrySpec
+	// `// materialize [manual] <asset> [append] [key=<col>]` — target + strategy.
+	materialize?: MaterializeSpec
+	// `// data_test <kind> …` — accumulating data-quality checks (multiple lines).
+	dataTests: DataTest[]
+	// `// column <out> <- <src>.<col>[, …]` — accumulating column lineage.
+	columnLineage: ColumnLineage[]
+	// Bare `// macros` (alone on the line, like `// pipeline`) — marks this
+	// DuckDB script as a workspace macro library.
+	macros: boolean
+	// `// use <lib_script_path>` — force-inject the named macro library into
+	// this script's jobs. Accumulating, declaration order, deduped.
+	useLibs: string[]
+	// `// mute <asset>` — suppress the auto-derived cascade edge for a read
+	// that would otherwise trigger this script (a lookup / SCD input). Only
+	// asset refs; native trigger kinds are never auto-derived. Accumulating,
+	// deduped.
+	muteAssets: PipelineTriggerAsset[]
+	// `// mute all` — opt out of auto-derivation entirely (explicit `// on`
+	// edges are unaffected).
+	muteAll: boolean
 }
 
 // Tokenize a `key=value [key="quoted value"] ...` option string. Bare
@@ -121,15 +262,224 @@ function parseKvOpts(s: string): Map<string, string> {
 	return out
 }
 
+// Drop a `// on` right-hand side's trailing `key=value` opts (e.g.
+// `debounce=60s`), returning just the trigger ref. The opts start at the first
+// whitespace-delimited token shaped like `<ident>=…`; everything before is the
+// ref. Mirrors Rust `split_trailing_kv_opts` — asset refs never contain a space
+// followed by an `ident=` token, so without this `// on ducklake://t debounce=1s`
+// would keep the path as `t debounce=1s` and desync the live canvas from deploy.
+function stripTrailingKvOpts(s: string): string {
+	const m = s.match(/\s([A-Za-z_][A-Za-z0-9_]*)=/)
+	return (m?.index !== undefined ? s.slice(0, m.index) : s).trimEnd()
+}
+
 function parseAssetSyntax(s: string): PipelineTriggerAsset | undefined {
 	for (const [prefix, kind] of ASSET_PREFIXES) {
 		if (s.startsWith(prefix)) {
-			return { kind, path: s.slice(prefix.length) }
+			let path = s.slice(prefix.length)
+			// Mirror the Rust `parse_asset_syntax` S3 canonicalization: strip all
+			// leading slashes so the SDK object form (`s3:///key`, default
+			// storage) and DuckDB / `// on s3://key` share one asset path, and a
+			// canonical key never starts with `/` (so ref reconstruction
+			// round-trips). Without this the live graph preview would show
+			// disconnected `/key` and `key` nodes. S3-only; leading slashes only,
+			// so Hive-partition keys are untouched.
+			if (kind === 's3object') {
+				path = path.replace(/^\/+/, '')
+			}
+			return { kind, path }
 		}
 	}
 	return undefined
 }
 
+// Mirror of Rust `parse_asset_syntax(s, enable_default_syntax=true)`: the bare
+// words `ducklake` / `datatable` are shorthand for their `…://main` form. Used
+// by `// materialize` (but NOT by `// on`, which is default-syntax off, so the
+// trigger parser keeps using `parseAssetSyntax`).
+function parseAssetSyntaxDefault(s: string): PipelineTriggerAsset | undefined {
+	if (s === 'datatable') return { kind: 'datatable', path: 'main' }
+	if (s === 'ducklake') return { kind: 'ducklake', path: 'main' }
+	return parseAssetSyntax(s)
+}
+
+// Parse a `// materialize [manual] <asset> [append] [key=<col>] [history]
+// [track=<c1,c2>]` right-hand side. Optional leading `manual` word opts out of
+// managed mode; a leading `scd2` word is an alias for the `history` flag; the
+// next token is the target asset URI (default-syntax shorthands enabled); the
+// remainder are strategy options (`append` flag, `key=<col>`, `history` flag,
+// `track=<c1,c2,…>`, `deletes=close`, `on_schema_change=ignore`). Missing/empty
+// target → undefined (dropped).
+function parseMaterializeSpec(s: string): MaterializeSpec | undefined {
+	// One optional leading mode keyword: `manual` (track-only) or `scd2` (an alias
+	// for the `history` flag below).
+	let manual = false
+	let scd2Kw = false
+	let rest = s
+	const afterManual = consumeKeyword(s, 'manual')
+	const afterScd2 = afterManual === undefined ? consumeKeyword(s, 'scd2') : undefined
+	if (afterManual !== undefined) {
+		manual = true
+		rest = afterManual.trimStart()
+	} else if (afterScd2 !== undefined) {
+		scd2Kw = true
+		rest = afterScd2.trimStart()
+	}
+	rest = rest.trim()
+	const m = rest.match(/^(\S+)(?:\s+(.*))?$/)
+	if (!m) return undefined
+	const asset = parseAssetSyntaxDefault(m[1])
+	if (!asset || asset.path === '') return undefined
+	const optsStr = m[2] ?? ''
+	const optTokens = optsStr.split(/\s+/)
+	const append = optTokens.some((t) => t === 'append')
+	// SCD type-2 history: primary spelling is the bare `history` flag on a keyed
+	// merge; the leading `scd2` keyword is a recognized alias.
+	const scd2 = scd2Kw || optTokens.some((t) => t === 'history')
+	const opts = parseKvOpts(optsStr)
+	const key = opts.get('key')
+	const uniqueKey = key && key !== '' ? key : undefined
+	// `track=<c1,c2,…>` (scd2): comma-separated tracked columns; empty ⇒ all.
+	// The value is whitespace-terminated (like every `=`-option), so it must have
+	// no spaces (`track=a,b`, not `track=a, b` — the rest is dropped).
+	const track = (opts.get('track') ?? '')
+		.split(',')
+		.map((c) => c.trim())
+		.filter((c) => c !== '')
+	// `deletes=close` (scd2 only) opts into hard-delete-close; any other value
+	// (or absence) keeps the soft-delete default.
+	const closeDeleted = opts.get('deletes') === 'close'
+	// `on_schema_change=ignore` suppresses downstream contract warnings; any
+	// other value (or absence) keeps the `warn` default, fail-safe like `deletes=`.
+	const onSchemaChange = opts.get('on_schema_change') === 'ignore' ? 'ignore' : 'warn'
+	return {
+		targetKind: asset.kind,
+		targetPath: asset.path,
+		manual,
+		append,
+		uniqueKey,
+		scd2,
+		track,
+		closeDeleted,
+		onSchemaChange
+	}
+}
+
+// A single bare identifier token (column name). Rejects empty / multi-token
+// input. Mirrors Rust `single_ident`.
+function singleIdent(s: string): string | undefined {
+	const t = s.trim()
+	if (t === '' || t.split(/\s+/).length !== 1) return undefined
+	return t
+}
+
+// Strip one layer of matching surrounding single or double quotes.
+function unquote(s: string): string {
+	if (s.length >= 2 && (s[0] === '"' || s[0] === "'") && s[s.length - 1] === s[0]) {
+		return s.slice(1, -1)
+	}
+	return s
+}
+
+// `<col> = a,b,c`. Mirrors Rust `parse_accepted_values`.
+function parseAcceptedValues(s: string): DataTest | undefined {
+	const eq = s.indexOf('=')
+	if (eq < 0) return undefined
+	const column = singleIdent(s.slice(0, eq))
+	if (!column) return undefined
+	const values = s
+		.slice(eq + 1)
+		.split(',')
+		.map((v) => unquote(v.trim()))
+		.filter((v) => v !== '')
+	if (values.length === 0) return undefined
+	return { type: 'accepted_values', column, values }
+}
+
+// `<col> -> <asset-uri>.<refcol>`. Mirrors Rust `parse_relationships`.
+function parseRelationships(s: string): DataTest | undefined {
+	const arrow = s.indexOf('->')
+	if (arrow < 0) return undefined
+	const column = singleIdent(s.slice(0, arrow))
+	if (!column) return undefined
+	const target = s.slice(arrow + 2).trim()
+	const dot = target.lastIndexOf('.')
+	if (dot < 0) return undefined
+	const toColumn = singleIdent(target.slice(dot + 1))
+	if (!toColumn) return undefined
+	const asset = parseAssetSyntaxDefault(target.slice(0, dot).trim())
+	if (!asset || asset.path === '') return undefined
+	return {
+		type: 'relationships',
+		column,
+		to_kind: asset.kind,
+		to_path: asset.path,
+		to_column: toColumn
+	}
+}
+
+// `<asset-uri>.<col>` upstream reference. The column is the segment after the
+// final `.`; the rest is the asset URI (default-syntax shorthands enabled).
+// Mirrors Rust `parse_column_ref`.
+function parseColumnRef(s: string): ColumnRef | undefined {
+	const dot = s.lastIndexOf('.')
+	if (dot < 0) return undefined
+	const fromColumn = singleIdent(s.slice(dot + 1))
+	if (!fromColumn) return undefined
+	const asset = parseAssetSyntaxDefault(s.slice(0, dot).trim())
+	if (!asset || asset.path === '') return undefined
+	return { from_kind: asset.kind, from_path: asset.path, from_column: fromColumn }
+}
+
+// `<out_col> <- <ref>[, <ref> …]`. Individually malformed refs are dropped; the
+// line is kept iff ≥1 ref parses (mirrors `parseAcceptedValues`). A missing
+// `<-`, a non-ident output column, or zero valid refs drops the line.
+// Mirrors Rust `parse_column_lineage_spec`.
+function parseColumnLineageSpec(s: string): ColumnLineage | undefined {
+	const arrow = s.indexOf('<-')
+	if (arrow < 0) return undefined
+	const column = singleIdent(s.slice(0, arrow))
+	if (!column) return undefined
+	const inputs = s
+		.slice(arrow + 2)
+		.split(',')
+		.map((r) => parseColumnRef(r.trim()))
+		.filter((r): r is ColumnRef => r !== undefined)
+	if (inputs.length === 0) return undefined
+	return { column, inputs }
+}
+
+// Parse a `// data_test <kind> …` right-hand side into one `DataTest`. The
+// leading token selects the variant; anything not a built-in keyword is the
+// `custom` escape hatch (a single script-path token). Returns `undefined` for
+// malformed input so a typo fails safe. Mirrors Rust `parse_data_test_spec`.
+function parseDataTestSpec(s: string): DataTest | undefined {
+	const trimmed = s.trim()
+	if (trimmed === '') return undefined
+	const m = trimmed.match(/^(\S+)(?:\s+([\s\S]*))?$/)
+	if (!m) return undefined
+	const head = m[1]
+	const rest = (m[2] ?? '').trim()
+	switch (head) {
+		case 'unique': {
+			const column = singleIdent(rest)
+			return column ? { type: 'unique', column } : undefined
+		}
+		case 'not_null': {
+			const column = singleIdent(rest)
+			return column ? { type: 'not_null', column } : undefined
+		}
+		case 'accepted_values':
+			return parseAcceptedValues(rest)
+		case 'relationships':
+			return parseRelationships(rest)
+		default:
+			// Custom escape hatch: the whole right-hand side must be one path
+			// token. Trailing content after a non-built-in head is rejected.
+			return rest === '' ? { type: 'custom', path: head } : undefined
+	}
+}
+
 type ParsedTriggerSpec =
 	| { kind: 'asset'; value: PipelineTriggerAsset }
 	| { kind: 'native'; value: PipelineNativeTrigger }
@@ -235,12 +585,23 @@ export function parsePipelineAnnotations(code: string): PipelineAnnotations {
 	const out: PipelineAnnotations = {
 		inPipeline: false,
 		triggerAssets: [],
-		nativeTriggers: []
+		nativeTriggers: [],
+		dataTests: [],
+		columnLineage: [],
+		macros: false,
+		useLibs: [],
+		muteAssets: [],
+		muteAll: false
 	}
 
 	for (const rawLine of code.split('\n')) {
+		// Annotations live in the leading comment header: skip blank lines but
+		// stop at the first line of actual code, so comments inside the body
+		// (e.g. a regular `# tag ...` prose comment) can't false-positive.
+		// Mirrors the Rust parse_pipeline_annotations header scan.
+		if (rawLine.trim() === '') continue
 		const rest = stripCommentPrefix(rawLine)
-		if (rest === undefined) continue
+		if (rest === undefined) break
 		const inner = rest.trimStart()
 
 		const afterPipeline = consumeKeyword(inner, 'pipeline')
@@ -250,6 +611,26 @@ export function parsePipelineAnnotations(code: string): PipelineAnnotations {
 			continue
 		}
 
+		const afterMacros = consumeKeyword(inner, 'macros')
+		if (afterMacros !== undefined) {
+			// Strict like `pipeline`: keyword alone on the line, so prose such
+			// as `// macros are defined below` never false-positives.
+			if (afterMacros.trim() === '') out.macros = true
+			continue
+		}
+
+		// `// use <lib_script_path>` — accumulating. The argument must be a
+		// single whitespace-free token containing `/` (all script paths do),
+		// so prose like `// use this script to …` is dropped fail-safe.
+		const afterUse = consumeKeyword(inner, 'use')
+		if (afterUse !== undefined) {
+			const path = afterUse.trim()
+			if (path && !/\s/.test(path) && path.includes('/') && !out.useLibs.includes(path)) {
+				out.useLibs.push(path)
+			}
+			continue
+		}
+
 		const afterPart = consumeKeyword(inner, 'partitioned')
 		if (afterPart !== undefined) {
 			if (!out.partition) {
@@ -271,7 +652,10 @@ export function parsePipelineAnnotations(code: string): PipelineAnnotations {
 		const afterTag = consumeKeyword(inner, 'tag')
 		if (afterTag !== undefined) {
 			const name = afterTag.trim()
-			if (name && !out.tag) {
+			// Worker tags are single-word identifiers; a value with whitespace
+			// or beyond the script.tag column width is almost certainly a
+			// regular comment starting with "# tag ...".
+			if (name && !out.tag && !/\s/.test(name) && name.length <= 50) {
 				out.tag = name
 			}
 			continue
@@ -286,9 +670,60 @@ export function parsePipelineAnnotations(code: string): PipelineAnnotations {
 			continue
 		}
 
+		const afterMaterialize = consumeKeyword(inner, 'materialize')
+		if (afterMaterialize !== undefined) {
+			if (!out.materialize) {
+				const spec = parseMaterializeSpec(afterMaterialize.trim())
+				if (spec) out.materialize = spec
+			}
+			continue
+		}
+
+		// `// mute all` opts out of auto-derived cascade edges entirely;
+		// `// mute <asset>` suppresses the one edge. Only asset refs are
+		// muteable — native trigger kinds are never auto-derived. A complete
+		// word, so prose like `// muted for now` never matches.
+		const afterMute = consumeKeyword(inner, 'mute')
+		if (afterMute !== undefined) {
+			const arg = afterMute.trim()
+			if (arg === 'all') {
+				out.muteAll = true
+			} else {
+				const spec = parseTriggerSpec(arg)
+				if (
+					spec?.kind === 'asset' &&
+					!out.muteAssets.some((a) => a.kind === spec.value.kind && a.path === spec.value.path)
+				) {
+					out.muteAssets.push(spec.value)
+				}
+			}
+			continue
+		}
+
+		// `data_test` is a complete word (so it never collides with the `// test:`
+		// CI annotation, which has no whitespace after `test`). Accumulates.
+		const afterDataTest = consumeKeyword(inner, 'data_test')
+		if (afterDataTest !== undefined) {
+			const spec = parseDataTestSpec(afterDataTest.trim())
+			if (spec) out.dataTests.push(spec)
+			continue
+		}
+
+		// `column` is a complete word; a body comment that merely starts with
+		// `column` has no `<-` and is dropped fail-safe. Accumulates.
+		const afterColumn = consumeKeyword(inner, 'column')
+		if (afterColumn !== undefined) {
+			const spec = parseColumnLineageSpec(afterColumn.trim())
+			if (spec) out.columnLineage.push(spec)
+			continue
+		}
+
 		const afterOn = consumeKeyword(inner, 'on')
 		if (afterOn !== undefined) {
-			const specText = afterOn.trim()
+			// Strip trailing `key=value` opts (e.g. `debounce=60s`) so the ref
+			// matches body inference and the deploy path — otherwise the opts
+			// leak into the asset path and the explicit edge dedups wrong.
+			const specText = stripTrailingKvOpts(afterOn.trim())
 			if (!specText) continue
 			const spec = parseTriggerSpec(specText)
 			if (!spec) continue
diff --git a/frontend/src/lib/components/assets/AssetGraph/partitionBuckets.test.ts b/frontend/src/lib/components/assets/AssetGraph/partitionBuckets.test.ts
new file mode 100644
index 0000000000..a8a47af259
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/partitionBuckets.test.ts
@@ -0,0 +1,161 @@
+import { describe, expect, it } from 'vitest'
+import {
+	bucketFor,
+	bucketFromInputValue,
+	defaultBucket,
+	inputValueFromBucket,
+	isBeforeStart,
+	isValidStart,
+	isValidTimeZone,
+	partitionInputType,
+	partitionMetadataError,
+	recentBuckets,
+	startBucketOf,
+	usesCalendarPicker
+} from './partitionBuckets'
+import type { PartitionSpec } from './parsePipelineAnnotations'
+
+const spec = (kind: PartitionSpec['kind'], extra: Partial<PartitionSpec> = {}): PartitionSpec =>
+	({ kind, ...extra }) as PartitionSpec
+
+// A fixed UTC instant: 2026-07-05 14:37Z (a Sunday — ISO week 27 of 2026).
+// Explicit UTC so the assertions are independent of the test runner's TZ, and
+// they exercise the same UTC default the backend uses when `spec.tz` is absent.
+const at = new Date(Date.UTC(2026, 6, 5, 14, 37, 0))
+
+describe('bucketFor mirrors backend default_format (UTC)', () => {
+	it('daily -> %Y-%m-%d', () => {
+		expect(bucketFor(spec('daily'), at)).toBe('2026-07-05')
+	})
+	it('hourly -> %Y-%m-%dT%H', () => {
+		expect(bucketFor(spec('hourly'), at)).toBe('2026-07-05T14')
+	})
+	it('monthly -> %Y-%m', () => {
+		expect(bucketFor(spec('monthly'), at)).toBe('2026-07')
+	})
+	it('weekly -> ISO %G-W%V', () => {
+		expect(bucketFor(spec('weekly'), at)).toBe('2026-W27')
+	})
+})
+
+describe('bucketFor honours spec.tz', () => {
+	// 2026-07-05 02:30Z is still 2026-07-04 in America/New_York (UTC-4 in July).
+	const nearMidnight = new Date(Date.UTC(2026, 6, 5, 2, 30, 0))
+	it('shifts the day boundary by the producer tz', () => {
+		expect(bucketFor(spec('daily'), nearMidnight)).toBe('2026-07-05') // UTC default
+		expect(bucketFor(spec('daily', { tz: 'America/New_York' }), nearMidnight)).toBe('2026-07-04')
+	})
+	it('shifts the hour bucket by the producer tz', () => {
+		// 02:30Z -> 22 (previous day) in New York.
+		expect(bucketFor(spec('hourly', { tz: 'America/New_York' }), nearMidnight)).toBe(
+			'2026-07-04T22'
+		)
+	})
+})
+
+describe('defaultBucket honours the start= anchor', () => {
+	// `at` is 2026-07-05.
+	it('seeds the current bucket when at or after start', () => {
+		expect(defaultBucket(spec('daily'), at)).toBe('2026-07-05')
+		expect(defaultBucket(spec('daily', { start: '2026-01-01' }), at)).toBe('2026-07-05')
+		expect(defaultBucket(spec('daily', { start: '2026-07-05' }), at)).toBe('2026-07-05') // == start, not before
+	})
+	it('seeds the start bucket (never a pre-start one) when before start', () => {
+		expect(defaultBucket(spec('daily', { start: '2026-08-01' }), at)).toBe('2026-08-01')
+		expect(defaultBucket(spec('monthly', { start: '2026-08-01' }), at)).toBe('2026-08')
+		expect(defaultBucket(spec('hourly', { start: '2026-08-01' }), at)).toBe('2026-08-01T00')
+	})
+	it('isBeforeStart mirrors the backend date comparison', () => {
+		expect(isBeforeStart(spec('daily', { start: '2026-08-01' }), at)).toBe(true)
+		expect(isBeforeStart(spec('daily', { start: '2026-07-05' }), at)).toBe(false)
+		expect(isBeforeStart(spec('daily'), at)).toBe(false)
+	})
+	it('startBucketOf renders the anchor in the cadence, undefined when unset', () => {
+		expect(startBucketOf(spec('daily', { start: '2026-08-01' }))).toBe('2026-08-01')
+		expect(startBucketOf(spec('monthly', { start: '2026-08-15' }))).toBe('2026-08')
+		expect(startBucketOf(spec('hourly', { start: '2026-08-01' }))).toBe('2026-08-01T00')
+		expect(startBucketOf(spec('daily'))).toBeUndefined()
+	})
+})
+
+describe('malformed metadata fails safe (parity with backend validation)', () => {
+	it('isValidTimeZone rejects garbage, accepts real zones and absence', () => {
+		expect(isValidTimeZone(undefined)).toBe(true)
+		expect(isValidTimeZone('UTC')).toBe(true)
+		expect(isValidTimeZone('America/New_York')).toBe(true)
+		expect(isValidTimeZone('Not/AZone')).toBe(false)
+		expect(isValidTimeZone('garbage')).toBe(false)
+	})
+	it('isValidStart rejects malformed and JS-normalized dates', () => {
+		expect(isValidStart(undefined)).toBe(true)
+		expect(isValidStart('2026-08-01')).toBe(true)
+		expect(isValidStart('2026-02-31')).toBe(false) // JS would roll to Mar 3
+		expect(isValidStart('2026-13-01')).toBe(false)
+		expect(isValidStart('08/01/2026')).toBe(false)
+	})
+	it('partitionMetadataError reports the first problem, else undefined', () => {
+		expect(partitionMetadataError(spec('daily'))).toBeUndefined()
+		expect(
+			partitionMetadataError(spec('daily', { tz: 'America/New_York', start: '2026-08-01' }))
+		).toBeUndefined()
+		expect(partitionMetadataError(spec('daily', { tz: 'Not/AZone' }))).toContain('timezone')
+		expect(partitionMetadataError(spec('daily', { start: '2026-02-31' }))).toContain('start date')
+	})
+	it('bucketFor never throws on an invalid tz (falls back to UTC)', () => {
+		expect(bucketFor(spec('daily', { tz: 'Not/AZone' }), at)).toBe('2026-07-05')
+	})
+	it('an invalid start is treated as no anchor (isBeforeStart/startBucketOf)', () => {
+		expect(isBeforeStart(spec('daily', { start: '2026-02-31' }), at)).toBe(false)
+		expect(startBucketOf(spec('daily', { start: '2026-02-31' }))).toBeUndefined()
+	})
+})
+
+describe('partitionInputType', () => {
+	it('maps each calendar kind to its native input', () => {
+		expect(partitionInputType(spec('daily'))).toBe('date')
+		expect(partitionInputType(spec('hourly'))).toBe('datetime-local')
+		expect(partitionInputType(spec('weekly'))).toBe('week')
+		expect(partitionInputType(spec('monthly'))).toBe('month')
+	})
+	it('falls back to text for dynamic and custom-format specs', () => {
+		expect(partitionInputType(spec('dynamic', { key: '$.tenant' }))).toBe('text')
+		expect(partitionInputType(spec('daily', { format: '%Y/%m/%d' }))).toBe('text')
+		expect(usesCalendarPicker(spec('dynamic', { key: '$.tenant' }))).toBe(false)
+		expect(usesCalendarPicker(spec('daily', { format: '%Y/%m/%d' }))).toBe(false)
+	})
+})
+
+describe('native input <-> bucket round-trip', () => {
+	it('hourly truncates the datetime-local minutes and restores :00', () => {
+		expect(bucketFromInputValue(spec('hourly'), '2026-07-05T14:37')).toBe('2026-07-05T14')
+		expect(inputValueFromBucket(spec('hourly'), '2026-07-05T14')).toBe('2026-07-05T14:00')
+	})
+	it('non-hourly kinds pass through unchanged', () => {
+		expect(bucketFromInputValue(spec('daily'), '2026-07-05')).toBe('2026-07-05')
+		expect(inputValueFromBucket(spec('weekly'), '2026-W27')).toBe('2026-W27')
+	})
+	it('empty stays empty', () => {
+		expect(bucketFromInputValue(spec('hourly'), '')).toBe('')
+		expect(inputValueFromBucket(spec('daily'), '')).toBe('')
+	})
+})
+
+describe('recentBuckets (UTC)', () => {
+	it('walks back day by day, most recent first', () => {
+		expect(recentBuckets(spec('daily'), at, 3)).toEqual(['2026-07-05', '2026-07-04', '2026-07-03'])
+	})
+	it('walks back hour by hour', () => {
+		expect(recentBuckets(spec('hourly'), at, 3)).toEqual([
+			'2026-07-05T14',
+			'2026-07-05T13',
+			'2026-07-05T12'
+		])
+	})
+	it('walks back month by month across a year boundary without day roll-over', () => {
+		const jan31 = new Date(Date.UTC(2026, 0, 31, 0, 0, 0))
+		expect(recentBuckets(spec('monthly'), jan31, 3)).toEqual(['2026-01', '2025-12', '2025-11'])
+	})
+	it('walks back week by week', () => {
+		expect(recentBuckets(spec('weekly'), at, 3)).toEqual(['2026-W27', '2026-W26', '2026-W25'])
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/partitionBuckets.ts b/frontend/src/lib/components/assets/AssetGraph/partitionBuckets.ts
new file mode 100644
index 0000000000..401ef82cae
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/partitionBuckets.ts
@@ -0,0 +1,261 @@
+// Client-side partition-bucket math for the run form's partition picker.
+// Produces the same canonical bucket strings the backend renders in
+// `windmill-common/src/partition_ee.rs` (`resolve_time_partition` /
+// `default_format`): the instant is localized to the spec's timezone
+// (`spec.tz`, defaulting to UTC — NOT the browser's zone) and then formatted.
+// Getting the zone right matters — a browser in a non-UTC zone would otherwise
+// seed a default bucket, and compare against materialized rows, off by a
+// day/hour near every boundary and always for an explicit `tz=` spec.
+//
+//   daily   %Y-%m-%d      -> 2026-07-05
+//   hourly  %Y-%m-%dT%H   -> 2026-07-05T14
+//   weekly  %G-W%V (ISO)  -> 2026-W27
+//   monthly %Y-%m         -> 2026-07
+//
+// Pure module (no Svelte runes) so the mapping is unit-testable.
+
+import type { PartitionSpec } from './parsePipelineAnnotations'
+
+export type PartitionInputType = 'date' | 'month' | 'week' | 'datetime-local' | 'text'
+
+// A spec carrying a custom strftime `format` can't be reproduced by the native
+// date pickers (arbitrary strftime), and `dynamic` partitions are a free-form
+// key extracted from the payload — both fall back to a plain text input.
+export function usesCalendarPicker(spec: PartitionSpec): boolean {
+	return spec.kind !== 'dynamic' && !spec.format
+}
+
+export function partitionInputType(spec: PartitionSpec): PartitionInputType {
+	if (!usesCalendarPicker(spec)) return 'text'
+	switch (spec.kind) {
+		case 'monthly':
+			return 'month'
+		case 'weekly':
+			return 'week'
+		case 'hourly':
+			return 'datetime-local'
+		default:
+			return 'date'
+	}
+}
+
+function pad(n: number): string {
+	return String(n).padStart(2, '0')
+}
+
+const ZONED_PARTS_OPTS: Intl.DateTimeFormatOptions = {
+	year: 'numeric',
+	month: '2-digit',
+	day: '2-digit',
+	hour: '2-digit',
+	minute: '2-digit',
+	second: '2-digit',
+	hourCycle: 'h23'
+}
+
+// Re-express `at` as a Date whose UTC fields equal the wall-clock in `tz`, so
+// all downstream field reads / calendar arithmetic can use the UTC getters and
+// stay in the producer's zone. `hourCycle: 'h23'` keeps hours 00–23. A
+// malformed `tz` (rejected by `Intl`) falls back to UTC rather than throwing —
+// the backend validates `tz=` and is the source of truth for the error; the
+// picker must never crash the graph view (`partitionMetadataError` gates
+// auto-seeding so a bogus bucket isn't silently sent).
+function zonedAsUtc(at: Date, tz: string): Date {
+	let parts: Intl.DateTimeFormatPart[]
+	try {
+		parts = new Intl.DateTimeFormat('en-US', { ...ZONED_PARTS_OPTS, timeZone: tz }).formatToParts(
+			at
+		)
+	} catch {
+		parts = new Intl.DateTimeFormat('en-US', {
+			...ZONED_PARTS_OPTS,
+			timeZone: 'UTC'
+		}).formatToParts(at)
+	}
+	const g = (t: string) => Number(parts.find((p) => p.type === t)?.value)
+	return new Date(
+		Date.UTC(g('year'), g('month') - 1, g('day'), g('hour'), g('minute'), g('second'))
+	)
+}
+
+// `tz=` is valid iff `Intl` accepts it (absent === UTC === valid).
+export function isValidTimeZone(tz?: string): boolean {
+	if (!tz) return true
+	try {
+		new Intl.DateTimeFormat('en-US', { timeZone: tz })
+		return true
+	} catch {
+		return false
+	}
+}
+
+// `start=` is valid iff it's a real `YYYY-MM-DD` calendar date. The round-trip
+// check rejects dates JS would silently normalize (e.g. `2026-02-31` → Mar 3),
+// which the backend's `NaiveDate::parse_from_str` also rejects.
+export function isValidStart(start?: string): boolean {
+	if (!start) return true
+	const m = start.match(/^(\d{4})-(\d{2})-(\d{2})$/)
+	if (!m) return false
+	const y = Number(m[1])
+	const mo = Number(m[2])
+	const d = Number(m[3])
+	const dt = new Date(Date.UTC(y, mo - 1, d))
+	return dt.getUTCFullYear() === y && dt.getUTCMonth() === mo - 1 && dt.getUTCDate() === d
+}
+
+// A human-readable reason the `// partitioned` metadata is unusable, or
+// undefined when it's sound. Mirrors the backend's `tz=` / `start=` validation
+// so the picker can refuse to auto-seed a bucket the backend would reject.
+export function partitionMetadataError(spec: PartitionSpec): string | undefined {
+	if (!isValidTimeZone(spec.tz)) return `invalid timezone "${spec.tz}"`
+	if (!isValidStart(spec.start)) return `invalid start date "${spec.start}" (want YYYY-MM-DD)`
+	return undefined
+}
+
+// ISO 8601 week-numbering year + week (chrono's %G / %V) of a UTC-substituted
+// date. Standard "nearest Thursday" algorithm, all in UTC.
+function isoWeekOf(d: Date): { isoYear: number; week: number } {
+	const date = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()))
+	const dayNum = (date.getUTCDay() + 6) % 7 // Mon=0 … Sun=6
+	date.setUTCDate(date.getUTCDate() - dayNum + 3) // Thursday of this week
+	const isoYear = date.getUTCFullYear()
+	const firstThursday = new Date(Date.UTC(isoYear, 0, 4))
+	const fdNum = (firstThursday.getUTCDay() + 6) % 7
+	firstThursday.setUTCDate(firstThursday.getUTCDate() - fdNum + 3)
+	const week = 1 + Math.round((date.getTime() - firstThursday.getTime()) / (7 * 86400000))
+	return { isoYear, week }
+}
+
+// Render a UTC-substituted date into its canonical bucket for the cadence.
+function fmtBucket(kind: PartitionSpec['kind'], d: Date): string {
+	const y = d.getUTCFullYear()
+	const m = d.getUTCMonth() + 1
+	const day = d.getUTCDate()
+	const h = d.getUTCHours()
+	switch (kind) {
+		case 'hourly':
+			return `${y}-${pad(m)}-${pad(day)}T${pad(h)}`
+		case 'monthly':
+			return `${y}-${pad(m)}`
+		case 'weekly': {
+			const { isoYear, week } = isoWeekOf(d)
+			return `${isoYear}-W${pad(week)}`
+		}
+		default:
+			return `${y}-${pad(m)}-${pad(day)}`
+	}
+}
+
+export function bucketFor(spec: PartitionSpec, at: Date): string {
+	return fmtBucket(spec.kind, zonedAsUtc(at, spec.tz ?? 'UTC'))
+}
+
+// The zoned start date (`spec.start`, `YYYY-MM-DD`) as a UTC-substituted Date at
+// 00:00, or undefined if unset/malformed. `start` is a plain date in the
+// producer's tz — the backend parses it as a NaiveDate and compares by date.
+function startDate(spec: PartitionSpec): Date | undefined {
+	if (!spec.start || !isValidStart(spec.start)) return undefined
+	const m = spec.start.match(/^(\d{4})-(\d{2})-(\d{2})$/)!
+	return new Date(Date.UTC(Number(m[1]), Number(m[2]) - 1, Number(m[3])))
+}
+
+// True when `at` (localized to the producer tz) falls on a date before the
+// `start=` anchor — exactly the backend's `local.date_naive() < start_date`
+// check (`resolve_time_partition`), which resolves such an instant to no
+// partition.
+export function isBeforeStart(spec: PartitionSpec, at: Date): boolean {
+	const start = startDate(spec)
+	if (!start) return false
+	const zoned = zonedAsUtc(at, spec.tz ?? 'UTC')
+	const zonedDate = Date.UTC(zoned.getUTCFullYear(), zoned.getUTCMonth(), zoned.getUTCDate())
+	return zonedDate < start.getTime()
+}
+
+// The canonical bucket of the `start=` anchor (its date at 00:00), or undefined
+// if unset. Buckets sort lexicographically within a cadence, so callers can
+// compare against it to drop pre-start buckets.
+export function startBucketOf(spec: PartitionSpec): string | undefined {
+	const start = startDate(spec)
+	return start ? fmtBucket(spec.kind, start) : undefined
+}
+
+// The bucket to pre-fill the picker with. Normally the current bucket (matching
+// the backend's "absent partition arg -> current bucket" resolution), but when
+// the current instant is before the `start=` anchor the backend would resolve
+// to NO partition — so default to the first valid bucket (the start) rather
+// than a pre-start one the worker would take verbatim and materialize early.
+export function defaultBucket(spec: PartitionSpec, at: Date): string {
+	if (isBeforeStart(spec, at)) {
+		const start = startDate(spec)
+		if (start) return fmtBucket(spec.kind, start)
+	}
+	return bucketFor(spec, at)
+}
+
+// Native input value -> canonical bucket. Only hourly differs: datetime-local
+// carries a minute component the hourly bucket drops. The picked wall-clock is
+// taken verbatim as the bucket (the user picks in the producer's frame), so no
+// timezone conversion happens here.
+export function bucketFromInputValue(spec: PartitionSpec, inputValue: string): string {
+	if (!inputValue) return ''
+	if (spec.kind === 'hourly') {
+		const m = inputValue.match(/^(\d{4}-\d{2}-\d{2}T\d{2})/)
+		return m ? m[1] : inputValue
+	}
+	return inputValue
+}
+
+// Canonical bucket -> native input value. Only hourly differs: datetime-local
+// needs a minute component the bucket omits.
+export function inputValueFromBucket(spec: PartitionSpec, bucket: string): string {
+	if (!bucket) return ''
+	if (spec.kind === 'hourly') {
+		return /T\d{2}$/.test(bucket) ? `${bucket}:00` : bucket
+	}
+	return bucket
+}
+
+// The last `count` buckets ending at (and including) `now`, most-recent first,
+// localized to `spec.tz`. Arithmetic walks calendar units in the zoned frame,
+// so it's exact across DST (no ±1 drift). Undefined for non-calendar specs
+// (the caller guards on `usesCalendarPicker`).
+export function recentBuckets(spec: PartitionSpec, now: Date, count: number): string[] {
+	const base = zonedAsUtc(now, spec.tz ?? 'UTC')
+	const out: string[] = []
+	for (let i = 0; i < count; i++) {
+		const d = new Date(base)
+		switch (spec.kind) {
+			case 'hourly':
+				d.setUTCHours(d.getUTCHours() - i)
+				break
+			case 'weekly':
+				d.setUTCDate(d.getUTCDate() - 7 * i)
+				break
+			case 'monthly':
+				// Normalize to the 1st first so subtracting months can't roll over
+				// a short target month (e.g. Mar 31 − 1mo → Mar 3).
+				d.setUTCDate(1)
+				d.setUTCMonth(d.getUTCMonth() - i)
+				break
+			default:
+				d.setUTCDate(d.getUTCDate() - i)
+		}
+		out.push(fmtBucket(spec.kind, d))
+	}
+	return out
+}
+
+// How many recent buckets the "missing partitions" hint scans, per kind — a
+// window that reads as "recent" for each cadence without flooding the hint.
+export function recentWindow(kind: PartitionSpec['kind']): number {
+	switch (kind) {
+		case 'hourly':
+			return 24
+		case 'weekly':
+			return 8
+		case 'monthly':
+			return 6
+		default:
+			return 14
+	}
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineAiHelpers.test.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineAiHelpers.test.ts
new file mode 100644
index 0000000000..a1a82870c8
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineAiHelpers.test.ts
@@ -0,0 +1,143 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { JobService, ScriptService } from '$lib/gen'
+import { createPipelineAiHelpers, type PipelineDraft } from './pipelineAiHelpers'
+import type { AssetGraphResponse } from './types'
+
+// Build a helper handle over an in-memory drafts Map, mirroring how the editor
+// wires it. `getFolder` returns the bare folder name (as the route/session do).
+function makeHandle(
+	initial: Array<[string, PipelineDraft]> = [],
+	runnables: Array<{ path: string }> = []
+) {
+	let drafts = new Map(initial)
+	let forgotten: string[] = []
+	const handle = createPipelineAiHelpers({
+		getFolder: () => 'x',
+		getWorkspace: () => 'w',
+		getResolvedGraph: () =>
+			({ assets: [], runnables, edges: [], triggers: [] }) as unknown as AssetGraphResponse,
+		getDrafts: () => drafts,
+		setDrafts: (next) => (drafts = next),
+		newDraftLocalId: () => 'id',
+		onForgetPath: (p) => forgotten.push(p)
+	})
+	return { handle, drafts: () => drafts, forgotten: () => forgotten }
+}
+
+afterEach(() => vi.restoreAllMocks())
+
+const draft = (over: Partial<PipelineDraft> = {}): PipelineDraft =>
+	({ localId: 'l', script: { content: '' } as any, ...over }) as PipelineDraft
+
+describe('pipeline AI direct-draft helpers', () => {
+	it('removeProposedNode discards the unsaved draft at a path', async () => {
+		const { handle, drafts, forgotten } = makeHandle([
+			['f/x/a', draft()],
+			['f/x/b', draft()]
+		])
+		await handle.removeProposedNode('f/x/a')
+		expect(drafts().has('f/x/a')).toBe(false)
+		expect(drafts().has('f/x/b')).toBe(true)
+		expect(forgotten()).toContain('f/x/a')
+	})
+
+	it('removeProposedNode throws when there is no draft to discard', async () => {
+		const { handle } = makeHandle()
+		await expect(handle.removeProposedNode('f/x/missing')).rejects.toThrow()
+	})
+
+	it('getPipelineContext does not expose any pending/approval state', () => {
+		const { handle } = makeHandle([['f/x/a', draft()]])
+		const ctx = handle.getPipelineContext()
+		expect(ctx).not.toHaveProperty('pendingProposals')
+		expect(handle).not.toHaveProperty('acceptAll')
+		expect(handle).not.toHaveProperty('rejectAll')
+	})
+
+	it('testNode on a deployed node never dispatches downstream subscribers', async () => {
+		// No draft at the path → runs the deployed version, which must carry
+		// `_wmill_skip_asset_dispatch` so a single-node test can't fire downstream.
+		const spy = vi.spyOn(JobService, 'runScriptByPath').mockResolvedValue('job-1' as any)
+		const { handle } = makeHandle()
+		await handle.testNode('f/x/deployed', { foo: 1 })
+		expect(spy).toHaveBeenCalledWith(
+			expect.objectContaining({
+				requestBody: expect.objectContaining({ _wmill_skip_asset_dispatch: true, foo: 1 })
+			})
+		)
+	})
+
+	it('proposeNode rejects a path outside the open folder', async () => {
+		const { handle, drafts } = makeHandle()
+		await expect(
+			handle.proposeNode({ path: 'f/other/n', language: 'duckdb' as any, content: '' })
+		).rejects.toThrow(/open folder/)
+		expect(drafts().size).toBe(0)
+	})
+
+	it('proposeNode rejects content missing the pipeline annotation', async () => {
+		const { handle, drafts } = makeHandle()
+		await expect(
+			handle.proposeNode({ path: 'f/x/new', language: 'duckdb' as any, content: 'SELECT 1' })
+		).rejects.toThrow(/pipeline annotation/)
+		expect(drafts().size).toBe(0)
+	})
+
+	it('proposeNode rejects a path colliding with an existing draft', async () => {
+		const { handle } = makeHandle([['f/x/a', draft()]])
+		await expect(
+			handle.proposeNode({ path: 'f/x/a', language: 'duckdb' as any, content: '-- pipeline' })
+		).rejects.toThrow(/already exists/)
+	})
+
+	it('proposeNode rejects a path colliding with an existing deployed node', async () => {
+		const { handle, drafts } = makeHandle([], [{ path: 'f/x/dep' }])
+		await expect(
+			handle.proposeNode({ path: 'f/x/dep', language: 'duckdb' as any, content: '-- pipeline' })
+		).rejects.toThrow(/already exists/)
+		expect(drafts().size).toBe(0)
+	})
+
+	it('proposeNode rejects a path that is an already-deployed script when the graph has not hydrated', async () => {
+		// Empty graph (session preview can race open_preview), but a deployed script
+		// exists at the path — the backend probe must still catch it.
+		const spy = vi.spyOn(ScriptService, 'getScriptByPath').mockResolvedValue({} as any)
+		const { handle, drafts } = makeHandle()
+		await expect(
+			handle.proposeNode({
+				path: 'f/x/deployed',
+				language: 'duckdb' as any,
+				content: '-- pipeline'
+			})
+		).rejects.toThrow(/already exists/)
+		expect(spy).toHaveBeenCalled()
+		expect(drafts().size).toBe(0)
+	})
+
+	it('editNode rejects a path outside the open folder', async () => {
+		const { handle, drafts } = makeHandle()
+		await expect(handle.editNode('f/other/foo', '-- pipeline')).rejects.toThrow(/open folder/)
+		expect(drafts().size).toBe(0)
+	})
+
+	it('editNode preserves the deployed script hash/metadata and replaces only content', async () => {
+		const deployed = {
+			hash: 'abc123',
+			path: 'f/x/node',
+			summary: 'My node',
+			description: 'desc',
+			tag: 'custom',
+			language: 'duckdb',
+			content: '-- pipeline\nSELECT 1'
+		}
+		vi.spyOn(ScriptService, 'getScriptByPath').mockResolvedValue(deployed as any)
+		const { handle, drafts } = makeHandle()
+		await handle.editNode('f/x/node', '-- pipeline\nSELECT 2')
+		const d = drafts().get('f/x/node')
+		expect(d?.script.hash).toBe('abc123')
+		expect(d?.script.summary).toBe('My node')
+		expect(d?.script.description).toBe('desc')
+		expect(d?.script.tag).toBe('custom')
+		expect(d?.script.content).toBe('-- pipeline\nSELECT 2')
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineAiHelpers.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineAiHelpers.ts
new file mode 100644
index 0000000000..3658bc5a32
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineAiHelpers.ts
@@ -0,0 +1,334 @@
+import { JobService, ScriptService, type AssetKind, type Script, type ScriptLang } from '$lib/gen'
+import { emptySchema, sendUserToast } from '$lib/utils'
+import { inferAssets } from '$lib/infer'
+import {
+	extractReads,
+	extractWrites,
+	type AssetWithAltAccessType
+} from '$lib/components/assets/lib'
+import { assetUri, autoOutputAsset, type PipelineOutputKind } from './pipelineTemplates'
+import { parsePipelineAnnotations } from './parsePipelineAnnotations'
+import type { AssetGraphResponse } from './types'
+import type {
+	PipelineAIChatHelpers,
+	PipelineContext,
+	PipelineNodeSummary
+} from '$lib/components/copilot/chat/pipeline/core'
+
+// ============================================================================
+// Shared data-pipeline AI helper layer.
+//
+// Both the full-page editor (/pipeline/[folder]) and the in-session preview
+// (PipelineEditorView) drive the AI chat's pipeline tools through this factory,
+// so the build/edit logic lives in exactly one place. Each caller injects
+// accessors for its own draft Map and graph; this module owns the AI behaviour
+// (build/edit/discard/test). AI edits apply directly as unsaved drafts — there
+// is no separate approve/reject step.
+// ============================================================================
+
+/**
+ * An unsaved pipeline node draft. `localId` is a stable per-draft id preserved
+ * across renames (the page uses it to dedupe concurrent deploys). AI-built nodes
+ * and manually-created drafts are the same thing — an unsaved node on the canvas.
+ */
+export type PipelineDraft = {
+	localId: string
+	script: Script
+	outputAssets?: Array<{ kind: AssetKind; path: string }>
+	/** Body-inferred reads captured with the draft, so an inactive draft keeps
+	 * its input lineage on the canvas. `undefined` = not captured yet (legacy
+	 * bundle / just-seeded draft) — consumers fall back to the session cache;
+	 * an empty array is an authoritative "reads nothing". */
+	inputAssets?: Array<{ kind: AssetKind; path: string }>
+}
+
+export type PipelineAiHelperDeps = {
+	getFolder: () => string
+	getWorkspace: () => string | undefined
+	/** The draft-overlaid graph (resolveGraph output) the context summary reads. */
+	getResolvedGraph: () => AssetGraphResponse
+	getDrafts: () => Map<string, PipelineDraft>
+	setDrafts: (next: Map<string, PipelineDraft>) => void
+	/** Stable id for a freshly-created draft (route page tracks deploys by it). */
+	newDraftLocalId: () => string
+	/** Focus/select the node after it is staged (pan + open in the pane). */
+	onProposeNode?: (path: string) => void
+	/** Throw (or switch to edit mode) when the surface can't accept AI edits. */
+	ensureEditable?: () => void
+	/** Surface the draft overlay if it is hidden (the page's "show drafts" view). */
+	onShowDrafts?: () => void
+	/** Forget per-path state when a draft is discarded. */
+	onForgetPath?: (path: string) => void
+	/** Notify the caller a test run started so it can light up its run UI. */
+	onRunStarted?: (jobId: string, path: string) => void
+}
+
+export function makePipelineScript(
+	language: ScriptLang,
+	scriptPath: string,
+	content: string,
+	createdAt: string
+): Script {
+	// Cast through unknown: a local draft only needs path/language/content/schema;
+	// the many readonly deployment fields on Script don't matter until createScript.
+	return {
+		hash: '',
+		path: scriptPath,
+		summary: '',
+		description: '',
+		content,
+		schema: emptySchema(),
+		is_template: false,
+		extra_perms: {},
+		language,
+		kind: 'script',
+		created_by: '',
+		created_at: createdAt,
+		archived: false,
+		deleted: false,
+		starred: false
+	} as unknown as Script
+}
+
+async function inferDraftAssets(
+	language: ScriptLang,
+	content: string
+): Promise<{
+	writes: Array<{ kind: AssetKind; path: string }>
+	reads: Array<{ kind: AssetKind; path: string }>
+}> {
+	try {
+		const inferred = await inferAssets(language, content)
+		if (inferred?.status === 'error') return { writes: [], reads: [] }
+		const assets = (inferred?.assets ?? []) as AssetWithAltAccessType[]
+		return { writes: extractWrites(assets), reads: extractReads(assets) }
+	} catch {
+		return { writes: [], reads: [] }
+	}
+}
+
+export function createPipelineAiHelpers(deps: PipelineAiHelperDeps): PipelineAIChatHelpers {
+	// A staged draft is always persisted into the OPEN folder's data_pipeline
+	// bundle, so a path outside the folder would silently land an unrelated script
+	// there. Both build and edit must stay scoped to the folder.
+	function assertInFolder(path: string) {
+		const folder = deps.getFolder()
+		if (folder && !path.startsWith(`f/${folder}/`)) {
+			throw new Error(
+				`Pipeline nodes must be in the open folder — use a path under 'f/${folder}/' (got '${path}').`
+			)
+		}
+	}
+
+	// A pipeline node IS its `// pipeline` annotation (it's what makes the deployed
+	// script a pipeline member). Reject content that lacks it so a staged draft
+	// isn't a non-member script the model can't see is broken until deploy.
+	function assertPipelineAnnotation(content: string) {
+		if (!parsePipelineAnnotations(content).inPipeline) {
+			throw new Error(
+				`Pipeline node content must declare the pipeline annotation on its own comment line ` +
+					`(\`// pipeline\`, or \`-- pipeline\` for SQL / \`# pipeline\` for Python).`
+			)
+		}
+	}
+
+	function buildContext(): PipelineContext {
+		const graph = deps.getResolvedGraph()
+		const drafts = deps.getDrafts()
+		const nodes: PipelineNodeSummary[] = graph.runnables
+			.filter((r) => r.usage_kind === 'script')
+			.map((r) => {
+				const draft = drafts.get(r.path)
+				const writes = graph.edges
+					.filter(
+						(e) =>
+							e.runnable_kind === 'script' &&
+							e.runnable_path === r.path &&
+							(e.access_type === 'w' || e.access_type === 'rw')
+					)
+					.map((e) => assetUri({ kind: e.asset_kind, path: e.asset_path }))
+				const reads = graph.edges
+					.filter(
+						(e) =>
+							e.runnable_kind === 'script' &&
+							e.runnable_path === r.path &&
+							(e.access_type === 'r' || e.access_type === 'rw')
+					)
+					.map((e) => assetUri({ kind: e.asset_kind, path: e.asset_path }))
+				const triggers = graph.triggers
+					.filter((t) => t.runnable_kind === 'script' && t.runnable_path === r.path)
+					.map((t) =>
+						t.trigger_kind === 'asset'
+							? assetUri({ kind: t.asset_kind, path: t.asset_path })
+							: t.trigger_kind
+					)
+				return {
+					path: r.path,
+					language: draft?.script.language,
+					unsaved: r.unsaved ?? false,
+					summary: draft?.script.summary || undefined,
+					writes: [...new Set(writes)],
+					reads: [...new Set(reads)],
+					triggers: [...new Set(triggers)]
+				}
+			})
+		return {
+			folder: deps.getFolder(),
+			mode: 'edit',
+			nodes,
+			assets: graph.assets.map((a) => assetUri({ kind: a.kind, path: a.path }))
+		}
+	}
+
+	const helpers: PipelineAIChatHelpers = {
+		getPipelineContext: buildContext,
+		getNodeBody: async (path) => {
+			const draft = deps.getDrafts().get(path)
+			if (draft) return { language: draft.script.language, content: draft.script.content }
+			const workspace = deps.getWorkspace()
+			if (!workspace) return undefined
+			try {
+				const deployed = await ScriptService.getScriptByPath({ workspace, path })
+				return { language: deployed.language, content: deployed.content }
+			} catch {
+				return undefined
+			}
+		},
+		proposeNode: async ({ path, language, content, outputKind }) => {
+			deps.ensureEditable?.()
+			// build_pipeline_node creates a NEW node in the OPEN folder. Reject a path
+			// outside the folder (it would silently stage into this folder's bundle)
+			// and a path that collides with an existing node (the model should use
+			// edit_pipeline_node instead of shadowing a deployed node as a draft).
+			assertInFolder(path)
+			assertPipelineAnnotation(content)
+			const drafts = deps.getDrafts()
+			if (drafts.has(path)) {
+				throw new Error(
+					`A draft already exists at '${path}'. Use edit_pipeline_node to change it instead.`
+				)
+			}
+			if (deps.getResolvedGraph().runnables.some((r) => r.path === path)) {
+				throw new Error(
+					`A pipeline node already exists at '${path}'. Use edit_pipeline_node to change it instead.`
+				)
+			}
+			// Authoritative new-node check: the resolved graph may not have hydrated yet
+			// (the session preview can race open_preview), and it only lists pipeline
+			// runnables — so probe the backend. ANY deployed script at this path means
+			// "build new" would shadow it on deploy; the model should edit instead.
+			const workspace = deps.getWorkspace()
+			if (workspace) {
+				let deployedExists = false
+				try {
+					await ScriptService.getScriptByPath({ workspace, path })
+					deployedExists = true
+				} catch {
+					// 404 → no deployed script at this path, safe to create a new node.
+				}
+				if (deployedExists) {
+					throw new Error(
+						`A script already exists at '${path}'. Use edit_pipeline_node to change it instead.`
+					)
+				}
+			}
+			const inferred = await inferDraftAssets(language, content)
+			// Fall back to a seeded output (from the declared output_kind) when the
+			// body doesn't yet write anything inferable.
+			const seeded =
+				inferred.writes[0] ??
+				(outputKind
+					? autoOutputAsset(outputKind as PipelineOutputKind, deps.getFolder(), language)
+					: undefined)
+			const next = new Map(drafts)
+			next.set(path, {
+				localId: deps.newDraftLocalId(),
+				script: makePipelineScript(language, path, content, new Date().toISOString()),
+				outputAssets: inferred.writes.length > 0 ? inferred.writes : seeded ? [seeded] : undefined,
+				inputAssets: inferred.reads
+			})
+			deps.setDrafts(next)
+			deps.onShowDrafts?.()
+			deps.onProposeNode?.(path)
+			return { path }
+		},
+		editNode: async (path, content) => {
+			deps.ensureEditable?.()
+			assertInFolder(path)
+			assertPipelineAnnotation(content)
+			const drafts = deps.getDrafts()
+			const existing = drafts.get(path)
+			// Base the edit on the existing draft's / deployed script object and replace
+			// ONLY the content — preserving hash, summary, description, tag, schema, and
+			// settings. Rebuilding a fresh script would wipe that metadata: deploying
+			// from the pane (auto_parent) would update the script while clearing it, and
+			// the route "Save all" path (no parent_hash) could hit the path-conflict
+			// branch on the occupied path.
+			let baseScript: Script
+			if (existing) {
+				baseScript = existing.script
+			} else {
+				const workspace = deps.getWorkspace()
+				if (!workspace) throw new Error('No workspace is selected.')
+				baseScript = await ScriptService.getScriptByPath({ workspace, path })
+			}
+			const inferred = await inferDraftAssets(baseScript.language, content)
+			const next = new Map(drafts)
+			next.set(path, {
+				localId: existing?.localId ?? deps.newDraftLocalId(),
+				script: { ...baseScript, content },
+				outputAssets: inferred.writes.length > 0 ? inferred.writes : existing?.outputAssets,
+				inputAssets: inferred.reads
+			})
+			deps.setDrafts(next)
+			deps.onShowDrafts?.()
+			deps.onProposeNode?.(path)
+		},
+		removeProposedNode: async (path) => {
+			if (!deps.getDrafts().has(path)) {
+				throw new Error(`No unsaved draft at '${path}' to discard.`)
+			}
+			const next = new Map(deps.getDrafts())
+			next.delete(path)
+			deps.setDrafts(next)
+			deps.onForgetPath?.(path)
+		},
+		testNode: async (path, args) => {
+			const workspace = deps.getWorkspace()
+			if (!workspace) return undefined
+			const draft = deps.getDrafts().get(path)
+			try {
+				let jobId: string
+				if (draft) {
+					// Un-deployed/edited body: preview-run the draft content so it can be
+					// tested before deploying.
+					jobId = await JobService.runScriptPreview({
+						workspace,
+						requestBody: {
+							path,
+							content: draft.script.content,
+							language: draft.script.language,
+							args: args ?? {}
+						}
+					})
+				} else {
+					// test_pipeline_node previews ONE node — never fan out to downstream
+					// deployed subscribers via the backend asset dispatcher (which would
+					// run side-effecting deployed scripts the user didn't ask for).
+					jobId = await JobService.runScriptByPath({
+						workspace,
+						path,
+						requestBody: { ...(args ?? {}), _wmill_skip_asset_dispatch: true }
+					})
+				}
+				deps.onRunStarted?.(jobId, path)
+				return jobId
+			} catch (e: any) {
+				sendUserToast(`Run failed: ${e?.body ?? e?.message ?? e}`, true)
+				return undefined
+			}
+		}
+	}
+
+	return helpers
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineEditorState.svelte.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineEditorState.svelte.ts
new file mode 100644
index 0000000000..086abc1bf8
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineEditorState.svelte.ts
@@ -0,0 +1,201 @@
+import type { AssetKind, Script } from '$lib/gen'
+import type { AssetWithAltAccessType } from '$lib/components/assets/lib'
+import type { AssetGraphSelection } from './types'
+import {
+	parsePipelineAnnotations,
+	type ColumnLineage,
+	type PipelineAnnotations
+} from './parsePipelineAnnotations'
+import type { PipelineDraft } from './pipelineAiHelpers'
+
+// ============================================================================
+// Externalized pipeline-editor state — the data-pipeline analogue of the flow
+// editor's `flowStore` / `flowStateStore`. It owns the in-flight draft Map, the
+// live editor overlays, and the current selection: the substrate the route page
+// editor and the in-session preview both render through (via the shared
+// <PipelineGraphEditor>). Persistence, graph resolution, run dispatch, and deploy
+// stay with the consumer; this is a plain reactive bag so a consumer can
+// read/mutate it without prop plumbing.
+// ============================================================================
+
+const EMPTY_ANNOTATIONS: PipelineAnnotations = parsePipelineAnnotations('')
+
+type LiveAnnotations = { scriptPath: string | undefined; annotations: PipelineAnnotations }
+type LiveBodyAssets = {
+	scriptPath: string | undefined
+	assets: AssetWithAltAccessType[]
+	columnLineage?: ColumnLineage[]
+}
+type LiveContent = { scriptPath: string | undefined; content: string }
+
+export class PipelineEditorState {
+	/** In-flight drafts keyed by script path (manual + AI-staged). */
+	drafts = $state<Map<string, PipelineDraft>>(new Map())
+	/** Draft open in the details pane (mutually exclusive with `selection`). */
+	activeDraftPath = $state<string | undefined>(undefined)
+	/** The persisted node/asset selected on the canvas. */
+	selection = $state<AssetGraphSelection | undefined>(undefined)
+
+	/** Live-parsed annotations of the open script (refreshed per keystroke). */
+	liveAnnotations = $state<LiveAnnotations>({
+		scriptPath: undefined,
+		annotations: EMPTY_ANNOTATIONS
+	})
+	/** Live-inferred body read/write assets of the open script. */
+	liveBodyAssets = $state<LiveBodyAssets>({ scriptPath: undefined, assets: [] })
+	/** The open draft's live editor buffer. */
+	liveContent = $state<LiveContent>({ scriptPath: undefined, content: '' })
+
+	/** Set true once a draft bundle was restored from the DB on load — drives the
+	 * route toolbar's one-shot "Loaded from draft" hint. Written by the editor's
+	 * autosave hydrate when persistence is enabled. */
+	loadedFromDbDraft = $state(false)
+
+	/** Folder this state is scoped to. Used by the in-session preview (where one
+	 * instance is reused across editor hide/show) to detect a retarget to a
+	 * different folder and reset, so stale drafts don't bleed across folders. */
+	folder = $state<string | undefined>(undefined)
+
+	/** True once the DB draft bundle for the current folder has been hydrated
+	 * into this instance. Gated per-instance (not per component mount) so the
+	 * in-session preview hydrates ONCE when its runtime is fresh and then keeps
+	 * the in-memory drafts across editor hide/show — re-reading the DB on every
+	 * remount would race a not-yet-flushed autosave and drop a just-staged draft.
+	 * Reset to false on a folder retarget so the new folder re-hydrates. */
+	hydratedFromDb = $state(false)
+
+	/** Clear all in-flight state. Used when the session preview retargets a
+	 * different pipeline folder (a same-folder remount keeps the drafts). */
+	reset = () => {
+		this.drafts = new Map()
+		this.activeDraftPath = undefined
+		this.selection = undefined
+		this.clearLiveOverlays()
+		this.loadedFromDbDraft = false
+		// Force a re-hydrate from the DB draft of the newly-targeted folder.
+		this.hydratedFromDb = false
+	}
+
+	#nextDraftLocalId = 0
+	// Arrow fields so `pe.method` can be passed straight as a callback (the
+	// details pane takes onDraftPersist / onAnnotationsChange / … by reference).
+	newDraftLocalId = (): string => {
+		this.#nextDraftLocalId += 1
+		return `pe-${this.#nextDraftLocalId}`
+	}
+
+	handleAnnotationsChange = (scriptPath: string | undefined, annotations: PipelineAnnotations) => {
+		this.liveAnnotations = { scriptPath, annotations }
+	}
+	handleAssetsChange = (
+		scriptPath: string | undefined,
+		assets: AssetWithAltAccessType[],
+		columnLineage?: ColumnLineage[]
+	) => {
+		this.liveBodyAssets = { scriptPath, assets, columnLineage }
+	}
+	handleContentChange = (scriptPath: string | undefined, content: string) => {
+		this.liveContent = { scriptPath, content }
+	}
+
+	clearLiveOverlays = () => {
+		this.liveAnnotations = { scriptPath: undefined, annotations: EMPTY_ANNOTATIONS }
+		this.liveBodyAssets = { scriptPath: undefined, assets: [] }
+		this.liveContent = { scriptPath: undefined, content: '' }
+	}
+
+	/** Drop per-path editor state when a path goes away. Does NOT touch
+	 * consumer-owned per-path state (e.g. the route page's save errors — the
+	 * route layers that on in its own wrapper). */
+	forgetPath = (path: string) => {
+		if (this.activeDraftPath === path) this.activeDraftPath = undefined
+		if (this.selection?.kind === 'runnable' && this.selection.path === path)
+			this.selection = undefined
+		if (this.liveAnnotations.scriptPath === path)
+			this.liveAnnotations = { scriptPath: undefined, annotations: EMPTY_ANNOTATIONS }
+		if (this.liveBodyAssets.scriptPath === path)
+			this.liveBodyAssets = { scriptPath: undefined, assets: [] }
+		if (this.liveContent.scriptPath === path)
+			this.liveContent = { scriptPath: undefined, content: '' }
+	}
+
+	discardDraft = (path: string) => {
+		if (!this.drafts.has(path)) return
+		const next = new Map(this.drafts)
+		next.delete(path)
+		this.drafts = next
+		this.forgetPath(path)
+	}
+
+	/** Commit body edits + inferred outputs back into the drafts Map on pane
+	 * teardown (deferred a microtask so a same-batch discard doesn't resurrect the
+	 * entry). Verbatim port of the route page's `handleDraftPersist`. */
+	handleDraftPersist = (
+		p: string,
+		snapshot: {
+			content: string
+			writes: { kind: AssetKind; path: string }[]
+			// Optional: undefined = reads not captured by this caller — keep
+			// whatever the draft already carries.
+			reads?: { kind: AssetKind; path: string }[]
+			script?: Script
+		}
+	) => {
+		queueMicrotask(() => {
+			const d = this.drafts.get(p)
+			if (!d) {
+				if (!snapshot.script) return
+				const next = new Map(this.drafts)
+				next.set(p, {
+					localId: this.newDraftLocalId(),
+					script: snapshot.script,
+					outputAssets: snapshot.writes.length > 0 ? snapshot.writes : undefined,
+					inputAssets: snapshot.reads
+				})
+				this.drafts = next
+				return
+			}
+			// `?? 0` is load-bearing: an undefined `outputAssets` (a no-output draft)
+			// vs an empty inferred `writes` both mean "no writes". Without the
+			// coalesce, `undefined === 0` is false, so this never short-circuits —
+			// every persist re-writes the drafts Map with an equivalent object,
+			// re-triggering the pane's emit → graph re-derive → persist, an infinite
+			// microtask loop (hangs the tab without an effect-depth throw).
+			const refsEqual = (
+				a: Array<{ kind: AssetKind; path: string }>,
+				b: Array<{ kind: AssetKind; path: string }>
+			) =>
+				a.length === b.length && a.every((x, i) => x.kind === b[i]?.kind && x.path === b[i]?.path)
+			const writesEqual = refsEqual(d.outputAssets ?? [], snapshot.writes)
+			// An uncaptured entry (`inputAssets` undefined) is never "equal" to an
+			// incoming capture — even `reads: []` must be recorded, or the entry
+			// stays on the legacy fallback (session cache) and can keep stale read
+			// edges after the pane closes.
+			const readsEqual =
+				snapshot.reads == undefined ||
+				(d.inputAssets != undefined && refsEqual(d.inputAssets, snapshot.reads))
+			if (d.script.content === snapshot.content && writesEqual && readsEqual) return
+			const next = new Map(this.drafts)
+			next.set(p, {
+				...d,
+				script: { ...d.script, content: snapshot.content },
+				outputAssets: snapshot.writes.length > 0 ? snapshot.writes : undefined,
+				inputAssets: snapshot.reads ?? d.inputAssets
+			})
+			this.drafts = next
+		})
+	}
+
+	/** The draft open in the pane, if any. */
+	get activeDraft(): PipelineDraft | undefined {
+		return this.activeDraftPath ? this.drafts.get(this.activeDraftPath) : undefined
+	}
+
+	/** Whichever script is open — the active draft, or a selected persisted script. */
+	get openScriptPath(): string | undefined {
+		if (this.activeDraftPath) return this.activeDraftPath
+		if (this.selection?.kind === 'runnable' && this.selection.runnable_kind === 'script')
+			return this.selection.path
+		return undefined
+	}
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineEditorState.test.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineEditorState.test.ts
new file mode 100644
index 0000000000..2ec06bc8cc
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineEditorState.test.ts
@@ -0,0 +1,106 @@
+import { describe, it, expect } from 'vitest'
+import { PipelineEditorState } from './pipelineEditorState.svelte'
+import type { PipelineDraft } from './pipelineAiHelpers'
+import type { AssetKind } from '$lib/gen'
+
+// handleDraftPersist defers its commit a microtask (so a same-batch discard can
+// win); flush that microtask before asserting.
+const flushMicrotasks = () => new Promise<void>((resolve) => queueMicrotask(() => resolve()))
+
+function draft(content: string, outputAssets?: { kind: AssetKind; path: string }[]): PipelineDraft {
+	return {
+		localId: 'pe-1',
+		script: { path: 'f/x/n', language: 'duckdb', content } as PipelineDraft['script'],
+		outputAssets
+	}
+}
+
+describe('PipelineEditorState.handleDraftPersist', () => {
+	// Regression: a no-output draft has `outputAssets: undefined`; the details pane
+	// infers an empty `writes: []`. Both mean "no writes", so persisting unchanged
+	// content+writes must be a no-op. The earlier `undefined === 0` length check made
+	// it false, so every persist re-wrote the drafts Map with an equivalent object —
+	// re-triggering the pane's emit → graph re-derive → persist, an infinite
+	// microtask loop that froze the tab. The Map reference must stay identical.
+	it('is idempotent for a no-output draft (undefined outputAssets vs empty inferred writes)', async () => {
+		const pe = new PipelineEditorState()
+		pe.drafts = new Map([['f/x/n', draft('SELECT 1', undefined)]])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', { content: 'SELECT 1', writes: [] })
+		await flushMicrotasks()
+		expect(pe.drafts).toBe(before)
+	})
+
+	it('re-writes the drafts Map when the content actually changes', async () => {
+		const pe = new PipelineEditorState()
+		pe.drafts = new Map([['f/x/n', draft('SELECT 1', undefined)]])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', { content: 'SELECT 2', writes: [] })
+		await flushMicrotasks()
+		expect(pe.drafts).not.toBe(before)
+		expect(pe.drafts.get('f/x/n')?.script.content).toBe('SELECT 2')
+	})
+
+	it('re-writes the drafts Map when the inferred writes actually change', async () => {
+		const pe = new PipelineEditorState()
+		pe.drafts = new Map([['f/x/n', draft('SELECT 1', undefined)]])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', {
+			content: 'SELECT 1',
+			writes: [{ kind: 'resource' as AssetKind, path: 'f/x/out' }]
+		})
+		await flushMicrotasks()
+		expect(pe.drafts).not.toBe(before)
+		expect(pe.drafts.get('f/x/n')?.outputAssets).toEqual([{ kind: 'resource', path: 'f/x/out' }])
+	})
+
+	it('stays idempotent when outputAssets and inferred writes match (non-empty)', async () => {
+		const pe = new PipelineEditorState()
+		pe.drafts = new Map([
+			['f/x/n', draft('SELECT 1', [{ kind: 'resource' as AssetKind, path: 'f/x/out' }])]
+		])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', {
+			content: 'SELECT 1',
+			writes: [{ kind: 'resource' as AssetKind, path: 'f/x/out' }]
+		})
+		await flushMicrotasks()
+		expect(pe.drafts).toBe(before)
+	})
+})
+
+describe('PipelineEditorState.handleDraftPersist — read capture', () => {
+	it('records an authoritative empty capture on an uncaptured entry (undefined → [])', async () => {
+		const pe = new PipelineEditorState()
+		pe.drafts = new Map([['f/x/n', draft('SELECT 1', undefined)]])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', { content: 'SELECT 1', writes: [], reads: [] })
+		await flushMicrotasks()
+		// Must rewrite: undefined means "fall back to the session cache", [] means
+		// "reads nothing" — staying undefined would keep stale cached read edges
+		// alive after the pane closes.
+		expect(pe.drafts).not.toBe(before)
+		expect(pe.drafts.get('f/x/n')?.inputAssets).toEqual([])
+	})
+
+	it('is idempotent once the capture matches ([] vs reads: [])', async () => {
+		const pe = new PipelineEditorState()
+		const d = draft('SELECT 1', undefined)
+		d.inputAssets = []
+		pe.drafts = new Map([['f/x/n', d]])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', { content: 'SELECT 1', writes: [], reads: [] })
+		await flushMicrotasks()
+		expect(pe.drafts).toBe(before)
+	})
+
+	it('is idempotent when a legacy caller omits reads', async () => {
+		const pe = new PipelineEditorState()
+		pe.drafts = new Map([['f/x/n', draft('SELECT 1', undefined)]])
+		const before = pe.drafts
+		pe.handleDraftPersist('f/x/n', { content: 'SELECT 1', writes: [] })
+		await flushMicrotasks()
+		expect(pe.drafts).toBe(before)
+		expect(pe.drafts.get('f/x/n')?.inputAssets).toBeUndefined()
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineHistory.svelte.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineHistory.svelte.ts
index 50ad3e1d6e..d654085179 100644
--- a/frontend/src/lib/components/assets/AssetGraph/pipelineHistory.svelte.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineHistory.svelte.ts
@@ -80,7 +80,15 @@ export function usePipelineHistory(
 						kind: j.job_kind.startsWith('flow') ? 'flow' : 'script',
 						status: j.success ? 'success' : 'failure',
 						source: j.schedule_path ? 'schedule' : 'run',
-						at: j.started_at ?? j.created_at
+						at: j.started_at ?? j.created_at,
+						// Same completion-time derivation as the live poll —
+						// the freshness chip compares against completion, and
+						// `at` (start) would read a long run as older than its
+						// output actually is.
+						completedAt:
+							j.started_at != undefined
+								? new Date(new Date(j.started_at).getTime() + j.duration_ms).toISOString()
+								: undefined
 					})
 				}
 				sawFullPage = rows.length === PER_PAGE
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.dataTest.test.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.dataTest.test.ts
new file mode 100644
index 0000000000..2acdf2abfb
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.dataTest.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it } from 'vitest'
+import {
+	autoOutputAsset,
+	compatibleOutputKinds,
+	generatePipelineDraft,
+	PIPELINE_OUTPUT_KINDS
+} from './pipelineTemplates'
+
+// The `data_test` output kind scaffolds a *custom* (singular) data test: a
+// standalone DuckDB script referenced from a materialize script's
+// `-- data_test <path>` line. It must be a single SELECT that reads the
+// freshly-materialized target through the internal `_wm_target` schema — the
+// two rules the backend's self-teaching errors enforce.
+describe('data_test scaffold', () => {
+	it('is a DuckDB-only output kind exposed in the picker', () => {
+		expect(compatibleOutputKinds('duckdb')).toContain('data_test')
+		expect(compatibleOutputKinds('python3')).not.toContain('data_test')
+		expect(PIPELINE_OUTPUT_KINDS.map((k) => k.id)).toContain('data_test')
+	})
+
+	it('produces no output asset (it asserts against an existing target)', () => {
+		expect(autoOutputAsset('data_test', 'folder', 'duckdb')).toBeUndefined()
+	})
+
+	it('scaffolds a single SELECT against `_wm_target.<table>`', () => {
+		const src = generatePipelineDraft({
+			language: 'duckdb',
+			outputKind: 'data_test',
+			triggers: []
+		})
+		// starter body is a single SELECT against the internal target alias.
+		expect(src).toContain('SELECT * FROM _wm_target.your_table WHERE your_condition;')
+		// exactly one SQL statement (single SELECT) — count statement lines, not
+		// the word "SELECT" that also appears in the guidance comment.
+		const stmtLines = src.split('\n').filter((l) => /^\s*SELECT\b/i.test(l))
+		expect(stmtLines).toHaveLength(1)
+		// no `-- materialize <uri>` output annotation — a data test declares no
+		// asset (the word still appears in the guidance comment, which is fine).
+		expect(src).not.toMatch(/^--\s*materialize\s/m)
+		// teaches how to wire it up + the offending-rows convention.
+		expect(src).toContain('-- data_test <this-script-path>')
+		expect(src).toContain('offending rows')
+	})
+
+	it('seeds the table name from an upstream ducklake asset when present', () => {
+		const src = generatePipelineDraft({
+			language: 'duckdb',
+			outputKind: 'data_test',
+			input: { kind: 'ducklake', path: 'analytics/orders' },
+			triggers: []
+		})
+		expect(src).toContain('SELECT * FROM _wm_target.orders WHERE your_condition;')
+		// no ATTACH of the input — the runtime attaches the target as `_wm_target`.
+		expect(src).not.toContain('ATTACH')
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.test.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.test.ts
new file mode 100644
index 0000000000..00fdd085ed
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.test.ts
@@ -0,0 +1,158 @@
+import { describe, expect, it } from 'vitest'
+import type { ScriptLang } from '$lib/gen'
+import {
+	autoOutputAsset,
+	generatePipelineDraft,
+	type PipelineOutputKind
+} from './pipelineTemplates'
+
+// The seeded draft asset (`autoOutputAsset`, stored as `outputAssets` and used
+// by resolveGraph for inactive-draft node identity) must match the asset
+// identity the deploy-time / wasm parser infers from the generated body. The
+// parser canonicalizes any S3 URI by stripping the `s3://` prefix and all
+// leading slashes (see backend `parse_asset_syntax`); if the seed carried a
+// leading slash while the body wrote `s3:///key`, the preview would render a
+// duplicate `/key` node and a phantom post-deploy drift. This pins the two in
+// lockstep so that class of drift can't regress.
+
+// Mirror of the parser's S3 canonicalization for a raw `s3://…` URI.
+function canonicalS3Key(uri: string): string {
+	const rest = uri.replace(/^s3:\/\//, '')
+	return rest.replace(/^\/+/, '')
+}
+
+const S3_KINDS: PipelineOutputKind[] = ['s3_parquet', 's3_object']
+const LANGS: ScriptLang[] = ['bun', 'python3', 'duckdb']
+
+describe('pipelineTemplates S3 seed/body parity', () => {
+	for (const language of LANGS) {
+		for (const outputKind of S3_KINDS) {
+			it(`${language} ${outputKind}: seeded asset path matches the body's S3 write URI`, () => {
+				const output = autoOutputAsset(outputKind, 'demo', language)
+				expect(output).toBeDefined()
+				const asset = output!
+
+				// The seed must be a canonical slashless key so it matches the
+				// identity the parser infers from the generated body.
+				expect(asset.kind).toBe('s3object')
+				expect(asset.path.startsWith('/')).toBe(false)
+
+				const body = generatePipelineDraft({
+					language,
+					outputKind,
+					output: asset,
+					triggers: []
+				})
+
+				// Every S3 URI the generated body emits must canonicalize back to
+				// the seeded asset path — the write target especially.
+				const uris = body.match(/s3:\/\/[^'"`)\s]+/g) ?? []
+				expect(uris.length).toBeGreaterThan(0)
+				for (const uri of uris) {
+					// Runtime form must stay triple-slash (default storage); a bare
+					// `s3://key` would target a named storage `key` at run time.
+					expect(uri.startsWith('s3:///')).toBe(true)
+					expect(canonicalS3Key(uri)).toBe(asset.path)
+				}
+			})
+		}
+	}
+})
+
+// `{partition}` substitutes to the partition IDENTITY string (e.g. `2026-07-05T23`,
+// `2026-W27`, `2026-07`), which is NOT a valid DuckDB TIMESTAMP literal for any
+// sub-day / non-daily grain — so a naive `WHERE ts = TIMESTAMP {partition}`
+// raises a Conversion Error for hourly/weekly/monthly. The runtime injects a
+// `wm_partition(ts)` macro (format from the same source that stamps the
+// identity), so the scaffold teaches the one grain-agnostic filter line.
+describe('pipelineTemplates materialize partition filter', () => {
+	const materializeBody = () =>
+		generatePipelineDraft({
+			language: 'duckdb',
+			outputKind: 'materialize',
+			output: autoOutputAsset('materialize', 'demo', 'duckdb'),
+			input: { kind: 'ducklake', path: 'main/orders' },
+			triggers: []
+		})
+
+	it('teaches the grain-agnostic wm_partition filter', () => {
+		const body = materializeBody()
+		expect(body).toContain(`WHERE wm_partition(<ts_col>) = {partition}`)
+	})
+
+	it('never scaffolds the naive `TIMESTAMP {partition}` cast, nor a raw strftime format', () => {
+		const body = materializeBody()
+		// The footgun cast must never appear (comment or SQL) now that the macro
+		// hides the format entirely.
+		expect(body).not.toMatch(/TIMESTAMP\s*\{partition\}/)
+		// No hand-written strftime format to drift from the resolver.
+		expect(body).not.toContain('strftime')
+	})
+})
+
+describe('pipelineTemplates: auto-derived reads drop the redundant // on', () => {
+	const draft = (
+		input: { kind: 'ducklake' | 's3object' | 'datatable'; path: string } | undefined,
+		triggers: Parameters<typeof generatePipelineDraft>[0]['triggers'],
+		language: ScriptLang = 'duckdb',
+		outputKind: PipelineOutputKind = 'materialize'
+	) =>
+		generatePipelineDraft({
+			language,
+			outputKind,
+			output: autoOutputAsset(outputKind, 'demo', language),
+			input,
+			triggers
+		})
+
+	it('omits // on for a ducklake input the body reads (auto-derived)', () => {
+		const body = draft({ kind: 'ducklake', path: 'main/orders' }, [
+			{ kind: 'asset', ref: 'ducklake://main/orders' }
+		])
+		expect(body).not.toContain('on ducklake://main/orders')
+		// The body still attaches and reads the table (`ducklake://main` →
+		// `lake.orders`), which is what wires the cascade now that the explicit
+		// `// on` is gone.
+		expect(body).toContain(`ATTACH 'ducklake://main'`)
+		expect(body).toContain('lake.orders')
+	})
+
+	it('omits // on for an s3 input the body reads', () => {
+		const body = draft({ kind: 's3object', path: 'raw/events.parquet' }, [
+			{ kind: 'asset', ref: 's3://raw/events.parquet' }
+		])
+		expect(body).not.toContain('on s3://raw/events.parquet')
+	})
+
+	it('keeps // on for a datatable input (not auto-derived)', () => {
+		const body = draft({ kind: 'datatable', path: 'main/dt' }, [
+			{ kind: 'asset', ref: 'datatable://main/dt' }
+		])
+		expect(body).toContain('on datatable://main/dt')
+	})
+
+	it('keeps // on for a native trigger', () => {
+		const body = draft(undefined, [{ kind: 'schedule', path: undefined }])
+		expect(body).toContain('on schedule')
+	})
+
+	it('keeps // on when the body does not read the input (postgres, bash)', () => {
+		// postgres/bash bodies ignore `input`, so dropping `// on` would leave the
+		// script with neither an explicit trigger nor an inferred read → no cascade.
+		const pg = draft(
+			{ kind: 'ducklake', path: 'main/orders' },
+			[{ kind: 'asset', ref: 'ducklake://main/orders' }],
+			'postgresql',
+			'datatable'
+		)
+		expect(pg).toContain('on ducklake://main/orders')
+
+		const bash = draft(
+			{ kind: 's3object', path: 'raw/events.parquet' },
+			[{ kind: 'asset', ref: 's3://raw/events.parquet' }],
+			'bash',
+			's3_object'
+		)
+		expect(bash).toContain('on s3://raw/events.parquet')
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.ts b/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.ts
index 44e501ac3e..02607d5f35 100644
--- a/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/pipelineTemplates.ts
@@ -3,14 +3,24 @@ import { random_adj } from '$lib/components/random_positive_adjetive'
 import { parseDbInputFromAssetSyntax } from '$lib/utils'
 
 // What kind of asset the new script will produce. Drives the random output
-// path scheme and the body skeleton. The output asset is NOT declared in a
-// comment annotation — it's reconstructed from the body's SDK calls / SQL by
-// the asset parser, same as production scripts, so it can't go stale.
+// path scheme and the body skeleton. For most kinds the output asset is NOT
+// declared in a comment annotation — it's reconstructed from the body's SDK
+// calls / SQL by the asset parser, same as production scripts, so it can't go
+// stale. The exception is `materialize`, which declares its target explicitly
+// via the `// materialize` annotation (the runtime generates the write).
 //
 // `none` is the conservative default — body just has a "fill in" comment. The
 // other kinds inject their respective wmill SDK calls / SQL setup so the
 // script is runnable (modulo schema definition) the moment it's created.
-export type PipelineOutputKind = 'none' | 'datatable' | 'ducklake' | 's3_parquet' | 's3_object'
+export type PipelineOutputKind =
+	| 'none'
+	| 'datatable'
+	| 'ducklake'
+	| 'materialize'
+	| 'data_test'
+	| 's3_parquet'
+	| 's3_object'
+	| 'macros'
 
 export type PipelineOutputKindMeta = {
 	id: PipelineOutputKind
@@ -23,6 +33,16 @@ export type PipelineOutputKindMeta = {
 // object are the escape hatches for arbitrary blobs; none is last because
 // picking it disables the whole "auto-generated output" feature.
 export const PIPELINE_OUTPUT_KINDS: PipelineOutputKindMeta[] = [
+	{
+		id: 'materialize',
+		label: 'Materialized table',
+		description: 'Managed DuckLake table — idempotent, versioned, tracked'
+	},
+	{
+		id: 'data_test',
+		label: 'Data test',
+		description: 'Custom assertion — a single SELECT returning offending rows (empty = pass)'
+	},
 	{
 		id: 'datatable',
 		label: 'Data table',
@@ -31,7 +51,7 @@ export const PIPELINE_OUTPUT_KINDS: PipelineOutputKindMeta[] = [
 	{
 		id: 'ducklake',
 		label: 'Ducklake',
-		description: 'DuckDB lakehouse table'
+		description: 'DuckDB lakehouse table (raw write)'
 	},
 	{
 		id: 's3_parquet',
@@ -43,6 +63,11 @@ export const PIPELINE_OUTPUT_KINDS: PipelineOutputKindMeta[] = [
 		label: 'S3 Object',
 		description: 'Generic file (JSON/CSV/binary)'
 	},
+	{
+		id: 'macros',
+		label: 'Macro library',
+		description: 'Reusable DuckDB macros, callable from every script in the workspace'
+	},
 	{
 		id: 'none',
 		label: 'No output',
@@ -60,7 +85,20 @@ const LANG_COMPATIBILITY: Record<ScriptLang, PipelineOutputKind[]> = {
 	bun: ['datatable', 'ducklake', 's3_parquet', 's3_object', 'none'],
 	deno: ['datatable', 'ducklake', 's3_parquet', 's3_object', 'none'],
 	python3: ['datatable', 'ducklake', 's3_parquet', 's3_object', 'none'],
-	duckdb: ['datatable', 'ducklake', 's3_parquet', 's3_object', 'none'],
+	// `materialize` is DuckDB-only: it generates the managed write around a
+	// single SELECT. The Python/TS `wmll.ducklake` helper currently takes a SQL
+	// SELECT (not in-memory rows), so a polyglot managed materialize is a
+	// separate follow-up — those langs keep the `ducklake` raw-write kind.
+	duckdb: [
+		'materialize',
+		'data_test',
+		'datatable',
+		'ducklake',
+		's3_parquet',
+		's3_object',
+		'macros',
+		'none'
+	],
 	postgresql: ['datatable', 'none'],
 	mysql: ['none'],
 	mssql: ['none'],
@@ -135,17 +173,18 @@ export function autoOutputAsset(
 		case 'datatable':
 			return { kind: 'datatable', path: `main/${adj}_${pick(TABLE_NOUNS)}_${slug}` }
 		case 'ducklake':
+		case 'materialize':
 			return { kind: 'ducklake', path: `main/${adj}_${pick(TABLE_NOUNS)}_${slug}` }
-		// s3 paths carry the canonical leading slash of a default-storage
-		// object (`s3:///<key>` parses to path `/<key>`). The deploy-time
-		// parser stores writes in that form — a slashless seeded path would
-		// never match it, and the post-deploy drift check would report the
-		// output as lost (it isn't; the key differs by one '/'). Bodies that
-		// take a bare key (`{ s3: ... }`) strip the slash via `s3Key`.
+		// s3 outputs use the canonical slashless key. `parse_asset_syntax`
+		// normalizes `s3:///<key>` (default storage) and `s3://<key>` to the
+		// bare `<key>`, so the seeded draft asset must be slashless to match the
+		// deploy-time inferred identity — otherwise the post-deploy drift check
+		// would flag the output as a phantom `/`-prefixed node. The generated
+		// bodies still emit the `s3:///<key>` default-storage URI for runtime I/O.
 		case 's3_parquet':
 			return {
 				kind: 's3object',
-				path: `/pipelines/${folder}/${adj}_${pick(DATASET_NOUNS)}_${slug}.parquet`
+				path: `pipelines/${folder}/${adj}_${pick(DATASET_NOUNS)}_${slug}.parquet`
 			}
 		case 's3_object': {
 			// duckdb's natural output for a generic blob is CSV (one COPY TO
@@ -155,9 +194,14 @@ export function autoOutputAsset(
 			const ext = language === 'duckdb' ? 'csv' : 'json'
 			return {
 				kind: 's3object',
-				path: `/pipelines/${folder}/${adj}_${pick(FILE_NOUNS)}_${slug}.${ext}`
+				path: `pipelines/${folder}/${adj}_${pick(FILE_NOUNS)}_${slug}.${ext}`
 			}
 		}
+		// A macro library produces no asset — its "output" is the registry
+		// entries the deploy records. A custom data test produces no asset
+		// either — it asserts against an existing materialized target.
+		case 'macros':
+		case 'data_test':
 		case 'none':
 			return undefined
 	}
@@ -178,10 +222,11 @@ export function assetUri(asset: { kind: AssetKind; path: string }): string {
 	return `${ASSET_URI_PREFIX[asset.kind]}${asset.path}`
 }
 
-// Bare object key for the SDK's `{ s3: <key> }` forms: the canonical asset
-// path of a default-storage object has a leading slash, the key must not.
+// Bare object key for the SDK's `{ s3: <key> }` / `s3:///<key>` forms. Asset
+// paths are already canonical slashless keys; strip stray leading slashes
+// defensively so the emitted key never starts with '/'.
 function s3Key(path: string): string {
-	return path.replace(/^\//, '')
+	return path.replace(/^\/+/, '')
 }
 
 // Splits a datatable asset path (`<db>/<table>` or `<db>/<schema>.<table>`)
@@ -286,26 +331,73 @@ export type TemplateContext = {
 // Header: `// pipeline` + every trigger source as its own annotation line.
 // Output asset is NOT declared here — it's reconstructed from the body's
 // SDK calls / SQL by the asset parser, same as production scripts.
-function header(language: ScriptLang, triggers: DraftTriggerSource[]): string {
+function header(ctx: TemplateContext): string {
+	const { language, triggers, output, outputKind, input } = ctx
 	const p = commentPrefix(language)
-	const lines = triggers.map((t) => {
+	// A custom data test is a standalone script, not a graph node that produces
+	// an asset — so it gets no `// pipeline` / output annotation. Instead, tell
+	// the author how to wire it up (the `data_test` reference) and the two rules
+	// that aren't obvious: single SELECT, returning the offending rows.
+	if (outputKind === 'data_test') {
+		return [
+			`${p} Custom data test — reference it from a materialize script with \`${p} data_test <this-script-path>\`.`,
+			`${p} It must be a single SELECT returning the offending rows; the run fails if any row comes back.`,
+			''
+		].join('\n')
+	}
+	// A ducklake/s3 read the body performs auto-wires its cascade edge from the
+	// FROM clause, so an explicit `// on` for that same asset would be redundant
+	// now that auto-derivation is the default. Only drop it when the generated
+	// body actually READS the input: bun/deno/python/duckdb emit an input load,
+	// but postgres/bash/generic bodies (and `data_upload`, which reads the picker
+	// `file` instead) do not — dropping there would leave the script with no
+	// cascade at all. Also keep `// on` for kinds inference can't derive
+	// (datatable/resource/…) and native triggers.
+	const bodyReadsInput = READS_INPUT_LANGS.has(language) && !isDataUpload(triggers)
+	const inputRef = input ? assetUri(input) : undefined
+	const inputAutoDerives = input?.kind === 'ducklake' || input?.kind === 's3object'
+	const lines = triggers.flatMap((t) => {
 		switch (t.kind) {
 			case 'asset':
-				return `${p} on ${t.ref}`
+				if (bodyReadsInput && inputAutoDerives && t.ref === inputRef) return []
+				return [`${p} on ${t.ref}`]
 			default:
 				// Native triggers (incl. schedule): marker-only — the
 				// binding lives on the trigger row's own `script_path`.
-				return `${p} on ${t.kind}`
+				return [`${p} on ${t.kind}`]
 		}
 	})
-	// Discoverability hint — the three annotations users most often miss
-	// when authoring their first pipeline script. Single line, real
-	// example values (not placeholders) so users see the syntax. Docs
-	// link is the canonical reference once they want the details. A blank
-	// line separates it from the parsed annotations above (`// pipeline`,
-	// `// on …`) so the editor reads as "real annotations, then a hint".
-	const more = `${p} More: partitioned daily, freshness 1h, retry 3, tag heavy — https://www.windmill.dev/docs/pipelines/annotations`
-	return [`${p} pipeline`, ...lines, '', more, ''].join('\n')
+	// Managed materialization is the one kind that declares its output
+	// explicitly — the runtime generates the write around the body's SELECT, so
+	// the target can't be inferred from the body. Emit `// materialize <uri>`
+	// plus a hint about the strategy options that go on the same line. The hint
+	// must NOT start with a parser keyword (`materialize`, `on`, …) or it would
+	// be read as an annotation — `Strategy:` is safe.
+	const matLine =
+		outputKind === 'materialize' && output
+			? [
+					`${p} materialize ${assetUri(output)}`,
+					`${p} Strategy: add key=<col> to merge (upsert), or append for insert-only; default replaces the partition`
+				]
+			: []
+	// Macro library: the `// macros` marker registers every CREATE MACRO below
+	// into the workspace registry at deploy. The hint must not start with a
+	// parser keyword — `Consumers` is safe.
+	const macrosLine =
+		outputKind === 'macros'
+			? [
+					`${p} macros`,
+					`${p} Consumers just call these by name; add \`${p} use <this-script-path>\` in a consumer to force-inject the whole library`
+				]
+			: []
+	// Discoverability hint — a single pointer to the docs rather than a dump of
+	// every optional annotation. New users found the old feature list
+	// (mute/partitioned/freshness/retry/tag on one line) overwhelming; the docs
+	// are the canonical reference once they want any of it. A blank line
+	// separates it from the parsed annotations above (`// pipeline`, `// on …`)
+	// so the editor reads as "real annotations, then a hint".
+	const more = `${p} Optional: partitioning, freshness, retries & cascade control — https://www.windmill.dev/docs/core_concepts/pipelines`
+	return [`${p} pipeline`, ...lines, ...matLine, ...macrosLine, '', more, ''].join('\n')
 }
 
 // Bun / Deno bodies. These share the wmill SDK surface, so we treat them
@@ -322,6 +414,11 @@ function isDataUpload(triggers: DraftTriggerSource[]): boolean {
 	return triggers.some((t) => t.kind === 'data_upload')
 }
 
+// Languages whose generated body reads the `input` asset (an SDK load / SQL
+// FROM), so a ducklake/s3 input auto-derives its cascade and the explicit
+// `// on` can be dropped. postgres/bash/generic bodies ignore `input`.
+const READS_INPUT_LANGS: ReadonlySet<ScriptLang> = new Set(['bun', 'deno', 'python3', 'duckdb'])
+
 function bodyTs(ctx: TemplateContext): string {
 	const { input, output, outputKind } = ctx
 	const dataUpload = isDataUpload(ctx.triggers)
@@ -340,28 +437,28 @@ function bodyTs(ctx: TemplateContext): string {
 		if (!input) return ''
 		switch (input.kind) {
 			case 's3object':
+				// `s3:///<key>` URI — one spelling shared with the `// on
+				// s3:///…` annotation form (the object literal `{ s3: <key> }`
+				// is equivalent).
 				return [
-					`  // Upstream: ${assetUri(input)}`,
-					`  const buf = await wmill.loadS3File({ s3: ${JSON.stringify(s3Key(input.path))} })`,
+					`  const buf = await wmill.loadS3File(${JSON.stringify(`s3:///${s3Key(input.path)}`)})`,
 					`  const rows = JSON.parse(new TextDecoder().decode(buf))`,
 					``
 				].join('\n')
 			case 'datatable':
 				return [
-					`  // Upstream: ${assetUri(input)}`,
 					`  const src = wmill.datatable(${JSON.stringify(input.path.split('/')[0] ?? 'main')})`,
 					`  const rows = await src\`SELECT * FROM ${input.path.split('/').slice(1).join('_') || 'table_name'}\`.fetch()`,
 					``
 				].join('\n')
 			case 'ducklake':
 				return [
-					`  // Upstream: ${assetUri(input)}`,
 					`  const lake = wmill.ducklake(${JSON.stringify(input.path.split('/')[0] ?? 'main')})`,
 					`  const rows = await lake\`SELECT * FROM ${input.path.split('/').slice(1).join('_') || 'table_name'}\`.fetch()`,
 					``
 				].join('\n')
 			default:
-				return `  // Upstream: ${assetUri(input)}\n`
+				return ''
 		}
 	})()
 
@@ -370,9 +467,10 @@ function bodyTs(ctx: TemplateContext): string {
 		switch (outputKind) {
 			case 's3_parquet':
 			case 's3_object':
+				// `s3:///<key>` URI — see the loadS3File note above.
 				return [
 					`  const payload = new TextEncoder().encode(JSON.stringify(rows))`,
-					`  await wmill.writeS3File({ s3: ${JSON.stringify(s3Key(output.path))} }, payload)`
+					`  await wmill.writeS3File(${JSON.stringify(`s3:///${s3Key(output.path)}`)}, payload)`
 				].join('\n')
 			case 'datatable': {
 				const dbName = output.path.split('/')[0] ?? 'main'
@@ -426,25 +524,25 @@ function bodyPython(ctx: TemplateContext): string {
 		if (!input) return ''
 		switch (input.kind) {
 			case 's3object':
+				// `s3:///<key>` URI — SDK string params must be s3:// URIs
+				// (bare keys are rejected), and this form matches the
+				// `# on s3:///…` annotation spelling.
 				return [
-					`    # Upstream: ${assetUri(input)}`,
-					`    buf = wmill.load_s3_file(${JSON.stringify(s3Key(input.path))})`,
+					`    buf = wmill.load_s3_file(${JSON.stringify(`s3:///${s3Key(input.path)}`)})`,
 					`    import json; rows = json.loads(buf.decode("utf-8"))`
 				].join('\n')
 			case 'datatable':
 				return [
-					`    # Upstream: ${assetUri(input)}`,
 					`    src = wmill.datatable(${JSON.stringify(input.path.split('/')[0] ?? 'main')})`,
 					`    rows = src.query("SELECT * FROM ${input.path.split('/').slice(1).join('_') || 'table_name'}").fetch()`
 				].join('\n')
 			case 'ducklake':
 				return [
-					`    # Upstream: ${assetUri(input)}`,
 					`    lake = wmill.ducklake(${JSON.stringify(input.path.split('/')[0] ?? 'main')})`,
 					`    rows = lake.query("SELECT * FROM ${input.path.split('/').slice(1).join('_') || 'table_name'}").fetch()`
 				].join('\n')
 			default:
-				return `    # Upstream: ${assetUri(input)}`
+				return ''
 		}
 	})()
 
@@ -453,9 +551,10 @@ function bodyPython(ctx: TemplateContext): string {
 		switch (outputKind) {
 			case 's3_parquet':
 			case 's3_object':
+				// `s3:///<key>` URI — see the load_s3_file note above.
 				return [
 					`    import json`,
-					`    wmill.write_s3_file(${JSON.stringify(s3Key(output.path))}, json.dumps(rows).encode("utf-8"))`
+					`    wmill.write_s3_file(${JSON.stringify(`s3:///${s3Key(output.path)}`)}, json.dumps(rows).encode("utf-8"))`
 				].join('\n')
 			case 'datatable': {
 				const dbName = output.path.split('/')[0] ?? 'main'
@@ -491,6 +590,22 @@ function bodyPython(ctx: TemplateContext): string {
 function bodyDuckdb(ctx: TemplateContext): string {
 	const { input, output, outputKind } = ctx
 	const dataUpload = isDataUpload(ctx.triggers)
+	if (outputKind === 'data_test') {
+		// Standalone custom data test: it reads ONLY the freshly-materialized
+		// target, which the runtime attaches under the internal `_wm_target`
+		// schema — so it emits no ATTACH / input load of its own. When the test
+		// was created off a ducklake asset, seed its table name; otherwise a
+		// clear placeholder. This exact shape (single SELECT vs `_wm_target`) is
+		// what the backend's self-teaching errors ask for.
+		const testTable = input?.kind === 'ducklake' ? catalogTableRef(input.path) : 'your_table'
+		return [
+			'',
+			`-- Return the rows that VIOLATE your assertion; an empty result means the test passes.`,
+			`-- \`_wm_target\` is the freshly-materialized target, attached by the runtime.`,
+			`SELECT * FROM _wm_target.${testTable} WHERE your_condition;`,
+			''
+		].join('\n')
+	}
 	const lines: string[] = []
 	if (dataUpload) {
 		// `(s3object)` param declaration → the run form renders the S3 picker
@@ -498,7 +613,6 @@ function bodyDuckdb(ctx: TemplateContext): string {
 		lines.push(`-- $file (s3object)`)
 		lines.push(`-- \`file\` is uploaded via the S3 picker on the run form.`)
 	}
-	if (input) lines.push(`-- Upstream: ${assetUri(input)}`)
 	lines.push('')
 
 	// Resolve the catalog db name to ATTACH. Output's db wins when both sides
@@ -532,13 +646,13 @@ function bodyDuckdb(ctx: TemplateContext): string {
 		if (!input) return null
 		switch (input.kind) {
 			case 's3object':
-				return `read_parquet('s3://${input.path}')`
+				return `read_parquet('s3:///${input.path}')`
 			case 'datatable':
 				// `pg` is the attached Postgres catalog (see ATTACH above).
 				// Use a 2-part `pg.<table>` ref so the asset parser maps it
-				// back to `datatable://<db>/<table>` — matching the
-				// `// Upstream` annotation. Schema is only emitted if the
-				// asset path explicitly includes one (`main/myschema.mytable`).
+				// back to `datatable://<db>/<table>` — matching the input asset.
+				// Schema is only emitted if the asset path explicitly includes
+				// one (`main/myschema.mytable`).
 				return `pg.${catalogTableRef(input.path)}`
 			case 'ducklake':
 				return `lake.${catalogTableRef(input.path)}`
@@ -555,7 +669,7 @@ function bodyDuckdb(ctx: TemplateContext): string {
 					`COPY (`,
 					`  SELECT *`,
 					`  FROM ${fromExpr}`,
-					`) TO 's3://${output.path}' (FORMAT 'parquet');`
+					`) TO 's3:///${output.path}' (FORMAT 'parquet');`
 				)
 			}
 			break
@@ -566,7 +680,7 @@ function bodyDuckdb(ctx: TemplateContext): string {
 					`COPY (`,
 					`  SELECT *`,
 					`  FROM ${fromExpr}`,
-					`) TO 's3://${output.path}' (FORMAT 'csv', HEADER);`
+					`) TO 's3:///${output.path}' (FORMAT 'csv', HEADER);`
 				)
 			}
 			break
@@ -579,6 +693,25 @@ function bodyDuckdb(ctx: TemplateContext): string {
 				)
 			}
 			break
+		case 'materialize':
+			// Managed materialization: the body is just the SELECT that produces
+			// the slice — the runtime wraps it into the idempotent write +
+			// snapshot (see the `// materialize` annotation in the header). No
+			// CREATE TABLE / INSERT, and the target is NOT attached here (the
+			// runtime attaches it).
+			//
+			// Partitioned? `{partition}` is the slice's identity string. For a
+			// time grain the runtime injects a `wm_partition(ts)` macro that
+			// buckets a timestamp with that same identity format, so one
+			// grain-agnostic filter line targets the active slice — no
+			// hand-written strftime format, no `= TIMESTAMP {partition}` cast
+			// (which errors for hourly/weekly/monthly). One commented line keeps
+			// the scaffold light; docs cover dynamic-grain keys.
+			lines.push(
+				`-- Partitioned? Filter the source to the active slice: WHERE wm_partition(<ts_col>) = {partition}`,
+				`SELECT * FROM ${inSql ?? '(SELECT 1 AS placeholder)'};`
+			)
+			break
 		case 'datatable':
 			if (output) {
 				// 2-part `pg.<table>` so the asset parser resolves the
@@ -594,6 +727,18 @@ function bodyDuckdb(ctx: TemplateContext): string {
 				)
 			}
 			break
+		case 'macros':
+			// Library body: only CREATE [OR REPLACE] MACRO statements (plus plain
+			// setup). One scalar + one table example; bodies may only call macros
+			// defined EARLIER in the file (DuckDB bind-checks at creation).
+			lines.push(
+				`CREATE OR REPLACE MACRO safe_div(a, b, fallback := 0) AS`,
+				`  CASE WHEN b = 0 THEN fallback ELSE a / b END;`,
+				``,
+				`CREATE OR REPLACE MACRO sample_rows(src, n) AS TABLE`,
+				`  SELECT * FROM query_table(src) LIMIT n;`
+			)
+			break
 		case 'none':
 		default:
 			// With an uploaded file but no output asset, at least surface its
@@ -605,9 +750,8 @@ function bodyDuckdb(ctx: TemplateContext): string {
 }
 
 function bodyPostgres(ctx: TemplateContext): string {
-	const { input, output, outputKind } = ctx
+	const { output, outputKind } = ctx
 	const lines: string[] = []
-	if (input) lines.push(`-- Upstream: ${assetUri(input)}`)
 	lines.push('')
 
 	if (outputKind === 'datatable' && output) {
@@ -636,9 +780,8 @@ function bodyPostgres(ctx: TemplateContext): string {
 }
 
 function bodyBash(ctx: TemplateContext): string {
-	const { input, output, outputKind } = ctx
+	const { output, outputKind } = ctx
 	const lines: string[] = []
-	if (input) lines.push(`# Upstream: ${assetUri(input)}`)
 	if (outputKind === 's3_object' && output) {
 		lines.push(
 			``,
@@ -655,7 +798,6 @@ function bodyBash(ctx: TemplateContext): string {
 function genericBody(ctx: TemplateContext): string {
 	const p = commentPrefix(ctx.language)
 	const lines: string[] = []
-	if (ctx.input) lines.push(`${p} Upstream: ${assetUri(ctx.input)}`)
 	lines.push(`${p} Fill in pipeline logic.`)
 	return lines.join('\n') + '\n'
 }
@@ -664,7 +806,7 @@ function genericBody(ctx: TemplateContext): string {
 // The returned content is ready to drop into a Script as `content` — no
 // further mutation needed, including for the trigger annotations.
 export function generatePipelineDraft(ctx: TemplateContext): string {
-	const head = header(ctx.language, ctx.triggers)
+	const head = header(ctx)
 	const body = (() => {
 		switch (ctx.language) {
 			case 'bun':
diff --git a/frontend/src/lib/components/assets/AssetGraph/resolveGraph.test.ts b/frontend/src/lib/components/assets/AssetGraph/resolveGraph.test.ts
index 78199a3871..e35054beab 100644
--- a/frontend/src/lib/components/assets/AssetGraph/resolveGraph.test.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/resolveGraph.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { resolveGraph, type ResolveGraphInput } from './resolveGraph'
+import { resolveGraph, computeMutedReadKeys, type ResolveGraphInput } from './resolveGraph'
 import type { PipelineAnnotations } from './parsePipelineAnnotations'
 import type { AssetGraphResponse } from './types'
 import type { AssetWithAltAccessType } from '$lib/components/assets/lib'
@@ -8,6 +8,12 @@ const ann = (over: Partial<PipelineAnnotations> = {}): PipelineAnnotations => ({
 	inPipeline: false,
 	triggerAssets: [],
 	nativeTriggers: [],
+	dataTests: [],
+	columnLineage: [],
+	macros: false,
+	useLibs: [],
+	muteAssets: [],
+	muteAll: false,
 	...over
 })
 
@@ -33,6 +39,15 @@ const input = (over: Partial<ResolveGraphInput> = {}): ResolveGraphInput => ({
 const s3 = (path: string, access_type: 'r' | 'w' | 'rw'): AssetWithAltAccessType =>
 	({ kind: 's3object', path, access_type }) as AssetWithAltAccessType
 
+const duck = (path: string, access_type: 'r' | 'w' | 'rw'): AssetWithAltAccessType =>
+	({ kind: 'ducklake', path, access_type }) as AssetWithAltAccessType
+
+/** kind:path of the unsaved asset-trigger overlays for a runnable. */
+const assetTrigKeys = (r: AssetGraphResponse, path: string): string[] =>
+	r.triggers
+		.filter((t) => t.trigger_kind === 'asset' && t.runnable_path === path && (t as any).unsaved)
+		.map((t) => `${(t as any).asset_kind}:${(t as any).asset_path}`)
+
 describe('resolveGraph', () => {
 	it('passes an empty graph through unchanged', () => {
 		const r = resolveGraph(input())
@@ -65,11 +80,14 @@ describe('resolveGraph', () => {
 		expect(resolveGraph(input({ base }))).toEqual(base)
 	})
 
-	it('draft: adds an unsaved runnable + write edge from the static outputAsset', () => {
+	it('draft: adds an unsaved runnable + write edge from outputAssets', () => {
 		const drafts = new Map([
 			[
 				'f/x/d',
-				{ script: { content: '' }, outputAsset: { kind: 's3object' as const, path: '/out.json' } }
+				{
+					script: { content: '' },
+					outputAssets: [{ kind: 's3object' as const, path: '/out.json' }]
+				}
 			]
 		])
 		const r = resolveGraph(input({ drafts }))
@@ -92,20 +110,48 @@ describe('resolveGraph', () => {
 		})
 	})
 
-	it('draft: outputAssets snapshot wins over the static outputAsset', () => {
+	it('scd2 materialize draft: writes both the base dim and its _current companion view', () => {
 		const drafts = new Map([
 			[
-				'f/x/d',
+				'f/x/dim',
 				{
-					script: { content: '' },
-					outputAsset: { kind: 's3object' as const, path: '/old.json' },
-					outputAssets: [{ kind: 's3object' as const, path: '/new.json' }]
+					script: {
+						content: '-- materialize ducklake://main/dim_customers key=id history\nselect 1'
+					}
 				}
 			]
 		])
 		const r = resolveGraph(input({ drafts }))
-		expect(r.edges.map((e) => e.asset_path)).toContain('/new.json')
-		expect(r.edges.map((e) => e.asset_path)).not.toContain('/old.json')
+		// Base dimension: a plain write output node.
+		expect(r.assets).toContainEqual({ kind: 'ducklake', path: 'main/dim_customers' })
+		// Companion `_current` view: same producer, marked derived from the base.
+		expect(r.assets).toContainEqual({
+			kind: 'ducklake',
+			path: 'main/dim_customers_current',
+			derived_from: 'main/dim_customers'
+		})
+		for (const path of ['main/dim_customers', 'main/dim_customers_current']) {
+			expect(r.edges).toContainEqual({
+				runnable_path: 'f/x/dim',
+				runnable_kind: 'script',
+				asset_kind: 'ducklake',
+				asset_path: path,
+				access_type: 'w',
+				unsaved: true
+			})
+		}
+	})
+
+	it('non-scd2 materialize draft: writes only the base dim, no _current companion', () => {
+		const drafts = new Map([
+			[
+				'f/x/dim',
+				{ script: { content: '-- materialize ducklake://main/dim_customers key=id\nselect 1' } }
+			]
+		])
+		const r = resolveGraph(input({ drafts }))
+		expect(r.assets).toContainEqual({ kind: 'ducklake', path: 'main/dim_customers' })
+		expect(r.assets.some((a) => a.path === 'main/dim_customers_current')).toBe(false)
 	})
 
 	it('active draft: live body writes are authoritative over the snapshot', () => {
@@ -189,6 +235,85 @@ describe('resolveGraph', () => {
 		expect(r.edges.find((e) => e.asset_path === '/should-not.json')).toBeUndefined()
 	})
 
+	it('open buffer: a ducklake/s3 read auto-derives an unsaved cascade trigger', () => {
+		const liveBodyAssets = {
+			scriptPath: 'f/x/open',
+			assets: [duck('main.orders', 'r'), s3('raw/events', 'r'), duck('main.out', 'w')]
+		}
+		const liveAnnotations = { scriptPath: 'f/x/open', annotations: ann({ inPipeline: true }) }
+		const r = resolveGraph(input({ liveBodyAssets, liveAnnotations }))
+		// The two reads derive edges; the write (main.out) does not (self-edge).
+		expect(assetTrigKeys(r, 'f/x/open').sort()).toEqual([
+			'ducklake:main.orders',
+			's3object:raw/events'
+		])
+	})
+
+	it('open buffer: a materialize producer reading its own target does not self-cascade', () => {
+		// The body `SELECT`s from the table it materializes (incremental model).
+		// The write is annotation-declared, not in the body, so without excluding
+		// the materialize target the read would auto-derive a self-cascade edge.
+		const liveBodyAssets = { scriptPath: 'f/x/p', assets: [duck('main.orders', 'r')] }
+		const liveAnnotations = {
+			scriptPath: 'f/x/p',
+			annotations: ann({
+				inPipeline: true,
+				materialize: { targetKind: 'ducklake' as const, targetPath: 'main.orders' }
+			})
+		}
+		const r = resolveGraph(input({ liveBodyAssets, liveAnnotations }))
+		expect(assetTrigKeys(r, 'f/x/p')).toEqual([])
+	})
+
+	it('open buffer: a read that is also written (rw) does not self-trigger', () => {
+		const liveBodyAssets = { scriptPath: 'f/x/open', assets: [duck('main.self', 'rw')] }
+		const liveAnnotations = { scriptPath: 'f/x/open', annotations: ann({ inPipeline: true }) }
+		const r = resolveGraph(input({ liveBodyAssets, liveAnnotations }))
+		expect(assetTrigKeys(r, 'f/x/open')).toEqual([])
+	})
+
+	it('open buffer: // mute suppresses one derived edge, // mute all suppresses all', () => {
+		const liveBodyAssets = {
+			scriptPath: 'f/x/open',
+			assets: [duck('main.a', 'r'), duck('main.b', 'r')]
+		}
+		const muted = resolveGraph(
+			input({
+				liveBodyAssets,
+				liveAnnotations: {
+					scriptPath: 'f/x/open',
+					annotations: ann({ inPipeline: true, muteAssets: [{ kind: 'ducklake', path: 'main.a' }] })
+				}
+			})
+		)
+		expect(assetTrigKeys(muted, 'f/x/open')).toEqual(['ducklake:main.b'])
+
+		const all = resolveGraph(
+			input({
+				liveBodyAssets,
+				liveAnnotations: {
+					scriptPath: 'f/x/open',
+					annotations: ann({ inPipeline: true, muteAll: true })
+				}
+			})
+		)
+		expect(assetTrigKeys(all, 'f/x/open')).toEqual([])
+	})
+
+	it('open buffer: an explicit // on is not double-emitted as a derived edge', () => {
+		const liveBodyAssets = { scriptPath: 'f/x/open', assets: [duck('main.orders', 'r')] }
+		const liveAnnotations = {
+			scriptPath: 'f/x/open',
+			annotations: ann({
+				inPipeline: true,
+				triggerAssets: [{ kind: 'ducklake', path: 'main.orders' }]
+			})
+		}
+		const r = resolveGraph(input({ liveBodyAssets, liveAnnotations }))
+		// Exactly one overlay for the table, not one explicit + one derived.
+		expect(assetTrigKeys(r, 'f/x/open')).toEqual(['ducklake:main.orders'])
+	})
+
 	it('open-script live annotations add unsaved triggers, deduped vs persisted', () => {
 		const base = baseGraph({
 			triggers: [
@@ -350,6 +475,55 @@ describe('resolveGraph', () => {
 		expect(r.edges.some((e) => e.asset_path === 'main/out' && e.access_type === 'w')).toBe(true)
 	})
 
+	it('editing a saved scd2 producer keeps both the base and _current persisted write edges', () => {
+		// Deploy persists a write to both `main/dim` and `main/dim_current`.
+		// Opening the producer for editing must not judge the companion `_current`
+		// write stale — otherwise a consumer of only the view orphans mid-edit.
+		const base = baseGraph({
+			runnables: [{ path: 'f/x/dim', usage_kind: 'script' }],
+			edges: [
+				{
+					runnable_path: 'f/x/dim',
+					runnable_kind: 'script',
+					asset_kind: 'ducklake',
+					asset_path: 'main/dim_customers',
+					access_type: 'w'
+				},
+				{
+					runnable_path: 'f/x/dim',
+					runnable_kind: 'script',
+					asset_kind: 'ducklake',
+					asset_path: 'main/dim_customers_current',
+					access_type: 'w'
+				}
+			]
+		})
+		const r = resolveGraph(
+			input({
+				base,
+				liveAnnotations: {
+					scriptPath: 'f/x/dim',
+					annotations: ann({
+						materialize: {
+							targetKind: 'ducklake',
+							targetPath: 'main/dim_customers',
+							uniqueKey: 'id',
+							scd2: true
+						}
+					})
+				},
+				liveBodyAssets: { scriptPath: 'f/x/dim', assets: [] }
+			})
+		)
+		for (const path of ['main/dim_customers', 'main/dim_customers_current']) {
+			expect(
+				r.edges.some(
+					(e) => e.runnable_path === 'f/x/dim' && e.asset_path === path && e.access_type === 'w'
+				)
+			).toBe(true)
+		}
+	})
+
 	it('selecting a saved script unchanged drops nothing (no stale removal)', () => {
 		const base = baseGraph({
 			runnables: [{ path: 'f/x/prod', usage_kind: 'script' }],
@@ -464,4 +638,389 @@ describe('resolveGraph', () => {
 			missing: true
 		})
 	})
+
+	it('macro edges: base passes through; live `// use` adds an unsaved via_use edge', () => {
+		const base = baseGraph({
+			runnables: [
+				{
+					path: 'f/lib/stats',
+					usage_kind: 'script',
+					macros: [{ name: 'safe_div', params: 'a, b', is_table: false }]
+				},
+				{ path: 'f/x/cons', usage_kind: 'script' }
+			],
+			macro_edges: [
+				{
+					lib_path: 'f/lib/stats',
+					consumer_path: 'f/x/cons',
+					macro_names: ['safe_div'],
+					via_use: false
+				}
+			]
+		})
+		const r = resolveGraph(
+			input({
+				base,
+				liveAnnotations: {
+					scriptPath: 'f/x/other',
+					annotations: ann({ useLibs: ['f/lib/stats'] })
+				}
+			})
+		)
+		// Detection edge preserved untouched.
+		expect(r.macro_edges).toContainEqual({
+			lib_path: 'f/lib/stats',
+			consumer_path: 'f/x/cons',
+			macro_names: ['safe_div'],
+			via_use: false
+		})
+		// Live `// use` synthesizes an unsaved whole-lib edge with the lib's names.
+		expect(r.macro_edges).toContainEqual({
+			lib_path: 'f/lib/stats',
+			consumer_path: 'f/x/other',
+			macro_names: ['safe_div'],
+			via_use: true,
+			unsaved: true
+		})
+	})
+
+	it('macro edges: removing the `// use` line of an overlaid consumer retires its via_use edge', () => {
+		const base = baseGraph({
+			macro_edges: [
+				{
+					lib_path: 'f/lib/stats',
+					consumer_path: 'f/x/cons',
+					macro_names: ['safe_div'],
+					via_use: true
+				}
+			]
+		})
+		const r = resolveGraph(
+			input({
+				base,
+				liveAnnotations: { scriptPath: 'f/x/cons', annotations: ann() }
+			})
+		)
+		expect(r.macro_edges).toEqual([])
+	})
+
+	it('macro edges: draft `// macros` library gets the ƒ badge data from its body', () => {
+		const drafts = new Map([
+			[
+				'f/lib/new',
+				{
+					script: {
+						content: '// macros\nCREATE OR REPLACE MACRO dbl(a) AS a * 2;'
+					}
+				}
+			]
+		])
+		const r = resolveGraph(input({ drafts }))
+		const lib = r.runnables.find((x) => x.path === 'f/lib/new')
+		expect(lib?.macros).toEqual([{ name: 'dbl', params: 'a', is_table: false }])
+	})
+})
+
+describe('computeMutedReadKeys', () => {
+	const readEdge = (asset_kind: any, asset_path: string, access: any = 'r') => ({
+		runnable_path: 'f/x/c',
+		runnable_kind: 'script' as const,
+		asset_kind,
+		asset_path,
+		access_type: access
+	})
+	const assetTrigger = (asset_kind: any, asset_path: string) => ({
+		trigger_kind: 'asset' as const,
+		asset_kind,
+		asset_path,
+		runnable_kind: 'script' as const,
+		runnable_path: 'f/x/c'
+	})
+	// `f/x/c` (the read consumer) is an in-pipeline script.
+	const pipelineRunnable = [{ path: 'f/x/c', usage_kind: 'script' as const, in_pipeline: true }]
+
+	it('flags a ducklake/s3 read with no cascade trigger as muted', () => {
+		const muted = computeMutedReadKeys(
+			[readEdge('ducklake', 'main.orders'), readEdge('s3object', 'raw/events')],
+			[],
+			pipelineRunnable
+		)
+		expect([...muted].sort()).toEqual([
+			'ducklake:main.orders->script:f/x/c',
+			's3object:raw/events->script:f/x/c'
+		])
+	})
+
+	it('does not flag a read that has a cascade trigger', () => {
+		const muted = computeMutedReadKeys(
+			[readEdge('ducklake', 'main.orders')],
+			[assetTrigger('ducklake', 'main.orders')],
+			pipelineRunnable
+		)
+		expect(muted.size).toBe(0)
+	})
+
+	it('ignores rw self-reads and unsupported kinds', () => {
+		const muted = computeMutedReadKeys(
+			[
+				readEdge('ducklake', 'main.self', 'rw'), // self-read, not muted
+				readEdge('resource', 'f/db'), // out of scope
+				readEdge('datatable', 'main.dt') // out of scope
+			],
+			[],
+			pipelineRunnable
+		)
+		expect(muted.size).toBe(0)
+	})
+
+	it('does not flag a read whose script also writes the asset', () => {
+		// Live-overlay shape of a `// materialize` producer reading its own target:
+		// a separate `'r'` read edge and `'w'` write edge for the same asset. It's
+		// the script's own output, not a suppressed input, so it is not muted.
+		const muted = computeMutedReadKeys(
+			[readEdge('ducklake', 'main.orders', 'r'), readEdge('ducklake', 'main.orders', 'w')],
+			[],
+			pipelineRunnable
+		)
+		expect(muted.size).toBe(0)
+	})
+
+	it('does not flag a read by a non-pipeline script (auto-derivation never applied)', () => {
+		// Same read, but the consumer is a plain script (or a flow), not a
+		// `// pipeline` member — no auto trigger was ever derived to suppress.
+		const plainScript = [{ path: 'f/x/c', usage_kind: 'script' as const, in_pipeline: false }]
+		expect(computeMutedReadKeys([readEdge('ducklake', 'main.orders')], [], plainScript).size).toBe(
+			0
+		)
+		const flow = [{ path: 'f/x/c', usage_kind: 'flow' as const, in_pipeline: true }]
+		expect(computeMutedReadKeys([readEdge('ducklake', 'main.orders')], [], flow).size).toBe(0)
+	})
+})
+
+describe('live buffer overlays (open script)', () => {
+	// A deployed producer: `f/x/prod` materializes ducklake main/orders.
+	const deployedProducer = () =>
+		baseGraph({
+			assets: [{ kind: 'ducklake', path: 'main/orders' }],
+			runnables: [{ path: 'f/x/prod', usage_kind: 'script', in_pipeline: true }],
+			edges: [
+				{
+					runnable_path: 'f/x/prod',
+					runnable_kind: 'script',
+					asset_kind: 'ducklake',
+					asset_path: 'main/orders',
+					access_type: 'w'
+				}
+			]
+		})
+
+	it('open draft: live annotations win over the stale draft snapshot for the materialize target', () => {
+		const drafts = new Map([
+			['f/x/d', { script: { content: '-- materialize ducklake://main/old_target\nselect 1' } }]
+		])
+		const r = resolveGraph(
+			input({
+				drafts,
+				liveBodyAssets: { scriptPath: 'f/x/d', assets: [] },
+				liveAnnotations: {
+					scriptPath: 'f/x/d',
+					annotations: ann({
+						inPipeline: true,
+						materialize: { targetKind: 'ducklake', targetPath: 'main/new_target' }
+					})
+				}
+			})
+		)
+		expect(r.assets).toContainEqual({ kind: 'ducklake', path: 'main/new_target' })
+		expect(r.assets).not.toContainEqual({ kind: 'ducklake', path: 'main/old_target' })
+		expect(r.edges).toContainEqual({
+			runnable_path: 'f/x/d',
+			runnable_kind: 'script',
+			asset_kind: 'ducklake',
+			asset_path: 'main/new_target',
+			access_type: 'w',
+			unsaved: true
+		})
+	})
+
+	it('open saved script: retargeting `// materialize` swaps the write edge live', () => {
+		const r = resolveGraph(
+			input({
+				base: deployedProducer(),
+				liveBodyAssets: { scriptPath: 'f/x/prod', assets: [] },
+				liveAnnotations: {
+					scriptPath: 'f/x/prod',
+					annotations: ann({
+						inPipeline: true,
+						materialize: { targetKind: 'ducklake', targetPath: 'main/orders_gold' }
+					})
+				}
+			})
+		)
+		// New target surfaces as an unsaved write edge…
+		expect(r.assets).toContainEqual({ kind: 'ducklake', path: 'main/orders_gold' })
+		expect(r.edges).toContainEqual({
+			runnable_path: 'f/x/prod',
+			runnable_kind: 'script',
+			asset_kind: 'ducklake',
+			asset_path: 'main/orders_gold',
+			access_type: 'w',
+			unsaved: true
+		})
+		// …the stale write edge is dropped, but the deployed dataset node stays.
+		expect(
+			r.edges.filter((e) => e.asset_path === 'main/orders' && e.runnable_path === 'f/x/prod')
+		).toEqual([])
+		expect(r.assets).toContainEqual({ kind: 'ducklake', path: 'main/orders' })
+	})
+
+	it('open saved script: unchanged materialize target dedups against the persisted write edge', () => {
+		const r = resolveGraph(
+			input({
+				base: deployedProducer(),
+				liveBodyAssets: { scriptPath: 'f/x/prod', assets: [] },
+				liveAnnotations: {
+					scriptPath: 'f/x/prod',
+					annotations: ann({
+						inPipeline: true,
+						materialize: { targetKind: 'ducklake', targetPath: 'main/orders' }
+					})
+				}
+			})
+		)
+		expect(
+			r.edges.filter(
+				(e) =>
+					e.runnable_path === 'f/x/prod' &&
+					e.asset_path === 'main/orders' &&
+					(e.access_type === 'w' || e.access_type === 'rw')
+			)
+		).toHaveLength(1)
+	})
+
+	it('open saved script: live body reads/writes overlay as unsaved lineage', () => {
+		const base = baseGraph({
+			assets: [{ kind: 'ducklake', path: 'main/orders' }],
+			runnables: [{ path: 'f/x/cons', usage_kind: 'script', in_pipeline: true }],
+			edges: [
+				{
+					runnable_path: 'f/x/cons',
+					runnable_kind: 'script',
+					asset_kind: 'ducklake',
+					asset_path: 'main/orders',
+					access_type: 'r'
+				}
+			]
+		})
+		const r = resolveGraph(
+			input({
+				base,
+				liveBodyAssets: {
+					scriptPath: 'f/x/cons',
+					assets: [duck('main/orders_eu', 'r'), s3('/report.parquet', 'w')]
+				},
+				liveAnnotations: {
+					scriptPath: 'f/x/cons',
+					annotations: ann({ inPipeline: true })
+				}
+			})
+		)
+		// New read + write from the buffer…
+		expect(r.edges).toContainEqual({
+			runnable_path: 'f/x/cons',
+			runnable_kind: 'script',
+			asset_kind: 'ducklake',
+			asset_path: 'main/orders_eu',
+			access_type: 'r',
+			unsaved: true
+		})
+		expect(r.edges).toContainEqual({
+			runnable_path: 'f/x/cons',
+			runnable_kind: 'script',
+			asset_kind: 's3object',
+			asset_path: '/report.parquet',
+			access_type: 'w',
+			unsaved: true
+		})
+		// …the no-longer-read persisted edge is dropped.
+		expect(
+			r.edges.filter((e) => e.asset_path === 'main/orders' && e.runnable_path === 'f/x/cons')
+		).toEqual([])
+	})
+})
+
+describe('inactive draft input lineage', () => {
+	it('keeps read edges + derived cascade for a deselected draft via inputAssets', () => {
+		const drafts = new Map([
+			[
+				'f/x/cons',
+				{
+					script: { content: '-- pipeline\n-- materialize ducklake://main/agg\nselect 1' },
+					outputAssets: [{ kind: 'ducklake' as const, path: 'main/agg' }],
+					inputAssets: [{ kind: 'ducklake' as const, path: 'main/src' }]
+				}
+			]
+		])
+		// No live overlay: the draft is NOT the open script.
+		const r = resolveGraph(input({ drafts }))
+		expect(r.assets).toContainEqual({ kind: 'ducklake', path: 'main/src' })
+		expect(r.edges).toContainEqual({
+			runnable_path: 'f/x/cons',
+			runnable_kind: 'script',
+			asset_kind: 'ducklake',
+			asset_path: 'main/src',
+			access_type: 'r',
+			unsaved: true
+		})
+		// Auto-derived cascade trigger from the captured read.
+		expect(assetTrigKeys(r, 'f/x/cons')).toContain('ducklake:main/src')
+	})
+
+	it('an empty inputAssets array is authoritative — no session-cache fallback', () => {
+		const drafts = new Map([
+			[
+				'f/x/cons',
+				{
+					script: { content: '-- pipeline\nselect 1' },
+					inputAssets: [] as Array<{ kind: 'ducklake'; path: string }>
+				}
+			]
+		])
+		const inferredReadsByPath = new Map([
+			['f/x/cons', [{ kind: 'ducklake' as const, path: 'main/stale' }]]
+		])
+		const r = resolveGraph(input({ drafts, inferredReadsByPath }))
+		expect(r.assets).not.toContainEqual({ kind: 'ducklake', path: 'main/stale' })
+		expect(r.edges.filter((e) => e.asset_path === 'main/stale')).toEqual([])
+	})
+})
+
+describe('open saved script: live overlay vs inferred-lineage maps', () => {
+	it('does not duplicate edges when the same live ref reaches both paths', () => {
+		// The route page mirrors the open pane's liveBodyAssets into
+		// inferredReads/WritesByPath, so the same refs arrive twice.
+		const base = baseGraph({
+			runnables: [{ path: 'f/x/cons', usage_kind: 'script', in_pipeline: true }]
+		})
+		const live = [duck('main/src', 'r'), s3('/out.parquet', 'w')]
+		const r = resolveGraph(
+			input({
+				base,
+				liveBodyAssets: { scriptPath: 'f/x/cons', assets: live },
+				liveAnnotations: { scriptPath: 'f/x/cons', annotations: ann({ inPipeline: true }) },
+				inferredReadsByPath: new Map([
+					['f/x/cons', [{ kind: 'ducklake' as const, path: 'main/src' }]]
+				]),
+				inferredWritesByPath: new Map([
+					['f/x/cons', [{ kind: 's3object' as const, path: '/out.parquet' }]]
+				])
+			})
+		)
+		expect(
+			r.edges.filter((e) => e.asset_path === 'main/src' && e.runnable_path === 'f/x/cons')
+		).toHaveLength(1)
+		expect(
+			r.edges.filter((e) => e.asset_path === '/out.parquet' && e.runnable_path === 'f/x/cons')
+		).toHaveLength(1)
+	})
 })
diff --git a/frontend/src/lib/components/assets/AssetGraph/resolveGraph.ts b/frontend/src/lib/components/assets/AssetGraph/resolveGraph.ts
index 6e4f512000..8ee0ca53d7 100644
--- a/frontend/src/lib/components/assets/AssetGraph/resolveGraph.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/resolveGraph.ts
@@ -1,5 +1,11 @@
-import type { AssetGraphResponse, NativeTriggerKind } from './types'
-import { parsePipelineAnnotations, type PipelineAnnotations } from './parsePipelineAnnotations'
+import type { AssetGraphMacroEdge, AssetGraphResponse, NativeTriggerKind } from './types'
+import {
+	mergeColumnLineage,
+	parsePipelineAnnotations,
+	scd2CurrentTargetPath,
+	type ColumnLineage,
+	type PipelineAnnotations
+} from './parsePipelineAnnotations'
 import {
 	extractWrites,
 	extractReads,
@@ -10,8 +16,10 @@ import {
 /** Minimal structural shape of a pipeline draft `resolveGraph` needs. */
 export type GraphDraft = {
 	script: { content: string }
-	outputAsset?: { kind: AssetKind; path: string }
 	outputAssets?: Array<{ kind: AssetKind; path: string }>
+	/** Reads captured on pane teardown. `undefined` = not captured (legacy
+	 * bundle) → fall back to the session cache; `[]` = authoritative none. */
+	inputAssets?: Array<{ kind: AssetKind; path: string }>
 }
 
 export type ResolveGraphInput = {
@@ -20,7 +28,12 @@ export type ResolveGraphInput = {
 	/** In-flight drafts keyed by script path. */
 	drafts: Map<string, GraphDraft>
 	/** Body assets inferred for the currently-open script (live keystrokes). */
-	liveBodyAssets: { scriptPath: string | undefined; assets: AssetWithAltAccessType[] }
+	liveBodyAssets: {
+		scriptPath: string | undefined
+		assets: AssetWithAltAccessType[]
+		/** Body-inferred column lineage (DuckDB SQL AST) for the open script. */
+		columnLineage?: ColumnLineage[]
+	}
 	/** Pipeline annotations parsed from the currently-open buffer. */
 	liveAnnotations: { scriptPath: string | undefined; annotations: PipelineAnnotations }
 	/** Sticky session caches of inferred body writes/reads per script path. */
@@ -60,6 +73,108 @@ function persistedNativeKinds(base: AssetGraphResponse, path: string): Set<strin
 	)
 }
 
+// Read-asset kinds that auto-derive a cascade trigger edge inside a
+// `// pipeline`. Mirror of the backend `is_auto_trigger_kind`
+// (windmill-common assets.rs) — ducklake tables and s3 objects only.
+const AUTO_TRIGGER_KINDS: ReadonlySet<AssetKind> = new Set(['ducklake', 's3object'])
+
+/** `kind:path` refs of a script's `// materialize` write target(s) (base +
+ *  the scd2 `<dim>_current` companion), which the body `SELECT` doesn't express. */
+function materializeWriteRefs(parsed: PipelineAnnotations): string[] {
+	const m = parsed.materialize
+	if (!m) return []
+	const refs = [`${m.targetKind}:${m.targetPath}`]
+	const current = scd2CurrentTargetPath(m)
+	if (current) refs.push(`${m.targetKind}:${current}`)
+	return refs
+}
+
+/**
+ * Backend-mirror of `derive_pipeline_asset_trigger_refs` (windmill-common
+ * assets.rs): a pipeline script's ducklake/s3 read auto-wires a cascade
+ * trigger edge from the FROM clause, so `// on <asset>` is only needed for
+ * edges inference can't see. Excluded: assets the script also writes (`writes`
+ * covers `w`/`rw`, so an `rw` self-read can't loop-trigger), muted assets,
+ * `// mute all`, and any explicit `// on` (which already emits its own edge).
+ * Returns the `{kind, path}` refs to overlay as unsaved asset triggers, deduped.
+ */
+function deriveAutoAssetTriggers(
+	reads: Array<{ kind: AssetKind; path: string }>,
+	writes: Array<{ kind: AssetKind; path: string }>,
+	parsed: PipelineAnnotations
+): Array<{ kind: AssetKind; path: string }> {
+	// Auto-derivation is scoped to `// pipeline` scripts (backend gates on
+	// `in_pipeline`); `// mute all` opts a pipeline script back out.
+	if (!parsed.inPipeline || parsed.muteAll) return []
+	const skip = new Set<string>([
+		...writes.map((w) => `${w.kind}:${w.path}`),
+		// The `// materialize` target(s) are this script's own output — the body
+		// `SELECT` doesn't express the write, so an incremental model that reads
+		// its own target would otherwise auto-derive a self-cascade edge (backend
+		// parity: the deploy path upgrades the same read to `rw`).
+		...materializeWriteRefs(parsed),
+		...parsed.muteAssets.map((a) => `${a.kind}:${a.path}`),
+		...parsed.triggerAssets.map((a) => `${a.kind}:${a.path}`)
+	])
+	const out: Array<{ kind: AssetKind; path: string }> = []
+	for (const r of reads) {
+		const key = `${r.kind}:${r.path}`
+		if (!AUTO_TRIGGER_KINDS.has(r.kind) || skip.has(key)) continue
+		skip.add(key) // dedup within reads too
+		out.push({ kind: r.kind, path: r.path })
+	}
+	return out
+}
+
+/** Edge key matching a lineage/trigger edge's `(asset, runnable)` pair. */
+function edgeKey(a: {
+	asset_kind: string
+	asset_path: string
+	runnable_kind: string
+	runnable_path: string
+}): string {
+	return `${a.asset_kind}:${a.asset_path}->${a.runnable_kind}:${a.runnable_path}`
+}
+
+/**
+ * Keys of "muted read" edges: a ducklake/s3 asset a script reads read-*only*
+ * (`access_type === 'r'`) yet has NO cascade trigger for. Auto-derivation is the
+ * default, so a supported read with no trigger means the author opted it out
+ * with `// mute <asset>` / `// mute all` (or it's an explicit non-triggering
+ * read). The canvas badges these — the exception — instead of every derived
+ * edge. Self-reads are excluded: a script that also writes the asset carries
+ * `'rw'` on the deployed graph (one edge) or a separate `'w'` edge in the live
+ * overlay (a `// materialize` producer reading its own target), and neither
+ * should badge as muted — it's the script's own output, not a suppressed input.
+ *
+ * Only `// pipeline` scripts are considered: auto-derivation never applies to a
+ * plain script or a flow, so a non-pipeline runnable reading a ducklake/s3
+ * asset has no auto trigger to suppress and must render as ordinary lineage.
+ */
+export function computeMutedReadKeys(
+	edges: AssetGraphResponse['edges'],
+	triggers: AssetGraphResponse['triggers'],
+	runnables: AssetGraphResponse['runnables']
+): Set<string> {
+	const pipelineScripts = new Set(
+		runnables.filter((r) => r.usage_kind === 'script' && r.in_pipeline).map((r) => r.path)
+	)
+	const cascaded = new Set(
+		triggers.filter((t) => t.trigger_kind === 'asset').map((t) => edgeKey(t))
+	)
+	const written = new Set(
+		edges.filter((e) => e.access_type === 'w' || e.access_type === 'rw').map((e) => edgeKey(e))
+	)
+	const muted = new Set<string>()
+	for (const e of edges) {
+		if (e.access_type !== 'r' || !AUTO_TRIGGER_KINDS.has(e.asset_kind)) continue
+		if (e.runnable_kind !== 'script' || !pipelineScripts.has(e.runnable_path)) continue
+		const key = edgeKey(e)
+		if (!cascaded.has(key) && !written.has(key)) muted.add(key)
+	}
+	return muted
+}
+
 /** `kind:path` keys of persisted asset (`// on <asset>`) triggers for `path`. */
 function persistedAssetKeys(base: AssetGraphResponse, path: string): Set<string> {
 	return new Set(
@@ -137,15 +252,94 @@ export function resolveGraph(input: ResolveGraphInput): AssetGraphResponse {
 			return false
 		return true
 	})
+	// Mirror the backend's skip-if-empty: no `macro_edges` key at all when
+	// there is nothing to show (also keeps the no-macros response shape
+	// byte-identical to before the feature).
+	const macroEdges = resolveMacroEdges(input)
 	return {
 		...base,
 		assets: acc.assets,
 		runnables: acc.runnables,
 		edges: acc.edges,
-		triggers: [...baseTriggers, ...acc.extraTriggers]
+		triggers: [...baseTriggers, ...acc.extraTriggers],
+		...(macroEdges.length > 0 || base.macro_edges ? { macro_edges: macroEdges } : {})
 	}
 }
 
+/**
+ * Macro-library → consumer edges: the deployed base edges, with `// use`
+ * declarations of overlaid scripts (drafts + the open buffer) taking over
+ * their consumer's `via_use` edges so adding/removing a `// use` line updates
+ * the canvas live. Detection-based edges (macro calls in the deployed body)
+ * are backend-owned and only refresh on redeploy.
+ */
+function resolveMacroEdges(input: ResolveGraphInput): AssetGraphMacroEdge[] {
+	const { base, drafts, liveAnnotations } = input
+	const libMacroNames = new Map<string, string[]>()
+	for (const r of base.runnables) {
+		if (r.usage_kind === 'script' && r.macros?.length) {
+			libMacroNames.set(
+				r.path,
+				r.macros.map((m) => m.name)
+			)
+		}
+	}
+	const useByPath = new Map<string, string[]>()
+	for (const [path, d] of drafts) {
+		useByPath.set(path, parsePipelineAnnotations(d.script.content).useLibs)
+	}
+	if (liveAnnotations.scriptPath) {
+		// `?? []` — callers may hand a minimal annotations object (tests, older
+		// call sites) that predates the field.
+		useByPath.set(liveAnnotations.scriptPath, liveAnnotations.annotations.useLibs ?? [])
+	}
+	const out: AssetGraphMacroEdge[] = []
+	for (const e of base.macro_edges ?? []) {
+		if (e.via_use && useByPath.has(e.consumer_path)) continue
+		out.push({ ...e })
+	}
+	for (const [path, libs] of useByPath) {
+		for (const lib of libs) {
+			const existing = out.find((e) => e.lib_path === lib && e.consumer_path === path)
+			if (existing) {
+				// Upgrade the detection edge in place: `// use` pulls in the whole
+				// library, so the edge covers every macro the lib defines.
+				existing.via_use = true
+				existing.unsaved = true
+				existing.macro_names = [
+					...new Set([...existing.macro_names, ...(libMacroNames.get(lib) ?? [])])
+				]
+			} else {
+				out.push({
+					lib_path: lib,
+					consumer_path: path,
+					macro_names: libMacroNames.get(lib) ?? [],
+					via_use: true,
+					unsaved: true
+				})
+			}
+		}
+	}
+	return out
+}
+
+// Light regex extraction of a draft macro library's definitions for the live
+// node badge. The strict grammar lives in the Rust `parse_macro_library` at
+// deploy; this only needs name/params/table-ness for display (nested parens
+// in a default value may truncate the shown signature, never the deploy).
+const MACRO_DEF_RE =
+	/create\s+(?:or\s+replace\s+)?(?:temp(?:orary)?\s+)?(?:macro|function)\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*\(([^)]*)\)\s*as\s+(table\b)?/gi
+
+export function extractDraftMacros(
+	content: string
+): { name: string; params: string; is_table: boolean }[] {
+	const out: { name: string; params: string; is_table: boolean }[] = []
+	for (const m of content.matchAll(MACRO_DEF_RE)) {
+		out.push({ name: m[1].toLowerCase(), params: m[2].trim(), is_table: m[3] !== undefined })
+	}
+	return out
+}
+
 type ResolveContext = {
 	draftedPaths: Set<string>
 	isDrafted: (kind: string, p: string) => boolean
@@ -173,6 +367,20 @@ function makeContext(input: ResolveGraphInput): ResolveContext {
 		if (liveAnnotations.scriptPath === openPath) {
 			for (const a of liveAnnotations.annotations.triggerAssets)
 				liveRefKeys.add(`${a.kind}:${a.path}`)
+			// The `// materialize <asset>` target is a declared *output*, but it
+			// lives in an annotation (not the SQL body), so neither triggerAssets
+			// (inputs) nor the body-inferred assets cover it. Without this its
+			// persisted write-edge is judged stale and dropped the moment the
+			// script is selected/edited — leaving the output asset unlinked. A
+			// managed scd2 producer persists a second write to the `<dim>_current`
+			// companion view, so keep that too or a consumer of only the view
+			// orphans while the producer is open for editing.
+			const m = liveAnnotations.annotations.materialize
+			if (m) {
+				liveRefKeys.add(`${m.targetKind}:${m.targetPath}`)
+				const currentPath = scd2CurrentTargetPath(m)
+				if (currentPath) liveRefKeys.add(`${m.targetKind}:${currentPath}`)
+			}
 		}
 		for (const a of liveBodyAssets.assets) liveRefKeys.add(`${a.kind}:${a.path}`)
 	}
@@ -203,6 +411,95 @@ function seedAccumulator(input: ResolveGraphInput, ctx: ResolveContext): Accumul
 	}
 }
 
+/**
+ * The write output(s) a `// materialize <asset>` annotation declares: the
+ * target itself, plus — for a managed scd2 materialize — the `<dim>_current`
+ * companion view (mirrors the deploy path), so a consumer of only the view
+ * links back to this producer instead of orphaning.
+ */
+function materializeOuts(
+	parsed: PipelineAnnotations
+): Array<{ kind: AssetKind; path: string; derivedFrom?: string }> {
+	if (!parsed.materialize) return []
+	const outs: Array<{ kind: AssetKind; path: string; derivedFrom?: string }> = [
+		{ kind: parsed.materialize.targetKind, path: parsed.materialize.targetPath }
+	]
+	const currentPath = scd2CurrentTargetPath(parsed.materialize)
+	if (currentPath) {
+		outs.push({
+			kind: parsed.materialize.targetKind,
+			path: currentPath,
+			derivedFrom: parsed.materialize.targetPath
+		})
+	}
+	return outs
+}
+
+/** Add an output asset node + unsaved write edge for `runnablePath`, deduped
+ *  against the assets/edges already accumulated (base survivors included). */
+function pushWriteOut(
+	acc: Accumulator,
+	runnablePath: string,
+	out: { kind: AssetKind; path: string; derivedFrom?: string }
+) {
+	const existing = acc.assets.find((a) => a.kind === out.kind && a.path === out.path)
+	if (!existing) {
+		acc.assets.push({
+			kind: out.kind,
+			path: out.path,
+			...(out.derivedFrom ? { derived_from: out.derivedFrom } : {})
+		})
+	} else if (out.derivedFrom && existing.derived_from == undefined) {
+		existing.derived_from = out.derivedFrom
+	}
+	const hasWriteEdge = acc.edges.some(
+		(e) =>
+			e.runnable_kind === 'script' &&
+			e.runnable_path === runnablePath &&
+			e.asset_kind === out.kind &&
+			e.asset_path === out.path &&
+			(e.access_type === 'w' || e.access_type === 'rw')
+	)
+	if (hasWriteEdge) return
+	acc.edges.push({
+		runnable_path: runnablePath,
+		runnable_kind: 'script',
+		asset_kind: out.kind,
+		asset_path: out.path,
+		access_type: 'w',
+		unsaved: true
+	})
+}
+
+/** Add an input asset node + unsaved read edge for `runnablePath`, deduped
+ *  against the assets/edges already accumulated. */
+function pushReadIn(
+	acc: Accumulator,
+	runnablePath: string,
+	inp: { kind: AssetKind; path: string }
+) {
+	if (!acc.assets.some((a) => a.kind === inp.kind && a.path === inp.path)) {
+		acc.assets.push({ kind: inp.kind, path: inp.path })
+	}
+	const hasReadEdge = acc.edges.some(
+		(e) =>
+			e.runnable_kind === 'script' &&
+			e.runnable_path === runnablePath &&
+			e.asset_kind === inp.kind &&
+			e.asset_path === inp.path &&
+			(e.access_type === 'r' || e.access_type === 'rw')
+	)
+	if (hasReadEdge) return
+	acc.edges.push({
+		runnable_path: runnablePath,
+		runnable_kind: 'script',
+		asset_kind: inp.kind,
+		asset_path: inp.path,
+		access_type: 'r',
+		unsaved: true
+	})
+}
+
 /**
  * Every draft contributes: a runnable, output asset(s), a write edge, live
  * read lineage for the active draft, plus its seeded asset/native triggers
@@ -210,11 +507,31 @@ function seedAccumulator(input: ResolveGraphInput, ctx: ResolveContext): Accumul
  * `drafts` map so multiple concurrent drafts all render at once.
  */
 function seedDraftOverlays(acc: Accumulator, input: ResolveGraphInput) {
-	const { base, drafts, liveBodyAssets } = input
-	const { runnables, assets, edges, extraTriggers } = acc
+	const { base, drafts, liveBodyAssets, inferredReadsByPath, inferredWritesByPath } = input
+	const { runnables, assets, extraTriggers } = acc
 
 	for (const [path, d] of drafts) {
-		const parsed = parsePipelineAnnotations(d.script.content)
+		// The open draft's annotations come from the live buffer, not the draft
+		// snapshot — the snapshot only syncs on pane teardown, so parsing it here
+		// would pin annotation-derived outputs (`// materialize` target, badges)
+		// to their pre-edit values until the user clicks away.
+		const parsed =
+			path === input.liveAnnotations.scriptPath
+				? input.liveAnnotations.annotations
+				: parsePipelineAnnotations(d.script.content)
+		// For the open script, fold in the WASM-inferred column lineage (DuckDB
+		// SQL AST) under the same annotation-wins precedence the backend applies
+		// on deploy, so the live preview matches what deploys. Only the open
+		// script carries live inference (`liveBodyAssets`); other drafts stay
+		// annotation-only until they deploy (the backend infers then).
+		const inferredCL =
+			path === liveBodyAssets.scriptPath ? (liveBodyAssets.columnLineage ?? []) : []
+		const mergedCL = mergeColumnLineage(inferredCL, parsed.columnLineage)
+		// The `// materialize` target this draft's column lineage describes, so
+		// the column graph anchors to it rather than guessing a write-edge.
+		const materializeTarget = parsed.materialize
+			? { kind: parsed.materialize.targetKind, path: parsed.materialize.targetPath }
+			: undefined
 		// A draft can coexist with a base entry — during save the refetch
 		// lands before drafts cleanup, and a user re-editing a deployed
 		// script also produces both. In that case we mutate the existing
@@ -222,6 +539,9 @@ function seedDraftOverlays(acc: Accumulator, input: ResolveGraphInput) {
 		// duplicate (which would crash svelte-flow's keyed each), so the
 		// canvas + trigger-node labels reflect that there's pending body
 		// editing for this path.
+		// `// macros` library draft: extract the definitions for the live node
+		// badge (regex-light; the strict parse happens at deploy).
+		const draftMacros = parsed.macros ? extractDraftMacros(d.script.content) : []
 		const baseIdx = runnables.findIndex((r) => r.usage_kind === 'script' && r.path === path)
 		if (baseIdx === -1) {
 			runnables.push({
@@ -232,87 +552,58 @@ function seedDraftOverlays(acc: Accumulator, input: ResolveGraphInput) {
 				freshness: parsed.freshness?.duration,
 				tag: parsed.tag,
 				retry: parsed.retry,
+				data_tests: parsed.dataTests.length > 0 ? parsed.dataTests : undefined,
+				column_lineage: mergedCL.length > 0 ? mergedCL : undefined,
+				materialize_target: materializeTarget,
+				macros: draftMacros.length > 0 ? draftMacros : undefined,
 				unsaved: true
 			})
 		} else {
-			runnables[baseIdx] = { ...runnables[baseIdx], unsaved: true }
+			// Refresh annotation-derived badges from the live parse too, so
+			// adding/removing `// data_test` / `// column` lines on an
+			// already-deployed script updates the badge immediately (not only
+			// after redeploy/refetch).
+			runnables[baseIdx] = {
+				...runnables[baseIdx],
+				data_tests: parsed.dataTests.length > 0 ? parsed.dataTests : undefined,
+				column_lineage: mergedCL.length > 0 ? mergedCL : undefined,
+				materialize_target: materializeTarget,
+				macros: draftMacros.length > 0 ? draftMacros : undefined,
+				unsaved: true
+			}
 		}
-		// Output asset(s): three-tier resolution.
+		// Output asset(s): two-tier resolution.
 		//   1. Active draft (the body the user is editing right now):
 		//      live body inference is authoritative — renaming a
 		//      CREATE TABLE target or writeS3File path retires the
 		//      old output node and surfaces the new one as the user
 		//      types.
-		//   2. Inactive draft with a captured `outputAssets` snapshot
-		//      (taken on the last pane transition): use those, so a
-		//      draft the user already edited keeps its renamed outputs
-		//      after they've clicked elsewhere.
-		//   3. Fallback to the static `outputAsset` seeded at draft
-		//      creation — covers fresh drafts and parser misses (e.g.
-		//      WIN-1943: wmill.writeS3File({s3, storage}) object form
-		//      not yet detected by the TS parser).
+		//   2. Inactive draft: its captured `outputAssets` (inferred at
+		//      creation/last edit, or the seeded output for a fresh draft
+		//      whose body doesn't yet write anything inferable).
 		const liveForThisDraft = liveBodyAssets.scriptPath === path
-		const writeOuts: Array<{ kind: AssetKind; path: string }> = []
+		const writeOuts: Array<{ kind: AssetKind; path: string; derivedFrom?: string }> = []
 		if (liveForThisDraft) {
 			writeOuts.push(...extractWrites(liveBodyAssets.assets))
 		} else if (d.outputAssets) {
 			writeOuts.push(...d.outputAssets)
 		}
-		if (writeOuts.length === 0 && d.outputAsset) {
-			writeOuts.push(d.outputAsset)
-		}
+		// `// materialize <asset>` declares a write output via annotation, not
+		// the SQL body, so the body-inference tiers above miss it (pushWriteOut
+		// dedups against existing assets/edges).
+		writeOuts.push(...materializeOuts(parsed))
 		for (const out of writeOuts) {
-			const hasAsset = assets.some((a) => a.kind === out.kind && a.path === out.path)
-			if (!hasAsset) assets.push({ kind: out.kind, path: out.path })
-			// Dedup against edges already in the overlay (this draft's base
-			// edges were dropped above, so this only guards against duplicate
-			// writeOuts entries — not against the persisted version).
-			const hasWriteEdge = edges.some(
-				(e) =>
-					e.runnable_kind === 'script' &&
-					e.runnable_path === path &&
-					e.asset_kind === out.kind &&
-					e.asset_path === out.path &&
-					(e.access_type === 'w' || e.access_type === 'rw')
-			)
-			if (hasWriteEdge) continue
-			edges.push({
-				runnable_path: path,
-				runnable_kind: 'script',
-				asset_kind: out.kind,
-				asset_path: out.path,
-				access_type: 'w',
-				unsaved: true
-			})
+			pushWriteOut(acc, path, out)
 		}
-		// Live read lineage for the active draft (body reads like loadS3File /
-		// SELECT). Only the open draft has live-inferred assets; inactive drafts
-		// fall back to their `// on <asset>` annotations below for inputs. Without
-		// this, dropping the persisted base edges above would lose the input
-		// edges of a saved script the moment the user starts editing it.
-		if (liveForThisDraft) {
-			for (const inp of extractReads(liveBodyAssets.assets)) {
-				if (!assets.some((a) => a.kind === inp.kind && a.path === inp.path)) {
-					assets.push({ kind: inp.kind, path: inp.path })
-				}
-				const hasReadEdge = edges.some(
-					(e) =>
-						e.runnable_kind === 'script' &&
-						e.runnable_path === path &&
-						e.asset_kind === inp.kind &&
-						e.asset_path === inp.path &&
-						(e.access_type === 'r' || e.access_type === 'rw')
-				)
-				if (hasReadEdge) continue
-				edges.push({
-					runnable_path: path,
-					runnable_kind: 'script',
-					asset_kind: inp.kind,
-					asset_path: inp.path,
-					access_type: 'r',
-					unsaved: true
-				})
-			}
+		// Read lineage: live inference for the open draft, the captured
+		// `inputAssets` snapshot for inactive ones (with the session cache as a
+		// legacy fallback). Without the inactive tier, merely selecting another
+		// node would drop this draft's input edges from the canvas.
+		const draftReads = liveForThisDraft
+			? extractReads(liveBodyAssets.assets)
+			: (d.inputAssets ?? inferredReadsByPath.get(path) ?? [])
+		for (const inp of draftReads) {
+			pushReadIn(acc, path, inp)
 		}
 		// Seed trigger edges from the draft's template so the graph stays
 		// stable when the user clicks off this draft. Live annotations
@@ -334,6 +625,28 @@ function seedDraftOverlays(acc: Accumulator, input: ResolveGraphInput) {
 			const hasTriggerAsset = assets.some((x) => x.kind === a.kind && x.path === a.path)
 			if (!hasTriggerAsset) assets.push({ kind: a.kind, path: a.path })
 		}
+		// Auto-derived cascade edges (backend parity): a ducklake/s3 read wires
+		// the edge from the body alone. Reads reuse the tier above; writes come
+		// from the active draft's live inference, else the captured snapshot /
+		// session cache. The open buffer's derived edges are re-computed
+		// authoritatively in applyLiveBufferOverlay (which strips this path's
+		// seeded triggers first), same as the explicit `// on` triggers above.
+		const draftWrites = liveForThisDraft
+			? extractWrites(liveBodyAssets.assets)
+			: (d.outputAssets ?? inferredWritesByPath.get(path) ?? [])
+		for (const a of deriveAutoAssetTriggers(draftReads, draftWrites, parsed)) {
+			extraTriggers.push({
+				trigger_kind: 'asset',
+				asset_kind: a.kind,
+				asset_path: a.path,
+				runnable_kind: 'script',
+				runnable_path: path,
+				unsaved: true
+			})
+			if (!assets.some((x) => x.kind === a.kind && x.path === a.path)) {
+				assets.push({ kind: a.kind, path: a.path })
+			}
+		}
 		// Native trigger annotations on a draft are "missing" until a
 		// matching trigger row exists. A brand-new draft never has one (the
 		// script isn't deployed yet), but a draft promoted from unsaved
@@ -394,6 +707,49 @@ function applyLiveBufferOverlay(acc: Accumulator, input: ResolveGraphInput, ctx:
 			assets.push({ kind: a.kind, path: a.path })
 		}
 	}
+	// Auto-derived cascade edges (backend parity): a ducklake/s3 read wires
+	// the edge from the FROM clause alone, keystroke-live. The open buffer's
+	// live body inference is authoritative for its reads/writes. `// mute` /
+	// `// mute all` and explicit `// on` (above) suppress a derived edge; a
+	// derived edge already persisted for a non-draft open script is deduped
+	// via `assetKeys`.
+	if (input.liveBodyAssets.scriptPath === livePath) {
+		const reads = extractReads(input.liveBodyAssets.assets)
+		const writes = extractWrites(input.liveBodyAssets.assets)
+		for (const a of deriveAutoAssetTriggers(reads, writes, liveAnnotations.annotations)) {
+			if (assetKeys.has(`${a.kind}:${a.path}`)) continue
+			extraTriggers.push({
+				trigger_kind: 'asset',
+				asset_kind: a.kind,
+				asset_path: a.path,
+				runnable_kind: 'script',
+				runnable_path: livePath,
+				unsaved: true
+			})
+			if (!assets.some((x) => x.kind === a.kind && x.path === a.path)) {
+				assets.push({ kind: a.kind, path: a.path })
+			}
+		}
+	}
+	// Lineage overlay for an open SAVED script. seedDraftOverlays owns drafts,
+	// but a deployed script's unsaved edits are only promoted to a draft on
+	// pane teardown — until then the buffer's lineage lives here. staleForOpen
+	// already dropped the base edges the buffer no longer references; this adds
+	// the ones it now does. Without it, retargeting `// materialize` (or a body
+	// write/read) shows no output edge until the user clicks away.
+	if (!ctx.draftedPaths.has(livePath)) {
+		for (const out of materializeOuts(liveAnnotations.annotations)) {
+			pushWriteOut(acc, livePath, out)
+		}
+		if (input.liveBodyAssets.scriptPath === livePath) {
+			for (const out of extractWrites(input.liveBodyAssets.assets)) {
+				pushWriteOut(acc, livePath, out)
+			}
+			for (const inp of extractReads(input.liveBodyAssets.assets)) {
+				pushReadIn(acc, livePath, inp)
+			}
+		}
+	}
 	// Native trigger annotations: kinds for which a matching trigger
 	// row was found in the backend response. If the live buffer
 	// declares `// on kafka` and at least one kafka_trigger row points
@@ -442,7 +798,7 @@ function crossCheckSweptScripts(acc: Accumulator, input: ResolveGraphInput) {
  * changes — not just while selected.
  */
 function overlayInferredLineage(acc: Accumulator, input: ResolveGraphInput) {
-	const { base, drafts, inferredWritesByPath, inferredReadsByPath } = input
+	const { drafts, inferredWritesByPath, inferredReadsByPath } = input
 	const { assets, edges } = acc
 
 	const overlayLineage = (
@@ -451,19 +807,21 @@ function overlayInferredLineage(acc: Accumulator, input: ResolveGraphInput) {
 	) => {
 		for (const [scriptPath, refs] of byPath) {
 			if (drafts.has(scriptPath)) continue
-			const persisted = new Set(
-				base.edges
-					.filter(
-						(e) =>
-							e.runnable_path === scriptPath &&
-							e.runnable_kind === 'script' &&
-							(e.access_type === access || e.access_type === 'rw')
-					)
-					.map((e) => `${e.asset_kind}:${e.asset_path}`)
-			)
 			for (const a of refs) {
-				const key = `${a.kind}:${a.path}`
-				if (persisted.has(key)) continue
+				// Dedup against the ACCUMULATED edges, not just base: for the open
+				// script these same refs may already be overlaid by
+				// applyLiveBufferOverlay (which feeds the maps on the route page),
+				// and a duplicate would collide on the canvas's endpoint-derived
+				// edge ids.
+				const hasEdge = edges.some(
+					(e) =>
+						e.runnable_path === scriptPath &&
+						e.runnable_kind === 'script' &&
+						e.asset_kind === a.kind &&
+						e.asset_path === a.path &&
+						(e.access_type === access || e.access_type === 'rw')
+				)
+				if (hasEdge) continue
 				if (!assets.some((x) => x.kind === a.kind && x.path === a.path)) {
 					assets.push({ kind: a.kind, path: a.path })
 				}
diff --git a/frontend/src/lib/components/assets/AssetGraph/schemaContracts.test.ts b/frontend/src/lib/components/assets/AssetGraph/schemaContracts.test.ts
new file mode 100644
index 0000000000..9247b23d9b
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/schemaContracts.test.ts
@@ -0,0 +1,276 @@
+import { describe, expect, it } from 'vitest'
+import {
+	buildSchemaContractContext,
+	diffSchemaContracts,
+	mapWarningsToMarkers,
+	normalizeAssetPath,
+	referencedDucklakePaths,
+	type CapturedSchemaLite
+} from './schemaContracts'
+import { parsePipelineAnnotations } from './parsePipelineAnnotations'
+import type { AssetWithAltAccessType } from '../lib'
+
+// Mirrors backend/windmill-common/src/schema_contracts.rs unit tests — the two
+// diffs must apply the same rules or the editor previews a different verdict
+// than the save-time check returns.
+
+function schema(cols: [string, string][], version = 2): CapturedSchemaLite {
+	return {
+		columns: cols.map(([name, type]) => ({ name, type })),
+		version,
+		capturedAt: '2026-01-01T00:00:00Z'
+	}
+}
+
+function readAsset(path: string, cols: string[]): AssetWithAltAccessType {
+	return {
+		path,
+		kind: 'ducklake',
+		access_type: 'r',
+		columns: Object.fromEntries(cols.map((c) => [c, 'r' as const]))
+	}
+}
+
+const NO_ANN = { columnLineage: [], dataTests: [] }
+
+describe('diffSchemaContracts', () => {
+	it('warns on a missing read column, matching case-insensitively', () => {
+		const schemas = new Map([
+			[
+				'lake/orders',
+				schema([
+					['Order_ID', 'BIGINT'],
+					['amount_usd', 'DOUBLE']
+				])
+			]
+		])
+		const w = diffSchemaContracts({
+			...NO_ANN,
+			assets: [readAsset('lake/orders', ['order_id', 'amount'])],
+			schemas,
+			ignored: new Set()
+		})
+		expect(w).toHaveLength(1)
+		expect(w[0].kind).toBe('missing_column')
+		expect(w[0].column).toBe('amount')
+		expect(w[0].schema_version).toBe(2)
+	})
+
+	it('skips unknown-column assets, "*" and reserved columns', () => {
+		const schemas = new Map([['lake/orders', schema([['id', 'BIGINT']])]])
+		const noColumns: AssetWithAltAccessType = {
+			path: 'lake/orders',
+			kind: 'ducklake',
+			access_type: 'r'
+		}
+		expect(
+			diffSchemaContracts({ ...NO_ANN, assets: [noColumns], schemas, ignored: new Set() })
+		).toEqual([])
+		expect(
+			diffSchemaContracts({
+				...NO_ANN,
+				assets: [readAsset('lake/orders', ['*', '_wm_partition', 'id'])],
+				schemas,
+				ignored: new Set()
+			})
+		).toEqual([])
+	})
+
+	it('is silent for assets without a captured schema', () => {
+		expect(
+			diffSchemaContracts({
+				...NO_ANN,
+				assets: [readAsset('lake/unknown', ['whatever'])],
+				schemas: new Map(),
+				ignored: new Set()
+			})
+		).toEqual([])
+	})
+
+	it('normalizes the {partition} token before lookup', () => {
+		const schemas = new Map([['lake/orders', schema([['id', 'BIGINT']])]])
+		const w = diffSchemaContracts({
+			...NO_ANN,
+			assets: [readAsset('lake/orders/{partition}', ['gone'])],
+			schemas,
+			ignored: new Set()
+		})
+		expect(w).toHaveLength(1)
+		expect(w[0].asset_path).toBe('lake/orders')
+	})
+
+	it('warns on broken // column lineage refs', () => {
+		const ann = parsePipelineAnnotations(
+			'// column total <- ducklake://lake/orders.amount\nSELECT 1;'
+		)
+		const schemas = new Map([['lake/orders', schema([['id', 'BIGINT']])]])
+		const w = diffSchemaContracts({
+			assets: [],
+			columnLineage: ann.columnLineage,
+			dataTests: [],
+			schemas,
+			ignored: new Set()
+		})
+		expect(w).toHaveLength(1)
+		expect(w[0].kind).toBe('missing_lineage_source')
+	})
+
+	it('flags missing relationship columns and captured-type differences', () => {
+		const ann = parsePipelineAnnotations(
+			'// materialize ducklake://lake/orders\n' +
+				'// data_test relationships customer_id -> ducklake://lake/customers.id\n' +
+				'// data_test relationships customer_id -> ducklake://lake/customers.uuid\n' +
+				'SELECT 1;'
+		)
+		const schemas = new Map([
+			['lake/customers', schema([['id', 'VARCHAR']])],
+			['lake/orders', schema([['customer_id', 'BIGINT']])]
+		])
+		const w = diffSchemaContracts({
+			assets: [],
+			columnLineage: ann.columnLineage,
+			dataTests: ann.dataTests,
+			materialize: ann.materialize,
+			schemas,
+			ignored: new Set()
+		})
+		expect(w).toHaveLength(2)
+		expect(
+			w.some(
+				(x) =>
+					x.kind === 'relationship_type_mismatch' &&
+					x.expected_type === 'BIGINT' &&
+					x.found_type === 'VARCHAR'
+			)
+		).toBe(true)
+		expect(w.some((x) => x.kind === 'missing_relationship_column' && x.column === 'uuid')).toBe(
+			true
+		)
+	})
+
+	it('suppresses ignored assets down to one informational note', () => {
+		const schemas = new Map([['lake/orders', schema([['id', 'BIGINT']])]])
+		const ignored = new Set(['lake/orders'])
+		const w = diffSchemaContracts({
+			...NO_ANN,
+			assets: [readAsset('lake/orders', ['a', 'b'])],
+			schemas,
+			ignored
+		})
+		expect(w).toHaveLength(1)
+		expect(w[0].kind).toBe('suppressed')
+		expect(
+			diffSchemaContracts({
+				...NO_ANN,
+				assets: [readAsset('lake/orders', ['id'])],
+				schemas,
+				ignored
+			})
+		).toEqual([])
+	})
+})
+
+describe('referencedDucklakePaths', () => {
+	it('collects paths from reads, lineage, relationships and materialize', () => {
+		const ann = parsePipelineAnnotations(
+			'// materialize ducklake://lake/out\n' +
+				'// column total <- ducklake://lake/a.amount\n' +
+				'// data_test relationships k -> ducklake://lake/b.id\n' +
+				'SELECT 1;'
+		)
+		const refs = referencedDucklakePaths({
+			assets: [readAsset('lake/c/{partition}', ['x'])],
+			columnLineage: ann.columnLineage,
+			dataTests: ann.dataTests,
+			materialize: ann.materialize
+		})
+		expect(refs.sort()).toEqual(['lake/a', 'lake/b', 'lake/c', 'lake/out'])
+	})
+})
+
+describe('buildSchemaContractContext', () => {
+	it('derives ignored assets and scd2 _current bases from graph runnables', () => {
+		const ctx = buildSchemaContractContext([
+			{
+				materialize_target: { kind: 'ducklake', path: 'lake/dim' },
+				materialize_strategy: 'scd2',
+				materialize_on_schema_change: 'ignore'
+			},
+			{
+				materialize_target: { kind: 'ducklake', path: 'lake/orders' },
+				materialize_strategy: 'replace'
+			},
+			// non-ducklake and absent targets are ignored
+			{ materialize_target: { kind: 's3object', path: 'x/y' }, materialize_strategy: 'scd2' },
+			{}
+		])
+		expect(ctx.ignoredAssets).toEqual(['lake/dim', 'lake/dim_current'])
+		expect(ctx.scd2CurrentBases).toEqual({ 'lake/dim_current': 'lake/dim' })
+	})
+
+	it('ignores _current only for scd2 producers (backend spec.scd2 gate)', () => {
+		const ctx = buildSchemaContractContext([
+			{
+				materialize_target: { kind: 'ducklake', path: 'lake/t' },
+				materialize_strategy: 'replace',
+				materialize_on_schema_change: 'ignore'
+			}
+		])
+		// a non-scd2 producer's `<base>_current` is an unrelated asset — it must
+		// keep warning, exactly like the server-side check
+		expect(ctx.ignoredAssets).toEqual(['lake/t'])
+		expect(ctx.scd2CurrentBases).toEqual({})
+	})
+})
+
+describe('mapWarningsToMarkers', () => {
+	it('anchors annotation warnings to their lines and body reads to the identifier', () => {
+		const code =
+			'-- pipeline\n' +
+			'-- on ducklake://lake/orders\n' +
+			'-- column total <- ducklake://lake/orders.amount\n' +
+			'-- data_test relationships k -> ducklake://lake/customers.uuid\n' +
+			'SELECT amount FROM dl.orders;'
+		const markers = mapWarningsToMarkers(code, [
+			{
+				kind: 'missing_lineage_source',
+				asset_path: 'lake/orders',
+				column: 'amount',
+				message: 'm1'
+			},
+			{
+				kind: 'missing_relationship_column',
+				asset_path: 'lake/customers',
+				column: 'uuid',
+				message: 'm2'
+			},
+			{ kind: 'missing_column', asset_path: 'lake/orders', column: 'amount', message: 'm3' },
+			{ kind: 'suppressed', asset_path: 'lake/orders', message: 'hidden' }
+		])
+		expect(markers).toHaveLength(3)
+		expect(markers[0].startLineNumber).toBe(3)
+		expect(markers[1].startLineNumber).toBe(4)
+		// body-read warning anchors to the first occurrence of the identifier,
+		// which is the annotation line mentioning `amount` (line 3)
+		expect(markers[2].startLineNumber).toBe(3)
+		// token range is tight around the identifier, not the whole line
+		const line3 = '-- column total <- ducklake://lake/orders.amount'
+		expect(markers[2].startColumn).toBe(line3.indexOf('amount') + 1)
+	})
+
+	it('falls back to the line mentioning the asset path', () => {
+		const code = '# pipeline\n# on ducklake://lake/orders\nprint(1)'
+		const markers = mapWarningsToMarkers(code, [
+			{ kind: 'missing_column', asset_path: 'lake/orders', column: 'zzz', message: 'm' }
+		])
+		expect(markers[0].startLineNumber).toBe(2)
+	})
+})
+
+describe('normalizeAssetPath', () => {
+	it('strips the partition token and trailing slashes', () => {
+		expect(normalizeAssetPath('lake/orders/{partition}')).toBe('lake/orders')
+		expect(normalizeAssetPath('lake/orders_{partition}')).toBe('lake/orders_')
+		expect(normalizeAssetPath('lake/orders/')).toBe('lake/orders')
+	})
+})
diff --git a/frontend/src/lib/components/assets/AssetGraph/schemaContracts.ts b/frontend/src/lib/components/assets/AssetGraph/schemaContracts.ts
new file mode 100644
index 0000000000..4a1de04e13
--- /dev/null
+++ b/frontend/src/lib/components/assets/AssetGraph/schemaContracts.ts
@@ -0,0 +1,440 @@
+// Client-side mirror of the save-time schema-contract check (pipelines gap
+// #2b, backend/windmill-common/src/schema_contracts.rs). The backend endpoint
+// (`checkSchemaContracts`) is the authoritative check run on save; this mirror
+// drives the *live* editor surface (Monaco warning markers + completions) from
+// the WASM parse that already runs on the open buffer, so the two must apply
+// the same rules: ducklake-only, case-insensitive column names, `columns`
+// absent ⇒ skip, `_wm_partition` whitelisted, `{partition}` token stripped,
+// annotation-declared lineage only, asset without captured schema ⇒ silent.
+
+import { AssetService, ScriptService, type ContractWarning, type ScriptLang } from '$lib/gen'
+import { sendUserToast } from '$lib/toast'
+import type { AssetWithAltAccessType } from '../lib'
+import {
+	parsePipelineAnnotations,
+	type ColumnLineage,
+	type DataTest,
+	type MaterializeSpec
+} from './parsePipelineAnnotations'
+
+// Columns the materialize engine manages; excluded from the captured schema on
+// purpose, so reads of them must not warn.
+const RESERVED_COLUMNS = ['_wm_partition']
+
+const PARTITION_TOKEN = '{partition}'
+
+export type CapturedSchemaLite = {
+	columns: { name: string; type: string }[]
+	version: number
+	capturedAt: string
+}
+
+// Strip the `{partition}` token a declared URI may carry so lookups hit the
+// captured path (mirrors `normalize_asset_path`).
+export function normalizeAssetPath(path: string): string {
+	return path
+		.replaceAll('/' + PARTITION_TOKEN, '')
+		.replaceAll(PARTITION_TOKEN, '')
+		.replace(/\/+$/, '')
+}
+
+function isReserved(name: string): boolean {
+	return RESERVED_COLUMNS.some((r) => r.toLowerCase() === name.toLowerCase())
+}
+
+function findColumn(
+	schema: CapturedSchemaLite,
+	name: string
+): { name: string; type: string } | undefined {
+	const lower = name.toLowerCase()
+	return schema.columns.find((c) => c.name.toLowerCase() === lower)
+}
+
+export type SchemaContractInputs = {
+	// Per-asset column reads/writes from the WASM parse (entries without a
+	// `columns` map are skipped — wildcard/unknown access).
+	assets: AssetWithAltAccessType[]
+	// Annotation-declared `// column` lineage ONLY (not merged AST-inferred
+	// lineage — redundant with body reads and alias-attribution can misfire).
+	columnLineage: ColumnLineage[]
+	dataTests: DataTest[]
+	materialize?: MaterializeSpec
+	// Latest captured schema per normalized ducklake path (after any
+	// `_current` → base-table fallback the caller resolved).
+	schemas: Map<string, CapturedSchemaLite>
+	// Normalized paths whose producer declares `on_schema_change=ignore`.
+	ignored: Set<string>
+}
+
+// Mirrors backend `diff_contract` — same warning kinds and suppression
+// semantics, minus the human message wording (the editor renders its own).
+export function diffSchemaContracts(input: SchemaContractInputs): ContractWarning[] {
+	const { assets, columnLineage, dataTests, materialize, schemas, ignored } = input
+	const warnings: ContractWarning[] = []
+
+	// W1 — body-read/written columns missing from the captured schema.
+	for (const a of assets) {
+		if (a.kind !== 'ducklake' || a.columns == undefined) continue
+		const path = normalizeAssetPath(a.path)
+		const schema = schemas.get(path)
+		if (!schema) continue
+		for (const col of Object.keys(a.columns)) {
+			if (col === '*' || isReserved(col)) continue
+			if (!findColumn(schema, col)) {
+				warnings.push({
+					kind: 'missing_column',
+					asset_path: path,
+					column: col,
+					schema_version: schema.version,
+					captured_at: schema.capturedAt,
+					message: `column \`${col}\` of ducklake://${path} is not in its captured schema (v${schema.version}, columns: ${schema.columns.map((c) => c.name).join(', ')})`
+				})
+			}
+		}
+	}
+
+	// W2 — `// column` lineage source refs.
+	for (const cl of columnLineage) {
+		for (const input of cl.inputs) {
+			if (input.from_kind !== 'ducklake' || isReserved(input.from_column)) continue
+			const path = normalizeAssetPath(input.from_path)
+			const schema = schemas.get(path)
+			if (!schema) continue
+			if (!findColumn(schema, input.from_column)) {
+				warnings.push({
+					kind: 'missing_lineage_source',
+					asset_path: path,
+					column: input.from_column,
+					schema_version: schema.version,
+					captured_at: schema.capturedAt,
+					message: `\`// column ${cl.column}\` reads \`${input.from_column}\` from ducklake://${path}, which is not in its captured schema (v${schema.version})`
+				})
+			}
+		}
+	}
+
+	// W3 — relationships refs: missing column, and captured-type difference
+	// when the consumer's own materialize target has a capture. Types still
+	// coerce at run time, so a difference is "differs", never "will fail".
+	const ownSchema =
+		materialize?.targetKind === 'ducklake'
+			? schemas.get(normalizeAssetPath(materialize.targetPath))
+			: undefined
+	for (const dt of dataTests) {
+		if (dt.type !== 'relationships' || dt.to_kind !== 'ducklake') continue
+		const path = normalizeAssetPath(dt.to_path)
+		const schema = schemas.get(path)
+		if (!schema) continue
+		const refCol = findColumn(schema, dt.to_column)
+		if (!refCol) {
+			warnings.push({
+				kind: 'missing_relationship_column',
+				asset_path: path,
+				column: dt.to_column,
+				schema_version: schema.version,
+				captured_at: schema.capturedAt,
+				message: `\`// data_test relationships ${dt.column}\` references ducklake://${path}.${dt.to_column}, which is not in its captured schema (v${schema.version})`
+			})
+		} else {
+			const ownCol = ownSchema && findColumn(ownSchema, dt.column)
+			if (ownCol && ownCol.type.toLowerCase() !== refCol.type.toLowerCase()) {
+				warnings.push({
+					kind: 'relationship_type_mismatch',
+					asset_path: path,
+					column: dt.to_column,
+					expected_type: ownCol.type,
+					found_type: refCol.type,
+					schema_version: schema.version,
+					captured_at: schema.capturedAt,
+					message: `\`// data_test relationships ${dt.column}\` joins \`${dt.column}\` (${ownCol.type}) to ducklake://${path}.${dt.to_column} (${refCol.type}) — captured types differ`
+				})
+			}
+		}
+	}
+
+	// W4 — producer `on_schema_change=ignore`: drop the asset's warnings,
+	// leaving one informational entry per suppressed asset.
+	if (ignored.size > 0) {
+		const suppressed: string[] = []
+		const kept = warnings.filter((w) => {
+			if (ignored.has(w.asset_path)) {
+				if (!suppressed.includes(w.asset_path)) suppressed.push(w.asset_path)
+				return false
+			}
+			return true
+		})
+		warnings.length = 0
+		warnings.push(...kept)
+		for (const path of suppressed) {
+			warnings.push({
+				kind: 'suppressed',
+				asset_path: path,
+				message: `schema mismatches on ducklake://${path} suppressed by its producer's \`on_schema_change=ignore\``
+			})
+		}
+	}
+
+	return warnings
+}
+
+// The ducklake paths a buffer references in ways the contract check inspects —
+// what the editor needs captured schemas for.
+export function referencedDucklakePaths(
+	input: Pick<SchemaContractInputs, 'assets' | 'columnLineage' | 'dataTests' | 'materialize'>
+): string[] {
+	const paths = new Set<string>()
+	for (const a of input.assets) {
+		if (a.kind === 'ducklake' && a.columns != undefined) paths.add(normalizeAssetPath(a.path))
+	}
+	for (const cl of input.columnLineage) {
+		for (const i of cl.inputs) {
+			if (i.from_kind === 'ducklake') paths.add(normalizeAssetPath(i.from_path))
+		}
+	}
+	for (const dt of input.dataTests) {
+		if (dt.type === 'relationships' && dt.to_kind === 'ducklake')
+			paths.add(normalizeAssetPath(dt.to_path))
+	}
+	if (input.materialize?.targetKind === 'ducklake')
+		paths.add(normalizeAssetPath(input.materialize.targetPath))
+	return [...paths]
+}
+
+// --- Captured-schema cache ------------------------------------------------
+
+// Short-TTL cache so per-keystroke recomputes and completion requests don't
+// re-fetch. Captured schemas only change when a producer materializes, so a
+// briefly stale hit is fine — the authoritative save-time check re-reads.
+const SCHEMA_TTL_MS = 30_000
+const schemaCache = new Map<string, { at: number; value: CapturedSchemaLite | undefined }>()
+
+export async function fetchLatestSchema(
+	workspace: string,
+	path: string
+): Promise<CapturedSchemaLite | undefined> {
+	const key = `${workspace}:${path}`
+	const hit = schemaCache.get(key)
+	if (hit && Date.now() - hit.at < SCHEMA_TTL_MS) return hit.value
+	let value: CapturedSchemaLite | undefined = undefined
+	try {
+		const versions = await AssetService.listAssetSchemas({ workspace, path })
+		const latest = versions[0]
+		if (latest) {
+			value = {
+				columns: latest.columns,
+				version: latest.version,
+				capturedAt: latest.captured_at
+			}
+		}
+	} catch (e) {
+		console.error('failed to fetch captured asset schema', path, e)
+	}
+	schemaCache.set(key, { at: Date.now(), value })
+	return value
+}
+
+// Resolve the schema map for a set of referenced paths, applying the scd2
+// `<dim>_current` → base-table fallback when the graph identifies the view's
+// producer as a managed scd2 materializer (the view is `SELECT * … WHERE
+// is_current`, so columns are identical).
+export async function fetchSchemasForPaths(
+	workspace: string,
+	paths: string[],
+	scd2CurrentBase?: (path: string) => string | undefined
+): Promise<Map<string, CapturedSchemaLite>> {
+	const out = new Map<string, CapturedSchemaLite>()
+	await Promise.all(
+		paths.map(async (p) => {
+			let schema = await fetchLatestSchema(workspace, p)
+			if (!schema && p.endsWith('_current')) {
+				const base = scd2CurrentBase?.(p)
+				if (base) schema = await fetchLatestSchema(workspace, base)
+			}
+			if (schema) out.set(p, schema)
+		})
+	)
+	return out
+}
+
+// --- Pipeline-graph context ---------------------------------------------------
+
+// Producer-side facts the contract mirror needs but cannot derive from the
+// open buffer: which assets are muted (`on_schema_change=ignore`) and which
+// `<dim>_current` views map to an scd2 base table. Built by the pipeline page
+// from the resolved graph; absent outside the pipeline editor (standalone
+// script editor), where suppression simply doesn't apply client-side — the
+// save-time server check remains authoritative either way.
+export type SchemaContractGraphContext = {
+	// Normalized asset paths whose producer declares `on_schema_change=ignore`.
+	ignoredAssets: string[]
+	// `<base>_current` → base for managed scd2 producers in the graph.
+	scd2CurrentBases: Record<string, string>
+}
+
+export function buildSchemaContractContext(
+	runnables: Pick<
+		import('./types').AssetGraphRunnableNode,
+		'materialize_target' | 'materialize_strategy' | 'materialize_on_schema_change'
+	>[]
+): SchemaContractGraphContext {
+	const ignoredAssets: string[] = []
+	const scd2CurrentBases: Record<string, string> = {}
+	for (const r of runnables) {
+		const t = r.materialize_target
+		if (!t || t.kind !== 'ducklake') continue
+		const base = normalizeAssetPath(t.path)
+		if (r.materialize_on_schema_change === 'ignore') {
+			ignoredAssets.push(base)
+			// The `_current` companion is the producer's own view only for scd2 —
+			// mirroring the backend's `spec.scd2` gate; for any other strategy a
+			// `<base>_current` ref is an unrelated asset that must keep warning.
+			if (r.materialize_strategy === 'scd2') {
+				ignoredAssets.push(`${base}_current`)
+			}
+		}
+		if (r.materialize_strategy === 'scd2') {
+			scd2CurrentBases[`${base}_current`] = base
+		}
+	}
+	return { ignoredAssets, scd2CurrentBases }
+}
+
+// --- Save-time surface ------------------------------------------------------
+
+// Run the authoritative backend check for just-deployed content and toast the
+// result. Never throws — a failed check must not taint a successful deploy.
+export async function notifyContractWarnings(
+	workspace: string,
+	language: ScriptLang,
+	content: string
+): Promise<void> {
+	// Every checkable ref carries the `ducklake` token (URIs and the bare
+	// default-syntax shorthand alike) — skip the round-trip for the vast
+	// majority of saves that can't produce a warning.
+	if (!content.includes('ducklake')) return
+	try {
+		const { warnings } = await ScriptService.checkSchemaContracts({
+			workspace,
+			requestBody: { language, content }
+		})
+		const real = warnings.filter((w) => w.kind !== 'suppressed')
+		if (real.length === 0) return
+		sendUserToast(
+			`Schema contract: ${real.length} warning${real.length > 1 ? 's' : ''}`,
+			'warning',
+			[],
+			real.map((w) => `• ${w.message}`).join('\n'),
+			10000
+		)
+	} catch (e) {
+		console.error('schema-contract check failed', e)
+	}
+}
+
+// End-to-end live-editor check: parse the buffer's annotations, resolve the
+// captured schemas for everything it references, diff, and anchor the result
+// to source positions. Cheap per keystroke — the annotation parse is a line
+// scan and schema fetches hit the short-TTL cache.
+export async function computeContractMarkers(
+	workspace: string,
+	code: string,
+	assets: AssetWithAltAccessType[],
+	context?: SchemaContractGraphContext
+): Promise<ContractMarker[]> {
+	const ann = parsePipelineAnnotations(code)
+	const inputs = {
+		assets,
+		// Annotation-declared lineage only — body-inferred lineage is redundant
+		// with the body-read check and its alias attribution can misfire.
+		columnLineage: ann.columnLineage,
+		dataTests: ann.dataTests,
+		materialize: ann.materialize
+	}
+	const refs = referencedDucklakePaths(inputs)
+	if (refs.length === 0) return []
+	const schemas = await fetchSchemasForPaths(
+		workspace,
+		refs,
+		context ? (p) => context.scd2CurrentBases[p] : undefined
+	)
+	if (schemas.size === 0) return []
+	const warnings = diffSchemaContracts({
+		...inputs,
+		schemas,
+		ignored: new Set(context?.ignoredAssets ?? [])
+	})
+	return mapWarningsToMarkers(code, warnings)
+}
+
+// --- Editor marker mapping ---------------------------------------------------
+
+export type ContractMarker = {
+	message: string
+	startLineNumber: number
+	startColumn: number
+	endLineNumber: number
+	endColumn: number
+}
+
+// Best-effort source anchoring: annotation-family warnings anchor to their
+// annotation line; body-read warnings anchor to the first occurrence of the
+// column identifier; fallback is the `// on`/first line mentioning the asset.
+export function mapWarningsToMarkers(code: string, warnings: ContractWarning[]): ContractMarker[] {
+	const lines = code.split('\n')
+
+	function lineMatching(pred: (line: string) => boolean): number | undefined {
+		const idx = lines.findIndex(pred)
+		return idx >= 0 ? idx + 1 : undefined
+	}
+
+	function tokenRange(
+		lineNumber: number,
+		token: string
+	): { startColumn: number; endColumn: number } {
+		const line = lines[lineNumber - 1] ?? ''
+		const idx = line.toLowerCase().indexOf(token.toLowerCase())
+		if (idx < 0) return { startColumn: 1, endColumn: line.length + 1 }
+		return { startColumn: idx + 1, endColumn: idx + 1 + token.length }
+	}
+
+	return warnings
+		.filter((w) => w.kind !== 'suppressed')
+		.map((w) => {
+			let lineNumber: number | undefined
+			let token: string | undefined = w.column ?? undefined
+			switch (w.kind) {
+				case 'missing_lineage_source':
+					lineNumber = lineMatching(
+						(l) => /^\s*(\/\/|--|#)\s*column\s/.test(l) && !!w.column && l.includes(w.column)
+					)
+					break
+				case 'missing_relationship_column':
+				case 'relationship_type_mismatch':
+					lineNumber = lineMatching(
+						(l) =>
+							/^\s*(\/\/|--|#)\s*data_test\s+relationships\s/.test(l) && l.includes(w.asset_path)
+					)
+					break
+				case 'missing_column': {
+					// first body occurrence of the column identifier
+					const re = new RegExp(`\\b${w.column?.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`, 'i')
+					lineNumber = w.column ? lineMatching((l) => re.test(l)) : undefined
+					break
+				}
+			}
+			if (lineNumber == undefined) {
+				// fallback: the `// on …` (or any) line mentioning the asset path
+				lineNumber = lineMatching((l) => l.includes(w.asset_path)) ?? 1
+				token = w.asset_path
+			}
+			const range = token
+				? tokenRange(lineNumber, token)
+				: { startColumn: 1, endColumn: (lines[lineNumber - 1]?.length ?? 0) + 1 }
+			return {
+				message: w.message,
+				startLineNumber: lineNumber,
+				endLineNumber: lineNumber,
+				...range
+			}
+		})
+}
diff --git a/frontend/src/lib/components/assets/AssetGraph/types.ts b/frontend/src/lib/components/assets/AssetGraph/types.ts
index 5f3aa4b52d..0e055abca2 100644
--- a/frontend/src/lib/components/assets/AssetGraph/types.ts
+++ b/frontend/src/lib/components/assets/AssetGraph/types.ts
@@ -1,10 +1,21 @@
 import type { AssetKind } from '$lib/gen'
+import type { ColumnLineage, DataTest } from './parsePipelineAnnotations'
 
 export type GraphUsageKind = 'script' | 'flow'
 
 export interface AssetGraphAssetNode {
 	kind: AssetKind
 	path: string
+	// Fork workspaces only: 'fork' when this ducklake asset was materialized in
+	// the fork itself, 'deferred' when reads fall back to the parent workspace's
+	// current table via a defer view. Absent outside forks / for other kinds /
+	// when never materialized anywhere. Lockstep with Rust `GraphAssetNode`.
+	fork_materialization?: 'fork' | 'deferred'
+	// Base dimension path this node is the SCD2 `<dim>_current` companion view of
+	// (its producer declares `// materialize … history` on `<dim>`). Set only on
+	// the `_current` node; lets the canvas mark it as a derived "current view"
+	// rather than an unrelated table. Lockstep with Rust `GraphAssetNode`.
+	derived_from?: string
 }
 
 export interface AssetGraphRunnableNode {
@@ -21,6 +32,11 @@ export interface AssetGraphRunnableNode {
 	// Raw `// freshness <duration>` value, e.g. "1h", "30m". Surfaced for
 	// the badge; the runtime parses it as needed.
 	freshness?: string
+	// Completion time (ISO) of the newest successful run of this pipeline
+	// member visible to the caller. The freshness chip compares it against
+	// the `// freshness` window to render fresh/stale. Absent = no
+	// successful run found (or none visible under job RLS).
+	last_success_at?: string
 	// `// tag <name>` worker-tag override. Surfaced for the badge so users
 	// can see which worker pool will pick this script up at a glance.
 	tag?: string
@@ -28,9 +44,39 @@ export interface AssetGraphRunnableNode {
 	// duration string (`"5s"`, `"30s"`); absent = back-to-back. Surfaced as
 	// a badge so retry-enabled scripts are visible without opening the pane.
 	retry?: { count: number; delay?: string }
+	// `// data_test <kind> …` data-quality checks run against the materialized
+	// asset. Surfaced as a count badge (with a per-test breakdown in the title)
+	// so test coverage is visible on the node without opening the pane.
+	data_tests?: DataTest[]
+	// `// column <out> <- <src>.<col>` declared column-level lineage for this
+	// script's materialized output. Surfaced as a count badge on the write-edge
+	// and as a column-to-column diagram in the asset details pane.
+	column_lineage?: ColumnLineage[]
+	// `// materialize <asset>` target — the asset `column_lineage` describes.
+	// Lets the column graph anchor lineage to the exact output instead of
+	// guessing a ducklake write-edge (a multi-output script writes several).
+	materialize_target?: { kind: AssetKind; path: string }
+	// Managed `// materialize` write strategy. Absent for non-materializing or
+	// `manual` scripts. Used (with `partition_kind`) to decide whether a
+	// produced asset's schema can evolve: only whole-table `replace` can, since
+	// `append`/`merge`/`scd2`/partitioned writes INSERT into a fixed-schema
+	// table. `scd2` also identifies the producer of a `<dim>_current` companion
+	// view for the schema-contract `_current` → base-table fallback.
+	materialize_strategy?: 'replace' | 'append' | 'merge' | 'scd2'
+	// `on_schema_change=ignore` on the managed materialize — the producer's
+	// opt-out from downstream schema-contract warnings. Only present when set
+	// to `ignore` (default `warn` is absent). Threaded into the editor's
+	// contract mirror so it suppresses the same warnings the server check does.
+	materialize_on_schema_change?: string
+	// Macros this script provides to the workspace registry (deployed
+	// `// macros` library). Non-empty marks the node as a macro library;
+	// drives the "defines N macros" badge and the details-pane signature
+	// list. `params` is the verbatim parameter list.
+	macros?: { name: string; params: string; is_table: boolean }[]
 	// Synthesized by the page from a local draft; the script doesn't exist
 	// in the DB yet. Drives a dashed/lower-opacity rendering to mirror how
 	// unsaved triggers are styled — visually distinct from persisted nodes.
+	// AI-built nodes are plain drafts too (no separate pending/approval state).
 	unsaved?: boolean
 }
 
@@ -94,11 +140,41 @@ export type AssetGraphTrigger =
 			missing?: boolean
 	  }
 
+// Macro-library → consumer edge: the consumer calls `macro_names` of
+// `lib_path`'s macros (deploy-recorded detection), or pulls in the whole
+// library via `// use` (`via_use`, macro_names then lists the full library).
+// `unsaved: true` marks a draft's `// use` overlay.
+export interface AssetGraphMacroEdge {
+	lib_path: string
+	consumer_path: string
+	macro_names: string[]
+	via_use: boolean
+	unsaved?: boolean
+}
+
+// Ordering-only "must-run-after" edge: `runnable_path`'s `// data_test`
+// (a `relationships` ref, or a custom test reading a pipeline asset) needs
+// `asset` materialized before the tested script runs — but the tested script
+// doesn't consume the asset's rows, so this is NOT a lineage edge. Resolved
+// server-side to the referenced asset's in-pipeline producer; fed into the
+// cascade topo-sort (buildLineageDag) so a cold cascade orders the referenced
+// dimension first, and rendered dashed on the canvas (like macro edges).
+export interface AssetGraphTestEdge {
+	producer_kind: GraphUsageKind
+	producer_path: string
+	runnable_kind: GraphUsageKind
+	runnable_path: string
+	asset_kind: AssetKind
+	asset_path: string
+}
+
 export interface AssetGraphResponse {
 	assets: AssetGraphAssetNode[]
 	runnables: AssetGraphRunnableNode[]
 	edges: AssetGraphEdge[]
 	triggers: AssetGraphTrigger[]
+	macro_edges?: AssetGraphMacroEdge[]
+	test_edges?: AssetGraphTestEdge[]
 }
 
 export type AssetGraphNodeData =
diff --git a/frontend/src/lib/components/assets/workspaceMacros.ts b/frontend/src/lib/components/assets/workspaceMacros.ts
new file mode 100644
index 0000000000..d25f9d1bea
--- /dev/null
+++ b/frontend/src/lib/components/assets/workspaceMacros.ts
@@ -0,0 +1,32 @@
+import { AssetService, type ListWorkspaceMacrosResponse } from '$lib/gen'
+
+export type WorkspaceMacro = ListWorkspaceMacrosResponse[number]
+
+// Workspace macros are late-bound (the worker reads the registry per job), so
+// mild staleness in editor surfaces is harmless — a short TTL keeps repeated
+// editor mounts / drawer opens from refetching on every keystroke-driven
+// remount while still picking up a lib deploy within seconds.
+const TTL_MS = 30_000
+const cache = new Map<string, { at: number; items: WorkspaceMacro[] }>()
+
+export async function listWorkspaceMacrosCached(workspace: string): Promise<WorkspaceMacro[]> {
+	const hit = cache.get(workspace)
+	if (hit && Date.now() - hit.at < TTL_MS) return hit.items
+	const items = await AssetService.listWorkspaceMacros({ workspace })
+	cache.set(workspace, { at: Date.now(), items })
+	return items
+}
+
+export function invalidateWorkspaceMacros(workspace: string) {
+	cache.delete(workspace)
+}
+
+/** `name(params)` display signature, with the table-macro arrow. */
+export function macroSignature(m: WorkspaceMacro): string {
+	return `${m.name}(${m.params})${m.is_table ? ' → table' : ''}`
+}
+
+/** Full `CREATE` statement for the copy button / documentation preview. */
+export function macroDefinitionSql(m: WorkspaceMacro): string {
+	return `CREATE OR REPLACE MACRO ${m.name}(${m.params}) AS ${m.is_table ? 'TABLE ' : ''}${m.body};`
+}
diff --git a/frontend/src/lib/components/common/ScrollableX.svelte b/frontend/src/lib/components/common/ScrollableX.svelte
new file mode 100644
index 0000000000..836439bfbb
--- /dev/null
+++ b/frontend/src/lib/components/common/ScrollableX.svelte
@@ -0,0 +1,17 @@
+<script lang="ts">
+	import type { Snippet } from 'svelte'
+
+	// Subtle horizontal scroll: native overflow (so wheel/trackpad/drag always
+	// work) with the shared `.scrollbar-subtle` thumb (thin, hover-revealed). Bar
+	// thickness is tunable via the `--wm-scrollbar-size` CSS var (pass through
+	// `style`), so denser callers (e.g. the tab strip) can shrink it.
+	let {
+		class: c = '',
+		style = '',
+		children
+	}: { class?: string; style?: string; children: Snippet } = $props()
+</script>
+
+<div class="overflow-x-auto overflow-y-hidden scrollbar-subtle {c}" {style}>
+	{@render children()}
+</div>
diff --git a/frontend/src/lib/components/common/badge/Badge.svelte b/frontend/src/lib/components/common/badge/Badge.svelte
index cf7a7cad66..c57d41029c 100644
--- a/frontend/src/lib/components/common/badge/Badge.svelte
+++ b/frontend/src/lib/components/common/badge/Badge.svelte
@@ -90,7 +90,7 @@
 
 	const hovers: Partial<Record<BadgeColor, string>> = {
 		gray: 'hover:bg-surface-hover',
-		blue: 'hover:bg-blue-200 dark:hover:bg-blue-700/40',
+		blue: 'hover:bg-blue-100 dark:hover:bg-blue-700/60',
 		red: 'hover:bg-red-200 dark:hover:bg-red-500/25',
 		green: 'hover:bg-green-200 dark:hover:bg-green-500/25',
 		yellow: 'hover:bg-yellow-200 dark:hover:bg-yellow-500/25',
diff --git a/frontend/src/lib/components/common/button/CopyButton.svelte b/frontend/src/lib/components/common/button/CopyButton.svelte
new file mode 100644
index 0000000000..4eaed95b9b
--- /dev/null
+++ b/frontend/src/lib/components/common/button/CopyButton.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+	import { Check, Copy } from 'lucide-svelte'
+	import Button from './Button.svelte'
+	import { copyToClipboard } from '$lib/utils'
+
+	// Icon-only copy-to-clipboard button: swaps to a green check for a moment
+	// after a successful copy. Safe inside menus/tooltips (clicks don't propagate).
+	let {
+		value,
+		sendToast = false,
+		title = 'Copy to clipboard',
+		class: className = ''
+	}: {
+		value: string
+		// Also pop the global "copied to clipboard" toast on success.
+		sendToast?: boolean
+		// Hover title while not copied (e.g. "Copy id: wm-fork-x"); "Copied!"
+		// always takes over after a copy.
+		title?: string
+		class?: string
+	} = $props()
+
+	let copied = $state(false)
+	let resetTimeout: ReturnType<typeof setTimeout> | undefined
+
+	async function copy() {
+		if (!(await copyToClipboard(value, sendToast))) return
+		copied = true
+		clearTimeout(resetTimeout)
+		resetTimeout = setTimeout(() => (copied = false), 1500)
+	}
+</script>
+
+<Button
+	variant="subtle"
+	unifiedSize="xs"
+	iconOnly
+	title={copied ? 'Copied!' : title}
+	startIcon={copied
+		? { icon: Check, classes: 'text-green-600 dark:text-green-400' }
+		: { icon: Copy }}
+	onClick={copy}
+	wrapperClasses={className}
+/>
diff --git a/frontend/src/lib/components/common/checkbox/Checkbox.svelte b/frontend/src/lib/components/common/checkbox/Checkbox.svelte
index 0c0fcef268..49e13e9519 100644
--- a/frontend/src/lib/components/common/checkbox/Checkbox.svelte
+++ b/frontend/src/lib/components/common/checkbox/Checkbox.svelte
@@ -4,6 +4,9 @@
 	interface Props {
 		/** Controlled checked state. */
 		checked?: boolean
+		/** Tri-state display (e.g. a group header with only part of its items
+		 * selected). Purely visual — `checked` still drives the value. */
+		indeterminate?: boolean
 		disabled?: boolean
 		/** Native title attribute (hover hint). */
 		title?: string | undefined
@@ -15,6 +18,7 @@
 
 	let {
 		checked = false,
+		indeterminate = false,
 		disabled = false,
 		title = undefined,
 		class: className = undefined,
@@ -25,6 +29,7 @@
 <input
 	type="checkbox"
 	{checked}
+	{indeterminate}
 	{disabled}
 	{title}
 	onchange={onChange}
diff --git a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
index 1c7e6052eb..fa1cef6726 100644
--- a/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/ConfirmationModal.svelte
@@ -3,7 +3,7 @@
 	import { createEventDispatcher, type Snippet } from 'svelte'
 	import { fade } from 'svelte/transition'
 	import Button from '../button/Button.svelte'
-	import { AlertTriangle, CornerDownLeft, Loader2, RefreshCcw } from 'lucide-svelte'
+	import { AlertTriangle, CornerDownLeft, Info, Loader2, RefreshCcw } from 'lucide-svelte'
 	import { twMerge } from 'tailwind-merge'
 
 	type Props = {
@@ -12,10 +12,13 @@
 		keyListen?: boolean
 		loading?: boolean
 		open?: boolean
-		type?: 'danger' | 'reload'
+		type?: 'danger' | 'reload' | 'info'
 		showIcon?: boolean
 		id?: string
 		trashbin?: boolean
+		/** Tailwind z-index class for the modal root. Override to stack this modal
+		 * above another modal that's already open (both default to `z-[9999]`). */
+		zIndexClass?: string
 		children?: Snippet
 		onConfirmed?: () => void | Promise<void>
 		onCanceled?: () => void
@@ -31,6 +34,7 @@
 		showIcon = true,
 		id,
 		trashbin = false,
+		zIndexClass = 'z-[9999]',
 		children,
 		onConfirmed,
 		onCanceled
@@ -83,6 +87,17 @@
 				icon: 'text-blue-700 dark:text-blue-300',
 				iconWrapper: 'bg-blue-100 dark:bg-blue-800/50'
 			}
+		},
+
+		// Neutral, affirmative confirmation (non-destructive) — e.g. proceeding with
+		// an import. The confirm button stays a plain accent (see `destructive` below).
+		info: {
+			Icon: Info,
+			color: 'blue',
+			classes: {
+				icon: 'text-blue-700 dark:text-blue-300',
+				iconWrapper: 'bg-blue-100 dark:bg-blue-800/50'
+			}
 		}
 	} satisfies { [type in typeof type]: any }
 	const Icon = $derived(theme[type].Icon ?? AlertTriangle)
@@ -93,7 +108,7 @@
 {#if open}
 	<div
 		transition:fadeFast|local
-		class={'fixed top-0 bottom-0 left-0 right-0 z-[9999]'}
+		class={twMerge('fixed top-0 bottom-0 left-0 right-0', zIndexClass)}
 		role="dialog"
 		{id}
 	>
diff --git a/frontend/src/lib/components/common/confirmationModal/DraftEditorModals.svelte b/frontend/src/lib/components/common/confirmationModal/DraftEditorModals.svelte
index 2d7a9cd3ff..26366325b5 100644
--- a/frontend/src/lib/components/common/confirmationModal/DraftEditorModals.svelte
+++ b/frontend/src/lib/components/common/confirmationModal/DraftEditorModals.svelte
@@ -38,6 +38,13 @@
 		draftSavedAt?: string | undefined
 		/** ISO timestamp of the latest deploy at this path. */
 		deployedAt?: string | undefined
+		/** Precise staleness inputs (flows/apps): the deployed version the draft was
+		 *  forked from, and the current deployed head. When both are set they drive
+		 *  `isStale` and the dedup key instead of the timestamps — exact, and stable
+		 *  across autosaves (the timestamp drifts past `deployedAt` as you keep
+		 *  editing). Absent (pre-feature drafts, scripts) ⇒ timestamp fallback. */
+		draftBaseVersion?: number | undefined
+		deployedHeadVersion?: number | undefined
 		/** Discard the draft and reload deployed (same as "Reset to deployed"). */
 		onLoadLatestDeploy?: () => void | Promise<void>
 		/** Defaults to true; set to false to suppress all modals. */
@@ -56,6 +63,8 @@
 		othersModalOpen = $bindable(),
 		draftSavedAt = undefined,
 		deployedAt = undefined,
+		draftBaseVersion = undefined,
+		deployedHeadVersion = undefined,
 		onLoadLatestDeploy,
 		enabled = true
 	}: Props = $props()
@@ -65,13 +74,27 @@
 	let staleAlertKey = $state<string | undefined>(undefined)
 	let staleModalOpen = $state(false)
 
+	// Prefer the exact version comparison (flows/apps) over the timestamp: the
+	// draft's pinned fork base never drifts, whereas `draftSavedAt` advances past
+	// `deployedAt` once you keep editing a stale draft, hiding the staleness.
+	const useVersion = $derived(draftBaseVersion != null && deployedHeadVersion != null)
 	const isStale = $derived(
-		!!draftSavedAt &&
-			!!deployedAt &&
-			!!onLoadLatestDeploy &&
-			new Date(draftSavedAt).getTime() < new Date(deployedAt).getTime()
+		!!onLoadLatestDeploy &&
+			(useVersion
+				? draftBaseVersion !== deployedHeadVersion
+				: !!draftSavedAt &&
+					!!deployedAt &&
+					new Date(draftSavedAt).getTime() < new Date(deployedAt).getTime())
+	)
+	// Key on the versions (not `draftSavedAt`) in the version path, else every
+	// autosave would mint a new key and re-pop the modal mid-edit.
+	const currentKey = $derived(
+		isStale
+			? useVersion
+				? `${path}|v|${draftBaseVersion}|${deployedHeadVersion}`
+				: `${path}|${draftSavedAt}|${deployedAt}`
+			: undefined
 	)
-	const currentKey = $derived(isStale ? `${path}|${draftSavedAt}|${deployedAt}` : undefined)
 
 	$effect(() => {
 		const key = currentKey
diff --git a/frontend/src/lib/components/common/drawer/DrawerContent.svelte b/frontend/src/lib/components/common/drawer/DrawerContent.svelte
index 6b76873c49..dfa7d248c6 100644
--- a/frontend/src/lib/components/common/drawer/DrawerContent.svelte
+++ b/frontend/src/lib/components/common/drawer/DrawerContent.svelte
@@ -24,6 +24,11 @@
 		titleExtra?: import('svelte').Snippet
 		/** Rendered fixed below the header, above the scrollable content. */
 		banner?: import('svelte').Snippet
+		/**
+		 * Whether the `banner` reserves space (its baseline exists). Only then does
+		 * the content hug it with tight top padding; new entities keep normal padding.
+		 */
+		bannerReserved?: boolean
 		children?: import('svelte').Snippet
 	}
 
@@ -43,6 +48,7 @@
 		actions,
 		titleExtra,
 		banner,
+		bannerReserved = false,
 		children
 	}: Props = $props()
 
@@ -86,19 +92,29 @@
 		{/if}
 	</div>
 
-	{#if banner}
-		{@render banner()}
-	{/if}
+	{#snippet contentBox(tightTop = false)}
+		<div
+			class={classNames(
+				noPadding ? '' : tightTop ? 'px-4 pb-4 pt-1' : 'p-4',
+				'grow min-h-0 max-h-full',
+				forceOverflowVisible ? '!overflow-visible' : ''
+			)}
+			class:overflow-y-auto={overflow_y}
+			style={overflow_y ? 'scrollbar-gutter: stable;' : ''}
+		>
+			{@render children?.()}
+		</div>
+	{/snippet}
 
-	<div
-		class={classNames(
-			noPadding ? '' : 'p-4',
-			'grow min-h-0 max-h-full',
-			forceOverflowVisible ? '!overflow-visible' : ''
-		)}
-		class:overflow-y-auto={overflow_y}
-		style={overflow_y ? 'scrollbar-gutter: stable;' : ''}
-	>
-		{@render children?.()}
-	</div>
+	{#if banner}
+		<!-- Banner + content share one `divide-y` cell: the header keeps its single
+		     divider (no bordered strip around the reserved slot) and the content hugs
+		     the slot with tight top padding (see `contentBox`/`bannerReserved`). -->
+		<div class="flex flex-col grow min-h-0 max-h-full">
+			{@render banner()}
+			{@render contentBox(bannerReserved)}
+		</div>
+	{:else}
+		{@render contentBox()}
+	{/if}
 </div>
diff --git a/frontend/src/lib/components/common/index.ts b/frontend/src/lib/components/common/index.ts
index 32f402c643..4f390cfe57 100644
--- a/frontend/src/lib/components/common/index.ts
+++ b/frontend/src/lib/components/common/index.ts
@@ -2,7 +2,9 @@ export { default as ActionRow } from './actionRow/ActionRow.svelte'
 export { default as Alert } from './alert/Alert.svelte'
 export { default as Badge } from './badge/Badge.svelte'
 export { default as Button } from './button/Button.svelte'
+export { default as CopyButton } from './button/CopyButton.svelte'
 export { default as UndoRedo } from './button/UndoRedo.svelte'
+export { default as NameIdTooltip } from './tooltip/NameIdTooltip.svelte'
 export { default as ClearableInput } from './clearableInput/ClearableInput.svelte'
 export { default as Drawer } from './drawer/Drawer.svelte'
 export { default as DrawerContent } from './drawer/DrawerContent.svelte'
diff --git a/frontend/src/lib/components/common/modal/Modal.svelte b/frontend/src/lib/components/common/modal/Modal.svelte
index bd07aaa6e6..1596c2aa9f 100644
--- a/frontend/src/lib/components/common/modal/Modal.svelte
+++ b/frontend/src/lib/components/common/modal/Modal.svelte
@@ -18,6 +18,10 @@
 		style?: string
 		cancelText?: string | undefined
 		kind?: 'button' | 'X'
+		/** Force a minimum z-index base. Defaults to elevating above the AI chat
+		 * side panel when it is open. Pass an explicit value to stack above other
+		 * surfaces (e.g. a modal opened over the /sessions preview-pane editor). */
+		minZIndex?: number
 		settings?: import('svelte').Snippet
 		children?: import('svelte').Snippet
 		actions?: import('svelte').Snippet
@@ -30,6 +34,7 @@
 		style = '',
 		cancelText = undefined,
 		kind = 'button',
+		minZIndex: minZIndexProp = undefined,
 		settings,
 		children: children_render,
 		actions
@@ -39,9 +44,10 @@
 
 	let disposable: Disposable | undefined = $state(undefined)
 
-	// Only elevate above the AI chat panel when it's actually open —
-	// when chat is closed there's nothing at z-index 1200 to stack above.
-	const minZIndex = $derived(chatState.size > 0 ? zIndexes.aiChat + 1 : 0)
+	// An explicit override wins; otherwise only elevate above the AI chat panel
+	// when it's actually open — when chat is closed there's nothing at z-index
+	// 1200 to stack above.
+	const minZIndex = $derived(minZIndexProp ?? (chatState.size > 0 ? zIndexes.aiChat + 1 : 0))
 
 	// Both `bind:open` and this $effect are needed: bind:open syncs the
 	// boolean, while the effect calls openDrawer/closeDrawer to register
@@ -93,9 +99,7 @@
 				<div
 					class={twMerge(
 						'fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity',
-						open
-							? 'ease-out duration-300 opacity-100'
-							: 'ease-in duration-200 opacity-0'
+						open ? 'ease-out duration-300 opacity-100' : 'ease-in duration-200 opacity-0'
 					)}
 				></div>
 
@@ -131,9 +135,7 @@
 								</div>
 							</div>
 							{#if kind == 'button'}
-								<div
-									class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4"
-								>
+								<div class="flex items-center space-x-2 flex-row-reverse space-x-reverse mt-4">
 									{@render actions?.()}
 									<Button
 										on:click={() => {
diff --git a/frontend/src/lib/components/common/table/AppRow.svelte b/frontend/src/lib/components/common/table/AppRow.svelte
index f016fafd5c..4f2c760648 100644
--- a/frontend/src/lib/components/common/table/AppRow.svelte
+++ b/frontend/src/lib/components/common/table/AppRow.svelte
@@ -6,7 +6,7 @@
 	import DraftBadge from '$lib/components/DraftBadge.svelte'
 	import type ShareModal from '$lib/components/ShareModal.svelte'
 	import { AppService, type ListableApp } from '$lib/gen'
-	import { userStore, workspaceStore } from '$lib/stores'
+	import { userStore, userWorkspaces, workspaceStore } from '$lib/stores'
 	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 	import { createEventDispatcher } from 'svelte'
 	import Button from '../button/Button.svelte'
@@ -34,8 +34,7 @@
 	import AppDeploymentHistory from '$lib/components/apps/editor/AppDeploymentHistory.svelte'
 	import { isDeployable } from '$lib/utils_deployable'
 	import { getDeployUiSettings } from '$lib/components/home/deploy_ui'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 
 	interface Props {
@@ -170,7 +169,7 @@
 						</Button>
 					</div>
 				{/if}
-				{#if !isCloudHosted() && !isRuleActive('DisableWorkspaceForking') && (!showEditButton || !app.canWrite)}
+				{#if !isCloudHosted() && editInForkAllowed($workspaceStore, $userWorkspaces) && (!showEditButton || !app.canWrite)}
 					<div>
 						<Button
 							variant={!showEditButton ? 'default' : 'subtle'}
@@ -179,7 +178,7 @@
 							startIcon={{ icon: GitFork }}
 							href={buildForkEditUrl(app.raw_app ? 'raw_app' : 'app', app.path)}
 						>
-							Edit in fork
+							{editInForkLabel($workspaceStore, $userWorkspaces)}
 						</Button>
 					</div>
 				{/if}
@@ -235,10 +234,13 @@
 						hide: $userStore?.operator
 					},
 					{
-						displayName: 'Edit in workspace fork',
+						displayName: editInForkLabel($workspaceStore, $userWorkspaces),
 						icon: GitFork,
 						href: buildForkEditUrl(app.raw_app ? 'raw_app' : 'app', path),
-						hide: $userStore?.operator || isCloudHosted() || isRuleActive('DisableWorkspaceForking')
+						hide:
+							$userStore?.operator ||
+							isCloudHosted() ||
+							!editInForkAllowed($workspaceStore, $userWorkspaces)
 					},
 					{
 						displayName: 'Move/Rename',
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index 89a08b412b..a19715686f 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -8,7 +8,7 @@
 	import DraftBadge from '$lib/components/DraftBadge.svelte'
 	import type ShareModal from '$lib/components/ShareModal.svelte'
 	import { FlowService, type Flow } from '$lib/gen'
-	import { userStore, workspaceStore } from '$lib/stores'
+	import { userStore, userWorkspaces, workspaceStore } from '$lib/stores'
 	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 	import { createEventDispatcher } from 'svelte'
 	import Badge from '../badge/Badge.svelte'
@@ -36,8 +36,7 @@
 	import FlowHistory from '$lib/components/flows/FlowHistory.svelte'
 	import InheritedLabels from '$lib/components/InheritedLabels.svelte'
 	import { getDeployUiSettings } from '$lib/components/home/deploy_ui'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 
 	interface Props {
@@ -191,7 +190,7 @@
 						</Button>
 					</div>
 				{/if}
-				{#if !isCloudHosted() && !isRuleActive('DisableWorkspaceForking') && (!showEditButton || !flow.canWrite)}
+				{#if !isCloudHosted() && editInForkAllowed($workspaceStore, $userWorkspaces) && (!showEditButton || !flow.canWrite)}
 					<div>
 						<Button
 							variant={!showEditButton ? 'default' : 'subtle'}
@@ -200,7 +199,7 @@
 							startIcon={{ icon: GitFork }}
 							href={buildForkEditUrl('flow', flow.path)}
 						>
-							Edit in fork
+							{editInForkLabel($workspaceStore, $userWorkspaces)}
 						</Button>
 					</div>
 				{/if}
@@ -252,10 +251,13 @@
 						hide: $userStore?.operator
 					},
 					{
-						displayName: 'Edit in workspace fork',
+						displayName: editInForkLabel($workspaceStore, $userWorkspaces),
 						icon: GitFork,
 						href: buildForkEditUrl('flow', path),
-						hide: $userStore?.operator || isCloudHosted() || isRuleActive('DisableWorkspaceForking')
+						hide:
+							$userStore?.operator ||
+							isCloudHosted() ||
+							!editInForkAllowed($workspaceStore, $userWorkspaces)
 					},
 					{
 						displayName: 'Audit logs',
diff --git a/frontend/src/lib/components/common/table/RawAppRow.svelte b/frontend/src/lib/components/common/table/RawAppRow.svelte
index e759a1d9fe..3f74356506 100644
--- a/frontend/src/lib/components/common/table/RawAppRow.svelte
+++ b/frontend/src/lib/components/common/table/RawAppRow.svelte
@@ -33,7 +33,7 @@
 </script>
 
 <Row
-	href="{base}/apps/get_raw/{app.version}/{app.path}"
+	href="{base}/apps_raw/get/{app.path}"
 	kind="raw_app"
 	{marked}
 	path={app.path}
diff --git a/frontend/src/lib/components/common/table/Row.svelte b/frontend/src/lib/components/common/table/Row.svelte
index 8b24b1e23b..43bec92921 100644
--- a/frontend/src/lib/components/common/table/Row.svelte
+++ b/frontend/src/lib/components/common/table/Row.svelte
@@ -50,6 +50,7 @@
 			| 'azure_trigger'
 			| 'email_trigger'
 			| 'data_pipeline'
+			| 'datatable_migration'
 		triggerKind?: string | undefined
 		summary?: string | undefined
 		path: string
diff --git a/frontend/src/lib/components/common/table/RowIcon.svelte b/frontend/src/lib/components/common/table/RowIcon.svelte
index fd08c77087..b2deb47443 100644
--- a/frontend/src/lib/components/common/table/RowIcon.svelte
+++ b/frontend/src/lib/components/common/table/RowIcon.svelte
@@ -19,6 +19,7 @@
 		Unplug,
 		Workflow
 	} from 'lucide-svelte'
+	import FileIcon from '$lib/components/raw_apps/FileIcon.svelte'
 
 	interface Props {
 		kind:
@@ -26,6 +27,7 @@
 			| 'flow'
 			| 'app'
 			| 'raw_app'
+			| 'raw_app_file'
 			| 'resource'
 			| 'variable'
 			| 'resource_type'
@@ -53,12 +55,16 @@
 			| 'azure_trigger'
 			| 'email_trigger'
 			| 'data_pipeline'
+			| 'datatable_migration'
 		/** For 'trigger' kind, specifies the specific trigger type (routes, schedules, etc.) */
 		triggerKind?: string | undefined
+		/** For 'raw_app_file' kind: the file name/path, used to pick an
+		 * extension-specific icon. */
+		path?: string | undefined
 		size?: number
 	}
 
-	let { kind, triggerKind = undefined, size = 16 }: Props = $props()
+	let { kind, triggerKind = undefined, path = undefined, size = 16 }: Props = $props()
 
 	// Map per-kind backend names (e.g. `kafka_trigger`) to the legacy short
 	// names the icon switch already handles, so we don't have to duplicate cases.
@@ -85,6 +91,8 @@
 		<BarsStaggered {size} class="text-teal-500" />
 	{:else if effectiveKind === 'app' || effectiveKind === 'raw_app'}
 		<LayoutDashboard {size} class="text-orange-500" />
+	{:else if effectiveKind === 'raw_app_file'}
+		<FileIcon name={path ?? ''} {size} />
 	{:else if effectiveKind === 'script'}
 		<Code2 {size} class="text-blue-500" />
 	{:else if effectiveKind === 'variable'}
@@ -121,6 +129,8 @@
 		<Calendar {size} class="text-gray-400" />
 	{:else if effectiveKind === 'data_pipeline'}
 		<Workflow {size} class="text-indigo-500" />
+	{:else if effectiveKind === 'datatable_migration'}
+		<Database {size} class="text-violet-500" />
 	{:else}
 		<div style="width: {size}px;"></div>
 	{/if}
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index 1d87d4c8d5..507986294f 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -9,7 +9,7 @@
 	import type ShareModal from '$lib/components/ShareModal.svelte'
 
 	import { ScriptService, type Script } from '$lib/gen'
-	import { hubBaseUrlStore, userStore, workspaceStore } from '$lib/stores'
+	import { hubBaseUrlStore, userStore, userWorkspaces, workspaceStore } from '$lib/stores'
 	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 
 	import { createEventDispatcher } from 'svelte'
@@ -48,8 +48,7 @@
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import { getDeployUiSettings } from '$lib/components/home/deploy_ui'
 	import { scriptToHubUrl } from '$lib/hub'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 
 	interface Props {
@@ -251,7 +250,7 @@
 						</div>
 					{/if}
 				{/if}
-				{#if !isCloudHosted() && !isRuleActive('DisableWorkspaceForking') && (!showEditButton || !script.canWrite)}
+				{#if !isCloudHosted() && editInForkAllowed($workspaceStore, $userWorkspaces) && (!showEditButton || !script.canWrite)}
 					<div>
 						<Button
 							variant={!showEditButton ? 'default' : 'subtle'}
@@ -260,7 +259,7 @@
 							startIcon={{ icon: GitFork }}
 							href={buildForkEditUrl('script', script.path)}
 						>
-							Edit in fork
+							{editInForkLabel($workspaceStore, $userWorkspaces)}
 						</Button>
 					</div>
 				{/if}
@@ -334,10 +333,13 @@
 						hide: $userStore?.operator
 					},
 					{
-						displayName: 'Edit in workspace fork',
+						displayName: editInForkLabel($workspaceStore, $userWorkspaces),
 						icon: GitFork,
 						href: buildForkEditUrl('script', script.path),
-						hide: $userStore?.operator || isCloudHosted() || isRuleActive('DisableWorkspaceForking')
+						hide:
+							$userStore?.operator ||
+							isCloudHosted() ||
+							!editInForkAllowed($workspaceStore, $userWorkspaces)
 					},
 					{
 						displayName: 'Move/Rename',
diff --git a/frontend/src/lib/components/common/tabs/DraggableTabs.svelte b/frontend/src/lib/components/common/tabs/DraggableTabs.svelte
index 937191d272..905759f391 100644
--- a/frontend/src/lib/components/common/tabs/DraggableTabs.svelte
+++ b/frontend/src/lib/components/common/tabs/DraggableTabs.svelte
@@ -25,8 +25,8 @@
 	import { dndzone, type DndEvent } from '@windmill-labs/svelte-dnd-action'
 	import { X } from 'lucide-svelte'
 	import { twMerge } from 'tailwind-merge'
-	import { createScrollArea, melt } from '@melt-ui/svelte'
 	import { untrack } from 'svelte'
+	import ScrollableX from '../ScrollableX.svelte'
 
 	interface Props {
 		tabs: TabItem[]
@@ -36,11 +36,28 @@
 		onReorder?: (newOrder: TabItem[]) => void
 		/** Extra classes for the outer tab strip. */
 		class?: string
-		/** Render after the right-pinned tabs (e.g. a "Split with Preview" toggle). */
+		/** Render inside the scroll row, right after the last tab (e.g. a "+" new-tab
+		 * button) — scrolls with the tabs, unlike `trailing`. */
+		afterTabs?: import('svelte').Snippet
+		/** Render after the right-pinned tabs, outside the scroll area so it stays
+		 * pinned (e.g. a "Split with Preview" toggle). */
 		trailing?: import('svelte').Snippet
+		/** Render inside each tab, after the label and before the close button (e.g. a
+		 * per-tab chevron/breadcrumb picker). Receives the tab and whether it's active. */
+		tabAccessory?: import('svelte').Snippet<[TabItem, boolean]>
 	}
 
-	let { tabs, activeId, onSelect, onClose, onReorder, class: c = '', trailing }: Props = $props()
+	let {
+		tabs,
+		activeId,
+		onSelect,
+		onClose,
+		onReorder,
+		class: c = '',
+		afterTabs,
+		trailing,
+		tabAccessory
+	}: Props = $props()
 
 	const pinnedLeft = $derived(tabs.filter((t) => t.pinned === 'left'))
 	const middle = $derived(tabs.filter((t) => !t.pinned))
@@ -60,27 +77,6 @@
 		if (!isDragging) dndMiddle = next
 	})
 
-	// `type: 'hover'` shows the custom bar only while hovering/scrolling the strip.
-	const {
-		elements: { root, viewport, content, scrollbarX, thumbX }
-	} = createScrollArea({ type: 'hover', hideDelay: 600, dir: 'ltr' })
-
-	// melt only re-measures the thumb when its *content* resizes, not the
-	// viewport — so a pane resize leaves the thumb stale. Detect width changes
-	// via `bind:clientWidth` and nudge melt by perturbing the 0×0 sentinel's box.
-	let viewportWidth = $state(0)
-	let resizeSentinel: HTMLSpanElement | undefined = $state(undefined)
-	$effect(() => {
-		void viewportWidth
-		const el = untrack(() => resizeSentinel)
-		if (!el) return
-		el.style.width = '1px'
-		const raf = requestAnimationFrame(() => {
-			el.style.width = '0px'
-		})
-		return () => cancelAnimationFrame(raf)
-	})
-
 	function handleConsider(e: CustomEvent<DndEvent<TabItem>>) {
 		isDragging = true
 		dndMiddle = e.detail.items
@@ -144,6 +140,15 @@
 			<Icon size={12} class={tab.iconClass} />
 		{/if}
 		<span class={twMerge('truncate max-w-[180px]', tab.labelClass)}>{tab.label}</span>
+		{#if tabAccessory}
+			<!-- The accessory is its own control (e.g. a picker): a click on it must not
+				 also select/re-select the tab, mirroring the close button below. -->
+			<!-- svelte-ignore a11y_click_events_have_key_events -->
+			<!-- svelte-ignore a11y_no_static_element_interactions -->
+			<span class="inline-flex items-center" onclick={(e) => e.stopPropagation()}>
+				{@render tabAccessory(tab, isActive)}
+			</span>
+		{/if}
 		{#if tab.closable !== false}
 			<button
 				type="button"
@@ -161,52 +166,40 @@
 {/snippet}
 
 <div class={twMerge('flex items-center bg-surface', c)}>
-	<div use:melt={$root} class="tabs-root flex-1 min-w-0 relative pt-1 pl-1 pb-1">
-		<div use:melt={$viewport} bind:clientWidth={viewportWidth} class="tabs-viewport w-full">
-			<!-- Inner flex wrapper — melt's content element is forced to
-				 `display: table` which would stack the tabs vertically. -->
-			<div use:melt={$content}>
-				<div class="flex items-center" role="tablist">
-					{#each pinnedLeft as tab (tab.id)}
-						{@render tabButton(tab)}
-					{/each}
+	<!-- 4px bar to match the strip's `pb-1` reserve. -->
+	<ScrollableX class="flex-1 min-w-0 pt-1 pl-1 pb-1" style="--wm-scrollbar-size: 4px;">
+		<div class="flex items-center" role="tablist">
+			{#each pinnedLeft as tab (tab.id)}
+				{@render tabButton(tab)}
+			{/each}
 
-					<div
-						class="flex items-center"
-						use:dndzone={{
-							items: dndMiddle,
-							flipDurationMs: 150,
-							type: dndType,
-							dropTargetStyle: {}
-						}}
-						onconsider={handleConsider}
-						onfinalize={handleFinalize}
-					>
-						{#each dndMiddle as tab (tab.id)}
-							<div>
-								{@render tabButton(tab)}
-							</div>
-						{/each}
+			<div
+				class="flex items-center"
+				use:dndzone={{
+					items: dndMiddle,
+					flipDurationMs: 150,
+					type: dndType,
+					dropTargetStyle: {}
+				}}
+				onconsider={handleConsider}
+				onfinalize={handleFinalize}
+			>
+				{#each dndMiddle as tab (tab.id)}
+					<div>
+						{@render tabButton(tab)}
 					</div>
-
-					{#each pinnedRight as tab (tab.id)}
-						{@render tabButton(tab)}
-					{/each}
-
-					<!-- resize nudge for melt (see the $effect above) -->
-					<span
-						bind:this={resizeSentinel}
-						aria-hidden="true"
-						style="display:inline-block;width:0;height:0"
-					></span>
-				</div>
+				{/each}
 			</div>
-		</div>
 
-		<div use:melt={$scrollbarX} class="tabs-scrollbar">
-			<div use:melt={$thumbX} class="tabs-thumb"></div>
+			{#each pinnedRight as tab (tab.id)}
+				{@render tabButton(tab)}
+			{/each}
+
+			{#if afterTabs}
+				{@render afterTabs()}
+			{/if}
 		</div>
-	</div>
+	</ScrollableX>
 
 	{#if trailing}
 		<div class="ml-1 pr-1 flex items-center shrink-0">
@@ -214,38 +207,3 @@
 		</div>
 	{/if}
 </div>
-
-<style>
-	.tabs-viewport {
-		height: 100%;
-	}
-
-	/* Custom 4px bar, absolutely positioned so toggling it never shifts layout. */
-	:global([data-melt-scroll-area-scrollbar].tabs-scrollbar) {
-		height: 4px;
-		background: transparent;
-		touch-action: none;
-		user-select: none;
-		transition: opacity 0.15s;
-	}
-	/* Hide the whole bar when melt marks it hidden (key off the scrollbar, not
-	   the thumb — the thumb's data-state doesn't track overflow). */
-	:global([data-melt-scroll-area-scrollbar].tabs-scrollbar[data-state='hidden']) {
-		opacity: 0;
-		pointer-events: none;
-	}
-	:global([data-melt-scroll-area-thumb].tabs-thumb) {
-		/* melt leaves the thumb-height var empty for a horizontal bar, collapsing
-		   the inline height to 0 — supply it so the thumb fills the 4px track. */
-		--melt-scroll-area-thumb-height: 100%;
-		height: 100%;
-		width: var(--melt-scroll-area-thumb-width);
-		background: rgb(var(--color-text-hint) / 0.35);
-		border-radius: 2px;
-		position: relative;
-		transition: background-color 0.15s;
-	}
-	:global([data-melt-scroll-area-thumb].tabs-thumb:hover) {
-		background: rgb(var(--color-text-secondary) / 0.6);
-	}
-</style>
diff --git a/frontend/src/lib/components/common/tabs/Tabs.svelte b/frontend/src/lib/components/common/tabs/Tabs.svelte
index e8a98a21c2..65daedf622 100644
--- a/frontend/src/lib/components/common/tabs/Tabs.svelte
+++ b/frontend/src/lib/components/common/tabs/Tabs.svelte
@@ -3,6 +3,7 @@
 	import { writable } from 'svelte/store'
 	import { createEventDispatcher } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
+	import ScrollableX from '../ScrollableX.svelte'
 	import type { TabsContext } from '$lib/components/apps/editor/settingsPanel/inputEditor/tabs.svelte'
 
 	const dispatch = createEventDispatcher<{ selected: string }>()
@@ -75,10 +76,12 @@
 
 <svelte:window onhashchange={hashChange} />
 {#if !hideTabs}
-	<div class="overflow-x-auto {wrapperClass}">
+	<ScrollableX class={wrapperClass}>
+		<!-- `scrollbar-hidden` is inert on this non-scrolling row (ScrollableX owns the
+			 scroll), but TroubleshootFlowTutorial targets it as a selector hook — keep it. -->
 		<div class={twMerge('border-b flex flex-row whitespace-nowrap scrollbar-hidden', c)} {style}>
 			{@render children?.({ selected })}
 		</div>
-	</div>
+	</ScrollableX>
 {/if}
 {@render content?.()}
diff --git a/frontend/src/lib/components/common/tabs/TabsV2.svelte b/frontend/src/lib/components/common/tabs/TabsV2.svelte
index 08616af90c..314bb9cd15 100644
--- a/frontend/src/lib/components/common/tabs/TabsV2.svelte
+++ b/frontend/src/lib/components/common/tabs/TabsV2.svelte
@@ -2,6 +2,7 @@
 	import { setContext, untrack } from 'svelte'
 	import { writable } from 'svelte/store'
 	import { twMerge } from 'tailwind-merge'
+	import ScrollableX from '../ScrollableX.svelte'
 	import type { TabsContext } from '$lib/components/apps/editor/settingsPanel/inputEditor/tabs.svelte'
 
 	interface Props {
@@ -72,10 +73,10 @@
 
 <svelte:window onhashchange={hashChange} />
 {#if !hideTabs}
-	<div class="overflow-x-auto {wrapperClass}">
-		<div class={twMerge('border-b flex flex-row whitespace-nowrap scrollbar-hidden', c)} {style}>
+	<ScrollableX class={wrapperClass}>
+		<div class={twMerge('border-b flex flex-row whitespace-nowrap', c)} {style}>
 			{@render children?.({ selected })}
 		</div>
-	</div>
+	</ScrollableX>
 {/if}
 {@render content?.()}
diff --git a/frontend/src/lib/components/common/tooltip/NameIdTooltip.svelte b/frontend/src/lib/components/common/tooltip/NameIdTooltip.svelte
new file mode 100644
index 0000000000..7db96bbde7
--- /dev/null
+++ b/frontend/src/lib/components/common/tooltip/NameIdTooltip.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+	import type { Placement } from '@floating-ui/core'
+	import Tooltip from '$lib/components/meltComponents/Tooltip.svelte'
+	import CopyButton from '../button/CopyButton.svelte'
+
+	// Rich hover tooltip for anything with a display name and a technical id
+	// (workspaces, scripts, …): shows both plus a copy-id button. Wrap the
+	// hoverable element as children; remove its native `title` so they don't
+	// both pop.
+	let {
+		name,
+		id,
+		placement = 'bottom-start',
+		disablePopup = false,
+		class: className = '',
+		children
+	}: {
+		name: string
+		id: string
+		placement?: Placement
+		// Keeps the trigger rendered but suppresses the popup (e.g. when another
+		// affordance like a collapsed-sidebar popover already covers hover).
+		disablePopup?: boolean
+		class?: string
+		children?: import('svelte').Snippet
+	} = $props()
+</script>
+
+<!-- openDelay keeps the tooltip from popping on casual pointer passes; closeDelay
+     lets the pointer travel from the trigger into the tooltip to reach the copy
+     button without the tooltip vanishing en route. -->
+<Tooltip
+	{placement}
+	{disablePopup}
+	anchor="cursor"
+	openDelay={700}
+	closeDelay={200}
+	class={className}
+>
+	{@render children?.()}
+	{#snippet text()}
+		<div class="flex flex-col gap-0.5 min-w-0">
+			<div class="text-xs font-semibold text-emphasis truncate">{name}</div>
+			<div class="flex items-center gap-1 min-w-0">
+				<span class="font-mono text-2xs text-secondary truncate">{id}</span>
+				<CopyButton value={id} />
+			</div>
+		</div>
+	{/snippet}
+</Tooltip>
diff --git a/frontend/src/lib/components/copilot/chat/AIButton.svelte b/frontend/src/lib/components/copilot/chat/AIButton.svelte
index 0234810a8b..7f9ccda715 100644
--- a/frontend/src/lib/components/copilot/chat/AIButton.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIButton.svelte
@@ -4,29 +4,25 @@
 	import { aiUserDisabled } from '$lib/stores'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import DarkPopover from '$lib/components/Popover.svelte'
-	import { ExternalLink, WandSparkles } from 'lucide-svelte'
-	import { getModifierKey } from '$lib/utils'
+	import { ExternalLink, MessagesSquare } from 'lucide-svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 
 	let {
 		togglePanel,
-		btnClasses
+		btnClasses,
+		label = 'Open in AI session'
 	}: {
 		togglePanel: () => void
 		btnClasses?: string
+		/** Tooltip + accessible text of the icon-only button. */
+		label?: string
 	} = $props()
 </script>
 
 {#if $copilotInfo.enabled}
 	<DarkPopover>
 		{#snippet text()}
-			<div class="flex flex-row gap-1">
-				Show the AI Panel.
-
-				<div class="flex flex-row items-center !text-md opacity-60 gap-0 font-normal">
-					{getModifierKey()}L
-				</div>
-			</div>
+			{label}
 		{/snippet}
 		{@render button({ onPress: () => togglePanel() })}
 	</DarkPopover>
@@ -60,10 +56,10 @@
 		color="light"
 		variant="default"
 		onClick={onPress}
-		startIcon={{ icon: WandSparkles }}
+		startIcon={{ icon: MessagesSquare }}
 		iconOnly
 		{btnClasses}
 	>
-		AI Panel
+		{label}
 	</Button>
 {/snippet}
diff --git a/frontend/src/lib/components/copilot/chat/AIChat.svelte b/frontend/src/lib/components/copilot/chat/AIChat.svelte
index add2c7b44f..038751f4b6 100644
--- a/frontend/src/lib/components/copilot/chat/AIChat.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIChat.svelte
@@ -19,7 +19,9 @@
 		forceDisabledMessage = '',
 		wideLayout = false,
 		emptyHint,
-		inputPreface
+		inputPreface,
+		initialInstructions = undefined,
+		onDraftChange = undefined
 	}: {
 		hideHeader?: boolean
 		hideModeSelector?: boolean
@@ -35,6 +37,9 @@
 		wideLayout?: boolean
 		emptyHint?: import('svelte').Snippet
 		inputPreface?: import('svelte').Snippet
+		// Seed / observe the composer's draft text (forwarded to AIChatDisplay).
+		initialInstructions?: string
+		onDraftChange?: (text: string) => void
 	} = $props()
 
 	const isAdmin = $derived($userStore?.is_admin || $userStore?.is_super_admin)
@@ -163,7 +168,8 @@
 	{headerLeft}
 	hasDiff={aiChatManager.scriptEditorOptions &&
 		!!aiChatManager.scriptEditorOptions.lastDeployedCode &&
-		aiChatManager.scriptEditorOptions.lastDeployedCode !== aiChatManager.scriptEditorOptions.code}
+		aiChatManager.scriptEditorOptions.lastDeployedCode !==
+			aiChatManager.scriptEditorOptions.getCode()}
 	diffMode={aiChatManager.scriptEditorOptions?.diffMode ?? false}
 	{disabled}
 	{disabledMessage}
@@ -173,4 +179,6 @@
 	{wideLayout}
 	{emptyHint}
 	{inputPreface}
+	{initialInstructions}
+	{onDraftChange}
 ></AIChatDisplay>
diff --git a/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte b/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte
index e9ac5eed16..3845c20435 100644
--- a/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIChatDisplay.svelte
@@ -10,6 +10,8 @@
 		ChevronDown,
 		ChevronsRight,
 		CheckIcon,
+		FileText,
+		Folder,
 		Hand,
 		HistoryIcon,
 		Hourglass,
@@ -26,9 +28,8 @@
 	import { isActiveUserQuestion, type DisplayMessage } from './shared'
 	import type { ContextElement } from './context'
 	import ChatQuickActions from './ChatQuickActions.svelte'
-	import ProviderModelSelector from './ProviderModelSelector.svelte'
 	import ContextUsageIndicator from './ContextUsageIndicator.svelte'
-	import AIChatSettingsMenu from './AIChatSettingsMenu.svelte'
+	import AIChatModelSettings from './AIChatModelSettings.svelte'
 	import ChatMode from './ChatMode.svelte'
 	import DatatableCreationPolicy from './DatatableCreationPolicy.svelte'
 	import Tooltip from '$lib/components/meltComponents/Tooltip.svelte'
@@ -39,8 +40,18 @@
 	import ChatTypingIndicator from './ChatTypingIndicator.svelte'
 	import AIChatInput from './AIChatInput.svelte'
 	import QueuedMessageChip from './QueuedMessageChip.svelte'
+	import JobsSegment from './JobsSegment.svelte'
 	import { getModifierKey } from '$lib/utils'
 	import type { SelectedContext } from './app/core'
+	import AttachedFilesBar from './files/AttachedFilesBar.svelte'
+	import { type FileToAttach } from './files/attachedFiles.svelte'
+	import {
+		hasFileSystemAccess,
+		pickDirectory,
+		handlesFromDataTransfer,
+		readDroppedEntries
+	} from './files/fsAccess'
+	import { sendUserToast } from '$lib/toast'
 
 	const MAX_YOLO_TOOLTIP_TOOLS = 8
 	const aiChatManager = getAiChatManager()
@@ -105,7 +116,9 @@
 		hideModeSelector = false,
 		wideLayout = false,
 		emptyHint,
-		inputPreface
+		inputPreface,
+		initialInstructions = undefined,
+		onDraftChange = undefined
 	}: {
 		messages: DisplayMessage[]
 		pastChats: { id: string; title: string }[]
@@ -132,6 +145,9 @@
 		wideLayout?: boolean
 		emptyHint?: Snippet
 		inputPreface?: Snippet
+		// Seed / observe the main composer's draft text (see AIChatInput).
+		initialInstructions?: string
+		onDraftChange?: (text: string) => void
 	} = $props()
 
 	let aiChatInput: AIChatInput | undefined = $state()
@@ -242,16 +258,142 @@
 
 	const showTypingIndicator = $derived(aiChatManager.loading)
 
-	// `@` context picker is offered in modes that accept workspace/script/flow
-	// references (SCRIPT, FLOW, GLOBAL → workspace items + code blocks) or in
-	// APP mode (datatables, frontend files, etc.). Other modes (NAVIGATOR,
-	// ASK, API) don't accept @-context.
+	// The manual `@` context-picker button. Shown in SCRIPT/FLOW (workspace items +
+	// code blocks) and APP (datatables, frontend files). Hidden in GLOBAL — there
+	// `@`-context is still invoked inline by typing `@` in the input, so the button
+	// is redundant. NAVIGATOR/ASK/API don't take @-context at all.
 	const showContextPicker = $derived(
 		aiChatManager.mode === AIMode.SCRIPT ||
 			aiChatManager.mode === AIMode.FLOW ||
-			aiChatManager.mode === AIMode.GLOBAL ||
 			aiChatManager.mode === AIMode.APP
 	)
+
+	// File attachment is GLOBAL-mode only.
+	const canAttachFiles = $derived(aiChatManager.mode === AIMode.GLOBAL && !disabled)
+	// Steers the OS file picker toward text formats (soft hint; content sniff is authoritative).
+	const TEXT_FILE_ACCEPT =
+		'text/*,.txt,.csv,.tsv,.json,.jsonl,.ndjson,.md,.markdown,.log,.yaml,.yml,.toml,.ini,.cfg,.conf,.env,.xml,.html,.htm,.css,.js,.mjs,.cjs,.ts,.tsx,.jsx,.py,.rb,.rs,.go,.java,.kt,.c,.h,.cpp,.cc,.cs,.php,.sh,.bash,.zsh,.sql,.svelte,.vue,.dockerfile'
+	let fileInputEl = $state<HTMLInputElement | null>(null)
+	let folderInputEl = $state<HTMLInputElement | null>(null)
+	let dragDepth = $state(0)
+	const isDraggingFiles = $derived(dragDepth > 0)
+	// File System Access API → live re-grantable folder handles (refreshed each turn).
+	// Otherwise folders are snapshotted into the browser (via webkitdirectory / dropped-entry
+	// walk), same as files. Either way folders display identically.
+	const canUseFsAccess = hasFileSystemAccess()
+
+	function reportAddResult(added: string[], rejected: { name: string; reason: string }[]) {
+		if (rejected.length === 0) return
+		// Single rejected file (e.g. one dropped image): show the precise reason.
+		if (added.length === 0 && rejected.length === 1) {
+			sendUserToast(`Could not attach "${rejected[0].name}": ${rejected[0].reason}`, true)
+			return
+		}
+		// Otherwise (folders / multi-select): summarize to avoid a flood of toasts. The only
+		// per-file rejection left is non-text content (binary files are skipped).
+		const lead = added.length
+			? `Attached ${added.length}, skipped ${rejected.length}`
+			: `Skipped ${rejected.length} file${rejected.length === 1 ? '' : 's'}`
+		sendUserToast(`${lead} (non-text).`, added.length === 0)
+	}
+
+	async function handleAddFiles(files: FileList | FileToAttach[]) {
+		const { added, rejected } = await aiChatManager.attachedFiles.addFiles(files)
+		reportAddResult(added, rejected)
+	}
+
+	async function addDirHandle(dir: FileSystemDirectoryHandle) {
+		const { added, rejected } = await aiChatManager.attachedFiles.addFolder(dir)
+		reportAddResult(added, rejected)
+	}
+
+	function linkFiles() {
+		// Files are always snapshotted (every browser), so the universal picker is fine.
+		fileInputEl?.click()
+	}
+
+	async function linkFolder() {
+		if (!canUseFsAccess) {
+			// No File System Access API → pick a folder via the directory input; its files are
+			// snapshotted into the browser (no live handle), grouped under the folder name.
+			folderInputEl?.click()
+			return
+		}
+		let dir: FileSystemDirectoryHandle | undefined
+		try {
+			dir = await pickDirectory()
+		} catch (e) {
+			// The picker threw instead of opening — surface why (e.g. a browser/enterprise
+			// policy blocking the File System Access API) rather than appearing to do nothing.
+			sendUserToast(
+				`Couldn't open the folder picker: ${e instanceof Error ? e.message : String(e)}`,
+				true
+			)
+			return
+		}
+		if (dir) await addDirHandle(dir)
+	}
+
+	function dragHasFiles(e: DragEvent): boolean {
+		return Array.from(e.dataTransfer?.types ?? []).includes('Files')
+	}
+
+	function onPanelDragEnter(e: DragEvent) {
+		if (!canAttachFiles || !dragHasFiles(e)) return
+		e.preventDefault()
+		dragDepth++
+	}
+	function onPanelDragOver(e: DragEvent) {
+		if (!canAttachFiles || !dragHasFiles(e)) return
+		e.preventDefault()
+		if (e.dataTransfer) e.dataTransfer.dropEffect = 'copy'
+	}
+	function onPanelDragLeave(_e: DragEvent) {
+		if (!canAttachFiles) return
+		dragDepth = Math.max(0, dragDepth - 1)
+	}
+	async function onPanelDrop(e: DragEvent) {
+		dragDepth = 0
+		if (!canAttachFiles || !dragHasFiles(e)) return
+		e.preventDefault()
+		const dt = e.dataTransfer
+		if (!dt) return
+		if (canUseFsAccess) {
+			// getAsFileSystemHandle calls are kicked off synchronously inside this call.
+			const handles = await handlesFromDataTransfer(dt)
+			for (const h of handles) {
+				if (h.kind === 'directory') {
+					// Folders link as a live handle.
+					await addDirHandle(h as FileSystemDirectoryHandle)
+				} else {
+					// Files are always snapshotted (handle discarded).
+					await handleAddFiles([{ file: await (h as FileSystemFileHandle).getFile() }])
+				}
+			}
+		} else {
+			// Fallback (no File System Access API): snapshot dropped files AND folders by walking
+			// the legacy webkitGetAsEntry tree. readDroppedEntries reads the entries synchronously
+			// (they're only valid during this event) before its first await; if it yields nothing
+			// (no entry API), fall back to the flat dt.files.
+			const entries = await readDroppedEntries(Array.from(dt.items ?? []))
+			if (entries.length > 0) await handleAddFiles(entries)
+			else if (dt.files.length > 0) await handleAddFiles(dt.files)
+		}
+	}
+
+	function onFileInputChange(e: Event) {
+		const input = e.currentTarget as HTMLInputElement
+		if (input.files && input.files.length > 0) void handleAddFiles(input.files)
+		input.value = '' // allow re-selecting the same file
+	}
+
+	function onFolderInputChange(e: Event) {
+		const input = e.currentTarget as HTMLInputElement
+		// webkitdirectory files carry webkitRelativePath (`folder/sub/file`); addFiles groups
+		// them under the folder and skips junk paths. Snapshot, like a dropped folder.
+		if (input.files && input.files.length > 0) void handleAddFiles(input.files)
+		input.value = ''
+	}
 	const availableAutonomyModeOptions = $derived.by(() =>
 		autonomyModeOptions.filter((option) =>
 			isAutonomyModeAvailable(
@@ -339,7 +481,28 @@
 
 <!-- tabindex="-1": clicks on non-focusable chat content must move focus into
 the panel, or the Escape-to-stop focus check would wrongly reject them. -->
-<div class="flex flex-col h-full outline-none" tabindex="-1" bind:this={panelEl}>
+<div
+	class="flex flex-col h-full relative outline-none"
+	tabindex="-1"
+	bind:this={panelEl}
+	ondragenter={onPanelDragEnter}
+	ondragover={onPanelDragOver}
+	ondragleave={onPanelDragLeave}
+	ondrop={onPanelDrop}
+	role="region"
+	aria-label="AI chat"
+>
+	{#if isDraggingFiles}
+		<div
+			class="absolute inset-0 z-50 flex items-center justify-center pointer-events-none rounded-md border-2 border-dashed border-blue-400 bg-blue-500/10"
+			transition:fade={{ duration: 100 }}
+		>
+			<div class="flex flex-col items-center gap-1 text-blue-600 dark:text-blue-300">
+				<Plus size={24} />
+				<span class="text-sm font-medium">Drop files to attach</span>
+			</div>
+		</div>
+	{/if}
 	{#if !hideHeader}
 		<div
 			class="flex flex-row items-center justify-between gap-2 p-2 border-b border-gray-200 dark:border-gray-600"
@@ -429,7 +592,11 @@ the panel, or the Escape-to-stop focus check would wrongly reject them. -->
 
 	{#if messages.length > 0}
 		<div class="flex-1 min-h-0 relative">
-			<div class="absolute inset-0 overflow-y-scroll pt-2" bind:this={scrollEl} onscroll={onScroll}>
+			<div
+				class="absolute inset-0 overflow-y-scroll pt-2 scrollbar-subtle"
+				bind:this={scrollEl}
+				onscroll={onScroll}
+			>
 				<div
 					class={wideLayout
 						? 'w-full max-w-3xl mx-auto px-7 flex flex-col pb-2'
@@ -537,6 +704,19 @@ the panel, or the Escape-to-stop focus check would wrongly reject them. -->
 		{/if}
 		<div>
 			<QueuedMessageChip />
+			{#if aiChatManager.mode === AIMode.GLOBAL && !aiChatManager.isSessionChat}
+				<!-- Standalone Jobs bar for the global side-panel chat. In /sessions the
+				     Jobs segment lives inside the session bar (SessionChangesBar). -->
+				<div class="mb-1">
+					<JobsSegment standalone />
+				</div>
+			{/if}
+			{#if aiChatManager.mode === AIMode.GLOBAL}
+				<!-- In sessions, file chips sit above the fork/draft bar (inputPreface). Selected
+				     context gets no badge row here — items already appear as highlighted @mentions
+				     in the input (deleting the mention deselects), so showContext={false} below. -->
+				<AttachedFilesBar />
+			{/if}
 			{#if inputPreface}
 				{@render inputPreface()}
 			{/if}
@@ -544,6 +724,9 @@ the panel, or the Escape-to-stop focus check would wrongly reject them. -->
 				bind:this={aiChatInput}
 				bind:selectedContext
 				{availableContext}
+				{initialInstructions}
+				{onDraftChange}
+				showContext={aiChatManager.mode !== AIMode.GLOBAL}
 				disabled={disabled || hasActiveUserQuestion}
 				isFirstMessage={messages.length === 0}
 			/>
@@ -595,11 +778,76 @@ the panel, or the Escape-to-stop focus check would wrongly reject them. -->
 											setShowing={(showing) => {
 												if (!showing) close()
 											}}
+											onSelectFile={(name) => {
+												aiChatInput?.insertFileMention(name)
+												close()
+											}}
 										/>
 									{/if}
 								{/snippet}
 							</Popover>
 						{/if}
+						{#if canAttachFiles}
+							<DropdownV2
+								items={() => [
+									{ displayName: 'Attach file', icon: FileText, action: () => linkFiles() },
+									{
+										// A real (live) link needs the File System Access API; without it the
+										// folder is only snapshotted, so call it "Add folder", not "Link folder".
+										displayName: canUseFsAccess ? 'Link folder' : 'Add folder',
+										icon: Folder,
+										tooltip: canUseFsAccess
+											? 'Linked live — the assistant reads the folder’s current files from disk and refreshes each turn.'
+											: 'Loaded as a snapshot — the folder’s files are copied into your browser (they won’t auto-update). For a live link that refreshes from disk, use a Chromium-based browser (Chrome, Edge).',
+										action: () => linkFolder()
+									}
+								]}
+								placement="bottom-start"
+								fixedHeight={false}
+							>
+								{#snippet buttonReplacement()}
+									<Tooltip small placement="top">
+										<Button
+											nonCaptureEvent
+											unifiedSize="2xs"
+											variant="default"
+											iconOnly
+											startIcon={{ icon: Plus }}
+										/>
+										{#snippet text()}
+											<div class="max-w-64 text-xs">
+												<p class="font-semibold">Attach files or link a folder</p>
+												<p class="mt-1">
+													Nothing is uploaded. Files are kept locally in your browser; a folder is
+													linked live from disk. The assistant lists, searches, and reads them on
+													demand — their contents aren't sent unless it reads them.
+												</p>
+											</div>
+										{/snippet}
+									</Tooltip>
+								{/snippet}
+							</DropdownV2>
+							<!-- Fallback file picker (used when the File System Access API is unavailable).
+							     `accept` only steers toward text; the content sniff in addFiles() is authoritative. -->
+							<input
+								bind:this={fileInputEl}
+								type="file"
+								multiple
+								accept={TEXT_FILE_ACCEPT}
+								class="hidden no-default-style"
+								onchange={onFileInputChange}
+							/>
+							<!-- Fallback folder picker (no File System Access API): webkitdirectory selects a
+							     whole folder; its files carry webkitRelativePath and are snapshotted. -->
+							<input
+								bind:this={folderInputEl}
+								type="file"
+								multiple
+								webkitdirectory
+								class="hidden no-default-style"
+								onchange={onFolderInputChange}
+							/>
+						{/if}
 						{#if showAutonomyModeSelector}
 							<DropdownV2
 								items={() =>
@@ -678,8 +926,8 @@ the panel, or the Escape-to-stop focus check would wrongly reject them. -->
 						{#if aiChatManager.mode === AIMode.APP}
 							<DatatableCreationPolicy />
 						{/if}
-						<ProviderModelSelector />
-						<AIChatSettingsMenu />
+						<ContextUsageIndicator />
+						<AIChatModelSettings />
 
 						{#if aiChatManager.mode === AIMode.APP && appContext && (appContext.inspectorElement || appContext.codeSelection)}
 							{#if appContext.inspectorElement}
@@ -727,9 +975,6 @@ the panel, or the Escape-to-stop focus check would wrongly reject them. -->
 					</div>
 				{/if}
 			</div>
-			<div class="flex px-1 mt-1">
-				<ContextUsageIndicator />
-			</div>
 		</div>
 		{#if (aiChatManager.mode === AIMode.NAVIGATOR || aiChatManager.mode === AIMode.ASK) && suggestions.length > 0 && messages.filter((m) => m.role === 'user').length === 0 && !disabled}
 			<div class="px-2 mt-4">
diff --git a/frontend/src/lib/components/copilot/chat/AIChatInput.svelte b/frontend/src/lib/components/copilot/chat/AIChatInput.svelte
index 3d9e5c550f..8f39b78a27 100644
--- a/frontend/src/lib/components/copilot/chat/AIChatInput.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIChatInput.svelte
@@ -6,6 +6,7 @@
 	import type { ContextElement } from './context'
 	import { AIMode } from './AIChatManager.svelte'
 	import { CHAT_INPUT_PADDING, getAiChatManager } from './aiChatManagerContext'
+	import { formatMention } from './mention'
 	import { twMerge } from 'tailwind-merge'
 	import { tick, untrack, type Snippet } from 'svelte'
 	import Portal from '$lib/components/Portal.svelte'
@@ -41,6 +42,10 @@
 		loading?: boolean
 		// Called when the user clicks Stop. Defaults to `aiChatManager.cancel()`.
 		onCancel?: () => void
+		// Observe the composer draft as it changes (the text is local state —
+		// `aiChatManager.instructions` only carries programmatic prompts). Used by
+		// sessions to persist the typed-but-unsent prompt with the session draft.
+		onDraftChange?: (text: string) => void
 	}
 
 	let {
@@ -60,7 +65,8 @@
 		bottomRightSnippet,
 		onKeyDown = undefined,
 		loading,
-		onCancel
+		onCancel,
+		onDraftChange = undefined
 	}: Props = $props()
 
 	// GLOBAL-mode suggestion pool. We pick one at mount-time so each new
@@ -117,6 +123,10 @@
 	let contextTextareaComponent: ContextTextarea | undefined = $state()
 	let instructionsTextareaComponent: HTMLTextAreaElement | undefined = $state()
 	let instructions = $state(untrack(() => initialInstructions))
+	$effect(() => {
+		const text = instructions
+		untrack(() => onDraftChange?.(text))
+	})
 	// Collapsed big-paste blobs referenced by tokens in `instructions`.
 	let pastes = $state<PasteAttachment[]>(untrack(() => initialPastes ?? []))
 
@@ -196,6 +206,13 @@
 		focusInput()
 	}
 
+	/** Insert a plain @filename mention for an attached file (used by the @ menu Files category). */
+	export function insertFileMention(name: string) {
+		const sep = instructions.length === 0 || instructions.endsWith(' ') ? '' : ' '
+		instructions = `${instructions}${sep}${formatMention(name)} `
+		focusInput()
+	}
+
 	function clickOutside(node: HTMLElement) {
 		function handleClick(event: MouseEvent) {
 			if (node && !node.contains(event.target as Node)) {
@@ -222,7 +239,9 @@
 		// Workspace items are fetched on-demand and not in availableContext,
 		// so skip the availableContext check for them
 		const isWorkspaceItem =
-			contextElement.type === 'workspace_script' || contextElement.type === 'workspace_flow'
+			contextElement.type === 'workspace_script' ||
+			contextElement.type === 'workspace_flow' ||
+			contextElement.type === 'workspace_app'
 		if (
 			!isWorkspaceItem &&
 			!availableContext.find(
diff --git a/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts b/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts
index 0eb9a79707..c58c3311c3 100644
--- a/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts
+++ b/frontend/src/lib/components/copilot/chat/AIChatManager.svelte.ts
@@ -1,5 +1,5 @@
 import type { ScriptLang } from '$lib/gen/types.gen'
-import { WorkspaceService } from '$lib/gen'
+import { WorkspaceService, JobService, type CompletedJob } from '$lib/gen'
 import type { FlowOptions, ScriptOptions } from './ContextManager.svelte'
 import {
 	flowTools,
@@ -19,7 +19,15 @@ import {
 	type DisplayMessage,
 	type Tool,
 	type ToolCallbacks,
-	type ToolDisplayMessage
+	type ToolDisplayMessage,
+	type UserQuestionDisplay,
+	type ChatJob,
+	type ChatJobInit,
+	type ChatJobStatus,
+	completedJobToolStatus,
+	backgroundJobCompletionNote,
+	deriveChatJobStatus,
+	trimJob
 } from './shared'
 import type {
 	ChatCompletionMessageParam,
@@ -44,6 +52,9 @@ import {
 	buildSummaryMessageContent
 } from './compactionPrompt'
 import { dfs } from '$lib/components/flows/previousResults'
+import { SvelteSet } from 'svelte/reactivity'
+import type { UserDraftItemKind } from '$lib/gen'
+import { maskKey } from '$lib/components/sessions/modifiedItemsMask'
 import { getStringError } from './utils'
 import { type PasteAttachment } from './pasteTokens'
 import { chatDraft, expanded } from './chatDraft'
@@ -55,6 +66,7 @@ import { BROWSER } from 'esm-env'
 import { workspaceStore, type DBSchemas } from '$lib/stores'
 import { askTools, prepareAskSystemMessage, prepareAskUserMessage } from './ask/core'
 import { readDocsPageTool, searchDocsTool } from './docs/core'
+import { TypewriterReveal } from './typewriterReveal'
 import { chatState, DEFAULT_SIZE, triggerablesByAi } from './sharedChatState.svelte'
 import {
 	createAppBackendRunnableContextElement,
@@ -67,24 +79,43 @@ import type { Selection } from 'monaco-editor'
 import type AIChatInput from './AIChatInput.svelte'
 import { prepareApiSystemMessage, prepareApiUserMessage } from './api/core'
 import { runChatLoop, truncateToToolPairedPrefix } from './chatLoop'
+import { sanitizeToolCallArguments } from './toolCallArguments'
 import { normalizeContextUsage } from './tokenUsage'
 import type { ReviewChangesOpts } from './monaco-adapter'
 import {
 	getCurrentModel,
 	tryGetCurrentModel,
 	getCombinedCustomPrompt,
+	getCustomPromptParts,
+	getUserCustomPrompts,
+	setUserCustomPrompts,
 	isWebSearchEnabledForProvider
 } from '$lib/aiStore'
 import type { WorkspaceMutationTarget } from './workspaceTools'
 import {
 	globalToolsFor,
+	loadWorkspaceSkills,
 	prepareGlobalSystemMessage,
 	prepareGlobalUserMessage,
+	type AiSkillListItem,
 	type GlobalToolHelpers
 } from './global/core'
+import { formatChatJobCompletion } from './datatableTools'
 import { isGlobalAiEnabled } from './global/gate'
+import {
+	pipelineTools,
+	getPipelinePromptSection,
+	type PipelineAIChatHelpers
+} from './pipeline/core'
 import { scopedKey, onUserChange, migrateLegacyLocalStorage } from '$lib/userScopedStorage'
 import { getLocalSetting, storeLocalSetting } from '$lib/utils'
+import { AttachedFilesStore } from './files/attachedFiles.svelte'
+import { appendAttachedFilesRoster } from './files/fileTools'
+
+// SSR and users who prefer reduced motion get no typewriter pacing.
+function prefersInstantReveal(): boolean {
+	return !BROWSER || (window.matchMedia?.('(prefers-reduced-motion: reduce)').matches ?? false)
+}
 
 // Compaction of the stored history: once the projected request size
 // (contextTokens — the provider's report when current, a fresh chars/4
@@ -109,6 +140,15 @@ const MAX_CONSECUTIVE_COMPACTION_FAILURES = 3
 // (panel teardown, save-and-clear) pass their own reason, so the queued-message
 // flush can tell "the user wants to move on" from "the turn was torn down".
 const USER_CANCEL_REASON = 'user_cancelled'
+// Built-in `/compact` session command — summarizes the conversation locally
+// instead of sending a turn to the model. Matched on the whole input so a
+// regular message that merely mentions "/compact" mid-sentence is unaffected.
+const COMPACT_COMMAND_NAME = 'compact'
+const COMPACT_COMMAND_RE = /^\/compact\s*$/
+// Built-in `/clear` session command — saves the conversation to history and
+// resets to a fresh chat (the "New chat" action), instead of sending a turn.
+const CLEAR_COMMAND_NAME = 'clear'
+const CLEAR_COMMAND_RE = /^\/clear\s*$/
 const AI_AUTONOMY_MODE_STORAGE_KEY = 'ai-chat-autonomy-mode'
 const LEGACY_AUTO_ACCEPT_TOOL_CONFIRMATIONS_STORAGE_KEY = 'ai-chat-yolo-mode'
 const WEB_SEARCH_ERROR_HINT =
@@ -230,12 +270,15 @@ function getSendRequestErrorMessage(err: unknown, webSearchUnavailable: boolean)
 export class AIChatManager {
 	contextManager = new ContextManager()
 	historyManager = new HistoryManager()
+	/** Files the user attached to the current GLOBAL-mode conversation. */
+	attachedFiles = new AttachedFilesStore()
 	abortController: AbortController | undefined = undefined
 	inlineAbortController: AbortController | undefined = undefined
 	// Flag to skip Responses API if it's not available (e.g., Azure region doesn't support it)
 	skipResponsesApi = false
 
 	mode = $state<AIMode>(AIMode.NAVIGATOR)
+	pipelineAiChatHelpers = $state<PipelineAIChatHelpers | undefined>(undefined)
 	readonly isOpen = $derived(chatState.size > 0)
 	savedSize = $state<number>(0)
 	instructions = $state<string>('')
@@ -245,10 +288,52 @@ export class AIChatManager {
 	// the turn finishes (clean completion or user cancel). Ephemeral — never
 	// saved to displayMessages or history.
 	queuedMessage = $state<string>('')
+	// Jobs the chat started that detached into the background (global/sessions
+	// chat only). Rendered in the jobs tray, persisted with the chat, and advanced
+	// by a single background poller. See registerJob / #pollBackgroundJobs.
+	backgroundJobs = $state<ChatJob[]>([])
+	// Completion notes for finished background jobs awaiting delivery to the model.
+	// Drained as a preamble into the next turn — either the user's next message, or,
+	// when the chat is idle, an auto-resume turn started for them (see
+	// #maybeAutoResumeFromJobs). Ephemeral like queuedMessage — not persisted.
+	pendingJobNotes = $state<string[]>([])
+	// Guards #maybeAutoResumeFromJobs against re-entering while its own turn spins up.
+	#autoResuming = false
+	#jobPollTimer: ReturnType<typeof setTimeout> | undefined = undefined
+	#jobPollDelay = 2000
+	// True while a #pollBackgroundJobs pass is executing. #stopJobPoller only clears
+	// the scheduled timer, not an in-flight poll, so without this a refreshBackgroundJobs
+	// mid-poll (cancel / approval close) would start a second concurrent poll chain and
+	// double the poll rate. The guard makes such a refresh coalesce into the running pass.
+	#isPolling = false
+	// Bumped on every conversation switch (clearBackgroundJobs). An in-flight poll
+	// captures it before its awaits and bails if it changed, so a getJob that
+	// resolves after the user switched chats can't mutate the newly-loaded one.
+	#jobPollGeneration = 0
+	// Consecutive getJob failures per background job, so a vanished/404 job can be
+	// drained instead of polled forever. Ephemeral, keyed by jobId.
+	#jobPollFailures = new Map<string, number>()
+	/** Opens a run in the sessions preview pane. Set by the session runtime;
+	 * undefined in the global side-panel chat, where the tray falls back to opening
+	 * the run in a new browser tab. */
+	openRunInPreview?: (a: { jobId: string; workspace: string; label: string }) => void
 	loading = $state<boolean>(false)
 	currentReply = $state<string>('')
 	currentReasoning = $state<string>('')
 	currentReasoningActive = $state<boolean>(false)
+	// Smooths the provider's bursty delivery into continuous typing by revealing
+	// buffered text a slice per frame. The reply and the reasoning/thinking stream
+	// each get their own reveal (independent buffers, both append to their own
+	// $state). Reduced-motion (sampled once — the pref never changes mid-session)
+	// and SSR fall back to instant.
+	private replyReveal = new TypewriterReveal({
+		onReveal: (chunk) => (this.currentReply += chunk),
+		instant: prefersInstantReveal()
+	})
+	private reasoningReveal = new TypewriterReveal({
+		onReveal: (chunk) => (this.currentReasoning += chunk),
+		instant: prefersInstantReveal()
+	})
 	displayMessages = $state<DisplayMessage[]>([])
 	messages = $state<ChatCompletionMessageParam[]>([])
 	/** Provider-reported context size of the last committed turn (prompt +
@@ -305,7 +390,7 @@ export class AIChatManager {
 	cachedDatatables = $state<AppDatatableElement[]>([])
 
 	private confirmationCallbacks = new Map<string, (value: boolean) => void>()
-	private userQuestionCallbacks = new Map<string, (choice: string | undefined) => void>()
+	private userQuestionCallbacks = new Map<string, (choices: string[] | undefined) => void>()
 	private appDatatablesRefreshTimeout: ReturnType<typeof setTimeout> | undefined = undefined
 
 	disabledModes: Partial<Record<AIMode, boolean>> = $state({})
@@ -317,6 +402,433 @@ export class AIChatManager {
 	// tool `helpers` in GLOBAL mode so the preview/deploy tools dispatch to THIS
 	// session rather than the UI-active one — keeps backgrounded sessions isolated.
 	sessionId: string | undefined = undefined
+	// Resolves the workspace this chat operates on. Session chats set it to their
+	// own (possibly forked) workspace so the chat targets it WITHOUT switching the
+	// global workspaceStore. Undefined for the global side-panel chat, which
+	// follows the active workspace. Always read via `operatingWorkspace`.
+	workspaceResolver: (() => string | undefined) | undefined = undefined
+
+	// The workspace every workspace-scoped chat action targets — skills, tool
+	// loop, logging, user-message context, and commit. Session-resolved when a
+	// resolver is set, else the globally-active workspace.
+	get operatingWorkspace(): string | undefined {
+		return this.workspaceResolver?.() ?? get(workspaceStore)
+	}
+
+	// Fired whenever the active chat id changes away from the one the consumer
+	// knows (a "/clear" rotation or a history switch). Session runtimes wire this
+	// to keep the session record's chatId aligned — the compare-page handoff
+	// (`from_session`) reads it, and a stale id would preselect the previous
+	// chat's items. Set here (not imported) to avoid a copilot→sessions cycle.
+	onChatRotated: ((chatId: string) => void) | undefined = undefined
+
+	// Workspace items the CURRENT chat modified via AI tool calls, as
+	// `${UserDraftItemKind}:${storagePath}` keys (see modifiedItemsMask.ts).
+	// undefined = untracked: only the global side-panel chat (never initialised),
+	// which falls back to the show-all bar. Session chats are always tracked (a
+	// SvelteSet, even empty) — see loadPastChat/initRuntime — so their Edits
+	// surface never claims drafts the session didn't touch. Reactive so the
+	// session bar updates as tools record mid-turn.
+	modifiedItems = $state<SvelteSet<string> | undefined>(undefined)
+
+	// Start tracking for a brand-new session chat (empty = "tracked, nothing yet").
+	initModifiedItemsTracking() {
+		this.modifiedItems = new SvelteSet()
+	}
+
+	// Record an item an AI tool call created/edited/deleted. No-op when untracked
+	// (the global singleton never initialises the set), so it stays unaffected.
+	recordModifiedItem(itemKind: UserDraftItemKind, storagePath: string) {
+		this.modifiedItems?.add(maskKey(itemKind, storagePath))
+	}
+
+	// Un-record an item whose chat-made change was discarded — without this the
+	// still-existing deployed item would keep reading as this chat's "Deployed"
+	// edit. Persisted immediately: unlike recordModifiedItem (whose persistence
+	// rides on the turn's saveChat), a discard can fire from the review dock
+	// outside any turn, and waiting would resurrect the entry on reload.
+	async removeModifiedItem(itemKind: UserDraftItemKind, storagePath: string) {
+		if (!this.modifiedItems?.delete(maskKey(itemKind, storagePath))) return
+		await this.#persistModifiedItems()
+	}
+
+	// Move a mask entry to the path a draft actually deployed to. A draft-only
+	// flow/app parks at a synthetic `draft_{uuid}` storage path and deploys to
+	// its chosen path — without the move, the existence check at the synthetic
+	// path fails after reload and the deployed row vanishes from the dock.
+	async renameModifiedItem(itemKind: UserDraftItemKind, fromPath: string, toPath: string) {
+		if (fromPath === toPath) return
+		if (!this.modifiedItems?.delete(maskKey(itemKind, fromPath))) return
+		this.modifiedItems.add(maskKey(itemKind, toPath))
+		await this.#persistModifiedItems()
+	}
+
+	// Serialized, snapshot-at-write-time persistence: two rapid dock actions
+	// would otherwise race their saveChat writes, and the earlier (staler)
+	// snapshot could land last — dropping the later mutation until the next
+	// turn-end save.
+	#maskPersistQueue: Promise<void> = Promise.resolve()
+	#persistModifiedItems(): Promise<void> {
+		this.#maskPersistQueue = this.#maskPersistQueue.then(() =>
+			this.historyManager
+				.saveChat(
+					this.displayMessages,
+					this.messages,
+					this.contextUsage,
+					this.modifiedItems ? [...this.modifiedItems] : undefined
+				)
+				// Swallow (and log) a failed write so it can't wedge the queue as a
+				// rejected link — the next persist snapshots the full current set, so
+				// a lost write self-heals on the next mutation or turn-end save.
+				.catch((e) => console.error('Failed to persist modified-items mask', e))
+		)
+		return this.#maskPersistQueue
+	}
+
+	// ===== Background jobs (global/sessions chat only) =====
+	//
+	// A test-run tool that doesn't finish within the inline wait detaches: it
+	// returns a "still running" handle to the model and registers the job here.
+	// A single poller advances all detached jobs; on completion it fills the tool
+	// card and queues a notify-only note for the model's next turn.
+
+	private isJobNonTerminal(status: ChatJobStatus): boolean {
+		// suspended (awaiting approval) and scheduled are non-terminal — the poller
+		// MUST keep watching them, else an approval would never clear from the tray.
+		return (
+			status === 'queued' ||
+			status === 'running' ||
+			status === 'suspended' ||
+			status === 'scheduled'
+		)
+	}
+
+	/** Record a job the moment it starts, so the tray shows it while it is still
+	 * inline-waiting. Idempotent on jobId. The init carries the serializable
+	 * `resultFormat` (persisted), so completion formatting survives a reload. */
+	registerJob = (init: ChatJobInit) => {
+		if (this.backgroundJobs.some((j) => j.jobId === init.jobId)) return
+		this.backgroundJobs = [
+			...this.backgroundJobs,
+			{ ...init, createdAt: Date.now(), status: 'queued', detached: false, reported: false }
+		]
+	}
+
+	/** Merge a partial update into a tracked job by id. */
+	updateJob = (jobId: string, update: Partial<ChatJob>) => {
+		const idx = this.backgroundJobs.findIndex((j) => j.jobId === jobId)
+		if (idx === -1) return
+		this.backgroundJobs[idx] = { ...this.backgroundJobs[idx], ...update }
+		this.backgroundJobs = [...this.backgroundJobs]
+	}
+
+	/** A job left the inline wait — hand it to the background poller. */
+	markJobDetached = (jobId: string) => {
+		this.updateJob(jobId, { detached: true })
+		this.#ensureJobPoller()
+		void this.#persistBackgroundJobs()
+	}
+
+	/** User-facing cancel from the jobs tray. */
+	cancelJob = async (jobId: string) => {
+		const job = this.backgroundJobs.find((j) => j.jobId === jobId)
+		if (!job) return
+		try {
+			await JobService.cancelQueuedJob({ workspace: job.workspace, id: jobId, requestBody: {} })
+			// Don't mark terminal here: a bare `status: 'canceled'` would (a) leave the
+			// `job` snapshot that drives JobStatusIcon stale (badge stuck on running)
+			// and (b) make isJobNonTerminal false so the poller stops before it can
+			// refresh either. Let the poller observe the canceled CompletedJob and set
+			// status + job together; poke it so the tray converges within a tick.
+			this.refreshBackgroundJobs()
+		} catch (e) {
+			console.error('Failed to cancel job', jobId, e)
+			sendUserToast('Failed to cancel job', true)
+		}
+	}
+
+	/** Remove a finished job from the tray. */
+	dismissJob = (jobId: string) => {
+		this.backgroundJobs = this.backgroundJobs.filter((j) => j.jobId !== jobId)
+		void this.#persistBackgroundJobs()
+	}
+
+	/** Force an immediate background-job poll (e.g. right after an approval) instead
+	 * of waiting for the next scheduled tick. */
+	refreshBackgroundJobs = () => {
+		this.#stopJobPoller()
+		this.#jobPollDelay = 2000
+		void this.#pollBackgroundJobs()
+	}
+
+	#ensureJobPoller() {
+		if (this.#jobPollTimer !== undefined) return
+		// A poll pass is running (it cleared #jobPollTimer on entry). It reschedules
+		// from the current job set when it finishes, so the job that just detached is
+		// already covered. Scheduling here instead would create a second timer that the
+		// end-of-pass reschedule overwrites WITHOUT clearing — orphaning it into a
+		// duplicate, self-perpetuating poll chain. Coalesce into the active pass.
+		if (this.#isPolling) return
+		if (!this.backgroundJobs.some((j) => j.detached && this.isJobNonTerminal(j.status))) return
+		this.#jobPollDelay = 2000
+		this.#scheduleJobPoll()
+	}
+
+	#scheduleJobPoll() {
+		this.#jobPollTimer = setTimeout(() => void this.#pollBackgroundJobs(), this.#jobPollDelay)
+	}
+
+	#stopJobPoller() {
+		if (this.#jobPollTimer !== undefined) {
+			clearTimeout(this.#jobPollTimer)
+			this.#jobPollTimer = undefined
+		}
+	}
+
+	// Guarded entry point for every poll trigger (scheduled tick, #ensureJobPoller,
+	// and refreshBackgroundJobs): if a pass is already running, coalesce into it
+	// instead of starting a second concurrent chain that would double the poll rate.
+	async #pollBackgroundJobs() {
+		if (this.#isPolling) return
+		this.#isPolling = true
+		try {
+			await this.#runBackgroundJobsPoll()
+		} finally {
+			this.#isPolling = false
+		}
+	}
+
+	async #runBackgroundJobsPoll() {
+		this.#jobPollTimer = undefined
+		const gen = this.#jobPollGeneration
+		const pending = this.backgroundJobs.filter((j) => j.detached && this.isJobNonTerminal(j.status))
+		if (pending.length === 0) return
+
+		let anyTerminal = false
+		for (const job of pending) {
+			try {
+				const fetched = await JobService.getJob({
+					workspace: job.workspace,
+					id: job.jobId,
+					noLogs: false,
+					noCode: true
+				})
+				// The user switched conversations while this getJob was in flight; its
+				// result belongs to a chat that's gone. Drop it rather than mutate the
+				// newly-loaded one (which re-armed its own poller on load).
+				if (gen !== this.#jobPollGeneration) return
+				this.#jobPollFailures.delete(job.jobId)
+				if (fetched.type === 'CompletedJob') {
+					anyTerminal = true
+					this.#onBackgroundJobComplete(job, fetched as CompletedJob)
+				} else {
+					// Store the derived status and the trimmed Job together so the tray
+					// badge (JobStatusIcon) and the scalar status can never drift.
+					this.updateJob(job.jobId, {
+						status: deriveChatJobStatus(fetched),
+						job: trimJob(fetched)
+					})
+				}
+			} catch (e) {
+				// Same generation guard as the success path — a switch during the failing
+				// getJob means this result is for a conversation that's gone.
+				if (gen !== this.#jobPollGeneration) return
+				// A vanished job (404) or repeated failures must not keep the poller
+				// alive forever — now that suspended/scheduled are polled too, drain it
+				// as failed so isJobNonTerminal lets the poller stop.
+				const httpStatus = (e as { status?: number })?.status
+				const failures = (this.#jobPollFailures.get(job.jobId) ?? 0) + 1
+				this.#jobPollFailures.set(job.jobId, failures)
+				if (httpStatus === 404 || failures >= 5) {
+					this.#jobPollFailures.delete(job.jobId)
+					// Vanished (404) or unreachable after repeated polls. Mark it failed WITH
+					// a snapshot + tool-card patch (mirroring #onBackgroundJobComplete) so
+					// neither the tray badge nor the launching tool card stays frozen on
+					// "running" — a bare `status: 'failure'` with no `job` would render the
+					// orange queued badge (JobsSegment's `!job.job` fallback). The synthetic
+					// failed CompletedJob keeps the `success`-key discriminant so JobStatusIcon
+					// and deriveChatJobStatus agree. No model note/auto-resume: a vanished job
+					// isn't a meaningful completion to react to (usually transient infra).
+					const gone = {
+						type: 'CompletedJob',
+						id: job.jobId,
+						success: false,
+						canceled: false
+					} as unknown as CompletedJob
+					this.updateJob(job.jobId, { status: 'failure', reported: true, job: trimJob(gone) })
+					this.applyToolStatus(job.toolCallId, {
+						content: 'Background job could not be retrieved (it may have been removed)',
+						error: `Job ${job.jobId} was unreachable`
+					})
+					anyTerminal = true
+				} else {
+					console.error('Failed to poll background job', job.jobId, e)
+				}
+			}
+		}
+
+		if (anyTerminal) {
+			void this.#persistBackgroundJobs()
+		}
+
+		// Reschedule while anything is still in flight, backing off up to 5s.
+		if (this.backgroundJobs.some((j) => j.detached && this.isJobNonTerminal(j.status))) {
+			this.#jobPollDelay = Math.min(this.#jobPollDelay + 1000, 5000)
+			this.#scheduleJobPoll()
+		}
+
+		// Something finished this cycle — if the chat is idle, react to it now
+		// instead of waiting for the user's next message. Fire-and-forget so the
+		// poller loop above isn't blocked by the turn.
+		if (anyTerminal) void this.#maybeAutoResumeFromJobs()
+	}
+
+	#onBackgroundJobComplete(job: ChatJob, completed: CompletedJob) {
+		const status = deriveChatJobStatus(completed)
+		this.updateJob(job.jobId, {
+			status,
+			durationMs: completed.duration_ms,
+			reported: true,
+			job: trimJob(completed)
+		})
+		// If the launching tool stamped a resultFormat, reconstruct its shaped card +
+		// model text so the detached path reports the same contract the inline path
+		// would (row-capped rows, friendly datatable errors) — even after a reload,
+		// since resultFormat is persisted on the job. A canceled job skips formatting:
+		// its card is the neutral "canceled" state, not a result.
+		const formatted =
+			status === 'canceled' || !job.resultFormat
+				? undefined
+				: formatChatJobCompletion(completed, job.resultFormat)
+		// Fill the tool card that launched it (we run outside a turn here).
+		this.applyToolStatus(job.toolCallId, formatted?.card ?? completedJobToolStatus(completed))
+		// A user-canceled job needs no model note or auto-resume: the user stopped it
+		// deliberately, so announcing it (as "FAILED", since a canceled job isn't a
+		// success) or burning a turn on it would be noise.
+		if (status === 'canceled') return
+		// Queue a completion note for the model. Delivered on the next turn —
+		// either the user's next message or an idle auto-resume (fired by the poller).
+		this.pendingJobNotes = [
+			...this.pendingJobNotes,
+			backgroundJobCompletionNote(job.jobId, job.label, completed, formatted?.llmText)
+		]
+	}
+
+	/**
+	 * Stage 2 wake: when a background job finishes and the chat is otherwise idle,
+	 * start a turn on the user's behalf so the model reacts to the result (reports
+	 * it, continues the plan) instead of waiting for the next manual message. The
+	 * rich completion note reaches the model via the pendingJobNotes preamble in
+	 * sendRequest; the visible bubble is just a short, clearly-automated line.
+	 *
+	 * Bounded so it can't run away: fires only when idle (no in-flight turn) and
+	 * only when notes exist — and sendRequest drains the notes, so a turn that
+	 * doesn't spawn a new job leaves nothing to re-trigger on. A turn that DOES
+	 * spawn another job resumes again when that one finishes, which is the point.
+	 */
+	async #maybeAutoResumeFromJobs() {
+		if (this.#autoResuming) return
+		// Global/sessions chat only (the only mode with a jobs tray + preamble).
+		if (this.mode !== AIMode.GLOBAL) return
+		// Mid-turn: the notes will ride that turn's preamble, so don't start another.
+		if (this.loading) return
+		if (this.pendingJobNotes.length === 0) return
+		// Nothing to continue (empty chat), or the user is mid-compose — don't
+		// clobber their draft or auto-send it. Their eventual send carries the notes.
+		if (this.messages.length === 0 || this.instructions.trim()) return
+		this.#autoResuming = true
+		try {
+			const count = this.pendingJobNotes.length
+			this.instructions =
+				count === 1 ? 'A background job just finished.' : `${count} background jobs just finished.`
+			await this.sendRequest()
+		} catch (e) {
+			console.error('Auto-resume after background job failed', e)
+		} finally {
+			this.#autoResuming = false
+		}
+	}
+
+	// Serialized snapshot-at-write persistence, mirroring #persistModifiedItems.
+	// Omits the modified-items mask so a concurrent mask write isn't clobbered
+	// (saveChat keeps the prior mask when it is undefined).
+	#jobPersistQueue: Promise<void> = Promise.resolve()
+	#persistBackgroundJobs(): Promise<void> {
+		this.#jobPersistQueue = this.#jobPersistQueue.then(() =>
+			this.historyManager
+				.saveChat(
+					this.displayMessages,
+					this.messages,
+					this.contextUsage,
+					undefined,
+					$state.snapshot(this.backgroundJobs)
+				)
+				.catch((e) => console.error('Failed to persist background jobs', e))
+		)
+		return this.#jobPersistQueue
+	}
+
+	/** Reset background-job state on conversation switch. */
+	private clearBackgroundJobs() {
+		this.#stopJobPoller()
+		// Invalidate any in-flight poll so its post-await continuation can't write
+		// into the conversation we're switching to.
+		this.#jobPollGeneration++
+		this.backgroundJobs = []
+		this.pendingJobNotes = []
+	}
+
+	/** Merge a status patch into the tool card identified by tool_call_id, or
+	 * create it. Shared by the per-turn setToolStatus callback and the background
+	 * job poller (which runs outside a turn). */
+	applyToolStatus = (id: string, metadata?: Partial<ToolDisplayMessage>) => {
+		const existingIdx = this.displayMessages.findIndex(
+			(m) => m.role === 'tool' && m.tool_call_id === id
+		)
+		if (existingIdx !== -1) {
+			const existing = this.displayMessages[existingIdx] as ToolDisplayMessage
+			if (existing.content.length === 0 && metadata?.error) {
+				this.displayMessages[existingIdx].content = metadata.error
+			}
+			this.displayMessages[existingIdx] = {
+				...existing,
+				...(metadata || {})
+			} as ToolDisplayMessage
+		} else {
+			const newMessage: ToolDisplayMessage = {
+				role: 'tool',
+				tool_call_id: id,
+				content: metadata?.content ?? metadata?.error ?? '',
+				...(metadata || {})
+			}
+			this.displayMessages.push(newMessage)
+		}
+	}
+
+	// Workspace AI skills (name + description) advertised in the GLOBAL system
+	// prompt and surfaced as slash commands in session chat. Loaded
+	// asynchronously when entering GLOBAL mode; the system message is rebuilt
+	// once they resolve.
+	globalSkills = $state<AiSkillListItem[]>([])
+	private globalSkillsRefreshId = 0
+
+	// Built-in session-chat slash commands, listed in the command picker
+	// alongside workspace skills. Unlike a skill, these run locally and never
+	// reach the model; the submit path intercepts them first, so they shadow any
+	// workspace skill of the same name.
+	readonly sessionBuiltinCommands: AiSkillListItem[] = [
+		{ name: COMPACT_COMMAND_NAME, description: 'Summarize the conversation to free up context' },
+		{ name: CLEAR_COMMAND_NAME, description: 'Clear the conversation and start a new chat' }
+	]
+
+	// Built-ins followed by workspace skills, with any skill whose name collides
+	// with a built-in dropped: the picker keys leaves by name, so a duplicate
+	// would break its keyed list and ambiguous-resolve nav. Built-ins win — they
+	// already shadow same-named skills at execution (the submit interception).
+	sessionCommands: AiSkillListItem[] = $derived([
+		...this.sessionBuiltinCommands,
+		...this.globalSkills.filter((s) => !this.sessionBuiltinCommands.some((b) => b.name === s.name))
+	])
 
 	allowedModes: Record<AIMode, boolean> = $derived({
 		script:
@@ -419,6 +931,67 @@ export class AIChatManager {
 		return freed
 	}
 
+	/**
+	 * Core summarize + rewrite, shared by automatic and manual compaction. Sends
+	 * the prefix to the summarizer, then replaces the summarized prefix with a
+	 * single summary message in `messages` (as a user message) and
+	 * `displayMessages` (as a `summary` boundary). Surviving tail user messages
+	 * have their restart `index` re-based onto the new history: the summary
+	 * occupies slot 0, so a tail user message that was at `keepFrom` lands at slot
+	 * 1. `displayKeepFrom` is where the kept tail begins in `displayMessages`.
+	 *
+	 * Owns only the `compacting` flag and the history rewrite; callers own trigger
+	 * policy (circuit breaker, gates) and persistence. Returns the outcome —
+	 * 'aborted' is a user Stop (history left untouched), distinct from 'error'.
+	 */
+	private runSummarization = async (
+		prefix: ChatCompletionMessageParam[],
+		tail: ChatCompletionMessageParam[],
+		keepFrom: number,
+		displayKeepFrom: number,
+		abortController: AbortController
+	): Promise<'ok' | 'empty' | 'aborted' | 'error'> => {
+		this.compacting = true
+		try {
+			const raw = await getNonStreamingCompletion(
+				[
+					...sanitizeToolCallArguments(prefix),
+					{ role: 'user', content: getCompactionSummaryPrompt() }
+				],
+				abortController
+			)
+			const formatted = formatCompactSummary(raw ?? '')
+			if (!formatted) {
+				return 'empty'
+			}
+
+			this.messages = [{ role: 'user', content: buildSummaryMessageContent(formatted) }, ...tail]
+
+			// Replace the summarized display prefix with the boundary marker and
+			// re-base the surviving tail's restart indices (the summary occupies
+			// slot 0, so the tail now starts at slot 1).
+			this.displayMessages = [
+				{ role: 'summary', content: formatted },
+				...this.displayMessages
+					.slice(displayKeepFrom)
+					.map((m) => (m.role === 'user' ? { ...m, index: m.index - keepFrom + 1 } : m))
+			]
+
+			// The provider report described the pre-compaction history; the new
+			// history is much smaller, so clear it and let readers re-estimate.
+			this.contextUsage = undefined
+			return 'ok'
+		} catch (err) {
+			if (abortController.signal.aborted) {
+				return 'aborted'
+			}
+			console.error('Conversation summarization failed', err)
+			return 'error'
+		} finally {
+			this.compacting = false
+		}
+	}
+
 	/**
 	 * Summary-based partial compaction. Summarizes the older PREFIX of the stored
 	 * history into a single user message and keeps the recent tail verbatim,
@@ -493,45 +1066,92 @@ export class AIChatManager {
 			return false
 		}
 
-		this.compacting = true
-		try {
-			const raw = await getNonStreamingCompletion(
-				[...prefix, { role: 'user', content: getCompactionSummaryPrompt() }],
-				abortController
-			)
-			const formatted = formatCompactSummary(raw ?? '')
-			if (!formatted) {
-				this.consecutiveCompactionFailures++
-				return false
-			}
-
-			this.messages = [{ role: 'user', content: buildSummaryMessageContent(formatted) }, ...tail]
-
-			// Replace the summarized display prefix with the boundary marker and
-			// re-base the surviving tail's restart indices (the summary occupies
-			// slot 0, so the tail now starts at slot 1).
-			this.displayMessages = [
-				{ role: 'summary', content: formatted },
-				...this.displayMessages
-					.slice(displayKeepFrom)
-					.map((m) => (m.role === 'user' ? { ...m, index: m.index - keepFrom + 1 } : m))
-			]
-
-			// The provider report described the pre-compaction history; the new
-			// history is much smaller, so clear it and let readers re-estimate.
-			this.contextUsage = undefined
+		const result = await this.runSummarization(
+			prefix,
+			tail,
+			keepFrom,
+			displayKeepFrom,
+			abortController
+		)
+		if (result === 'ok') {
 			this.consecutiveCompactionFailures = 0
 			return true
-		} catch (err) {
-			// A user Stop aborts the in-flight summary — that's a turn cancel, not a
-			// compaction failure, so it doesn't count toward the circuit breaker.
-			if (!abortController.signal.aborted) {
-				console.error('Conversation summarization failed', err)
-				this.consecutiveCompactionFailures++
+		}
+		// 'aborted' is a user Stop during the in-flight summary — a turn cancel, not
+		// a compaction failure, so it doesn't count toward the circuit breaker.
+		if (result === 'empty' || result === 'error') {
+			this.consecutiveCompactionFailures++
+		}
+		return false
+	}
+
+	/**
+	 * Manual compaction (the `/compact` session command): summarize the ENTIRE
+	 * stored history into a single summary message and keep nothing verbatim, so
+	 * the next message continues from the summary alone. Unlike the automatic
+	 * trigger it ignores the context-window budget, the circuit breaker, and the
+	 * prefix-size gate — the user asked for it explicitly — and runs on its own
+	 * abort controller so the Stop button (`cancel`) can interrupt the in-flight
+	 * summary, leaving history untouched.
+	 */
+	compactManually = async (): Promise<void> => {
+		if (this.loading) {
+			return
+		}
+		// A summary round-trip only pays off once there's a prior exchange to fold
+		// in; a single message (or none) has nothing to compact.
+		if (this.messages.length < 2) {
+			sendUserToast('Nothing to compact yet.')
+			return
+		}
+
+		const abortController = new AbortController()
+		this.abortController = abortController
+		this.loading = true
+		let result: 'ok' | 'empty' | 'aborted' | 'error' = 'error'
+		try {
+			// Everything is the prefix, nothing is kept verbatim: keepFrom and
+			// displayKeepFrom point past the end so the kept tail is empty.
+			result = await this.runSummarization(
+				[...this.messages],
+				[],
+				this.messages.length,
+				this.displayMessages.length,
+				abortController
+			)
+			switch (result) {
+				case 'ok':
+					await this.historyManager.saveChat(
+						this.displayMessages,
+						this.messages,
+						this.contextUsage,
+						this.modifiedItems ? [...this.modifiedItems] : undefined
+					)
+					sendUserToast('Conversation compacted.')
+					break
+				case 'empty':
+					sendUserToast('Compaction produced an empty summary — conversation left unchanged.', true)
+					break
+				case 'error':
+					sendUserToast('Failed to compact the conversation.', true)
+					break
+				// 'aborted' (user Stop): history untouched, no toast.
 			}
-			return false
 		} finally {
-			this.compacting = false
+			this.loading = false
+		}
+
+		// Flush a message typed while compaction ran. Mirrors the send-turn
+		// epilogue (loading gated its capture): auto-send after a successful
+		// compaction or a deliberate user cancel — the user is ready to move on —
+		// while a failed/empty compaction or a programmatic cancel leaves it queued.
+		if ((result === 'ok' || this.wasCancelledByUser()) && this.queuedMessage) {
+			const next = this.queuedMessage
+			this.queuedMessage = ''
+			const accepted = await this.sendRequest({ instructions: next })
+			if (accepted === false) {
+				this.queuedMessage = next
+			}
 		}
 	}
 
@@ -621,35 +1241,40 @@ export class AIChatManager {
 
 	requestUserQuestion = (
 		toolId: string,
-		_question: { question: string; choices: string[] }
-	): Promise<string | undefined> => {
+		_question: UserQuestionDisplay
+	): Promise<string[] | undefined> => {
 		return new Promise((resolve) => {
 			this.userQuestionCallbacks.set(toolId, resolve)
 		})
 	}
 
-	handleUserQuestionAnswer = (toolId: string, choice: string) => {
+	handleUserQuestionAnswer = (toolId: string, choices: string[]) => {
 		const callback = this.userQuestionCallbacks.get(toolId)
 		if (!callback) {
 			return
 		}
 
+		// Display-only readback for the collapsed tool-header: a compact comma list.
+		// The model-facing return (bare string / newline-bulleted) is built by the
+		// tool fn from the resolved choices below.
+		const answerSummary = choices.join(', ')
+
 		this.displayMessages = this.displayMessages.map((message) => {
 			if (message.role === 'tool' && message.tool_call_id === toolId && message.userQuestion) {
 				return {
 					...message,
-					content: `User answered question: ${choice}`,
+					content: `User answered question: ${answerSummary}`,
 					isLoading: false,
 					userQuestion: {
 						...message.userQuestion,
-						selectedChoice: choice
+						selectedChoices: choices
 					}
 				}
 			}
 			return message
 		})
 
-		callback(choice)
+		callback(choices)
 		this.userQuestionCallbacks.delete(toolId)
 	}
 
@@ -760,7 +1385,7 @@ export class AIChatManager {
 			this.helpers = {
 				getScriptOptions: () => {
 					return {
-						code: this.scriptEditorOptions?.code ?? '',
+						code: this.scriptEditorOptions?.getCode() ?? '',
 						lang: lang,
 						path: this.scriptEditorOptions?.path ?? '',
 						args: this.scriptEditorOptions?.args ?? {}
@@ -808,15 +1433,8 @@ export class AIChatManager {
 			this.tools = [searchDocsTool, readDocsPageTool, ...this.apiTools]
 			this.helpers = {}
 		} else if (mode === AIMode.GLOBAL) {
-			const customPrompt = getCombinedCustomPrompt(mode)
-			this.systemMessage = prepareGlobalSystemMessage(customPrompt, {
-				previewTools: this.isSessionChat
-			})
-			this.tools = globalToolsFor({ sessionPreview: this.isSessionChat })
-			this.helpers = {
-				...(this.isSessionChat ? { sessionId: this.sessionId } : {}),
-				testActiveFlow: async (args?: Record<string, any>) => this.flowAiChatHelpers?.testFlow(args)
-			} satisfies GlobalToolHelpers
+			this.configureGlobalMode()
+			void this.refreshGlobalSkills()
 		} else if (mode === AIMode.APP) {
 			const customPrompt = getCombinedCustomPrompt(mode)
 			this.systemMessage = prepareAppSystemMessage(customPrompt)
@@ -825,6 +1443,100 @@ export class AIChatManager {
 		}
 	}
 
+	// Fetch the workspace's AI skills and, if GLOBAL mode is still active, rebuild
+	// the system message so the next chat-loop iteration advertises them. Ignore
+	// stale resolves so workspace changes cannot overwrite newer skills.
+	// Build the global-mode system message, tools, and helpers, layering on the
+	// pipeline surface when a /pipeline editor has registered helpers. Centralized
+	// so changeMode, refreshGlobalSkills, and setPipelineHelpers stay consistent —
+	// each rebuild would otherwise drop the pipeline augmentation the others added.
+	private configureGlobalMode = () => {
+		const systemMessage = prepareGlobalSystemMessage(getCustomPromptParts(AIMode.GLOBAL), {
+			previewTools: this.isSessionChat,
+			skills: this.globalSkills
+		})
+		const baseHelpers: GlobalToolHelpers = {
+			// A session targets its own fixed (possibly forked) workspace, so capture it for
+			// permission gating. The global side-panel chat follows the live navigation
+			// workspace instead, so leave it unset there — allowedOpenPages reads the store.
+			...(this.isSessionChat
+				? { sessionId: this.sessionId, operatingWorkspace: this.operatingWorkspace }
+				: {}),
+			testActiveFlow: async (args?: Record<string, any>) => this.flowAiChatHelpers?.testFlow(args),
+			attachedFiles: this.attachedFiles,
+			getUserInstructions: () => getUserCustomPrompts()[AIMode.GLOBAL] ?? '',
+			setUserInstructions: (instructions: string) => {
+				const prompts = getUserCustomPrompts()
+				if (instructions.trim()) {
+					prompts[AIMode.GLOBAL] = instructions
+				} else {
+					delete prompts[AIMode.GLOBAL]
+				}
+				setUserCustomPrompts(prompts)
+				this.rebuildGlobalSystemMessage()
+			}
+		}
+		const pipeline = this.pipelineAiChatHelpers
+		if (pipeline) {
+			systemMessage.content += getPipelinePromptSection(pipeline.getPipelineContext())
+			this.tools = [...globalToolsFor({ sessionPreview: this.isSessionChat }), ...pipelineTools]
+			this.helpers = { ...baseHelpers, pipeline }
+		} else {
+			this.tools = globalToolsFor({ sessionPreview: this.isSessionChat })
+			this.helpers = baseHelpers
+		}
+		this.systemMessage = systemMessage
+	}
+
+	refreshGlobalSkills = async (workspace = this.operatingWorkspace ?? '') => {
+		const refreshId = ++this.globalSkillsRefreshId
+		const skills = await loadWorkspaceSkills(workspace)
+		if (refreshId !== this.globalSkillsRefreshId) {
+			return
+		}
+		this.globalSkills = skills
+		if (this.mode === AIMode.GLOBAL) {
+			this.configureGlobalMode()
+		}
+	}
+
+	// Rebuild the GLOBAL system message in place so an updated user instruction (persisted by
+	// the update_user_instructions tool) is picked up on the next chat-loop iteration, which
+	// re-reads this.systemMessage via a getter.
+	rebuildGlobalSystemMessage = () => {
+		if (this.mode !== AIMode.GLOBAL) {
+			return
+		}
+		const systemMessage = prepareGlobalSystemMessage(getCustomPromptParts(AIMode.GLOBAL), {
+			previewTools: this.isSessionChat,
+			skills: this.globalSkills
+		})
+		// Preserve the active pipeline-editor augmentation that configureGlobalMode
+		// adds — otherwise update_user_instructions (which calls this) would drop the
+		// /pipeline/<folder> context + direct-draft/materialize guidance mid-session.
+		const pipeline = this.pipelineAiChatHelpers
+		if (pipeline) {
+			systemMessage.content += getPipelinePromptSection(pipeline.getPipelineContext())
+		}
+		this.systemMessage = systemMessage
+	}
+
+	private expandGlobalSkillCommand = (instructions: string): string => {
+		if (!this.isSessionChat || this.mode !== AIMode.GLOBAL || !instructions.startsWith('/')) {
+			return instructions
+		}
+		const match = /^\/([a-z0-9-]+)(?:\s+([\s\S]*))?$/.exec(instructions)
+		if (!match) {
+			return instructions
+		}
+		const skill = this.globalSkills.find((s) => s.name === match[1])
+		if (!skill) {
+			return instructions
+		}
+		const rest = match[2]?.trim()
+		return rest ? `Use the "${skill.name}" skill. ${rest}` : `Use the "${skill.name}" skill.`
+	}
+
 	canApplyCode = $derived(this.allowedModes.script && this.mode === AIMode.SCRIPT)
 
 	private changeModeTool = {
@@ -1015,7 +1727,13 @@ export class AIChatManager {
 				messages,
 				addedMessages,
 				get systemMessage() {
-					return systemMessageOverride ?? self.systemMessage
+					const base = systemMessageOverride ?? self.systemMessage
+					// Inject the attached-files roster at request time (re-read each iteration)
+					// so it always reflects the live file list without reactive bookkeeping.
+					if (self.mode === AIMode.GLOBAL && self.attachedFiles.count > 0) {
+						return appendAttachedFilesRoster(base, self.attachedFiles)
+					}
+					return base
 				},
 				get tools() {
 					return self.tools
@@ -1031,11 +1749,19 @@ export class AIChatManager {
 				get webSearch() {
 					return isWebSearchEnabledForProvider(getCurrentModel().provider)
 				},
-				clients: {
-					openai: workspaceAIClients.getOpenaiClient(),
-					anthropic: workspaceAIClients.getAnthropicClient()
+				// Build the proxy clients against the operating workspace, not the global
+				// singleton: a session deliberately leaves workspaceStore untouched, so the
+				// singleton (init'd only on global workspace changes) would route the LLM
+				// request through the navigation workspace's /ai/proxy instead of the
+				// session's — sending it to the wrong workspace's AI credentials.
+				get clients() {
+					const ws = self.operatingWorkspace ?? ''
+					return {
+						openai: workspaceAIClients.createOpenaiClient(ws),
+						anthropic: workspaceAIClients.createAnthropicClient(ws)
+					}
 				},
-				workspace: get(workspaceStore) ?? '',
+				workspace: this.operatingWorkspace ?? '',
 				skipResponsesApi: this.skipResponsesApi,
 				onSkipResponsesApi: () => {
 					this.skipResponsesApi = true
@@ -1060,7 +1786,7 @@ export class AIChatManager {
 						return prepareGlobalUserMessage(
 							pendingPrompt,
 							this.contextManager.getSelectedContext(),
-							{ workspace: get(workspaceStore) }
+							{ workspace: this.operatingWorkspace }
 						)
 					}
 					return undefined
@@ -1189,9 +1915,11 @@ export class AIChatManager {
 			isPreprocessor?: boolean
 		} = {}
 	) => {
-		// Returns whether the message was actually turned into a chat turn —
-		// the queue flush uses this to restore messages dropped by an early
-		// return instead of silently losing them.
+		// Returns whether the input was consumed: true when it was sent as a chat
+		// turn OR handled as a local built-in command, false when it was dropped
+		// without being acted on (mode hidden, empty, beforeSend failed). The
+		// queue flush restores the queued message only on false, so a consumed
+		// command isn't re-queued and re-fired into the next conversation.
 		const requestedMode = options.mode ?? this.mode
 		if (!isAIModeVisible(requestedMode)) {
 			return false
@@ -1206,6 +1934,40 @@ export class AIChatManager {
 		if (!this.instructions.trim()) {
 			return false
 		}
+		// Built-in session commands run locally instead of becoming a chat turn.
+		// Intercepted here — before the beforeSend workspace commit, file regrants,
+		// and skill expansion. Scoped to session chat GLOBAL mode, where the
+		// slash-command UI lives. Return true (consumed, not dropped) so that a
+		// command flushed from the queue isn't restored and re-fired into the next
+		// conversation.
+		if (this.isSessionChat && this.mode === AIMode.GLOBAL) {
+			const trimmed = this.instructions.trim()
+			// `/compact`: summarize the conversation locally to free up context.
+			if (COMPACT_COMMAND_RE.test(trimmed)) {
+				this.instructions = ''
+				await this.compactManually()
+				return true
+			}
+			// `/clear`: save the conversation to history and start a fresh chat.
+			if (CLEAR_COMMAND_RE.test(trimmed)) {
+				this.instructions = ''
+				await this.saveAndClear()
+				return true
+			}
+		}
+		// Re-grant any locked File System Access handles within this send gesture, so the
+		// file tools can read the live files. requestPermission() needs a user gesture, and
+		// this runs before the first await/network call while the Send click is still active.
+		// Attachment upkeep must never block the send — affected files just stay locked/stale
+		// and the tools report their status to the model.
+		try {
+			await this.attachedFiles.regrantLocked()
+			// Re-enumerate linked folders so on-disk changes (renamed/added/removed/edited
+			// files) are reflected in the roster + indexes before this turn runs.
+			await this.attachedFiles.refreshFolders()
+		} catch (e) {
+			console.error('Attached-files upkeep failed before send', e)
+		}
 		if (this.beforeSend) {
 			try {
 				await this.beforeSend()
@@ -1224,6 +1986,11 @@ export class AIChatManager {
 				return false
 			}
 		}
+		// Session chats commit their workspace in beforeSend; skills must match the
+		// committed workspace before the system prompt is sent.
+		if (this.mode === AIMode.GLOBAL) {
+			await this.refreshGlobalSkills(this.operatingWorkspace ?? '')
+		}
 		const isFirstUserTurn = !this.displayMessages.some((message) => message.role === 'user')
 		// Declared outside `try` so the catch can recover what the loop produced
 		// before a failure: the structured messages and the latest streamed text
@@ -1250,7 +2017,7 @@ export class AIChatManager {
 			const model = tryGetCurrentModel()
 			if (model) {
 				WorkspaceService.logAiChat({
-					workspace: get(workspaceStore) ?? '',
+					workspace: this.operatingWorkspace ?? '',
 					requestBody: {
 						session_id: this.historyManager.getCurrentChatId(),
 						provider: model.provider,
@@ -1297,6 +2064,19 @@ export class AIChatManager {
 			// The LLM gets the full pasted content; the display message above keeps
 			// the compact tokens + registry so the bubble can render/expand chips.
 			const oldInstructions = expanded(chatDraft(this.instructions, pastes))
+			// Deliver background-job completions to the model as a preamble on this
+			// turn (notify-only wake). Folded into the model-facing text only — the
+			// display bubble keeps this.instructions, and no extra message is added, so
+			// the display↔messages index pairing above stays intact. Ephemeral.
+			const jobNotesPreamble =
+				this.mode === AIMode.GLOBAL && this.pendingJobNotes.length > 0
+					? this.pendingJobNotes.join('\n\n') + '\n\n'
+					: ''
+			if (jobNotesPreamble) this.pendingJobNotes = []
+			const modelInstructions =
+				this.mode === AIMode.GLOBAL
+					? jobNotesPreamble + this.expandGlobalSkillCommand(oldInstructions)
+					: oldInstructions
 			this.instructions = ''
 
 			if (this.mode === AIMode.SCRIPT && !this.scriptEditorOptions && !options.lang) {
@@ -1329,8 +2109,8 @@ export class AIChatManager {
 					userMessage = prepareApiUserMessage(oldInstructions)
 					break
 				case AIMode.GLOBAL:
-					userMessage = prepareGlobalUserMessage(oldInstructions, oldSelectedContext, {
-						workspace: get(workspaceStore)
+					userMessage = prepareGlobalUserMessage(modelInstructions, oldSelectedContext, {
+						workspace: this.operatingWorkspace
 					})
 					break
 				case AIMode.APP:
@@ -1350,8 +2130,15 @@ export class AIChatManager {
 			const projectedContextTokens = this.contextTokens + this.estimateMessagesTokens([userMessage])
 
 			this.messages.push(userMessage)
-			await this.historyManager.saveChat(this.displayMessages, this.messages, this.contextUsage)
+			await this.historyManager.saveChat(
+				this.displayMessages,
+				this.messages,
+				this.contextUsage,
+				this.modifiedItems ? [...this.modifiedItems] : undefined
+			)
 
+			this.replyReveal.reset()
+			this.reasoningReveal.reset()
 			this.currentReply = ''
 			this.currentReasoning = ''
 			this.currentReasoningActive = false
@@ -1386,7 +2173,12 @@ export class AIChatManager {
 							this.contextUsage = Math.max(0, this.contextUsage - freed)
 						}
 					}
-					await this.historyManager.saveChat(this.displayMessages, this.messages, this.contextUsage)
+					await this.historyManager.saveChat(
+						this.displayMessages,
+						this.messages,
+						this.contextUsage,
+						this.modifiedItems ? [...this.modifiedItems] : undefined
+					)
 				}
 			}
 			// Rollback anchors for restoreUnsentTurn: captured after compaction so
@@ -1407,10 +2199,16 @@ export class AIChatManager {
 				messages: [...this.messages],
 				abortController: this.abortController,
 				callbacks: {
-					onNewToken: (token) => (this.currentReply += token),
-					onReasoningDelta: (token) => (this.currentReasoning += token),
+					onNewToken: (token) => this.replyReveal.push(token),
+					onReasoningDelta: (token) => this.reasoningReveal.push(token),
 					onReasoningStart: () => (this.currentReasoningActive = true),
 					onMessageEnd: () => {
+						// Drain any un-revealed backlog into currentReply first, so the reads
+						// below see the full text. This funnel covers clean completion, tool
+						// boundaries, and abort/error — flush-before-read is the invariant that
+						// keeps text from being lost or duplicated on any exit path.
+						this.replyReveal.flush()
+						this.reasoningReveal.flush()
 						// Keep the streamed text for the abort/error paths. Non-empty only:
 						// parsers flush (and reset) when a tool call starts after text, and
 						// the catch's later empty call would wipe it — stale keeps are
@@ -1436,31 +2234,17 @@ export class AIChatManager {
 						this.currentReasoning = ''
 						this.currentReasoningActive = false
 					},
-					setToolStatus: (id, metadata) => {
-						const existingIdx = this.displayMessages.findIndex(
-							(m) => m.role === 'tool' && m.tool_call_id === id
-						)
-						if (existingIdx !== -1) {
-							// Update existing tool message with metadata
-							const existing = this.displayMessages[existingIdx] as ToolDisplayMessage
-							if (existing.content.length === 0 && metadata?.error) {
-								this.displayMessages[existingIdx].content = metadata.error
+					setToolStatus: this.applyToolStatus,
+					// Job-tracking hooks enable detach-into-background; wire them only in
+					// GLOBAL mode (global chat + sessions). In-editor script/flow/pipeline
+					// chats leave these undefined, so their test runs keep blocking.
+					...(this.mode === AIMode.GLOBAL
+						? {
+								onJobStarted: (job) => this.registerJob(job),
+								onJobStatus: (jobId, update) => this.updateJob(jobId, update),
+								onJobDetached: (jobId) => this.markJobDetached(jobId)
 							}
-							this.displayMessages[existingIdx] = {
-								...existing,
-								...(metadata || {})
-							} as ToolDisplayMessage
-						} else {
-							// Create new tool message with metadata
-							const newMessage: ToolDisplayMessage = {
-								role: 'tool',
-								tool_call_id: id,
-								content: metadata?.content ?? metadata?.error ?? '',
-								...(metadata || {})
-							}
-							this.displayMessages.push(newMessage)
-						}
-					},
+						: {}),
 					removeToolStatus: (id) => {
 						const existingIdx = this.displayMessages.findIndex(
 							(m) => m.role === 'tool' && m.tool_call_id === id
@@ -1472,7 +2256,10 @@ export class AIChatManager {
 					},
 					requestConfirmation: this.requestConfirmation,
 					shouldAutoAcceptToolConfirmations: () => this.autoAcceptToolConfirmationsActive,
-					requestUserQuestion: this.requestUserQuestion
+					requestUserQuestion: this.requestUserQuestion,
+					onItemModified: (kind, path) => this.recordModifiedItem(kind, path),
+					onItemDeployed: (kind, from, to) => void this.renameModifiedItem(kind, from, to),
+					onItemDiscarded: (kind, path) => void this.removeModifiedItem(kind, path)
 				}
 			}
 
@@ -1508,7 +2295,12 @@ export class AIChatManager {
 				this.contextUsage = result?.lastIterationUsage
 					? result.lastIterationUsage.prompt + result.lastIterationUsage.completion
 					: undefined
-				await this.historyManager.saveChat(this.displayMessages, this.messages, this.contextUsage)
+				await this.historyManager.saveChat(
+					this.displayMessages,
+					this.messages,
+					this.contextUsage,
+					this.modifiedItems ? [...this.modifiedItems] : undefined
+				)
 				// Still counts as the saved first turn — skipping the hook here would
 				// permanently miss it (the next turn isn't "first" anymore).
 				if (isFirstUserTurn && this.afterFirstTurnSaved) {
@@ -1538,7 +2330,12 @@ export class AIChatManager {
 					// user message on reload. Remove it instead.
 					this.historyManager.deletePastChat(this.historyManager.getCurrentChatId())
 				} else {
-					await this.historyManager.saveChat(this.displayMessages, this.messages, this.contextUsage)
+					await this.historyManager.saveChat(
+						this.displayMessages,
+						this.messages,
+						this.contextUsage,
+						this.modifiedItems ? [...this.modifiedItems] : undefined
+					)
 				}
 				if (!wasAborted) {
 					sendUserToast('The model returned no response — your message was restored to the input.')
@@ -1557,7 +2354,12 @@ export class AIChatManager {
 				if (this.autoAcceptEditsActive) {
 					this.acceptPendingFlowEdits()
 				}
-				await this.historyManager.saveChat(this.displayMessages, this.messages, this.contextUsage)
+				await this.historyManager.saveChat(
+					this.displayMessages,
+					this.messages,
+					this.contextUsage,
+					this.modifiedItems ? [...this.modifiedItems] : undefined
+				)
 				// Only this branch is a clean send: the queued-message flush below
 				// auto-sends the next message after it (set after saveChat so a
 				// persistence failure falls through to the restore path instead).
@@ -1581,7 +2383,12 @@ export class AIChatManager {
 				// compaction on the next send instead of failing the same way again.
 				this.contextUsage = undefined
 				try {
-					await this.historyManager.saveChat(this.displayMessages, this.messages, this.contextUsage)
+					await this.historyManager.saveChat(
+						this.displayMessages,
+						this.messages,
+						this.contextUsage,
+						this.modifiedItems ? [...this.modifiedItems] : undefined
+					)
 				} catch (saveErr) {
 					console.error('Failed to persist partial chat after error', saveErr)
 				}
@@ -1590,6 +2397,11 @@ export class AIChatManager {
 			sendUserToast(getSendRequestErrorMessage(err, webSearchUnavailable), true)
 		} finally {
 			this.loading = false
+			// Turn teardown: cancel any in-flight reveal frame and drop leftover
+			// backlog. onMessageEnd already flushed on every outcome, so this only
+			// releases the loop; it never discards uncommitted text.
+			this.replyReveal.reset()
+			this.reasoningReveal.reset()
 		}
 		// Flush the queued message. Send it after a cleanly committed turn OR a
 		// deliberate user cancel (Esc / Stop) — in both cases the user is ready
@@ -1607,6 +2419,11 @@ export class AIChatManager {
 				this.queuedMessage = next
 			}
 		}
+		// A background job may have finished mid-turn: its note missed this turn's
+		// preamble (captured at the start) and the poller skipped auto-resume while
+		// we were loading. Now that we're idle, deliver it via an auto-resume. Skips
+		// itself if the queued-message flush above already carried the notes.
+		void this.#maybeAutoResumeFromJobs()
 		return true
 	}
 
@@ -1710,10 +2527,28 @@ export class AIChatManager {
 		// Drop any message queued in this conversation so it can't auto-send into
 		// the fresh chat or linger as a card across the switch.
 		this.queuedMessage = ''
-		await this.historyManager.save(this.displayMessages, this.messages, this.contextUsage)
+		// The tray + poller belong to the conversation being left; the just-saved
+		// chat keeps its persisted jobs (save() omits the arg → fallback preserves).
+		this.clearBackgroundJobs()
+		await this.historyManager.save(
+			this.displayMessages,
+			this.messages,
+			this.contextUsage,
+			this.modifiedItems ? [...this.modifiedItems] : undefined
+		)
 		this.displayMessages = []
 		this.messages = []
 		this.contextUsage = undefined
+		// The mask belongs to the conversation just saved — the fresh chat starts
+		// its own (empty) tracking; carrying entries over would claim the previous
+		// conversation's edits for the new one. Untracked chats stay untracked.
+		if (this.modifiedItems) this.modifiedItems = new SvelteSet()
+		// In an AI session, linked files are session-scoped: they persist across conversations
+		// (cleared only when the session is deleted). The ephemeral global side-panel chat has no
+		// session, so "New chat" must clear them — otherwise the next, unrelated conversation
+		// would still get the previous file roster and could read/search it.
+		if (!this.isSessionChat) this.attachedFiles.clear()
+		this.onChatRotated?.(this.historyManager.getCurrentChatId())
 	}
 
 	loadPastChat = async (id: string) => {
@@ -1722,10 +2557,35 @@ export class AIChatManager {
 			// Drop any message queued in the current conversation so it doesn't
 			// auto-send into the loaded one or linger as a card across the switch.
 			this.queuedMessage = ''
+			// Stop the poller for the conversation being left before swapping in the
+			// loaded chat's jobs below.
+			this.clearBackgroundJobs()
+			// Same isolation as saveAndClear: the ephemeral global chat's attachments belong to
+			// the conversation being left, not the one being loaded; sessions keep them.
+			if (!this.isSessionChat) this.attachedFiles.clear()
 			this.displayMessages = chat.displayMessages
 			this.messages = chat.actualMessages
 			this.contextUsage = normalizeContextUsage(chat.contextUsage)
+			// Seed the modified-items mask from the stored chat. A session's Edits
+			// surface is scoped strictly to what this session edited, so it must never
+			// fall back to showing every draft in the (possibly forked) workspace: a
+			// legacy chat with no stored mask seeds an empty tracked set, not undefined.
+			// The global side-panel chat never tracks, so leave it untouched there.
+			if (this.isSessionChat) {
+				const stored = this.historyManager.getModifiedItems(id)
+				this.modifiedItems = new SvelteSet(stored ?? [])
+			}
+			// Rebuild the jobs tray from the loaded chat, and re-attach the poller to
+			// any job that was still in flight when it was last persisted.
+			const storedJobs = this.historyManager.getBackgroundJobs(id)
+			this.backgroundJobs = storedJobs ? storedJobs.map((j) => ({ ...j })) : []
+			for (const j of this.backgroundJobs) {
+				if (this.isJobNonTerminal(j.status)) j.detached = true
+			}
+			if (this.backgroundJobs.length > 0) this.backgroundJobs = [...this.backgroundJobs]
+			this.#ensureJobPoller()
 			this.#automaticScroll = true
+			this.onChatRotated?.(id)
 		}
 	}
 
@@ -1856,14 +2716,13 @@ export class AIChatManager {
 								lastDeployedCode: undefined,
 								lastSavedCode: undefined
 							}
-
 				return {
 					args: moduleState?.previewArgs ?? {},
 					error:
 						moduleState && !moduleState.previewSuccess
 							? getStringError(moduleState.previewResult)
 							: undefined,
-					code: module.value.content,
+					getCode: () => (module.value.type === 'rawscript' ? module.value.content : ''),
 					lang: module.value.language,
 					path: module.id,
 					...editorRelated
@@ -1907,6 +2766,28 @@ export class AIChatManager {
 		}
 	}
 
+	// Registered by the /pipeline editor while it is mounted. Rebuilds the global
+	// tool set so the pipeline tools appear (and disappear on unregister). Pipeline
+	// AI edits apply directly as drafts, so there is nothing to auto-accept.
+	// Returns a cleanup that tears the registration back down.
+	setPipelineHelpers = (pipelineHelpers: PipelineAIChatHelpers) => {
+		this.pipelineAiChatHelpers = pipelineHelpers
+		untrack(() => {
+			if (this.mode === AIMode.GLOBAL) {
+				this.configureGlobalMode()
+			}
+		})
+
+		return () => {
+			this.pipelineAiChatHelpers = undefined
+			untrack(() => {
+				if (this.mode === AIMode.GLOBAL) {
+					this.configureGlobalMode()
+				}
+			})
+		}
+	}
+
 	/**
 	 * Refresh cached datatables from the app helpers (async)
 	 * Creates one context element per table (not per datatable)
diff --git a/frontend/src/lib/components/copilot/chat/AIChatManager.test.ts b/frontend/src/lib/components/copilot/chat/AIChatManager.test.ts
index 16a08d7344..94270d0e6a 100644
--- a/frontend/src/lib/components/copilot/chat/AIChatManager.test.ts
+++ b/frontend/src/lib/components/copilot/chat/AIChatManager.test.ts
@@ -6,6 +6,18 @@ import type { ChatCompletionMessageParam } from 'openai/resources/chat/completio
 import { AIChatManager, AIMode, AIAutonomyMode } from './AIChatManager.svelte'
 import { runChatLoop } from './chatLoop'
 
+// This suite forces esm-env BROWSER=true (below). That makes @sveltejs/kit's
+// client runtime (pulled transitively via $lib/navigation) evaluate browser-only
+// globals at import time and throw "location is not defined" under the node test
+// env. Stub the two $app modules $lib/navigation needs so kit's client runtime is
+// never loaded. File-local: no other suite is affected.
+vi.mock('$app/navigation', () => ({
+	goto: vi.fn(),
+	afterNavigate: vi.fn(),
+	beforeNavigate: vi.fn()
+}))
+vi.mock('$app/paths', () => ({ base: '', assets: '' }))
+
 const mocks = vi.hoisted(() => ({
 	getCurrentModel: vi.fn(),
 	tryGetCurrentModel: vi.fn(),
@@ -15,7 +27,10 @@ const mocks = vi.hoisted(() => ({
 	getOpenaiClient: vi.fn(),
 	getAnthropicClient: vi.fn(),
 	getNonStreamingCompletion: vi.fn(),
-	runChatLoop: vi.fn()
+	runChatLoop: vi.fn(),
+	listAiSkills: vi.fn(),
+	getJob: vi.fn(),
+	workspace: 'test_workspace' as string | undefined
 }))
 
 vi.mock('monaco-editor', () => ({
@@ -24,26 +39,44 @@ vi.mock('monaco-editor', () => ({
 
 vi.mock('$lib/gen', () => ({
 	WorkspaceService: {
-		logAiChat: mocks.logAiChat
+		logAiChat: mocks.logAiChat,
+		listAiSkills: mocks.listAiSkills
 	},
 	ScriptService: {},
 	FlowService: {},
-	JobService: {}
+	JobService: {
+		getJob: mocks.getJob
+	}
 }))
 
 // Autonomy mode is now namespaced by the logged-in user's email (see
 // userScopedStorage); the mock emits one so scopedKey() resolves.
 const TEST_EMAIL = 'admin@test'
 
-vi.mock('$lib/stores', () => ({
-	workspaceStore: { subscribe: () => () => undefined },
-	userStore: {
-		subscribe: (run: (value: { username: string; email: string }) => void) => {
-			run({ username: 'admin', email: 'admin@test' })
+vi.mock('$lib/stores', () => {
+	// A minimal readable store: get(store) reads this value synchronously. Defined
+	// inside the factory since vi.mock is hoisted above module-scope declarations.
+	const readable = <T>(value: T) => ({
+		subscribe: (run: (v: T) => void) => {
+			run(value)
 			return () => undefined
 		}
+	})
+	return {
+		workspaceStore: {
+			subscribe: (run: (value: string | undefined) => void) => {
+				run(mocks.workspace)
+				return () => undefined
+			}
+		},
+		userStore: readable({ username: 'admin', email: 'admin@test', is_admin: true }),
+		// Read eagerly at module load by the open_page tool's allowedOpenPages /
+		// allowedTriggerKinds (global/core.ts) as the manager's tools are built.
+		superadmin: readable(false),
+		userWorkspaces: readable([] as unknown[]),
+		enterpriseLicense: readable(undefined)
 	}
-}))
+})
 
 vi.mock('$lib/toast', () => ({
 	sendUserToast: mocks.sendUserToast
@@ -53,6 +86,9 @@ vi.mock('$lib/aiStore', () => ({
 	getCurrentModel: mocks.getCurrentModel,
 	tryGetCurrentModel: mocks.tryGetCurrentModel,
 	getCombinedCustomPrompt: () => '',
+	getCustomPromptParts: () => ({}),
+	getUserCustomPrompts: () => ({}),
+	setUserCustomPrompts: () => {},
 	isWebSearchEnabledForProvider: mocks.isWebSearchEnabledForProvider
 }))
 
@@ -95,6 +131,8 @@ beforeEach(() => {
 	mocks.logAiChat.mockResolvedValue(undefined)
 	mocks.getOpenaiClient.mockReturnValue({})
 	mocks.getAnthropicClient.mockReturnValue({})
+	mocks.listAiSkills.mockResolvedValue([])
+	mocks.workspace = 'test_workspace'
 	mocks.runChatLoop.mockResolvedValue({
 		addedMessages: [],
 		tokenUsage: { prompt: 0, completion: 0, total: 0 },
@@ -185,6 +223,82 @@ describe('AIChatManager request errors', () => {
 	})
 })
 
+describe('AIChatManager global skills', () => {
+	const model = { provider: 'openai', model: 'gpt-4o' }
+
+	beforeEach(() => {
+		localStorage.clear()
+		mocks.getCurrentModel.mockReturnValue(model)
+		mocks.tryGetCurrentModel.mockReturnValue(model)
+	})
+
+	it('loads skills after beforeSend commits the session workspace', async () => {
+		let resolveParentSkills: ((skills: { name: string; description: string }[]) => void) | undefined
+		const parentSkills = new Promise<{ name: string; description: string }[]>((resolve) => {
+			resolveParentSkills = resolve
+		})
+		mocks.workspace = 'parent'
+		mocks.listAiSkills.mockImplementation(({ workspace }: { workspace: string }) => {
+			if (workspace === 'parent') {
+				return parentSkills
+			}
+			return Promise.resolve([{ name: 'child-skill', description: 'child workspace skill' }])
+		})
+		mocks.runChatLoop.mockImplementation(async (config: any) => {
+			expect(config.workspace).toBe('child')
+			expect(config.systemMessage.content).toContain('child-skill')
+			expect(config.systemMessage.content).not.toContain('parent-skill')
+			const message = { role: 'assistant' as const, content: 'done' }
+			config.addedMessages?.push(message)
+			return {
+				addedMessages: [message],
+				tokenUsage: { prompt: 0, completion: 0, total: 0 },
+				hitMaxIterations: false
+			}
+		})
+
+		const manager = new AIChatManager()
+		manager.isSessionChat = true
+		manager.beforeSend = () => {
+			mocks.workspace = 'child'
+		}
+
+		await manager.sendRequest({ instructions: 'first', mode: AIMode.GLOBAL })
+		resolveParentSkills?.([{ name: 'parent-skill', description: 'parent workspace skill' }])
+		await Promise.resolve()
+
+		expect(mocks.listAiSkills).toHaveBeenCalledWith({ workspace: 'parent' })
+		expect(mocks.listAiSkills).toHaveBeenCalledWith({ workspace: 'child' })
+		expect(manager.systemMessage.content).toContain('child-skill')
+		expect(manager.systemMessage.content).not.toContain('parent-skill')
+	})
+
+	it('expands a leading slash skill command for the model while preserving the displayed text', async () => {
+		mocks.listAiSkills.mockResolvedValue([
+			{ name: 'review-code', description: 'review code for bugs' }
+		])
+		mocks.runChatLoop.mockImplementation(async (config: any) => {
+			const userMessage = config.messages[config.messages.length - 1]
+			expect(userMessage.content).toContain('Use the "review-code" skill. find bugs')
+			expect(userMessage.content).not.toContain('/review-code find bugs')
+			const message = { role: 'assistant' as const, content: 'done' }
+			config.addedMessages?.push(message)
+			return {
+				addedMessages: [message],
+				tokenUsage: { prompt: 0, completion: 0, total: 0 },
+				hitMaxIterations: false
+			}
+		})
+
+		const manager = new AIChatManager()
+		manager.isSessionChat = true
+
+		await manager.sendRequest({ instructions: '/review-code find bugs', mode: AIMode.GLOBAL })
+
+		expect(manager.displayMessages[0]?.content).toBe('/review-code find bugs')
+	})
+})
+
 describe('AIChatManager autonomy mode', () => {
 	beforeEach(() => {
 		localStorage.clear()
@@ -514,6 +628,78 @@ describe('AIChatManager queued messages', () => {
 		await manager.loadPastChat('chat-b')
 		expect(manager.queuedMessage).toBe('')
 	})
+
+	it('clears attachments on New chat / load past chat (non-session), keeps them in a session', async () => {
+		const txt = (n: string) => new File(['hello\n'], n, { type: 'text/plain' })
+
+		// Non-session global chat: New chat must clear the previous conversation's attachments.
+		const manager = createManager(createInputMock())
+		await manager.attachedFiles.addFiles([txt('a.txt')])
+		expect(manager.attachedFiles.count).toBe(1)
+		await manager.saveAndClear()
+		expect(manager.attachedFiles.count).toBe(0)
+
+		// ...and loading a past chat clears them too.
+		vi.spyOn(manager.historyManager, 'loadPastChat').mockReturnValue({
+			id: 'chat-c',
+			title: 'Chat C',
+			displayMessages: [],
+			actualMessages: [],
+			lastModified: 0
+		} as unknown as ReturnType<typeof manager.historyManager.loadPastChat>)
+		await manager.attachedFiles.addFiles([txt('c.txt')])
+		expect(manager.attachedFiles.count).toBe(1)
+		await manager.loadPastChat('chat-c')
+		expect(manager.attachedFiles.count).toBe(0)
+
+		// Session chat: attachments are session-scoped — they survive New chat.
+		const session = createManager(createInputMock())
+		session.isSessionChat = true
+		await session.attachedFiles.addFiles([txt('b.txt')])
+		await session.saveAndClear()
+		expect(session.attachedFiles.count).toBe(1)
+	})
+
+	it('tracks (empty mask) a session chat loaded with no stored modified-items', async () => {
+		// A legacy session chat has no persisted mask. It must NOT stay untracked
+		// (undefined) — that makes the Edits surface fall back to showing every
+		// draft in the (possibly forked) workspace. Seed an empty tracked set so the
+		// session only ever surfaces what it actually edited.
+		const manager = createManager(createInputMock())
+		manager.isSessionChat = true
+		vi.spyOn(manager.historyManager, 'loadPastChat').mockReturnValue({
+			id: 'legacy-session-chat',
+			title: 'Legacy',
+			displayMessages: [],
+			actualMessages: [],
+			lastModified: 0
+		} as unknown as ReturnType<typeof manager.historyManager.loadPastChat>)
+		vi.spyOn(manager.historyManager, 'getModifiedItems').mockReturnValue(undefined)
+
+		await manager.loadPastChat('legacy-session-chat')
+
+		expect(manager.modifiedItems).toBeInstanceOf(Set)
+		expect(manager.modifiedItems?.size).toBe(0)
+	})
+
+	it('seeds a session chat mask from its stored modified-items', async () => {
+		const manager = createManager(createInputMock())
+		manager.isSessionChat = true
+		vi.spyOn(manager.historyManager, 'loadPastChat').mockReturnValue({
+			id: 'tracked-session-chat',
+			title: 'Tracked',
+			displayMessages: [],
+			actualMessages: [],
+			lastModified: 0
+		} as unknown as ReturnType<typeof manager.historyManager.loadPastChat>)
+		vi.spyOn(manager.historyManager, 'getModifiedItems').mockReturnValue([
+			'script:u/admin/hello_world'
+		])
+
+		await manager.loadPastChat('tracked-session-chat')
+
+		expect([...(manager.modifiedItems ?? [])]).toEqual(['script:u/admin/hello_world'])
+	})
 })
 
 describe('AIChatManager context compaction', () => {
@@ -573,7 +759,9 @@ describe('AIChatManager context compaction', () => {
 		expect(manager.messages[0]).toMatchObject({ role: 'user', content: 'c'.repeat(400) })
 		// Mid-turn, the report is debited by the freed estimate (visible in the
 		// compaction-time save) so a rolled-back turn keeps a consistent value
-		expect(saveChat).toHaveBeenCalledWith(expect.anything(), expect.anything(), 650_000)
+		// 4th arg: the modified-items mask rides on every save (undefined here —
+		// this bare manager never initialised tracking).
+		expect(saveChat).toHaveBeenCalledWith(expect.anything(), expect.anything(), 650_000, undefined)
 		// At commit, the no-report turn clears the stored value; the readable
 		// number falls back to estimating the now-tiny compacted history
 		expect(manager.contextUsage).toBeUndefined()
@@ -823,7 +1011,7 @@ describe('AIChatManager context compaction', () => {
 
 		// The request that went out begins with the summary user message, then the
 		// recent tail verbatim, then the new question.
-		const sent = mocks.runChatLoop.mock.calls[0][0].messages
+		const sent = mocks.runChatLoop.mock.calls[mocks.runChatLoop.mock.calls.length - 1][0].messages
 		expect(sent).toHaveLength(4)
 		expect(sent[0].role).toBe('user')
 		expect(sent[0].content).toContain('SUMMARY TEXT')
@@ -885,12 +1073,10 @@ describe('AIChatManager context compaction', () => {
 		mocks.tryGetCurrentModel.mockReturnValue(gpt4oModel)
 		// The user hits Stop while the summary request is in flight: it aborts the
 		// turn's controller and rejects.
-		mocks.getNonStreamingCompletion.mockImplementation(
-			async (_msgs: any, ac: AbortController) => {
-				ac.abort('user_cancelled')
-				throw new Error('aborted')
-			}
-		)
+		mocks.getNonStreamingCompletion.mockImplementation(async (_msgs: any, ac: AbortController) => {
+			ac.abort('user_cancelled')
+			throw new Error('aborted')
+		})
 		// With the controller already aborted, the real request returns nothing;
 		// mirror that so the turn takes the cancel/rollback path.
 		mocks.runChatLoop.mockImplementation(async () => ({
@@ -914,6 +1100,244 @@ describe('AIChatManager context compaction', () => {
 	})
 })
 
+describe('AIChatManager manual compaction', () => {
+	const model = { provider: 'openai', model: 'gpt-4o' }
+
+	beforeEach(() => {
+		localStorage.clear()
+		vi.clearAllMocks()
+		mocks.getCurrentModel.mockReturnValue(model)
+		mocks.tryGetCurrentModel.mockReturnValue(model)
+		// changeMode(GLOBAL) refreshes workspace skills; keep it a no-op here.
+		mocks.listAiSkills.mockResolvedValue([])
+	})
+
+	function seedExchange(manager: AIChatManager) {
+		manager.messages = [
+			{ role: 'user', content: 'q1' },
+			{ role: 'assistant', content: 'a1' },
+			{ role: 'user', content: 'q2' },
+			{ role: 'assistant', content: 'a2' }
+		]
+		manager.displayMessages = [
+			{ role: 'user', content: 'q1', index: 0 },
+			{ role: 'assistant', content: 'a1' },
+			{ role: 'user', content: 'q2', index: 2 },
+			{ role: 'assistant', content: 'a2' }
+		]
+	}
+
+	it('folds the whole history into a single summary boundary, keeping nothing verbatim', async () => {
+		mocks.getNonStreamingCompletion.mockResolvedValue('<summary>MANUAL SUMMARY</summary>')
+		const manager = new AIChatManager()
+		seedExchange(manager)
+		manager.contextUsage = 123
+		const saveChat = vi.spyOn(manager.historyManager, 'saveChat')
+
+		await manager.compactManually()
+
+		// The summarizer saw the entire history, then the summary instruction.
+		expect(mocks.getNonStreamingCompletion).toHaveBeenCalledTimes(1)
+		const summaryReq = mocks.getNonStreamingCompletion.mock.calls[0][0]
+		expect(summaryReq).toHaveLength(5)
+		expect(summaryReq[0].content).toBe('q1')
+		expect(summaryReq[3].content).toBe('a2')
+		expect(summaryReq[4].content).toContain('detailed summary')
+
+		// Nothing kept verbatim: messages collapse to just the summary user message.
+		expect(manager.messages).toHaveLength(1)
+		expect(manager.messages[0].role).toBe('user')
+		expect(manager.messages[0].content).toContain('MANUAL SUMMARY')
+		expect(manager.messages[0].content).toContain('continued from a previous conversation')
+		expect(manager.messages[0].content).not.toContain('<summary>')
+
+		// The transcript shows one summary boundary in place of the old bubbles.
+		expect(manager.displayMessages).toHaveLength(1)
+		expect(manager.displayMessages[0]).toMatchObject({ role: 'summary', content: 'MANUAL SUMMARY' })
+
+		expect(manager.contextUsage).toBeUndefined()
+		expect(saveChat).toHaveBeenCalled()
+		expect(mocks.sendUserToast).toHaveBeenCalledWith('Conversation compacted.')
+		expect(manager.loading).toBe(false)
+		expect(manager.compacting).toBe(false)
+	})
+
+	it('no-ops with a toast when there is nothing worth compacting', async () => {
+		const manager = new AIChatManager()
+		manager.messages = [{ role: 'user', content: 'only one' }]
+
+		await manager.compactManually()
+
+		expect(mocks.getNonStreamingCompletion).not.toHaveBeenCalled()
+		expect(mocks.sendUserToast).toHaveBeenCalledWith('Nothing to compact yet.')
+		expect(manager.messages).toHaveLength(1)
+	})
+
+	it('leaves history untouched when the user stops mid-summary', async () => {
+		mocks.getNonStreamingCompletion.mockImplementation(async (_msgs: any, ac: AbortController) => {
+			ac.abort('user_cancelled')
+			throw new Error('aborted')
+		})
+		const manager = new AIChatManager()
+		seedExchange(manager)
+
+		await manager.compactManually()
+
+		expect(manager.messages).toHaveLength(4)
+		expect(manager.displayMessages.some((m) => m.role === 'summary')).toBe(false)
+		// An abort is a user cancel, not a failure — no toast, no destructive change.
+		expect(mocks.sendUserToast).not.toHaveBeenCalled()
+		expect(manager.loading).toBe(false)
+	})
+
+	it('routes the /compact session command to manual compaction instead of the model', async () => {
+		mocks.getNonStreamingCompletion.mockResolvedValue('<summary>VIA COMMAND</summary>')
+		const manager = new AIChatManager()
+		manager.isSessionChat = true
+		seedExchange(manager)
+
+		const sent = await manager.sendRequest({ instructions: '/compact', mode: AIMode.GLOBAL })
+
+		// Consumed as a local command (true so the queue flush won't re-fire it),
+		// without ever reaching the model loop...
+		expect(sent).toBe(true)
+		expect(mocks.runChatLoop).not.toHaveBeenCalled()
+		// ...it ran the summarizer and compacted in place, clearing the composer.
+		expect(mocks.getNonStreamingCompletion).toHaveBeenCalledTimes(1)
+		expect(manager.displayMessages[0]).toMatchObject({ role: 'summary', content: 'VIA COMMAND' })
+		expect(manager.instructions).toBe('')
+	})
+
+	it('auto-sends a message queued while compaction was running', async () => {
+		mocks.getNonStreamingCompletion.mockResolvedValue('<summary>S</summary>')
+		mocks.runChatLoop.mockImplementation(async (config: any) => {
+			const message = { role: 'assistant' as const, content: 'done' }
+			config.addedMessages?.push(message)
+			return {
+				addedMessages: [message],
+				tokenUsage: { prompt: 0, completion: 0, total: 0 },
+				hitMaxIterations: false
+			}
+		})
+		const manager = new AIChatManager()
+		manager.isSessionChat = true
+		manager.changeMode(AIMode.GLOBAL)
+		seedExchange(manager)
+		// A message typed while loading was true gets queued, not sent.
+		manager.queuedMessage = 'follow-up question'
+
+		await manager.compactManually()
+
+		// Compaction ran once, then the queued message went out as a real turn.
+		expect(mocks.getNonStreamingCompletion).toHaveBeenCalledTimes(1)
+		expect(mocks.runChatLoop).toHaveBeenCalledTimes(1)
+		const sent = mocks.runChatLoop.mock.calls[0][0].messages
+		expect(sent[sent.length - 1].content).toContain('follow-up question')
+		expect(manager.queuedMessage).toBe('')
+	})
+
+	it('routes the /clear session command to a fresh chat instead of the model', async () => {
+		const manager = new AIChatManager()
+		manager.isSessionChat = true
+		seedExchange(manager)
+
+		const sent = await manager.sendRequest({ instructions: '/clear', mode: AIMode.GLOBAL })
+
+		// Consumed as a local command (true so the queue flush won't re-fire it),
+		// without ever reaching the model...
+		expect(sent).toBe(true)
+		expect(mocks.runChatLoop).not.toHaveBeenCalled()
+		expect(mocks.getNonStreamingCompletion).not.toHaveBeenCalled()
+		// ...it reset the conversation and cleared the composer.
+		expect(manager.displayMessages).toEqual([])
+		expect(manager.messages).toEqual([])
+		expect(manager.instructions).toBe('')
+	})
+
+	it('consumes a /clear flushed from the queue without re-queuing it', async () => {
+		// A normal turn that commits cleanly, so its epilogue flushes the queue.
+		mocks.runChatLoop.mockImplementation(async (config: any) => {
+			const message = { role: 'assistant' as const, content: 'done' }
+			config.addedMessages?.push(message)
+			return {
+				addedMessages: [message],
+				tokenUsage: { prompt: 0, completion: 0, total: 0 },
+				hitMaxIterations: false
+			}
+		})
+		const manager = new AIChatManager()
+		manager.isSessionChat = true
+		manager.changeMode(AIMode.GLOBAL)
+		seedExchange(manager)
+		// `/clear` typed while the turn was streaming gets queued, not sent.
+		manager.queuedMessage = '/clear'
+
+		await manager.sendRequest({ instructions: 'a normal message', mode: AIMode.GLOBAL })
+
+		// The committed turn's flush ran `/clear` (resetting the conversation) and,
+		// because the command reports itself as consumed, did NOT restore it — so a
+		// stale `/clear` can't re-fire and wipe the next conversation.
+		expect(manager.queuedMessage).toBe('')
+		expect(manager.displayMessages).toEqual([])
+		expect(manager.messages).toEqual([])
+	})
+
+	it('does not intercept /clear outside session chat', async () => {
+		mocks.runChatLoop.mockImplementation(async (config: any) => {
+			const message = { role: 'assistant' as const, content: 'done' }
+			config.addedMessages?.push(message)
+			return {
+				addedMessages: [message],
+				tokenUsage: { prompt: 0, completion: 0, total: 0 },
+				hitMaxIterations: false
+			}
+		})
+		const manager = new AIChatManager()
+		manager.isSessionChat = false
+
+		await manager.sendRequest({ instructions: '/clear', mode: AIMode.GLOBAL })
+
+		// Without the session-chat command surface, /clear is a normal message.
+		expect(mocks.runChatLoop).toHaveBeenCalledTimes(1)
+	})
+
+	it('does not intercept /compact outside session chat', async () => {
+		mocks.runChatLoop.mockImplementation(async (config: any) => {
+			const message = { role: 'assistant' as const, content: 'done' }
+			config.addedMessages?.push(message)
+			return {
+				addedMessages: [message],
+				tokenUsage: { prompt: 0, completion: 0, total: 0 },
+				hitMaxIterations: false
+			}
+		})
+		const manager = new AIChatManager()
+		manager.isSessionChat = false
+
+		await manager.sendRequest({ instructions: '/compact', mode: AIMode.GLOBAL })
+
+		// Without the session-chat command surface, /compact is a normal message.
+		expect(mocks.runChatLoop).toHaveBeenCalledTimes(1)
+		expect(mocks.getNonStreamingCompletion).not.toHaveBeenCalled()
+	})
+
+	it('shadows a workspace skill that collides with a built-in command', () => {
+		const manager = new AIChatManager()
+		manager.globalSkills = [
+			{ name: 'compact', description: 'a workspace skill that happens to be named compact' },
+			{ name: 'review-code', description: 'review code for bugs' }
+		]
+
+		// Built-ins come first and the colliding skill is dropped, so the picker
+		// never renders two leaves with the same `skill:compact` key.
+		const names = manager.sessionCommands.map((c) => c.name)
+		expect(names).toEqual(['compact', 'clear', 'review-code'])
+		expect(manager.sessionCommands[0].description).toBe(
+			'Summarize the conversation to free up context'
+		)
+	})
+})
+
 const assistantToolCall = (id: string): ChatCompletionMessageParam => ({
 	role: 'assistant',
 	content: '',
@@ -1202,3 +1626,95 @@ describe('AIChatManager sendRequest lifecycle', () => {
 		expect(manager.loading).toBe(false)
 	})
 })
+
+describe('AIChatManager background job completion', () => {
+	const completed = (over: Record<string, unknown> = {}) =>
+		({
+			type: 'CompletedJob',
+			id: 'job-1',
+			success: true,
+			canceled: false,
+			result: [{ n: 1 }],
+			duration_ms: 1234,
+			logs: 'ran',
+			...over
+		}) as any
+
+	beforeEach(() => {
+		localStorage.clear()
+		vi.clearAllMocks()
+		mocks.getCurrentModel.mockReturnValue({ provider: 'openai', model: 'gpt-4o' })
+	})
+
+	// Drive a registered+detached job to completion through the public poller entry
+	// (refreshBackgroundJobs polls immediately) and wait until the poller reports it.
+	async function completeDetachedJob(manager: AIChatManager) {
+		manager.markJobDetached('job-1')
+		manager.refreshBackgroundJobs()
+		await vi.waitFor(() => expect(manager.backgroundJobs[0]?.reported).toBe(true))
+	}
+
+	// A ChatJob carrying only its serializable resultFormat (no in-memory closure) —
+	// exactly the shape a job has after being rehydrated from IndexedDB on reload.
+	const datatableJob = {
+		jobId: 'job-1',
+		toolCallId: 'tc-1',
+		kind: 'script' as const,
+		label: 'SQL · main',
+		workspace: 'ws',
+		resultFormat: { kind: 'datatable' as const, datatableName: 'main' }
+	}
+
+	it('reconstructs the datatable result contract from the persisted resultFormat', async () => {
+		const manager = new AIChatManager()
+		manager.registerJob(datatableJob)
+		const applyToolStatus = vi.spyOn(manager, 'applyToolStatus')
+		mocks.getJob.mockResolvedValue(completed({ result: [{ n: 1 }, { n: 2 }] }))
+
+		await completeDetachedJob(manager)
+
+		// No live closure is involved: the descriptor alone reshapes both the tool card
+		// and the model note, so a job that detached and survived a reload still reports
+		// the SQL contract (row count + shaped rows) rather than generic job output.
+		expect(applyToolStatus).toHaveBeenCalledWith('tc-1', {
+			content: 'Query returned 2 row(s)',
+			result: JSON.stringify([{ n: 1 }, { n: 2 }], null, 2)
+		})
+		expect(manager.pendingJobNotes).toHaveLength(1)
+		expect(manager.pendingJobNotes[0]).toContain('"rowCount": 2')
+	})
+
+	it('skips reconstruction and emits no note for a canceled detached job', async () => {
+		const manager = new AIChatManager()
+		manager.registerJob(datatableJob)
+		const applyToolStatus = vi.spyOn(manager, 'applyToolStatus')
+		mocks.getJob.mockResolvedValue(completed({ success: false, canceled: true }))
+
+		await completeDetachedJob(manager)
+
+		// A user cancel isn't a result to shape or a completion to announce.
+		expect(manager.pendingJobNotes).toHaveLength(0)
+		expect(manager.backgroundJobs[0]?.status).toBe('canceled')
+		expect(applyToolStatus).toHaveBeenCalledWith('tc-1', {
+			content: 'Background job canceled',
+			logs: expect.anything()
+		})
+	})
+
+	it('falls back to the generic note when the job has no resultFormat', async () => {
+		const manager = new AIChatManager()
+		manager.registerJob({
+			jobId: 'job-1',
+			toolCallId: 'tc-1',
+			kind: 'script',
+			label: 'run',
+			workspace: 'ws'
+		})
+		mocks.getJob.mockResolvedValue(completed())
+
+		await completeDetachedJob(manager)
+
+		expect(manager.pendingJobNotes).toHaveLength(1)
+		expect(manager.pendingJobNotes[0]).toContain('Background job job-1 for "run" succeeded')
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/AIChatModelSettings.svelte b/frontend/src/lib/components/copilot/chat/AIChatModelSettings.svelte
new file mode 100644
index 0000000000..0a911134b6
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/AIChatModelSettings.svelte
@@ -0,0 +1,456 @@
+<script lang="ts">
+	import { ChevronDown, Check, User, Building2, Settings, ExternalLink } from 'lucide-svelte'
+	import DropdownV2 from '$lib/components/DropdownV2.svelte'
+	import DropdownSubmenuItem from '$lib/components/DropdownSubmenuItem.svelte'
+	import MenuItem from '$lib/components/meltComponents/MenuItem.svelte'
+	import MenuItemWrapper from '$lib/components/meltComponents/MenuItemWrapper.svelte'
+	import Button from '$lib/components/common/button/Button.svelte'
+	import {
+		COPILOT_SESSION_MODEL_SETTING_NAME,
+		COPILOT_SESSION_PROVIDER_SETTING_NAME,
+		COPILOT_SESSION_REASONING_SETTING_NAME,
+		userStore,
+		workspaceStore
+	} from '$lib/stores'
+	import { storeLocalSetting, type Item } from '$lib/utils'
+	import {
+		copilotInfo,
+		copilotSessionModel,
+		getUserCustomPrompts,
+		setCopilotInfo,
+		setUserCustomPrompts
+	} from '$lib/aiStore'
+	import { WorkspaceService, type AIProvider, type AIProviderModel } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+	import { base } from '$lib/base'
+	import AIPromptsModal from '$lib/components/settings/AIPromptsModal.svelte'
+	import { getAiChatManager } from './aiChatManagerContext'
+	import {
+		getReasoningCapability,
+		resolveEffectiveReasoning,
+		REASONING_OFF,
+		type ReasoningProviderModel
+	} from '../reasoningRegistry'
+
+	const aiChatManager = getAiChatManager()
+	const AI_SETTINGS_HREF = `${base}/workspace_settings?tab=ai`
+
+	let providerModel = $derived(
+		($copilotSessionModel ??
+			$copilotInfo.defaultModel ??
+			$copilotInfo.aiModels[0] ?? {
+				model: 'No model',
+				provider: 'No provider'
+			}) as ReasoningProviderModel
+	)
+	let models = $derived($copilotInfo.aiModels)
+
+	let capability = $derived(
+		getReasoningCapability(providerModel.provider as AIProvider, providerModel.model)
+	)
+	// Effective effort accounts for the default-on level on capable models.
+	let currentEffort = $derived(resolveEffectiveReasoning(providerModel))
+	// Slider stops: an off position only where the model can truly disable (else the
+	// provider would coerce it to the lowest level), then the provider-native levels.
+	let stops = $derived([...(capability.canDisable ? [REASONING_OFF] : []), ...capability.levels])
+	let currentStop = $derived(
+		providerModel.reasoning === REASONING_OFF
+			? REASONING_OFF
+			: (currentEffort ?? stops[stops.length - 1])
+	)
+	let stopIndex = $derived(Math.max(0, stops.indexOf(currentStop)))
+	// Percentage filled (accent) up to the thumb; the rest of the track stays surface-secondary.
+	let fillPct = $derived(stops.length > 1 ? Math.round((stopIndex / (stops.length - 1)) * 100) : 0)
+	// Button suffix: the effort token, or 'off' when explicitly disabled. Omitted entirely
+	// for models with no reasoning support.
+	let effortLabel = $derived(capability.supported ? (currentEffort ?? REASONING_OFF) : undefined)
+
+	// The trigger label resizes when the effort changes (e.g. dragging the slider while the menu
+	// is open). With a `bottom-end` popover anchored to the trigger's right edge, that resize would
+	// shift the popover. So we freeze the trigger to its width at open time and release it on close —
+	// no movement while open, and natural sizing (no reserved padding) the rest of the time.
+	let menuOpen = $state(false)
+	let triggerEl: HTMLElement | undefined = $state(undefined)
+	let lockedWidth = $state<number | undefined>(undefined)
+	$effect(() => {
+		if (menuOpen) {
+			if (lockedWidth === undefined && triggerEl) {
+				lockedWidth = triggerEl.getBoundingClientRect().width
+			}
+		} else {
+			lockedWidth = undefined
+		}
+	})
+
+	function selectModel(m: AIProviderModel) {
+		// Carry the effort onto the new model only if it supports that level ('off'
+		// only where the model can truly disable); otherwise drop it so the model's
+		// default applies.
+		const carried = providerModel.reasoning
+		const cap = getReasoningCapability(m.provider, m.model)
+		const keep =
+			carried === REASONING_OFF
+				? cap.canDisable
+				: carried !== undefined && cap.levels.includes(carried)
+		$copilotSessionModel = { ...m, ...(keep ? { reasoning: carried } : {}) }
+		storeLocalSetting(COPILOT_SESSION_MODEL_SETTING_NAME, m.model)
+		storeLocalSetting(COPILOT_SESSION_PROVIDER_SETTING_NAME, m.provider)
+		storeLocalSetting(COPILOT_SESSION_REASONING_SETTING_NAME, keep ? carried : undefined)
+	}
+
+	function selectReasoning(value: string) {
+		const reasoning = value === REASONING_OFF ? REASONING_OFF : value
+		$copilotSessionModel = {
+			...providerModel,
+			provider: providerModel.provider as AIProvider,
+			reasoning
+		}
+		// Pin the current model selection so the reasoning choice persists with it.
+		storeLocalSetting(COPILOT_SESSION_MODEL_SETTING_NAME, providerModel.model)
+		storeLocalSetting(COPILOT_SESSION_PROVIDER_SETTING_NAME, providerModel.provider)
+		storeLocalSetting(COPILOT_SESSION_REASONING_SETTING_NAME, reasoning)
+	}
+
+	// ---- prompt parameters (User / Workspace custom prompts) ----
+	let mode = $derived(aiChatManager.mode)
+	let modalOpen = $state(false)
+	let modalScope = $state<'user' | 'workspace'>('user')
+	let customPrompts = $state<Record<string, string>>({})
+	let initialPrompt = $state('')
+	// Snapshot of the mode the modal was opened for. The live chat mode can change
+	// while the modal is open (mode selector sits behind it), so all edit/save/reset
+	// operations must key off this snapshot, not the reactive `mode`.
+	let activeMode = $state(aiChatManager.mode)
+
+	let isAdmin = $derived(Boolean($userStore?.is_admin || $userStore?.is_super_admin))
+	// True when the workspace has no AI providers of its own (it uses instance defaults).
+	// In that case the backend never makes workspace custom_prompts effective, so a saved
+	// workspace prompt would be dead config — mirror the settings page and surface it read-only.
+	let workspaceMissingProviders = $state(false)
+	let modalReadOnly = $derived(
+		modalScope === 'workspace' && (!isAdmin || workspaceMissingProviders)
+	)
+	let readOnlyReason = $derived(
+		modalScope === 'workspace' && isAdmin && workspaceMissingProviders
+			? 'This workspace uses instance AI defaults, so a workspace prompt would have no effect. Configure workspace AI providers in AI settings first.'
+			: undefined
+	)
+	let hasChanges = $derived((customPrompts[activeMode] ?? '') !== initialPrompt)
+
+	function openUserPrompt() {
+		activeMode = mode
+		initialPrompt = getUserCustomPrompts()[activeMode] ?? ''
+		customPrompts = { [activeMode]: initialPrompt }
+		modalScope = 'user'
+		modalOpen = true
+	}
+
+	// Seed from the same source save() writes to (the raw workspace ai_config) and detect
+	// whether the workspace has its own providers in the same fetch. Non-admins can't read
+	// raw settings, so they see the effective prompt from copilotInfo (read-only).
+	async function openWorkspacePrompt() {
+		activeMode = mode
+		modalScope = 'workspace'
+		workspaceMissingProviders = false
+		if (!isAdmin) {
+			initialPrompt = $copilotInfo.customPrompts?.[activeMode] ?? ''
+		} else {
+			const workspace = $workspaceStore
+			try {
+				const settings = workspace ? await WorkspaceService.getSettings({ workspace }) : undefined
+				const providers = settings?.ai_config?.providers ?? {}
+				workspaceMissingProviders = Object.keys(providers).length === 0
+				initialPrompt = settings?.ai_config?.custom_prompts?.[activeMode] ?? ''
+			} catch (err) {
+				sendUserToast(`Failed to load workspace AI prompt: ${err}`, true)
+				initialPrompt = $copilotInfo.customPrompts?.[activeMode] ?? ''
+			}
+		}
+		customPrompts = { [activeMode]: initialPrompt }
+		modalOpen = true
+	}
+
+	function reset() {
+		customPrompts = { [activeMode]: initialPrompt }
+	}
+
+	async function save() {
+		const value = (customPrompts[activeMode] ?? '').trim()
+		if (modalScope === 'user') {
+			const prompts = getUserCustomPrompts()
+			if (value) {
+				prompts[activeMode] = value
+			} else {
+				delete prompts[activeMode]
+			}
+			setUserCustomPrompts(prompts)
+			initialPrompt = value
+			customPrompts = { [activeMode]: value }
+			sendUserToast('User AI prompt saved')
+			return
+		}
+
+		const workspace = $workspaceStore
+		if (!workspace) return
+		try {
+			// Saving prompts requires a full ai_config round-trip; fetch the current
+			// config so we don't clobber providers/models/etc.
+			const settings = await WorkspaceService.getSettings({ workspace })
+			const config = settings.ai_config ?? {}
+			const custom_prompts = { ...(config.custom_prompts ?? {}) }
+			if (value) {
+				custom_prompts[activeMode] = value
+			} else {
+				delete custom_prompts[activeMode]
+			}
+			const response = await WorkspaceService.editCopilotConfig({
+				workspace,
+				requestBody: { ...config, custom_prompts }
+			})
+			setCopilotInfo(response.effective_ai_config)
+			initialPrompt = value
+			customPrompts = { [activeMode]: value }
+			sendUserToast('Workspace AI prompt saved')
+		} catch (err) {
+			sendUserToast(`Failed to save workspace AI prompt: ${err}`, true)
+			// Re-throw so AIPromptsModal keeps the modal open on a failed save.
+			throw err
+		}
+	}
+
+	// Prompt parameters, surfaced as a melt submenu (hover-opens and is floating-positioned,
+	// so it flips on screen edges instead of overflowing). The menu keeps itself open on
+	// item click (closeOnItemClick=false), so these actions close it explicitly via `close`.
+	function paramItems(close: () => void): Item {
+		return {
+			displayName: 'Parameters',
+			icon: Settings,
+			submenuItems: [
+				{
+					displayName: 'User prompt',
+					icon: User,
+					action: () => {
+						close()
+						openUserPrompt()
+					}
+				},
+				{
+					displayName: 'Workspace prompt',
+					icon: Building2,
+					action: () => {
+						close()
+						openWorkspacePrompt()
+					}
+				},
+				{
+					displayName: 'AI settings',
+					icon: Settings,
+					href: AI_SETTINGS_HREF,
+					hrefTarget: '_blank',
+					separatorTop: true,
+					hide: !isAdmin,
+					extra: externalLinkIcon
+				}
+			]
+		}
+	}
+
+	// Keep the slider's pointer events from bubbling to the enclosing melt item: melt's
+	// roving focus blurs the focused element on pointermove, which would abort the native
+	// thumb drag. Direct (non-delegated) listeners so they run before melt's item listener.
+	function isolatePointer(node: HTMLElement) {
+		const stop = (e: Event) => e.stopPropagation()
+		node.addEventListener('pointerdown', stop)
+		node.addEventListener('pointermove', stop)
+		return {
+			destroy() {
+				node.removeEventListener('pointerdown', stop)
+				node.removeEventListener('pointermove', stop)
+			}
+		}
+	}
+
+	// Adjust the reasoning effort with the arrow keys while the Thinking item is focused.
+	function adjustEffort(e: KeyboardEvent) {
+		if (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight') return
+		e.preventDefault()
+		const next = Math.min(
+			stops.length - 1,
+			Math.max(0, stopIndex + (e.key === 'ArrowRight' ? 1 : -1))
+		)
+		selectReasoning(stops[next])
+	}
+</script>
+
+{#snippet externalLinkIcon()}
+	<ExternalLink size={14} class="shrink-0 text-secondary" />
+{/snippet}
+
+<DropdownV2
+	customMenu
+	placement="bottom-end"
+	fixedHeight={false}
+	closeOnItemClick={false}
+	bind:open={menuOpen}
+>
+	{#snippet buttonReplacement()}
+		<div
+			bind:this={triggerEl}
+			style={lockedWidth !== undefined ? `width: ${lockedWidth}px` : undefined}
+		>
+			<Button
+				nonCaptureEvent
+				unifiedSize="2xs"
+				variant="subtle"
+				endIcon={{ icon: ChevronDown }}
+				btnClasses="w-full max-w-[200px] text-secondary font-normal"
+				title="Model & reasoning settings"
+			>
+				<span class="flex items-center gap-1 min-w-0">
+					<span class="truncate">{providerModel.model}</span>
+					{#if effortLabel}
+						<span class="shrink-0 text-tertiary">· {effortLabel}</span>
+					{/if}
+				</span>
+			</Button>
+		</div>
+	{/snippet}
+	{#snippet menu({ item, builders, close })}
+		<div
+			class="bg-surface-tertiary dark:border w-64 origin-top-right rounded-lg shadow-lg focus:outline-none py-1 text-xs"
+		>
+			<!-- Melt submenu: hover-opens and is floating-positioned (flips on screen edges). -->
+			<DropdownSubmenuItem item={paramItems(close)} {builders} meltItem={item} />
+
+			<div class="my-1 border-t border-border-light"></div>
+			<div class="px-3 pt-1.5 pb-1 text-2xs uppercase tracking-wide text-secondary">Model</div>
+			<div class="max-h-48 overflow-y-auto">
+				{#each models as m (m.provider + m.model)}
+					<MenuItem
+						{item}
+						class="w-full flex items-center gap-2 px-3 py-1.5 text-left font-normal hover:bg-surface-hover data-[highlighted]:bg-surface-hover rounded-sm transition-colors cursor-pointer"
+						onClick={() => selectModel(m)}
+					>
+						<span class="truncate grow min-w-0">{m.model}</span>
+						{#if m.model === providerModel.model && m.provider === providerModel.provider}
+							<Check size={14} class="shrink-0 text-primary" />
+						{/if}
+					</MenuItem>
+				{/each}
+			</div>
+
+			<div class="my-1 border-t border-border-light"></div>
+			{#if capability.supported}
+				<!-- Registered as a melt item so it joins the roving focus/highlight (and arrow
+				     up/down navigation), and so hovering it takes the highlight off the Parameters
+				     trigger. Left/right adjust the effort; the slider's input handler also drives it. -->
+				<MenuItemWrapper {item} onKeydown={adjustEffort} class="block group">
+					<div class="px-3 pt-1 pb-0.5 flex items-center justify-between">
+						<span class="text-2xs uppercase tracking-wide text-secondary">Thinking</span>
+						<span class="text-2xs text-secondary tabular-nums">{currentStop}</span>
+					</div>
+					{#if stops.length > 1}
+						<!-- Only the slider area reflects the item's highlight, not the header. -->
+						<div
+							class="px-3 py-1.5 rounded-sm transition-colors group-data-[highlighted]:bg-surface-hover"
+						>
+							<input
+								type="range"
+								min="0"
+								max={stops.length - 1}
+								step="1"
+								value={stopIndex}
+								style="--fill: {fillPct}%"
+								oninput={(e) => selectReasoning(stops[+e.currentTarget.value])}
+								use:isolatePointer
+								class="lean-range no-default-style w-full"
+								aria-label="Reasoning effort"
+							/>
+						</div>
+					{/if}
+				</MenuItemWrapper>
+			{:else}
+				<!-- Reasoning unsupported: keep the section but show it disabled with a reason,
+				     rather than hiding it. Not a melt item, so it's skipped by keyboard navigation. -->
+				<div class="px-3 pt-1 pb-1.5 opacity-60 cursor-default" aria-disabled="true">
+					<div class="text-2xs uppercase tracking-wide text-secondary">Thinking</div>
+					<div class="text-2xs text-tertiary mt-0.5">Not supported by this model</div>
+				</div>
+			{/if}
+		</div>
+	{/snippet}
+</DropdownV2>
+
+<AIPromptsModal
+	bind:open={modalOpen}
+	bind:customPrompts
+	scope={modalScope}
+	modes={[activeMode]}
+	readOnly={modalReadOnly}
+	{readOnlyReason}
+	onSave={modalReadOnly ? undefined : save}
+	onReset={reset}
+	{hasChanges}
+	title={modalScope === 'user' ? 'User AI prompt' : 'Workspace AI prompt'}
+	target="body"
+	fixedHeight="sm"
+	settingsHref={isAdmin ? AI_SETTINGS_HREF : undefined}
+/>
+
+<style>
+	/* Lean reasoning slider: a thin track and a small, borderless accent thumb. Native range
+	   thumbs can't be styled with Tailwind, and Svelte prunes scoped vendor pseudo-element
+	   rules — so they are wrapped in :global (the class is unique to this component). */
+	.lean-range {
+		-webkit-appearance: none;
+		appearance: none;
+		height: 10px;
+		margin: 0;
+		padding: 0;
+		/* override the global `input { background-color: ... !important }` so only the
+		   thin track shows, not a full-height band behind it */
+		background-color: transparent !important;
+		cursor: pointer;
+		outline: none;
+	}
+	.lean-range:focus,
+	.lean-range:focus-visible {
+		outline: none;
+	}
+	:global(.lean-range::-webkit-slider-runnable-track) {
+		height: 3px;
+		border-radius: 9999px;
+		background: linear-gradient(
+			to right,
+			rgb(var(--color-surface-accent-primary)) var(--fill, 0%),
+			rgb(var(--color-surface-secondary)) var(--fill, 0%)
+		);
+	}
+	:global(.lean-range::-webkit-slider-thumb) {
+		-webkit-appearance: none;
+		appearance: none;
+		margin-top: -3.5px;
+		width: 10px;
+		height: 10px;
+		border: none;
+		border-radius: 9999px;
+		background: rgb(var(--color-surface-accent-primary));
+	}
+	:global(.lean-range::-moz-range-track) {
+		height: 3px;
+		border-radius: 9999px;
+		background: rgb(var(--color-surface-secondary));
+	}
+	:global(.lean-range::-moz-range-progress) {
+		height: 3px;
+		border-radius: 9999px;
+		background: rgb(var(--color-surface-accent-primary));
+	}
+	:global(.lean-range::-moz-range-thumb) {
+		width: 10px;
+		height: 10px;
+		border: none;
+		border-radius: 9999px;
+		background: rgb(var(--color-surface-accent-primary));
+	}
+</style>
diff --git a/frontend/src/lib/components/copilot/chat/AIChatSettingsMenu.svelte b/frontend/src/lib/components/copilot/chat/AIChatSettingsMenu.svelte
deleted file mode 100644
index 683bf3c586..0000000000
--- a/frontend/src/lib/components/copilot/chat/AIChatSettingsMenu.svelte
+++ /dev/null
@@ -1,186 +0,0 @@
-<script lang="ts">
-	import DropdownV2 from '$lib/components/DropdownV2.svelte'
-	import Button from '$lib/components/common/button/Button.svelte'
-	import { Building2, ExternalLink, Settings, User } from 'lucide-svelte'
-	import AIPromptsModal from '$lib/components/settings/AIPromptsModal.svelte'
-	import { getAiChatManager } from './aiChatManagerContext'
-	import {
-		copilotInfo,
-		getUserCustomPrompts,
-		setCopilotInfo,
-		setUserCustomPrompts
-	} from '$lib/aiStore'
-	import { userStore, workspaceStore } from '$lib/stores'
-	import { WorkspaceService } from '$lib/gen'
-	import { sendUserToast } from '$lib/toast'
-	import type { Item } from '$lib/utils'
-	import { base } from '$lib/base'
-
-	const AI_SETTINGS_HREF = `${base}/workspace_settings?tab=ai`
-
-	// Quick access to the AI prompt preferences (user + workspace) for the
-	// current chat mode, surfaced next to the model selector in the AI chat.
-	const aiChatManager = getAiChatManager()
-	let mode = $derived(aiChatManager.mode)
-
-	let modalOpen = $state(false)
-	let modalScope = $state<'user' | 'workspace'>('user')
-	let customPrompts = $state<Record<string, string>>({})
-	let initialPrompt = $state('')
-	// Snapshot of the mode the modal was opened for. The live chat mode can change
-	// while the modal is open (mode selector sits behind it), so all edit/save/reset
-	// operations must key off this snapshot, not the reactive `mode`.
-	let activeMode = $state(aiChatManager.mode)
-
-	let isAdmin = $derived(Boolean($userStore?.is_admin || $userStore?.is_super_admin))
-	// True when the workspace has no AI providers of its own (it uses instance defaults).
-	// In that case the backend never makes workspace custom_prompts effective
-	// (get_copilot_info returns the instance config verbatim), so a saved workspace prompt
-	// would be dead config — mirror the settings page and surface the prompt read-only.
-	let workspaceMissingProviders = $state(false)
-	// Workspace prompts are admin-only to edit; non-admins (and admins on a workspace
-	// without its own providers) get a read-only view.
-	let modalReadOnly = $derived(
-		modalScope === 'workspace' && (!isAdmin || workspaceMissingProviders)
-	)
-	let readOnlyReason = $derived(
-		modalScope === 'workspace' && isAdmin && workspaceMissingProviders
-			? 'This workspace uses instance AI defaults, so a workspace prompt would have no effect. Configure workspace AI providers in AI settings first.'
-			: undefined
-	)
-	let hasChanges = $derived((customPrompts[activeMode] ?? '') !== initialPrompt)
-
-	function openUserPrompt() {
-		activeMode = mode
-		initialPrompt = getUserCustomPrompts()[activeMode] ?? ''
-		customPrompts = { [activeMode]: initialPrompt }
-		modalScope = 'user'
-		modalOpen = true
-	}
-
-	// Seed from the same source save() writes to (the raw workspace ai_config) and detect
-	// whether the workspace has its own providers in the same fetch. Non-admins can't read
-	// raw settings, so they see the effective prompt from copilotInfo (read-only).
-	async function openWorkspacePrompt() {
-		activeMode = mode
-		modalScope = 'workspace'
-		workspaceMissingProviders = false
-		if (!isAdmin) {
-			initialPrompt = $copilotInfo.customPrompts?.[activeMode] ?? ''
-		} else {
-			const workspace = $workspaceStore
-			try {
-				const settings = workspace ? await WorkspaceService.getSettings({ workspace }) : undefined
-				const providers = settings?.ai_config?.providers ?? {}
-				workspaceMissingProviders = Object.keys(providers).length === 0
-				initialPrompt = settings?.ai_config?.custom_prompts?.[activeMode] ?? ''
-			} catch (err) {
-				sendUserToast(`Failed to load workspace AI prompt: ${err}`, true)
-				initialPrompt = $copilotInfo.customPrompts?.[activeMode] ?? ''
-			}
-		}
-		customPrompts = { [activeMode]: initialPrompt }
-		modalOpen = true
-	}
-
-	function reset() {
-		customPrompts = { [activeMode]: initialPrompt }
-	}
-
-	async function save() {
-		const value = (customPrompts[activeMode] ?? '').trim()
-		if (modalScope === 'user') {
-			const prompts = getUserCustomPrompts()
-			if (value) {
-				prompts[activeMode] = value
-			} else {
-				delete prompts[activeMode]
-			}
-			setUserCustomPrompts(prompts)
-			initialPrompt = value
-			// Sync the editor to the trimmed value so hasChanges resets to false.
-			customPrompts = { [activeMode]: value }
-			sendUserToast('User AI prompt saved')
-			return
-		}
-
-		const workspace = $workspaceStore
-		if (!workspace) return
-		try {
-			// Saving prompts requires a full ai_config round-trip; fetch the
-			// current config so we don't clobber providers/models/etc.
-			const settings = await WorkspaceService.getSettings({ workspace })
-			const config = settings.ai_config ?? {}
-			const custom_prompts = { ...(config.custom_prompts ?? {}) }
-			if (value) {
-				custom_prompts[activeMode] = value
-			} else {
-				delete custom_prompts[activeMode]
-			}
-			const response = await WorkspaceService.editCopilotConfig({
-				workspace,
-				requestBody: { ...config, custom_prompts }
-			})
-			// Editing is gated on the workspace having its own providers, so effective_ai_config
-			// equals the saved config (it only falls back to the instance config when the
-			// workspace has none) and already carries the custom_prompts we just wrote.
-			setCopilotInfo(response.effective_ai_config)
-			initialPrompt = value
-			// Sync the editor to the trimmed value so hasChanges resets to false.
-			customPrompts = { [activeMode]: value }
-			sendUserToast('Workspace AI prompt saved')
-		} catch (err) {
-			sendUserToast(`Failed to save workspace AI prompt: ${err}`, true)
-			// Re-throw so AIPromptsModal keeps the modal open on a failed save.
-			throw err
-		}
-	}
-
-	let items = $derived<Item[]>([
-		{ displayName: 'User prompt', icon: User, action: openUserPrompt },
-		{ displayName: 'Workspace prompt', icon: Building2, action: openWorkspacePrompt },
-		{
-			displayName: 'AI settings',
-			icon: Settings,
-			href: AI_SETTINGS_HREF,
-			hrefTarget: '_blank',
-			separatorTop: true,
-			hide: !isAdmin,
-			extra: externalLinkIcon
-		}
-	])
-</script>
-
-{#snippet externalLinkIcon()}
-	<ExternalLink size={14} class="shrink-0 text-secondary" />
-{/snippet}
-
-<DropdownV2 {items} placement="bottom-end" fixedHeight={false}>
-	{#snippet buttonReplacement()}
-		<Button
-			nonCaptureEvent
-			unifiedSize="2xs"
-			variant="subtle"
-			iconOnly
-			startIcon={{ icon: Settings }}
-			btnClasses="text-secondary"
-			title="AI prompt settings"
-		/>
-	{/snippet}
-</DropdownV2>
-
-<AIPromptsModal
-	bind:open={modalOpen}
-	bind:customPrompts
-	scope={modalScope}
-	modes={[activeMode]}
-	readOnly={modalReadOnly}
-	{readOnlyReason}
-	onSave={modalReadOnly ? undefined : save}
-	onReset={reset}
-	{hasChanges}
-	title={modalScope === 'user' ? 'User AI prompt' : 'Workspace AI prompt'}
-	target="body"
-	fixedHeight="sm"
-	settingsHref={isAdmin ? AI_SETTINGS_HREF : undefined}
-/>
diff --git a/frontend/src/lib/components/copilot/chat/AiChatLayout.svelte b/frontend/src/lib/components/copilot/chat/AiChatLayout.svelte
index 33112b43e8..19c06c4330 100644
--- a/frontend/src/lib/components/copilot/chat/AiChatLayout.svelte
+++ b/frontend/src/lib/components/copilot/chat/AiChatLayout.svelte
@@ -14,7 +14,9 @@
 
 	interface Props {
 		noPadding?: boolean
-		isCollapsed?: boolean
+		// Rail width in rem (scales with the root font-size, like the rail itself).
+		sidebarWidth?: number
+		transitionClass?: string
 		isMobile?: boolean
 		children: any
 		onMenuOpen?: () => void
@@ -22,13 +24,18 @@
 	}
 	let {
 		noPadding: noBorder = false,
-		isCollapsed = false,
+		sidebarWidth = 13,
+		transitionClass = 'transition-all ease-in-out duration-200',
 		isMobile = false,
 		children,
 		onMenuOpen,
 		disableAi
 	}: Props = $props()
 
+	// The desktop rail is fixed-positioned, so the content is offset by a matching
+	// left padding (in rem, matching the rail). Mobile/operator/borderless: no rail.
+	let contentPadLeft = $derived(noBorder || $userStore?.operator || isMobile ? 0 : sidebarWidth)
+
 	$effect(() => {
 		if (disableAi) {
 			chatState.size = 0
@@ -73,11 +80,8 @@
 		<Pane size={100 - chatState.size} minSize={50} class="flex flex-col grow min-h-0 ">
 			<div
 				id="content"
-				class={classNames(
-					'w-full flex-1 flex flex-col overflow-y-auto min-h-0',
-					noBorder || $userStore?.operator || isMobile ? '!pl-0' : isCollapsed ? 'pl-12' : 'pl-40',
-					'transition-all ease-in-out duration-200'
-				)}
+				class={classNames('w-full flex-1 flex flex-col overflow-y-auto min-h-0', transitionClass)}
+				style:padding-left="{contentPadLeft}rem"
 			>
 				<main class="flex-1 flex flex-col min-h-0">
 					<div class="relative w-full flex-1 flex flex-col min-h-0">
@@ -101,11 +105,9 @@
 	</Splitpanes>
 {:else}
 	<div
-		class={classNames(
-			'flex-1 min-h-0 flex flex-col',
-			noBorder || $userStore?.operator || isMobile ? '' : isCollapsed ? 'pl-12' : 'pl-40',
-			'transition-all ease-in-out duration-200'
-		)}
+		id="content"
+		class={classNames('flex-1 min-h-0 flex flex-col', transitionClass)}
+		style:padding-left="{contentPadLeft}rem"
 	>
 		{@render burgerRow()}
 		<div class="flex-1 min-h-0 flex flex-col">
diff --git a/frontend/src/lib/components/copilot/chat/AskUserQuestionDisplay.svelte b/frontend/src/lib/components/copilot/chat/AskUserQuestionDisplay.svelte
index 7a7a7014ea..d17d77af29 100644
--- a/frontend/src/lib/components/copilot/chat/AskUserQuestionDisplay.svelte
+++ b/frontend/src/lib/components/copilot/chat/AskUserQuestionDisplay.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { onMount, tick } from 'svelte'
-	import { CircleHelp, ArrowUp } from 'lucide-svelte'
+	import { SvelteSet } from 'svelte/reactivity'
+	import { CircleHelp, ArrowUp, Plus, Square, SquareCheck } from 'lucide-svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import TextInput from '$lib/components/text_input/TextInput.svelte'
 	import { getAiChatManager } from './aiChatManagerContext'
@@ -20,36 +21,86 @@
 
 	let { toolCallId, userQuestion }: Props = $props()
 
+	const multiSelect = $derived(userQuestion.multiSelect === true)
+
+	// Multi-select choices accumulate here until the user explicitly submits — a
+	// SvelteSet (not a plain Set) so `.add()/.delete()` drive Svelte reactivity.
+	let picked = new SvelteSet<string>()
+
+	// Surface picked custom answers as their own toggle rows so the user can see
+	// and un-pick them before submitting; a value equal to a proposed choice just
+	// checks that choice rather than adding a duplicate row.
+	const customPicked = $derived(
+		multiSelect ? [...picked].filter((p) => !userQuestion.choices.includes(p)) : []
+	)
+	const displayedChoices = $derived([...userQuestion.choices, ...customPicked])
+
+	let cardNode = $state<HTMLDivElement | undefined>()
 	let choiceButtons = $state<(HTMLButtonElement | undefined)[]>([])
+	let submitButton = $state<HTMLButtonElement | undefined>()
 	let customAnswerInput = $state<TextInput | undefined>()
 	let customAnswer = $state('')
 	let canSubmitCustomAnswer = $derived(customAnswer.trim().length > 0)
 
-	// The custom-answer input is the last stop in the roving cursor, after all
-	// choices, so arrow navigation can reach it from the keyboard.
-	const customAnswerIndex = $derived(userQuestion.choices.length)
-	const itemCount = $derived(userQuestion.choices.length + 1)
-	// The item currently under the keyboard cursor. Mirrored onto the matching
-	// choice's `selected` prop so the highlight comes from the Button itself.
+	// Submit joins the roving cursor only while it is actionable: a disabled
+	// Button carries tabindex=-1, so an empty-selection Submit can't take focus
+	// and would strand arrow-key navigation on it. Excluding it from itemCount
+	// when unreachable keeps the wraparound landing on real, focusable stops.
+	const submitReachable = $derived(multiSelect && picked.size > 0)
+
+	// The custom-answer input is the next stop in the roving cursor after all
+	// (proposed + custom) choice rows; Submit follows it when reachable.
+	const customAnswerIndex = $derived(displayedChoices.length)
+	const submitIndex = $derived(submitReachable ? displayedChoices.length + 1 : -1)
+	const itemCount = $derived(displayedChoices.length + 1 + (submitReachable ? 1 : 0))
+	// The item currently under the keyboard cursor. In single mode it is mirrored
+	// onto the matching choice's `selected` prop for the highlight; in multi mode
+	// `selected` is reserved for checked state, so the cursor shows as a focus ring.
 	let activeIndex = $state(0)
 
 	onMount(() => {
 		void tick().then(() => {
-			focusIndex(0)
+			// preventScroll: a scrolling focus() strands the taller multi-select card's
+			// Submit below the fold. The container auto-scroll is a stick-to-bottom that
+			// stops once the user scrolls up, so reveal the card itself instead.
+			focusIndex(0, { preventScroll: true })
+			cardNode?.scrollIntoView({ block: 'nearest' })
 		})
 	})
 
-	function focusIndex(index: number) {
+	function focusIndex(index: number, opts?: FocusOptions) {
 		activeIndex = index
 		if (index === customAnswerIndex) {
 			customAnswerInput?.focus()
+		} else if (index === submitIndex) {
+			submitButton?.focus(opts)
 		} else {
-			choiceButtons[index]?.focus()
+			choiceButtons[index]?.focus(opts)
 		}
 	}
 
+	// Cmd/Ctrl+Enter finalizes a multi-select answer from anywhere in the card.
+	function isSubmitShortcut(event: KeyboardEvent): boolean {
+		return event.key === 'Enter' && (event.metaKey || event.ctrlKey)
+	}
+
 	function selectChoice(choice: string) {
-		aiChatManager.handleUserQuestionAnswer(toolCallId, choice)
+		if (multiSelect) {
+			if (picked.has(choice)) {
+				picked.delete(choice)
+			} else {
+				picked.add(choice)
+			}
+			return
+		}
+		aiChatManager.handleUserQuestionAnswer(toolCallId, [choice])
+	}
+
+	function submitPicked() {
+		if (!multiSelect || picked.size === 0) {
+			return
+		}
+		aiChatManager.handleUserQuestionAnswer(toolCallId, [...picked])
 	}
 
 	function submitCustomAnswer() {
@@ -58,10 +109,27 @@
 			return
 		}
 
-		aiChatManager.handleUserQuestionAnswer(toolCallId, answer)
+		if (multiSelect) {
+			// Clear after queuing so the user can add more answers before Submit.
+			picked.add(answer)
+			customAnswer = ''
+			// The list grew under the still-focused input, shifting its roving index;
+			// resync so a later background-area click refocuses the input, not the new row.
+			activeIndex = customAnswerIndex
+			return
+		}
+
+		aiChatManager.handleUserQuestionAnswer(toolCallId, [answer])
 	}
 
 	function handleChoiceKeydown(event: KeyboardEvent, choice: string, index: number) {
+		if (multiSelect && isSubmitShortcut(event)) {
+			event.preventDefault()
+			event.stopPropagation()
+			submitPicked()
+			return
+		}
+
 		if (event.key === 'ArrowDown' || event.key === 'ArrowRight') {
 			event.preventDefault()
 			event.stopPropagation()
@@ -79,7 +147,14 @@
 		if (event.key === 'Enter') {
 			event.preventDefault()
 			event.stopPropagation()
+			// A custom row is only present while picked, so toggling it here removes
+			// it and unmounts the button — redirect focus to a stable stop so the
+			// keyboard flow survives. Proposed choices stay mounted when unchecked.
+			const removesRow = customPicked.includes(choice)
 			selectChoice(choice)
+			if (removesRow) {
+				void tick().then(() => focusIndex(customAnswerIndex))
+			}
 		}
 	}
 
@@ -113,6 +188,13 @@
 	}
 
 	function handleCustomAnswerKeydown(event: KeyboardEvent) {
+		if (multiSelect && isSubmitShortcut(event)) {
+			event.preventDefault()
+			event.stopPropagation()
+			submitPicked()
+			return
+		}
+
 		// Only ArrowUp/ArrowDown roam out of the input — Left/Right stay free for
 		// moving the text caret within the answer.
 		if (event.key === 'ArrowUp') {
@@ -135,32 +217,67 @@
 			submitCustomAnswer()
 		}
 	}
+
+	function handleSubmitKeydown(event: KeyboardEvent) {
+		if (event.key === 'ArrowDown' || event.key === 'ArrowRight') {
+			event.preventDefault()
+			event.stopPropagation()
+			focusIndex((submitIndex + 1) % itemCount)
+			return
+		}
+
+		if (event.key === 'ArrowUp' || event.key === 'ArrowLeft') {
+			event.preventDefault()
+			event.stopPropagation()
+			focusIndex((submitIndex - 1 + itemCount) % itemCount)
+			return
+		}
+
+		if (event.key === 'Enter') {
+			event.preventDefault()
+			event.stopPropagation()
+			submitPicked()
+		}
+	}
 </script>
 
+<!-- scroll-mb clears the chat's sticky "Waiting for your input" chip (pinned at the
+     viewport bottom) so the mount scrollIntoView leaves the Submit button uncovered. -->
 <div
-	class="rounded-md border border-border-light bg-surface p-3"
+	bind:this={cardNode}
+	class="scroll-mb-8 rounded-md border border-border-light bg-surface p-3"
 	data-chat-keyboard-scope="ask-user-question"
 	use:focusActiveOnBackgroundClick
 >
 	<div class="flex items-start gap-2">
-		<CircleHelp class="mt-0.5 h-4 w-4 shrink-0 text-accent" />
+		<CircleHelp class="h-4 w-4 shrink-0 text-accent" />
 		<p class="min-w-0 flex-1 whitespace-pre-wrap text-xs font-semibold text-emphasis"
 			>{userQuestion.question}</p
 		>
 	</div>
 
 	<div class="mt-3 flex flex-col gap-2">
-		{#each userQuestion.choices as choice, index (index)}
+		{#each displayedChoices as choice, index (index)}
 			<Button
 				variant="default"
 				unifiedSize="sm"
-				selected={activeIndex === index}
+				selected={multiSelect ? picked.has(choice) : activeIndex === index}
 				bind:element={choiceButtons[index]}
 				onClick={() => selectChoice(choice)}
 				onkeydown={(event) => handleChoiceKeydown(event, choice, index)}
 				onfocus={() => (activeIndex = index)}
-				btnClasses="h-auto min-h-7 justify-start whitespace-normal py-1.5 text-left focus-visible:!ring-0 focus-visible:!outline-none"
+				btnClasses={`h-auto min-h-7 justify-start whitespace-normal py-1.5 text-left ${
+					multiSelect ? '' : 'focus-visible:!ring-0 focus-visible:!outline-none'
+				}`}
 			>
+				{#if multiSelect}
+					<!-- Show an empty box on every row, not only when checked, so multi-select is obvious up front. -->
+					{#if picked.has(choice)}
+						<SquareCheck class="mr-2 h-4 w-4 shrink-0" />
+					{:else}
+						<Square class="mr-2 h-4 w-4 shrink-0 text-secondary" />
+					{/if}
+				{/if}
 				<span class="break-words">{choice}</span>
 			</Button>
 		{/each}
@@ -182,12 +299,27 @@
 				variant="subtle"
 				unifiedSize="sm"
 				iconOnly
-				title="Send"
-				startIcon={{ icon: ArrowUp }}
+				title={multiSelect ? 'Add answer' : 'Send'}
+				startIcon={{ icon: multiSelect ? Plus : ArrowUp }}
 				disabled={!canSubmitCustomAnswer}
 				onClick={submitCustomAnswer}
 				btnClasses="shrink-0"
 			/>
 		</div>
+
+		{#if multiSelect}
+			<Button
+				variant="accent"
+				unifiedSize="sm"
+				bind:element={submitButton}
+				disabled={picked.size === 0}
+				onClick={submitPicked}
+				onkeydown={handleSubmitKeydown}
+				onfocus={() => (activeIndex = submitIndex)}
+				btnClasses="mt-1"
+			>
+				Submit{picked.size > 0 ? ` (${picked.size})` : ''}
+			</Button>
+		{/if}
 	</div>
 </div>
diff --git a/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte b/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte
index dd6e6a73a2..80cd446d13 100644
--- a/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte
+++ b/frontend/src/lib/components/copilot/chat/AssistantMessage.svelte
@@ -3,6 +3,7 @@
 	import { gfmPlugin } from 'svelte-exmarkdown/gfm'
 	import { twMerge } from 'tailwind-merge'
 	import { Brain, ChevronDown, ChevronRight, Loader2 } from 'lucide-svelte'
+	import { slide } from 'svelte/transition'
 	import type { DisplayMessage } from './shared'
 	import CodeDisplay from './script/CodeDisplay.svelte'
 	import LinkRenderer from './LinkRenderer.svelte'
@@ -95,6 +96,7 @@
 
 		{#if reasoningExpanded}
 			<div
+				transition:slide={{ duration: 150 }}
 				class="p-2 bg-surface text-secondary break-words prose prose-sm dark:prose-invert max-w-full leading-snug
 					prose-p:text-2xs prose-li:text-2xs prose-code:text-2xs prose-pre:text-2xs prose-ul:!pl-5
 					prose-headings:font-medium prose-headings:text-secondary prose-headings:mt-2 prose-headings:mb-1
diff --git a/frontend/src/lib/components/copilot/chat/ChatCommandPicker.svelte b/frontend/src/lib/components/copilot/chat/ChatCommandPicker.svelte
new file mode 100644
index 0000000000..6cd72e50db
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/ChatCommandPicker.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+	import { Sparkles } from 'lucide-svelte'
+	import DrillPicker from '$lib/components/DrillPicker.svelte'
+	import type { DrillLeaf, DrillNode } from '$lib/components/drillPicker'
+	import type { AiSkillListItem } from './global/core'
+
+	interface Props {
+		skills: AiSkillListItem[]
+		onSelect: (skill: AiSkillListItem) => void
+		setShowing?: (showing: boolean) => void
+		externalFilter?: string
+		autoFocus?: boolean
+	}
+
+	let { skills, onSelect, setShowing, externalFilter, autoFocus = true }: Props = $props()
+
+	type DrillPickerHandle = {
+		handleKeydown: (e: KeyboardEvent) => void
+	}
+
+	let inner = $state<DrillPickerHandle | undefined>(undefined)
+
+	const tree = $derived<DrillNode<AiSkillListItem>[]>(
+		skills.map((skill) => ({
+			type: 'leaf' as const,
+			key: `skill:${skill.name}`,
+			label: `/${skill.name}`,
+			secondary: skill.description,
+			searchableText: `${skill.name} ${skill.description}`,
+			data: skill
+		}))
+	)
+
+	export function handleKeydown(e: KeyboardEvent) {
+		inner?.handleKeydown(e)
+	}
+
+	function handlePick(leaf: DrillLeaf<AiSkillListItem>) {
+		onSelect(leaf.data)
+	}
+
+	function onDocumentKeydown(e: KeyboardEvent) {
+		if (e.key === 'Escape' && !e.defaultPrevented) {
+			setShowing?.(false)
+		}
+	}
+
+	$effect(() => {
+		document.addEventListener('keydown', onDocumentKeydown)
+		return () => document.removeEventListener('keydown', onDocumentKeydown)
+	})
+</script>
+
+{#snippet skillIcon(_leaf: DrillLeaf<AiSkillListItem>)}
+	<Sparkles size={12} class="shrink-0 text-tertiary" />
+{/snippet}
+
+<div class="w-[min(340px,calc(100vw-20px))] max-h-64 overflow-hidden">
+	<DrillPicker
+		bind:this={inner}
+		{tree}
+		onPick={handlePick}
+		{externalFilter}
+		{autoFocus}
+		leafIcon={skillIcon}
+		flush
+	/>
+</div>
diff --git a/frontend/src/lib/components/copilot/chat/ChatContextPicker.svelte b/frontend/src/lib/components/copilot/chat/ChatContextPicker.svelte
index c083f9eab8..45a81113a3 100644
--- a/frontend/src/lib/components/copilot/chat/ChatContextPicker.svelte
+++ b/frontend/src/lib/components/copilot/chat/ChatContextPicker.svelte
@@ -4,21 +4,23 @@ AI chat `@`-mention dropdown. Mounts the generic `DrillPicker` with a
 unified tree:
 
   Diffs / Modules / Databases / Workspace
-                                     ├── All / Flows / Scripts
+                                     ├── All / Flows / Scripts / Apps
                                      │       └── f/scope/sub/leaf …
 
 The Diffs / Modules / Databases branches are synthesized from the chat's
 in-memory `availableContext`. The Workspace branch delegates to
 `buildWorkspaceTree` so the picker shares the workspace caching machinery
-with the standalone picker used by `EditorHeader`.
+with the standalone picker used by `EditorHeader`. The Apps branch only
+appears in GLOBAL chat and lists raw (code-based) apps; visual apps are
+excluded.
 
 On a workspace-leaf pick, emits a reference-only `WorkspaceScriptElement` /
-`WorkspaceFlowElement` (path + title + summary). Content is materialized
-at message-prep time by `AIChatManager` — see PR #9216.
+`WorkspaceFlowElement` / `WorkspaceAppElement` (path + title + summary).
+Content is materialized at message-prep time by `AIChatManager` — see PR #9216.
 -->
 <script lang="ts">
 	import { workspaceStore } from '$lib/stores'
-	import { Database, Diff, Layers } from 'lucide-svelte'
+	import { Database, Diff, FileText, Folder, Layers } from 'lucide-svelte'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 	import FlowModuleIcon from '$lib/components/flows/FlowModuleIcon.svelte'
 	import RowIcon from '$lib/components/common/table/RowIcon.svelte'
@@ -28,9 +30,14 @@ at message-prep time by `AIChatManager` — see PR #9216.
 	import { type WorkspaceItem, type WorkspaceItemKind } from '$lib/components/workspacePicker'
 	import { useWorkspaceItemsLoader } from '$lib/components/workspaceItemsLoader.svelte'
 	import { buildWorkspaceTree, relativizeWorkspacePath } from '$lib/components/workspaceTree'
+	import { getFileIcon } from '$lib/components/icons/fileIcon'
+	import { getAiChatManager } from './aiChatManagerContext'
+	import { AIMode } from './AIChatManager.svelte'
+	import type { AttachedFile, AttachedFolder } from './files/attachedFiles.svelte'
 	import {
 		ContextIconMap,
 		type ContextElement,
+		type WorkspaceAppElement,
 		type WorkspaceFlowElement,
 		type WorkspaceScriptElement
 	} from './context'
@@ -40,6 +47,9 @@ at message-prep time by `AIChatManager` — see PR #9216.
 		selectedContext: ContextElement[]
 		onSelect: (element: ContextElement) => void
 		onSelectWorkspaceItem?: (element: ContextElement) => void
+		/** GLOBAL-chat only: pick an attached file to insert a plain `@filename`
+		 * mention. When omitted, the Files branch is not surfaced. */
+		onSelectFile?: (name: string) => void
 		setShowing?: (showing: boolean) => void
 		externalFilter?: string
 		autoFocus?: boolean
@@ -50,14 +60,19 @@ at message-prep time by `AIChatManager` — see PR #9216.
 		selectedContext,
 		onSelect,
 		onSelectWorkspaceItem,
+		onSelectFile,
 		setShowing,
 		externalFilter,
 		autoFocus = true
 	}: Props = $props()
 
-	// Chat tree leaves carry either a workspace path (resolved to content
-	// at pick time) or a runtime ContextElement (added directly).
-	type ChatLeafData = WorkspaceItem | ContextElement
+	const aiChatManager = getAiChatManager()
+
+	// Chat tree leaves carry either a workspace path (resolved to content at
+	// pick time), a runtime ContextElement (added directly), or an attached
+	// file name (inserts an `@filename` mention).
+	type FileLeafData = { fileName: string }
+	type ChatLeafData = WorkspaceItem | ContextElement | FileLeafData
 	type DrillPickerHandle = {
 		handleKeydown: (e: KeyboardEvent) => void
 	}
@@ -78,14 +93,26 @@ at message-prep time by `AIChatManager` — see PR #9216.
 	}
 
 	// Workspace state shared with WorkspaceItemDrillPicker via the loader.
-	// Chat surfaces flows and scripts only — apps aren't useful as @-mention
-	// context because they're frontends, not callable units.
-	const WORKSPACE_KINDS: WorkspaceItemKind[] = ['flow', 'script']
+	// Flows and scripts everywhere; raw apps only in GLOBAL chat, where the
+	// raw-app tool surface lets the model act on the reference. Visual apps stay
+	// excluded — they're frontends, not code units (filtered out below, where the
+	// 'app' kind is narrowed to raw apps before tree-building).
+	const WORKSPACE_KINDS = $derived<WorkspaceItemKind[]>(
+		aiChatManager.mode === AIMode.GLOBAL ? ['flow', 'script', 'app'] : ['flow', 'script']
+	)
 	const loader = useWorkspaceItemsLoader(
 		() => $workspaceStore,
 		() => WORKSPACE_KINDS
 	)
 
+	// The 'app' listing returns visual and raw apps together; keep only raw apps
+	// so the picker never surfaces a frontend-only app that the chat can't use.
+	const loadedForTree = $derived.by(() => {
+		const loaded = loader.loaded
+		if (!loaded.app) return loaded
+		return { ...loaded, app: loaded.app.filter((a) => a.raw_app) }
+	})
+
 	function contextLeaf(c: ContextElement): DrillLeaf<ChatLeafData> {
 		const displayLabel =
 			c.type === 'diff' || c.type === 'flow_module' ? c.title.replace(/_/g, ' ') : c.title
@@ -122,29 +149,119 @@ at message-prep time by `AIChatManager` — see PR #9216.
 		}
 	}
 
+	// Attached files surface as a Files branch (GLOBAL mode only, and only when
+	// the host wired `onSelectFile`). Picking one inserts an `@filename` mention
+	// rather than adding a context element — the AI already has read/search tools.
+	const attachedEnabled = $derived(!!onSelectFile && aiChatManager.mode === AIMode.GLOBAL)
+	// Locked/unavailable folders have no pickable children — skip them here.
+	const attachedFolders = $derived(
+		attachedEnabled ? aiChatManager.attachedFiles.folders.filter((f) => f.files.length > 0) : []
+	)
+	const attachedStandalone = $derived(attachedEnabled ? aiChatManager.attachedFiles.standalone : [])
+	const hasAttachments = $derived(attachedFolders.length > 0 || attachedStandalone.length > 0)
+
+	function fileLeaf(f: AttachedFile, label: string): DrillLeaf<ChatLeafData> {
+		return {
+			type: 'leaf',
+			key: `file:${f.name}`,
+			label,
+			// Match on the full path so a search like `sub/a` finds a nested file.
+			searchableText: f.relPath ?? f.name,
+			data: { fileName: f.name }
+		}
+	}
+
+	// Build a nested directory tree for one linked folder. `relPath` is
+	// `folder/sub/leaf` (its first segment is the folder name — see
+	// `enumerateDir`), so we drill the segments below that root.
+	function buildFolderBranch(folder: AttachedFolder): DrillBranch<ChatLeafData> | null {
+		type Dir = { dirs: Map<string, Dir>; leaves: DrillLeaf<ChatLeafData>[] }
+		const root: Dir = { dirs: new Map(), leaves: [] }
+		for (const f of folder.files) {
+			const segs = (f.relPath ?? f.name).split('/').slice(1) // drop the folder-name root
+			let cur = root
+			for (const seg of segs.slice(0, -1)) {
+				let next = cur.dirs.get(seg)
+				if (!next) {
+					next = { dirs: new Map(), leaves: [] }
+					cur.dirs.set(seg, next)
+				}
+				cur = next
+			}
+			cur.leaves.push(fileLeaf(f, segs[segs.length - 1] ?? f.name))
+		}
+		const byLabel = (a: { label: string }, b: { label: string }) => a.label.localeCompare(b.label)
+		function toNodes(dir: Dir, keyPrefix: string): DrillNode<ChatLeafData>[] {
+			const branches = [...dir.dirs.entries()]
+				.map(
+					([seg, sub]): DrillBranch<ChatLeafData> => ({
+						type: 'branch',
+						key: `${keyPrefix}/${seg}`,
+						label: seg,
+						icon: Folder,
+						children: toNodes(sub, `${keyPrefix}/${seg}`)
+					})
+				)
+				.sort(byLabel)
+			return [...branches, ...dir.leaves.sort(byLabel)]
+		}
+		const children = toNodes(root, `files:${folder.name}`)
+		if (children.length === 0) return null
+		return {
+			type: 'branch',
+			key: `files:${folder.name}`,
+			label: folder.name,
+			icon: Folder,
+			searchGroup: true,
+			children
+		}
+	}
+
+	function buildFilesBranch(): DrillBranch<ChatLeafData> | null {
+		if (!hasAttachments) return null
+		const children: DrillNode<ChatLeafData>[] = []
+		for (const folder of attachedFolders) {
+			const branch = buildFolderBranch(folder)
+			if (branch) children.push(branch)
+		}
+		for (const f of attachedStandalone) children.push(fileLeaf(f, f.name))
+		if (children.length === 0) return null
+		return {
+			type: 'branch',
+			key: 'files',
+			label: 'Files',
+			icon: FileText,
+			searchGroup: true,
+			children
+		}
+	}
+
 	// True when the chat root collapses to the workspace subtree (no Diffs /
 	// Modules / Databases branches present). Drives handleScopeChange's
 	// at-root preload — only fires when scope `[]` literally IS the workspace
 	// root; otherwise we wait until the user enters the Workspace branch.
 	const isWorkspaceOnly = $derived(
-		!availableContext.some(
-			(c) =>
-				(c.type === 'diff' || c.type === 'flow_module' || c.type === 'db') &&
-				(!hideSelected || !isSelected(c))
-		)
+		!hasAttachments &&
+			!availableContext.some(
+				(c) =>
+					(c.type === 'diff' || c.type === 'flow_module' || c.type === 'db') &&
+					(!hideSelected || !isSelected(c))
+			)
 	)
 
 	const tree = $derived<DrillNode<ChatLeafData>[]>(
 		(() => {
 			const branches: DrillNode<ChatLeafData>[] = []
+			const files = buildFilesBranch()
 			const diffs = buildContextBranch('diffs', 'Diffs', Diff, 'diff')
 			const modules = buildContextBranch('modules', 'Modules', BarsStaggered, 'flow_module')
 			const dbs = buildContextBranch('databases', 'Databases', Database, 'db')
+			if (files) branches.push(files)
 			if (diffs) branches.push(diffs)
 			if (modules) branches.push(modules)
 			if (dbs) branches.push(dbs)
 			const wsChildren = buildWorkspaceTree({
-				loaded: loader.loaded,
+				loaded: loadedForTree,
 				kinds: WORKSPACE_KINDS,
 				loadingKind: loader.loadingKind
 			}) as DrillNode<ChatLeafData>[]
@@ -164,7 +281,10 @@ at message-prep time by `AIChatManager` — see PR #9216.
 
 	function handlePick(leaf: DrillLeaf<ChatLeafData>) {
 		const d = leaf.data
-		if ('kind' in d) {
+		if ('fileName' in d) {
+			// Attached file — insert an `@filename` mention.
+			onSelectFile?.(d.fileName)
+		} else if ('kind' in d) {
 			// Workspace item — emit a reference-only workspace_* element.
 			// Content is fetched at message-prep time by the chat manager
 			// (see PR #9216 which switched workspace context to references).
@@ -187,8 +307,17 @@ at message-prep time by `AIChatManager` — see PR #9216.
 					deletable: true
 				}
 				onSelectWorkspaceItem(element)
+			} else if (d.kind === 'app') {
+				// Only raw apps reach here (the tree is narrowed in `loadedForTree`).
+				const element: WorkspaceAppElement & { deletable: boolean } = {
+					type: 'workspace_app',
+					path: d.path,
+					title: d.path,
+					summary: d.summary,
+					deletable: true
+				}
+				onSelectWorkspaceItem(element)
 			}
-			// Apps are filtered out via kinds=['flow','script']; ignore.
 		} else {
 			// Runtime context element — added directly.
 			onSelect(d)
@@ -210,6 +339,7 @@ at message-prep time by `AIChatManager` — see PR #9216.
 			if (isWorkspaceOnly) loader.ensureAll()
 			return
 		}
+		if (scope[0] === 'files') return // synthesised from attached files — no fetch
 		const inWorkspace = scope[0] === 'workspace' || isWorkspaceOnly
 		if (!inWorkspace) return // diffs / modules / databases — synthesised, no fetch
 		const path = scope[0] === 'workspace' ? scope.slice(1) : scope
@@ -241,7 +371,11 @@ at message-prep time by `AIChatManager` — see PR #9216.
 
 {#snippet leafIcon(leaf: DrillLeaf<ChatLeafData>)}
 	{@const d = leaf.data}
-	{#if 'kind' in d}
+	{#if 'fileName' in d}
+		{@const fi = getFileIcon(d.fileName)}
+		{@const Icon = fi.icon}
+		<Icon size={12} class="shrink-0 {fi.className ?? 'text-tertiary'}" />
+	{:else if 'kind' in d}
 		<RowIcon kind={d.kind} size={12} />
 	{:else if d.type === 'flow_module'}
 		<FlowModuleIcon module={d as unknown as FlowModule} size={14} />
diff --git a/frontend/src/lib/components/copilot/chat/ChatTypingIndicator.svelte b/frontend/src/lib/components/copilot/chat/ChatTypingIndicator.svelte
index 644ddab8e5..7c52de5cdf 100644
--- a/frontend/src/lib/components/copilot/chat/ChatTypingIndicator.svelte
+++ b/frontend/src/lib/components/copilot/chat/ChatTypingIndicator.svelte
@@ -42,14 +42,16 @@
 	aria-label="AI is generating a response"
 >
 	<span class={compact ? 'inline-flex items-end gap-0.5' : 'inline-flex items-end gap-1'}>
-		<span class={(compact ? 'w-1 h-1' : 'w-1.5 h-1.5') + ' rounded-full bg-accent chat-typing-dot'}
+		<span
+			class={(compact ? 'w-[3px] h-[3px]' : 'w-[5px] h-[5px]') +
+				' rounded-full bg-accent chat-typing-dot'}
 		></span>
 		<span
-			class={(compact ? 'w-1 h-1' : 'w-1.5 h-1.5') +
+			class={(compact ? 'w-[3px] h-[3px]' : 'w-[5px] h-[5px]') +
 				' rounded-full bg-accent chat-typing-dot chat-typing-dot-2'}
 		></span>
 		<span
-			class={(compact ? 'w-1 h-1' : 'w-1.5 h-1.5') +
+			class={(compact ? 'w-[3px] h-[3px]' : 'w-[5px] h-[5px]') +
 				' rounded-full bg-accent chat-typing-dot chat-typing-dot-3'}
 		></span>
 	</span>
diff --git a/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts b/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
index 4216b6cfa0..a728d1c96b 100644
--- a/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
+++ b/frontend/src/lib/components/copilot/chat/ContextManager.svelte.ts
@@ -11,7 +11,7 @@ import type { ExtendedOpenFlow } from '$lib/components/flows/types'
 
 export interface ScriptOptions {
 	lang: ScriptLang | 'bunnative'
-	code: string
+	getCode: () => string
 	error: string | undefined
 	args: Record<string, any>
 	path: string | undefined
@@ -77,7 +77,10 @@ export default class ContextManager {
 		}
 		this.workspace = workspace
 		this.selectedContext = currentlySelectedContext.filter(
-			(context) => context.type === 'workspace_script' || context.type === 'workspace_flow'
+			(context) =>
+				context.type === 'workspace_script' ||
+				context.type === 'workspace_flow' ||
+				context.type === 'workspace_app'
 		)
 	}
 
@@ -158,6 +161,7 @@ export default class ContextManager {
 					(c) =>
 						c.type === 'workspace_script' ||
 						c.type === 'workspace_flow' ||
+						c.type === 'workspace_app' ||
 						newAvailableContext.some((ac) => ac.type === c.type && ac.title === c.title)
 				)
 				.map((c) =>
@@ -192,7 +196,7 @@ export default class ContextManager {
 				{
 					type: 'code',
 					title: this.getContextCodePath(scriptOptions) ?? '',
-					content: scriptOptions.code,
+					content: scriptOptions.getCode(),
 					lang: scriptOptions.lang
 				}
 			]
@@ -209,22 +213,25 @@ export default class ContextManager {
 				}
 			}
 
-			if (scriptOptions.lastSavedCode && scriptOptions.lastSavedCode !== scriptOptions.code) {
+			if (scriptOptions.lastSavedCode && scriptOptions.lastSavedCode !== scriptOptions.getCode()) {
 				newAvailableContext.push({
 					type: 'diff',
 					title: 'diff_with_last_saved_draft', // can't use spaces in the title, because it will break the word match in the context text area hightlighting logic
 					content: scriptOptions.lastSavedCode ?? '',
-					diff: diffLines(scriptOptions.lastSavedCode ?? '', scriptOptions.code),
+					diff: diffLines(scriptOptions.lastSavedCode ?? '', scriptOptions.getCode()),
 					lang: scriptOptions.lang
 				})
 			}
 
-			if (scriptOptions.lastDeployedCode && scriptOptions.lastDeployedCode !== scriptOptions.code) {
+			if (
+				scriptOptions.lastDeployedCode &&
+				scriptOptions.lastDeployedCode !== scriptOptions.getCode()
+			) {
 				newAvailableContext.push({
 					type: 'diff',
 					title: 'diff_with_last_deployed_version',
 					content: scriptOptions.lastDeployedCode ?? '',
-					diff: diffLines(scriptOptions.lastDeployedCode ?? '', scriptOptions.code),
+					diff: diffLines(scriptOptions.lastDeployedCode ?? '', scriptOptions.getCode()),
 					lang: scriptOptions.lang
 				})
 			}
@@ -251,7 +258,7 @@ export default class ContextManager {
 				{
 					type: 'code',
 					title: this.getContextCodePath(scriptOptions) ?? '',
-					content: scriptOptions.code,
+					content: scriptOptions.getCode(),
 					lang: scriptOptions.lang,
 					deletable: false
 				},
@@ -277,19 +284,20 @@ export default class ContextManager {
 			newSelectedContext = newSelectedContext
 				.filter(
 					(c) =>
-						(c.type === 'code_piece' && scriptOptions.code.includes(c.content)) ||
+						(c.type === 'code_piece' && scriptOptions.getCode().includes(c.content)) ||
 						c.type === 'code' ||
 						// Workspace references are user-picked via @-mention and not in
 						// availableContext; preserve so badges survive editor refreshes.
 						c.type === 'workspace_script' ||
 						c.type === 'workspace_flow' ||
+						c.type === 'workspace_app' ||
 						newAvailableContext.some((ac) => ac.type === c.type && ac.title === c.title)
 				)
 				.map((c) => {
 					if (c.type === 'code') {
 						return {
 							...c,
-							content: scriptOptions.code,
+							content: scriptOptions.getCode(),
 							title: this.getContextCodePath(scriptOptions)
 						}
 					}
@@ -403,7 +411,10 @@ export default class ContextManager {
 							type: 'diff' as const,
 							title: 'diff_with_last_deployed_version',
 							content: this.scriptOptions.lastDeployedCode ?? '',
-							diff: diffLines(this.scriptOptions.lastDeployedCode ?? '', this.scriptOptions.code),
+							diff: diffLines(
+								this.scriptOptions.lastDeployedCode ?? '',
+								this.scriptOptions.getCode()
+							),
 							lang: this.scriptOptions.lang
 						}
 					]
diff --git a/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte b/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
index 8c47cede58..c6f3268e50 100644
--- a/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
+++ b/frontend/src/lib/components/copilot/chat/ContextTextarea.svelte
@@ -2,11 +2,14 @@
 	import autosize from '$lib/autosize'
 	import { tick } from 'svelte'
 	import type { ContextElement } from './context'
+	import { AIMode } from './AIChatManager.svelte'
+	import ChatCommandPicker from './ChatCommandPicker.svelte'
 	import ChatContextPicker from './ChatContextPicker.svelte'
 	import Portal from '$lib/components/Portal.svelte'
 	import { zIndexes } from '$lib/zIndexes'
 	import { twMerge } from 'tailwind-merge'
-	import { CHAT_INPUT_PADDING } from './aiChatManagerContext'
+	import { CHAT_INPUT_PADDING, getAiChatManager } from './aiChatManagerContext'
+	import { MENTION_RE, mentionTitle, formatMention } from './mention'
 	import { createFloatingActions, createVirtualElement } from 'svelte-floating-ui'
 	import { flip, offset, shift } from 'svelte-floating-ui/dom'
 	import {
@@ -50,10 +53,11 @@
 		onKeyDown = undefined
 	}: Props = $props()
 
-	const MENTION_RE = /@[\w/.\-\[\]]+/g
+	const aiChatManager = getAiChatManager()
+
 	function extractMentions(text: string): Set<string> {
 		const out = new Set<string>()
-		for (const m of text.matchAll(MENTION_RE)) out.add(m[0].slice(1))
+		for (const m of text.matchAll(MENTION_RE)) out.add(mentionTitle(m[0]))
 		return out
 	}
 
@@ -66,11 +70,22 @@
 
 	let showContextTooltip = $state(false)
 	let contextTooltipWord = $state('')
+	let showCommandTooltip = $state(false)
+	let commandTooltipWord = $state('')
 	let textarea = $state<HTMLTextAreaElement | undefined>(undefined)
 	let tooltipElement = $state<HTMLDivElement | undefined>(undefined)
 	let chatContextPicker: ChatContextPicker | undefined = $state()
+	let chatCommandPicker: ChatCommandPicker | undefined = $state()
+	let commandSkillsRefreshInFlight = false
 
-	// Virtual reference anchored at the `@` that opened the mention (not the
+	const commandSkills = $derived(
+		aiChatManager.mode === AIMode.GLOBAL && aiChatManager.isSessionChat
+			? aiChatManager.sessionCommands
+			: []
+	)
+	const activeTooltipWord = $derived(showContextTooltip ? contextTooltipWord : commandTooltipWord)
+
+	// Virtual reference anchored at the trigger that opened the picker (not the
 	// caret), so the picker stays put while the user types the query.
 	// svelte-floating-ui's `createVirtualElement` takes a raw ClientRect and
 	// wraps it in a function internally — re-`update()` on each anchor move.
@@ -221,6 +236,18 @@
 			.replace(/'/g, '&#39;')
 	}
 
+	// Inverse of escapeHtml (&amp; last so an escaped entity isn't double-decoded). Mentions
+	// are parsed out of the escaped HTML, so a title is un-escaped before the store lookup —
+	// else a filename like `R&D notes.md` (escaped to `R&amp;D notes.md`) would never match.
+	function unescapeHtml(text: string) {
+		return text
+			.replace(/&lt;/g, '<')
+			.replace(/&gt;/g, '>')
+			.replace(/&quot;/g, '"')
+			.replace(/&#39;/g, "'")
+			.replace(/&amp;/g, '&')
+	}
+
 	function getHighlightedText(text: string) {
 		let html = escapeHtml(text)
 		// Wrap collapsed-paste tokens as clickable chips. The span keeps the exact
@@ -231,11 +258,13 @@
 			if (!att) return match
 			return `<span data-paste-id="${att.id}" class="rounded bg-surface-secondary text-secondary cursor-pointer pointer-events-auto">${match}</span>`
 		})
-		html = html.replace(/@[\w/.\-\[\]]+/g, (match) => {
-			const title = match.slice(1)
+		html = html.replace(MENTION_RE, (match) => {
+			const title = unescapeHtml(mentionTitle(match))
 			const inContext =
 				availableContext.find((c) => c.title === title) ||
-				selectedContext.find((c) => c.title === title)
+				selectedContext.find((c) => c.title === title) ||
+				// Attached-file mentions (`@filename`) highlight just like context.
+				aiChatManager.attachedFiles.get(title)
 			if (inContext) {
 				return `<span class="bg-surface-accent-selected text-primary rounded box-decoration-clone z-10">${match}</span>`
 			}
@@ -510,19 +539,33 @@
 		showContextTooltip = false
 	}
 
+	function refreshCommandSkills() {
+		if (commandSkillsRefreshInFlight) return
+		commandSkillsRefreshInFlight = true
+		void aiChatManager.refreshGlobalSkills().finally(() => {
+			commandSkillsRefreshInFlight = false
+		})
+	}
+
+	function getCommandFilter(text: string): string | undefined {
+		if (aiChatManager.mode !== AIMode.GLOBAL || !aiChatManager.isSessionChat) return undefined
+		const match = /^\/([a-z0-9-]*)$/.exec(text)
+		return match?.[1]
+	}
+
 	function updateAnchorRect() {
 		if (!textarea) return
+		const triggerWord = activeTooltipWord
+		if (!triggerWord) return
 		try {
-			// Index of the `@` that started the current mention. handleInput
-			// only opens the picker when `contextTooltipWord` (= `@xxx`) is the
-			// LAST whitespace-separated word in `value`, so the `@` always sits
-			// at `value.length - contextTooltipWord.length`.
-			const atIndex = value.length - contextTooltipWord.length
-			const coords = getCaretCoordinates(textarea, atIndex)
+			// Inline `@` anchors to the last word; slash commands only open when
+			// `/...` is the whole input, so the trigger sits at index 0.
+			const triggerIndex = triggerWord.startsWith('/') ? 0 : value.length - triggerWord.length
+			const coords = getCaretCoordinates(textarea, triggerIndex)
 			const rect = textarea.getBoundingClientRect()
 			// getCaretCoordinates returns content-relative coords; subtract the
-			// textarea's own scroll so the anchor tracks the `@` once the input is
-			// capped (max-height) and scrolls internally.
+			// textarea's own scroll so the anchor tracks the trigger once the input
+			// is capped (max-height) and scrolls internally.
 			anchorRect = new DOMRect(
 				rect.left + coords.left - textarea.scrollLeft,
 				rect.top + coords.top - textarea.scrollTop,
@@ -542,6 +585,19 @@
 	function handleInput(e: Event) {
 		textarea = e.target as HTMLTextAreaElement
 
+		const commandFilter = getCommandFilter(value)
+		if (commandFilter !== undefined) {
+			const wasShowing = showCommandTooltip
+			showCommandTooltip = true
+			commandTooltipWord = `/${commandFilter}`
+			showContextTooltip = false
+			contextTooltipWord = ''
+			if (!wasShowing) refreshCommandSkills()
+			return
+		}
+		showCommandTooltip = false
+		commandTooltipWord = ''
+
 		const words = value.split(/\s+/)
 		const lastWord = words[words.length - 1]
 
@@ -558,6 +614,12 @@
 		}
 	}
 
+	function handleCommandSelection(skill: { name: string }) {
+		value = `/${skill.name} `
+		showCommandTooltip = false
+		setTimeout(() => textarea?.focus(), 0)
+	}
+
 	function handleKeyDown(e: KeyboardEvent) {
 		// Pass to parent first if provided
 		if (onKeyDown) {
@@ -569,6 +631,22 @@
 			return
 		}
 
+		if (showCommandTooltip) {
+			if (
+				e.key === 'ArrowDown' ||
+				e.key === 'ArrowUp' ||
+				e.key === 'Enter' ||
+				e.key === 'Tab' ||
+				e.key === 'Escape'
+			) {
+				chatCommandPicker?.handleKeydown(e)
+			}
+			if (e.key === 'Enter') {
+				e.preventDefault()
+			}
+			return
+		}
+
 		if (showContextTooltip) {
 			// Forward navigation keys to the picker so the textarea-focused
 			// user can drive it. The picker preventDefault/stopPropagation's
@@ -606,11 +684,11 @@
 	}
 
 	$effect(() => {
-		// Re-track on every value change. The `@` position can shift when the
-		// user adds/deletes text BEFORE it (line wrap, etc.); the picker should
-		// follow. floating-ui's autoUpdate only fires on scroll/resize.
+		// Re-track on every value change. The trigger position can shift when
+		// the user adds/deletes text before it (line wrap, etc.); the picker
+		// should follow. floating-ui's autoUpdate only fires on scroll/resize.
 		void value
-		if (showContextTooltip) updateAnchorRect()
+		if (showContextTooltip || showCommandTooltip) updateAnchorRect()
 	})
 
 	$effect(() => {
@@ -684,9 +762,9 @@
 		ondragstart={handlePasteDragStart}
 		onscroll={(e) => {
 			scrollTop = e.currentTarget.scrollTop
-			// Keep the `@` picker pinned to its anchor while the input scrolls
+			// Keep the picker pinned to its anchor while the input scrolls
 			// internally (autoUpdate can't observe a virtual ref's scroll).
-			if (showContextTooltip) updateAnchorRect()
+			if (showContextTooltip || showCommandTooltip) updateAnchorRect()
 		}}
 		onblur={() => {
 			setTimeout(() => {
@@ -695,6 +773,7 @@
 					return
 				}
 				showContextTooltip = false
+				showCommandTooltip = false
 			}, 200)
 		}}
 		{placeholder}
@@ -708,7 +787,7 @@
 	></textarea>
 </div>
 
-{#if showContextTooltip}
+{#if showContextTooltip || showCommandTooltip}
 	<Portal target="body">
 		<div
 			bind:this={tooltipElement}
@@ -716,25 +795,46 @@
 			class="bg-surface border border-gray-200 dark:border-gray-700 rounded-md shadow-lg overflow-hidden"
 			style="z-index: {zIndexes.tooltip};"
 		>
-			<ChatContextPicker
-				bind:this={chatContextPicker}
-				{availableContext}
-				{selectedContext}
-				onSelect={(element) => {
-					handleContextSelection(element)
-				}}
-				onSelectWorkspaceItem={(element) => {
-					onAddContext(element)
-					updateInstructionsWithContext(element)
-					showContextTooltip = false
-					setTimeout(() => textarea?.focus(), 0)
-				}}
-				externalFilter={contextTooltipWord.slice(1)}
-				autoFocus={false}
-				setShowing={(showing) => {
-					showContextTooltip = showing
-				}}
-			/>
+			{#if showCommandTooltip}
+				<ChatCommandPicker
+					bind:this={chatCommandPicker}
+					skills={commandSkills}
+					onSelect={handleCommandSelection}
+					externalFilter={commandTooltipWord.slice(1)}
+					autoFocus={false}
+					setShowing={(showing) => {
+						showCommandTooltip = showing
+					}}
+				/>
+			{:else}
+				<ChatContextPicker
+					bind:this={chatContextPicker}
+					{availableContext}
+					{selectedContext}
+					onSelect={(element) => {
+						handleContextSelection(element)
+					}}
+					onSelectWorkspaceItem={(element) => {
+						onAddContext(element)
+						updateInstructionsWithContext(element)
+						showContextTooltip = false
+						setTimeout(() => textarea?.focus(), 0)
+					}}
+					externalFilter={contextTooltipWord.slice(1)}
+					autoFocus={false}
+					setShowing={(showing) => {
+						showContextTooltip = showing
+					}}
+					onSelectFile={(name) => {
+						// Replace the in-progress `@word` with the chosen mention (bracketed if the
+						// filename has spaces, so the highlighter captures it whole).
+						const index = value.lastIndexOf('@')
+						value = (index !== -1 ? value.substring(0, index) : value) + `${formatMention(name)} `
+						showContextTooltip = false
+						setTimeout(() => textarea?.focus(), 0)
+					}}
+				/>
+			{/if}
 		</div>
 	</Portal>
 {/if}
diff --git a/frontend/src/lib/components/copilot/chat/ContextUsageIndicator.svelte b/frontend/src/lib/components/copilot/chat/ContextUsageIndicator.svelte
index f7681e9852..80b317ba12 100644
--- a/frontend/src/lib/components/copilot/chat/ContextUsageIndicator.svelte
+++ b/frontend/src/lib/components/copilot/chat/ContextUsageIndicator.svelte
@@ -2,9 +2,15 @@
 	import { copilotInfo, copilotSessionModel } from '$lib/aiStore'
 	import { getKnownModelContextWindow } from '../modelConfig'
 	import { getAiChatManager } from './aiChatManagerContext'
+	import { AIMode } from './AIChatManager.svelte'
+	import Tooltip from '$lib/components/meltComponents/Tooltip.svelte'
 
 	const aiChatManager = getAiChatManager()
 
+	// The `/compact` slash command is only wired up in session-chat GLOBAL mode,
+	// so only advertise it where it actually works.
+	let canCompact = $derived(aiChatManager.isSessionChat && aiChatManager.mode === AIMode.GLOBAL)
+
 	let providerModel = $derived(
 		$copilotSessionModel ?? $copilotInfo.defaultModel ?? $copilotInfo.aiModels[0]
 	)
@@ -19,6 +25,21 @@
 	// the user can watch context grow toward the compaction threshold.
 	let visible = $derived(usedTokens > 0 && aiChatManager.messages.length > 0)
 
+	// Compaction triggers at 80% of the window (COMPACTION_TRIGGER_RATIO); the
+	// gauge fills toward that point and turns red once it is reached.
+	const COMPACTION_TRIGGER_RATIO = 0.8
+	let ratio = $derived(contextWindow ? Math.min(usedTokens / contextWindow, 1) : undefined)
+	let fillPct = $derived(ratio !== undefined ? Math.round(ratio * 100) : undefined)
+	let fillClass = $derived(
+		ratio === undefined
+			? 'bg-tertiary'
+			: ratio >= COMPACTION_TRIGGER_RATIO
+				? 'bg-red-500'
+				: ratio >= COMPACTION_TRIGGER_RATIO * 0.75
+					? 'bg-amber-500'
+					: 'bg-surface-accent-primary'
+	)
+
 	function formatTokenCount(tokens: number): string {
 		if (tokens >= 1_000_000) {
 			return `${(tokens / 1_000_000).toFixed(1).replace(/\.0$/, '')}M`
@@ -31,9 +52,40 @@
 </script>
 
 {#if visible}
-	<span class="text-[0.6rem] text-tertiary tabular-nums" aria-label="Context window usage">
-		Context usage: ~{formatTokenCount(usedTokens)}{contextWindow
-			? ` / ${formatTokenCount(contextWindow)}`
-			: ''}
-	</span>
+	<Tooltip small placement="top">
+		<!-- Only a meter when we know the window: it's a 0–100% reading. With an unknown
+		     window there's no max to measure against, so it's a plain labeled indicator
+		     (the bar is decorative/full and the token count lives in the tooltip). -->
+		<div
+			class="flex items-center h-5"
+			aria-label="Context window usage"
+			role={fillPct !== undefined ? 'meter' : undefined}
+			aria-valuenow={fillPct}
+			aria-valuemin={fillPct !== undefined ? 0 : undefined}
+			aria-valuemax={fillPct !== undefined ? 100 : undefined}
+		>
+			<div class="w-8 h-1.5 rounded-full bg-surface-secondary overflow-hidden">
+				<div class="h-full rounded-full transition-all {fillClass}" style="width: {fillPct ?? 100}%"
+				></div>
+			</div>
+		</div>
+		{#snippet text()}
+			<div class="text-xs whitespace-nowrap">
+				<p class="font-semibold">Context usage</p>
+				<p class="mt-1 tabular-nums">
+					~{formatTokenCount(usedTokens)}{contextWindow
+						? ` / ${formatTokenCount(contextWindow)}`
+						: ''}{fillPct !== undefined ? ` (${fillPct}%)` : ''}
+				</p>
+				{#if ratio !== undefined && ratio >= COMPACTION_TRIGGER_RATIO}
+					<p class="mt-1 text-tertiary">History will be compacted soon to free up space.</p>
+				{/if}
+				{#if canCompact}
+					<p class="mt-1 text-tertiary">
+						Type <span class="font-mono">/compact</span> to summarize and free up space now.
+					</p>
+				{/if}
+			</div>
+		{/snippet}
+	</Tooltip>
 {/if}
diff --git a/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts b/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts
index 9173e4c441..d24246b711 100644
--- a/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts
+++ b/frontend/src/lib/components/copilot/chat/HistoryManager.svelte.ts
@@ -1,5 +1,5 @@
 import { type DBSchema as IDBSchema, type IDBPDatabase } from 'idb'
-import type { DisplayMessage } from './shared'
+import type { ChatJob, DisplayMessage } from './shared'
 import { expanded, messageDraft } from './chatDraft'
 import { createLongHash } from '$lib/editorLangUtils'
 import { userScopedDb, type UserScopedDbMigrateDeps } from '$lib/userScopedDb'
@@ -25,6 +25,16 @@ interface ChatSchema extends IDBSchema {
 			// New writes store the plain reported token count; chats persisted by
 			// earlier versions may still hold the legacy anchor object.
 			contextUsage?: PersistedContextUsage
+			// Workspace items this chat modified via AI tool calls, as
+			// `${UserDraftItemKind}:${storagePath}` keys. Persisted out-of-band from
+			// the message arrays so it survives compaction. Absent (undefined) on
+			// chats predating this feature → consumers fall back to showing all
+			// workspace drafts; a defined array (even empty) means "tracked".
+			modifiedItems?: string[]
+			// Jobs this chat started that detached into the background, so an
+			// in-flight job's tray row and completion survive a reload. Absent on
+			// chats predating this feature. Persisted out-of-band like modifiedItems.
+			backgroundJobs?: ChatJob[]
 		}
 	}
 }
@@ -80,6 +90,29 @@ export function __resetLegacyChatClaimForTesting(): void {
 	legacyChatClaim = undefined
 }
 
+// Read a chat's modified-items mask by chatId WITHOUT mounting an AIChatManager,
+// for the standalone /forks/compare route. Returns undefined for a legacy chat
+// (no field) so the page falls back to selecting all items; a defined array
+// (even empty) narrows the preselection. Opens a throwaway user-scoped handle;
+// the `get` is O(1) on the `id` keyPath.
+export async function readChatModifiedItems(chatId: string): Promise<string[] | undefined> {
+	const dbh = userScopedDb<ChatSchema>(DB_NAME, {
+		version: 1,
+		upgrade: createChatStore,
+		migrate: migrateLegacyChatDb
+	})
+	try {
+		const db = await dbh.whenReady()
+		const chat = await db?.get('chats', chatId)
+		return chat?.modifiedItems
+	} catch (err) {
+		console.error('Could not read chat modified items', err)
+		return undefined
+	} finally {
+		dbh.close()
+	}
+}
+
 export default class HistoryManager {
 	// Per-instance handle to the shared per-user DB lifecycle. There is one
 	// HistoryManager per AIChatManager (the singleton + one per session runtime),
@@ -100,6 +133,8 @@ export default class HistoryManager {
 			lastModified: number
 			sessionId?: string
 			contextUsage?: PersistedContextUsage
+			modifiedItems?: string[]
+			backgroundJobs?: ChatJob[]
 		}
 	> = $state({})
 
@@ -173,10 +208,20 @@ export default class HistoryManager {
 		return Object.values(this.savedChats)
 	}
 
+	getModifiedItems(id: string): string[] | undefined {
+		return this.savedChats[id]?.modifiedItems
+	}
+
+	getBackgroundJobs(id: string): ChatJob[] | undefined {
+		return this.savedChats[id]?.backgroundJobs
+	}
+
 	async saveChat(
 		displayMessages: DisplayMessage[],
 		messages: ChatCompletionMessageParam[],
-		contextUsage?: number
+		contextUsage?: number,
+		modifiedItems?: string[],
+		backgroundJobs?: ChatJob[]
 	) {
 		if (displayMessages.length > 0) {
 			// Compaction replaces the original first message with a summary boundary.
@@ -203,7 +248,30 @@ export default class HistoryManager {
 				id: this.currentChatId,
 				lastModified: Date.now(),
 				...(this.sessionId ? { sessionId: this.sessionId } : {}),
-				...(contextUsage !== undefined ? { contextUsage } : {})
+				...(contextUsage !== undefined ? { contextUsage } : {}),
+				// Only persist when the caller passes a defined array — an untracked
+				// chat (the global side-panel chat, mask still undefined) must not be
+				// stamped with [], which would flip it to the filtered view. Session
+				// chats are always tracked (see AIChatManager.loadPastChat), so they do
+				// pass a defined array and persist it. Since `put` replaces the whole
+				// record, a caller that omits the argument must not ERASE a tracked
+				// chat's stored mask — fall back to the previously saved field.
+				// Snapshot the fallback: savedChats is $state, so the stored value is a
+				// proxy that structuredClone (used by IndexedDB put) cannot clone.
+				...(modifiedItems !== undefined
+					? { modifiedItems }
+					: this.savedChats[this.currentChatId]?.modifiedItems !== undefined
+						? { modifiedItems: $state.snapshot(this.savedChats[this.currentChatId].modifiedItems) }
+						: {}),
+				// Same "don't erase on omit" guard as modifiedItems: a turn-end save
+				// that doesn't pass backgroundJobs must keep the tray's stored jobs.
+				...(backgroundJobs !== undefined
+					? { backgroundJobs }
+					: this.savedChats[this.currentChatId]?.backgroundJobs !== undefined
+						? {
+								backgroundJobs: $state.snapshot(this.savedChats[this.currentChatId].backgroundJobs)
+							}
+						: {})
 			}
 			this.savedChats = {
 				...this.savedChats,
@@ -218,9 +286,11 @@ export default class HistoryManager {
 	async save(
 		displayMessages: DisplayMessage[],
 		messages: ChatCompletionMessageParam[],
-		contextUsage?: number
+		contextUsage?: number,
+		modifiedItems?: string[],
+		backgroundJobs?: ChatJob[]
 	) {
-		await this.saveChat(displayMessages, messages, contextUsage)
+		await this.saveChat(displayMessages, messages, contextUsage, modifiedItems, backgroundJobs)
 		this.currentChatId = createLongHash()
 	}
 
diff --git a/frontend/src/lib/components/copilot/chat/HistoryManager.test.ts b/frontend/src/lib/components/copilot/chat/HistoryManager.test.ts
index 38fb7ecf0d..540dfaf72e 100644
--- a/frontend/src/lib/components/copilot/chat/HistoryManager.test.ts
+++ b/frontend/src/lib/components/copilot/chat/HistoryManager.test.ts
@@ -141,3 +141,30 @@ describe('HistoryManager title across compaction', () => {
 		expect(hm.getAllSavedChats().find((c) => c.id === id)?.title).toBe('original first question')
 	})
 })
+
+describe('HistoryManager modified-items mask persistence', () => {
+	const msgs = [{ role: 'user', content: 'hello', index: 0 }] as DisplayMessage[]
+
+	it('a save without the argument preserves a previously stored mask', async () => {
+		const hm = new HistoryManager()
+		await hm.init()
+		const id = hm.getCurrentChatId()
+
+		await hm.saveChat(msgs, [] as ChatCompletionMessageParam[], undefined, ['script:u/a/x'])
+		expect(hm.getModifiedItems(id)).toEqual(['script:u/a/x'])
+
+		// e.g. manual compaction re-saving the transcript: the whole record is
+		// rewritten, but the tracked mask must survive.
+		await hm.saveChat(msgs, [] as ChatCompletionMessageParam[])
+		expect(hm.getModifiedItems(id)).toEqual(['script:u/a/x'])
+	})
+
+	it('never retroactively stamps an untracked chat', async () => {
+		const hm = new HistoryManager()
+		await hm.init()
+		const id = hm.getCurrentChatId()
+
+		await hm.saveChat(msgs, [] as ChatCompletionMessageParam[])
+		expect(hm.getModifiedItems(id)).toBeUndefined()
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/JobsSegment.svelte b/frontend/src/lib/components/copilot/chat/JobsSegment.svelte
new file mode 100644
index 0000000000..0bcb315bda
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/JobsSegment.svelte
@@ -0,0 +1,384 @@
+<script lang="ts">
+	import { Button } from '$lib/components/common'
+	import Badge from '$lib/components/common/badge/Badge.svelte'
+	import Modal from '$lib/components/common/modal/Modal.svelte'
+	import Portal from '$lib/components/Portal.svelte'
+	import Popover from '$lib/components/meltComponents/Popover.svelte'
+	import { zIndexes } from '$lib/zIndexes'
+	import JobStatusIcon from '$lib/components/runs/JobStatusIcon.svelte'
+	import FlowStatusWaitingForEvents from '$lib/components/FlowStatusWaitingForEvents.svelte'
+	import { ChevronUp, ExternalLink, Hourglass, ThumbsUp, TimerOff } from 'lucide-svelte'
+	import { base } from '$lib/base'
+	import { slide } from 'svelte/transition'
+	import { JobService, type Job } from '$lib/gen'
+	import { msToReadableTime } from '$lib/utils'
+	import { sendUserToast } from '$lib/toast'
+	import { getAiChatManager } from './aiChatManagerContext'
+	import { deriveChatJobStatus, type ChatJob, type ChatJobStatus } from './shared'
+
+	// The "Jobs" segment of the session bar: a compact status chip that summarizes
+	// the background jobs the chat started, opening a popover with the full list
+	// (live status via the runs-page JobStatusIcon, approval, cancel, open-in-run).
+	// Renders as a standalone slim bar in the global side-panel chat, and as the
+	// right segment inside SessionChangesBar's session bar (standalone={false}).
+	let { standalone = false }: { standalone?: boolean } = $props()
+
+	const aiChatManager = getAiChatManager()
+	const jobs = $derived(aiChatManager.backgroundJobs)
+
+	const runningCount = $derived(jobs.filter((j) => j.status === 'running').length)
+	const approvalCount = $derived(jobs.filter((j) => j.status === 'suspended').length)
+	const queuedCount = $derived(
+		jobs.filter((j) => j.status === 'queued' || j.status === 'scheduled').length
+	)
+	const failureCount = $derived(jobs.filter((j) => j.status === 'failure').length)
+	const successCount = $derived(jobs.filter((j) => j.status === 'success').length)
+	const liveCount = $derived(jobs.filter((j) => !isTerminal(j.status)).length)
+	const hasLive = $derived(liveCount > 0)
+
+	function isTerminal(status: ChatJobStatus): boolean {
+		return status === 'success' || status === 'failure' || status === 'canceled'
+	}
+
+	// bg color for a status dot, keyed off the same vocabulary as the runs page:
+	// blue running, violet approval, orange queued/scheduled, green ok, red fail.
+	function dotClass(status: ChatJobStatus): string {
+		switch (status) {
+			case 'running':
+				return 'bg-blue-500'
+			case 'suspended':
+				return 'bg-violet-500'
+			case 'queued':
+			case 'scheduled':
+				return 'bg-orange-500'
+			case 'success':
+				return 'bg-green-500'
+			case 'failure':
+				return 'bg-red-500'
+			default:
+				return 'bg-gray-400'
+		}
+	}
+
+	// The single discriminating segment of a path ("u/admin/wait" → "wait"); the
+	// full label stays in the popover row + the chip's title.
+	function shortName(label: string): string {
+		const parts = label.split('/')
+		return parts[parts.length - 1] || label
+	}
+
+	// Aggregate chip readout, priority-ordered so the most action-worthy state
+	// wins the dot: approval > running > queued > failed > succeeded. A live run
+	// takes the dot even if an earlier job failed (failure resurfaces once idle).
+	const segment = $derived.by(
+		(): { dot: string; pulse: boolean; text: string; danger: boolean } => {
+			if (approvalCount > 0)
+				return {
+					dot: dotClass('suspended'),
+					pulse: true,
+					text: `${approvalCount} approval`,
+					danger: false
+				}
+			if (runningCount > 0) {
+				if (runningCount === 1 && liveCount === 1) {
+					const job = jobs.find((j) => j.status === 'running')
+					return {
+						dot: dotClass('running'),
+						pulse: true,
+						text: job ? shortName(job.label) : '1 running',
+						danger: false
+					}
+				}
+				return {
+					dot: dotClass('running'),
+					pulse: true,
+					text: `${runningCount} running`,
+					danger: false
+				}
+			}
+			if (queuedCount > 0)
+				return {
+					dot: dotClass('queued'),
+					pulse: false,
+					text: `${queuedCount} queued`,
+					danger: false
+				}
+			if (failureCount > 0)
+				return { dot: dotClass('failure'), pulse: false, text: `${jobs.length}`, danger: true }
+			// All terminal, none failed: green if anything actually succeeded, else gray
+			// (only canceled jobs left — a cancel isn't a success, so don't show green).
+			if (successCount > 0)
+				return { dot: dotClass('success'), pulse: false, text: `${jobs.length}`, danger: false }
+			return { dot: dotClass('canceled'), pulse: false, text: `${jobs.length}`, danger: false }
+		}
+	)
+
+	// Elapsed label for the running-single chip; a 1s clock, live only.
+	let now = $state(Date.now())
+	$effect(() => {
+		if (!hasLive) return
+		const t = setInterval(() => (now = Date.now()), 1000)
+		return () => clearInterval(t)
+	})
+
+	// Screen-reader announcement when a background job finishes — once per job (on
+	// its terminal transition), never per elapsed tick (the clock above updates
+	// `now`, not `jobs`, so this effect doesn't fire for it). Seed the seen-set on
+	// the first run so pre-existing terminal jobs aren't announced on mount.
+	let announcement = $state('')
+	const announcedTerminal = new Set<string>()
+	let announceInitialized = false
+	$effect(() => {
+		const terminal = jobs.filter((j) => isTerminal(j.status))
+		if (!announceInitialized) {
+			for (const j of terminal) announcedTerminal.add(j.jobId)
+			announceInitialized = true
+			return
+		}
+		// Announce every job that became terminal this tick in one utterance —
+		// setting `announcement` per job would drop all but the last when several
+		// finish together.
+		const newlyDone = terminal.filter((j) => !announcedTerminal.has(j.jobId))
+		for (const j of newlyDone) announcedTerminal.add(j.jobId)
+		if (newlyDone.length > 0) {
+			const parts = newlyDone.map((j) => {
+				const verb =
+					j.status === 'success' ? 'succeeded' : j.status === 'failure' ? 'failed' : 'was canceled'
+				return `${shortName(j.label)} ${verb}`
+			})
+			announcement = `Background job${newlyDone.length > 1 ? 's' : ''}: ${parts.join('; ')}.`
+		}
+	})
+	const runningJob = $derived(
+		runningCount === 1 && liveCount === 1 ? jobs.find((j) => j.status === 'running') : undefined
+	)
+	const chipElapsed = $derived(runningJob ? msToReadableTime(now - runningJob.createdAt, 2) : '')
+
+	// Popover rows: live jobs pinned to the top, then newest first.
+	const sortedJobs = $derived(
+		[...jobs].sort((a, b) => {
+			const al = isTerminal(a.status) ? 1 : 0
+			const bl = isTerminal(b.status) ? 1 : 0
+			if (al !== bl) return al - bl
+			return b.createdAt - a.createdAt
+		})
+	)
+
+	function elapsedLabel(job: ChatJob): string {
+		if (job.status === 'scheduled') return ''
+		if (isTerminal(job.status)) {
+			return job.durationMs !== undefined ? msToReadableTime(job.durationMs, 2) : ''
+		}
+		return msToReadableTime(now - job.createdAt, 2)
+	}
+
+	function runHref(job: ChatJob): string {
+		return `${base}/run/${job.jobId}?workspace=${job.workspace}`
+	}
+
+	function openRun(job: ChatJob) {
+		// In /sessions the run opens in the preview pane; the global side-panel chat
+		// has no runtime, so fall back to a new browser tab.
+		if (aiChatManager.openRunInPreview) {
+			aiChatManager.openRunInPreview({
+				jobId: job.jobId,
+				workspace: job.workspace,
+				label: job.label
+			})
+		} else {
+			window.open(runHref(job), '_blank', 'noreferrer')
+		}
+	}
+
+	// --- Popover open state + auto-open on approval ---
+	let popover: Popover | undefined = $state()
+	let open = $state(false)
+
+	// A job entering the approval state needs attention, so open the popover to
+	// surface its Approve action. Rising-edge only (a newly suspended job), so the
+	// user can still dismiss it while the approval stays pending.
+	let prevApprovalCount = 0
+	$effect(() => {
+		const count = approvalCount
+		if (count > prevApprovalCount) popover?.open()
+		prevApprovalCount = count
+	})
+
+	// --- Approval modal (reuses the run page's FlowStatusWaitingForEvents) ---
+	let approvalOpen = $state(false)
+	let approvalLabel = $state('')
+	let approvalJob = $state<Job | undefined>(undefined)
+
+	async function openApproval(job: ChatJob) {
+		approvalLabel = job.label
+		approvalJob = undefined
+		approvalOpen = true
+		try {
+			// The stored snapshot is trimmed; the approval form needs the full job
+			// (flow_status + raw_flow), so fetch it fresh.
+			const full = await JobService.getJob({
+				workspace: job.workspace,
+				id: job.jobId,
+				noLogs: true,
+				noCode: true
+			})
+			if (deriveChatJobStatus(full) === 'suspended') {
+				approvalJob = full
+			} else {
+				approvalOpen = false
+				sendUserToast('This job is no longer waiting for approval.')
+			}
+		} catch (e) {
+			approvalOpen = false
+			console.error('Failed to load approval details', e)
+			sendUserToast('Failed to load approval details', true)
+		}
+	}
+
+	// When the modal closes, drop the loaded job and force an immediate poll so the
+	// segment reflects the approve/reject without waiting for the next poll tick.
+	$effect(() => {
+		if (!approvalOpen && approvalJob) {
+			approvalJob = undefined
+			aiChatManager.refreshBackgroundJobs()
+		}
+	})
+
+	const ariaLabel = $derived(
+		hasLive
+			? `Jobs, ${segment.text}${chipElapsed ? `, ${chipElapsed}` : ''}`
+			: `Jobs, ${jobs.length} finished${failureCount > 0 ? `, ${failureCount} failed` : ''}`
+	)
+</script>
+
+{#if jobs.length > 0}
+	<!-- Live region so a background-job completion is announced to screen readers
+	     even when the chip's visual change alone wouldn't be. role="status" already
+	     implies aria-live="polite". -->
+	<div class="sr-only" role="status">{announcement}</div>
+	<Popover
+		bind:this={popover}
+		bind:isOpen={open}
+		placement="top-end"
+		enableFlyTransition
+		usePointerDownOutside
+		class={standalone
+			? 'flex h-[34px] w-full items-center rounded-md border bg-surface-tertiary px-3 hover:bg-surface-hover'
+			: 'flex h-full items-center px-3.5 hover:bg-surface-hover'}
+		triggerAttrs={{ 'aria-label': ariaLabel, 'aria-haspopup': 'dialog' }}
+		contentClasses="!bg-surface"
+	>
+		{#snippet trigger()}
+			<span class="flex min-w-0 items-center gap-2 text-xs">
+				<span class="shrink-0 font-normal text-primary">Jobs</span>
+				<span
+					class={`size-[7px] shrink-0 rounded-full ${segment.dot} ${segment.pulse ? 'motion-safe:animate-pulse' : ''}`}
+				></span>
+				<span
+					class={`min-w-0 truncate font-normal ${runningJob ? 'text-2xs' : 'text-xs'} ${segment.danger ? 'text-red-500' : 'text-primary'}`}
+					title={runningJob?.label ?? undefined}
+					dir={runningJob ? 'rtl' : undefined}
+				>
+					<!-- Running single: show the FULL path, truncated with a LEADING ellipsis
+					     (dir=rtl clips the start) so the disambiguating tail stays visible;
+					     <bdi> keeps the path itself rendering left-to-right. Counts render as-is. -->
+					{#if runningJob}<bdi>{runningJob.label}</bdi>{:else}{segment.text}{/if}
+				</span>
+				{#if chipElapsed}
+					<span
+						transition:slide={{ axis: 'x', duration: 200 }}
+						class="shrink-0 tabular-nums text-2xs text-tertiary"
+					>
+						{chipElapsed}
+					</span>
+				{/if}
+				<ChevronUp
+					size={14}
+					class={`shrink-0 text-secondary transition-transform duration-150 ${open ? 'rotate-180' : ''}`}
+				/>
+			</span>
+		{/snippet}
+
+		{#snippet content()}
+			<div class="flex max-h-[50vh] w-80 flex-col text-xs">
+				<div class="border-b px-3 py-2 text-tertiary">Jobs this session</div>
+				<div class="min-h-0 flex-1 overflow-y-auto py-1">
+					{#each sortedJobs as job (job.jobId)}
+						<div class="flex items-center gap-2.5 px-3 py-1.5">
+							{#if job.status === 'queued' || !job.job}
+								<!-- Queued: match the job detail page's orange badge (JobStatusIcon's
+								     default queued badge is gray). Also covers the pre-first-fetch state. -->
+								<Badge color="orange" baseClass="!px-1.5" title="Queued"
+									><Hourglass size={13} /></Badge
+								>
+							{:else}
+								<JobStatusIcon job={job.job} />
+							{/if}
+							<span class="min-w-0 grow truncate text-secondary" title={job.label}>{job.label}</span
+							>
+							<span class="shrink-0 tabular-nums text-tertiary">{elapsedLabel(job)}</span>
+							<div class="flex shrink-0 items-center gap-1.5">
+								{#if job.status === 'suspended'}
+									<Button
+										unifiedSize="xs"
+										variant="accent"
+										startIcon={{ icon: ThumbsUp }}
+										on:click={() => openApproval(job)}>Approve</Button
+									>
+								{/if}
+								{#if !isTerminal(job.status)}
+									<Button
+										unifiedSize="xs"
+										variant="accent"
+										destructive
+										startIcon={{ icon: TimerOff }}
+										on:click={() => aiChatManager.cancelJob(job.jobId)}>Cancel</Button
+									>
+								{/if}
+								<Button
+									iconOnly
+									unifiedSize="xs"
+									variant="subtle"
+									startIcon={{ icon: ExternalLink }}
+									title="Open the run"
+									on:click={() => openRun(job)}
+								/>
+							</div>
+						</div>
+					{/each}
+				</div>
+			</div>
+		{/snippet}
+	</Popover>
+
+	<!-- Portal to <body> + a z-index above the editor: opened from deep in the
+	     sessions chat column, the modal would otherwise be trapped below the
+	     preview-pane flow editor (Monaco at zIndexes.monacoEditor). -->
+	<Portal target="body">
+		<Modal
+			title={`Approval — ${approvalLabel}`}
+			bind:open={approvalOpen}
+			minZIndex={zIndexes.monacoEditorSuggestions + 1}
+		>
+			{#if approvalJob}
+				<FlowStatusWaitingForEvents
+					job={approvalJob}
+					workspaceId={approvalJob.workspace_id}
+					isOwner={true}
+					light
+					onAction={(approved) => {
+						// Approving resumes the flow (back to running); optimistically drop the
+						// suspended status so the segment updates instantly. Closing the modal
+						// triggers the on-close effect above, which re-polls to reconcile.
+						if (approved && approvalJob) {
+							aiChatManager.updateJob(approvalJob.id, { status: 'running' })
+						}
+						approvalOpen = false
+					}}
+				/>
+			{:else}
+				<div class="p-6 text-center text-xs text-tertiary">Loading approval…</div>
+			{/if}
+		</Modal>
+	</Portal>
+{/if}
diff --git a/frontend/src/lib/components/copilot/chat/ToolMessageActions.svelte b/frontend/src/lib/components/copilot/chat/ToolMessageActions.svelte
index 0a2fd1ab79..afee03bcf2 100644
--- a/frontend/src/lib/components/copilot/chat/ToolMessageActions.svelte
+++ b/frontend/src/lib/components/copilot/chat/ToolMessageActions.svelte
@@ -1,15 +1,24 @@
 <script lang="ts">
 	import { Button } from '$lib/components/common'
 	import {
+		ArrowRight,
+		Boxes,
 		Calendar,
 		Database,
+		DollarSign,
+		FolderOpen,
 		KeyRound,
 		Mail,
 		Package,
+		Play,
 		Route,
+		ScrollText,
+		Settings,
 		SquarePen,
 		Unplug,
-		Webhook
+		Users,
+		Webhook,
+		Zap
 	} from 'lucide-svelte'
 	import AwsIcon from '$lib/components/icons/AwsIcon.svelte'
 	import AzureIcon from '$lib/components/icons/AzureIcon.svelte'
@@ -29,6 +38,7 @@
 		title: string
 		icon: any
 	}
+	type ActionCard = ActionCardConfig & { subtitle: string; buttonIcon: any }
 
 	let { actions }: Props = $props()
 	let runningActionId: string | undefined = $state(undefined)
@@ -49,12 +59,30 @@
 		email: { title: 'Email trigger', icon: Mail }
 	}
 
-	function getActionCardConfig(action: ToolDisplayAction): ActionCardConfig {
+	const navigatePageConfig: Record<string, ActionCardConfig> = {
+		runs: { title: 'Runs', icon: Play },
+		schedules: { title: 'Schedules', icon: Calendar },
+		variables: { title: 'Variables', icon: DollarSign },
+		resources: { title: 'Resources', icon: Boxes },
+		assets: { title: 'Assets', icon: Database },
+		audit_logs: { title: 'Audit logs', icon: ScrollText },
+		folders: { title: 'Folders', icon: FolderOpen },
+		groups: { title: 'Groups', icon: Users },
+		triggers: { title: 'Triggers', icon: Zap },
+		workspace_settings: { title: 'Workspace settings', icon: Settings }
+	}
+
+	function getActionCard(action: ToolDisplayAction): ActionCard {
+		if (action.type === 'navigate') {
+			const config = navigatePageConfig[action.page] ?? { title: action.page, icon: Route }
+			return { ...config, subtitle: action.label, buttonIcon: ArrowRight }
+		}
 		const key: ActionCardKey | undefined =
 			action.resource === 'trigger' ? action.triggerKind : action.resource
-		return key
+		const config = key
 			? actionCardConfigs[key]
 			: { title: action.label.replace(/^Open\s+/i, ''), icon: Webhook }
+		return { ...config, subtitle: action.path, buttonIcon: SquarePen }
 	}
 
 	async function handleAction(action: ToolDisplayAction) {
@@ -73,7 +101,7 @@
 {#if actions.length > 0}
 	<div class="space-y-2">
 		{#each actions as action (action.id)}
-			{@const card = getActionCardConfig(action)}
+			{@const card = getActionCard(action)}
 			{@const Icon = card.icon}
 			<div class="flex items-center gap-3 rounded-md border !border-green-500/40 bg-surface p-3">
 				<div
@@ -83,7 +111,7 @@
 				</div>
 				<div class="min-w-0 flex-1">
 					<div class="truncate text-xs font-semibold text-primary">{card.title}</div>
-					<div class="truncate text-2xs text-secondary">{action.path}</div>
+					<div class="truncate text-2xs text-secondary">{card.subtitle}</div>
 				</div>
 				<Button
 					size="xs"
@@ -91,7 +119,7 @@
 					title={action.label}
 					loading={runningActionId === action.id}
 					disabled={runningActionId !== undefined && runningActionId !== action.id}
-					startIcon={{ icon: SquarePen }}
+					startIcon={{ icon: card.buttonIcon }}
 					onClick={() => handleAction(action)}
 				>
 					Open
diff --git a/frontend/src/lib/components/copilot/chat/anthropic.test.ts b/frontend/src/lib/components/copilot/chat/anthropic.test.ts
new file mode 100644
index 0000000000..9c9a4d0bb0
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/anthropic.test.ts
@@ -0,0 +1,164 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
+import { convertOpenAIToAnthropicMessages } from './anthropic'
+
+// anthropic.ts pulls in the chat client/registry layer at import time; the
+// converter under test is pure, so stub those side-effecting modules away.
+vi.mock('../lib', () => ({
+	getProviderAndCompletionConfig: vi.fn(),
+	workspaceAIClients: {}
+}))
+
+vi.mock('../reasoningRegistry', () => ({
+	applyReasoningToConfig: vi.fn()
+}))
+
+vi.mock('./shared', () => ({
+	processToolCall: vi.fn()
+}))
+
+describe('convertOpenAIToAnthropicMessages', () => {
+	it('replays a captured assistant turn verbatim, skips the standalone text copy, and leaves the turn untouched', () => {
+		const anthropicContent = [
+			{ type: 'thinking', thinking: 'first', signature: 'sig-1' },
+			{
+				type: 'server_tool_use',
+				id: 'srv_1',
+				name: 'web_search',
+				input: { query: 'nist password length' }
+			},
+			{
+				type: 'web_search_tool_result',
+				tool_use_id: 'srv_1',
+				content: [{ type: 'web_search_result', title: 'NIST', url: 'https://nist.gov' }]
+			},
+			{ type: 'thinking', thinking: 'second', signature: 'sig-2' },
+			{ type: 'tool_use', id: 'tool_1', name: 'list_resources', input: {} }
+		]
+		// Snapshot to assert the stored content is never mutated by the converter.
+		const anthropicContentSnapshot = JSON.parse(JSON.stringify(anthropicContent))
+
+		const messages: ChatCompletionMessageParam[] = [
+			{ role: 'user', content: 'find the nist length then list resources' },
+			// Standalone text the streamer emits before the tool-call message.
+			{ role: 'assistant', content: 'Let me search the web.' },
+			{
+				role: 'assistant',
+				tool_calls: [
+					{
+						id: 'tool_1',
+						type: 'function',
+						function: { name: 'list_resources', arguments: '{}' }
+					}
+				],
+				_anthropicContent: anthropicContent
+			} as any,
+			{ role: 'tool', tool_call_id: 'tool_1', content: 'resource A, resource B' }
+		]
+
+		const { messages: out } = convertOpenAIToAnthropicMessages(messages)
+
+		// user + the verbatim assistant turn + the tool result; the standalone text is dropped.
+		expect(out).toHaveLength(3)
+		expect(out[0]).toEqual({ role: 'user', content: 'find the nist length then list resources' })
+
+		// Assistant turn replayed in original order, no reordering or dropped blocks.
+		expect(out[1].role).toBe('assistant')
+		expect((out[1].content as any[]).map((b) => b.type)).toEqual([
+			'thinking',
+			'server_tool_use',
+			'web_search_tool_result',
+			'thinking',
+			'tool_use'
+		])
+		// The verbatim turn must stay byte-identical — no cache_control injected into it,
+		// or a thinking-block signature would no longer validate.
+		expect(out[1].content).toEqual(anthropicContentSnapshot)
+		expect((out[1].content as any[]).some((b) => 'cache_control' in b)).toBe(false)
+		expect(anthropicContent).toEqual(anthropicContentSnapshot)
+
+		// The cache breakpoint lands on the trailing tool result, not the assistant turn.
+		expect(out[2]).toEqual({
+			role: 'user',
+			content: [
+				{
+					type: 'tool_result',
+					tool_use_id: 'tool_1',
+					content: 'resource A, resource B',
+					cache_control: { type: 'ephemeral' }
+				}
+			]
+		})
+	})
+
+	it('converts a plain text assistant turn (no tools) and caches the trailing text block', () => {
+		const messages: ChatCompletionMessageParam[] = [
+			{ role: 'user', content: 'hello' },
+			{ role: 'assistant', content: 'hi there' }
+		]
+
+		const { messages: out } = convertOpenAIToAnthropicMessages(messages)
+
+		expect(out).toHaveLength(2)
+		expect(out[0]).toEqual({ role: 'user', content: 'hello' })
+		expect(out[1].role).toBe('assistant')
+		expect(out[1].content).toEqual([
+			{ type: 'text', text: 'hi there', cache_control: { type: 'ephemeral' } }
+		])
+	})
+
+	it('falls back to _anthropicThinkingBlocks for turns persisted before _anthropicContent', () => {
+		const thinkingBlocks = [{ type: 'thinking', thinking: 'reasoning', signature: 'sig-old' }]
+
+		const messages: ChatCompletionMessageParam[] = [
+			{ role: 'user', content: 'do a thing' },
+			// The standalone text persisted alongside an old-style turn must NOT be skipped
+			// (the fallback reconstruction relies on it for the assistant text).
+			{ role: 'assistant', content: 'working on it' },
+			{
+				role: 'assistant',
+				tool_calls: [
+					{
+						id: 'tool_old',
+						type: 'function',
+						function: { name: 'list_resources', arguments: '{}' }
+					}
+				],
+				_anthropicThinkingBlocks: thinkingBlocks
+			} as any
+		]
+
+		const { messages: out } = convertOpenAIToAnthropicMessages(messages)
+
+		expect(out).toHaveLength(3)
+		expect(out[1]).toEqual({ role: 'assistant', content: 'working on it' })
+		const content = out[2].content as any[]
+		// Thinking block re-injected first, then the tool_use.
+		expect(content.map((b) => b.type)).toEqual(['thinking', 'tool_use'])
+		expect(content[0]).toEqual(thinkingBlocks[0])
+		expect(content[1]).toMatchObject({ type: 'tool_use', id: 'tool_old', name: 'list_resources' })
+	})
+
+	it('caches a trailing tool result even when the prior turn used no captured content', () => {
+		const messages: ChatCompletionMessageParam[] = [
+			{ role: 'user', content: 'q' },
+			{
+				role: 'assistant',
+				tool_calls: [
+					{ id: 't1', type: 'function', function: { name: 'list_resources', arguments: '{}' } }
+				]
+			} as any,
+			{ role: 'tool', tool_call_id: 't1', content: 'done' }
+		]
+
+		const { messages: out } = convertOpenAIToAnthropicMessages(messages)
+
+		const last = out[out.length - 1]
+		expect(last.role).toBe('user')
+		expect((last.content as any[])[0]).toMatchObject({
+			type: 'tool_result',
+			tool_use_id: 't1',
+			cache_control: { type: 'ephemeral' }
+		})
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/anthropic.ts b/frontend/src/lib/components/copilot/chat/anthropic.ts
index 48b068039f..b6e7e57a17 100644
--- a/frontend/src/lib/components/copilot/chat/anthropic.ts
+++ b/frontend/src/lib/components/copilot/chat/anthropic.ts
@@ -286,15 +286,15 @@ export async function parseAnthropicCompletion(
 			role: 'assistant',
 			tool_calls: toolCallsToProcess
 		}
-		// Preserve thinking blocks (with signatures) so the next request keeps the
-		// reasoning chain — Anthropic requires this when thinking is combined with tool
-		// use. They are re-injected by convertOpenAIToAnthropicMessages.
-		const thinkingBlocks = finalMessage.content.filter(
-			(b) => b.type === 'thinking' || b.type === 'redacted_thinking'
-		)
-		if (thinkingBlocks.length > 0) {
-			;(assistantWithTools as any)._anthropicThinkingBlocks = thinkingBlocks
-		}
+		// Preserve the assistant turn verbatim (thinking/redacted_thinking with their
+		// signatures, server_tool_use + web_search_tool_result, text and tool_use) in
+		// original order. Anthropic binds each thinking block's signature to the blocks
+		// that precede it in the latest assistant message, so when this turn is replayed
+		// to continue past its tool call it must be byte-identical: reordering thinking to
+		// the front or dropping the web-search blocks invalidates a later block's
+		// signature and the request 400s with "thinking blocks ... cannot be modified".
+		// convertOpenAIToAnthropicMessages replays this content as-is.
+		;(assistantWithTools as any)._anthropicContent = finalMessage.content
 		messages.push(assistantWithTools)
 		addedMessages.push(assistantWithTools)
 
@@ -323,7 +323,33 @@ export function convertOpenAIToAnthropicMessages(messages: ChatCompletionMessage
 	let system: TextBlockParam[] | undefined
 	const anthropicMessages: MessageParam[] = []
 
-	for (const message of messages) {
+	// A streamed assistant turn that ends in tool calls is persisted as one or more
+	// standalone text messages followed by the tool-call message carrying
+	// _anthropicContent. That text is already inside _anthropicContent (replayed verbatim
+	// below), so drop the standalone copies — otherwise the text is duplicated and
+	// emitted ahead of the turn's thinking blocks. The scan stops at the preceding
+	// user/tool message, so only the current turn's own text is skipped.
+	const skipStandaloneText = new Set<number>()
+	for (let i = 0; i < messages.length; i++) {
+		if (!(messages[i] as any)._anthropicContent) continue
+		for (let j = i - 1; j >= 0; j--) {
+			const m = messages[j]
+			if (
+				m.role === 'assistant' &&
+				typeof m.content === 'string' &&
+				!m.tool_calls &&
+				!(m as any)._anthropicContent
+			) {
+				skipStandaloneText.add(j)
+			} else {
+				break
+			}
+		}
+	}
+
+	for (let i = 0; i < messages.length; i++) {
+		const message = messages[i]
+		if (skipStandaloneText.has(i)) continue
 		if (message.role === 'system') {
 			const systemText =
 				typeof message.content === 'string' ? message.content : JSON.stringify(message.content)
@@ -345,10 +371,19 @@ export function convertOpenAIToAnthropicMessages(messages: ChatCompletionMessage
 					typeof message.content === 'string' ? message.content : JSON.stringify(message.content)
 			})
 		} else if (message.role === 'assistant') {
+			// Replay a captured assistant turn verbatim so its thinking-block signatures
+			// stay valid (see the _anthropicContent note where the streamed turn is stored).
+			const anthropicContent = (message as any)._anthropicContent
+			if (Array.isArray(anthropicContent) && anthropicContent.length > 0) {
+				anthropicMessages.push({ role: 'assistant', content: anthropicContent as any })
+				continue
+			}
+
 			const content: any[] = []
 
-			// Re-inject preserved thinking blocks first (Anthropic requires thinking to
-			// precede tool_use in the same assistant turn when thinking is enabled).
+			// Fallback for sessions persisted before _anthropicContent existed: re-inject
+			// the preserved thinking blocks first (Anthropic requires thinking to precede
+			// tool_use in the same assistant turn when thinking is enabled).
 			const thinkingBlocks = (message as any)._anthropicThinkingBlocks
 			if (Array.isArray(thinkingBlocks) && thinkingBlocks.length > 0) {
 				content.push(...thinkingBlocks)
@@ -404,26 +439,29 @@ export function convertOpenAIToAnthropicMessages(messages: ChatCompletionMessage
 		}
 	}
 
-	// Add cache_control to the last message content blocks
+	// Cache the conversation prefix: put an ephemeral breakpoint on the last content
+	// block of the last message. Each continuation only appends a tool result plus the
+	// next turn, so everything up to here is read from cache — which is what keeps
+	// replaying assistant turns verbatim (web-search results included) affordable.
+	// cache_control is valid on text/tool_use/tool_result blocks, but a thinking or
+	// redacted_thinking block must never be modified, so skip the breakpoint there.
 	if (anthropicMessages.length > 0) {
 		const lastMessage = anthropicMessages[anthropicMessages.length - 1]
-		if (Array.isArray(lastMessage.content)) {
-			// Add cache_control to the last content block
-			if (lastMessage.content.length > 0) {
-				const lastBlock = lastMessage.content[lastMessage.content.length - 1]
-				if (lastBlock.type === 'text') {
-					lastBlock.cache_control = { type: 'ephemeral' }
-				}
-			}
-		} else if (typeof lastMessage.content === 'string') {
-			// Convert string content to array format with cache_control
+		if (typeof lastMessage.content === 'string') {
 			lastMessage.content = [
-				{
-					type: 'text',
-					text: lastMessage.content,
-					cache_control: { type: 'ephemeral' }
-				}
+				{ type: 'text', text: lastMessage.content, cache_control: { type: 'ephemeral' } }
 			]
+		} else if (Array.isArray(lastMessage.content) && lastMessage.content.length > 0) {
+			const lastIndex = lastMessage.content.length - 1
+			const lastBlock = lastMessage.content[lastIndex] as any
+			if (lastBlock.type !== 'thinking' && lastBlock.type !== 'redacted_thinking') {
+				// Clone the block instead of mutating in place: the array may be a verbatim
+				// _anthropicContent turn that must stay unaltered for later requests.
+				lastMessage.content = [
+					...lastMessage.content.slice(0, lastIndex),
+					{ ...lastBlock, cache_control: { type: 'ephemeral' } }
+				]
+			}
 		}
 	}
 
diff --git a/frontend/src/lib/components/copilot/chat/app/core.ts b/frontend/src/lib/components/copilot/chat/app/core.ts
index cbfdcc5616..599a77e906 100644
--- a/frontend/src/lib/components/copilot/chat/app/core.ts
+++ b/frontend/src/lib/components/copilot/chat/app/core.ts
@@ -927,6 +927,7 @@ export function prepareAppSystemMessage(customPrompt?: string): ChatCompletionSy
 - The frontend is bundled using esbuild with entrypoint \`index.tsx\`
 - Frontend files are managed separately from backend runnables
 - The \`wmill.d.ts\` file is generated automatically from the backend runnables shape
+- Begin every React file (\`.tsx\`/\`.jsx\`) that uses JSX with \`import React from 'react'\`. Raw apps bundle with the classic JSX transform, so \`React\` must be in scope wherever JSX is used — a missing import compiles fine but throws \`React is not defined\` at runtime.
 
 ### Backend
 Backend runnables can be of different types:
diff --git a/frontend/src/lib/components/copilot/chat/ask/core.ts b/frontend/src/lib/components/copilot/chat/ask/core.ts
index b93ace1179..36614eecb9 100644
--- a/frontend/src/lib/components/copilot/chat/ask/core.ts
+++ b/frontend/src/lib/components/copilot/chat/ask/core.ts
@@ -15,7 +15,7 @@ You have access to these tools:
 
 INSTRUCTIONS:
 - Call search_docs FIRST with a few distinctive keywords from the user's question to find the most relevant documentation pages and matching snippets.
-- If the snippets already answer the question, answer directly. Otherwise call read_docs_page with one of the returned Source URLs to read the full page; if read_docs_page returns a list of section headings, call it again with the same path and a \`section\` argument to read the relevant section.
+- If the snippets already answer the question, answer directly. Otherwise call read_docs_page with one of the returned Source URLs as its \`url\` argument to read the full page; if read_docs_page returns a list of section headings, call it again with the same \`url\` argument and a \`section\` argument to read the relevant section.
 - If the first search returns nothing useful, retry with different or broader keywords before giving up.
 - Answer based ONLY on what you find in the documentation. Do not invent features, flags, syntax, or behavior that you did not see in the docs.
 - Always include the documentation URL(s) you consulted in your answer. Cite the exact "Source" URL shown in the search results (or the "Source page" URL at the top of a read page) — never reconstruct a URL from a link inside the page body.
diff --git a/frontend/src/lib/components/copilot/chat/chatLoop.test.ts b/frontend/src/lib/components/copilot/chat/chatLoop.test.ts
index 9c1863ae54..93acdfbd86 100644
--- a/frontend/src/lib/components/copilot/chat/chatLoop.test.ts
+++ b/frontend/src/lib/components/copilot/chat/chatLoop.test.ts
@@ -399,3 +399,42 @@ describe('truncateToToolPairedPrefix', () => {
 		expect(truncateToToolPairedPrefix(msgs)).toEqual(msgs)
 	})
 })
+
+describe('runChatLoop history sanitization', () => {
+	beforeEach(() => {
+		vi.resetAllMocks()
+		mocks.providerSupportsWebSearch.mockReturnValue(false)
+		mocks.resolveRequestReasoning.mockReturnValue(undefined)
+		mocks.getOpenAIResponsesCompletion.mockResolvedValue({})
+		mocks.parseOpenAIResponsesCompletion.mockResolvedValue({
+			shouldContinue: false,
+			tokenUsage
+		})
+	})
+
+	it('replaces unparseable historical tool_call arguments before sending, without mutating the stored history', async () => {
+		const config = createConfig({ workspace: `workspace-${randomUUID()}` })
+		const poisoned: ChatCompletionMessageParam = {
+			role: 'assistant',
+			tool_calls: [
+				{
+					id: 'call_1',
+					type: 'function',
+					function: { name: 'patch_app_file', arguments: '{"path": "u/x", "old_string": "trunc' }
+				}
+			]
+		}
+		config.messages.push(poisoned, {
+			role: 'tool',
+			tool_call_id: 'call_1',
+			content: 'Error while calling tool'
+		})
+
+		await runChatLoop(config)
+
+		const sent = mocks.getOpenAIResponsesCompletion.mock.calls[0][0] as any[]
+		const sentAssistant = sent.find((m) => m.role === 'assistant' && m.tool_calls)
+		expect(sentAssistant.tool_calls[0].function.arguments).toBe('{}')
+		expect((poisoned as any).tool_calls[0].function.arguments).toContain('trunc')
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/chatLoop.ts b/frontend/src/lib/components/copilot/chat/chatLoop.ts
index 0e5e4923d7..edf5be4d07 100644
--- a/frontend/src/lib/components/copilot/chat/chatLoop.ts
+++ b/frontend/src/lib/components/copilot/chat/chatLoop.ts
@@ -8,8 +8,10 @@ import type {
 import { getCompletion, parseOpenAICompletion, providerSupportsWebSearch } from '../lib'
 import { resolveRequestReasoning, type ReasoningProviderModel } from '../reasoningRegistry'
 import { getAnthropicCompletion, parseAnthropicCompletion } from './anthropic'
+import { usesAnthropicMessagesApi } from '../modelConfig'
 import { getOpenAIResponsesCompletion, parseOpenAIResponsesCompletion } from './openai-responses'
 import type { Tool, ToolCallbacks } from './shared'
+import { sanitizeToolCallArguments } from './toolCallArguments'
 import { addChatTokenUsage, emptyChatTokenUsage, type ChatTokenUsage } from './tokenUsage'
 
 export interface ChatClients {
@@ -257,7 +259,7 @@ export async function runChatLoop(config: ChatLoopConfig): Promise<ChatLoopResul
 
 		const isOpenAI =
 			modelProvider.provider === 'openai' || modelProvider.provider === 'azure_openai'
-		const isAnthropic = modelProvider.provider === 'anthropic'
+		const isAnthropic = usesAnthropicMessagesApi(modelProvider.provider, modelProvider.model)
 		// Resolve effort once in chat context (applies the default-on level for
 		// capable models, and the provider-native disable token for an explicit
 		// off on reasoning-by-default providers); passed explicitly to each seam
@@ -266,7 +268,7 @@ export async function runChatLoop(config: ChatLoopConfig): Promise<ChatLoopResul
 
 		const messageParams = [
 			systemMessage,
-			...messages,
+			...sanitizeToolCallArguments(messages),
 			...(pendingUserMessage ? [pendingUserMessage] : [])
 		]
 		const toolDefs = tools.map((t) => t.def)
diff --git a/frontend/src/lib/components/copilot/chat/compactionPrompt.test.ts b/frontend/src/lib/components/copilot/chat/compactionPrompt.test.ts
index 2161182594..b91aacfa5d 100644
--- a/frontend/src/lib/components/copilot/chat/compactionPrompt.test.ts
+++ b/frontend/src/lib/components/copilot/chat/compactionPrompt.test.ts
@@ -34,6 +34,37 @@ chronological thinking the model should not keep
 		expect(formatCompactSummary(raw)).toBe('a\n\nb')
 	})
 
+	it('keeps the summary content when <summary> has no closing tag', () => {
+		const raw = '<summary>\n1. Primary Request and Intent: build the thing\n2. Pending Tasks: none'
+		const formatted = formatCompactSummary(raw)
+		expect(formatted).not.toContain('<summary>')
+		expect(formatted).toContain('Primary Request and Intent: build the thing')
+		expect(formatted).toContain('Pending Tasks: none')
+	})
+
+	it('drops the analysis scratchpad even when <summary> is left unclosed', () => {
+		const raw =
+			'<analysis>\nchronological thinking the model should not keep\n</analysis>\n<summary>\nthe real summary'
+		const formatted = formatCompactSummary(raw)
+		expect(formatted).not.toContain('chronological thinking')
+		expect(formatted).not.toContain('<analysis>')
+		expect(formatted).not.toContain('<summary>')
+		expect(formatted).toBe('the real summary')
+	})
+
+	it('strips an orphaned closing summary tag', () => {
+		expect(formatCompactSummary('plain summary</summary>')).toBe('plain summary')
+	})
+
+	it('does not leak analysis scratchpad that mentions a literal <summary> tag', () => {
+		const raw = `<analysis>scratchpad mentions <summary> before output</analysis>
+<summary>real summary</summary>`
+		const formatted = formatCompactSummary(raw)
+		expect(formatted).toBe('real summary')
+		expect(formatted).not.toContain('scratchpad')
+		expect(formatted).not.toContain('before output')
+	})
+
 	it('strips every analysis block, not just the first, when the summary is untagged', () => {
 		const raw = '<analysis>first</analysis>\nkept one\n<analysis>second</analysis>\nkept two'
 		const formatted = formatCompactSummary(raw)
diff --git a/frontend/src/lib/components/copilot/chat/compactionPrompt.ts b/frontend/src/lib/components/copilot/chat/compactionPrompt.ts
index 010a8cf8b8..f785682dac 100644
--- a/frontend/src/lib/components/copilot/chat/compactionPrompt.ts
+++ b/frontend/src/lib/components/copilot/chat/compactionPrompt.ts
@@ -100,13 +100,27 @@ export function getCompactionSummaryPrompt(): string {
  * well-formed-but-untagged summary is still usable.
  */
 export function formatCompactSummary(raw: string): string {
+	// Strip the analysis scratchpad first: it precedes the summary and may itself
+	// mention <summary>/<analysis> tokens that would otherwise be mistaken for the
+	// real summary boundary.
 	let formatted = raw.replace(/<analysis>[\s\S]*?<\/analysis>/gi, '')
 
 	const summaryMatch = formatted.match(/<summary>([\s\S]*?)<\/summary>/i)
 	if (summaryMatch) {
 		formatted = (summaryMatch[1] ?? '').trim()
+	} else {
+		// A truncated response or a weaker model sometimes opens <summary> without
+		// closing it. The text after the opener is still the summary, so keep it
+		// rather than leak the bare tag.
+		const openIdx = formatted.search(/<summary>/i)
+		if (openIdx !== -1) {
+			formatted = formatted.slice(openIdx)
+		}
 	}
 
+	// An orphaned opener or closer left by either branch must never reach the user.
+	formatted = formatted.replace(/<\/?(?:analysis|summary)>/gi, '')
+
 	// Collapse the blank-line runs left behind by stripping the analysis block.
 	return formatted.replace(/\n{3,}/g, '\n\n').trim()
 }
diff --git a/frontend/src/lib/components/copilot/chat/context.ts b/frontend/src/lib/components/copilot/chat/context.ts
index b2ab9e5f1c..cf41617f41 100644
--- a/frontend/src/lib/components/copilot/chat/context.ts
+++ b/frontend/src/lib/components/copilot/chat/context.ts
@@ -6,7 +6,8 @@ import {
 	FileCode,
 	Code2,
 	TextSelect,
-	Table2
+	Table2,
+	LayoutDashboard
 } from 'lucide-svelte'
 import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 import type { ScriptLang } from '$lib/gen/types.gen'
@@ -25,7 +26,8 @@ export const ContextIconMap = {
 	app_code_selection: TextSelect,
 	app_datatable: Table2,
 	workspace_script: Code2,
-	workspace_flow: BarsStaggered
+	workspace_flow: BarsStaggered,
+	workspace_app: LayoutDashboard
 	// flow_module type is handled with FlowModuleIcon
 }
 
@@ -228,6 +230,16 @@ export interface WorkspaceFlowElement {
 	summary?: string
 }
 
+/** Workspace app context element — reference to a (code-based) raw app in the
+ * workspace. Only raw apps are surfaced: the visual app builder produces a
+ * frontend, not a code unit the chat can act on. */
+export interface WorkspaceAppElement {
+	type: 'workspace_app'
+	path: string
+	title: string
+	summary?: string
+}
+
 export type ContextElement = (
 	| CodeElement
 	| ErrorElement
@@ -242,6 +254,7 @@ export type ContextElement = (
 	| AppDatatableElement
 	| WorkspaceScriptElement
 	| WorkspaceFlowElement
+	| WorkspaceAppElement
 ) & {
 	deletable?: boolean
 }
diff --git a/frontend/src/lib/components/copilot/chat/datatableTools.test.ts b/frontend/src/lib/components/copilot/chat/datatableTools.test.ts
index ff933eae20..391510ca52 100644
--- a/frontend/src/lib/components/copilot/chat/datatableTools.test.ts
+++ b/frontend/src/lib/components/copilot/chat/datatableTools.test.ts
@@ -1,16 +1,18 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { listMock, schemaMock, runSqlMock } = vi.hoisted(() => ({
+const { listMock, schemaMock, runScriptMock, executeTestRunMock } = vi.hoisted(() => ({
 	listMock: vi.fn(),
 	schemaMock: vi.fn(),
-	runSqlMock: vi.fn()
+	runScriptMock: vi.fn(),
+	executeTestRunMock: vi.fn()
 }))
 
 vi.mock('./shared', () => ({
 	createToolDef: (_schema: unknown, name: string, description: string) => ({
 		type: 'function',
 		function: { name, description, parameters: {} }
-	})
+	}),
+	executeTestRun: executeTestRunMock
 }))
 
 vi.mock('$lib/gen', () => ({
@@ -21,9 +23,23 @@ vi.mock('$lib/gen', () => ({
 }))
 
 vi.mock('$lib/components/jobs/utils', () => ({
-	runScriptAndPollResult: runSqlMock
+	runScript: runScriptMock
 }))
 
+// exec_datatable_sql now routes through executeTestRun; stub it to exercise the
+// jobStarter (so runScript args can be asserted) and then hand a completed job to
+// the tool's formatCompletion — which owns the datatable-specific result shaping.
+// The detach/tray orchestration itself is covered by shared.test.ts.
+function stubExecuteTestRunWithJob(job: { success: boolean; result: unknown }) {
+	runScriptMock.mockResolvedValue('job-123')
+	executeTestRunMock.mockImplementation(async (config: any) => {
+		await config.jobStarter()
+		const { llmText, card } = config.formatCompletion(job)
+		config.toolCallbacks.setToolStatus(config.toolId, card)
+		return llmText
+	})
+}
+
 import { getDatatableTools } from './datatableTools'
 
 function createToolCallbacks() {
@@ -54,7 +70,8 @@ function run(name: string, args: Record<string, unknown> = {}) {
 beforeEach(() => {
 	listMock.mockReset()
 	schemaMock.mockReset()
-	runSqlMock.mockReset()
+	runScriptMock.mockReset()
+	executeTestRunMock.mockReset()
 })
 
 describe('list_datatables', () => {
@@ -134,21 +151,10 @@ describe('exec_datatable_sql', () => {
 		expect(getTool('exec_datatable_sql').requiresConfirmation).toBe(true)
 	})
 
-	it('returns all rows when the result is at or below the cap', async () => {
-		const rows = Array.from({ length: 100 }, (_, i) => ({ id: i }))
-		runSqlMock.mockResolvedValue(rows)
-
-		const result = await run('exec_datatable_sql', {
-			datatable_name: 'main',
-			sql: 'SELECT * FROM t'
-		})
-
-		const parsed = JSON.parse(result)
-		expect(parsed.success).toBe(true)
-		expect(parsed.rowCount).toBe(100)
-		expect(parsed.result).toHaveLength(100)
-		expect(parsed.note).toBeUndefined()
-		expect(runSqlMock).toHaveBeenCalledWith({
+	it('starts the query as a postgresql job scoped to the datatable', async () => {
+		stubExecuteTestRunWithJob({ success: true, result: [] })
+		await run('exec_datatable_sql', { datatable_name: 'main', sql: 'SELECT * FROM t' })
+		expect(runScriptMock).toHaveBeenCalledWith({
 			workspace: 'test-workspace',
 			requestBody: {
 				language: 'postgresql',
@@ -158,18 +164,33 @@ describe('exec_datatable_sql', () => {
 		})
 	})
 
+	it('returns all rows when the result is at or below the cap', async () => {
+		const rows = Array.from({ length: 100 }, (_, i) => ({ id: i }))
+		stubExecuteTestRunWithJob({ success: true, result: rows })
+
+		const parsed = JSON.parse(
+			await run('exec_datatable_sql', { datatable_name: 'main', sql: 'SELECT * FROM t' })
+		)
+		expect(parsed.success).toBe(true)
+		expect(parsed.rowCount).toBe(100)
+		expect(parsed.result).toHaveLength(100)
+		expect(parsed.note).toBeUndefined()
+	})
+
 	it('truncates results above the cap and reports the full count', async () => {
 		const rows = Array.from({ length: 150 }, (_, i) => ({ id: i }))
-		runSqlMock.mockResolvedValue(rows)
+		stubExecuteTestRunWithJob({ success: true, result: rows })
 
-		const parsed = JSON.parse(await run('exec_datatable_sql', { datatable_name: 'main', sql: 'SELECT 1' }))
+		const parsed = JSON.parse(
+			await run('exec_datatable_sql', { datatable_name: 'main', sql: 'SELECT 1' })
+		)
 		expect(parsed.rowCount).toBe(150)
 		expect(parsed.result).toHaveLength(100)
 		expect(parsed.note).toBe('Showing first 100 of 150 rows')
 	})
 
 	it('treats a non-array result (e.g. DDL) as zero rows', async () => {
-		runSqlMock.mockResolvedValue(undefined)
+		stubExecuteTestRunWithJob({ success: true, result: undefined })
 		const parsed = JSON.parse(
 			await run('exec_datatable_sql', {
 				datatable_name: 'main',
@@ -180,13 +201,18 @@ describe('exec_datatable_sql', () => {
 	})
 
 	it('returns a failure object when the SQL job errors', async () => {
-		runSqlMock.mockRejectedValue(new Error('syntax error'))
-		const parsed = JSON.parse(await run('exec_datatable_sql', { datatable_name: 'main', sql: 'SLECT' }))
+		stubExecuteTestRunWithJob({ success: false, result: { error: { message: 'syntax error' } } })
+		const parsed = JSON.parse(
+			await run('exec_datatable_sql', { datatable_name: 'main', sql: 'SLECT' })
+		)
 		expect(parsed).toEqual({ success: false, error: 'syntax error' })
 	})
 
 	it('turns the backend "datatable not found" error into an actionable, blocking message', async () => {
-		runSqlMock.mockRejectedValue(new Error('Internal: datatable main not found @workspaces.rs:565:20'))
+		stubExecuteTestRunWithJob({
+			success: false,
+			result: { error: { message: 'Internal: datatable main not found @workspaces.rs:565:20' } }
+		})
 		const parsed = JSON.parse(
 			await run('exec_datatable_sql', { datatable_name: 'main', sql: 'CREATE TABLE t (id int)' })
 		)
diff --git a/frontend/src/lib/components/copilot/chat/datatableTools.ts b/frontend/src/lib/components/copilot/chat/datatableTools.ts
index cebde9e97e..e38b113425 100644
--- a/frontend/src/lib/components/copilot/chat/datatableTools.ts
+++ b/frontend/src/lib/components/copilot/chat/datatableTools.ts
@@ -1,8 +1,14 @@
 import { z } from 'zod'
-import { WorkspaceService } from '$lib/gen'
+import { WorkspaceService, type CompletedJob } from '$lib/gen'
 import type { DataTableTables } from '$lib/gen/types.gen'
-import { runScriptAndPollResult } from '$lib/components/jobs/utils'
-import { createToolDef, type Tool } from './shared'
+import { runScript } from '$lib/components/jobs/utils'
+import {
+	createToolDef,
+	executeTestRun,
+	type Tool,
+	type ToolDisplayMessage,
+	type ChatJobResultFormat
+} from './shared'
 
 /**
  * Workspace-scoped datatable tools, with no app whitelist and no creation policy.
@@ -46,36 +52,6 @@ export async function getDatatableColumns(
 	return schema.columns
 }
 
-/**
- * Execute an arbitrary SQL statement against a datatable.
- * Supports SELECT/INSERT/UPDATE/DELETE as well as DDL (CREATE/ALTER/DROP).
- * Returns rows for SELECT-like queries, an empty array otherwise.
- */
-export async function execDatatableSql(
-	workspace: string,
-	datatableName: string,
-	sql: string
-): Promise<
-	{ success: true; result: Record<string, any>[] } | { success: false; error: string }
-> {
-	try {
-		const result = await runScriptAndPollResult({
-			workspace,
-			requestBody: {
-				language: 'postgresql',
-				content: sql,
-				args: { database: `datatable://${datatableName}` }
-			}
-		})
-		if (Array.isArray(result)) {
-			return { success: true, result }
-		}
-		return { success: true, result: [] }
-	} catch (e) {
-		return { success: false, error: e instanceof Error ? e.message : String(e) }
-	}
-}
-
 // ============= Error helpers =============
 
 /**
@@ -140,6 +116,18 @@ const getExecDatatableSqlSchema = memo(() =>
 			.string()
 			.describe(
 				'The SQL query to execute. Supports SELECT, INSERT, UPDATE, DELETE, CREATE TABLE, ALTER TABLE, DROP TABLE, etc. For SELECT queries, results are returned as an array of objects. A newly created table will appear in list_datatables automatically.'
+			),
+		background: z
+			.boolean()
+			.optional()
+			.describe(
+				'Run in the background without waiting. Set true for queries you expect to be slow (large scans, heavy migrations) — you will be notified when it finishes. Leave unset for normal queries, which wait briefly and only background automatically if slow.'
+			),
+		wait_seconds: z
+			.number()
+			.optional()
+			.describe(
+				'How many seconds to wait for the query in-turn before it detaches into the background jobs tray. Defaults to 15. Raise it (capped at 120) for a query you expect to finish in ~30–60s and want the result in this same turn. Ignored when background is true.'
 			)
 	})
 )
@@ -154,6 +142,72 @@ const getExecDatatableSqlToolDef = memo(() =>
 /** Maximum rows returned to the model for a SELECT query. */
 const MAX_ROWS = 100
 
+/**
+ * Shape a finished datatable SQL job into the model-visible result + tool card:
+ * SELECT rows capped at MAX_ROWS, DDL/DML reported as zero rows, and the "datatable
+ * not configured" backend error rewritten as the actionable blocking message.
+ *
+ * Pure and keyed only on the datatable name so it can run from BOTH the inline
+ * completion path (executeTestRun.formatCompletion) AND a detached/rehydrated job
+ * reconstructed from its persisted ChatJobResultFormat (see formatChatJobCompletion).
+ */
+export function formatDatatableSqlCompletion(
+	job: CompletedJob,
+	datatableName: string
+): { llmText: string; card: Partial<ToolDisplayMessage> } {
+	if (job.success) {
+		// Successful runs always carry a `result` array (empty for DDL/DML),
+		// so SELECT rows and zero-row statements share one reporting path.
+		const rows = Array.isArray(job.result) ? (job.result as Record<string, any>[]) : []
+		const rowCount = rows.length
+		const payload =
+			rowCount > MAX_ROWS
+				? {
+						success: true,
+						rowCount,
+						result: rows.slice(0, MAX_ROWS),
+						note: `Showing first ${MAX_ROWS} of ${rowCount} rows`
+					}
+				: { success: true, rowCount, result: rows }
+		return {
+			llmText: JSON.stringify(payload, null, 2),
+			card: {
+				content: `Query returned ${rowCount} row(s)`,
+				result: JSON.stringify(job.result, null, 2)
+			}
+		}
+	}
+	const raw =
+		(job.result as any)?.error?.message ??
+		(typeof job.result === 'string' ? job.result : JSON.stringify(job.result)) ??
+		// JSON.stringify(undefined) is `undefined` (not a string), so a failed
+		// job with no result would otherwise yield an empty error message.
+		'Unknown error'
+	const errorMsg = isDatatableNotConfiguredError(raw)
+		? datatableNotConfiguredMessage(datatableName)
+		: raw
+	return {
+		llmText: JSON.stringify({ success: false, error: errorMsg }),
+		card: { content: `Error: ${errorMsg}`, error: errorMsg }
+	}
+}
+
+/**
+ * Reconstruct a tool's terminal formatter from the serializable descriptor stored
+ * on a ChatJob. Lets a background job that detached (and may have survived a reload,
+ * losing any in-memory closure) still report through its launching tool's result
+ * contract. Dispatches on `kind`; extend as more tools gain persisted formatters.
+ */
+export function formatChatJobCompletion(
+	job: CompletedJob,
+	resultFormat: ChatJobResultFormat
+): { llmText: string; card: Partial<ToolDisplayMessage> } {
+	switch (resultFormat.kind) {
+		case 'datatable':
+			return formatDatatableSqlCompletion(job, resultFormat.datatableName)
+	}
+}
+
 /**
  * The unrestricted workspace datatable tools, for registration in global mode.
  * Helper-free: each tool reads `workspace` directly from the tool call params.
@@ -233,45 +287,37 @@ export function getDatatableTools(): Tool<{}>[] {
 			showDetails: true,
 			fn: async ({ args, workspace, toolId, toolCallbacks }) => {
 				const parsedArgs = getExecDatatableSqlSchema().parse(args)
-				toolCallbacks.setToolStatus(toolId, {
-					content: `Executing SQL on "${parsedArgs.datatable_name}"...`
+				const name = parsedArgs.datatable_name
+				// Route through executeTestRun so a slow query detaches into the jobs
+				// tray (and honors `background`) instead of blocking the chat turn,
+				// while keeping the datatable-specific result/error shaping.
+				return executeTestRun({
+					jobStarter: () =>
+						runScript({
+							workspace,
+							requestBody: {
+								language: 'postgresql',
+								content: parsedArgs.sql,
+								args: { database: `datatable://${name}` }
+							}
+						}),
+					workspace,
+					toolCallbacks,
+					toolId,
+					contextName: 'script',
+					label: `SQL · ${name}`,
+					background: parsedArgs.background,
+					detachAfterMs:
+						parsedArgs.wait_seconds == null
+							? undefined
+							: Math.max(0, parsedArgs.wait_seconds) * 1000,
+					startMessage: `Executing SQL on "${name}"...`,
+					runningMessage: `SQL running on "${name}"...`,
+					// Inline path shapes the result here; the descriptor mirrors it so a
+					// detached/rehydrated completion reconstructs the same contract.
+					formatCompletion: (job) => formatDatatableSqlCompletion(job, name),
+					resultFormat: { kind: 'datatable', datatableName: name }
 				})
-				try {
-					const result = await execDatatableSql(workspace, parsedArgs.datatable_name, parsedArgs.sql)
-					if (result.success) {
-						// Successful runs always carry a `result` array (empty for DDL/DML), so
-						// SELECT rows and zero-row statements share one reporting path.
-						const rowCount = result.result.length
-						toolCallbacks.setToolStatus(toolId, { content: `Query returned ${rowCount} row(s)` })
-						if (rowCount > MAX_ROWS) {
-							return JSON.stringify(
-								{
-									success: true,
-									rowCount,
-									result: result.result.slice(0, MAX_ROWS),
-									note: `Showing first ${MAX_ROWS} of ${rowCount} rows`
-								},
-								null,
-								2
-							)
-						}
-						return JSON.stringify({ success: true, rowCount, result: result.result }, null, 2)
-					} else {
-						const raw = result.error || 'Unknown error'
-						const errorMsg = isDatatableNotConfiguredError(raw)
-							? datatableNotConfiguredMessage(parsedArgs.datatable_name)
-							: raw
-						toolCallbacks.setToolStatus(toolId, { content: `Error: ${errorMsg}`, error: errorMsg })
-						return JSON.stringify({ success: false, error: errorMsg })
-					}
-				} catch (e) {
-					const raw = e instanceof Error ? e.message : String(e)
-					const errorMsg = isDatatableNotConfiguredError(raw)
-						? datatableNotConfiguredMessage(parsedArgs.datatable_name)
-						: raw
-					toolCallbacks.setToolStatus(toolId, { content: `Error: ${errorMsg}`, error: errorMsg })
-					return JSON.stringify({ success: false, error: errorMsg })
-				}
 			}
 		}
 	]
diff --git a/frontend/src/lib/components/copilot/chat/docs/core.test.ts b/frontend/src/lib/components/copilot/chat/docs/core.test.ts
deleted file mode 100644
index da0e7f0880..0000000000
--- a/frontend/src/lib/components/copilot/chat/docs/core.test.ts
+++ /dev/null
@@ -1,464 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-	buildDocsOutline,
-	canonicalDocsPageUrl,
-	extractDocsSection,
-	formatDocsSearchResults,
-	makeSnippet,
-	mergeDocsSearchResults,
-	normalizeDocsUrl,
-	parseDocsFullText,
-	parseDocsHeadings,
-	parseDocsIndex,
-	renderDocsPageResult,
-	sanitizeDocsMarkdownLinks,
-	searchDocsIndex,
-	searchDocsPages
-} from './core'
-
-const SAMPLE = `# Jobs
-
-Intro text about jobs.
-
-## Job kinds
-
-Some kinds.
-
-## Result
-
-### Result of jobs that failed
-
-\`\`\`
-{ "error": "boom" }
-\`\`\`
-
-### Result streaming
-
-#### Returning a stream directly
-
-\`\`\`python
-# Returning a stream directly is a comment heading that must be ignored
-def main():
-    pass
-\`\`\`
-
-## Retention policy
-
-Final section.
-`
-
-describe('parseDocsHeadings', () => {
-	it('parses headings with their levels and ignores headings inside fenced code blocks', () => {
-		const headings = parseDocsHeadings(SAMPLE)
-		const titles = headings.map((h) => `${h.level}:${h.title}`)
-
-		expect(titles).toEqual([
-			'1:Jobs',
-			'2:Job kinds',
-			'2:Result',
-			'3:Result of jobs that failed',
-			'3:Result streaming',
-			'4:Returning a stream directly',
-			'2:Retention policy'
-		])
-		// The "# Returning a stream directly is a comment..." line inside the
-		// python fence must not be parsed as a heading.
-		expect(titles).not.toContain('1:Returning a stream directly is a comment heading that must be ignored')
-	})
-
-	it('returns startIndex offsets that point at the heading line', () => {
-		const headings = parseDocsHeadings(SAMPLE)
-		for (const heading of headings) {
-			expect(SAMPLE.slice(heading.startIndex)).toMatch(
-				new RegExp(`^#{${heading.level}}\\s+${heading.title.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`)
-			)
-		}
-	})
-
-	it('handles tilde fences', () => {
-		const content = '# Title\n\n~~~\n# not a heading\n~~~\n\n## Real\n'
-		const headings = parseDocsHeadings(content)
-		expect(headings.map((h) => h.title)).toEqual(['Title', 'Real'])
-	})
-})
-
-describe('extractDocsSection', () => {
-	it('extracts a section from its heading up to the next same-or-higher level heading', () => {
-		const section = extractDocsSection(SAMPLE, 'Result')
-		expect(section).toBeDefined()
-		expect(section).toContain('## Result')
-		expect(section).toContain('### Result of jobs that failed')
-		expect(section).toContain('### Result streaming')
-		// Stops before the next level-2 heading.
-		expect(section).not.toContain('## Retention policy')
-	})
-
-	it('matches case-insensitively and tolerates punctuation differences', () => {
-		const section = extractDocsSection(SAMPLE, 'retention-policy!')
-		expect(section).toBeDefined()
-		expect(section).toContain('## Retention policy')
-		expect(section).toContain('Final section.')
-	})
-
-	it('returns the deepest section bounded by the next same-level heading', () => {
-		const section = extractDocsSection(SAMPLE, 'Result streaming')
-		expect(section).toBeDefined()
-		expect(section).toContain('### Result streaming')
-		expect(section).toContain('#### Returning a stream directly')
-		expect(section).not.toContain('## Retention policy')
-	})
-
-	it('returns undefined when no heading matches', () => {
-		expect(extractDocsSection(SAMPLE, 'Nonexistent section')).toBeUndefined()
-	})
-})
-
-describe('buildDocsOutline', () => {
-	it('lists headings with approximate per-section sizes and indentation', () => {
-		const outline = buildDocsOutline(SAMPLE)
-		expect(outline).toContain('- Jobs (~')
-		expect(outline).toContain('  - Job kinds (~')
-		expect(outline).toContain('    - Result of jobs that failed (~')
-	})
-
-	it('handles pages with no headings', () => {
-		expect(buildDocsOutline('just some text\nwith no headings')).toBe(
-			'(no markdown headings found on this page)'
-		)
-	})
-})
-
-describe('normalizeDocsUrl', () => {
-	it('appends .md to a bare path', () => {
-		expect(normalizeDocsUrl('/docs/core_concepts/jobs')).toBe(
-			'https://www.windmill.dev/docs/core_concepts/jobs.md'
-		)
-	})
-
-	it('accepts a path without a leading slash', () => {
-		expect(normalizeDocsUrl('docs/core_concepts/jobs')).toBe(
-			'https://www.windmill.dev/docs/core_concepts/jobs.md'
-		)
-	})
-
-	it('accepts a full URL and strips anchors and query strings', () => {
-		expect(
-			normalizeDocsUrl('https://www.windmill.dev/docs/core_concepts/jobs#result?foo=bar')
-		).toBe('https://www.windmill.dev/docs/core_concepts/jobs.md')
-	})
-
-	it('does not double-append .md', () => {
-		expect(normalizeDocsUrl('/docs/core_concepts/jobs.md')).toBe(
-			'https://www.windmill.dev/docs/core_concepts/jobs.md'
-		)
-	})
-
-	it('strips a trailing slash before appending .md', () => {
-		expect(normalizeDocsUrl('/docs/core_concepts/jobs/')).toBe(
-			'https://www.windmill.dev/docs/core_concepts/jobs.md'
-		)
-	})
-
-	it('strips docusaurus numeric ordering prefixes from path segments', () => {
-		expect(normalizeDocsUrl('/docs/flows/13_flow_branches')).toBe(
-			'https://www.windmill.dev/docs/flows/flow_branches.md'
-		)
-	})
-
-	it('converts a .mdx source suffix to .md', () => {
-		expect(normalizeDocsUrl('/docs/flows/13_flow_branches.mdx')).toBe(
-			'https://www.windmill.dev/docs/flows/flow_branches.md'
-		)
-	})
-})
-
-describe('sanitizeDocsMarkdownLinks', () => {
-	const PAGE = 'https://www.windmill.dev/docs/flows/flow_editor.md'
-
-	it('rewrites a relative .mdx source link to a canonical published URL', () => {
-		expect(sanitizeDocsMarkdownLinks('See [retries](./14_retries.mdx) for more.', PAGE)).toBe(
-			'See [retries](https://www.windmill.dev/docs/flows/retries) for more.'
-		)
-	})
-
-	it('strips numeric prefixes from same-directory links', () => {
-		expect(sanitizeDocsMarkdownLinks('[handling](./8_error_handling.mdx)', PAGE)).toBe(
-			'[handling](https://www.windmill.dev/docs/flows/error_handling)'
-		)
-	})
-
-	it('preserves anchors when rewriting', () => {
-		expect(sanitizeDocsMarkdownLinks('[branch all](./13_flow_branches.mdx#branch-all)', PAGE)).toBe(
-			'[branch all](https://www.windmill.dev/docs/flows/flow_branches#branch-all)'
-		)
-	})
-
-	it('leaves image and external links untouched', () => {
-		const input =
-			'![diagram](./assets/flow_example.png) and [site](https://example.com/page.md)'
-		expect(sanitizeDocsMarkdownLinks(input, PAGE)).toBe(input)
-	})
-
-	it('leaves bare anchor links untouched', () => {
-		expect(sanitizeDocsMarkdownLinks('[top](#introduction)', PAGE)).toBe('[top](#introduction)')
-	})
-
-	// `../` links are authored against the docusaurus source tree, whose directory
-	// depth differs from the published URL on slug-flattened pages, so resolving
-	// them against the page URL is unreliable (a single `../` can over-escape just
-	// as a double one does). All `../` links are left untouched and disambiguated
-	// by the canonical "Source page" header instead.
-	it('leaves single ../ cross-directory links untouched', () => {
-		const input = '[handling](../core_concepts/8_error_handling.mdx)'
-		expect(sanitizeDocsMarkdownLinks(input, PAGE)).toBe(input)
-	})
-
-	it('leaves double ../../ cross-directory links untouched', () => {
-		const input = '[retries](../../flows/14_retries.md)'
-		expect(sanitizeDocsMarkdownLinks(input, PAGE)).toBe(input)
-	})
-})
-
-describe('canonicalDocsPageUrl', () => {
-	it('returns the published URL without the .md suffix', () => {
-		expect(canonicalDocsPageUrl('/docs/flows/flow_editor')).toBe(
-			'https://www.windmill.dev/docs/flows/flow_editor'
-		)
-	})
-
-	it('strips numeric prefixes so a source-style path maps to the published URL', () => {
-		expect(canonicalDocsPageUrl('/docs/flows/14_retries.md')).toBe(
-			'https://www.windmill.dev/docs/flows/retries'
-		)
-	})
-})
-
-describe('renderDocsPageResult', () => {
-	it('returns the whole page when small and no section requested', () => {
-		expect(renderDocsPageResult(SAMPLE)).toBe(SAMPLE)
-	})
-
-	it('returns an outline for large pages with no section requested', () => {
-		const large = `# Big\n\n${'x'.repeat(25_000)}\n\n## Tail\n\nmore`
-		const result = renderDocsPageResult(large)
-		expect(result).toContain('This documentation page is large')
-		expect(result).toContain('- Big (~')
-		expect(result).toContain('- Tail (~')
-	})
-
-	it('returns the requested section content when found', () => {
-		const result = renderDocsPageResult(SAMPLE, 'Job kinds')
-		expect(result).toContain('## Job kinds')
-		expect(result).toContain('Some kinds.')
-	})
-
-	it('returns the outline with a note when the requested section is missing', () => {
-		const result = renderDocsPageResult(SAMPLE, 'Does not exist')
-		expect(result).toContain('No section matching "Does not exist" was found')
-		expect(result).toContain('- Jobs (~')
-	})
-})
-
-// Mirrors the llms-full.txt layout: a corpus preamble, then per-page blocks each
-// introduced by a `---` + `## <Category>` lead-in followed by a `Source:` line.
-const SAMPLE_FULL = `# Windmill
-
-> Preamble blurb that precedes the first Source line and must be ignored.
-
-## Browser automation
-
-Source: https://www.windmill.dev/docs/advanced/browser_automation
-
-# Browser automation
-
-By default, a worker group named \`reports\` handles jobs with the \`chromium\` tag.
-The chromium binary will be available on these workers at /usr/bin/chromium.
-You can disable the sandbox by passing the --no-sandbox flag.
-
----
-
-## Worker groups
-
-Source: https://www.windmill.dev/docs/core_concepts/worker_groups
-
-# Worker groups
-
-Worker groups let you assign tags to workers.
-Set the chromium tag on a worker so it can run browser jobs.
-
----
-
-## Scheduling
-
-Source: https://www.windmill.dev/docs/core_concepts/scheduling
-
-# Scheduling
-
-Use cron expressions to schedule scripts and flows.
-`
-
-describe('parseDocsFullText', () => {
-	it('splits the corpus into pages keyed by Source URL, dropping the preamble', () => {
-		const pages = parseDocsFullText(SAMPLE_FULL)
-		expect(pages.map((p) => p.url)).toEqual([
-			'https://www.windmill.dev/docs/advanced/browser_automation',
-			'https://www.windmill.dev/docs/core_concepts/worker_groups',
-			'https://www.windmill.dev/docs/core_concepts/scheduling'
-		])
-	})
-
-	it('uses each page first heading as its title', () => {
-		const pages = parseDocsFullText(SAMPLE_FULL)
-		expect(pages.map((p) => p.title)).toEqual([
-			'Browser automation',
-			'Worker groups',
-			'Scheduling'
-		])
-	})
-
-	it('strips the trailing category lead-in so it is not mis-attributed to the previous page', () => {
-		const pages = parseDocsFullText(SAMPLE_FULL)
-		const browser = pages.find((p) => p.url.endsWith('/browser_automation'))
-		// "## Worker groups" introduces the *next* page and must not leak into this body.
-		expect(browser?.body).not.toContain('Worker groups')
-		expect(browser?.body).not.toContain('---')
-	})
-})
-
-describe('searchDocsPages', () => {
-	const pages = parseDocsFullText(SAMPLE_FULL)
-
-	it('ranks the page with more occurrences of the term first', () => {
-		const results = searchDocsPages(pages, 'chromium')
-		expect(results.map((r) => r.url)).toEqual([
-			'https://www.windmill.dev/docs/advanced/browser_automation',
-			'https://www.windmill.dev/docs/core_concepts/worker_groups'
-		])
-		expect(results[0].snippets.length).toBeGreaterThan(0)
-		expect(results[0].snippets.join('\n')).toContain('chromium')
-	})
-
-	it('prefers pages that cover every query term over partial matches', () => {
-		// Only browser_automation mentions both "chromium" and "sandbox".
-		const results = searchDocsPages(pages, 'chromium sandbox')
-		expect(results.map((r) => r.url)).toEqual([
-			'https://www.windmill.dev/docs/advanced/browser_automation'
-		])
-	})
-
-	it('returns nothing when no term matches', () => {
-		expect(searchDocsPages(pages, 'kubernetes helm chart')).toEqual([])
-	})
-
-	it('respects the maxPages cap', () => {
-		const results = searchDocsPages(pages, 'worker', { maxPages: 1 })
-		expect(results.length).toBe(1)
-	})
-})
-
-describe('makeSnippet', () => {
-	it('returns short lines unchanged after collapsing whitespace', () => {
-		expect(makeSnippet('  hello   world  ', ['world'], 200)).toBe('hello world')
-	})
-
-	it('windows a long line around the first matched term with ellipses', () => {
-		const line = `${'a '.repeat(200)}NEEDLE${' b'.repeat(200)}`
-		const snippet = makeSnippet(line, ['needle'], 60)
-		expect(snippet.length).toBeLessThanOrEqual(62) // 60 + two ellipsis chars
-		expect(snippet.toLowerCase()).toContain('needle')
-		expect(snippet.startsWith('…')).toBe(true)
-		expect(snippet.endsWith('…')).toBe(true)
-	})
-})
-
-describe('formatDocsSearchResults', () => {
-	it('renders Source URLs, snippet bullets and a citation instruction', () => {
-		const results = searchDocsPages(parseDocsFullText(SAMPLE_FULL), 'chromium')
-		const rendered = formatDocsSearchResults('chromium', results)
-		expect(rendered).toContain('Source: https://www.windmill.dev/docs/advanced/browser_automation')
-		expect(rendered).toContain('  - ')
-		expect(rendered).toContain('Cite the exact "Source" URL')
-	})
-
-	it('returns a no-match message when there are no results', () => {
-		expect(formatDocsSearchResults('zzz', [])).toContain('No documentation pages matched "zzz"')
-	})
-})
-
-const SAMPLE_INDEX = `# Windmill
-
-> Blurb.
-
-## Documentation structure
-
-### Core concepts
-- [AI agents](https://www.windmill.dev/docs/core_concepts/ai_agents.md): How do I build AI agents in Windmill? Add agent steps to flows. Connect to OpenAI, Anthropic and more.
-- [Retries](https://www.windmill.dev/docs/flows/retries.md): How do I retry a failing flow step automatically with exponential backoff?
-- [Persistent storage](https://www.windmill.dev/docs/core_concepts/persistent_storage/within_windmill.md): How do I persist state between runs in Windmill?
-`
-
-describe('parseDocsIndex', () => {
-	it('parses index entries into title, url and description', () => {
-		const entries = parseDocsIndex(SAMPLE_INDEX)
-		expect(entries).toHaveLength(3)
-		expect(entries[0]).toEqual({
-			title: 'AI agents',
-			url: 'https://www.windmill.dev/docs/core_concepts/ai_agents.md',
-			description:
-				'How do I build AI agents in Windmill? Add agent steps to flows. Connect to OpenAI, Anthropic and more.'
-		})
-	})
-
-	it('ignores lines that are not docs links', () => {
-		expect(parseDocsIndex('## Heading\n> blurb\nplain text')).toEqual([])
-	})
-})
-
-describe('searchDocsIndex', () => {
-	const entries = parseDocsIndex(SAMPLE_INDEX)
-
-	it('surfaces a named feature from its title/description when body grep would miss it', () => {
-		// The branch-centric phrasing a model used that failed body search; the
-		// index entry still matches on "agent"/"LLM"-adjacent terms.
-		const results = searchDocsIndex(entries, 'AI agent step decide')
-		expect(results[0].url).toBe('https://www.windmill.dev/docs/core_concepts/ai_agents.md')
-		expect(results[0].snippets[0]).toContain('agent steps')
-	})
-
-	it('ranks title matches above description-only matches', () => {
-		const results = searchDocsIndex(entries, 'retries')
-		expect(results[0].url).toBe('https://www.windmill.dev/docs/flows/retries.md')
-	})
-
-	it('returns nothing when no term matches', () => {
-		expect(searchDocsIndex(entries, 'kubernetes helm')).toEqual([])
-	})
-})
-
-describe('mergeDocsSearchResults', () => {
-	const body: ReturnType<typeof searchDocsPages> = [
-		{ url: 'https://www.windmill.dev/docs/openflow', title: 'OpenFlow', score: 10, snippets: ['x'] }
-	]
-	const index: ReturnType<typeof searchDocsIndex> = [
-		// Same page as a body hit but as the index `.md` URL — must dedupe.
-		{
-			url: 'https://www.windmill.dev/docs/openflow.md',
-			title: 'OpenFlow',
-			score: 5,
-			snippets: ['desc']
-		},
-		{ url: 'https://www.windmill.dev/docs/flows/retries.md', title: 'Retries', score: 4, snippets: ['desc'] }
-	]
-
-	it('keeps body results first and appends index-only matches, deduping by canonical URL', () => {
-		const merged = mergeDocsSearchResults(body, index)
-		expect(merged.map((r) => r.url)).toEqual([
-			'https://www.windmill.dev/docs/openflow',
-			'https://www.windmill.dev/docs/flows/retries.md'
-		])
-	})
-
-	it('respects the maxPages cap', () => {
-		expect(mergeDocsSearchResults(body, index, 1)).toHaveLength(1)
-	})
-})
diff --git a/frontend/src/lib/components/copilot/chat/docs/core.ts b/frontend/src/lib/components/copilot/chat/docs/core.ts
index 0329d2025d..38e9a600f0 100644
--- a/frontend/src/lib/components/copilot/chat/docs/core.ts
+++ b/frontend/src/lib/components/copilot/chat/docs/core.ts
@@ -1,345 +1,26 @@
 import type { Tool } from '../shared'
 import type { ChatCompletionTool } from 'openai/resources/index.mjs'
+import { DocumentationService } from '$lib/gen'
 
-const DOCS_ORIGIN = 'https://www.windmill.dev'
-const LLMS_TXT_URL = `${DOCS_ORIGIN}/llms.txt`
-const LLMS_FULL_TXT_URL = `${DOCS_ORIGIN}/llms-full.txt`
-const CACHE_TTL_MS = 15 * 60 * 1000
-// Above this size, return an outline of the page's headings instead of the full
-// content, prompting the model to request a specific section.
-const FULL_PAGE_CHAR_LIMIT = 20_000
-
-// search_docs result caps — keep the returned payload small (the whole point of
-// search vs. dumping the index or full pages is token economy).
-const SEARCH_MAX_PAGES = 8
-const SEARCH_MAX_SNIPPETS_PER_PAGE = 3
-const SEARCH_MAX_SNIPPET_CHARS = 200
-
-interface CacheEntry {
-	expiresAt: number
-	promise: Promise<string>
-}
-
-let llmsTxtCache: CacheEntry | undefined
-let llmsFullTxtCache: CacheEntry | undefined
-const pageCache = new Map<string, CacheEntry>()
-
-/**
- * Fetches the docs index (llms.txt) listing every documentation page. Cached at
- * module level with a TTL so repeated tool calls within a session reuse it.
- */
-export async function fetchDocsIndex(): Promise<string> {
-	const now = Date.now()
-	if (llmsTxtCache && llmsTxtCache.expiresAt > now) {
-		return llmsTxtCache.promise
-	}
-
-	const promise = fetchText(LLMS_TXT_URL).catch((error) => {
-		// Drop the failed promise from the cache so the next call retries.
-		if (llmsTxtCache?.promise === promise) {
-			llmsTxtCache = undefined
-		}
-		throw error
-	})
-	llmsTxtCache = { expiresAt: now + CACHE_TTL_MS, promise }
-	return promise
-}
-
-/**
- * Fetches the full documentation corpus (llms-full.txt): every page concatenated
- * into one document, each delimited by a `Source: <url>` line. ~2 MB. Cached at
- * module level with a TTL. Mirrors fetchDocsIndex; used by search_docs to grep
- * the whole corpus in a single fetch.
- */
-export async function fetchDocsFullText(): Promise<string> {
-	const now = Date.now()
-	if (llmsFullTxtCache && llmsFullTxtCache.expiresAt > now) {
-		return llmsFullTxtCache.promise
-	}
-
-	const promise = fetchText(LLMS_FULL_TXT_URL).catch((error) => {
-		if (llmsFullTxtCache?.promise === promise) {
-			llmsFullTxtCache = undefined
-		}
-		throw error
-	})
-	llmsFullTxtCache = { expiresAt: now + CACHE_TTL_MS, promise }
-	return promise
-}
-
-/**
- * Fetches a single docs page as raw markdown. `path` may be a full URL or a
- * /docs/... path; it is normalized to a `.md` URL. Cached per resolved URL.
- */
-export async function fetchDocsPage(path: string): Promise<string> {
-	const url = normalizeDocsUrl(path)
-	const now = Date.now()
-	const cached = pageCache.get(url)
-	if (cached && cached.expiresAt > now) {
-		return cached.promise
-	}
-
-	const promise = fetchText(url)
-		.then((content) => sanitizeDocsMarkdownLinks(content, url))
-		.catch((error) => {
-			if (pageCache.get(url)?.promise === promise) {
-				pageCache.delete(url)
-			}
-			throw error
-		})
-	pageCache.set(url, { expiresAt: now + CACHE_TTL_MS, promise })
-	return promise
-}
-
-async function fetchText(url: string): Promise<string> {
-	const response = await fetch(url)
-	if (!response.ok) {
-		throw new Error(`Request to ${url} failed with status ${response.status}`)
-	}
-	return await response.text()
-}
-
-/**
- * Normalizes a user/model-supplied docs reference to a fully-qualified `.md`
- * URL on the docs origin. Accepts:
- *   - `https://www.windmill.dev/docs/core_concepts/jobs`
- *   - `/docs/core_concepts/jobs.md`
- *   - `docs/core_concepts/jobs`
- */
-export function normalizeDocsUrl(input: string): string {
-	let value = input.trim()
-
-	if (/^https?:\/\//i.test(value)) {
-		// Strip the origin so we can re-anchor to DOCS_ORIGIN and normalize the path.
-		try {
-			const parsed = new URL(value)
-			value = parsed.pathname
-		} catch {
-			// Fall through and treat as a path.
-		}
-	}
-
-	// Drop any query string or hash fragment.
-	value = value.split('#')[0].split('?')[0]
-
-	if (!value.startsWith('/')) {
-		value = `/${value}`
-	}
-
-	// Strip a trailing slash (but keep the leading one).
-	if (value.length > 1 && value.endsWith('/')) {
-		value = value.slice(0, -1)
-	}
-
-	// Relative links inside the raw markdown reference docusaurus source files
-	// (e.g. `13_flow_branches.mdx`), but the published routes drop the numeric
-	// ordering prefixes and use `.md`.
-	value = stripDocsPathPrefixes(value)
-	if (value.endsWith('.mdx')) {
-		value = value.slice(0, -1)
-	}
-
-	if (!value.endsWith('.md')) {
-		value = `${value}.md`
-	}
-
-	return `${DOCS_ORIGIN}${value}`
-}
-
-/**
- * The canonical published URL a model should cite for a docs page (the `.md`
- * fetch URL without the suffix), e.g. `https://www.windmill.dev/docs/flows/retries`.
- */
-export function canonicalDocsPageUrl(path: string): string {
-	return normalizeDocsUrl(path).replace(/\.md$/i, '')
-}
-
-/**
- * Strips docusaurus numeric ordering prefixes (`13_`, `8-`) from each segment of
- * a docs path so it matches the published route. Operates on the path only.
- */
-function stripDocsPathPrefixes(path: string): string {
-	return path
-		.split('/')
-		.map((segment) => segment.replace(/^\d+[_-]/, ''))
-		.join('/')
-}
-
-/**
- * Rewrites relative/source-file doc links inside raw page markdown to canonical
- * published URLs, so the model never echoes a docusaurus source path (e.g.
- * `./13_flow_branches.mdx`) into its answer as a broken link. Resolves each link
- * relative to the page it came from, strips numeric ordering prefixes, and drops
- * the `.md`/`.mdx` extension. Non-doc links (external, images, anchors) are left
- * untouched.
- */
-export function sanitizeDocsMarkdownLinks(content: string, pageUrl: string): string {
-	return content.replace(/\]\(([^)\s]+?)(\s+"[^"]*")?\)/g, (match, target: string, title) => {
-		if (!/\.mdx?($|[#?])/i.test(target)) {
-			// Only rewrite links to docusaurus source files (.md/.mdx); leave
-			// images, external URLs and bare anchors untouched.
-			return match
-		}
-		if (/(^|\/)\.\.\//.test(target)) {
-			// `../` cross-directory links are authored against the docusaurus
-			// source tree, whose depth differs from the published URL, so strict
-			// resolution is unreliable. Leave them for the canonical-URL header to
-			// disambiguate rather than risk rewriting to a wrong path.
-			return match
-		}
-		let resolved: URL
-		try {
-			resolved = new URL(target, pageUrl)
-		} catch {
-			return match
-		}
-		if (resolved.origin !== DOCS_ORIGIN || !resolved.pathname.startsWith('/docs/')) {
-			return match
-		}
-		const pathname = stripDocsPathPrefixes(resolved.pathname).replace(/\.mdx?$/i, '')
-		return `](${DOCS_ORIGIN}${pathname}${resolved.hash}${title ?? ''})`
-	})
-}
-
-export interface DocsHeading {
-	level: number
-	title: string
-	/** Character offset of the start of the heading line within the document. */
-	startIndex: number
-}
-
-/**
- * Parses the markdown headings (`#`–`####`) of a docs page, ignoring any
- * heading-like lines that appear inside fenced code blocks (``` fences), which
- * are common in docs pages (e.g. `# comment` inside a python sample).
- */
-export function parseDocsHeadings(content: string): DocsHeading[] {
-	const headings: DocsHeading[] = []
-	let offset = 0
-	let inFence = false
-	let fenceMarker = ''
-
-	const lines = content.split('\n')
-	for (const line of lines) {
-		const fence = matchFence(line)
-		if (fence) {
-			if (!inFence) {
-				inFence = true
-				fenceMarker = fence
-			} else if (line.trimStart().startsWith(fenceMarker)) {
-				inFence = false
-				fenceMarker = ''
-			}
-			offset += line.length + 1
-			continue
-		}
-
-		if (!inFence) {
-			const match = /^(#{1,4})\s+(.*\S)\s*$/.exec(line)
-			if (match) {
-				headings.push({
-					level: match[1].length,
-					title: match[2].trim(),
-					startIndex: offset
-				})
-			}
-		}
-
-		offset += line.length + 1
-	}
-
-	return headings
-}
-
-function matchFence(line: string): string | undefined {
-	const trimmed = line.trimStart()
-	const match = /^(`{3,}|~{3,})/.exec(trimmed)
-	return match ? match[1] : undefined
-}
-
-/**
- * Builds a human-readable outline of a page's headings, including an approximate
- * character size for each section. Used when a page is too large to return whole.
- */
-export function buildDocsOutline(content: string): string {
-	const headings = parseDocsHeadings(content)
-	if (headings.length === 0) {
-		return '(no markdown headings found on this page)'
-	}
-
-	const lines = headings.map((heading, index) => {
-		const sectionEnd = sectionEndIndex(content, headings, index)
-		const approxChars = sectionEnd - heading.startIndex
-		const indent = '  '.repeat(Math.max(0, heading.level - 1))
-		return `${indent}- ${heading.title} (~${approxChars} chars)`
-	})
-
-	return lines.join('\n')
-}
-
-function sectionEndIndex(content: string, headings: DocsHeading[], index: number): number {
-	const heading = headings[index]
-	// A section ends at the next heading of the same or higher (shallower) level.
-	for (let i = index + 1; i < headings.length; i++) {
-		if (headings[i].level <= heading.level) {
-			return headings[i].startIndex
-		}
-	}
-	return content.length
-}
-
-/** Normalizes a heading title for tolerant, case/punctuation-insensitive matching. */
-function normalizeHeadingTitle(title: string): string {
-	return title
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, ' ')
-		.trim()
-}
-
-/**
- * Extracts the content of the section whose heading matches `section`, from the
- * matching heading up to the next heading of the same or higher level. Matching
- * is case-insensitive and tolerant of minor punctuation differences. Returns
- * `undefined` when no heading matches.
- */
-export function extractDocsSection(content: string, section: string): string | undefined {
-	const headings = parseDocsHeadings(content)
-	const target = normalizeHeadingTitle(section)
-	if (target.length === 0) {
-		return undefined
-	}
-
-	let matchIndex = headings.findIndex(
-		(heading) => normalizeHeadingTitle(heading.title) === target
-	)
-	if (matchIndex === -1) {
-		// Fall back to a contains match so "Result streaming" matches "Result".
-		matchIndex = headings.findIndex((heading) =>
-			normalizeHeadingTitle(heading.title).includes(target)
-		)
-	}
-	if (matchIndex === -1) {
-		return undefined
-	}
-
-	const start = headings[matchIndex].startIndex
-	const end = sectionEndIndex(content, headings, matchIndex)
-	return content.slice(start, end).trim()
-}
+// The docs corpus is self-hosted by the backend (a vendored snapshot embedded in
+// the binary). Search/ranking and page rendering happen server-side, so these
+// tools are thin wrappers over /api/docs/* — see backend `windmill-api/src/docs`.
+// The same endpoints back the MCP `searchDocs`/`readDocsPage` tools and the
+// `wmill docs` CLI, so all three return identical content.
 
 const READ_DOCS_PAGE_TOOL: ChatCompletionTool = {
 	type: 'function',
 	function: {
 		name: 'read_docs_page',
 		description:
-			'Fetch the raw markdown of a single Windmill documentation page. Provide the `path` (or full URL) of a page found via search_docs. If the page is large, this returns its list of section headings instead of the full content; call again with the `section` argument set to one of those headings to read that section.',
+			'Fetch the raw markdown of a single Windmill documentation page. Provide the `url` of a page found via search_docs (its Source URL). If the page is large, this returns its list of section headings instead of the full content; call again with the `section` argument set to one of those headings to read that section.',
 		parameters: {
 			type: 'object',
 			properties: {
-				path: {
+				url: {
 					type: 'string',
 					description:
-						'The docs page to read, as a path (e.g. /docs/core_concepts/jobs) or full URL (e.g. https://www.windmill.dev/docs/core_concepts/jobs).'
+						'The docs page to read, as a Source URL returned by search_docs (e.g. https://www.windmill.dev/docs/core_concepts/jobs). A bare path (e.g. /docs/core_concepts/jobs) is also accepted.'
 				},
 				section: {
 					type: 'string',
@@ -347,7 +28,7 @@ const READ_DOCS_PAGE_TOOL: ChatCompletionTool = {
 						'Optional. A heading title from the page outline to read just that section instead of the full page.'
 				}
 			},
-			required: ['path']
+			required: ['url']
 		}
 	}
 }
@@ -355,20 +36,19 @@ const READ_DOCS_PAGE_TOOL: ChatCompletionTool = {
 export const readDocsPageTool: Tool<{}> = {
 	def: READ_DOCS_PAGE_TOOL,
 	fn: async ({ args, toolId, toolCallbacks }) => {
-		const path = typeof args?.path === 'string' ? args.path : ''
-		const section = typeof args?.section === 'string' && args.section.trim() ? args.section : undefined
+		const url = typeof args?.url === 'string' ? args.url : ''
+		const section =
+			typeof args?.section === 'string' && args.section.trim() ? args.section : undefined
 		toolCallbacks.setToolStatus(toolId, {
 			content: section ? `Reading docs section "${section}"...` : 'Reading documentation page...'
 		})
 		try {
-			if (!path.trim()) {
-				return 'No documentation page path was provided. Provide a `path` — e.g. a `Source` URL returned by search_docs.'
+			if (!url.trim()) {
+				return 'No documentation page URL was provided. Provide a `url` — e.g. a `Source` URL returned by search_docs.'
 			}
-			const content = await fetchDocsPage(path)
+			const res = await DocumentationService.readDocsPage({ url, section })
 			toolCallbacks.setToolStatus(toolId, { content: 'Read documentation page' })
-			const canonicalUrl = canonicalDocsPageUrl(path)
-			const header = `Source page — cite this URL when referencing this page: ${canonicalUrl}\n\n`
-			return header + renderDocsPageResult(content, section)
+			return res.text
 		} catch (error) {
 			toolCallbacks.setToolStatus(toolId, {
 				content: 'Error reading documentation page',
@@ -382,428 +62,12 @@ export const readDocsPageTool: Tool<{}> = {
 	}
 }
 
-/**
- * Decides what to return for read_docs_page: a requested section, the full page,
- * or an outline asking the model to pick a section.
- */
-export function renderDocsPageResult(content: string, section?: string): string {
-	if (section) {
-		const extracted = extractDocsSection(content, section)
-		if (extracted !== undefined) {
-			return extracted
-		}
-		return [
-			`No section matching "${section}" was found on this page. Available sections:`,
-			'',
-			buildDocsOutline(content)
-		].join('\n')
-	}
-
-	// Gate on the page body only; the caller may prepend a short "Source page"
-	// header, so the returned payload can exceed this limit by that header's
-	// length. This threshold only decides whole-page vs. outline, so the small
-	// overshoot is immaterial.
-	if (content.length <= FULL_PAGE_CHAR_LIMIT) {
-		return content
-	}
-
-	return [
-		'This documentation page is large. Below is its list of sections with approximate sizes.',
-		'Call read_docs_page again with the same path and a `section` set to one of these headings to read that section.',
-		'',
-		buildDocsOutline(content)
-	].join('\n')
-}
-
-// ---------------------------------------------------------------------------
-// Full-text docs search (search_docs)
-//
-// Discovery primitive for the `search` ask variant: instead of dumping the whole
-// llms.txt index, grep the full corpus (llms-full.txt) for the user's keywords
-// and return only small matching snippets plus each page's `Source:` URL. The
-// model then cites that URL directly or passes it to read_docs_page for more.
-// ---------------------------------------------------------------------------
-
-const SOURCE_LINE_RE = /^Source:\s*(\S+)\s*$/
-// In llms-full.txt every page's `Source:` line is preceded by a category-header
-// lead-in: `...page body...\n\n---\n\n## <Category>\n\nSource: <url>`. Splitting
-// on `Source:` lines leaves that lead-in on the *previous* page, so strip a
-// trailing `---` + level-2-heading block to avoid mis-attributing the next
-// page's category title to the previous page.
-const TRAILING_LEAD_IN_RE = /\n+-{3,}[ \t]*\n+#{2}[ \t]+.*[ \t]*\n*$/
-
-export interface DocsFullPage {
-	url: string
-	title: string
-	body: string
-}
-
-export interface DocsSearchResult {
-	url: string
-	title: string
-	/** Higher = more relevant. Distinct query terms matched dominate raw occurrences. */
-	score: number
-	snippets: string[]
-}
-
-/**
- * Splits the llms-full.txt corpus into per-page records keyed by the `Source:`
- * URL. Content before the first `Source:` line (the corpus preamble) is dropped.
- */
-export function parseDocsFullText(fullText: string): DocsFullPage[] {
-	const pages: DocsFullPage[] = []
-	let url: string | undefined
-	let buffer: string[] = []
-
-	const flush = () => {
-		if (url === undefined) {
-			return
-		}
-		const body = buffer.join('\n').replace(TRAILING_LEAD_IN_RE, '').trim()
-		if (body.length > 0) {
-			pages.push({ url, title: firstHeading(body) ?? url, body })
-		}
-	}
-
-	for (const line of fullText.split('\n')) {
-		const match = SOURCE_LINE_RE.exec(line)
-		if (match) {
-			flush()
-			url = match[1]
-			buffer = []
-			continue
-		}
-		if (url !== undefined) {
-			buffer.push(line)
-		}
-	}
-	flush()
-	return pages
-}
-
-function firstHeading(body: string): string | undefined {
-	for (const line of body.split('\n')) {
-		const match = /^#{1,6}\s+(.*\S)\s*$/.exec(line)
-		if (match) {
-			return match[1].trim()
-		}
-	}
-	return undefined
-}
-
-/**
- * Ranks docs pages for a keyword query. The query is split into distinct terms;
- * a page's score is `distinctTermsMatched` (dominant) then total occurrences.
- * Pages covering every term are preferred over partial matches. Each result
- * carries up to `maxSnippetsPerPage` of its most term-dense lines.
- */
-export function searchDocsPages(
-	pages: DocsFullPage[],
-	query: string,
-	opts: { maxPages?: number; maxSnippetsPerPage?: number; maxSnippetChars?: number } = {}
-): DocsSearchResult[] {
-	const maxPages = opts.maxPages ?? SEARCH_MAX_PAGES
-	const maxSnippetsPerPage = opts.maxSnippetsPerPage ?? SEARCH_MAX_SNIPPETS_PER_PAGE
-	const maxSnippetChars = opts.maxSnippetChars ?? SEARCH_MAX_SNIPPET_CHARS
-
-	const terms = tokenizeQuery(query)
-	if (terms.length === 0) {
-		return []
-	}
-
-	interface Scored extends DocsSearchResult {
-		distinctTerms: number
-		order: number
-	}
-	const scored: Scored[] = []
-
-	pages.forEach((page, order) => {
-		const lowerBody = page.body.toLowerCase()
-		let distinctTerms = 0
-		let occurrences = 0
-		for (const term of terms) {
-			const count = countOccurrences(lowerBody, term)
-			if (count > 0) {
-				distinctTerms += 1
-				occurrences += count
-			}
-		}
-		if (distinctTerms === 0) {
-			return
-		}
-		scored.push({
-			url: page.url,
-			title: page.title,
-			// distinctTerms dominates so a page matching all terms always outranks
-			// one matching fewer, regardless of raw occurrence counts.
-			score: distinctTerms * 1_000_000 + occurrences,
-			distinctTerms,
-			order,
-			snippets: selectSnippets(page.body, terms, maxSnippetsPerPage, maxSnippetChars)
-		})
-	})
-
-	// Prefer pages that cover every query term; fall back to partial matches only
-	// when nothing covers all of them.
-	const fullCoverage = scored.filter((entry) => entry.distinctTerms === terms.length)
-	const pool = fullCoverage.length > 0 ? fullCoverage : scored
-
-	pool.sort((a, b) => b.score - a.score || a.order - b.order)
-
-	return pool
-		.slice(0, maxPages)
-		.map(({ url, title, score, snippets }) => ({ url, title, score, snippets }))
-}
-
-/** Splits a query into distinct, lowercased, non-empty terms. */
-function tokenizeQuery(query: string): string[] {
-	return Array.from(
-		new Set(
-			query
-				.toLowerCase()
-				.split(/\s+/)
-				.map((term) => term.trim())
-				.filter((term) => term.length > 0)
-		)
-	)
-}
-
-function countOccurrences(haystack: string, needle: string): number {
-	if (needle.length === 0) {
-		return 0
-	}
-	let count = 0
-	let index = haystack.indexOf(needle)
-	while (index !== -1) {
-		count += 1
-		index = haystack.indexOf(needle, index + needle.length)
-	}
-	return count
-}
-
-/**
- * Picks the most term-dense lines of a page body as snippets, in document order,
- * deduped, each trimmed to `maxChars` around the first matched term.
- */
-function selectSnippets(
-	body: string,
-	terms: string[],
-	maxSnippets: number,
-	maxChars: number
-): string[] {
-	interface LineHit {
-		text: string
-		distinct: number
-		order: number
-	}
-	const hits: LineHit[] = []
-
-	body.split('\n').forEach((line, order) => {
-		const lower = line.toLowerCase()
-		let distinct = 0
-		for (const term of terms) {
-			if (lower.includes(term)) {
-				distinct += 1
-			}
-		}
-		if (distinct === 0) {
-			return
-		}
-		const text = makeSnippet(line, terms, maxChars)
-		if (text.length > 0) {
-			hits.push({ text, distinct, order })
-		}
-	})
-
-	hits.sort((a, b) => b.distinct - a.distinct || a.order - b.order)
-
-	const seen = new Set<string>()
-	const result: string[] = []
-	for (const hit of hits) {
-		if (seen.has(hit.text)) {
-			continue
-		}
-		seen.add(hit.text)
-		result.push(hit.text)
-		if (result.length >= maxSnippets) {
-			break
-		}
-	}
-	return result
-}
-
-/**
- * Collapses a matched line to a single-line snippet of at most `maxChars`,
- * windowed around the first matched term (with ellipses) when the line is long.
- */
-export function makeSnippet(line: string, terms: string[], maxChars: number): string {
-	const collapsed = line.replace(/\s+/g, ' ').trim()
-	if (collapsed.length <= maxChars) {
-		return collapsed
-	}
-
-	const lower = collapsed.toLowerCase()
-	let firstIndex = -1
-	for (const term of terms) {
-		const index = lower.indexOf(term)
-		if (index !== -1 && (firstIndex === -1 || index < firstIndex)) {
-			firstIndex = index
-		}
-	}
-	if (firstIndex === -1) {
-		return `${collapsed.slice(0, maxChars).trimEnd()}…`
-	}
-
-	const start = Math.max(0, firstIndex - Math.floor(maxChars / 3))
-	const end = Math.min(collapsed.length, start + maxChars)
-	const prefix = start > 0 ? '…' : ''
-	const suffix = end < collapsed.length ? '…' : ''
-	return `${prefix}${collapsed.slice(start, end).trim()}${suffix}`
-}
-
-export interface DocsIndexEntry {
-	title: string
-	url: string
-	description: string
-}
-
-// A line in llms.txt: `- [Title](https://.../page.md): question-phrased description`.
-const INDEX_ENTRY_RE = /^\s*-\s*\[([^\]]+)\]\(([^)\s]+)\)\s*:?\s*(.*)$/
-
-/** Parses the llms.txt index into per-page entries (title, URL, description). */
-export function parseDocsIndex(indexText: string): DocsIndexEntry[] {
-	const entries: DocsIndexEntry[] = []
-	for (const line of indexText.split('\n')) {
-		const match = INDEX_ENTRY_RE.exec(line)
-		if (!match) {
-			continue
-		}
-		const [, title, url, description] = match
-		if (!url.includes('/docs/')) {
-			continue
-		}
-		entries.push({ title: title.trim(), url: url.trim(), description: description.trim() })
-	}
-	return entries
-}
-
-/**
- * Ranks index entries for a query by matching its terms against each entry's
- * title and description. Title matches weigh more than description matches.
- * The description becomes the result's single snippet. This recovers the
- * "named feature" discovery that full-text grep misses when the model searches
- * the wrong keywords (e.g. finding "AI agents" for "LLM decides which script").
- */
-export function searchDocsIndex(
-	entries: DocsIndexEntry[],
-	query: string,
-	opts: { maxPages?: number } = {}
-): DocsSearchResult[] {
-	const maxPages = opts.maxPages ?? SEARCH_MAX_PAGES
-	const terms = tokenizeQuery(query)
-	if (terms.length === 0) {
-		return []
-	}
-
-	interface Scored extends DocsSearchResult {
-		distinctTerms: number
-		order: number
-	}
-	const scored: Scored[] = []
-
-	entries.forEach((entry, order) => {
-		const title = entry.title.toLowerCase()
-		const description = entry.description.toLowerCase()
-		let distinctTerms = 0
-		let score = 0
-		for (const term of terms) {
-			const inTitle = title.includes(term)
-			const inDescription = description.includes(term)
-			if (inTitle || inDescription) {
-				distinctTerms += 1
-				score += (inTitle ? 5 : 0) + (inDescription ? 1 : 0)
-			}
-		}
-		if (distinctTerms === 0) {
-			return
-		}
-		scored.push({
-			url: entry.url,
-			title: entry.title,
-			score: distinctTerms * 1_000_000 + score,
-			distinctTerms,
-			order,
-			snippets: entry.description ? [entry.description] : []
-		})
-	})
-
-	const fullCoverage = scored.filter((entry) => entry.distinctTerms === terms.length)
-	const pool = fullCoverage.length > 0 ? fullCoverage : scored
-	pool.sort((a, b) => b.score - a.score || a.order - b.order)
-
-	return pool
-		.slice(0, maxPages)
-		.map(({ url, title, score, snippets }) => ({ url, title, score, snippets }))
-}
-
-/** Strips the `.md` suffix and trailing slash so index/body URLs dedupe. */
-function canonicalSearchUrl(url: string): string {
-	return url.replace(/\.md$/i, '').replace(/\/$/, '')
-}
-
-/**
- * Merges full-text (body) results with index-description results. Body matches
- * come first (concrete content hits), then index-only matches fill remaining
- * slots — so a named feature surfaced only by its index entry still appears even
- * when body grep landed on the wrong pages.
- */
-export function mergeDocsSearchResults(
-	bodyResults: DocsSearchResult[],
-	indexResults: DocsSearchResult[],
-	maxPages = SEARCH_MAX_PAGES
-): DocsSearchResult[] {
-	const seen = new Set(bodyResults.map((result) => canonicalSearchUrl(result.url)))
-	const merged = [...bodyResults]
-	for (const entry of indexResults) {
-		const key = canonicalSearchUrl(entry.url)
-		if (seen.has(key)) {
-			continue
-		}
-		seen.add(key)
-		merged.push(entry)
-	}
-	return merged.slice(0, maxPages)
-}
-
-/** Renders search results as the string returned to the model. */
-export function formatDocsSearchResults(query: string, results: DocsSearchResult[]): string {
-	if (results.length === 0) {
-		return `No documentation pages matched "${query}". Try fewer or more general keywords (a single distinctive term often works best).`
-	}
-
-	const blocks = results.map((result) => {
-		const lines = [`## ${result.title}`, `Source: ${result.url}`]
-		for (const snippet of result.snippets) {
-			lines.push(`  - ${snippet}`)
-		}
-		return lines.join('\n')
-	})
-
-	return [
-		`Found ${results.length} documentation page(s) matching "${query}", most relevant first:`,
-		'',
-		blocks.join('\n\n'),
-		'',
-		'Cite the exact "Source" URL when referencing a page. If these snippets are not enough, call read_docs_page with a Source URL to read the full page or a section.'
-	].join('\n')
-}
-
 const SEARCH_DOCS_TOOL: ChatCompletionTool = {
 	type: 'function',
 	function: {
 		name: 'search_docs',
 		description:
-			'Full-text search across the entire Windmill documentation. Provide one or more keywords; returns the most relevant docs pages, each with its Source URL and short matching snippets. Use this FIRST to find relevant pages by their content (a flag, function, error message, config key or concept). If the snippets answer the question, answer directly; otherwise call read_docs_page with a returned Source URL to read more.',
+			'Full-text search across the entire Windmill documentation. Provide one or more keywords; returns the most relevant docs pages, each with its Source URL and short matching snippets. Use this FIRST to find relevant pages by their content (a flag, function, error message, config key or concept). If the snippets answer the question, answer directly; otherwise call read_docs_page with a returned Source URL to read the full page or a section.',
 		parameters: {
 			type: 'object',
 			properties: {
@@ -829,26 +93,12 @@ export const searchDocsTool: Tool<{}> = {
 			if (!query) {
 				return 'No search query was provided. Provide a `query` of one or more keywords.'
 			}
-			const bodyResults = searchDocsPages(parseDocsFullText(await fetchDocsFullText()), query, {
-				maxPages: 5
-			})
-			// Also match the (small) index titles/descriptions to surface named
-			// features that body grep misses. Best-effort: a failed index fetch
-			// still leaves full-text results.
-			let indexResults: DocsSearchResult[] = []
-			try {
-				indexResults = searchDocsIndex(parseDocsIndex(await fetchDocsIndex()), query, {
-					maxPages: 4
-				})
-			} catch (indexError) {
-				console.error('Error searching documentation index:', indexError)
-			}
-			const results = mergeDocsSearchResults(bodyResults, indexResults)
+			const res = await DocumentationService.searchDocs({ query })
+			const count = res.results?.length ?? 0
 			toolCallbacks.setToolStatus(toolId, {
-				content:
-					results.length > 0 ? `Found ${results.length} matching page(s)` : 'No matching pages found'
+				content: count > 0 ? `Found ${count} matching page(s)` : 'No matching pages found'
 			})
-			return formatDocsSearchResults(query, results)
+			return res.text
 		} catch (error) {
 			toolCallbacks.setToolStatus(toolId, {
 				content: 'Error searching documentation',
diff --git a/frontend/src/lib/components/copilot/chat/files/AttachedFileChip.svelte b/frontend/src/lib/components/copilot/chat/files/AttachedFileChip.svelte
new file mode 100644
index 0000000000..52fcfd8b5a
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/AttachedFileChip.svelte
@@ -0,0 +1,61 @@
+<script lang="ts">
+	import { X, Loader2, AlertTriangle, Lock } from 'lucide-svelte'
+	import type { AttachedFile } from './attachedFiles.svelte'
+	import { getFileIcon } from '$lib/components/icons/fileIcon'
+
+	let { file, onRemove }: { file: AttachedFile; onRemove: () => void } = $props()
+
+	let showDelete = $state(false)
+	let fileIcon = $derived(getFileIcon(file.name))
+
+	function humanSize(bytes: number): string {
+		if (bytes < 1024) return `${bytes} B`
+		if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
+		return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+	}
+
+	// Metadata/status lives in the hover tooltip — the chip itself stays
+	// label-only to match the context-element chips it sits beside.
+	let detail = $derived(
+		file.status === 'indexing'
+			? 'indexing…'
+			: file.status === 'error'
+				? 'failed'
+				: file.status === 'locked'
+					? 'locked — click send to restore'
+					: file.status === 'unavailable'
+						? 'unavailable'
+						: `${file.lineCount} lines · ${humanSize(file.size)}`
+	)
+</script>
+
+<div
+	class="border rounded-md px-1 py-0.5 flex flex-row items-center gap-1 text-primary text-xs font-normal cursor-default hover:bg-surface-hover hover:cursor-pointer max-w-48 bg-surface"
+	onmouseenter={() => (showDelete = true)}
+	onmouseleave={() => (showDelete = false)}
+	role="listitem"
+	title={`${file.name} — ${detail}`}
+>
+	<button
+		class="shrink-0"
+		aria-label={`Remove ${file.name}`}
+		onclick={(e) => {
+			e.stopPropagation()
+			onRemove()
+		}}
+	>
+		{#if showDelete}
+			<X size={16} />
+		{:else if file.status === 'indexing'}
+			<Loader2 size={16} class="animate-spin text-tertiary" />
+		{:else if file.status === 'error' || file.status === 'unavailable'}
+			<AlertTriangle size={16} class="text-red-500" />
+		{:else if file.status === 'locked'}
+			<Lock size={16} class="text-amber-500" />
+		{:else}
+			{@const Icon = fileIcon.icon}
+			<Icon size={16} class={fileIcon.className ?? ''} />
+		{/if}
+	</button>
+	<span class="truncate" title={file.name}>{file.name}</span>
+</div>
diff --git a/frontend/src/lib/components/copilot/chat/files/AttachedFilesBar.svelte b/frontend/src/lib/components/copilot/chat/files/AttachedFilesBar.svelte
new file mode 100644
index 0000000000..50b961c090
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/AttachedFilesBar.svelte
@@ -0,0 +1,86 @@
+<script lang="ts">
+	import { Lock } from 'lucide-svelte'
+	import Popover from '$lib/components/meltComponents/Popover.svelte'
+	import { getAiChatManager } from '../aiChatManagerContext'
+	import AttachedFileChip from './AttachedFileChip.svelte'
+	import AttachedFolderChip from './AttachedFolderChip.svelte'
+	import type { AttachedFile, AttachedFolder } from './attachedFiles.svelte'
+
+	const aiChatManager = getAiChatManager()
+	const lockedCount = $derived(aiChatManager.attachedFiles.lockedCount)
+
+	const MAX_VISIBLE = 3
+
+	type Card =
+		| { kind: 'folder'; key: string; folder: AttachedFolder }
+		| { kind: 'file'; key: string; file: AttachedFile }
+
+	// One card per linked folder, one per standalone file.
+	const cards = $derived.by<Card[]>(() => [
+		...aiChatManager.attachedFiles.folders.map(
+			(folder): Card => ({ kind: 'folder', key: 'd:' + folder.name, folder })
+		),
+		...aiChatManager.attachedFiles.standalone.map(
+			(file): Card => ({ kind: 'file', key: 'f:' + file.name, file })
+		)
+	])
+
+	const visible = $derived(cards.slice(0, MAX_VISIBLE))
+	const overflow = $derived(cards.slice(MAX_VISIBLE))
+
+	function removeCard(card: Card) {
+		if (card.kind === 'folder') aiChatManager.attachedFiles.removeFolder(card.folder.name)
+		else aiChatManager.attachedFiles.removeFile(card.file.name)
+	}
+</script>
+
+{#snippet chip(card: Card)}
+	{#if card.kind === 'folder'}
+		<AttachedFolderChip folder={card.folder} onRemove={() => removeCard(card)} />
+	{:else}
+		<AttachedFileChip file={card.file} onRemove={() => removeCard(card)} />
+	{/if}
+{/snippet}
+
+{#if cards.length > 0}
+	<div class="flex flex-row flex-nowrap items-center gap-1 mt-1 mb-1 min-w-0" role="list">
+		{#each visible as card (card.key)}
+			{@render chip(card)}
+		{/each}
+
+		{#if overflow.length > 0}
+			<Popover>
+				{#snippet trigger()}
+					<div
+						class="shrink-0 border rounded-md px-1.5 py-0.5 flex flex-row items-center text-primary text-xs cursor-pointer hover:bg-surface-hover bg-surface"
+						title={`${overflow.length} more`}
+					>
+						+{overflow.length}
+					</div>
+				{/snippet}
+				{#snippet content()}
+					<div
+						class="flex flex-col gap-1 p-1 max-h-64 overflow-y-auto min-w-40"
+						role="list"
+						aria-label="More attached files"
+					>
+						{#each overflow as card (card.key)}
+							{@render chip(card)}
+						{/each}
+					</div>
+				{/snippet}
+			</Popover>
+		{/if}
+
+		{#if lockedCount > 0}
+			<button
+				class="shrink-0 border rounded-md px-1.5 py-0.5 flex flex-row items-center gap-1 text-xs text-amber-600 dark:text-amber-400 border-amber-300 dark:border-amber-700 hover:bg-surface-hover"
+				title="Re-grant access to linked files after a reload"
+				onclick={() => aiChatManager.attachedFiles.regrantLocked()}
+			>
+				<Lock size={12} class="shrink-0" />
+				Restore access ({lockedCount})
+			</button>
+		{/if}
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/copilot/chat/files/AttachedFolderChip.svelte b/frontend/src/lib/components/copilot/chat/files/AttachedFolderChip.svelte
new file mode 100644
index 0000000000..068447a878
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/AttachedFolderChip.svelte
@@ -0,0 +1,48 @@
+<script lang="ts">
+	import { Folder, X, Loader2, AlertTriangle, Lock } from 'lucide-svelte'
+	import type { AttachedFolder } from './attachedFiles.svelte'
+
+	let { folder, onRemove }: { folder: AttachedFolder; onRemove: () => void } = $props()
+
+	let showDelete = $state(false)
+
+	// Native tooltip listing the contained files (capped).
+	let hoverList = $derived.by(() => {
+		if (folder.status === 'locked') return `${folder.name}/ — locked, click send to restore`
+		if (folder.status === 'unavailable') return `${folder.name}/ — unavailable`
+		const max = 20
+		const shown = folder.files.slice(0, max).map((f) => f.name)
+		if (folder.files.length > max) shown.push(`… +${folder.files.length - max} more`)
+		return `${folder.name}/\n${shown.join('\n')}`
+	})
+</script>
+
+<div
+	class="border rounded-md px-1 py-0.5 flex flex-row items-center gap-1 text-primary text-xs font-normal cursor-default hover:bg-surface-hover hover:cursor-pointer max-w-48 bg-surface"
+	onmouseenter={() => (showDelete = true)}
+	onmouseleave={() => (showDelete = false)}
+	role="listitem"
+	title={hoverList}
+>
+	<button
+		class="shrink-0"
+		aria-label={`Remove folder ${folder.name}`}
+		onclick={(e) => {
+			e.stopPropagation()
+			onRemove()
+		}}
+	>
+		{#if showDelete}
+			<X size={16} />
+		{:else if folder.status === 'indexing'}
+			<Loader2 size={16} class="animate-spin text-tertiary" />
+		{:else if folder.status === 'error' || folder.status === 'unavailable'}
+			<AlertTriangle size={16} class="text-red-500" />
+		{:else if folder.status === 'locked'}
+			<Lock size={16} class="text-amber-500" />
+		{:else}
+			<Folder size={16} class="text-tertiary" />
+		{/if}
+	</button>
+	<span class="truncate" title={folder.name}>{folder.name}</span>
+</div>
diff --git a/frontend/src/lib/components/copilot/chat/files/attachedFiles.svelte.ts b/frontend/src/lib/components/copilot/chat/files/attachedFiles.svelte.ts
new file mode 100644
index 0000000000..124b390ec2
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/attachedFiles.svelte.ts
@@ -0,0 +1,602 @@
+/**
+ * Session-scoped store of files/folders the user has linked to the GLOBAL AI chat.
+ *
+ * Persistence model (survives reload, keyed by session in ./attachedFilesDB):
+ *  - FILES are always stored as a full-byte Blob snapshot — same on every browser,
+ *    no permission re-grant, never "locked".
+ *  - FOLDERS link as a live File System Access directory handle where the API exists
+ *    (one record, re-enumerated live on restore — folder files are read through the
+ *    handle, not copied). Where it doesn't (Firefox/Safari), a dropped/picked folder's
+ *    files are snapshotted individually (each carrying its `folder`/`relPath`) so they
+ *    regroup into the same folder chip on restore.
+ *
+ * Storage is bounded by the real browser quota (writes that exceed it are caught and
+ * the item simply isn't persisted — it stays usable for the session). Persistence is
+ * gated on the session being persisted (non-transient); links in a transient session
+ * are buffered and flushed on the first send.
+ */
+import { createLongHash } from '$lib/editorLangUtils'
+import { buildLineIndex, isTextFile, type FileEntry } from './fileEngine'
+import {
+	putItem,
+	deleteItem,
+	getItemsForSession,
+	ensurePersistentStorage,
+	type PersistedAttachedItem
+} from './attachedFilesDB'
+import { enumerateDir, isIgnoredPath, queryReadPermission, requestReadPermission } from './fsAccess'
+
+export type AttachedFileStatus = 'indexing' | 'ready' | 'error' | 'locked' | 'unavailable'
+
+export interface AttachedFile extends FileEntry {
+	size: number
+	status: AttachedFileStatus
+	error?: string
+	/** Top-level folder this file came from (first path segment), if part of a folder. */
+	folder?: string
+	/** Persisted source-record id. Folder children share the folder's record id. */
+	sourceId: string
+	/** Parent directory handle (folder children only) — used to re-grant / re-enumerate. */
+	handle?: FileSystemDirectoryHandle
+	/** Relative path within the folder (folder children only) — stable key for refresh diffing. */
+	relPath?: string
+	/**
+	 * Internal: a single placeholder row standing in for a not-yet-expanded folder
+	 * (locked/unavailable). Consumers should read `store.folders` instead of testing this.
+	 */
+	isFolderRoot?: boolean
+}
+
+/** A linked folder as a first-class object — consumers read this instead of re-grouping rows. */
+export interface AttachedFolder {
+	name: string
+	/** Aggregate status (locked > unavailable > indexing > error > ready). */
+	status: AttachedFileStatus
+	/** Child files; empty while the folder is locked/unavailable after a reload. */
+	files: AttachedFile[]
+}
+
+/** Aggregate a folder's rows (children + a possible placeholder) into one status. */
+function folderStatus(rows: AttachedFile[]): AttachedFileStatus {
+	for (const status of ['locked', 'unavailable', 'indexing', 'error'] as const) {
+		if (rows.some((f) => f.status === status)) return status
+	}
+	return 'ready'
+}
+
+export interface AddFilesResult {
+	added: string[]
+	rejected: { name: string; reason: string }[]
+}
+
+/** A file to link: a raw File, or `{ file, path? }` (path = relative display name). */
+export type FileToAttach = File | { file: File; path?: string }
+
+const EMPTY = new Blob([])
+
+export class AttachedFilesStore {
+	files = $state<AttachedFile[]>([])
+
+	/** Session context, set by the runtime; persistence writes are gated on `#persisted`. */
+	sessionId: string | undefined = undefined
+	#persisted = false
+	/** Records buffered while the session is transient (flushed on first send). */
+	#pending: PersistedAttachedItem[] = []
+
+	list(): AttachedFile[] {
+		return this.files
+	}
+	get(name: string): AttachedFile | undefined {
+		// Resolve to a real file — a folder-root placeholder may share the folder's name.
+		return this.files.find((f) => f.name === name && !f.isFolderRoot)
+	}
+	readyFiles(): AttachedFile[] {
+		// Folder-root placeholders aren't real files — never expose them to the read/search tools.
+		return this.files.filter((f) => f.status === 'ready' && !f.isFolderRoot)
+	}
+	get count(): number {
+		return this.files.length
+	}
+
+	/** Linked folders, children grouped and status aggregated (placeholder rows hidden). */
+	folders: AttachedFolder[] = $derived.by(() => {
+		const byName = new Map<string, AttachedFile[]>()
+		for (const f of this.files) {
+			if (!f.folder) continue
+			const rows = byName.get(f.folder)
+			if (rows) rows.push(f)
+			else byName.set(f.folder, [f])
+		}
+		return [...byName.entries()].map(([name, rows]) => ({
+			name,
+			status: folderStatus(rows),
+			files: rows.filter((f) => !f.isFolderRoot)
+		}))
+	})
+
+	/** Files linked on their own (not as part of a folder). */
+	standalone: AttachedFile[] = $derived.by(() => this.files.filter((f) => !f.folder))
+
+	/** Number of locked folders needing a re-grant. */
+	get lockedCount(): number {
+		return this.folders.filter((f) => f.status === 'locked').length
+	}
+
+	clear(): void {
+		this.files = []
+		this.#pending = []
+	}
+
+	removeFile(name: string): void {
+		// Target the real file only — never a folder-root placeholder that happens to share
+		// the name (those are managed via removeFolder), else removing a same-named standalone
+		// file would also drop the folder's placeholder.
+		const f = this.files.find((x) => x.name === name && !x.isFolderRoot)
+		if (!f) return
+		this.files = this.files.filter((x) => !(x.name === name && !x.isFolderRoot))
+		void this.#deleteRecord(f.sourceId)
+	}
+
+	/** Remove every file linked as part of the given folder (and its persisted record). */
+	removeFolder(folder: string): void {
+		const ids = new Set(this.files.filter((f) => f.folder === folder).map((f) => f.sourceId))
+		this.files = this.files.filter((f) => f.folder !== folder)
+		for (const id of ids) void this.#deleteRecord(id)
+	}
+
+	// ---------------------------------------------------------------- linking
+
+	/**
+	 * Link individual files — always stored as a Blob snapshot. Items carrying a folder
+	 * path (`folder/sub/file`, from a dropped/picked folder) are grouped into a folder and
+	 * have their junk paths (node_modules/.git/dotfiles) skipped; a loose single file is
+	 * kept as-is (so an explicitly attached `.env` isn't filtered out).
+	 */
+	async addFiles(input: FileList | FileToAttach[]): Promise<AddFilesResult> {
+		const result: AddFilesResult = { added: [], rejected: [] }
+
+		for (const item of Array.from(input as ArrayLike<FileToAttach>)) {
+			const file = item instanceof File ? item : item.file
+			const desired =
+				(item instanceof File ? '' : (item.path ?? '')) ||
+				(file as File & { webkitRelativePath?: string }).webkitRelativePath ||
+				file.name ||
+				'file'
+
+			const folder = desired.includes('/') ? desired.split('/')[0] : undefined
+			if (folder && isIgnoredPath(desired)) continue // skip junk inside folders
+
+			if (this.#isDuplicate(desired, file)) continue // silent no-op on re-link
+
+			const reason = await this.#preflight(file)
+			if (reason) {
+				result.rejected.push({ name: desired, reason })
+				continue
+			}
+
+			const name = this.#uniqueName(desired)
+			const relPath = folder ? desired : undefined
+			const sourceId = createLongHash()
+
+			this.#pushIndexing({ name, file, folder, sourceId, relPath })
+			result.added.push(name)
+			void this.#persist({
+				id: sourceId,
+				sessionId: this.sessionId ?? '',
+				kind: 'snapshot',
+				name,
+				folder,
+				relPath,
+				blob: file,
+				size: file.size,
+				lastModified: file.lastModified,
+				addedAt: Date.now()
+			})
+		}
+
+		return result
+	}
+
+	/**
+	 * Link a folder via a live directory handle (File System Access path only).
+	 * Enumerates the handle internally (junk-filtered, capped) — the same walk used
+	 * on restore and refresh, so callers never pre-enumerate.
+	 */
+	async addFolder(dirHandle: FileSystemDirectoryHandle): Promise<AddFilesResult> {
+		const result: AddFilesResult = { added: [], rejected: [] }
+		const folder = dirHandle.name
+		const existing = this.files.filter((f) => f.folder === folder)
+		if (existing.length > 0) {
+			const placeholder = existing.length === 1 ? existing.find((f) => f.isFolderRoot) : undefined
+			if (placeholder) {
+				// Re-picking a folder that sits locked/unavailable after a reload is a natural
+				// recovery gesture — replace the stale link with the freshly-granted handle.
+				this.files = this.files.filter((f) => f.sourceId !== placeholder.sourceId)
+				void this.#deleteRecord(placeholder.sourceId)
+			} else {
+				// Same basename, possibly a different directory — surface it instead of a silent no-op.
+				result.rejected.push({ name: folder, reason: 'A folder with this name is already linked' })
+				return result
+			}
+		}
+
+		const files = await enumerateDir(dirHandle)
+		const sourceId = createLongHash()
+		for (const { file, path } of files) {
+			if (!(await this.#sniffText(file))) {
+				result.rejected.push({ name: path, reason: 'Not a text file' })
+				continue
+			}
+			const name = this.#uniqueName(path)
+			this.#pushIndexing({ name, file, folder, sourceId, handle: dirHandle, relPath: path })
+			result.added.push(name)
+		}
+		// Keep the folder represented even when it links empty (or all-binary): a placeholder
+		// carries the handle so the chip stays and refreshFolders picks up files added later.
+		// Persist unconditionally so an empty-at-link folder also survives a reload.
+		this.#ensureFolderRow(sourceId, folder, dirHandle)
+		void this.#persist({
+			id: sourceId,
+			sessionId: this.sessionId ?? '',
+			kind: 'dir-handle',
+			name: folder,
+			folder,
+			handle: dirHandle,
+			addedAt: Date.now()
+		})
+		return result
+	}
+
+	// ------------------------------------------------------------- persistence
+
+	/** Set session context and load any persisted items for it (called on activation). */
+	async restore(sessionId: string, persisted: boolean): Promise<void> {
+		this.sessionId = sessionId
+		this.#persisted = persisted
+		this.files = []
+		this.#pending = []
+
+		const items = await getItemsForSession(sessionId)
+		for (const item of items) {
+			try {
+				if (item.kind === 'snapshot') {
+					if (!item.blob) {
+						this.#pushPlaceholder(item, 'unavailable')
+						continue
+					}
+					this.#pushIndexing({
+						name: item.name,
+						file: item.blob,
+						folder: item.folder,
+						relPath: item.relPath,
+						sourceId: item.id
+					})
+				} else {
+					// dir-handle (folder)
+					const handle = item.handle as FileSystemDirectoryHandle
+					if ((await queryReadPermission(handle)) === 'granted') {
+						await this.#expandFolder(handle, item.id)
+					} else {
+						this.#pushPlaceholder(item, 'locked', true)
+					}
+				}
+			} catch {
+				this.#pushPlaceholder(item, 'unavailable', item.kind === 'dir-handle')
+			}
+		}
+	}
+
+	/** Re-grant any locked folder handles. MUST be called within a user gesture (e.g. on send). */
+	async regrantLocked(): Promise<void> {
+		const sources = new Map<string, AttachedFile>()
+		for (const f of this.files) {
+			if (f.status === 'locked' && f.handle) sources.set(f.sourceId, f)
+		}
+		if (sources.size === 0) return
+
+		// Kick off all permission requests within the gesture, then process. A rejected
+		// request (requestReadPermission never rejects, but stay defensive) counts as denied.
+		const decided = await Promise.all(
+			[...sources.values()].map((f) =>
+				requestReadPermission(f.handle!).then(
+					(perm) => ({ f, perm }),
+					() => ({ f, perm: 'denied' as PermissionState })
+				)
+			)
+		)
+		for (const { f, perm } of decided) {
+			if (perm !== 'granted') continue
+			try {
+				await this.#expandFolder(f.handle as FileSystemDirectoryHandle, f.sourceId)
+				// Children are in — drop the locked placeholder row, then restore a ready
+				// placeholder if the folder came back empty/all-binary (else dropping the only
+				// handle-bearing row would unlink the folder and stop it ever refreshing).
+				this.files = this.files.filter((x) => !(x.sourceId === f.sourceId && x.isFolderRoot))
+				this.#ensureFolderRow(f.sourceId, f.folder ?? f.name, f.handle as FileSystemDirectoryHandle)
+			} catch {
+				// Enumeration failed (folder moved/deleted on disk): drop any partially-added
+				// children and keep the placeholder so the chip shows "unavailable".
+				this.files = this.files.filter((x) => x.sourceId !== f.sourceId || x.isFolderRoot)
+				this.#patchSource(f.sourceId, { status: 'unavailable' })
+			}
+		}
+	}
+
+	/** Flush buffered links once the session becomes persistent (first send). */
+	async flushPending(): Promise<void> {
+		this.#persisted = true
+		if (!this.sessionId) return
+		const pending = this.#pending
+		this.#pending = []
+		if (pending.length === 0) return
+		void ensurePersistentStorage()
+		for (const item of pending) {
+			try {
+				await putItem({ ...item, sessionId: this.sessionId })
+			} catch (e) {
+				console.error('Could not persist linked file', e)
+			}
+		}
+	}
+
+	async #persist(item: PersistedAttachedItem): Promise<void> {
+		if (this.#persisted && this.sessionId) {
+			void ensurePersistentStorage()
+			try {
+				// A QuotaExceededError just means it won't survive a reload — the item
+				// stays usable for this session. Swallow + log rather than fail the link.
+				await putItem({ ...item, sessionId: this.sessionId })
+			} catch (e) {
+				console.error('Could not persist linked file (kept for this session)', e)
+			}
+		} else {
+			this.#pending.push(item)
+		}
+	}
+
+	async #deleteRecord(sourceId: string): Promise<void> {
+		this.#pending = this.#pending.filter((p) => p.id !== sourceId)
+		if (this.#persisted) {
+			try {
+				await deleteItem(sourceId)
+			} catch {
+				/* ignore */
+			}
+		}
+	}
+
+	// ------------------------------------------------------------- internals
+
+	/** Identical re-link (same name, or same File identity) → silent no-op. */
+	#isDuplicate(desired: string, file: File): boolean {
+		return this.files.some(
+			(f) =>
+				// Folder-root placeholders aren't real files — they must not block attaching a
+				// standalone file that happens to share the folder's name.
+				!f.isFolderRoot &&
+				(f.name === desired ||
+					// Identical re-drop at the SAME relative path (its row name may have been
+					// auto-suffixed). Keyed on the path, NOT the basename — otherwise two distinct
+					// files sharing a basename under different folder subdirs (proj/a/index.ts vs
+					// proj/b/index.ts) would be wrongly deduped and silently dropped.
+					((f.relPath ?? f.name) === desired &&
+						f.size === file.size &&
+						f.file instanceof File &&
+						f.file.lastModified === file.lastModified))
+		)
+	}
+
+	/** Returns a rejection reason, or undefined if the file may be linked. */
+	async #preflight(file: File): Promise<string | undefined> {
+		if (!(await this.#sniffText(file))) return 'Not a text file'
+		return undefined
+	}
+
+	async #sniffText(file: Blob): Promise<boolean> {
+		try {
+			return await isTextFile(file)
+		} catch {
+			return false
+		}
+	}
+
+	#pushIndexing(p: {
+		name: string
+		file: File | Blob
+		folder?: string
+		sourceId: string
+		handle?: FileSystemDirectoryHandle
+		relPath?: string
+	}): void {
+		this.files = [
+			...this.files,
+			{
+				name: p.name,
+				file: p.file,
+				size: p.file.size,
+				lineIndex: [],
+				lineCount: 0,
+				status: 'indexing',
+				folder: p.folder,
+				sourceId: p.sourceId,
+				handle: p.handle,
+				relPath: p.relPath
+			}
+		]
+		void this.#indexFile(p.name, p.file)
+	}
+
+	#pushPlaceholder(
+		item: PersistedAttachedItem,
+		status: AttachedFileStatus,
+		isFolderRoot = false
+	): void {
+		this.files = [
+			...this.files,
+			{
+				name: item.name,
+				file: EMPTY,
+				size: item.size ?? 0,
+				lineIndex: [],
+				lineCount: 0,
+				status,
+				folder: item.folder,
+				sourceId: item.id,
+				handle: item.handle as FileSystemDirectoryHandle | undefined,
+				isFolderRoot
+			}
+		]
+	}
+
+	async #expandFolder(dirHandle: FileSystemDirectoryHandle, sourceId: string): Promise<void> {
+		const folder = dirHandle.name
+		const children = await enumerateDir(dirHandle)
+		for (const { file, path } of children) {
+			if (!(await this.#sniffText(file))) continue
+			const name = this.#uniqueName(path)
+			this.#pushIndexing({ name, file, folder, sourceId, handle: dirHandle, relPath: path })
+		}
+		this.#ensureFolderRow(sourceId, folder, dirHandle)
+	}
+
+	/**
+	 * Re-enumerate granted folder handles to reflect on-disk changes since they were
+	 * linked/last refreshed: added/removed/renamed files and content edits. Called on
+	 * each send so the AI sees the folder's current state. Unchanged files are left as-is
+	 * (diffed by relative path + lastModified); only changed files are re-indexed.
+	 */
+	async refreshFolders(): Promise<void> {
+		const sources = new Map<string, { handle: FileSystemDirectoryHandle; folder: string }>()
+		for (const f of this.files) {
+			// Include folder-root placeholders (an emptied folder keeps only its placeholder),
+			// else the source is lost and the folder never re-enumerates again.
+			if (f.folder && f.handle) {
+				sources.set(f.sourceId, { handle: f.handle, folder: f.folder })
+			}
+		}
+		for (const [sourceId, { handle, folder }] of sources) {
+			try {
+				if ((await queryReadPermission(handle)) !== 'granted') continue
+				const children = await enumerateDir(handle)
+				await this.#reconcileFolder(sourceId, folder, handle, children)
+			} catch {
+				this.#patchSource(sourceId, { status: 'unavailable' })
+			}
+		}
+	}
+
+	async #reconcileFolder(
+		sourceId: string,
+		folder: string,
+		handle: FileSystemDirectoryHandle,
+		children: { file: File; path: string }[]
+	): Promise<void> {
+		const existing = new Map<string, AttachedFile>()
+		for (const f of this.files) if (f.sourceId === sourceId && f.relPath) existing.set(f.relPath, f)
+		const seen = new Set<string>()
+
+		for (const { file, path } of children) {
+			seen.add(path)
+			const cur = existing.get(path)
+			if (!cur) {
+				// newly added on disk
+				if (!(await this.#sniffText(file))) continue
+				const name = this.#uniqueName(path)
+				this.#pushIndexing({ name, file, folder, sourceId, handle, relPath: path })
+			} else {
+				const curMod = cur.file instanceof File ? cur.file.lastModified : undefined
+				if (file.size !== cur.size || file.lastModified !== curMod) {
+					// content changed → re-read + re-index
+					this.#patch(cur.name, { file, size: file.size, status: 'indexing' })
+					void this.#indexFile(cur.name, file)
+				}
+			}
+		}
+		// removed/renamed-away on disk → drop from memory
+		const removed = [...existing.values()].filter((f) => f.relPath && !seen.has(f.relPath))
+		if (removed.length > 0) {
+			const names = new Set(removed.map((f) => f.name))
+			this.files = this.files.filter((f) => !names.has(f.name))
+		}
+		this.#ensureFolderRow(sourceId, folder, handle)
+	}
+
+	/**
+	 * Keep a linked folder represented even with no readable children: leave one
+	 * handle-carrying placeholder row so the chip stays visible AND `refreshFolders`
+	 * keeps the live source (without it, an emptied folder vanishes and never
+	 * re-enumerates). Drop the placeholder as soon as real children exist again.
+	 */
+	#ensureFolderRow(sourceId: string, folder: string, handle: FileSystemDirectoryHandle): void {
+		const hasChild = this.files.some((f) => f.sourceId === sourceId && !f.isFolderRoot)
+		const hasPlaceholder = this.files.some((f) => f.sourceId === sourceId && f.isFolderRoot)
+		if (!hasChild && !hasPlaceholder) {
+			this.files = [
+				...this.files,
+				{
+					name: folder,
+					file: EMPTY,
+					size: 0,
+					lineIndex: [],
+					lineCount: 0,
+					status: 'ready',
+					folder,
+					sourceId,
+					handle,
+					isFolderRoot: true
+				}
+			]
+		} else if (hasChild && hasPlaceholder) {
+			this.files = this.files.filter((f) => !(f.sourceId === sourceId && f.isFolderRoot))
+		}
+	}
+
+	async #indexFile(name: string, file: File | Blob): Promise<void> {
+		try {
+			const { lineIndex, lineCount } = await buildLineIndex(file)
+			this.#patchFile(name, file, { lineIndex, lineCount, status: 'ready' })
+		} catch (e) {
+			this.#patchFile(name, file, {
+				status: 'error',
+				error: e instanceof Error ? e.message : String(e)
+			})
+		}
+	}
+
+	#patch(name: string, changes: Partial<AttachedFile>): void {
+		this.files = this.files.map((f) => (f.name === name ? { ...f, ...changes } : f))
+	}
+	/**
+	 * Patch the row for `name` ONLY while it still holds the exact `file` we indexed.
+	 * `buildLineIndex` is async and unawaited; between its start and finish the row's
+	 * file can be swapped (remove + re-add a same-named file, or a folder refresh
+	 * re-indexing an edited file). Without the identity check a stale completion would
+	 * stamp the wrong lineIndex/lineCount on the new file, and read_file would then slice
+	 * the new Blob with the old offsets.
+	 */
+	#patchFile(name: string, file: File | Blob, changes: Partial<AttachedFile>): void {
+		this.files = this.files.map((f) =>
+			f.name === name && f.file === file ? { ...f, ...changes } : f
+		)
+	}
+	#patchSource(sourceId: string, changes: Partial<AttachedFile>): void {
+		this.files = this.files.map((f) => (f.sourceId === sourceId ? { ...f, ...changes } : f))
+	}
+
+	#uniqueName(original: string): string {
+		// Uniqueness is only among real files — folder-root placeholders may share a name
+		// with a standalone file and must not push it to a "(2)" suffix.
+		const taken = (n: string) => this.files.some((f) => f.name === n && !f.isFolderRoot)
+		if (!taken(original)) return original
+		const dot = original.lastIndexOf('.')
+		const base = dot > 0 ? original.slice(0, dot) : original
+		const ext = dot > 0 ? original.slice(dot) : ''
+		let n = 2
+		let candidate = `${base} (${n})${ext}`
+		while (taken(candidate)) {
+			n++
+			candidate = `${base} (${n})${ext}`
+		}
+		return candidate
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/files/attachedFiles.test.ts b/frontend/src/lib/components/copilot/chat/files/attachedFiles.test.ts
new file mode 100644
index 0000000000..c81bc1f9c4
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/attachedFiles.test.ts
@@ -0,0 +1,476 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+// Mock persistence + File System Access so we exercise the in-memory store logic.
+vi.mock('./attachedFilesDB', () => ({
+	putItem: vi.fn(async () => {}),
+	deleteItem: vi.fn(async () => {}),
+	getItemsForSession: vi.fn(async () => []),
+	ensurePersistentStorage: vi.fn(async () => {})
+}))
+
+const enumerateDirMock = vi.fn<(h: unknown) => Promise<{ file: File; path: string }[]>>()
+vi.mock('./fsAccess', () => ({
+	enumerateDir: (h: unknown) => enumerateDirMock(h),
+	isIgnoredPath: (p: string) =>
+		p.split('/').some((s) => s.startsWith('.') || ['node_modules', 'dist', '.git'].includes(s)),
+	queryReadPermission: vi.fn(async () => 'granted'),
+	requestReadPermission: vi.fn(async () => 'granted')
+}))
+
+// buildLineIndex is real by default; a single test flips to 'manual' to control
+// completion ordering and exercise the stale-index race guard.
+type BuildResult = { lineIndex: number[]; lineCount: number }
+const buildDeferreds: Array<{ file: Blob; resolve: (r: BuildResult) => void }> = []
+let buildMode: 'real' | 'manual' = 'real'
+vi.mock('./fileEngine', async (importOriginal) => {
+	const actual = await importOriginal<typeof import('./fileEngine')>()
+	return {
+		...actual,
+		buildLineIndex: (file: Blob) =>
+			buildMode === 'real'
+				? actual.buildLineIndex(file)
+				: new Promise<BuildResult>((resolve) => buildDeferreds.push({ file, resolve }))
+	}
+})
+
+import { AttachedFilesStore } from './attachedFiles.svelte'
+
+function file(name: string, content: string, lastModified = 1): File {
+	return new File([content], name, { type: 'text/plain', lastModified })
+}
+
+const dir = { kind: 'directory', name: 'proj' } as unknown as FileSystemDirectoryHandle
+
+async function settle(store: AttachedFilesStore) {
+	for (let i = 0; i < 100 && store.list().some((f) => f.status === 'indexing'); i++) {
+		await new Promise((r) => setTimeout(r, 2))
+	}
+}
+
+const names = (store: AttachedFilesStore) =>
+	store
+		.list()
+		.map((f) => f.name)
+		.sort()
+
+describe('AttachedFilesStore', () => {
+	let store: AttachedFilesStore
+	beforeEach(async () => {
+		store = new AttachedFilesStore()
+		await store.restore('s1', false)
+	})
+
+	it('links and indexes individual files as snapshots', async () => {
+		await store.addFiles([file('a.txt', 'one\ntwo\n')])
+		await settle(store)
+		const f = store.get('a.txt')
+		expect(f?.status).toBe('ready')
+		expect(f?.lineCount).toBe(2)
+		expect(f?.handle).toBeUndefined() // files never carry a handle
+	})
+
+	it('removes a file', async () => {
+		await store.addFiles([file('a.txt', 'x')])
+		store.removeFile('a.txt')
+		expect(store.count).toBe(0)
+	})
+
+	it('links a folder via a directory handle (enumerating it internally)', async () => {
+		enumerateDirMock.mockResolvedValue([
+			{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' },
+			{ file: file('old.ts', 'y\n'), path: 'proj/old.ts' }
+		])
+		await store.addFolder(dir)
+		await settle(store)
+		expect(enumerateDirMock).toHaveBeenCalledWith(dir)
+		expect(names(store)).toEqual(['proj/app.ts', 'proj/old.ts'])
+		expect(store.get('proj/app.ts')?.folder).toBe('proj')
+	})
+
+	it('refreshFolders detects rename, add, edit, and delete', async () => {
+		enumerateDirMock.mockResolvedValue([
+			{ file: file('app.ts', 'x\n', 1), path: 'proj/app.ts' },
+			{ file: file('old.ts', 'y\n', 1), path: 'proj/old.ts' }
+		])
+		await store.addFolder(dir)
+		await settle(store)
+
+		// On disk: app.ts edited (mtime bumped), old.ts renamed → new.ts, readme.md added.
+		enumerateDirMock.mockResolvedValue([
+			{ file: file('app.ts', 'x\nedited\n', 2), path: 'proj/app.ts' },
+			{ file: file('new.ts', 'y\n', 1), path: 'proj/new.ts' },
+			{ file: file('readme.md', '# hi\n', 1), path: 'proj/readme.md' }
+		])
+		await store.refreshFolders()
+		await settle(store)
+
+		// old.ts dropped (renamed away); new.ts + readme.md added; app.ts kept.
+		expect(names(store)).toEqual(['proj/app.ts', 'proj/new.ts', 'proj/readme.md'])
+		// edited file re-indexed to its new content (2 lines).
+		expect(store.get('proj/app.ts')?.status).toBe('ready')
+		expect(store.get('proj/app.ts')?.lineCount).toBe(2)
+	})
+
+	it('exposes folders and standalone as structured views', async () => {
+		enumerateDirMock.mockResolvedValue([
+			{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' },
+			{ file: file('b.ts', 'y\n'), path: 'proj/sub/b.ts' }
+		])
+		await store.addFolder(dir)
+		await store.addFiles([file('solo.txt', 'one\n')])
+		await settle(store)
+
+		expect(store.folders.map((f) => f.name)).toEqual(['proj'])
+		expect(store.folders[0].status).toBe('ready')
+		expect(store.folders[0].files.map((f) => f.relPath).sort()).toEqual([
+			'proj/app.ts',
+			'proj/sub/b.ts'
+		])
+		expect(store.standalone.map((f) => f.name)).toEqual(['solo.txt'])
+		expect(store.lockedCount).toBe(0)
+	})
+
+	it('a locked folder surfaces as one folder with no files', async () => {
+		const { getItemsForSession } = await import('./attachedFilesDB')
+		;(getItemsForSession as ReturnType<typeof vi.fn>).mockResolvedValueOnce([
+			{
+				id: 'src1',
+				sessionId: 's1',
+				kind: 'dir-handle',
+				name: 'proj',
+				folder: 'proj',
+				handle: dir,
+				addedAt: 0
+			}
+		])
+		const { queryReadPermission } = await import('./fsAccess')
+		;(queryReadPermission as ReturnType<typeof vi.fn>).mockResolvedValueOnce('prompt')
+
+		const s2 = new AttachedFilesStore()
+		await s2.restore('s1', true)
+
+		expect(s2.folders).toEqual([{ name: 'proj', status: 'locked', files: [] }])
+		expect(s2.standalone).toEqual([])
+		expect(s2.lockedCount).toBe(1)
+	})
+
+	it('re-picking a locked folder relinks it instead of silently no-oping', async () => {
+		const { getItemsForSession } = await import('./attachedFilesDB')
+		;(getItemsForSession as ReturnType<typeof vi.fn>).mockResolvedValueOnce([
+			{
+				id: 'src1',
+				sessionId: 's1',
+				kind: 'dir-handle',
+				name: 'proj',
+				folder: 'proj',
+				handle: dir,
+				addedAt: 0
+			}
+		])
+		const { queryReadPermission } = await import('./fsAccess')
+		;(queryReadPermission as ReturnType<typeof vi.fn>).mockResolvedValueOnce('prompt')
+		const s2 = new AttachedFilesStore()
+		await s2.restore('s1', true)
+		expect(s2.folders[0]?.status).toBe('locked')
+
+		enumerateDirMock.mockResolvedValue([{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' }])
+		const result = await s2.addFolder(dir)
+		await settle(s2)
+		expect(result.added).toEqual(['proj/app.ts'])
+		expect(s2.folders).toHaveLength(1)
+		expect(s2.folders[0].status).toBe('ready')
+	})
+
+	it('rejects linking a second folder with the same name (visible, not silent)', async () => {
+		enumerateDirMock.mockResolvedValue([{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' }])
+		await store.addFolder(dir)
+		await settle(store)
+		const result = await store.addFolder(dir)
+		expect(result.added).toEqual([])
+		expect(result.rejected[0]?.reason).toMatch(/already linked/)
+		expect(store.folders).toHaveLength(1)
+	})
+
+	it('regrant keeps the folder visible as unavailable when enumeration fails', async () => {
+		const { getItemsForSession } = await import('./attachedFilesDB')
+		;(getItemsForSession as ReturnType<typeof vi.fn>).mockResolvedValueOnce([
+			{
+				id: 'src1',
+				sessionId: 's1',
+				kind: 'dir-handle',
+				name: 'proj',
+				folder: 'proj',
+				handle: dir,
+				addedAt: 0
+			}
+		])
+		const { queryReadPermission } = await import('./fsAccess')
+		;(queryReadPermission as ReturnType<typeof vi.fn>).mockResolvedValueOnce('prompt')
+		const s2 = new AttachedFilesStore()
+		await s2.restore('s1', true)
+		expect(s2.lockedCount).toBe(1)
+
+		// Permission re-granted, but the directory is gone from disk.
+		enumerateDirMock.mockRejectedValueOnce(new Error('directory removed'))
+		await s2.regrantLocked()
+		expect(s2.folders).toEqual([{ name: 'proj', status: 'unavailable', files: [] }])
+	})
+
+	it('regrant of an empty folder keeps it linked and refreshing (not unlinked)', async () => {
+		const { getItemsForSession } = await import('./attachedFilesDB')
+		;(getItemsForSession as ReturnType<typeof vi.fn>).mockResolvedValueOnce([
+			{
+				id: 'src1',
+				sessionId: 's1',
+				kind: 'dir-handle',
+				name: 'proj',
+				folder: 'proj',
+				handle: dir,
+				addedAt: 0
+			}
+		])
+		const { queryReadPermission } = await import('./fsAccess')
+		;(queryReadPermission as ReturnType<typeof vi.fn>).mockResolvedValueOnce('prompt')
+		const s2 = new AttachedFilesStore()
+		await s2.restore('s1', true)
+		expect(s2.lockedCount).toBe(1)
+
+		// Access re-granted, but the folder is currently empty — it must stay linked (ready
+		// placeholder), not vanish when the locked placeholder is dropped.
+		enumerateDirMock.mockResolvedValueOnce([])
+		await s2.regrantLocked()
+		expect(s2.folders).toEqual([{ name: 'proj', status: 'ready', files: [] }])
+		expect(s2.lockedCount).toBe(0)
+
+		// A file added afterward is picked up — the handle survived.
+		enumerateDirMock.mockResolvedValueOnce([{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' }])
+		await s2.refreshFolders()
+		await settle(s2)
+		expect(s2.folders[0].files.map((f) => f.relPath)).toEqual(['proj/app.ts'])
+	})
+
+	it('removeFolder drops all of a folder’s files', async () => {
+		enumerateDirMock.mockResolvedValue([
+			{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' },
+			{ file: file('b.ts', 'y\n'), path: 'proj/b.ts' }
+		])
+		await store.addFolder(dir)
+		store.removeFolder('proj')
+		expect(store.count).toBe(0)
+	})
+
+	it('snapshots a folder via addFiles (paths), grouping it and persisting folder + relPath', async () => {
+		const { putItem } = await import('./attachedFilesDB')
+		// A persisted (non-transient) session writes through to IndexedDB immediately.
+		const s = new AttachedFilesStore()
+		await s.restore('s1', true)
+		await s.addFiles([
+			{ file: file('a.ts', 'x\n'), path: 'proj/a.ts' },
+			{ file: file('b.ts', 'y\n'), path: 'proj/sub/b.ts' }
+		])
+		await settle(s)
+		expect(s.folders.map((f) => f.name)).toEqual(['proj'])
+		expect(s.folders[0].files.map((f) => f.relPath).sort()).toEqual(['proj/a.ts', 'proj/sub/b.ts'])
+		expect(s.standalone).toEqual([])
+		const rec = (putItem as ReturnType<typeof vi.fn>).mock.calls
+			.map((c) => c[0])
+			.find((r) => r.name === 'proj/a.ts')
+		expect(rec).toMatchObject({ kind: 'snapshot', folder: 'proj', relPath: 'proj/a.ts' })
+	})
+
+	it('keeps same-basename files from different folder subdirs (dedup by path, not basename)', async () => {
+		// Two distinct files with the same basename, size and lastModified, different subdirs.
+		const res = await store.addFiles([
+			{ file: file('index.ts', 'a\n', 5), path: 'proj/a/index.ts' },
+			{ file: file('index.ts', 'a\n', 5), path: 'proj/b/index.ts' }
+		])
+		await settle(store)
+		expect(res.added.sort()).toEqual(['proj/a/index.ts', 'proj/b/index.ts'])
+		expect(store.folders[0].files.map((f) => f.relPath).sort()).toEqual([
+			'proj/a/index.ts',
+			'proj/b/index.ts'
+		])
+	})
+
+	it('skips junk paths (node_modules/.git/dotfiles) inside a snapshotted folder', async () => {
+		const res = await store.addFiles([
+			{ file: file('a.ts', 'x\n'), path: 'proj/a.ts' },
+			{ file: file('dep.js', 'z\n'), path: 'proj/node_modules/dep.js' },
+			{ file: file('cfg', 'w\n'), path: 'proj/.git/config' }
+		])
+		await settle(store)
+		expect(res.added).toEqual(['proj/a.ts'])
+		expect(store.folders[0].files).toHaveLength(1)
+	})
+
+	it('keeps an explicitly attached standalone dotfile (filter is folder-only)', async () => {
+		const res = await store.addFiles([file('.env', 'SECRET=1\n')])
+		await settle(store)
+		expect(res.added).toEqual(['.env'])
+		expect(store.standalone.map((f) => f.name)).toEqual(['.env'])
+	})
+
+	it('restores a snapshot folder grouped from its persisted folder/relPath', async () => {
+		const { getItemsForSession } = await import('./attachedFilesDB')
+		;(getItemsForSession as ReturnType<typeof vi.fn>).mockResolvedValueOnce([
+			{
+				id: 's-a',
+				sessionId: 's1',
+				kind: 'snapshot',
+				name: 'proj/a.ts',
+				folder: 'proj',
+				relPath: 'proj/a.ts',
+				blob: file('a.ts', 'x\n'),
+				addedAt: 0
+			},
+			{
+				id: 's-b',
+				sessionId: 's1',
+				kind: 'snapshot',
+				name: 'proj/b.ts',
+				folder: 'proj',
+				relPath: 'proj/b.ts',
+				blob: file('b.ts', 'y\n'),
+				addedAt: 0
+			}
+		])
+		const s2 = new AttachedFilesStore()
+		await s2.restore('s1', true)
+		await settle(s2)
+		expect(s2.folders.map((f) => f.name)).toEqual(['proj'])
+		expect(s2.folders[0].files).toHaveLength(2)
+		expect(s2.standalone).toEqual([])
+	})
+
+	it('imposes no file-count cap on a folder', async () => {
+		enumerateDirMock.mockResolvedValue(
+			Array.from({ length: 150 }, (_, i) => ({
+				file: file(`f${i}.ts`, 'x\n'),
+				path: `proj/f${i}.ts`
+			}))
+		)
+		await store.addFolder(dir)
+		await settle(store)
+		expect(store.folders[0].files.length).toBe(150)
+	})
+
+	it('removeFolder deletes every snapshot record from storage (persisted session)', async () => {
+		const { deleteItem } = await import('./attachedFilesDB')
+		const s = new AttachedFilesStore()
+		await s.restore('s1', true)
+		await s.addFiles([
+			{ file: file('a.ts', 'x\n'), path: 'proj/a.ts' },
+			{ file: file('b.ts', 'y\n'), path: 'proj/sub/b.ts' }
+		])
+		await settle(s)
+		const ids = s
+			.list()
+			.filter((f) => f.folder === 'proj')
+			.map((f) => f.sourceId)
+		expect(ids.length).toBe(2)
+		;(deleteItem as ReturnType<typeof vi.fn>).mockClear()
+		s.removeFolder('proj')
+		expect(s.count).toBe(0)
+		const deleted = (deleteItem as ReturnType<typeof vi.fn>).mock.calls.map((c) => c[0])
+		for (const id of ids) expect(deleted).toContain(id)
+	})
+
+	it('a stale index completion does not corrupt a re-added same-named file', async () => {
+		buildMode = 'manual'
+		try {
+			const A = file('a.txt', 'AAA\n')
+			const B = file('a.txt', 'BBB\nBBB\nBBB\n')
+			await store.addFiles([A]) // row 'a.txt' (file A) → buildLineIndex(A) pending
+			store.removeFile('a.txt')
+			await store.addFiles([B]) // new row 'a.txt' (file B) → buildLineIndex(B) pending
+
+			// The old (stale) index for A resolves last — it must NOT touch the row now holding B.
+			buildDeferreds.find((d) => d.file === A)!.resolve({ lineIndex: [0], lineCount: 99 })
+			await Promise.resolve()
+			expect(store.get('a.txt')?.status).toBe('indexing')
+			expect(store.get('a.txt')?.lineCount).not.toBe(99)
+
+			// B's own index applies normally.
+			buildDeferreds.find((d) => d.file === B)!.resolve({ lineIndex: [0, 4, 8], lineCount: 3 })
+			await Promise.resolve()
+			expect(store.get('a.txt')?.status).toBe('ready')
+			expect(store.get('a.txt')?.lineCount).toBe(3)
+		} finally {
+			buildMode = 'real'
+			buildDeferreds.length = 0
+		}
+	})
+
+	it('removeFolder deletes the live folder record from storage (persisted session)', async () => {
+		const { deleteItem } = await import('./attachedFilesDB')
+		const s = new AttachedFilesStore()
+		await s.restore('s1', true)
+		enumerateDirMock.mockResolvedValue([{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' }])
+		await s.addFolder(dir)
+		await settle(s)
+		const sourceId = s.list().find((f) => f.folder === 'proj')?.sourceId
+		;(deleteItem as ReturnType<typeof vi.fn>).mockClear()
+		s.removeFolder('proj')
+		expect(s.count).toBe(0)
+		expect((deleteItem as ReturnType<typeof vi.fn>).mock.calls.map((c) => c[0])).toContain(sourceId)
+	})
+
+	it('an emptied live folder stays visible and refreshes when files return', async () => {
+		enumerateDirMock.mockResolvedValue([{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' }])
+		await store.addFolder(dir)
+		await settle(store)
+		expect(store.folders.map((f) => f.name)).toEqual(['proj'])
+
+		// Folder emptied on disk → the last child is removed but the folder persists (placeholder).
+		enumerateDirMock.mockResolvedValue([])
+		await store.refreshFolders()
+		await settle(store)
+		expect(store.folders).toEqual([{ name: 'proj', status: 'ready', files: [] }])
+		expect(store.get('proj/app.ts')).toBeUndefined()
+		expect(store.readyFiles()).toEqual([]) // placeholder is never a tool target
+
+		// A file added back on disk is picked up — the live source survived the empty state.
+		enumerateDirMock.mockResolvedValue([{ file: file('new.ts', 'y\n'), path: 'proj/new.ts' }])
+		await store.refreshFolders()
+		await settle(store)
+		expect(store.folders[0].files.map((f) => f.relPath)).toEqual(['proj/new.ts'])
+	})
+
+	it('an empty-folder placeholder does not collide with a same-named standalone file', async () => {
+		enumerateDirMock.mockResolvedValue([]) // empty folder "proj" → creates a placeholder named "proj"
+		await store.addFolder(dir)
+		await settle(store)
+
+		// A standalone file literally named "proj" must NOT be deduped by the placeholder.
+		const res = await store.addFiles([file('proj', 'hello\n')])
+		await settle(store)
+		expect(res.added).toEqual(['proj'])
+		expect(store.standalone.map((f) => f.name)).toEqual(['proj'])
+		expect(store.folders.map((f) => f.name)).toEqual(['proj'])
+
+		// Removing that standalone leaves the folder's placeholder intact.
+		store.removeFile('proj')
+		expect(store.standalone).toEqual([])
+		expect(store.folders).toEqual([{ name: 'proj', status: 'ready', files: [] }])
+	})
+
+	it('links an initially empty live folder (kept visible, persisted, refreshes)', async () => {
+		const { putItem } = await import('./attachedFilesDB')
+		const s = new AttachedFilesStore()
+		await s.restore('s1', true)
+		enumerateDirMock.mockResolvedValue([]) // folder is empty at link time
+		const res = await s.addFolder(dir)
+		await settle(s)
+		expect(res.added).toEqual([])
+		expect(s.folders).toEqual([{ name: 'proj', status: 'ready', files: [] }])
+		// persisted as a dir-handle so it survives a reload despite being empty
+		const persisted = (putItem as ReturnType<typeof vi.fn>).mock.calls.map((c) => c[0])
+		expect(persisted.some((r) => r.kind === 'dir-handle' && r.folder === 'proj')).toBe(true)
+
+		// a file added later is picked up — the source existed from the start.
+		enumerateDirMock.mockResolvedValue([{ file: file('app.ts', 'x\n'), path: 'proj/app.ts' }])
+		await s.refreshFolders()
+		await settle(s)
+		expect(s.folders[0].files.map((f) => f.relPath)).toEqual(['proj/app.ts'])
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/files/attachedFilesDB.test.ts b/frontend/src/lib/components/copilot/chat/files/attachedFilesDB.test.ts
new file mode 100644
index 0000000000..9673e29edc
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/attachedFilesDB.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import {
+	getItemsForSession,
+	putItem,
+	deleteItem,
+	deleteItemsForSession,
+	ensurePersistentStorage
+} from './attachedFilesDB'
+
+// IndexedDB is unavailable in the node test env. The module must degrade gracefully
+// (open fails → reads return [], writes/deletes are no-ops) rather than throwing.
+describe('attachedFilesDB without IndexedDB', () => {
+	it('returns [] for reads', async () => {
+		expect(await getItemsForSession('s1')).toEqual([])
+	})
+
+	it('does not throw on writes/deletes', async () => {
+		await expect(
+			putItem({ id: 'a', sessionId: 's1', kind: 'snapshot', name: 'x.txt', addedAt: 0 })
+		).resolves.toBeUndefined()
+		await expect(deleteItem('a')).resolves.toBeUndefined()
+		await expect(deleteItemsForSession('s1')).resolves.toBeUndefined()
+	})
+
+	it('does not throw when requesting persistent storage', async () => {
+		await expect(ensurePersistentStorage()).resolves.toBeUndefined()
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/files/attachedFilesDB.ts b/frontend/src/lib/components/copilot/chat/files/attachedFilesDB.ts
new file mode 100644
index 0000000000..36f9ac4fbe
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/attachedFilesDB.ts
@@ -0,0 +1,118 @@
+/**
+ * IndexedDB persistence for AI-chat linked files, keyed by session id.
+ *
+ * Two kinds of records survive a reload (see the persistence plan):
+ *  - handle records ('file-handle' / 'dir-handle'): a re-grantable File System
+ *    Access handle is stored (structured-clone), re-read live on restore.
+ *  - 'snapshot' records: a full-byte Blob copy (fallback when the File System
+ *    Access API is unavailable).
+ *
+ * Mirrors the `idb` usage in HistoryManager.svelte.ts.
+ */
+import { openDB, type DBSchema as IDBSchema, type IDBPDatabase } from 'idb'
+
+export type AttachedItemKind = 'snapshot' | 'dir-handle'
+
+export interface PersistedAttachedItem {
+	/** Stable record id. */
+	id: string
+	sessionId: string
+	/** 'snapshot' = a file copied into IndexedDB; 'dir-handle' = a live folder handle. */
+	kind: AttachedItemKind
+	/** Display name: relative path for files, folder name for dir-handle records. */
+	name: string
+	/** Top-level folder (for grouping); equals `name` for dir-handle records. */
+	folder?: string
+	/** Folder-relative path (snapshot folder children) — restores the folder grouping/tree. */
+	relPath?: string
+	/** Live directory handle (for 'dir-handle'). */
+	handle?: FileSystemDirectoryHandle
+	/** Full-content copy (for 'snapshot'). */
+	blob?: Blob
+	size?: number
+	lastModified?: number
+	addedAt: number
+}
+
+interface AttachedFilesSchema extends IDBSchema {
+	items: {
+		key: string
+		value: PersistedAttachedItem
+		indexes: { 'by-session': string }
+	}
+}
+
+let dbPromise: Promise<IDBPDatabase<AttachedFilesSchema> | undefined> | undefined
+
+function getDB(): Promise<IDBPDatabase<AttachedFilesSchema> | undefined> {
+	if (!dbPromise) {
+		try {
+			dbPromise = openDB<AttachedFilesSchema>('copilot-attached-files', 1, {
+				upgrade(db) {
+					if (!db.objectStoreNames.contains('items')) {
+						const store = db.createObjectStore('items', { keyPath: 'id' })
+						store.createIndex('by-session', 'sessionId')
+					}
+				}
+			}).catch((err) => {
+				console.error('Could not open attached-files database', err)
+				return undefined
+			})
+		} catch (err) {
+			// IndexedDB unavailable (e.g. private mode / no DOM) — degrade gracefully.
+			console.error('Could not open attached-files database', err)
+			dbPromise = Promise.resolve(undefined)
+		}
+	}
+	return dbPromise
+}
+
+export async function putItem(item: PersistedAttachedItem): Promise<void> {
+	const db = await getDB()
+	await db?.put('items', item)
+}
+
+export async function getItemsForSession(sessionId: string): Promise<PersistedAttachedItem[]> {
+	const db = await getDB()
+	if (!db) return []
+	try {
+		return await db.getAllFromIndex('items', 'by-session', sessionId)
+	} catch (err) {
+		console.error('Could not read attached files', err)
+		return []
+	}
+}
+
+export async function deleteItem(id: string): Promise<void> {
+	const db = await getDB()
+	await db?.delete('items', id)
+}
+
+export async function deleteItemsForSession(sessionId: string): Promise<void> {
+	const db = await getDB()
+	if (!db) return
+	try {
+		const tx = db.transaction('items', 'readwrite')
+		const index = tx.store.index('by-session')
+		let cursor = await index.openCursor(sessionId)
+		while (cursor) {
+			await cursor.delete()
+			cursor = await cursor.continue()
+		}
+		await tx.done
+	} catch (err) {
+		console.error('Could not delete attached files for session', err)
+	}
+}
+
+/** Ask the browser to keep our storage from being evicted (best-effort, once). */
+let persistRequested = false
+export async function ensurePersistentStorage(): Promise<void> {
+	if (persistRequested) return
+	persistRequested = true
+	try {
+		await navigator.storage?.persist?.()
+	} catch {
+		// best-effort; ignore
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/files/fileEngine.test.ts b/frontend/src/lib/components/copilot/chat/files/fileEngine.test.ts
new file mode 100644
index 0000000000..8ef6d5b827
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/fileEngine.test.ts
@@ -0,0 +1,286 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+	buildLineIndex,
+	readFile,
+	searchFiles,
+	searchFilesInWorker,
+	isTextFile,
+	numberLines,
+	type FileEntry
+} from './fileEngine'
+
+function makeFile(content: string | Uint8Array, name = 'f.txt'): File {
+	return new File([content as BlobPart], name)
+}
+
+async function makeEntry(content: string, name = 'f.txt'): Promise<FileEntry> {
+	const file = makeFile(content, name)
+	const { lineIndex, lineCount } = await buildLineIndex(file)
+	return { name, file, lineIndex, lineCount }
+}
+
+describe('buildLineIndex', () => {
+	it('counts lines without a trailing newline', async () => {
+		const { lineIndex, lineCount } = await buildLineIndex(makeFile('a\nb'))
+		expect(lineCount).toBe(2)
+		expect(lineIndex).toEqual([0, 2])
+	})
+
+	it('does not count a single trailing newline as an extra line', async () => {
+		const { lineIndex, lineCount } = await buildLineIndex(makeFile('a\nb\n'))
+		expect(lineCount).toBe(2)
+		expect(lineIndex).toEqual([0, 2])
+	})
+
+	it('handles an empty file', async () => {
+		const { lineIndex, lineCount } = await buildLineIndex(makeFile(''))
+		expect(lineCount).toBe(0)
+		expect(lineIndex).toEqual([])
+	})
+
+	it('handles CRLF line endings (offsets by byte)', async () => {
+		// bytes: a=0 \r=1 \n=2 b=3 → line starts at 0 and 3
+		const { lineIndex, lineCount } = await buildLineIndex(makeFile('a\r\nb'))
+		expect(lineCount).toBe(2)
+		expect(lineIndex).toEqual([0, 3])
+	})
+
+	it('counts lines correctly across stream chunk boundaries', async () => {
+		const lines = Array.from({ length: 5000 }, (_, i) => `line ${i}`)
+		const { lineCount } = await buildLineIndex(makeFile(lines.join('\n')))
+		expect(lineCount).toBe(5000)
+	})
+})
+
+describe('readFile', () => {
+	it('reads a bounded window and reports pagination', async () => {
+		const entry = await makeEntry('l1\nl2\nl3')
+		const res = await readFile(entry, { startLine: 1, endLine: 2 })
+		expect(res.text).toBe('l1\nl2\n')
+		expect(res.startLine).toBe(1)
+		expect(res.endLine).toBe(2)
+		expect(res.totalLines).toBe(3)
+		expect(res.truncated).toBe(true)
+		expect(res.note).toContain('start_line=3')
+	})
+
+	it('reads the final line to end of file', async () => {
+		const entry = await makeEntry('l1\nl2\nl3')
+		const res = await readFile(entry, { startLine: 3 })
+		expect(res.text).toBe('l3')
+		expect(res.truncated).toBe(false)
+	})
+
+	it('clamps the window to maxLines', async () => {
+		const entry = await makeEntry(Array.from({ length: 100 }, (_, i) => `l${i}`).join('\n'))
+		const res = await readFile(entry, { startLine: 1, maxLines: 10 })
+		expect(res.endLine).toBe(10)
+		expect(res.truncated).toBe(true)
+	})
+
+	it('char-caps a degenerate single long line', async () => {
+		const entry = await makeEntry('x'.repeat(10000))
+		const res = await readFile(entry, { maxChars: 8000 })
+		expect(res.text.length).toBe(8000)
+		expect(res.truncated).toBe(true)
+		expect(res.note).toContain('8000 characters')
+	})
+
+	it('bounds the byte decode on a newline-sparse window (never reads past maxChars*4 bytes)', async () => {
+		// One 200k-char line; with maxChars=1000 only ≤4000 bytes are sliced before decode.
+		const entry = await makeEntry('y'.repeat(200_000))
+		const res = await readFile(entry, { maxChars: 1000 })
+		expect(res.text).toBe('y'.repeat(1000))
+		expect(res.truncated).toBe(true)
+	})
+
+	it('clamps a start line beyond the end', async () => {
+		const entry = await makeEntry('l1\nl2')
+		const res = await readFile(entry, { startLine: 99 })
+		expect(res.startLine).toBe(2)
+		expect(res.text).toBe('l2')
+	})
+
+	it('returns empty for an empty file', async () => {
+		const entry = await makeEntry('')
+		const res = await readFile(entry)
+		expect(res.text).toBe('')
+		expect(res.totalLines).toBe(0)
+	})
+
+	it('char-truncation inside the first line resumes the note at the next line', async () => {
+		// Line 1 exceeds maxChars; lines 2-3 follow. The window only returns line 1's prefix,
+		// so the note must report line 1 and point the model at line 2 (not claim lines 1-3).
+		const entry = await makeEntry('x'.repeat(20000) + '\nl2\nl3')
+		const res = await readFile(entry, { startLine: 1, endLine: 3, maxChars: 5000 })
+		expect(res.endLine).toBe(1)
+		expect(res.totalLines).toBe(3)
+		expect(res.truncated).toBe(true)
+		expect(res.note).toContain('start_line=2')
+	})
+
+	it('char-truncation after some whole lines resumes at the truncated line', async () => {
+		const entry = await makeEntry('a\nb\n' + 'x'.repeat(20000) + '\nd')
+		const res = await readFile(entry, { startLine: 1, endLine: 4, maxChars: 5000 })
+		expect(res.endLine).toBe(2) // a, b whole; line 3 (xxx) cut
+		expect(res.note).toContain('start_line=3')
+		// the partial line 3 must NOT leak into the body — it would contradict the note
+		expect(res.text).toBe('a\nb\n')
+		expect(numberLines(res.text, res.startLine)).toBe('1→a\n2→b')
+	})
+})
+
+describe('searchFiles', () => {
+	it('finds matches with 1-based line numbers', async () => {
+		const entry = await makeEntry('alpha\nbeta\ngamma beta')
+		const res = await searchFiles([entry], 'beta')
+		expect(res.error).toBeUndefined()
+		expect(res.hits).toEqual([
+			{ file: 'f.txt', line: 2, text: 'beta' },
+			{ file: 'f.txt', line: 3, text: 'gamma beta' }
+		])
+	})
+
+	it('searches across multiple files', async () => {
+		const a = await makeEntry('needle here', 'a.txt')
+		const b = await makeEntry('nope\nneedle', 'b.txt')
+		const res = await searchFiles([a, b], 'needle')
+		expect(res.hits.map((h) => `${h.file}:${h.line}`)).toEqual(['a.txt:1', 'b.txt:2'])
+	})
+
+	it('restricts to a single file with pathFilter', async () => {
+		const a = await makeEntry('needle', 'a.txt')
+		const b = await makeEntry('needle', 'b.txt')
+		const res = await searchFiles([a, b], 'needle', { pathFilter: 'b.txt' })
+		expect(res.hits).toEqual([{ file: 'b.txt', line: 1, text: 'needle' }])
+	})
+
+	it('reports an unknown pathFilter as an error', async () => {
+		const a = await makeEntry('needle', 'a.txt')
+		const res = await searchFiles([a], 'needle', { pathFilter: 'missing.txt' })
+		expect(res.error).toContain('missing.txt')
+	})
+
+	it('truncates at maxHits', async () => {
+		const entry = await makeEntry(Array.from({ length: 10 }, () => 'match').join('\n'))
+		const res = await searchFiles([entry], 'match', { maxHits: 3 })
+		expect(res.hits.length).toBe(3)
+		expect(res.truncated).toBe(true)
+	})
+
+	it('supports case-insensitive flags', async () => {
+		const entry = await makeEntry('Hello\nworld')
+		const res = await searchFiles([entry], 'hello', { flags: 'i' })
+		expect(res.hits).toEqual([{ file: 'f.txt', line: 1, text: 'Hello' }])
+	})
+
+	it('strips trailing CR from matched CRLF lines', async () => {
+		const entry = await makeEntry('foo\r\nbar')
+		const res = await searchFiles([entry], 'foo')
+		expect(res.hits).toEqual([{ file: 'f.txt', line: 1, text: 'foo' }])
+	})
+
+	it('returns a friendly error for an invalid regex', async () => {
+		const entry = await makeEntry('anything')
+		const res = await searchFiles([entry], '(')
+		expect(res.error).toContain('Invalid regex')
+		expect(res.hits).toEqual([])
+	})
+
+	it('matches across stream chunk boundaries', async () => {
+		const lines = Array.from({ length: 5000 }, (_, i) => (i === 4999 ? 'TARGET' : `line ${i}`))
+		const entry = await makeEntry(lines.join('\n'))
+		const res = await searchFiles([entry], 'TARGET')
+		expect(res.hits).toEqual([{ file: 'f.txt', line: 5000, text: 'TARGET' }])
+	})
+
+	it('a global flag does not drop matches via a stale lastIndex', async () => {
+		// `.test()` is stateful under the `g` flag; without resetting lastIndex, lines after
+		// the first match would be tested from a stale offset and silently miss.
+		const entry = await makeEntry('match\nmatch\nmatch')
+		const res = await searchFiles([entry], 'match', { flags: 'g' })
+		expect(res.hits.map((h) => h.line)).toEqual([1, 2, 3])
+	})
+})
+
+describe('searchFilesInWorker', () => {
+	// A controllable stand-in for the search Worker — `reply`, `error`, or `hang` (never responds).
+	class MockWorker {
+		onmessage: ((e: MessageEvent) => void) | null = null
+		onerror: ((e: unknown) => void) | null = null
+		static mode: 'reply' | 'error' | 'hang' = 'reply'
+		static reply: unknown = { hits: [], truncated: false }
+		static terminated = false
+		constructor(_url: URL | string, _opts?: unknown) {}
+		postMessage(): void {
+			if (MockWorker.mode === 'reply')
+				queueMicrotask(() => this.onmessage?.({ data: MockWorker.reply } as MessageEvent))
+			else if (MockWorker.mode === 'error') queueMicrotask(() => this.onerror?.({}))
+			// 'hang' → never responds, exercising the timeout path.
+		}
+		terminate(): void {
+			MockWorker.terminated = true
+		}
+	}
+
+	beforeEach(() => {
+		MockWorker.terminated = false
+		vi.stubGlobal('Worker', MockWorker)
+	})
+	afterEach(() => vi.unstubAllGlobals())
+
+	const entry: FileEntry = { name: 'a.txt', file: makeFile('x'), lineIndex: [], lineCount: 0 }
+
+	it('resolves with the worker result and terminates the worker', async () => {
+		MockWorker.mode = 'reply'
+		MockWorker.reply = { hits: [{ file: 'a.txt', line: 1, text: 'x' }], truncated: false }
+		const res = await searchFilesInWorker([entry], 'x')
+		expect(res.hits).toEqual([{ file: 'a.txt', line: 1, text: 'x' }])
+		expect(MockWorker.terminated).toBe(true)
+	})
+
+	it('times out on a non-responding (pathological) pattern and terminates the worker', async () => {
+		MockWorker.mode = 'hang'
+		const res = await searchFilesInWorker([entry], '^(a+)+$', {}, 20)
+		expect(res.error).toContain('timed out')
+		expect(MockWorker.terminated).toBe(true)
+	})
+})
+
+describe('isTextFile', () => {
+	it('accepts UTF-8 text', async () => {
+		expect(await isTextFile(makeFile('hello © world'))).toBe(true)
+	})
+
+	it('accepts an empty file', async () => {
+		expect(await isTextFile(makeFile(''))).toBe(true)
+	})
+
+	it('rejects content with NUL bytes', async () => {
+		expect(await isTextFile(makeFile(new Uint8Array([104, 0, 105]), 'b.bin'))).toBe(false)
+	})
+})
+
+describe('numberLines', () => {
+	it('prefixes each line with its absolute 1-based number', () => {
+		expect(numberLines('l3\nl4\n', 3)).toBe('3→l3\n4→l4')
+	})
+
+	it('right-aligns numbers to a common width', () => {
+		expect(numberLines('a\nb', 9)).toBe(' 9→a\n10→b')
+	})
+
+	it('numbers a final line that has no trailing newline', () => {
+		expect(numberLines('only', 5)).toBe('5→only')
+	})
+
+	it('matches a readFile window (numbers the returned lines, no phantom line)', async () => {
+		const file = makeFile('l1\nl2\nl3')
+		const { lineIndex, lineCount } = await buildLineIndex(file)
+		const res = await readFile(
+			{ name: 'f.txt', file, lineIndex, lineCount },
+			{ startLine: 1, endLine: 2 }
+		)
+		expect(numberLines(res.text, res.startLine)).toBe('1→l1\n2→l2')
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/files/fileEngine.ts b/frontend/src/lib/components/copilot/chat/files/fileEngine.ts
new file mode 100644
index 0000000000..5dbceb77e2
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/fileEngine.ts
@@ -0,0 +1,430 @@
+/**
+ * Storage-agnostic streaming engine for reading and searching attached files.
+ *
+ * Files are kept as `File` handles (lazy references to bytes on disk). Nothing is
+ * decoded into the JS heap wholesale: we stream in chunks, so a large file never
+ * freezes the tab or blows up memory. The only per-file state held in RAM is a
+ * line-offset index (a flat array of byte offsets, ~8 bytes per line).
+ *
+ * Line semantics match `String.split('\n')` except a single trailing newline does
+ * NOT add an empty final line (so "a\nb\n" is 2 lines, like `wc -l`). Lines are
+ * 1-based in the public read/search API.
+ */
+
+/** Minimal shape the engine needs. The attached-files store extends this with reactive status. */
+export interface FileEntry {
+	name: string
+	/** A File (live link) or a Blob (restored snapshot) — both stream/slice identically. */
+	file: File | Blob
+	lineIndex: number[]
+	lineCount: number
+}
+
+const CHUNK_NEWLINE = 0x0a // '\n' — in UTF-8 this byte never appears inside a multibyte sequence
+
+export const DEFAULT_READ_MAX_LINES = 200
+export const DEFAULT_READ_MAX_CHARS = 8000
+export const DEFAULT_SEARCH_MAX_HITS = 50
+/**
+ * Per-line cap on how much of a degenerate long line the regex is tested against.
+ * This bounds work for linear-time patterns; it does NOT prevent catastrophic
+ * backtracking — a nested-quantifier pattern can still go exponential within the
+ * capped prefix (search runs on the main thread, so that is a self-DoS of the tab).
+ */
+export const DEFAULT_SEARCH_LINE_SCAN_CAP = 100_000
+/** How much of a matching line we echo back, to keep search results bounded. */
+export const DEFAULT_SEARCH_LINE_ECHO_CAP = 500
+
+/**
+ * Stream the file once and record the byte offset at which each line starts.
+ * Scans raw bytes for '\n' (no decode needed — 0x0A is unambiguous in UTF-8).
+ */
+export async function buildLineIndex(
+	file: Blob
+): Promise<{ lineIndex: number[]; lineCount: number }> {
+	const fileSize = file.size
+	if (fileSize === 0) {
+		return { lineIndex: [], lineCount: 0 }
+	}
+
+	const lineIndex: number[] = [0]
+	let offset = 0
+	const reader = file.stream().getReader()
+	try {
+		while (true) {
+			const { done, value } = await reader.read()
+			if (done) break
+			const chunk = value as Uint8Array
+			for (let i = 0; i < chunk.length; i++) {
+				if (chunk[i] === CHUNK_NEWLINE) {
+					lineIndex.push(offset + i + 1)
+				}
+			}
+			offset += chunk.length
+		}
+	} finally {
+		reader.releaseLock()
+	}
+
+	// A trailing newline points one past the end (a phantom empty line) — drop it.
+	if (lineIndex.length > 1 && lineIndex[lineIndex.length - 1] === fileSize) {
+		lineIndex.pop()
+	}
+
+	return { lineIndex, lineCount: lineIndex.length }
+}
+
+export interface ReadResult {
+	text: string
+	startLine: number
+	endLine: number
+	totalLines: number
+	truncated: boolean
+	note: string
+}
+
+/**
+ * Read a bounded window of lines, reading only the relevant byte range from disk.
+ * Clamps the window to `maxLines` and the returned text to `maxChars` (protects
+ * against degenerate single-line files). Returns a self-describing pagination note.
+ */
+export async function readFile(
+	entry: FileEntry,
+	opts: {
+		startLine?: number
+		endLine?: number
+		maxLines?: number
+		maxChars?: number
+	} = {}
+): Promise<ReadResult> {
+	const totalLines = entry.lineCount
+	const maxLines = opts.maxLines ?? DEFAULT_READ_MAX_LINES
+	const maxChars = opts.maxChars ?? DEFAULT_READ_MAX_CHARS
+
+	if (totalLines === 0) {
+		return {
+			text: '',
+			startLine: 0,
+			endLine: 0,
+			totalLines: 0,
+			truncated: false,
+			note: 'File is empty.'
+		}
+	}
+
+	let start = opts.startLine ?? 1
+	if (start < 1) start = 1
+	if (start > totalLines) start = totalLines
+
+	const requestedEnd = opts.endLine ?? start + maxLines - 1
+	let end = requestedEnd
+	if (end < start) end = start
+	const cappedByLines = end - start + 1 > maxLines
+	if (cappedByLines) end = start + maxLines - 1
+	if (end > totalLines) end = totalLines
+
+	const byteStart = entry.lineIndex[start - 1]
+	const byteEnd = end < totalLines ? entry.lineIndex[end] : entry.file.size
+	// Bound the decode for newline-sparse files (minified JS, single-line JSONL): the
+	// window can span the whole file, but we only ever return maxChars characters, and
+	// a UTF-8 character is at most 4 bytes — so never materialize more than that.
+	const byteCap = byteStart + maxChars * 4
+	const byteCapped = byteCap < byteEnd
+
+	let text: string
+	try {
+		text = await entry.file.slice(byteStart, byteCapped ? byteCap : byteEnd).text()
+	} catch (e) {
+		throw new FileReadError(entry.name, e instanceof Error ? e.message : String(e))
+	}
+
+	let cappedByChars = byteCapped
+	if (text.length > maxChars) {
+		text = text.slice(0, maxChars)
+		cappedByChars = true
+	}
+
+	// When the char cap truncates the window short of `end`, the text holds fewer lines
+	// than requested — so the note must report the last line actually returned and resume
+	// at the next unread one (otherwise it claims lines it didn't return and skips them).
+	let lastLine = end
+	let resumeAt: number | undefined = end < totalLines ? end + 1 : undefined
+	if (cappedByChars) {
+		const completeLines = (text.match(/\n/g) || []).length
+		if (completeLines >= 1) {
+			// lines start..start+completeLines-1 are whole; the next line was cut mid-content.
+			// Trim that partial line off the returned text so the body matches the note (and
+			// the model doesn't see a line the note says it'll get on the next read).
+			lastLine = start + completeLines - 1
+			resumeAt = start + completeLines
+			text = text.slice(0, text.lastIndexOf('\n') + 1)
+		} else {
+			// the cap fell inside line `start` itself — it can't be returned in full, so
+			// advance past it rather than re-truncating the same line forever.
+			lastLine = start
+			resumeAt = start + 1
+		}
+		if (resumeAt > totalLines) resumeAt = undefined
+	}
+
+	const truncated = cappedByChars || resumeAt !== undefined
+
+	let note = `Showing lines ${start}-${lastLine} of ${totalLines}.`
+	if (cappedByChars) {
+		note += ` Output truncated to ${maxChars} characters (line(s) very long).`
+	}
+	if (resumeAt !== undefined) {
+		note += ` Call read_file again with start_line=${resumeAt} for more.`
+	}
+
+	return { text, startLine: start, endLine: lastLine, totalLines, truncated, note }
+}
+
+/**
+ * Prefix each line of a read window with its absolute 1-based number (`<n>→<content>`),
+ * so the model can quote/reference exact lines. `startLine` is the window's first line.
+ */
+export function numberLines(text: string, startLine: number): string {
+	const lines = text.split('\n')
+	// readFile's window ends with the trailing newline of its last line when more lines
+	// follow, so split yields a phantom empty element — drop it before numbering.
+	if (lines.length > 1 && lines[lines.length - 1] === '') lines.pop()
+	const width = String(startLine + lines.length - 1).length
+	return lines.map((l, i) => `${String(startLine + i).padStart(width)}→${l}`).join('\n')
+}
+
+export interface SearchHit {
+	file: string
+	line: number
+	text: string
+}
+
+export interface SearchResult {
+	hits: SearchHit[]
+	truncated: boolean
+	error?: string
+}
+
+/**
+ * Run a regex across one or more files, streaming each (no full-file load), and
+ * return matching lines with 1-based line numbers. Stops at `maxHits`.
+ */
+export async function searchFiles(
+	entries: FileEntry[],
+	pattern: string,
+	opts: {
+		flags?: string
+		pathFilter?: string
+		maxHits?: number
+		lineScanCap?: number
+		lineEchoCap?: number
+	} = {}
+): Promise<SearchResult> {
+	const maxHits = opts.maxHits ?? DEFAULT_SEARCH_MAX_HITS
+	const lineScanCap = opts.lineScanCap ?? DEFAULT_SEARCH_LINE_SCAN_CAP
+	const lineEchoCap = opts.lineEchoCap ?? DEFAULT_SEARCH_LINE_ECHO_CAP
+
+	let regex: RegExp
+	try {
+		regex = new RegExp(pattern, opts.flags ?? '')
+	} catch (e) {
+		return {
+			hits: [],
+			truncated: false,
+			error: `Invalid regex: ${e instanceof Error ? e.message : String(e)}`
+		}
+	}
+
+	const targets = opts.pathFilter ? entries.filter((e) => e.name === opts.pathFilter) : entries
+	if (opts.pathFilter && targets.length === 0) {
+		return { hits: [], truncated: false, error: `No attached file named "${opts.pathFilter}".` }
+	}
+
+	const hits: SearchHit[] = []
+	let truncated = false
+
+	for (const entry of targets) {
+		if (hits.length >= maxHits) {
+			truncated = true
+			break
+		}
+		try {
+			await streamLines(entry.file, (line, lineNo) => {
+				// Bound backtracking on pathological long lines by only testing a prefix.
+				const scanned = line.length > lineScanCap ? line.slice(0, lineScanCap) : line
+				// `regex` may carry a caller-supplied `g`/`y` flag, which makes `.test()`
+				// stateful (it advances `lastIndex`) — reset so each line matches from 0.
+				regex.lastIndex = 0
+				if (regex.test(scanned)) {
+					hits.push({
+						file: entry.name,
+						line: lineNo,
+						text: line.length > lineEchoCap ? line.slice(0, lineEchoCap) + '…' : line
+					})
+				}
+				return hits.length < maxHits // continue?
+			})
+		} catch (e) {
+			return {
+				hits,
+				truncated,
+				error: `Error reading "${entry.name}": ${e instanceof Error ? e.message : String(e)}`
+			}
+		}
+		if (hits.length >= maxHits) {
+			truncated = true
+			break
+		}
+	}
+
+	return { hits, truncated }
+}
+
+/**
+ * Run `searchFiles` off the main thread. A model-supplied regex can backtrack
+ * catastrophically (e.g. /^(a+)+$/) and `regex.test()` can't be interrupted — so we run
+ * it in a Worker and `terminate()` it on a timeout, keeping the tab responsive instead of
+ * frozen. Falls back to a main-thread search where Workers aren't available (best effort).
+ */
+export function searchFilesInWorker(
+	entries: FileEntry[],
+	pattern: string,
+	opts: { flags?: string; pathFilter?: string; maxHits?: number } = {},
+	timeoutMs = 3000
+): Promise<SearchResult> {
+	let worker: Worker
+	try {
+		worker = new Worker(new URL('./searchWorker.ts', import.meta.url), { type: 'module' })
+	} catch {
+		return searchFiles(entries, pattern, opts)
+	}
+	return new Promise<SearchResult>((resolve) => {
+		const finish = (r: SearchResult) => {
+			clearTimeout(timer)
+			worker.terminate()
+			resolve(r)
+		}
+		const timer = setTimeout(
+			() =>
+				finish({
+					hits: [],
+					truncated: false,
+					error: 'Search timed out — the pattern is too expensive. Try a simpler regex.'
+				}),
+			timeoutMs
+		)
+		worker.onmessage = (e: MessageEvent<SearchResult>) => finish(e.data)
+		worker.onerror = () => {
+			// Worker script failed to load/run — fall back to a main-thread search.
+			clearTimeout(timer)
+			worker.terminate()
+			searchFiles(entries, pattern, opts).then(resolve)
+		}
+		worker.postMessage({
+			files: entries.map((e) => ({ name: e.name, file: e.file })),
+			pattern,
+			flags: opts.flags,
+			pathFilter: opts.pathFilter,
+			maxHits: opts.maxHits
+		})
+	})
+}
+
+export class FileReadError extends Error {
+	constructor(
+		public fileName: string,
+		message: string
+	) {
+		super(message)
+		this.name = 'FileReadError'
+	}
+}
+
+/**
+ * Max characters buffered for a single line while streaming. A newline-less file
+ * (e.g. minified JS) would otherwise accumulate wholesale in `buffer`; past this
+ * cap excess characters are dropped (the line's intact prefix is preserved) —
+ * harmless for search, which only tests/echoes a prefix far smaller than this.
+ */
+const MAX_LINE_BUFFER_CHARS = 1_000_000
+
+/**
+ * Stream a file and invoke `onLine` for each line (1-based). A trailing newline
+ * does not produce an empty final line. `onLine` returns false to stop early.
+ * A trailing '\r' (CRLF) is stripped before the callback. Overlong lines are
+ * passed with at least their first MAX_LINE_BUFFER_CHARS characters intact;
+ * content beyond the cap may be dropped.
+ */
+async function streamLines(
+	file: Blob,
+	onLine: (line: string, lineNo: number) => boolean
+): Promise<void> {
+	const reader = file.stream().getReader()
+	const decoder = new TextDecoder('utf-8')
+	let buffer = ''
+	let lineNo = 0
+	try {
+		while (true) {
+			const { done, value } = await reader.read()
+			if (done) {
+				buffer += decoder.decode()
+				break
+			}
+			buffer += decoder.decode(value as Uint8Array, { stream: true })
+			let start = 0
+			let nlIdx: number
+			while ((nlIdx = buffer.indexOf('\n', start)) !== -1) {
+				let line = buffer.slice(start, nlIdx)
+				if (line.endsWith('\r')) line = line.slice(0, -1)
+				start = nlIdx + 1
+				lineNo++
+				if (!onLine(line, lineNo)) return
+			}
+			buffer = buffer.slice(start)
+			// The remainder holds no newline — cap how much of an overlong line we keep.
+			// Dropped characters are line content only, so newline detection and line
+			// numbering in later chunks are unaffected.
+			if (buffer.length > MAX_LINE_BUFFER_CHARS) {
+				buffer = buffer.slice(0, MAX_LINE_BUFFER_CHARS)
+			}
+		}
+		if (buffer.length > 0) {
+			let line = buffer
+			if (line.endsWith('\r')) line = line.slice(0, -1)
+			lineNo++
+			onLine(line, lineNo)
+		}
+	} finally {
+		reader.releaseLock()
+	}
+}
+
+/**
+ * Sniff the first bytes of a file to decide whether it is text (UTF-8 decodable,
+ * no NUL bytes). Used to reject binary files at attach time.
+ */
+export async function isTextFile(file: Blob, sampleBytes = 8192): Promise<boolean> {
+	if (file.size === 0) return true
+	const slice = file.slice(0, Math.min(sampleBytes, file.size))
+	const buf = new Uint8Array(await slice.arrayBuffer())
+	for (let i = 0; i < buf.length; i++) {
+		if (buf[i] === 0) return false // NUL byte → binary
+	}
+	try {
+		// `fatal` throws on invalid UTF-8. We may cut a multibyte char at the sample
+		// boundary, so only treat it as binary if the error is not at the very end.
+		new TextDecoder('utf-8', { fatal: true }).decode(buf)
+		return true
+	} catch {
+		// Could be a truncated trailing multibyte sequence — retry on a trimmed buffer.
+		if (buf.length >= 4) {
+			try {
+				new TextDecoder('utf-8', { fatal: true }).decode(buf.slice(0, buf.length - 3))
+				return true
+			} catch {
+				return false
+			}
+		}
+		return false
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/files/fileTools.test.ts b/frontend/src/lib/components/copilot/chat/files/fileTools.test.ts
new file mode 100644
index 0000000000..0bd45153af
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/fileTools.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, it, vi } from 'vitest'
+
+// '../shared' transitively imports monaco (CSS) which the node test env can't load.
+// fileTools only needs createToolDef from it (called at module load), so stub it.
+vi.mock('../shared', () => ({
+	createToolDef: (_schema: unknown, name: string, description: string) => ({ name, description })
+}))
+
+import { searchFilesTool } from './fileTools'
+import type { AttachedFile, AttachedFilesStore } from './attachedFiles.svelte'
+
+/** Minimal store stub: searchFilesTool's empty-ready path only reads count/readyFiles/list. */
+function fakeStore(rows: Array<Partial<AttachedFile>>): AttachedFilesStore {
+	const files = rows as AttachedFile[]
+	return {
+		get count() {
+			return files.length
+		},
+		readyFiles: () => files.filter((f) => f.status === 'ready' && !f.isFolderRoot),
+		list: () => files
+	} as unknown as AttachedFilesStore
+}
+
+async function runSearch(store: AttachedFilesStore): Promise<string> {
+	const res = await searchFilesTool.fn({
+		args: { pattern: 'x' },
+		helpers: { attachedFiles: store },
+		toolId: 't',
+		toolCallbacks: { setToolStatus: () => {} }
+	} as any)
+	return res as string
+}
+
+describe('search_files — attachments present but nothing readable', () => {
+	it('reports no searchable text for an empty/binary-only linked folder (only ready placeholders)', async () => {
+		// An empty/all-binary folder leaves a single `ready` placeholder row, filtered out of readyFiles().
+		const msg = await runSearch(fakeStore([{ name: 'proj', status: 'ready', isFolderRoot: true }]))
+		expect(msg).toMatch(/no searchable text files/i)
+		expect(msg).not.toMatch(/indexed/i)
+	})
+
+	it('tells the user to restore access when a restored folder is locked', async () => {
+		const msg = await runSearch(fakeStore([{ name: 'proj', status: 'locked', isFolderRoot: true }]))
+		expect(msg).toMatch(/restore access/i)
+	})
+
+	it('tells the user to re-link when files are unavailable', async () => {
+		const msg = await runSearch(fakeStore([{ name: 'gone.txt', status: 'unavailable' }]))
+		expect(msg).toMatch(/re-link/i)
+	})
+
+	it('still reports indexing while a file is genuinely indexing', async () => {
+		const msg = await runSearch(fakeStore([{ name: 'a.txt', status: 'indexing' }]))
+		expect(msg).toMatch(/still being indexed/i)
+	})
+
+	it('prefers the indexing message when an indexing file coexists with an empty folder', async () => {
+		const msg = await runSearch(
+			fakeStore([
+				{ name: 'proj', status: 'ready', isFolderRoot: true },
+				{ name: 'a.txt', status: 'indexing' }
+			])
+		)
+		expect(msg).toMatch(/still being indexed/i)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/files/fileTools.ts b/frontend/src/lib/components/copilot/chat/files/fileTools.ts
new file mode 100644
index 0000000000..982b858154
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/fileTools.ts
@@ -0,0 +1,226 @@
+/**
+ * AI tools and system-prompt roster for files attached to the GLOBAL chat.
+ *
+ * The model is made aware of attached files via a metadata-only roster appended to
+ * the system message (see `appendAttachedFilesRoster`). Their contents are NEVER
+ * inlined — the model pulls only the slices it needs through these two read-only
+ * tools, which stream from disk via ./fileEngine.
+ */
+import { z } from 'zod'
+import type { ChatCompletionSystemMessageParam } from 'openai/resources/chat/completions.mjs'
+import { createToolDef, type Tool } from '../shared'
+import {
+	readFile,
+	searchFilesInWorker,
+	numberLines,
+	FileReadError,
+	type SearchHit
+} from './fileEngine'
+import type { AttachedFile, AttachedFilesStore } from './attachedFiles.svelte'
+
+/** Slice of the GLOBAL tool helpers that exposes the attached-files store. */
+export interface AttachedFilesHelper {
+	attachedFiles?: AttachedFilesStore
+}
+
+function storeFrom(helpers: unknown): AttachedFilesStore | undefined {
+	return (helpers as AttachedFilesHelper | undefined)?.attachedFiles
+}
+
+/**
+ * For a specifically requested attached file, a message describing why it can't be read /
+ * searched yet (still indexing, locked, unavailable, errored) or that it isn't attached —
+ * or undefined when it's `ready`. Shared by read_file and search_files so both report the
+ * same accurate status instead of search_files claiming a non-ready file isn't attached.
+ */
+function notReadyMessage(store: AttachedFilesStore, file: string): string | undefined {
+	const entry = store.get(file)
+	if (entry?.status === 'ready') return undefined
+	if (entry?.status === 'indexing')
+		return `File "${file}" is still being indexed. Try again shortly.`
+	if (entry?.status === 'locked')
+		return `File "${file}" is locked after a reload. Ask the user to restore access (send a message, or click "Restore access").`
+	if (entry?.status === 'unavailable')
+		return `File "${file}" is no longer available (moved, deleted, or its local copy was evicted). Ask the user to re-link it.`
+	if (entry?.status === 'error')
+		return `File "${file}" failed to load: ${entry.error ?? 'unknown error'}.`
+	const names = store
+		.list()
+		.map((f) => f.name)
+		.join(', ')
+	return `No attached file named "${file}". Attached files: ${names || '(none)'}.`
+}
+
+/**
+ * When attachments exist but none expose a readable target (`readyFiles()` is empty),
+ * explain the actual reason instead of always claiming files are still indexing. Empty
+ * or binary-only linked folders leave only `ready` placeholder rows (filtered out of
+ * `readyFiles`), while a locked/unavailable restore surfaces those statuses on the rows.
+ */
+function noReadyFilesMessage(store: AttachedFilesStore): string {
+	const statuses = new Set(store.list().map((f) => f.status))
+	if (statuses.has('indexing')) return 'Attached files are still being indexed. Try again shortly.'
+	if (statuses.has('locked'))
+		return 'The attached files are locked after a reload. Ask the user to restore access (send a message, or click "Restore access").'
+	if (statuses.has('unavailable'))
+		return 'The attached files are no longer available (moved, deleted, or their local copies were evicted). Ask the user to re-link them.'
+	if (statuses.has('error')) return 'The attached files failed to load.'
+	return 'No searchable text files are attached (a linked folder may be empty or contain only non-text files).'
+}
+
+function humanSize(bytes: number): string {
+	if (bytes < 1024) return `${bytes} B`
+	if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
+	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
+}
+
+const searchFilesSchema = z.object({
+	pattern: z.string().describe('JavaScript regular expression to search for.'),
+	file: z
+		.string()
+		.optional()
+		.describe(
+			'Optional exact filename (as listed under "Attached files") to restrict the search to. Omit to search across all attached files.'
+		),
+	ignore_case: z.boolean().optional().describe('Case-insensitive matching. Defaults to false.')
+})
+
+const searchFilesToolDef = createToolDef(
+	searchFilesSchema,
+	'search_files',
+	'Search the user-attached files with a regular expression and return matching lines with their line numbers. Use this to locate content before reading a specific window with read_file.'
+)
+
+export const searchFilesTool: Tool<{}> = {
+	def: searchFilesToolDef,
+	fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+		const store = storeFrom(helpers)
+		if (!store || store.count === 0) {
+			return 'No files are attached to this conversation.'
+		}
+		const parsed = searchFilesSchema.parse(args)
+		// Validate a specifically requested file against the full store first, so a non-ready
+		// target reports its real status (indexing/locked/…) instead of "not attached".
+		if (parsed.file) {
+			const notReady = notReadyMessage(store, parsed.file)
+			if (notReady) return notReady
+		}
+		const ready = store.readyFiles()
+		if (ready.length === 0) {
+			return noReadyFilesMessage(store)
+		}
+		toolCallbacks.setToolStatus(toolId, {
+			content: `Searching attached files for /${parsed.pattern}/...`
+		})
+
+		// Run in a Worker so a pathological model-supplied regex can't freeze the tab.
+		const result = await searchFilesInWorker(ready, parsed.pattern, {
+			flags: parsed.ignore_case ? 'i' : '',
+			pathFilter: parsed.file
+		})
+		if (result.error) {
+			return `Error: ${result.error}`
+		}
+		const scope = parsed.file ? `"${parsed.file}"` : `${ready.length} file(s)`
+		if (result.hits.length === 0) {
+			return `No matches for /${parsed.pattern}/ in ${scope}.`
+		}
+		const body = result.hits.map((h: SearchHit) => `${h.file}:${h.line}: ${h.text}`).join('\n')
+		const header = `Found ${result.hits.length} match(es) in ${scope}:`
+		const footer = result.truncated
+			? '\n\n(Stopped at the result limit — refine your pattern or pass a `file` to narrow the search.)'
+			: ''
+		return `${header}\n${body}${footer}`
+	}
+}
+
+const readFileSchema = z.object({
+	file: z.string().describe('Exact filename to read, as listed under "Attached files".'),
+	start_line: z.number().int().optional().describe('1-based first line to read. Defaults to 1.'),
+	end_line: z
+		.number()
+		.int()
+		.optional()
+		.describe('1-based last line to read. The window is capped at 200 lines.')
+})
+
+const readFileToolDef = createToolDef(
+	readFileSchema,
+	'read_file',
+	'Read a bounded window of lines from a user-attached file. Returns each line prefixed with its 1-based number (`<n>→<content>`) plus a pagination note. Files are not in context, so use this to inspect their contents.'
+)
+
+export const readFileTool: Tool<{}> = {
+	def: readFileToolDef,
+	fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+		const store = storeFrom(helpers)
+		if (!store || store.count === 0) {
+			return 'No files are attached to this conversation.'
+		}
+		const parsed = readFileSchema.parse(args)
+		const notReady = notReadyMessage(store, parsed.file)
+		if (notReady) return notReady
+		const entry = store.get(parsed.file)!
+		toolCallbacks.setToolStatus(toolId, { content: `Reading "${parsed.file}"...` })
+
+		try {
+			const res = await readFile(entry, {
+				startLine: parsed.start_line,
+				endLine: parsed.end_line
+			})
+			return res.text ? `${res.note}\n\n${numberLines(res.text, res.startLine)}` : res.note
+		} catch (e) {
+			if (e instanceof FileReadError) {
+				return `Could not read "${parsed.file}": ${e.message}. The file may have been moved or deleted since it was attached.`
+			}
+			return `Error reading "${parsed.file}": ${e instanceof Error ? e.message : String(e)}`
+		}
+	}
+}
+
+export const fileTools: Tool<{}>[] = [searchFilesTool, readFileTool]
+
+function rosterLine(f: AttachedFile): string {
+	if (f.status === 'indexing') return `- ${f.name} (indexing…)`
+	if (f.status === 'locked') return `- ${f.name} (locked — needs the user to restore access)`
+	if (f.status === 'unavailable') return `- ${f.name} (unavailable)`
+	if (f.status === 'error') return `- ${f.name} (failed to load)`
+	return `- ${f.name} — ${f.lineCount} lines, ${humanSize(f.size)}`
+}
+
+/** Build the `## Attached files` system-prompt section (metadata only, never content). */
+export function buildAttachedFilesRoster(store: AttachedFilesStore): string {
+	const lines: string[] = []
+	for (const folder of store.folders) {
+		// A locked/unavailable folder has no readable children — one line for the whole folder.
+		if (folder.status === 'locked') {
+			lines.push(`- ${folder.name} (locked — needs the user to restore access)`)
+		} else if (folder.status === 'unavailable') {
+			lines.push(`- ${folder.name} (unavailable)`)
+		} else {
+			lines.push(...folder.files.map(rosterLine))
+		}
+	}
+	lines.push(...store.standalone.map(rosterLine))
+	if (lines.length === 0) return ''
+	return [
+		'## Attached files',
+		'The user has attached the following files to this conversation. Their contents are NOT included here.',
+		'Use the `search_files` tool to find content with a regex, and `read_file` to read a bounded window of lines.',
+		'',
+		lines.join('\n')
+	].join('\n')
+}
+
+/**
+ * Return a copy of the system message with the attached-files roster appended.
+ * Always derives from the provided base so the roster never accumulates across turns.
+ */
+export function appendAttachedFilesRoster(
+	base: ChatCompletionSystemMessageParam,
+	store: AttachedFilesStore
+): ChatCompletionSystemMessageParam {
+	const roster = buildAttachedFilesRoster(store)
+	if (!roster || typeof base.content !== 'string') return base
+	return { ...base, content: `${base.content}\n\n${roster}` }
+}
diff --git a/frontend/src/lib/components/copilot/chat/files/fsAccess.test.ts b/frontend/src/lib/components/copilot/chat/files/fsAccess.test.ts
new file mode 100644
index 0000000000..e4536b6eac
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/fsAccess.test.ts
@@ -0,0 +1,49 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import { hasFileSystemAccess, isIgnoredPath, pickDirectory } from './fsAccess'
+
+describe('hasFileSystemAccess', () => {
+	it('is false when the File System Access API is absent (node / Firefox / Safari today)', () => {
+		// The test env exposes none of showOpenFilePicker / showDirectoryPicker /
+		// DataTransferItem.getAsFileSystemHandle, so the gate must report false.
+		// The positive path (all three present) is exercised via browser verification.
+		expect(hasFileSystemAccess()).toBe(false)
+	})
+})
+
+describe('pickDirectory', () => {
+	afterEach(() => {
+		delete (window as { showDirectoryPicker?: unknown }).showDirectoryPicker
+	})
+
+	it('returns undefined when the user dismisses the picker (AbortError)', async () => {
+		;(window as { showDirectoryPicker?: unknown }).showDirectoryPicker = async () => {
+			throw new DOMException('aborted', 'AbortError')
+		}
+		await expect(pickDirectory()).resolves.toBeUndefined()
+	})
+
+	it('rethrows any non-abort failure instead of silently no-oping', async () => {
+		// e.g. a policy that blocks the File System Access API, or a lost user-activation.
+		;(window as { showDirectoryPicker?: unknown }).showDirectoryPicker = async () => {
+			throw new DOMException('blocked by policy', 'SecurityError')
+		}
+		await expect(pickDirectory()).rejects.toThrow(/blocked by policy/)
+	})
+})
+
+describe('isIgnoredPath', () => {
+	it('keeps normal source paths', () => {
+		expect(isIgnoredPath('myproj/src/app.ts')).toBe(false)
+		expect(isIgnoredPath('README.md')).toBe(false)
+	})
+	it('skips ignored directories', () => {
+		expect(isIgnoredPath('myproj/node_modules/lib/index.js')).toBe(true)
+		expect(isIgnoredPath('myproj/dist/bundle.js')).toBe(true)
+		expect(isIgnoredPath('a/target/x')).toBe(true)
+	})
+	it('skips dotfiles and dotdirs', () => {
+		expect(isIgnoredPath('myproj/.env')).toBe(true)
+		expect(isIgnoredPath('myproj/.git/config')).toBe(true)
+		expect(isIgnoredPath('.DS_Store')).toBe(true)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/files/fsAccess.ts b/frontend/src/lib/components/copilot/chat/files/fsAccess.ts
new file mode 100644
index 0000000000..2c741c0988
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/fsAccess.ts
@@ -0,0 +1,192 @@
+/**
+ * Thin wrappers over the File System Access API, used when available so linked
+ * files/folders can be re-read live after a reload (re-grantable handles).
+ * Capability is feature-detected (never browser-sniffed): the day Firefox/Safari
+ * ship the API, the handle path lights up automatically.
+ */
+const IGNORED_DIRS = new Set([
+	'node_modules',
+	'dist',
+	'build',
+	'out',
+	'target',
+	'vendor',
+	'coverage',
+	'__pycache__',
+	'.git',
+	'.svelte-kit',
+	'.next',
+	'.nuxt',
+	'.venv',
+	'venv',
+	'.idea',
+	'.vscode',
+	'.turbo',
+	'.cache'
+])
+
+function isIgnoredSegment(name: string): boolean {
+	return name.startsWith('.') || IGNORED_DIRS.has(name)
+}
+
+/** True if any segment of a relative path is a dotfile/dotdir or an ignored directory. */
+export function isIgnoredPath(path: string): boolean {
+	return path.split('/').some(isIgnoredSegment)
+}
+
+type FSWindow = Window & {
+	showDirectoryPicker?: (opts?: {
+		mode?: 'read' | 'readwrite'
+	}) => Promise<FileSystemDirectoryHandle>
+}
+
+type FSDataTransferItem = DataTransferItem & {
+	getAsFileSystemHandle?: () => Promise<FileSystemHandle | null>
+}
+
+/**
+ * True when the File System Access API needed for FOLDER linking is usable:
+ * the directory picker plus drag-drop handles. (Files never use the API — they're
+ * always snapshotted — so showOpenFilePicker is intentionally not required.)
+ */
+export function hasFileSystemAccess(): boolean {
+	return (
+		typeof window !== 'undefined' &&
+		'showDirectoryPicker' in window &&
+		typeof DataTransferItem !== 'undefined' &&
+		'getAsFileSystemHandle' in DataTransferItem.prototype
+	)
+}
+
+/**
+ * Open the directory picker. Returns undefined if the user dismisses it.
+ * Any other failure (a policy that blocks the File System Access API, a lost
+ * user-activation, etc.) is rethrown — swallowing it makes the picker silently
+ * never open, which is indistinguishable from a no-op and impossible to debug.
+ */
+export async function pickDirectory(): Promise<FileSystemDirectoryHandle | undefined> {
+	const w = window as FSWindow
+	if (!w.showDirectoryPicker) return undefined
+	try {
+		return await w.showDirectoryPicker({ mode: 'read' })
+	} catch (e) {
+		// AbortError means the user dismissed the dialog (and, under browser automation,
+		// that CDP intercepted the chooser) — a no-op, not a failure.
+		if (e instanceof DOMException && e.name === 'AbortError') return undefined
+		throw e
+	}
+}
+
+/**
+ * Resolve File System Access handles from a drop's items. The `getAsFileSystemHandle`
+ * calls are kicked off synchronously (items are only valid during the drop event);
+ * the returned promise resolves the handles.
+ */
+export function handlesFromDataTransfer(dt: DataTransfer): Promise<FileSystemHandle[]> {
+	const pending = Array.from(dt.items)
+		.filter((it) => it.kind === 'file')
+		.map((it) => (it as FSDataTransferItem).getAsFileSystemHandle?.() ?? Promise.resolve(null))
+	return Promise.all(pending).then((handles) => handles.filter((h): h is FileSystemHandle => !!h))
+}
+
+export function isFileHandle(h: FileSystemHandle): h is FileSystemFileHandle {
+	return h.kind === 'file'
+}
+export function isDirectoryHandle(h: FileSystemHandle): h is FileSystemDirectoryHandle {
+	return h.kind === 'directory'
+}
+
+/**
+ * Recursively read a directory handle into a flat list of files with relative paths,
+ * skipping junk (dotfiles/dotdirs, node_modules, …). No file-count cap — the browser's
+ * memory/quota are the only limit. Used on link and on live re-enumeration after a reload.
+ */
+export async function enumerateDir(
+	dir: FileSystemDirectoryHandle
+): Promise<{ file: File; path: string }[]> {
+	const out: { file: File; path: string }[] = []
+
+	async function walk(handle: FileSystemDirectoryHandle, prefix: string): Promise<void> {
+		// @ts-ignore - values() is an async iterator in the File System Access API
+		for await (const entry of handle.values() as AsyncIterable<FileSystemHandle>) {
+			const path = `${prefix}/${entry.name}`
+			if (isIgnoredPath(path)) continue
+			if (isFileHandle(entry)) {
+				out.push({ file: await entry.getFile(), path })
+			} else if (isDirectoryHandle(entry)) {
+				await walk(entry, path)
+			}
+		}
+	}
+
+	await walk(dir, dir.name)
+	return out
+}
+
+/**
+ * Recursively read dropped files AND folders via the legacy `webkitGetAsEntry` API —
+ * the fallback for browsers without the File System Access API (Firefox/Safari). Folder
+ * contents are snapshotted into the browser (no live handle). Each result `path` is
+ * folder-relative (`folder/sub/file` for a dropped folder, bare name for a loose file),
+ * junk paths skipped, no file-count cap.
+ *
+ * `webkitGetAsEntry()` is only valid synchronously during the drop event, so this MUST be
+ * called from the drop handler — its `.map(...)` runs before the first `await`, capturing
+ * the entries while the items are still live.
+ */
+export async function readDroppedEntries(
+	items: DataTransferItem[]
+): Promise<{ file: File; path: string }[]> {
+	const roots = items
+		.map((it) => it.webkitGetAsEntry?.() ?? null)
+		.filter((e): e is FileSystemEntry => !!e)
+	const out: { file: File; path: string }[] = []
+	for (const root of roots) await walkDropEntry(root, out)
+	return out
+}
+
+async function walkDropEntry(
+	entry: FileSystemEntry,
+	out: { file: File; path: string }[]
+): Promise<void> {
+	const path = entry.fullPath.replace(/^\//, '')
+	if (isIgnoredPath(path)) return
+	if (entry.isFile) {
+		const fileEntry = entry as FileSystemFileEntry
+		const file = await new Promise<File>((res, rej) => fileEntry.file(res, rej))
+		out.push({ file, path })
+	} else if (entry.isDirectory) {
+		const reader = (entry as FileSystemDirectoryEntry).createReader()
+		// readEntries yields in batches and returns [] once exhausted — loop until empty.
+		while (true) {
+			const batch = await new Promise<FileSystemEntry[]>((res, rej) => reader.readEntries(res, rej))
+			if (batch.length === 0) break
+			for (const child of batch) await walkDropEntry(child, out)
+		}
+	}
+}
+
+/** queryPermission without a user gesture; 'granted' | 'prompt' | 'denied'. Never rejects. */
+export async function queryReadPermission(handle: FileSystemHandle): Promise<PermissionState> {
+	try {
+		// @ts-ignore - queryPermission is part of the File System Access API
+		return (await handle.queryPermission?.({ mode: 'read' })) ?? 'prompt'
+	} catch {
+		return 'prompt'
+	}
+}
+
+/**
+ * requestPermission — MUST be called within a user gesture. Never rejects: the spec
+ * rejects with SecurityError when user activation is missing (e.g. a second prompt
+ * after the first consumed the gesture) — that maps to 'denied' here so callers can
+ * treat it as "still locked" instead of blowing up the send path.
+ */
+export async function requestReadPermission(handle: FileSystemHandle): Promise<PermissionState> {
+	try {
+		// @ts-ignore - requestPermission is part of the File System Access API
+		return (await handle.requestPermission?.({ mode: 'read' })) ?? 'denied'
+	} catch {
+		return 'denied'
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/files/searchWorker.ts b/frontend/src/lib/components/copilot/chat/files/searchWorker.ts
new file mode 100644
index 0000000000..68960801da
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/files/searchWorker.ts
@@ -0,0 +1,38 @@
+/**
+ * Web Worker that runs `search_files` off the main thread.
+ *
+ * The regex is model-supplied and `RegExp.prototype.test()` can't be interrupted, so a
+ * catastrophic-backtracking pattern (e.g. /^(a+)+$/) would otherwise hang the whole tab.
+ * Running it here lets the caller `terminate()` this worker on a timeout instead. The
+ * matching itself reuses `searchFiles` from the engine (single source of truth).
+ */
+import { searchFiles, type FileEntry } from './fileEngine'
+
+interface SearchRequest {
+	files: { name: string; file: Blob }[]
+	pattern: string
+	flags?: string
+	pathFilter?: string
+	maxHits?: number
+}
+
+self.onmessage = async (e: MessageEvent<SearchRequest>) => {
+	const { files, pattern, flags, pathFilter, maxHits } = e.data
+	// searchFiles only reads `name` + `file` (it streams); the index fields are unused here.
+	const entries: FileEntry[] = files.map((f) => ({
+		name: f.name,
+		file: f.file,
+		lineIndex: [],
+		lineCount: 0
+	}))
+	try {
+		const result = await searchFiles(entries, pattern, { flags, pathFilter, maxHits })
+		;(self as unknown as Worker).postMessage(result)
+	} catch (err) {
+		;(self as unknown as Worker).postMessage({
+			hits: [],
+			truncated: false,
+			error: err instanceof Error ? err.message : String(err)
+		})
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte b/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
index 37db9a90ba..b2496bbcda 100644
--- a/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
+++ b/frontend/src/lib/components/copilot/chat/flow/FlowAIChat.svelte
@@ -135,7 +135,8 @@
 			await acceptPendingFlowEditsIfEnabled()
 		},
 		getFlowInputsSchema: async () => {
-			return flowStore.val.schema ?? {}
+			const s = flowStore.val.schema ?? {}
+			return { type: 'object', properties: {}, required: [], ...s }
 		},
 
 		updateExprsToSet: (id: string, inputTransforms: Record<string, InputTransform>) => {
diff --git a/frontend/src/lib/components/copilot/chat/flow/openFlow.json b/frontend/src/lib/components/copilot/chat/flow/openFlow.json
index 0309aeaf91..c7ede4c0b5 100644
--- a/frontend/src/lib/components/copilot/chat/flow/openFlow.json
+++ b/frontend/src/lib/components/copilot/chat/flow/openFlow.json
@@ -1 +1 @@
-{"openapi":"3.0.3","info":{"version":"1.716.0","title":"OpenFlow Spec","contact":{"name":"Ruben Fiszel","email":"ruben@windmill.dev","url":"https://windmill.dev"},"license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0.html"}},"paths":{},"externalDocs":{"description":"documentation portal","url":"https://windmill.dev"},"components":{"schemas":{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \"yellow\", \"#ffff00\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution — modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type"}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type"}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind"}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type"}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type"}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw",null]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw",null]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}]},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}}}
\ No newline at end of file
+{"openapi":"3.0.3","info":{"version":"1.716.0","title":"OpenFlow Spec","contact":{"name":"Ruben Fiszel","email":"ruben@windmill.dev","url":"https://windmill.dev"},"license":{"name":"Apache 2.0","url":"https://www.apache.org/licenses/LICENSE-2.0.html"}},"paths":{},"externalDocs":{"description":"documentation portal","url":"https://windmill.dev"},"components":{"schemas":{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \"yellow\", \"#ffff00\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution — modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type"}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type"}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind"}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type"}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type"}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw",null]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw",null]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}]},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}}}
\ No newline at end of file
diff --git a/frontend/src/lib/components/copilot/chat/flow/openFlowZod.gen.ts b/frontend/src/lib/components/copilot/chat/flow/openFlowZod.gen.ts
index 21e6735ab1..3e0b8fcf69 100644
--- a/frontend/src/lib/components/copilot/chat/flow/openFlowZod.gen.ts
+++ b/frontend/src/lib/components/copilot/chat/flow/openFlowZod.gen.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-export const flowModuleValueSchema = z.discriminatedUnion("type", [z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "content": z.string().describe("The script source code. Should export a 'main' function"), "language": z.enum(["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]).describe("Programming language for this script"), "path": z.string().describe("Optional path for saving this script").optional(), "lock": z.string().describe("Lock file content for dependencies").optional(), "type": z.literal("rawscript"), "tag": z.string().describe("Worker group tag for execution routing").optional(), "concurrent_limit": z.number().describe("Maximum concurrent executions of this script").optional(), "concurrency_time_window_s": z.number().describe("Time window for concurrent_limit").optional(), "custom_concurrency_key": z.string().describe("Custom key for grouping concurrent executions").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional(), "assets": z.array(z.object({ "path": z.string().describe("Path to the asset"), "kind": z.enum(["s3object","resource","ducklake","datatable","volume"]).describe("Type of asset"), "access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Access level for this asset").optional(), "alt_access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Alternative access level").optional() })).describe("External resources this script accesses (S3 objects, resources, etc.)").optional() }).describe("Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "path": z.string().describe("Path to the script in the workspace (e.g., 'f/scripts/send_email')"), "hash": z.string().describe("Optional specific version hash of the script to use").optional(), "type": z.literal("script"), "tag_override": z.string().describe("Override the script's default worker group tag").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional() }).describe("Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments"), "path": z.string().describe("Path to the flow in the workspace (e.g., 'f/flows/process_user')"), "type": z.literal("flow") }).describe("Reference to an existing flow by path. Use this to call another flow as a subflow"), z.object({ "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'"), "iterator": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("forloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations"), z.object({ "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute in each iteration. Use stop_after_if to control when the loop ends"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("whileloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (use with caution in while loops)").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch condition").optional(), "expr": z.string().describe("JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"), "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute if this branch's expr is true") })).describe("Array of branches to evaluate in order. The first branch with expr evaluating to true executes"), "default": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute if no branch expressions match"), "type": z.literal("branchone") }).describe("Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch's purpose").optional(), "skip_failure": z.boolean().describe("If true, failure in this branch doesn't fail the entire flow").optional(), "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute in this branch") })).describe("Array of branches that all execute (either in parallel or sequentially)"), "type": z.literal("branchall"), "parallel": z.boolean().describe("If true, all branches execute concurrently. If false, they execute sequentially").optional() }).describe("Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently"), z.object({ "type": z.literal("identity"), "flow": z.boolean().describe("If true, marks this as a flow identity (special handling)").optional() }).describe("Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder"), z.object({ "input_transforms": z.object({ "provider": z.discriminatedUnion("type", [z.object({ "value": z.object({ "kind": z.enum(["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]).describe("Supported AI provider types"), "resource": z.string().describe("Resource reference in format '$res:{resource_path}' pointing to provider credentials"), "model": z.string().describe("Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')") }).describe("Complete AI provider configuration with resource reference and model selection"), "type": z.literal("static") }).describe("Static provider configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined"), "output_type": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"), "user_message": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."), "system_prompt": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("System instructions that guide the AI's behavior, persona, and response style. Optional.").optional(), "streaming": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n").optional(), "memory": z.discriminatedUnion("type", [z.object({ "value": z.discriminatedUnion("kind", [z.object({ "kind": z.literal("off") }).describe("No conversation memory/context"), z.object({ "kind": z.literal("auto"), "context_length": z.number().int().describe("Maximum number of messages to retain in context").optional(), "memory_id": z.string().describe("Identifier for persistent memory across agent invocations").optional() }).describe("Automatic context management"), z.object({ "kind": z.literal("manual"), "messages": z.array(z.object({ "role": z.enum(["user","assistant","system"]), "content": z.string() }).describe("A single message in conversation history")) }).describe("Explicit message history")]).describe("Conversation memory configuration"), "type": z.literal("static") }).describe("Static memory configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined").optional(), "output_schema": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n").optional(), "user_attachments": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n").optional(), "max_completion_tokens": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n").optional(), "temperature": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n").optional(), "max_iterations": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n").optional() }).describe("Input parameters for the AI agent mapped to their values"), "tools": z.array(z.object({ "id": z.string().describe("Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"), "summary": z.string().describe("Short description of what this tool does (shown to the AI)").optional(), "value": z.any().superRefine((x, ctx) => {
+export const flowModuleValueSchema = z.discriminatedUnion("type", [z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "content": z.string().describe("The script source code. Should export a 'main' function"), "language": z.enum(["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]).describe("Programming language for this script"), "path": z.string().describe("Optional path for saving this script").optional(), "lock": z.string().describe("Lock file content for dependencies").optional(), "type": z.literal("rawscript"), "tag": z.string().describe("Worker group tag for execution routing").optional(), "concurrent_limit": z.number().describe("Maximum concurrent executions of this script").optional(), "concurrency_time_window_s": z.number().describe("Time window for concurrent_limit").optional(), "custom_concurrency_key": z.string().describe("Custom key for grouping concurrent executions").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional(), "assets": z.array(z.object({ "path": z.string().describe("Path to the asset"), "kind": z.enum(["s3object","resource","ducklake","datatable","volume"]).describe("Type of asset"), "access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Access level for this asset").optional(), "alt_access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Alternative access level").optional() })).describe("External resources this script accesses (S3 objects, resources, etc.)").optional() }).describe("Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "path": z.string().describe("Path to the script in the workspace (e.g., 'f/scripts/send_email')"), "hash": z.string().describe("Optional specific version hash of the script to use").optional(), "type": z.literal("script"), "tag_override": z.string().describe("Override the script's default worker group tag").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional() }).describe("Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments"), "path": z.string().describe("Path to the flow in the workspace (e.g., 'f/flows/process_user')"), "type": z.literal("flow") }).describe("Reference to an existing flow by path. Use this to call another flow as a subflow"), z.object({ "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'"), "iterator": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("forloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations"), z.object({ "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute in each iteration. Use stop_after_if to control when the loop ends"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("whileloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (use with caution in while loops)").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch condition").optional(), "expr": z.string().describe("JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"), "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute if this branch's expr is true") })).describe("Array of branches to evaluate in order. The first branch with expr evaluating to true executes"), "default": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute if no branch expressions match"), "type": z.literal("branchone") }).describe("Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch's purpose").optional(), "skip_failure": z.boolean().describe("If true, failure in this branch doesn't fail the entire flow").optional(), "modules": z.array(z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.lazy(() => flowModuleValueSchema), "stop_after_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "stop_after_all_iters_if": z.object({ "skip_if_stopped": z.boolean().describe("If true, following steps are skipped when this condition triggers").optional(), "expr": z.string().describe("JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"), "error_message": z.string().nullable().describe("Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.").optional(), "error_include_result": z.boolean().describe("When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false.").optional() }).describe("Early termination condition for a module").optional(), "skip_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'") }).describe("Conditionally skip this step based on previous results or flow inputs").optional(), "sleep": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "cache_ttl": z.number().describe("Cache duration in seconds for this step's results").optional(), "cache_ignore_s3_path": z.boolean().optional(), "timeout": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "delete_after_secs": z.number().int().describe("If set, delete the step's args, result and logs after this many seconds following job completion").optional(), "summary": z.string().describe("Short description of what this step does").optional(), "mock": z.object({ "enabled": z.boolean().describe("If true, return mock value instead of executing").optional(), "return_value": z.any().describe("Value to return when mocked").optional() }).describe("Mock configuration for testing without executing the actual step").optional(), "suspend": z.object({ "required_events": z.number().int().describe("Number of approvals required before continuing").optional(), "timeout": z.number().int().describe("Timeout in seconds before auto-continuing or canceling").optional(), "resume_form": z.object({ "schema": z.record(z.string(), z.any()).describe("JSON Schema for the resume form").optional() }).describe("Form schema for collecting input when resuming").optional(), "user_auth_required": z.boolean().describe("If true, only authenticated users can approve").optional(), "user_groups_required": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "self_approval_disabled": z.boolean().describe("If true, the user who started the flow cannot approve").optional(), "hide_cancel": z.boolean().describe("If true, hide the cancel button on the approval form").optional(), "continue_on_disapprove_timeout": z.boolean().describe("If true, continue flow on timeout instead of canceling").optional() }).describe("Configuration for approval/resume steps that wait for user input").optional(), "priority": z.number().describe("Execution priority for this step (higher numbers run first)").optional(), "continue_on_error": z.boolean().describe("If true, flow continues even if this step fails").optional(), "retry": z.object({ "constant": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "seconds": z.number().int().describe("Seconds to wait between retries").optional() }).describe("Retry with constant delay between attempts").optional(), "exponential": z.object({ "attempts": z.number().int().describe("Number of retry attempts").optional(), "multiplier": z.number().int().describe("Multiplier for exponential backoff").optional(), "seconds": z.number().int().gte(1).describe("Initial delay in seconds").optional(), "random_factor": z.number().int().gte(0).lte(100).describe("Random jitter percentage (0-100) to avoid thundering herd").optional() }).describe("Retry with exponential backoff (delay doubles each time)").optional(), "retry_if": z.object({ "expr": z.string().describe("JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables") }).describe("Conditional retry based on error or result").optional() }).describe("Retry configuration for failed module executions").optional(), "debouncing": z.object({ "debounce_delay_s": z.number().int().describe("Delay in seconds to debounce this step's executions across flow runs").optional(), "debounce_key": z.string().describe("Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>").optional(), "debounce_args_to_accumulate": z.array(z.string()).describe("Array-type arguments to accumulate across debounced executions").optional(), "max_total_debouncing_time": z.number().int().describe("Maximum total time in seconds before forced execution").optional(), "max_total_debounces_amount": z.number().int().describe("Maximum number of debounces before forced execution").optional() }).describe("Debounce configuration for this step (EE only)").optional() }).describe("A single step in a flow. Can be a script, subflow, loop, or branch")).describe("Steps to execute in this branch") })).describe("Array of branches that all execute (either in parallel or sequentially)"), "type": z.literal("branchall"), "parallel": z.boolean().describe("If true, all branches execute concurrently. If false, they execute sequentially").optional() }).describe("Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently"), z.object({ "type": z.literal("identity"), "flow": z.boolean().describe("If true, marks this as a flow identity (special handling)").optional() }).describe("Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder"), z.object({ "input_transforms": z.object({ "provider": z.discriminatedUnion("type", [z.object({ "value": z.object({ "kind": z.enum(["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]).describe("Supported AI provider types"), "resource": z.string().describe("Resource reference in format '$res:{resource_path}' pointing to provider credentials"), "model": z.string().describe("Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')") }).describe("Complete AI provider configuration with resource reference and model selection"), "type": z.literal("static") }).describe("Static provider configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined"), "output_type": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"), "user_message": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."), "system_prompt": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("System instructions that guide the AI's behavior, persona, and response style. Optional.").optional(), "streaming": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n").optional(), "memory": z.discriminatedUnion("type", [z.object({ "value": z.discriminatedUnion("kind", [z.object({ "kind": z.literal("off") }).describe("No conversation memory/context"), z.object({ "kind": z.literal("auto"), "context_length": z.number().int().describe("Maximum number of messages to retain in context").optional(), "memory_id": z.string().describe("Identifier for persistent memory across agent invocations").optional() }).describe("Automatic context management"), z.object({ "kind": z.literal("manual"), "messages": z.array(z.object({ "role": z.enum(["user","assistant","system"]), "content": z.string() }).describe("A single message in conversation history")) }).describe("Explicit message history")]).describe("Conversation memory configuration"), "type": z.literal("static") }).describe("Static memory configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined").optional(), "output_schema": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n").optional(), "user_attachments": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n").optional(), "max_completion_tokens": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n").optional(), "temperature": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n").optional(), "max_iterations": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n").optional() }).describe("Input parameters for the AI agent mapped to their values"), "tools": z.array(z.object({ "id": z.string().describe("Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"), "summary": z.string().describe("Short description of what this tool does (shown to the AI)").optional(), "value": z.any().superRefine((x, ctx) => {
     const schemas = [z.intersection(z.object({ "tool_type": z.literal("flowmodule") }), z.lazy(() => flowModuleValueSchema)).describe("A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module"), z.object({ "tool_type": z.literal("mcp"), "resource_path": z.string().describe("Path to the MCP resource/server configuration"), "include_tools": z.array(z.string()).describe("Whitelist of specific tools to include from this MCP server").optional(), "exclude_tools": z.array(z.string()).describe("Blacklist of tools to exclude from this MCP server").optional() }).describe("Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers"), z.object({ "tool_type": z.literal("websearch") }).describe("A tool implemented as a websearch tool. The AI can call this like any other websearch tool")];
     const errors = schemas.reduce<z.ZodError[]>(
       (errors, schema) =>
@@ -20,7 +20,7 @@ export const flowModuleValueSchema = z.discriminatedUnion("type", [z.object({ "i
   }).describe("The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference") }).describe("A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool")).describe("Array of tools the agent can use. The agent decides which tools to call based on the task"), "type": z.literal("aiagent"), "omit_output_from_conversation": z.boolean().describe("If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled.").default(false), "parallel": z.boolean().describe("If true, the agent can execute multiple tool calls in parallel").optional() }).describe("AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task")]).describe("The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type")
 
 
-export const flowModuleSchema = z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.discriminatedUnion("type", [z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "content": z.string().describe("The script source code. Should export a 'main' function"), "language": z.enum(["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]).describe("Programming language for this script"), "path": z.string().describe("Optional path for saving this script").optional(), "lock": z.string().describe("Lock file content for dependencies").optional(), "type": z.literal("rawscript"), "tag": z.string().describe("Worker group tag for execution routing").optional(), "concurrent_limit": z.number().describe("Maximum concurrent executions of this script").optional(), "concurrency_time_window_s": z.number().describe("Time window for concurrent_limit").optional(), "custom_concurrency_key": z.string().describe("Custom key for grouping concurrent executions").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional(), "assets": z.array(z.object({ "path": z.string().describe("Path to the asset"), "kind": z.enum(["s3object","resource","ducklake","datatable","volume"]).describe("Type of asset"), "access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Access level for this asset").optional(), "alt_access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Alternative access level").optional() })).describe("External resources this script accesses (S3 objects, resources, etc.)").optional() }).describe("Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "path": z.string().describe("Path to the script in the workspace (e.g., 'f/scripts/send_email')"), "hash": z.string().describe("Optional specific version hash of the script to use").optional(), "type": z.literal("script"), "tag_override": z.string().describe("Override the script's default worker group tag").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional() }).describe("Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments"), "path": z.string().describe("Path to the flow in the workspace (e.g., 'f/flows/process_user')"), "type": z.literal("flow") }).describe("Reference to an existing flow by path. Use this to call another flow as a subflow"), z.object({ "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'"), "iterator": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("forloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations"), z.object({ "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute in each iteration. Use stop_after_if to control when the loop ends"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("whileloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (use with caution in while loops)").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch condition").optional(), "expr": z.string().describe("JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"), "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute if this branch's expr is true") })).describe("Array of branches to evaluate in order. The first branch with expr evaluating to true executes"), "default": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute if no branch expressions match"), "type": z.literal("branchone") }).describe("Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch's purpose").optional(), "skip_failure": z.boolean().describe("If true, failure in this branch doesn't fail the entire flow").optional(), "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute in this branch") })).describe("Array of branches that all execute (either in parallel or sequentially)"), "type": z.literal("branchall"), "parallel": z.boolean().describe("If true, all branches execute concurrently. If false, they execute sequentially").optional() }).describe("Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently"), z.object({ "type": z.literal("identity"), "flow": z.boolean().describe("If true, marks this as a flow identity (special handling)").optional() }).describe("Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder"), z.object({ "input_transforms": z.object({ "provider": z.discriminatedUnion("type", [z.object({ "value": z.object({ "kind": z.enum(["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]).describe("Supported AI provider types"), "resource": z.string().describe("Resource reference in format '$res:{resource_path}' pointing to provider credentials"), "model": z.string().describe("Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')") }).describe("Complete AI provider configuration with resource reference and model selection"), "type": z.literal("static") }).describe("Static provider configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined"), "output_type": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"), "user_message": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."), "system_prompt": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("System instructions that guide the AI's behavior, persona, and response style. Optional.").optional(), "streaming": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n").optional(), "memory": z.discriminatedUnion("type", [z.object({ "value": z.discriminatedUnion("kind", [z.object({ "kind": z.literal("off") }).describe("No conversation memory/context"), z.object({ "kind": z.literal("auto"), "context_length": z.number().int().describe("Maximum number of messages to retain in context").optional(), "memory_id": z.string().describe("Identifier for persistent memory across agent invocations").optional() }).describe("Automatic context management"), z.object({ "kind": z.literal("manual"), "messages": z.array(z.object({ "role": z.enum(["user","assistant","system"]), "content": z.string() }).describe("A single message in conversation history")) }).describe("Explicit message history")]).describe("Conversation memory configuration"), "type": z.literal("static") }).describe("Static memory configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined").optional(), "output_schema": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n").optional(), "user_attachments": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n").optional(), "max_completion_tokens": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n").optional(), "temperature": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n").optional(), "max_iterations": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n").optional() }).describe("Input parameters for the AI agent mapped to their values"), "tools": z.array(z.object({ "id": z.string().describe("Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"), "summary": z.string().describe("Short description of what this tool does (shown to the AI)").optional(), "value": z.any().superRefine((x, ctx) => {
+export const flowModuleSchema = z.object({ "id": z.string().describe("Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"), "value": z.discriminatedUnion("type", [z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "content": z.string().describe("The script source code. Should export a 'main' function"), "language": z.enum(["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]).describe("Programming language for this script"), "path": z.string().describe("Optional path for saving this script").optional(), "lock": z.string().describe("Lock file content for dependencies").optional(), "type": z.literal("rawscript"), "tag": z.string().describe("Worker group tag for execution routing").optional(), "concurrent_limit": z.number().describe("Maximum concurrent executions of this script").optional(), "concurrency_time_window_s": z.number().describe("Time window for concurrent_limit").optional(), "custom_concurrency_key": z.string().describe("Custom key for grouping concurrent executions").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional(), "assets": z.array(z.object({ "path": z.string().describe("Path to the asset"), "kind": z.enum(["s3object","resource","ducklake","datatable","volume"]).describe("Type of asset"), "access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Access level for this asset").optional(), "alt_access_type": z.union([z.literal("r"), z.literal("w"), z.literal("rw"), z.literal(null)]).nullable().describe("Alternative access level").optional() })).describe("External resources this script accesses (S3 objects, resources, etc.)").optional() }).describe("Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments"), "path": z.string().describe("Path to the script in the workspace (e.g., 'f/scripts/send_email')"), "hash": z.string().describe("Optional specific version hash of the script to use").optional(), "type": z.literal("script"), "tag_override": z.string().describe("Override the script's default worker group tag").optional(), "is_trigger": z.boolean().describe("If true, this script is a trigger that can start the flow").optional() }).describe("Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code"), z.object({ "input_transforms": z.record(z.string(), z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs")).describe("Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments"), "path": z.string().describe("Path to the flow in the workspace (e.g., 'f/flows/process_user')"), "type": z.literal("flow") }).describe("Reference to an existing flow by path. Use this to call another flow as a subflow"), z.object({ "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'"), "iterator": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("forloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations"), z.object({ "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute in each iteration. Use stop_after_if to control when the loop ends"), "skip_failures": z.boolean().describe("If true, iteration failures don't stop the loop. Failed iterations return null"), "type": z.literal("whileloopflow"), "parallel": z.boolean().describe("If true, iterations run concurrently (use with caution in while loops)").optional(), "parallelism": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").optional(), "squash": z.boolean().optional() }).describe("Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch condition").optional(), "expr": z.string().describe("JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"), "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute if this branch's expr is true") })).describe("Array of branches to evaluate in order. The first branch with expr evaluating to true executes"), "default": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute if no branch expressions match"), "type": z.literal("branchone") }).describe("Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes"), z.object({ "branches": z.array(z.object({ "summary": z.string().describe("Short description of this branch's purpose").optional(), "skip_failure": z.boolean().describe("If true, failure in this branch doesn't fail the entire flow").optional(), "modules": z.array(z.lazy(() => flowModuleSchema)).describe("Steps to execute in this branch") })).describe("Array of branches that all execute (either in parallel or sequentially)"), "type": z.literal("branchall"), "parallel": z.boolean().describe("If true, all branches execute concurrently. If false, they execute sequentially").optional() }).describe("Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently"), z.object({ "type": z.literal("identity"), "flow": z.boolean().describe("If true, marks this as a flow identity (special handling)").optional() }).describe("Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder"), z.object({ "input_transforms": z.object({ "provider": z.discriminatedUnion("type", [z.object({ "value": z.object({ "kind": z.enum(["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]).describe("Supported AI provider types"), "resource": z.string().describe("Resource reference in format '$res:{resource_path}' pointing to provider credentials"), "model": z.string().describe("Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')") }).describe("Complete AI provider configuration with resource reference and model selection"), "type": z.literal("static") }).describe("Static provider configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined"), "output_type": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"), "user_message": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."), "system_prompt": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("System instructions that guide the AI's behavior, persona, and response style. Optional.").optional(), "streaming": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n").optional(), "memory": z.discriminatedUnion("type", [z.object({ "value": z.discriminatedUnion("kind", [z.object({ "kind": z.literal("off") }).describe("No conversation memory/context"), z.object({ "kind": z.literal("auto"), "context_length": z.number().int().describe("Maximum number of messages to retain in context").optional(), "memory_id": z.string().describe("Identifier for persistent memory across agent invocations").optional() }).describe("Automatic context management"), z.object({ "kind": z.literal("manual"), "messages": z.array(z.object({ "role": z.enum(["user","assistant","system"]), "content": z.string() }).describe("A single message in conversation history")) }).describe("Explicit message history")]).describe("Conversation memory configuration"), "type": z.literal("static") }).describe("Static memory configuration passed directly to the AI agent"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined").optional(), "output_schema": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n").optional(), "user_attachments": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n").optional(), "max_completion_tokens": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n").optional(), "temperature": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n").optional(), "max_iterations": z.discriminatedUnion("type", [z.object({ "value": z.any().describe("The static value. For resources, use format '$res:path/to/resource'").optional(), "type": z.literal("static") }).describe("Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'"), z.object({ "expr": z.string().describe("JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"), "type": z.literal("javascript") }).describe("JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value"), z.object({ "type": z.literal("ai") }).describe("Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.")]).describe("Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs").describe("Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n").optional() }).describe("Input parameters for the AI agent mapped to their values"), "tools": z.array(z.object({ "id": z.string().describe("Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"), "summary": z.string().describe("Short description of what this tool does (shown to the AI)").optional(), "value": z.any().superRefine((x, ctx) => {
     const schemas = [z.intersection(z.object({ "tool_type": z.literal("flowmodule") }), z.lazy(() => flowModuleValueSchema)).describe("A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module"), z.object({ "tool_type": z.literal("mcp"), "resource_path": z.string().describe("Path to the MCP resource/server configuration"), "include_tools": z.array(z.string()).describe("Whitelist of specific tools to include from this MCP server").optional(), "exclude_tools": z.array(z.string()).describe("Blacklist of tools to exclude from this MCP server").optional() }).describe("Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers"), z.object({ "tool_type": z.literal("websearch") }).describe("A tool implemented as a websearch tool. The AI can call this like any other websearch tool")];
     const errors = schemas.reduce<z.ZodError[]>(
       (errors, schema) =>
diff --git a/frontend/src/lib/components/copilot/chat/flow/providerKind.test.ts b/frontend/src/lib/components/copilot/chat/flow/providerKind.test.ts
new file mode 100644
index 0000000000..ab520762ec
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/flow/providerKind.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest'
+import { flowModulesSchema } from './openFlowZod.gen'
+
+// Guards against the generated copilot flow Zod schema (openFlowZod.gen.ts)
+// drifting from the AIProviderKind enum in openflow.openapi.yaml. A missing
+// provider kind here silently rejects AI-generated flow edits for that provider
+// in the copilot flow-editing path (validateFlowModules -> flowModulesSchema).
+function aiAgentModuleWithProviderKind(kind: string) {
+	return {
+		id: 'agent',
+		value: {
+			type: 'aiagent',
+			tools: [],
+			input_transforms: {
+				provider: {
+					type: 'static',
+					value: { kind, resource: '$res:u/admin/foundry', model: 'gpt-4o' }
+				},
+				user_message: { type: 'static', value: 'hello' },
+				output_type: { type: 'static', value: 'text' }
+			}
+		}
+	}
+}
+
+describe('copilot flow module validation - AI agent provider kind', () => {
+	it('accepts azure_foundry (and the existing azure_openai baseline)', () => {
+		expect(
+			flowModulesSchema.safeParse([aiAgentModuleWithProviderKind('azure_openai')]).success
+		).toBe(true)
+		expect(
+			flowModulesSchema.safeParse([aiAgentModuleWithProviderKind('azure_foundry')]).success
+		).toBe(true)
+	})
+
+	it('still rejects an unknown provider kind (enum is actually enforced)', () => {
+		expect(
+			flowModulesSchema.safeParse([aiAgentModuleWithProviderKind('not_a_real_provider')]).success
+		).toBe(false)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/global/core.test.ts b/frontend/src/lib/components/copilot/chat/global/core.test.ts
index 50ad2547f0..2438302a00 100644
--- a/frontend/src/lib/components/copilot/chat/global/core.test.ts
+++ b/frontend/src/lib/components/copilot/chat/global/core.test.ts
@@ -36,7 +36,7 @@ const { backendDrafts, serverTimestamps, failingWrites, failingReads } = vi.hois
 	// concurrent writer advancing the row; otherwise empty, so the conflict
 	// branch in `updateDraft` stays inert for every pre-existing test.
 	serverTimestamps: new Map<string, string>(),
-	// Keys whose `updateDraft` / `getDraftForUser` throw a non-404 (network/5xx);
+	// Keys whose `updateDraft` / draft reads throw a non-404 (network/5xx);
 	// only set by the error-handling tests, empty otherwise.
 	failingWrites: new Set<string>(),
 	failingReads: new Set<string>()
@@ -64,6 +64,9 @@ vi.mock('$lib/gen', async () => {
 			getScriptByPath: vi.fn(async () => {
 				throw new Error('getScriptByPath mock not configured')
 			}),
+			getScriptByHash: vi.fn(async () => {
+				throw new Error('getScriptByHash mock not configured')
+			}),
 			queryHubScripts: vi.fn(async () => []),
 			getHubScriptContentByPath: vi.fn(async () => ''),
 			listScripts: vi.fn(async () => [])
@@ -119,6 +122,9 @@ vi.mock('$lib/gen', async () => {
 			getFlowByPath: vi.fn(async () => {
 				throw new Error('getFlowByPath mock not configured')
 			}),
+			getFlowVersion: vi.fn(async () => {
+				throw new Error('getFlowVersion mock not configured')
+			}),
 			getFlowLatestVersion: vi.fn(async () => ({ id: 1 })),
 			listFlows: vi.fn(async () => [])
 		}),
@@ -126,13 +132,17 @@ vi.mock('$lib/gen', async () => {
 			existsSchedule: vi.fn(async () => false),
 			getSchedule: vi.fn(async () => {
 				throw new Error('getSchedule mock not configured')
-			})
+			}),
+			createSchedule: vi.fn(async () => 'created'),
+			updateSchedule: vi.fn(async () => 'updated')
 		}),
 		HttpTriggerService: wrapService(actual.HttpTriggerService, {
 			existsHttpTrigger: vi.fn(async () => false),
 			getHttpTrigger: vi.fn(async () => {
 				throw new Error('getHttpTrigger mock not configured')
-			})
+			}),
+			createHttpTrigger: vi.fn(async () => 'created'),
+			updateHttpTrigger: vi.fn(async () => 'updated')
 		}),
 		AppService: wrapService(actual.AppService, {
 			existsApp: vi.fn(async () => false),
@@ -141,13 +151,18 @@ vi.mock('$lib/gen', async () => {
 			getAppByPath: vi.fn(async () => {
 				throw new Error('getAppByPath mock not configured')
 			}),
+			getAppByVersion: vi.fn(async () => {
+				throw new Error('getAppByVersion mock not configured')
+			}),
 			listApps: vi.fn(async () => [])
 		}),
 		ResourceService: wrapService(actual.ResourceService, {
 			existsResource: vi.fn(async () => false),
 			getResource: vi.fn(async () => {
 				throw new Error('getResource mock not configured')
-			})
+			}),
+			createResource: vi.fn(async () => 'created'),
+			updateResource: vi.fn(async () => 'updated')
 		}),
 		VariableService: wrapService(actual.VariableService, {
 			existsVariable: vi.fn(async () => false),
@@ -157,6 +172,9 @@ vi.mock('$lib/gen', async () => {
 			createVariable: vi.fn(async () => 'created'),
 			updateVariable: vi.fn(async () => 'updated')
 		}),
+		FolderService: wrapService(actual.FolderService, {
+			createFolder: vi.fn(async () => 'created')
+		}),
 		DraftService: wrapService(actual.DraftService, {
 			updateDraft: vi.fn(async ({ kind, path, requestBody }: any) => {
 				const key = `${kind}:${path}`
@@ -178,14 +196,27 @@ vi.mock('$lib/gen', async () => {
 				return { status: 'saved', current_timestamp: '2026-06-15T00:00:00Z' }
 			}),
 			getDraftForUser: vi.fn(async ({ kind, path }: any) => {
+				// The real endpoint rejects drawer kinds up front (drafts for
+				// schedule/trigger/resource/variable are private to their owner) —
+				// mirror it so a caller regressing to this route for those kinds
+				// fails in tests the same way it does against the backend.
+				if (!['script', 'flow', 'app', 'raw_app'].includes(kind))
+					throw Object.assign(new Error('drafts for this item kind are private to their owner'), {
+						status: 404
+					})
 				const key = `${kind}:${path}`
 				if (failingReads.has(key)) throw Object.assign(new Error('server error'), { status: 500 })
-				// 404-shaped (status) like the real ApiError, so the adapter's
-				// narrowed catch treats it as "no draft" rather than re-throwing.
 				if (!backendDrafts.has(key))
 					throw Object.assign(new Error('no draft for that owner at that path'), { status: 404 })
 				return { value: backendDrafts.get(key), created_at: '2026-06-15T00:00:00Z' }
 			}),
+			getOwnDraft: vi.fn(async ({ kind, path }: any) => {
+				const key = `${kind}:${path}`
+				if (failingReads.has(key)) throw Object.assign(new Error('server error'), { status: 500 })
+				// The real endpoint returns 200 with null when the user has no draft.
+				if (!backendDrafts.has(key)) return null
+				return { value: backendDrafts.get(key), created_at: '2026-06-15T00:00:00Z' }
+			}),
 			listDrafts: vi.fn(async () =>
 				Array.from(backendDrafts.entries()).map(([key, value]) => {
 					const idx = key.indexOf(':')
@@ -209,6 +240,13 @@ vi.mock('./rawAppBundlerBridge', () => ({
 	}))
 }))
 
+vi.mock('$lib/infer', async () => ({
+	...(await vi.importActual<any>('$lib/infer')),
+	// Avoid the wasm parser in unit tests: the script deploy path infers the arg
+	// schema but tolerates failure, and these tests don't assert on the schema.
+	inferArgs: vi.fn(async () => {})
+}))
+
 import {
 	globalTools,
 	globalToolsFor,
@@ -233,6 +271,7 @@ import { bundleRawAppDraft } from './rawAppBundlerBridge'
 import {
 	AppService,
 	FlowService,
+	FolderService,
 	HttpTriggerService,
 	JobService,
 	ResourceService,
@@ -240,6 +279,8 @@ import {
 	ScriptService,
 	VariableService
 } from '$lib/gen'
+import { userStore } from '$lib/stores'
+import { get } from 'svelte/store'
 import type { Tool, ToolCallbacks } from '../shared'
 
 const WORKSPACE = 'global-core-test'
@@ -605,6 +646,178 @@ describe('global AI tools', () => {
 		expect(VariableService.updateVariable).not.toHaveBeenCalled()
 	})
 
+	it('deploys every field of a script draft (not just content/summary)', async () => {
+		// The deploy delegates to the shared deployer, which reads the full persisted
+		// draft via getScriptByPath(getDraft) and deploys all of it. Config fields
+		// (tag/priority/schema/description/concurrency) were previously dropped,
+		// sourced from the deployed version instead.
+		seedBackendDraft(
+			'script',
+			'f/scripts/full',
+			{ path: 'f/scripts/full', content: 'export async function main() {}', language: 'bun' },
+			{ workspace: WORKSPACE }
+		)
+		vi.mocked(ScriptService.getScriptByPath).mockResolvedValueOnce({
+			hash: 1234,
+			path: 'f/scripts/full',
+			summary: 'Full script',
+			description: 'desc',
+			content: 'export async function main() {}',
+			schema: { foo: 'bar' },
+			language: 'bun',
+			kind: 'script',
+			tag: 'custom-tag',
+			priority: 7,
+			concurrent_limit: 3,
+			draft_only: true
+		} as any)
+
+		await callGlobalTool('deploy_workspace_item', { type: 'script', path: 'f/scripts/full' })
+
+		expect(ScriptService.createScript).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({
+				path: 'f/scripts/full',
+				content: 'export async function main() {}',
+				summary: 'Full script',
+				description: 'desc',
+				schema: { foo: 'bar' },
+				language: 'bun',
+				tag: 'custom-tag',
+				priority: 7,
+				concurrent_limit: 3,
+				parent_hash: 1234
+			})
+		})
+		// Editor-only / server-managed draft keys must not leak into the deploy body.
+		const calls = vi.mocked(ScriptService.createScript).mock.calls
+		const body = calls[calls.length - 1][0].requestBody as any
+		expect(body.draft_only).toBeUndefined()
+	})
+
+	it('deploys every config field of a flow draft via createFlow', async () => {
+		seedBackendDraft(
+			'flow',
+			'f/flows/full',
+			{ summary: 'Full flow', description: 'flow desc', value: { modules: [] }, schema: {} },
+			{ workspace: WORKSPACE }
+		)
+		vi.mocked(FlowService.getFlowByPath).mockResolvedValueOnce({
+			path: 'f/flows/full',
+			summary: 'Full flow',
+			description: 'flow desc',
+			value: { modules: [] },
+			schema: { x: 1 },
+			tag: 'flow-tag',
+			dedicated_worker: true
+		} as any)
+
+		await callGlobalTool('deploy_workspace_item', { type: 'flow', path: 'f/flows/full' })
+
+		// No deployed flow row (existsFlowByPath defaults to false) → create.
+		expect(FlowService.createFlow).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({
+				path: 'f/flows/full',
+				summary: 'Full flow',
+				description: 'flow desc',
+				value: { modules: [] },
+				schema: { x: 1 },
+				tag: 'flow-tag',
+				dedicated_worker: true
+			})
+		})
+		expect(FlowService.updateFlow).not.toHaveBeenCalled()
+	})
+
+	it('deploys an editor draft_only script at its chosen path, not its synthetic storage key', async () => {
+		// A new script created in the editor lives at a synthetic `u/{user}/draft_{uuid}`
+		// storage key while its chosen path is in the draft value. The chat addresses
+		// it by the chosen (display) path; deploy must resolve to the storage key so the
+		// shared deployer can read the draft via getScriptByPath, then deploy at the
+		// chosen path. Reading at the chosen path would 404.
+		const storageKey = 'u/admin/draft_abc123'
+		const chosenPath = 'f/team/chosen_path'
+		seedBackendDraft(
+			'script',
+			storageKey,
+			{
+				path: chosenPath,
+				summary: 'New script',
+				description: '',
+				content: 'export async function main() {}',
+				schema: {},
+				is_template: false,
+				language: 'bun',
+				kind: 'script'
+			},
+			{ workspace: WORKSPACE }
+		)
+		UserDraft.setLiveEditorDraft({
+			workspace: WORKSPACE,
+			itemKind: 'script',
+			storagePath: storageKey,
+			effectivePath: chosenPath
+		})
+		vi.mocked(ScriptService.getScriptByPath).mockResolvedValueOnce({
+			path: chosenPath,
+			summary: 'New script',
+			description: '',
+			content: 'export async function main() {}',
+			schema: {},
+			language: 'bun',
+			kind: 'script'
+		} as any)
+
+		const flushSpy = vi.spyOn(UserDraftDbSyncer, 'flush')
+
+		await callGlobalTool('deploy_workspace_item', { type: 'script', path: chosenPath })
+
+		// Any pending editor autosave is flushed at the storage key before delegating,
+		// so the shared deployer reads the latest value, not a stale persisted draft.
+		expect(flushSpy).toHaveBeenCalledWith(
+			expect.objectContaining({ workspace: WORKSPACE, itemKind: 'script', path: storageKey })
+		)
+		// The draft is read at the STORAGE key (the chosen path would 404)…
+		expect(ScriptService.getScriptByPath).toHaveBeenCalledWith(
+			expect.objectContaining({ workspace: WORKSPACE, path: storageKey, getDraft: true })
+		)
+		// …and deployed at the chosen path.
+		expect(ScriptService.createScript).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({ path: chosenPath })
+		})
+	})
+
+	it('aborts deploy when the pre-deploy draft flush hit a conflict', async () => {
+		// flush() resolves even when the save recorded a conflict; deploy must abort
+		// rather than publish the stale persisted draft.
+		seedBackendDraft(
+			'script',
+			'f/scripts/conflicted',
+			{
+				path: 'f/scripts/conflicted',
+				summary: '',
+				description: '',
+				content: 'export async function main() {}',
+				schema: {},
+				is_template: false,
+				language: 'bun',
+				kind: 'script'
+			},
+			{ workspace: WORKSPACE }
+		)
+		const conflictSpy = vi
+			.spyOn(UserDraftDbSyncer, 'getConflict')
+			.mockReturnValue({ conflict: { serverTimestamp: '2026', localLastSync: null } } as any)
+
+		await expect(
+			callGlobalTool('deploy_workspace_item', { type: 'script', path: 'f/scripts/conflicted' })
+		).rejects.toThrow(/conflicting/)
+		expect(ScriptService.createScript).not.toHaveBeenCalled()
+		conflictSpy.mockRestore()
+	})
+
 	it('writes script drafts into UserDraft', async () => {
 		const content = 'export async function main() {\n\treturn "hello"\n}'
 
@@ -969,6 +1182,170 @@ describe('global AI tools', () => {
 		expect(draft).not.toHaveProperty('override')
 	})
 
+	// Schedule drafts (like all drawer kinds) are private to their owner, so the
+	// cross-user draft route 404s on them. Reading them back must go through the
+	// own-draft route, else a freshly written schedule draft is listed but can
+	// never be read or deployed.
+	it('reads and deploys a schedule draft written by the chat', async () => {
+		await callGlobalTool('write_schedule', {
+			path: 'u/admin/test_schedule_greet',
+			schedule: '0 0 9 * * *',
+			timezone: 'UTC',
+			script_path: 'f/scripts/greet',
+			is_flow: false,
+			args: {}
+		})
+
+		const readRaw = await callGlobalTool('read_workspace_item', {
+			type: 'schedule',
+			path: 'u/admin/test_schedule_greet'
+		})
+		expect(JSON.parse(readRaw)).toMatchObject({
+			type: 'schedule',
+			path: 'u/admin/test_schedule_greet',
+			isDraft: true
+		})
+
+		await callGlobalTool('deploy_workspace_item', {
+			type: 'schedule',
+			path: 'u/admin/test_schedule_greet'
+		})
+		expect(ScheduleService.createSchedule).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({
+				path: 'u/admin/test_schedule_greet',
+				schedule: '0 0 9 * * *',
+				script_path: 'f/scripts/greet'
+			})
+		})
+		// The draft is consumed by the deploy.
+		expect(
+			getBackendDraft('trigger_schedule', 'u/admin/test_schedule_greet', {
+				workspace: WORKSPACE
+			})
+		).toBeUndefined()
+	})
+
+	// Same private-owner read path as schedules, for the trigger drawer kinds.
+	it('reads and deploys a trigger draft written by the chat', async () => {
+		await callGlobalTool('write_trigger', {
+			kind: 'http',
+			config: {
+				path: 'u/admin/fresh_route',
+				script_path: 'f/scripts/handler',
+				is_flow: false,
+				route_path: 'api/fresh',
+				http_method: 'get',
+				authentication_method: 'none',
+				is_static_website: false
+			}
+		})
+
+		const readRaw = await callGlobalTool('read_workspace_item', {
+			type: 'trigger',
+			trigger_kind: 'http',
+			path: 'u/admin/fresh_route'
+		})
+		expect(JSON.parse(readRaw)).toMatchObject({
+			type: 'trigger',
+			triggerKind: 'http',
+			path: 'u/admin/fresh_route',
+			isDraft: true
+		})
+
+		await callGlobalTool('deploy_workspace_item', {
+			type: 'trigger',
+			trigger_kind: 'http',
+			path: 'u/admin/fresh_route'
+		})
+		expect(HttpTriggerService.createHttpTrigger).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({
+				path: 'u/admin/fresh_route',
+				route_path: 'api/fresh',
+				script_path: 'f/scripts/handler'
+			})
+		})
+		expect(
+			getBackendDraft('trigger_http', 'u/admin/fresh_route', { workspace: WORKSPACE })
+		).toBeUndefined()
+	})
+
+	// Same private-owner read path as schedules, for the resource drawer kind.
+	it('reads and deploys a resource draft written by the chat', async () => {
+		await callGlobalTool('write_resource', {
+			path: 'u/admin/fresh_db',
+			value: { host: 'db.example.com', port: 5432 },
+			resource_type: 'postgresql',
+			description: 'fresh database'
+		})
+
+		const readRaw = await callGlobalTool('read_workspace_item', {
+			type: 'resource',
+			path: 'u/admin/fresh_db'
+		})
+		expect(JSON.parse(readRaw)).toMatchObject({
+			type: 'resource',
+			path: 'u/admin/fresh_db',
+			isDraft: true
+		})
+
+		await callGlobalTool('deploy_workspace_item', {
+			type: 'resource',
+			path: 'u/admin/fresh_db'
+		})
+		expect(ResourceService.createResource).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({
+				path: 'u/admin/fresh_db',
+				resource_type: 'postgresql',
+				value: { host: 'db.example.com', port: 5432 }
+			})
+		})
+		expect(
+			getBackendDraft('resource', 'u/admin/fresh_db', { workspace: WORKSPACE })
+		).toBeUndefined()
+	})
+
+	// Same private-owner read path as schedules, for the variable drawer kind.
+	// Secret variables deploy through the ephemeral in-memory value instead
+	// (see the ephemeral-value tests above); this pins the plain-value cycle.
+	it('reads and deploys a non-secret variable draft written by the chat', async () => {
+		await callGlobalTool('write_variable', {
+			path: 'u/admin/fresh_config',
+			value: 'plain-value',
+			is_secret: false,
+			description: 'fresh config'
+		})
+
+		const readRaw = await callGlobalTool('read_workspace_item', {
+			type: 'variable',
+			path: 'u/admin/fresh_config'
+		})
+		expect(JSON.parse(readRaw)).toMatchObject({
+			type: 'variable',
+			path: 'u/admin/fresh_config',
+			isDraft: true
+		})
+
+		await callGlobalTool('deploy_workspace_item', {
+			type: 'variable',
+			path: 'u/admin/fresh_config'
+		})
+		expect(VariableService.createVariable).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: expect.objectContaining({
+				path: 'u/admin/fresh_config',
+				value: 'plain-value',
+				is_secret: false,
+				description: 'fresh config'
+			})
+		})
+		expect(
+			getBackendDraft('variable', 'u/admin/fresh_config', { workspace: WORKSPACE })
+		).toBeUndefined()
+	})
+
 	it('requires trigger_kind when discarding a trigger draft', async () => {
 		await expect(
 			callGlobalTool('discard_local_draft', {
@@ -1009,6 +1386,260 @@ describe('global AI tools', () => {
 		})
 	})
 
+	describe('stale-draft deploy guard and rebase', () => {
+		// The suite's beforeEach only clears mock calls (not implementations), so
+		// restore the script-service mocks these tests override back to their factory
+		// defaults; otherwise a persistent resolved value leaks into later tests.
+		afterEach(() => {
+			vi.mocked(ScriptService.existsScriptByPath).mockResolvedValue(false)
+			vi.mocked(ScriptService.getScriptByPath).mockImplementation(async () => {
+				throw new Error('getScriptByPath mock not configured')
+			})
+			vi.mocked(ScriptService.getScriptByHash).mockImplementation(async () => {
+				throw new Error('getScriptByHash mock not configured')
+			})
+			vi.mocked(FlowService.existsFlowByPath).mockResolvedValue(false)
+			vi.mocked(FlowService.getFlowByPath).mockImplementation(async () => {
+				throw new Error('getFlowByPath mock not configured')
+			})
+			vi.mocked(FlowService.getFlowVersion).mockImplementation(async () => {
+				throw new Error('getFlowVersion mock not configured')
+			})
+			vi.mocked(FlowService.getFlowLatestVersion).mockResolvedValue({ id: 1 } as any)
+			vi.mocked(AppService.existsApp).mockResolvedValue(false)
+			vi.mocked(AppService.getAppByPath).mockImplementation(async () => {
+				throw new Error('getAppByPath mock not configured')
+			})
+			vi.mocked(AppService.getAppByVersion).mockImplementation(async () => {
+				throw new Error('getAppByVersion mock not configured')
+			})
+		})
+
+		function seedStaleScriptDraft(path: string, parentHash: string, content = 'draft content') {
+			seedBackendDraft('script', path, {
+				path,
+				summary: 's',
+				description: '',
+				content,
+				language: 'bun',
+				kind: 'script',
+				parent_hash: parentHash,
+				schema: {}
+			})
+		}
+
+		function mockDeployedScript(path: string, hash: string, content = 'latest deployed') {
+			vi.mocked(ScriptService.existsScriptByPath).mockResolvedValue(true)
+			vi.mocked(ScriptService.getScriptByPath).mockResolvedValue({
+				path,
+				hash,
+				content,
+				language: 'bun',
+				summary: 's'
+			} as any)
+		}
+
+		it('blocks deploying a script draft started from an older deployed version', async () => {
+			seedStaleScriptDraft('f/scripts/stale', 'base-hash')
+			mockDeployedScript('f/scripts/stale', 'new-hash')
+
+			await expect(
+				callGlobalTool('deploy_workspace_item', { type: 'script', path: 'f/scripts/stale' })
+			).rejects.toThrow(/older deployed version/)
+			expect(ScriptService.createScript).not.toHaveBeenCalled()
+		})
+
+		it('deploys a stale script draft when force is set', async () => {
+			seedStaleScriptDraft('f/scripts/stale', 'base-hash')
+			mockDeployedScript('f/scripts/stale', 'new-hash')
+
+			const result = JSON.parse(
+				await callGlobalTool('deploy_workspace_item', {
+					type: 'script',
+					path: 'f/scripts/stale',
+					force: true
+				})
+			)
+			expect(result.success).toBe(true)
+			expect(ScriptService.createScript).toHaveBeenCalled()
+		})
+
+		it('deploys a script draft that is based on the current deployed head', async () => {
+			seedStaleScriptDraft('f/scripts/fresh', 'head-hash')
+			mockDeployedScript('f/scripts/fresh', 'head-hash')
+
+			const result = JSON.parse(
+				await callGlobalTool('deploy_workspace_item', { type: 'script', path: 'f/scripts/fresh' })
+			)
+			expect(result.success).toBe(true)
+			expect(ScriptService.createScript).toHaveBeenCalled()
+		})
+
+		it('rebase_draft discards the stale draft and surfaces the changes to replay', async () => {
+			seedStaleScriptDraft('f/scripts/stale', 'base-hash', 'base content\nmy added line\n')
+			mockDeployedScript('f/scripts/stale', 'new-hash', 'latest deployed content\n')
+			vi.mocked(ScriptService.getScriptByHash).mockResolvedValue({
+				hash: 'base-hash',
+				content: 'base content\n',
+				language: 'bun'
+			} as any)
+
+			const result = JSON.parse(
+				await callGlobalTool('rebase_draft', { type: 'script', path: 'f/scripts/stale' })
+			)
+			expect(result.success).toBe(true)
+			expect(result.latest_hash).toBe('new-hash')
+			// The diff surfaces the draft's own change over its fork base.
+			expect(result.your_changes).toContain('my added line')
+
+			// The stale draft is discarded (not reset), so a premature deploy fails
+			// cleanly rather than silently shipping the latest unchanged.
+			expect(getBackendDraft('script', 'f/scripts/stale', { workspace: WORKSPACE })).toBeUndefined()
+			await expect(
+				callGlobalTool('deploy_workspace_item', { type: 'script', path: 'f/scripts/stale' })
+			).rejects.toThrow(/No .*draft/)
+			expect(ScriptService.createScript).not.toHaveBeenCalled()
+
+			// Re-applying re-bases onto the current head; the deploy then passes.
+			await callGlobalTool('write_script', {
+				path: 'f/scripts/stale',
+				summary: 's',
+				language: 'bun',
+				content: 'latest deployed content\nmy added line\n'
+			})
+			const deploy = JSON.parse(
+				await callGlobalTool('deploy_workspace_item', { type: 'script', path: 'f/scripts/stale' })
+			)
+			expect(deploy.success).toBe(true)
+			expect(ScriptService.createScript).toHaveBeenCalled()
+		})
+
+		function seedStaleFlowDraft(path: string, versionId: number, modules: any[] = []) {
+			seedBackendDraft('flow', path, {
+				path,
+				summary: 'f',
+				description: '',
+				version_id: versionId,
+				value: { modules },
+				schema: {}
+			})
+		}
+
+		function mockDeployedFlow(path: string, versionId: number) {
+			vi.mocked(FlowService.existsFlowByPath).mockResolvedValue(true)
+			vi.mocked(FlowService.getFlowByPath).mockResolvedValue({
+				path,
+				summary: 'f',
+				version_id: versionId,
+				value: { modules: [] },
+				schema: {}
+			} as any)
+		}
+
+		it('blocks deploying a flow draft started from an older deployed version', async () => {
+			seedStaleFlowDraft('f/flows/stale', 1)
+			mockDeployedFlow('f/flows/stale', 2)
+
+			await expect(
+				callGlobalTool('deploy_workspace_item', { type: 'flow', path: 'f/flows/stale' })
+			).rejects.toThrow(/older deployed version/)
+			expect(FlowService.updateFlow).not.toHaveBeenCalled()
+			expect(FlowService.createFlow).not.toHaveBeenCalled()
+		})
+
+		it('rebase_draft discards the stale flow draft and surfaces the changes to replay', async () => {
+			seedStaleFlowDraft('f/flows/stale', 1, [{ id: 'a', value: { type: 'identity' } }])
+			mockDeployedFlow('f/flows/stale', 2)
+			vi.mocked(FlowService.getFlowVersion).mockResolvedValue({
+				value: { modules: [] }
+			} as any)
+
+			const result = JSON.parse(
+				await callGlobalTool('rebase_draft', { type: 'flow', path: 'f/flows/stale' })
+			)
+			expect(result.success).toBe(true)
+			expect(result.latest_version).toBe(2)
+			expect(result.your_changes).toContain('identity')
+
+			// The stale draft is discarded, so a premature deploy fails cleanly.
+			expect(getBackendDraft('flow', 'f/flows/stale', { workspace: WORKSPACE })).toBeUndefined()
+			await expect(
+				callGlobalTool('deploy_workspace_item', { type: 'flow', path: 'f/flows/stale' })
+			).rejects.toThrow(/No .*draft/)
+			expect(FlowService.updateFlow).not.toHaveBeenCalled()
+		})
+
+		function seedStaleAppDraft(path: string, parentVersion: number, file = 'old') {
+			seedBackendDraft('raw_app', path, {
+				summary: 'a',
+				files: { '/index.tsx': file },
+				runnables: {},
+				data: { tables: [] },
+				parent_version: parentVersion
+			})
+		}
+
+		function mockDeployedApp(path: string, versionId: number, file = 'latest') {
+			vi.mocked(AppService.existsApp).mockResolvedValue(true)
+			vi.mocked(AppService.getAppByPath).mockResolvedValue({
+				path,
+				summary: 'a',
+				versions: [versionId],
+				value: { files: { '/index.tsx': file }, runnables: {}, data: { tables: [] } },
+				policy: { execution_mode: 'publisher' }
+			} as any)
+		}
+
+		it('grafts the fork-base version onto a new app draft and keeps it through the save whitelist', async () => {
+			// No draft yet: the first app edit projects the deployed app into a draft.
+			// This exercises the runtime path types can't catch — the graft in
+			// appSourceToDraftValue AND survival through normalizeAppDraftValue's whitelist.
+			mockDeployedApp('f/apps/fresh', 5)
+
+			await callGlobalTool('write_app_file', {
+				path: 'f/apps/fresh',
+				file_path: '/src/New.tsx',
+				content: 'export default function New() { return null }'
+			})
+
+			const draft = getBackendDraft<any>('raw_app', 'f/apps/fresh', { workspace: WORKSPACE })
+			expect(draft.parent_version).toBe(5)
+		})
+
+		it('blocks deploying an app draft started from an older deployed version', async () => {
+			seedStaleAppDraft('f/apps/stale', 1)
+			mockDeployedApp('f/apps/stale', 2)
+
+			await expect(
+				callGlobalTool('deploy_workspace_item', { type: 'app', path: 'f/apps/stale' })
+			).rejects.toThrow(/older deployed version/)
+			expect(AppService.createAppRaw).not.toHaveBeenCalled()
+			expect(AppService.updateAppRaw).not.toHaveBeenCalled()
+		})
+
+		it('rebase_draft discards the stale app draft and surfaces the changes to replay', async () => {
+			seedStaleAppDraft('f/apps/stale', 1, 'my-change')
+			mockDeployedApp('f/apps/stale', 2, 'latest-deployed')
+			vi.mocked(AppService.getAppByVersion).mockResolvedValue({
+				value: { files: { '/index.tsx': 'base' }, runnables: {}, data: { tables: [] } }
+			} as any)
+
+			const result = JSON.parse(
+				await callGlobalTool('rebase_draft', { type: 'app', path: 'f/apps/stale' })
+			)
+			expect(result.success).toBe(true)
+			expect(result.latest_version).toBe(2)
+			expect(result.your_changes).toContain('my-change')
+
+			// The stale draft is discarded, so a premature deploy fails cleanly.
+			expect(getBackendDraft('raw_app', 'f/apps/stale', { workspace: WORKSPACE })).toBeUndefined()
+			await expect(
+				callGlobalTool('deploy_workspace_item', { type: 'app', path: 'f/apps/stale' })
+			).rejects.toThrow(/No .*draft/)
+			expect(AppService.updateAppRaw).not.toHaveBeenCalled()
+		})
+	})
+
 	it('preserves existing flow metadata and seeds freshness on first flow write', async () => {
 		vi.mocked(FlowService.existsFlowByPath).mockResolvedValueOnce(true)
 		vi.mocked(FlowService.getFlowLatestVersion).mockResolvedValueOnce({ id: 42 } as any)
@@ -1383,9 +2014,7 @@ describe('global AI tools', () => {
 			file_path: '/min.tsx'
 		})
 
-		expect(result).toContain(
-			'lines 1-3 of 3, truncated to the first 50000 of 90002 chars.'
-		)
+		expect(result).toContain('lines 1-3 of 3, truncated to the first 50000 of 90002 chars.')
 		expect(result).toContain('the file is likely minified')
 		expect(result.split('\n\n')[1]).toHaveLength(50_000)
 	})
@@ -1401,9 +2030,7 @@ describe('global AI tools', () => {
 			file_path: '/generated.js'
 		})
 
-		expect(result).toContain(
-			'lines 1-1 of 1, truncated to the first 50000 of 60000 chars.'
-		)
+		expect(result).toContain('lines 1-1 of 1, truncated to the first 50000 of 60000 chars.')
 		expect(result).toContain('re-read with a smaller limit')
 		expect(result.split('\n\n')[1]).toBe('x'.repeat(50_000))
 	})
@@ -1488,8 +2115,7 @@ describe('global AI tools', () => {
 			versions: [5],
 			value: {
 				files: {
-					'/lib/aggregations.ts':
-						'export function computeRevenue(o) {\n  return o.unitPrice\n}\n',
+					'/lib/aggregations.ts': 'export function computeRevenue(o) {\n  return o.unitPrice\n}\n',
 					'/components/SummaryPanel.tsx':
 						'import { computeRevenue } from "../lib/aggregations"\nconst total = computeRevenue(order)\n',
 					'/components/OrdersTable.tsx': 'const r = computeRevenue(row)\n// renders revenue\n',
@@ -1787,6 +2413,9 @@ describe('global AI tools', () => {
 			{ workspace: WORKSPACE }
 		)
 
+		// getAppByPath resolves with no draft_path → deploy at the item's own path.
+		vi.mocked(AppService.getAppByPath).mockResolvedValueOnce({} as any)
+
 		const raw = await callGlobalTool('deploy_workspace_item', {
 			type: 'app',
 			path: 'f/apps/report',
@@ -1832,6 +2461,93 @@ describe('global AI tools', () => {
 		})
 	})
 
+	it('deploys an editor raw app draft at its draft_path, not its synthetic storage key', async () => {
+		// An editor-created draft_only raw app lives at a synthetic storage key with
+		// its chosen path in `draft_path`; deploy must resolve to the storage key,
+		// read draft_path, and create the app there — not at the synthetic key.
+		const storageKey = 'u/admin/draft_app999'
+		const chosenPath = 'f/team/chosen_app'
+		seedBackendDraft(
+			'raw_app',
+			storageKey,
+			{
+				summary: 'Editor app',
+				files: { '/App.tsx': 'export default () => null' },
+				runnables: {},
+				data: { tables: [] },
+				draft_path: chosenPath
+			},
+			{ workspace: WORKSPACE }
+		)
+		UserDraft.setLiveEditorDraft({
+			workspace: WORKSPACE,
+			itemKind: 'raw_app',
+			storagePath: storageKey,
+			effectivePath: chosenPath
+		})
+		vi.mocked(AppService.getAppByPath).mockResolvedValueOnce({
+			draft: { draft_path: chosenPath }
+		} as any)
+		const flushSpy = vi.spyOn(UserDraftDbSyncer, 'flush')
+
+		await callGlobalTool('deploy_workspace_item', { type: 'app', path: chosenPath })
+
+		// The draft is flushed at the storage key before the draft_path read, so a
+		// not-yet-saved editor rename isn't read stale.
+		expect(flushSpy).toHaveBeenCalledWith(
+			expect.objectContaining({ workspace: WORKSPACE, itemKind: 'raw_app', path: storageKey })
+		)
+		// draft_path is read from the backend draft at the storage key…
+		expect(AppService.getAppByPath).toHaveBeenCalledWith(
+			expect.objectContaining({
+				workspace: WORKSPACE,
+				path: storageKey,
+				getDraft: true,
+				rawApp: true
+			})
+		)
+		// …and the app is created at the chosen path, not the synthetic key.
+		expect(AppService.createAppRaw).toHaveBeenCalledWith(
+			expect.objectContaining({
+				formData: expect.objectContaining({
+					app: expect.objectContaining({ path: chosenPath })
+				})
+			})
+		)
+	})
+
+	it('aborts a raw app deploy when the draft_path lookup fails (non-404)', async () => {
+		// A real lookup failure (network/5xx) must abort, not silently fall back to the
+		// storage path and deploy there. Only a 404 justifies the storage-path fallback.
+		seedBackendDraft(
+			'raw_app',
+			'u/admin/draft_appfail',
+			{
+				summary: 'Editor app',
+				files: { '/App.tsx': 'export default () => null' },
+				runnables: {},
+				data: { tables: [] },
+				draft_path: 'f/team/chosen_app'
+			},
+			{ workspace: WORKSPACE }
+		)
+		UserDraft.setLiveEditorDraft({
+			workspace: WORKSPACE,
+			itemKind: 'raw_app',
+			storagePath: 'u/admin/draft_appfail',
+			effectivePath: 'f/team/chosen_app'
+		})
+		vi.mocked(AppService.getAppByPath).mockRejectedValueOnce(
+			Object.assign(new Error('server error'), { status: 500 })
+		)
+
+		await expect(
+			callGlobalTool('deploy_workspace_item', { type: 'app', path: 'f/team/chosen_app' })
+		).rejects.toThrow()
+		expect(AppService.createAppRaw).not.toHaveBeenCalled()
+		expect(AppService.updateAppRaw).not.toHaveBeenCalled()
+	})
+
 	it('deploys an existing raw app draft by bundling files and updating the raw app', async () => {
 		vi.mocked(AppService.existsApp).mockResolvedValueOnce(true)
 		seedBackendDraft(
@@ -1848,6 +2564,8 @@ describe('global AI tools', () => {
 			{ workspace: WORKSPACE }
 		)
 
+		vi.mocked(AppService.getAppByPath).mockResolvedValueOnce({} as any)
+
 		await callGlobalTool('deploy_workspace_item', {
 			type: 'app',
 			path: 'f/apps/report'
@@ -1876,6 +2594,40 @@ describe('global AI tools', () => {
 		expect(getBackendDraft('raw_app', 'f/apps/report', { workspace: WORKSPACE })).toBeUndefined()
 	})
 
+	it('forwards preserve_on_behalf_of when the deployed policy carries an on_behalf_of', async () => {
+		// Without the flag the backend resets the policy's on_behalf_of to the
+		// deploying user; this chat path has no on-behalf-of selector, so it must
+		// preserve whatever the carried policy already holds.
+		vi.mocked(AppService.existsApp).mockResolvedValueOnce(true)
+		seedBackendDraft(
+			'raw_app',
+			'f/apps/obo',
+			{
+				summary: 'On-behalf app',
+				files: { '/index.tsx': 'console.log("obo")' },
+				runnables: {},
+				data: { tables: [] },
+				policy: {
+					execution_mode: 'publisher',
+					on_behalf_of: 'u/alice',
+					on_behalf_of_email: 'alice@windmill.dev'
+				}
+			},
+			{ workspace: WORKSPACE }
+		)
+		vi.mocked(AppService.getAppByPath).mockResolvedValueOnce({} as any)
+
+		await callGlobalTool('deploy_workspace_item', { type: 'app', path: 'f/apps/obo' })
+
+		expect(AppService.updateAppRaw).toHaveBeenCalledWith(
+			expect.objectContaining({
+				formData: expect.objectContaining({
+					app: expect.objectContaining({ preserve_on_behalf_of: true })
+				})
+			})
+		)
+	})
+
 	it('notifies the session preview (as raw_app) after deploying a raw app', async () => {
 		const onDeployed = vi.fn()
 		setDeployedInSessionHandler(onDeployed)
@@ -1892,6 +2644,8 @@ describe('global AI tools', () => {
 				{ workspace: WORKSPACE }
 			)
 
+			vi.mocked(AppService.getAppByPath).mockResolvedValueOnce({} as any)
+
 			await callGlobalTool(
 				'deploy_workspace_item',
 				{ type: 'app', path: 'f/apps/report' },
@@ -2372,7 +3126,7 @@ describe('global AI tools', () => {
 		const callbacks: ToolCallbacks = {
 			setToolStatus: vi.fn(),
 			removeToolStatus: vi.fn(),
-			requestUserQuestion: vi.fn(async (_toolId, question) => question.choices[1])
+			requestUserQuestion: vi.fn(async (_toolId, question) => [question.choices[1]])
 		}
 
 		const raw = await callGlobalTool(
@@ -2398,7 +3152,45 @@ describe('global AI tools', () => {
 				content: 'User answered question: python3',
 				isLoading: false,
 				result: 'python3',
-				userQuestion: expect.objectContaining({ selectedChoice: 'python3' })
+				userQuestion: expect.objectContaining({ selectedChoices: ['python3'] })
+			})
+		)
+	})
+
+	it('returns a newline-bulleted list when several answers are selected', async () => {
+		const callbacks: ToolCallbacks = {
+			setToolStatus: vi.fn(),
+			removeToolStatus: vi.fn(),
+			requestUserQuestion: vi.fn(async (_toolId, question) => [
+				question.choices[0],
+				question.choices[2]
+			])
+		}
+
+		const raw = await callGlobalTool(
+			'askUserQuestion',
+			{
+				question: 'Which languages should be supported?',
+				choices: ['bun', 'python3', 'go'],
+				multiSelect: true
+			},
+			callbacks
+		)
+
+		// Model-facing return stays newline-bulleted; the header readback is a
+		// compact comma list.
+		expect(raw).toBe('- bun\n- go')
+		expect(callbacks.requestUserQuestion).toHaveBeenCalledWith(
+			'test-askUserQuestion',
+			expect.objectContaining({ multiSelect: true })
+		)
+		expect(callbacks.setToolStatus).toHaveBeenLastCalledWith(
+			'test-askUserQuestion',
+			expect.objectContaining({
+				content: 'User answered question: bun, go',
+				isLoading: false,
+				result: '- bun\n- go',
+				userQuestion: expect.objectContaining({ selectedChoices: ['bun', 'go'] })
 			})
 		)
 	})
@@ -2408,7 +3200,7 @@ describe('global AI tools', () => {
 		const callbacks: ToolCallbacks = {
 			setToolStatus: vi.fn(),
 			removeToolStatus: vi.fn(),
-			requestUserQuestion: vi.fn(async (_toolId, question) => question.choices[9])
+			requestUserQuestion: vi.fn(async (_toolId, question) => [question.choices[9]])
 		}
 
 		const raw = await callGlobalTool(
@@ -2453,7 +3245,7 @@ describe('global AI tools', () => {
 		const callbacks: ToolCallbacks = {
 			setToolStatus: vi.fn(),
 			removeToolStatus: vi.fn(),
-			requestUserQuestion: vi.fn(async () => 'use deno instead')
+			requestUserQuestion: vi.fn(async () => ['use deno instead'])
 		}
 
 		const raw = await callGlobalTool(
@@ -2471,12 +3263,58 @@ describe('global AI tools', () => {
 			expect.objectContaining({
 				content: 'User answered question: use deno instead',
 				result: 'use deno instead',
-				userQuestion: expect.objectContaining({ selectedChoice: 'use deno instead' })
+				userQuestion: expect.objectContaining({ selectedChoices: ['use deno instead'] })
 			})
 		)
 	})
 })
 
+describe('folder tools', () => {
+	beforeEach(() => {
+		vi.clearAllMocks()
+		userStore.set(undefined)
+	})
+	afterEach(() => {
+		userStore.set(undefined)
+	})
+
+	it('create_folder requires confirmation', () => {
+		const tool = getGlobalTool('create_folder')
+		expect(tool.requiresConfirmation).toBe(true)
+		expect(tool.confirmationMessage).toBe('Create folder')
+	})
+
+	it('create_folder creates the folder and reflects it in the path context', async () => {
+		userStore.set({ username: 'bob', is_admin: false, folders: ['existing'] } as any)
+		const raw = await callGlobalTool('create_folder', { name: 'analytics', summary: 'team data' })
+
+		expect(vi.mocked(FolderService.createFolder)).toHaveBeenCalledWith({
+			workspace: WORKSPACE,
+			requestBody: { name: 'analytics', summary: 'team data' }
+		})
+		const parsed = JSON.parse(raw)
+		expect(parsed.success).toBe(true)
+		expect(parsed.message).toContain('f/analytics')
+		expect((get(userStore) as any)?.folders).toContain('analytics')
+	})
+
+	it('create_folder rejects an invalid name without calling the API', async () => {
+		const raw = await callGlobalTool('create_folder', { name: 'bad name!' })
+		expect(vi.mocked(FolderService.createFolder)).not.toHaveBeenCalled()
+		const parsed = JSON.parse(raw)
+		expect(parsed.success).toBe(false)
+		expect(parsed.error).toContain('alphanumeric')
+	})
+
+	it('create_folder surfaces a backend error (e.g. name conflict)', async () => {
+		vi.mocked(FolderService.createFolder).mockRejectedValueOnce(new Error('Folder already exists'))
+		const raw = await callGlobalTool('create_folder', { name: 'taken' })
+		const parsed = JSON.parse(raw)
+		expect(parsed.success).toBe(false)
+		expect(parsed.error).toContain('Folder already exists')
+	})
+})
+
 describe('prepareGlobalSystemMessage', () => {
 	it('keeps global chat draft instructions concise and user-facing', () => {
 		const message = prepareGlobalSystemMessage()
@@ -2496,6 +3334,104 @@ describe('prepareGlobalSystemMessage', () => {
 		expect(content).not.toContain('frontend AI draft store')
 	})
 
+	it('honors user-supplied shared folder paths without asking first', () => {
+		const content = prepareGlobalSystemMessage(undefined, {
+			user: { username: 'admin', is_admin: true, folders: ['evals'] }
+		}).content as string
+
+		expect(content).toContain(
+			'If the user supplies a fully qualified `f/<folder>/...` path, use that exact path'
+		)
+		expect(content).toContain('Do not ask for folder confirmation')
+		expect(content).toContain('substitute a `u/admin/...` path unless a tool rejects it')
+	})
+
+	it('tells the model to create a folder only when the user explicitly asks', () => {
+		const content = prepareGlobalSystemMessage().content as string
+		expect(content).toContain(
+			'create one with `create_folder` only when the user explicitly asks for a new folder'
+		)
+	})
+
+	describe('folder guidance', () => {
+		const guidanceOf = (user: {
+			username: string
+			is_admin?: boolean
+			folders?: string[]
+			folders_read?: string[]
+		}) => prepareGlobalSystemMessage(undefined, { user }).content as string
+
+		it('lists the writable folders for a non-admin', () => {
+			const content = guidanceOf({
+				username: 'bob',
+				is_admin: false,
+				folders: ['marketing', 'data_engineering'],
+				folders_read: ['marketing', 'data_engineering']
+			})
+			expect(content).toContain(
+				'Folders you can write to in this workspace: `f/marketing`, `f/data_engineering`.'
+			)
+			expect(content).not.toContain('You can see but NOT write to')
+		})
+
+		it('flags read-only folders a non-admin cannot write to', () => {
+			const content = guidanceOf({
+				username: 'bob',
+				is_admin: false,
+				folders: ['team_a'],
+				folders_read: ['team_a', 'team_b']
+			})
+			expect(content).toContain('Folders you can write to in this workspace: `f/team_a`.')
+			expect(content).toContain(
+				'You can see but NOT write to: `f/team_b` — never create or deploy items there.'
+			)
+		})
+
+		it('points a non-admin with no writable folders at the personal scope', () => {
+			const content = guidanceOf({ username: 'bob', is_admin: false, folders: [] })
+			expect(content).toContain(
+				'You have no shared folders you can write to in this workspace, so use `u/bob/<name>`.'
+			)
+		})
+
+		it('gives an admin permission-agnostic guidance with a non-exhaustive hint', () => {
+			const content = guidanceOf({
+				username: 'admin',
+				is_admin: true,
+				folders: ['marketing', 'data_engineering']
+			})
+			expect(content).toContain('As a workspace admin you can write to any existing folder.')
+			expect(content).toContain(
+				'Folders here include `f/marketing`, `f/data_engineering` (you can also write to others not listed).'
+			)
+			expect(content).toContain(
+				'If the user names a folder, use it; if they explicitly ask for a new folder, create it with `create_folder`; otherwise ask them which folder to use rather than guessing or creating one unprompted.'
+			)
+			expect(content).not.toContain('Folders you can write to in this workspace')
+		})
+
+		it('omits the folder hint for an admin with no associated folders', () => {
+			const content = guidanceOf({ username: 'admin', is_admin: true, folders: [] })
+			expect(content).toContain(
+				'- As a workspace admin you can write to any existing folder. If the user names a folder, use it; if they explicitly ask for a new folder, create it with `create_folder`; otherwise ask them which folder to use rather than guessing or creating one unprompted.'
+			)
+			expect(content).not.toContain('Folders here include')
+		})
+
+		it('caps the folder list and notes the remainder', () => {
+			const folders = Array.from({ length: 45 }, (_, i) => `f${i}`)
+			const content = guidanceOf({ username: 'bob', is_admin: false, folders })
+			expect(content).toContain('(+5 more)')
+		})
+
+		it('emits no folder guidance when no user is available', () => {
+			const content = prepareGlobalSystemMessage().content as string
+			expect(content).not.toContain('Folders you can write to in this workspace')
+			expect(content).not.toContain('As a workspace admin you can write to any existing folder')
+			expect(content).not.toContain('You have no shared folders you can write to')
+		})
+	})
+
 	it('exposes separate tools for discarding drafts and deleting workspace items', () => {
 		const discard = getGlobalTool('discard_local_draft')
 		const deleteItem = getGlobalTool('delete_workspace_item')
@@ -2668,6 +3604,156 @@ describe('session-only preview tools gating', () => {
 		expect(on).toContain('get_app_runtime_logs')
 		expect(on).toContain('list_app_runs')
 	})
+
+	// The instruction headers are matched by their distinctive parenthetical so the
+	// guidance bullet (which references both block names) doesn't false-positive.
+	const WS_HEADER = 'WORKSPACE INSTRUCTIONS (configured by a workspace admin'
+	const USER_HEADER = "USER INSTRUCTIONS (this user's personal instructions"
+
+	it('renders only the workspace block when given workspace instructions', () => {
+		const content = prepareGlobalSystemMessage({ workspace: 'Always be terse.' }).content as string
+		expect(content).toContain(WS_HEADER)
+		expect(content).toContain('Always be terse.')
+		expect(content).not.toContain(USER_HEADER)
+	})
+
+	it('renders the user block with the edit-tool mention when given user instructions', () => {
+		const content = prepareGlobalSystemMessage({ user: 'Prefer Bun for new scripts.' })
+			.content as string
+		expect(content).toContain(USER_HEADER)
+		expect(content).toContain('update_user_instructions')
+		expect(content).toContain('Prefer Bun for new scripts.')
+		expect(content).not.toContain(WS_HEADER)
+	})
+
+	it('renders the workspace block before the user block when both are present', () => {
+		const content = prepareGlobalSystemMessage({ workspace: 'WS rule.', user: 'User rule.' })
+			.content as string
+		expect(content).toContain(WS_HEADER)
+		expect(content.indexOf(USER_HEADER)).toBeGreaterThan(content.indexOf(WS_HEADER))
+	})
+
+	it('omits both instruction headers when none are provided', () => {
+		const content = prepareGlobalSystemMessage().content as string
+		expect(content).not.toContain(WS_HEADER)
+		expect(content).not.toContain(USER_HEADER)
+	})
+})
+
+describe('update_user_instructions', () => {
+	function makeHelpers(initial = '') {
+		let value = initial
+		return {
+			getUserInstructions: () => value,
+			setUserInstructions: vi.fn((v: string) => {
+				value = v
+			})
+		}
+	}
+
+	it('appends to empty instructions', async () => {
+		const helpers = makeHelpers('')
+		const res = await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'append', text: 'Prefer Bun for new scripts.' },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).toHaveBeenCalledWith('Prefer Bun for new scripts.')
+		expect(res).toContain('Added a personal instruction')
+	})
+
+	it('appends to existing instructions joined by a blank line', async () => {
+		const helpers = makeHelpers('Existing rule.')
+		await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'append', text: 'Another rule.' },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).toHaveBeenCalledWith('Existing rule.\n\nAnother rule.')
+	})
+
+	it('returns only a short confirmation, not the resulting instructions', async () => {
+		const helpers = makeHelpers('Existing rule.')
+		const res = await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'append', text: 'Another rule.' },
+			toolCallbacks,
+			helpers
+		)
+		expect(res).not.toContain('Existing rule.')
+		expect(res).not.toContain('Another rule.')
+	})
+
+	it('replaces an exact match', async () => {
+		const helpers = makeHelpers('Prefer Bun.\n\nUse tabs.')
+		await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'replace', old_string: 'Prefer Bun.', new_string: 'Prefer Deno.' },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).toHaveBeenCalledWith('Prefer Deno.\n\nUse tabs.')
+	})
+
+	it('removes the matched text when new_string is empty', async () => {
+		const helpers = makeHelpers('Keep this.\n\nDrop this.')
+		await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'replace', old_string: '\n\nDrop this.', new_string: '' },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).toHaveBeenCalledWith('Keep this.')
+	})
+
+	it('clears all instructions when the whole text is replaced with empty', async () => {
+		const helpers = makeHelpers('Only rule.')
+		const res = await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'replace', old_string: 'Only rule.', new_string: '' },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).toHaveBeenCalledWith('')
+		expect(res).toContain('Cleared your personal instructions')
+	})
+
+	it('errors without writing when old_string is not found, and echoes the current text for recovery', async () => {
+		const helpers = makeHelpers('Existing rule.')
+		const res = await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'replace', old_string: 'missing', new_string: 'x' },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).not.toHaveBeenCalled()
+		expect(res).toContain('not found')
+		expect(res).toContain('Existing rule.')
+	})
+
+	it('rejects a result over the length cap without writing', async () => {
+		const helpers = makeHelpers('')
+		const res = await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'append', text: 'a'.repeat(5001) },
+			toolCallbacks,
+			helpers
+		)
+		expect(helpers.setUserInstructions).not.toHaveBeenCalled()
+		expect(res).toContain('over the 5000')
+	})
+
+	it('fails gracefully when the context does not provide instruction helpers', async () => {
+		const res = await callGlobalTool(
+			'update_user_instructions',
+			{ operation: 'append', text: 'x' },
+			toolCallbacks,
+			{}
+		)
+		expect(res).toContain('cannot modify user instructions')
+	})
 })
 
 describe('prepareGlobalUserMessage', () => {
@@ -2705,15 +3791,23 @@ describe('prepareGlobalUserMessage', () => {
 				path: 'f/flows/reporting',
 				title: 'f/flows/reporting',
 				summary: 'Reporting flow'
+			},
+			{
+				type: 'workspace_app',
+				path: 'f/apps/dashboard',
+				title: 'f/apps/dashboard',
+				summary: 'Dashboard raw app'
 			}
 		])
 
 		expect(message.content).toContain('## SELECTED CONTEXT')
 		expect(message.content).toContain('- type: script, path: f/scripts/report')
 		expect(message.content).toContain('- type: flow, path: f/flows/reporting')
+		expect(message.content).toContain('- type: raw_app, path: f/apps/dashboard')
 		expect(message.content).toContain('## INSTRUCTIONS:\nUpdate these items')
 		expect(message.content).not.toContain('Report script')
 		expect(message.content).not.toContain('Reporting flow')
+		expect(message.content).not.toContain('Dashboard raw app')
 	})
 
 	it('omits selected context section when no workspace item is selected', () => {
diff --git a/frontend/src/lib/components/copilot/chat/global/core.ts b/frontend/src/lib/components/copilot/chat/global/core.ts
index 90925255d2..f26e3a670d 100644
--- a/frontend/src/lib/components/copilot/chat/global/core.ts
+++ b/frontend/src/lib/components/copilot/chat/global/core.ts
@@ -2,6 +2,7 @@ import {
 	AppService,
 	AzureTriggerService,
 	FlowService,
+	FolderService,
 	GcpTriggerService,
 	HttpTriggerService,
 	JobService,
@@ -14,8 +15,10 @@ import {
 	ScriptService,
 	SqsTriggerService,
 	VariableService,
-	WebsocketTriggerService
+	WebsocketTriggerService,
+	WorkspaceService
 } from '$lib/gen'
+import { createTwoFilesPatch } from 'diff'
 import { $ScriptLang } from '$lib/gen/schemas.gen'
 import type {
 	AppWithLastVersion,
@@ -53,6 +56,7 @@ import { createInlineScriptSession } from '../flow/inlineScriptsUtils'
 import {
 	getDatatableSdkReference,
 	getFlowPrompt,
+	getPipelinePrompt,
 	getRawAppPrompt,
 	getResourcePrompt,
 	getScriptPrompt
@@ -76,6 +80,8 @@ import {
 import { searchDocsTool, readDocsPageTool } from '../docs/core'
 import type { ContextElement } from '../context'
 import { getDatatableTools } from '../datatableTools'
+import { fileTools } from '../files/fileTools'
+import type { AttachedFilesStore } from '../files/attachedFiles.svelte'
 import { UserDraft } from '$lib/userDraft.svelte'
 import { emptySchema } from '$lib/utils'
 import { inferArgs } from '$lib/infer'
@@ -97,16 +103,42 @@ import {
 	type WorkspaceItem,
 	type WorkspaceItemType
 } from './workspaceItems'
-import { buildFlowDeployRequestBody, buildScriptDeployRequestBody } from './deployRequests'
-import { userStore } from '$lib/stores'
+import {
+	userStore,
+	superadmin,
+	enterpriseLicense,
+	userWorkspaces,
+	workspaceStore
+} from '$lib/stores'
 import { get } from 'svelte/store'
+import { deployDraft as deployDraftToWorkspace } from '$lib/utils_draft_deploy'
+import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 import { bundleRawAppDraft } from './rawAppBundlerBridge'
+import {
+	buildRunsUrl,
+	buildSchedulesUrl,
+	buildVariablesUrl,
+	buildResourcesUrl,
+	buildAssetsUrl,
+	buildAuditLogsUrl,
+	buildWorkspaceSettingsUrl,
+	buildFoldersUrl,
+	buildGroupsUrl,
+	buildTriggersUrl,
+	WORKSPACE_SETTINGS_TABS
+} from './pageNavigation'
+import {
+	pageHref,
+	TRIGGER_PAGES,
+	type TriggerKind as PageTriggerKind
+} from '$lib/components/sessions/previewRouter'
 import {
 	clearEphemeralSecretVariableDraftValue,
 	deleteGlobalDraft,
 	getEphemeralSecretVariableDraftValue,
 	getGlobalDraft,
 	getGlobalDraftStoragePath,
+	itemKindFor,
 	listGlobalDrafts,
 	persistGlobalDraft,
 	readGlobalDraftValue,
@@ -132,7 +164,9 @@ const INSTRUCTION_SUBJECTS = [
 ] as const satisfies readonly WorkspaceItemType[]
 // `datatable` is not a workspace item type, but the model can request the
 // datatable SDK reference (the wmill.datatable() runnable API) the same way.
-const INSTRUCTION_SUBJECTS_EXTRA = ['datatable'] as const
+// `pipeline` likewise isn't an item type — a data pipeline is a set of
+// annotated scripts in a folder, so it gets authoring guidance, not a CRUD type.
+const INSTRUCTION_SUBJECTS_EXTRA = ['datatable', 'pipeline'] as const
 const ALL_INSTRUCTION_SUBJECTS = [...INSTRUCTION_SUBJECTS, ...INSTRUCTION_SUBJECTS_EXTRA] as const
 const MAX_LIST_LIMIT = 100
 type ActiveGlobalEditorType = Extract<WorkspaceItemType, 'script' | 'flow' | 'app'>
@@ -165,7 +199,7 @@ const scriptLangSchema = z.enum($ScriptLang.enum)
 
 const getInstructionsSchema = z.object({
 	subject: instructionSubjectSchema.describe(
-		'What to get authoring instructions for: a workspace item type (script, flow, resource, app) or "datatable" for the wmill.datatable() SQL SDK used inside runnables. Schedules, triggers, and variables don\'t need instructions — their tool schemas describe everything.'
+		'What to get authoring instructions for: a workspace item type (script, flow, resource, app), "pipeline" for building a data pipeline (a DAG of annotated scripts wired by storage assets — NOT a flow), or "datatable" for the wmill.datatable() SQL SDK used inside runnables. Schedules, triggers, and variables don\'t need instructions — their tool schemas describe everything.'
 	),
 	language: scriptLangSchema
 		.optional()
@@ -183,7 +217,52 @@ const askUserQuestionSchema = z.object({
 		.array(z.string().min(1).describe('Proposed answer text shown to the user and returned as-is.'))
 		.min(2)
 		.max(10)
-		.describe('Two to ten mutually exclusive proposed answer strings.')
+		.describe('Two to ten proposed answer strings.'),
+	multiSelect: z
+		.boolean()
+		.optional()
+		.describe(
+			'When true, the user may select several answers; use only when the choices can genuinely co-apply (not mutually exclusive). Defaults to single-select.'
+		)
+})
+
+// Matches the per-mode cap enforced by the prompt-settings UI (AIPromptsModal) and
+// the backend workspace prompt (MAX_CUSTOM_PROMPT_LENGTH).
+export const MAX_USER_INSTRUCTIONS_LENGTH = 5000
+
+const updateUserInstructionsSchema = z.object({
+	operation: z
+		.enum(['append', 'replace'])
+		.describe(
+			'What to do with your personal Global instructions. \'append\' adds a new instruction to the end (use for "remember this" / "always do X"). \'replace\' performs an exact find-and-replace to edit or remove existing text (use for "change X" / "stop doing Y"); set new_string to "" to remove.'
+		),
+	text: z
+		.string()
+		.min(1)
+		.optional()
+		.describe(
+			"Required when operation is 'append': the instruction to add. Ignored for 'replace'."
+		),
+	old_string: z
+		.string()
+		.min(1)
+		.optional()
+		.describe(
+			"Required when operation is 'replace': exact text to find in your current personal instructions. Ignored for 'append'."
+		),
+	new_string: z
+		.string()
+		.optional()
+		.describe(
+			"Required when operation is 'replace': replacement text. Use an empty string to delete the matched text. Ignored for 'append'."
+		),
+	replace_all: z
+		.boolean()
+		.optional()
+		.default(false)
+		.describe(
+			"For operation 'replace': when true, replace every exact match; when false, old_string must match exactly once."
+		)
 })
 
 const listWorkspaceItemsSchema = z.object({
@@ -370,6 +449,10 @@ const getJobLogsSchema = z.object({
 	id: z.string().describe('The UUID of the job to fetch logs for.')
 })
 
+const cancelJobSchema = z.object({
+	id: z.string().describe('The UUID of the job to cancel.')
+})
+
 const listRunsSchema = z.object({
 	path: z.string().optional().describe('Filter to runs of this exact script or flow path.'),
 	created_by: z.string().optional().describe('Filter by the username that started the run.'),
@@ -413,7 +496,20 @@ const deployWorkspaceItemSchema = z.object({
 	deployment_message: z
 		.string()
 		.optional()
-		.describe('Optional deployment message recorded with the change.')
+		.describe('Optional deployment message recorded with the change.'),
+	force: z
+		.boolean()
+		.optional()
+		.describe(
+			'Deploy even if the draft was started from an older deployed version, overwriting the version deployed since. Defaults to false; prefer calling rebase_draft first to keep the newer changes.'
+		)
+})
+
+const rebaseDraftSchema = z.object({
+	type: itemTypeSchema,
+	path: z
+		.string()
+		.describe('Workspace path of the draft to rebase onto the latest deployed version.')
 })
 
 const editScriptSchema = z.object({
@@ -451,9 +547,32 @@ const testRunArgsSchema = z
 	.optional()
 	.describe('Arguments to pass to the runnable. Omit or pass null when no arguments are needed.')
 
+const backgroundArgSchema = z
+	.boolean()
+	.optional()
+	.describe(
+		'Run in the background without waiting. Set true for jobs you expect to be long (deploys, backfills, big queries) — you will be notified when it finishes. Leave unset for normal runs, which wait briefly and only background automatically if slow.'
+	)
+
+const waitSecondsArgSchema = z
+	.number()
+	.optional()
+	.describe(
+		'How many seconds to wait for the job in-turn before it detaches into the background jobs tray. Defaults to 15. Raise it (capped at 120) for a job you expect to finish in, say, 30–60s and want the result in this same turn. Ignored when background is true. Do not use this to poll — larger values just hold the turn longer.'
+	)
+
+/** Translate the model's `wait_seconds` into executeTestRun's `detachAfterMs`
+ * (the value is clamped to MAX_DETACH_AFTER_MS there). `undefined` keeps the
+ * default inline budget; negatives are floored to 0 (immediate detach). */
+function waitSecondsToDetachMs(waitSeconds: number | undefined): number | undefined {
+	return waitSeconds == null ? undefined : Math.max(0, waitSeconds) * 1000
+}
+
 const testRunScriptSchema = z.object({
 	path: z.string().describe('Workspace path of the script to test.'),
-	args: testRunArgsSchema
+	args: testRunArgsSchema,
+	background: backgroundArgSchema,
+	wait_seconds: waitSecondsArgSchema
 })
 
 const testRunScriptToolDef = createToolDef(
@@ -465,7 +584,9 @@ const testRunScriptToolDef = createToolDef(
 
 const testRunFlowSchema = z.object({
 	path: z.string().describe('Workspace path of the flow to test.'),
-	args: testRunArgsSchema
+	args: testRunArgsSchema,
+	background: backgroundArgSchema,
+	wait_seconds: waitSecondsArgSchema
 })
 
 const testRunFlowToolDef = createToolDef(
@@ -478,7 +599,9 @@ const testRunFlowToolDef = createToolDef(
 const testRunStepSchema = z.object({
 	path: z.string().describe('Workspace path of the flow containing the step to test.'),
 	stepId: z.string().describe('The id of the step/module to test.'),
-	args: testRunArgsSchema
+	args: testRunArgsSchema,
+	background: backgroundArgSchema,
+	wait_seconds: waitSecondsArgSchema
 })
 
 const testRunStepToolDef = createToolDef(
@@ -622,15 +745,30 @@ const deleteAppRunnableSchema = z.object({
 
 const openPreviewSchema = z.object({
 	kind: z
-		.enum(['script', 'flow', 'raw_app'])
+		.enum(['script', 'flow', 'raw_app', 'pipeline'])
 		.describe(
-			'Item kind to preview. Use "raw_app" for code-based apps (created via init_app). The legacy drag-and-drop app builder ("app") is not previewable in the session panel — don\'t pass it.'
+			'Item kind to preview. Use "raw_app" for code-based apps (created via init_app). Use "pipeline" to show the data-pipeline graph for a folder — here `path` is the folder name, not an item path. The legacy drag-and-drop app builder ("app") is not previewable in the session panel — don\'t pass it.'
 		),
-	path: z.string().describe('Workspace path of the item to preview.')
+	path: z
+		.string()
+		.describe('Workspace path of the item to preview, or the folder name when kind is "pipeline".')
 })
 
 const getPreviewStatusSchema = z.object({})
 
+const closePageSchema = z.object({
+	all: z
+		.boolean()
+		.optional()
+		.describe('Close every open preview tab, clearing the side panel. Ignores `match` when true.'),
+	match: z
+		.string()
+		.optional()
+		.describe(
+			'Close the preview tab(s) whose page name or item path contains this text (case-insensitive), e.g. "runs", "schedules", or a script path. Call get_preview_status first if unsure what is open.'
+		)
+})
+
 type SessionToolResult = {
 	aiResult: string
 	uiMessage: string
@@ -678,22 +816,87 @@ const initAppSchema = z.object({
 		)
 })
 
+// Mirrors the backend VALID_FOLDER_NAME check so an invalid name fails before the
+// network round-trip (the server enforces the same rule).
+const VALID_FOLDER_NAME = /^[a-zA-Z_0-9-]+$/
+
+const createFolderSchema = z.object({
+	name: z
+		.string()
+		.describe(
+			'Folder name — letters, digits, underscores or hyphens only. The folder becomes addressable as `f/<name>/<item>`.'
+		),
+	summary: z.string().optional().describe('Optional human-readable description of the folder.')
+})
+
+type FolderPromptContext = { folders: string[]; foldersRead: string[]; isAdmin: boolean }
+
+// Renders the folders the current user can act on into the system prompt so the
+// model can pick an `f/<folder>/...` path without a discovery round-trip (there
+// is no folder-listing tool). For a non-admin, `folders` (from whoami) is exactly
+// the writable set, so read-only folders are listed separately as off-limits.
+// Admins bypass folder ACLs and can write anywhere, but `folders` only carries
+// their explicitly-permissioned subset, so for admins it is offered as a
+// non-exhaustive hint alongside permission-agnostic guidance (the complete set
+// needs a folder-listing tool — follow-up).
+// Capped so a folder-heavy workspace can't dominate the prompt.
+function buildFolderGuidance(username: string, ctx?: FolderPromptContext): string {
+	if (!ctx) return ''
+	const MAX = 40
+	const writable = ctx.folders ?? []
+	const fmt = (names: string[]) => {
+		const shown = names
+			.slice(0, MAX)
+			.map((n) => `\`f/${n}\``)
+			.join(', ')
+		return names.length > MAX ? `${shown} (+${names.length - MAX} more)` : shown
+	}
+	if (ctx.isAdmin) {
+		const known =
+			writable.length > 0
+				? ` Folders here include ${fmt(writable)} (you can also write to others not listed).`
+				: ''
+		return `- As a workspace admin you can write to any existing folder.${known} If the user names a folder, use it; if they explicitly ask for a new folder, create it with \`create_folder\`; otherwise ask them which folder to use rather than guessing or creating one unprompted.`
+	}
+	const readOnly = (ctx.foldersRead ?? []).filter((f) => !writable.includes(f))
+	const lines: string[] = []
+	if (writable.length > 0) {
+		lines.push(
+			`- Folders you can write to in this workspace: ${fmt(writable)}. For shared/team work, pick the one whose purpose matches the request; if none clearly fits, ask which folder to use (askUserQuestion) rather than inventing a path. Use \`create_folder\` only when the user explicitly asks for a new folder.`
+		)
+	} else {
+		lines.push(
+			`- You have no shared folders you can write to in this workspace, so use \`u/${username}/<name>\`. If the user explicitly asks for a shared folder, create one with \`create_folder\` (you become an owner); otherwise ask before placing shared work rather than inventing an \`f/<folder>/...\` path.`
+		)
+	}
+	if (readOnly.length > 0) {
+		lines.push(
+			`- You can see but NOT write to: ${fmt(readOnly)} — never create or deploy items there.`
+		)
+	}
+	return lines.join('\n')
+}
+
 const buildGlobalSystemPrompt = (
 	username: string,
-	previewTools: boolean
-) => `You are Windmill's global workspace assistant.
+	previewTools: boolean,
+	folderCtx?: FolderPromptContext,
+	skills: AiSkillListItem[] = []
+) => {
+	const folderGuidance = buildFolderGuidance(username, folderCtx)
+	const folderGuidanceBlock = folderGuidance ? `\n${folderGuidance}` : ''
+	return `You are Windmill's global workspace assistant.
 
 The current user's workspace username is "${username}".
 
 Use tools to inspect workspace items and create per-user drafts (saved server-side, visible only to this user — not deployed) for scripts, flows, schedules, triggers, resources, variables, and raw apps.
 
 Path conventions:
-- Every workspace path has exactly three segments and starts with one of two namespaces:
-  - \`u/${username}/<name>\` — the current user's personal scope. Default for ad-hoc, exploratory, or scratch work.
-  - \`f/<folder>/<name>\` — a shared folder scope. The folder must already exist; bare \`f/<name>\` is INVALID and will fail.
-- When the user gives a bare name without a namespace prefix (e.g. "create a flow called myflow"), default to \`u/${username}/<name>\`. Do NOT invent \`f/<name>\` — that is a structurally invalid path.
-- If the request implies shared / team work but doesn't name a specific folder (e.g. "the marketing flow"), ask which folder to use rather than guessing. Call \`list_workspace_items\` with \`type: ['folder']\` (or rely on the user's hint) before assuming a folder exists.
-- Only use an \`f/<folder>/<name>\` path when the user explicitly named the folder or you confirmed it exists.
+- A workspace path starts with one of two namespaces; its trailing <name> may itself contain "/", so a path has three or more segments:
+  - \`u/${username}/<name>\` — your personal scope. Default for ad-hoc, exploratory, or scratch work.
+  - \`f/<folder>/<name>\` — a shared folder scope; the <folder> must already exist (a bare \`f/<name>\` with no folder segment is INVALID and will fail).
+- If the user supplies a fully qualified \`f/<folder>/...\` path, use that exact path; they have already chosen the folder. Do not ask for folder confirmation or substitute a \`u/${username}/...\` path unless a tool rejects it.
+- Default a bare name with no namespace prefix (e.g. "create a flow called myflow") to \`u/${username}/<name>\`. Never invent an \`f/<folder>/...\` path for a folder that does not exist; create one with \`create_folder\` only when the user explicitly asks for a new folder.${folderGuidanceBlock}
 
 Rules:
 - Draft tools create or update drafts only; they do not deploy or mutate deployed workspace items.
@@ -704,17 +907,22 @@ Rules:
 - Variable values are never readable. For secrets, create a secret variable and reference it from resources as "$var:path/to/variable".
 - Use search_resource_types before write_resource.
 - Use get_instructions before writing scripts, flows, resources, or apps. For scripts, pass the target language.
+- A "data pipeline" is NOT a flow: it is a DAG of independent scripts in one folder, wired by storage assets (DuckLake/data tables/S3) and triggers via top-of-file \`pipeline\` / \`on <ref>\` annotation comments written in each script's comment syntax (\`--\` for SQL, \`#\` for Python/Bash, \`//\` for TS — a \`//\` line in a SQL node is a syntax error). When the user asks for a data pipeline (or to ingest/transform/materialize data across steps), call get_instructions with subject "pipeline" and build annotated script drafts — do not build a flow.
 - After creating or editing a script or flow draft, run test_run_script, test_run_flow, or test_run_step with representative args before reporting that it works. These tools prefer drafts, so testing does not require deployment.
 - Use list_runs to find recent runs (optionally filtered by path, creator, label, or status), then get_job_logs with a returned id to inspect a specific run's logs — without starting a new test run.
-- When a required decision is ambiguous, use askUserQuestion with two to ten clear proposed answer strings instead of guessing. The user can also type a custom answer when none of the proposed answers fit.
+- Use open_page to show a workspace page with filters applied — Runs, Schedules, Variables, Resources, Assets, Audit logs, or Workspace settings on a specific tab (e.g. "open the failed runs of f/foo/bar", "open the schedule for X", "open the git sync settings"). Only the pages listed for this user in the tool are available; don't offer pages that aren't listed. Don't use it as a substitute for list_runs when you just need the data yourself.
+- When a required decision is ambiguous, use askUserQuestion with two to ten clear proposed answer strings instead of guessing. The user can also type a custom answer when none of the proposed answers fit. Set multiSelect: true only when the answers can genuinely co-apply and the user may pick several (not mutually exclusive).
+- When the user asks you to remember a lasting preference, always/never do something, or change/stop a behavior going forward, call update_user_instructions to persist it. It edits only the USER INSTRUCTIONS block (not WORKSPACE INSTRUCTIONS). Keep each instruction concise; do not use it for one-off requests scoped to the current task.
 - Keep context targeted.${
-	previewTools
-		? `
+		previewTools
+			? `
 - After writing or substantially editing a script / flow / app draft, show it via open_preview(kind, path) so the user sees the editor and live preview right next to the chat. First check whether it is already shown: if unsure, call get_preview_status. Only call open_preview (or offer to) when no preview is open or it is showing a different item — don't re-open a preview already showing the item you just edited.
+- Building a data pipeline: call open_preview(kind="pipeline", path="<folder>") as the FIRST step, before creating any node — this opens the pipeline editor the user reviews in. path is the folder, not an item; an empty or not-yet-created folder is fine (create_folder first if needed, then open it). Opening it registers build_pipeline_node / edit_pipeline_node — use ONLY those to add or change pipeline nodes, never write_script for a pipeline node — they apply directly as unsaved drafts on the canvas (no separate accept/reject step) that the user reviews and deploys. Do not write pipeline scripts without first opening the editor.
 - When debugging a running raw app, call get_app_runtime_logs to read the live preview's browser console output. It needs the raw app preview open (open_preview kind="raw_app").
-- get_app_runtime_logs only shows the app's browser console. For the server-side logs of a backend runnable the app invoked (a backend.<id> call), call list_app_runs to get that run's job_id from the live preview, then get_job_logs with it. Use this when a backend call errors or returns something unexpected.`
-		: ''
-}
+- get_app_runtime_logs only shows the app's browser console. For the server-side logs of a backend runnable the app invoked (a backend.<id> call), call list_app_runs to get that run's job_id from the live preview, then get_job_logs with it. Use this when a backend call errors or returns something unexpected.
+- open_page opens its page as a tab in the side-panel preview next to the chat — the only way to show one of these pages there (open_preview only handles editable items). Changing filters on a page already open updates that same tab; only pass new_tab when the user explicitly asks for a separate tab.`
+			: ''
+	}
 
 Documentation:
 - Use search_docs to look up how a Windmill feature works in the official documentation (a flag, concept, function, or "does Windmill support X") instead of guessing about product behavior. It returns matching doc snippets with their Source URL; call read_docs_page with a Source URL to read the full page (or a section, if it returns headings). Cite the Source URL when you rely on it.
@@ -740,7 +948,17 @@ Data Tables:
 - Use list_datatables to discover the available datatables and their tables. Reuse an existing table rather than creating a duplicate. If list_datatables reports none, this is a blocking prerequisite — tell the user to set up a datatable in their workspace settings and stop; do not assume a "main" datatable exists or call exec_datatable_sql.
 - Use get_datatable_table_schema only when you need a table's column names/types; list_datatables is enough for table-list or availability summaries.
 - Use exec_datatable_sql to explore data, run queries, mutate rows, or change schema (CREATE/ALTER/DROP). Creating a table is a normal CREATE TABLE statement — it appears in list_datatables afterward, with no registration step.
-- When writing runnable code (inline app runnables, scripts, flow modules) that reads or writes datatable data at runtime, it accesses a datatable via wmill.datatable(). Default to TypeScript (bun) unless the user asked for another language. Call get_instructions with subject "datatable" and language "bun" for the TypeScript SQL SDK reference (or language "python3" for Python) — it returns only that language so you get just what you need.`
+- When writing runnable code (inline app runnables, scripts, flow modules) that reads or writes datatable data at runtime, it accesses a datatable via wmill.datatable(). Default to TypeScript (bun) unless the user asked for another language. Call get_instructions with subject "datatable" and language "bun" for the TypeScript SQL SDK reference (or language "python3" for Python) — it returns only that language so you get just what you need.${
+		skills.length > 0
+			? `
+
+Skills:
+- Skills are reusable instruction sets curated for this workspace, each covering a specific kind of task. The available skills are listed below by name and description.
+- When a user's request matches a skill's description, call read_skill with its exact name to load the full instructions BEFORE acting, then follow them.
+${skills.map((s) => `- ${s.name}: ${s.description}`).join('\n')}`
+			: ''
+	}`
+}
 
 const DEFAULT_LIST_TYPES = ['script', 'flow'] as const satisfies readonly WorkspaceItemType[]
 
@@ -1476,6 +1694,10 @@ Datatables are workspace-scoped managed PostgreSQL databases. In chat, explore a
 ${getDatatableSdkReference(lang)}`
 }
 
+function getPipelineInstructions(): string {
+	return getPipelinePrompt()
+}
+
 function getInstructions(subject: InstructionSubject, language?: ScriptLang): string {
 	switch (subject) {
 		case 'script':
@@ -1488,15 +1710,384 @@ function getInstructions(subject: InstructionSubject, language?: ScriptLang): st
 			return getAppInstructions()
 		case 'datatable':
 			return getDatatableInstructions(language)
+		case 'pipeline':
+			return getPipelineInstructions()
+	}
+}
+
+export type AiSkillListItem = { name: string; description: string }
+
+/** Fetch the workspace's AI skills (name + description) for the global system prompt. */
+export async function loadWorkspaceSkills(workspace: string): Promise<AiSkillListItem[]> {
+	if (!workspace) return []
+	try {
+		return await WorkspaceService.listAiSkills({ workspace })
+	} catch (e) {
+		console.error('Failed to load AI skills', e)
+		return []
+	}
+}
+
+const readSkillSchema = z.object({
+	name: z
+		.string()
+		.describe('The exact skill name as listed in the Skills section of the system prompt.')
+})
+
+export const readSkillTool: Tool<{}> = {
+	def: createToolDef(
+		readSkillSchema,
+		'read_skill',
+		'Load the full instructions for a workspace AI skill by name. Skills are listed in the system prompt under "Skills"; call this before acting on a task a skill covers, then follow its instructions.'
+	),
+	fn: async ({ args, workspace, toolId, toolCallbacks }) => {
+		const parsed = readSkillSchema.parse(args)
+		toolCallbacks.setToolStatus(toolId, { content: `Reading skill "${parsed.name}"...` })
+		try {
+			const skill = await WorkspaceService.getAiSkill({ workspace, name: parsed.name })
+			toolCallbacks.setToolStatus(toolId, { content: `Read skill "${parsed.name}"` })
+			return `Skill: ${skill.name}\nDescription: ${skill.description}\n\nInstructions:\n${skill.instructions}`
+		} catch (e) {
+			const msg = e instanceof Error ? e.message : String(e)
+			toolCallbacks.setToolStatus(toolId, {
+				content: `Error reading skill "${parsed.name}"`,
+				error: msg
+			})
+			return `Failed to read skill "${parsed.name}": ${msg}. Check the name against the Skills list in the system prompt.`
+		}
+	}
+}
+
+const OPEN_PAGE_NAMES = [
+	'runs',
+	'schedules',
+	'variables',
+	'resources',
+	'assets',
+	'audit_logs',
+	'folders',
+	'groups',
+	'triggers',
+	'workspace_settings'
+] as const
+type OpenPageName = (typeof OPEN_PAGE_NAMES)[number]
+
+const OPEN_PAGE_LABELS: Record<OpenPageName, string> = {
+	runs: 'Runs',
+	schedules: 'Schedules',
+	variables: 'Variables',
+	resources: 'Resources',
+	assets: 'Assets',
+	audit_logs: 'Audit logs',
+	folders: 'Folders',
+	groups: 'Groups',
+	triggers: 'Triggers',
+	workspace_settings: 'Workspace settings'
+}
+
+// Trigger kinds available given the workspace's license — the EE-gated kinds
+// (kafka/nats/sqs/gcp/azure) are only offered with an enterprise license.
+function allowedTriggerKinds(): PageTriggerKind[] {
+	const ee = !!get(enterpriseLicense)
+	return (Object.keys(TRIGGER_PAGES) as PageTriggerKind[]).filter((k) => ee || !TRIGGER_PAGES[k].ee)
+}
+
+// Which pages the current user can actually reach — mirrors the sidebar's gating.
+// Operators see exactly the pages enabled in the operating workspace's operator_settings
+// (the same source OperatorMenu gates on); a missing/false flag means no access, and
+// operators are never admins so workspace_settings is always excluded. Non-operators
+// get every page except workspace_settings, which is admin/superadmin only. `workspaceId`
+// is the chat's operating workspace (a session targets its own, possibly forked workspace);
+// it defaults to the navigation workspace for the global side-panel chat. The tool only
+// ever advertises, and only ever acts on, pages in this set.
+function allowedOpenPages(workspaceId: string | undefined = get(workspaceStore)): OpenPageName[] {
+	const u = get(userStore)
+	const isAdmin = !!u?.is_admin || !!get(superadmin)
+	if (u?.operator) {
+		const settings = get(userWorkspaces).find((w) => w.id === workspaceId)?.operator_settings
+		return OPEN_PAGE_NAMES.filter(
+			(p) =>
+				p !== 'workspace_settings' && settings?.[p as keyof NonNullable<typeof settings>] === true
+		)
+	}
+	const allowed = new Set<OpenPageName>([
+		'runs',
+		'assets',
+		'schedules',
+		'variables',
+		'resources',
+		'audit_logs',
+		'folders',
+		'groups',
+		'triggers'
+	])
+	if (isAdmin) allowed.add('workspace_settings')
+	return OPEN_PAGE_NAMES.filter((p) => allowed.has(p))
+}
+
+// One flat object (not a discriminated union): `page` selects the target and the
+// per-page fields are optional. Top-level `type: object` is what Anthropic's
+// input_schema requires; a top-level oneOf would be rejected. Each per-page URL builder
+// drops any key that isn't one of its page's real query params, so a field that doesn't
+// apply to the chosen page is harmless. This full schema is used to PARSE tool args; the
+// advertised schema (what the model sees) is narrowed per-user in `setSchema`.
+const openPageFullSchema = z.object({
+	page: z
+		.enum([
+			'runs',
+			'schedules',
+			'variables',
+			'resources',
+			'assets',
+			'audit_logs',
+			'folders',
+			'groups',
+			'triggers',
+			'workspace_settings'
+		])
+		.describe('Which page to open'),
+	path: z
+		.string()
+		.optional()
+		.describe(
+			'Runs/Schedules/Variables/Resources/Assets: the script, flow or item path to filter by'
+		),
+	status: z
+		.enum(['running', 'success', 'failure', 'canceled', 'waiting', 'suspended'])
+		.optional()
+		.describe('Runs: filter by job execution status'),
+	schedule_path: z
+		.string()
+		.optional()
+		.describe(
+			'Runs: only runs triggered by this schedule path. Schedules: filter by this exact schedule path.'
+		),
+	job_kinds: z
+		.enum(['all', 'runs', 'dependencies', 'previews', 'deploymentcallbacks'])
+		.optional()
+		.describe('Runs: filter by job category (defaults to top-level runs)'),
+	user: z.string().optional().describe('Runs: filter by the user who created the job'),
+	open: z
+		.string()
+		.optional()
+		.describe(
+			'Schedules/Triggers: exact schedule or trigger path to open in the edit drawer, e.g. f/foo/my_schedule'
+		),
+	summary: z
+		.string()
+		.optional()
+		.describe('Schedules: search text matched against schedule summaries'),
+	trigger_kind: z
+		.enum([...(Object.keys(TRIGGER_PAGES) as [PageTriggerKind, ...PageTriggerKind[]])])
+		.optional()
+		.describe('Triggers: which trigger kind page to open (http, websocket, postgres, kafka, ...)'),
+	resource_type: z
+		.string()
+		.optional()
+		.describe('Resources: filter by resource type, e.g. postgres'),
+	owner: z
+		.string()
+		.optional()
+		.describe('Variables/Resources: filter by owner, e.g. u/alice or f/team'),
+	username: z.string().optional().describe('Audit logs: filter by the acting username'),
+	operation: z.string().optional().describe('Audit logs: filter by operation, e.g. jobs.run'),
+	resource: z.string().optional().describe('Audit logs: filter by the affected resource path'),
+	tab: z
+		.enum([...WORKSPACE_SETTINGS_TABS] as [string, ...string[]])
+		.optional()
+		.describe('Workspace settings: which settings tab to open'),
+	new_tab: z
+		.boolean()
+		.optional()
+		.describe(
+			'Open in a NEW preview tab instead of updating the tab already showing this page. Only set true when the user explicitly asks for a new or separate tab; by default changing filters reuses the existing tab.'
+		)
+})
+
+type OpenPageArgs = z.infer<typeof openPageFullSchema>
+
+// Which pages each optional field applies to — drives narrowing the advertised schema
+// so the model isn't shown fields for pages it can't open.
+const OPEN_PAGE_FIELD_PAGES: Record<string, OpenPageName[]> = {
+	path: ['runs', 'schedules', 'variables', 'resources', 'assets'],
+	status: ['runs'],
+	schedule_path: ['runs', 'schedules'],
+	job_kinds: ['runs'],
+	user: ['runs'],
+	open: ['schedules', 'triggers'],
+	summary: ['schedules'],
+	trigger_kind: ['triggers'],
+	resource_type: ['resources'],
+	owner: ['variables', 'resources'],
+	username: ['audit_logs'],
+	operation: ['audit_logs'],
+	resource: ['audit_logs'],
+	tab: ['workspace_settings']
+}
+
+// The model-facing schema for the given allowed pages: the `page` enum plus only the
+// fields relevant to those pages (reusing the full schema's field definitions). The
+// `trigger_kind` enum is narrowed to the license-available kinds.
+function buildOpenPageDefSchema(
+	pages: readonly OpenPageName[],
+	triggerKinds: readonly PageTriggerKind[]
+): z.ZodTypeAny {
+	const full = openPageFullSchema.shape as Record<string, z.ZodTypeAny>
+	// z.enum() rejects an empty list, and a user with no reachable pages (e.g. an operator
+	// with every operator_settings flag off) yields exactly that. Fall back to a plain
+	// string so schema-building can't throw; the handler still fails closed on every page.
+	const shape: Record<string, z.ZodTypeAny> = {
+		page: pages.length
+			? z.enum([...pages] as [OpenPageName, ...OpenPageName[]]).describe('Which page to open')
+			: z.string().describe('No pages are available to you in this workspace')
+	}
+	for (const [field, fieldPages] of Object.entries(OPEN_PAGE_FIELD_PAGES)) {
+		if (!fieldPages.some((p) => pages.includes(p))) continue
+		shape[field] =
+			field === 'trigger_kind'
+				? z
+						.enum([...triggerKinds] as [string, ...string[]])
+						.optional()
+						.describe('Triggers: which trigger kind page to open')
+				: full[field]
+	}
+	shape.new_tab = full.new_tab
+	return z.object(shape)
+}
+
+const OPEN_PAGE_DESCRIPTION =
+	'Open a Windmill page with filters applied — Runs, Schedules, Variables, Resources, Assets, Audit logs, Folders, Groups, Triggers (by kind), or Workspace settings (on a specific tab). Inside an AI session it opens as a tab in the side-panel preview next to the chat; elsewhere it offers a clickable link. Use after surfacing something the user likely wants to inspect (e.g. "show me the failed runs of X", "open the schedule for Y", "open the git sync settings", "open the kafka triggers"). This is the only way to show one of these pages in the session preview — open_preview only handles editable items (scripts, flows, raw apps, pipelines). Only pages listed for this user are available; do not offer others.'
+
+function buildOpenPageUrl(page: OpenPageName, a: OpenPageArgs): string {
+	switch (page) {
+		case 'runs':
+			return buildRunsUrl({
+				status: a.status,
+				path: a.path,
+				schedule_path: a.schedule_path,
+				job_kinds: a.job_kinds,
+				user: a.user
+			})
+		case 'schedules':
+			return buildSchedulesUrl({
+				open: a.open,
+				filters: { path: a.path, schedule_path: a.schedule_path, summary: a.summary }
+			})
+		case 'variables':
+			return buildVariablesUrl({ path: a.path, owner: a.owner })
+		case 'resources':
+			return buildResourcesUrl({ path: a.path, resource_type: a.resource_type, owner: a.owner })
+		case 'assets':
+			return buildAssetsUrl({ path: a.path })
+		case 'audit_logs':
+			return buildAuditLogsUrl({
+				username: a.username,
+				operation: a.operation,
+				resource: a.resource
+			})
+		case 'folders':
+			return buildFoldersUrl()
+		case 'groups':
+			return buildGroupsUrl()
+		case 'triggers':
+			return buildTriggersUrl({
+				// Default to HTTP routes when the model names no kind.
+				trigger_kind: (a.trigger_kind as PageTriggerKind | undefined) ?? 'http',
+				open: a.open
+			})
+		case 'workspace_settings':
+			return buildWorkspaceSettingsUrl({ tab: a.tab })
+	}
+}
+
+// Human-readable one-liner for the tool status/chip: the applied query params (and any
+// hash target), or "all <page>" when unfiltered.
+function summarizeOpenPage(url: string, page: OpenPageName): string {
+	const u = new URL(url, 'http://x')
+	const parts: string[] = []
+	u.searchParams.forEach((v, k) => parts.push(`${k}=${v}`))
+	if (u.hash) parts.push(u.hash.slice(1))
+	return parts.length ? parts.join(', ') : `all ${OPEN_PAGE_LABELS[page].toLowerCase()}`
+}
+
+export const openPageTool: Tool<{}> = {
+	def: createToolDef(
+		buildOpenPageDefSchema(allowedOpenPages(), allowedTriggerKinds()),
+		'open_page',
+		OPEN_PAGE_DESCRIPTION
+	),
+	// Keep the row expanded so the link chip (attached below as an action) is visible
+	// without the user having to expand the tool call.
+	showDetails: true,
+	autoCollapseDetails: false,
+	// Re-narrow the advertised `page` enum to this user's permissions each iteration, so
+	// the model never sees (or suggests) a page the user can't reach. Gates on the chat's
+	// operating workspace (the session's, when different from the navigation workspace).
+	setSchema: async function (helpers) {
+		this.def = createToolDef(
+			buildOpenPageDefSchema(
+				allowedOpenPages(operatingWorkspaceFromHelpers(helpers)),
+				allowedTriggerKinds()
+			),
+			'open_page',
+			OPEN_PAGE_DESCRIPTION
+		)
+	},
+	fn: async (ctx) => {
+		const { args, toolId, toolCallbacks } = ctx
+		const parsed = openPageFullSchema.parse(args)
+		const page = parsed.page as OpenPageName
+		const workspaceId = operatingWorkspaceFromHelpers(ctx.helpers)
+		// Defense in depth: never act on a page the user can't reach, even if the model
+		// requests one outside the advertised enum.
+		if (!allowedOpenPages(workspaceId).includes(page)) {
+			return `You don't have access to the ${OPEN_PAGE_LABELS[page] ?? page} page in this workspace.`
+		}
+		// Same fail-closed check for trigger_kind, which is narrowed to license-available
+		// kinds in the advertised schema: a model ignoring that narrowing must not get an
+		// EE-only trigger route built on a non-EE instance.
+		const triggerKind = parsed.trigger_kind as PageTriggerKind | undefined
+		if (page === 'triggers' && triggerKind && !allowedTriggerKinds().includes(triggerKind)) {
+			return `${TRIGGER_PAGES[triggerKind].label} aren't available on this instance.`
+		}
+		const url = buildOpenPageUrl(page, parsed)
+		const pageLabel = OPEN_PAGE_LABELS[page]
+		const summary = summarizeOpenPage(url, page)
+
+		// In a session, show the page as a preview tab alongside the chat (the primary
+		// UX). By default a filter change reuses the tab already showing this page;
+		// new_tab forces a separate tab. openPagePreview returns undefined when there
+		// is no active session, in which case we offer a link chip instead.
+		const previewResult = openPagePreview({
+			sessionId: sessionIdFromCtx(ctx),
+			href: pageHref(url),
+			label: pageLabel,
+			newTab: parsed.new_tab ?? false
+		})
+		if (previewResult) {
+			toolCallbacks.setToolStatus(toolId, { content: `Opened ${pageLabel} preview: ${summary}` })
+			return previewResult
+		}
+
+		// Outside a session there is no preview panel — offer a clickable link the user
+		// controls. (We deliberately don't navigate in place: a same-route goto would
+		// not re-sync the page's URL-driven filter state, so the change wouldn't land.)
+		toolCallbacks.setToolStatus(toolId, {
+			content: `Prepared a link to ${pageLabel}: ${summary}`,
+			actions: [{ id: `open-page:${page}:${url}`, type: 'navigate', label: summary, url, page }]
+		})
+		return `Offered the user a link to the ${pageLabel} page (${summary}). They can click it to open.`
 	}
 }
 
 export const globalTools: Tool<{}>[] = [
+	readSkillTool,
+	openPageTool,
 	{
 		def: createToolDef(
 			getInstructionsSchema,
 			'get_instructions',
-			'Get authoring guidance for scripts, flows, resources, apps, or the datatable SQL SDK (wmill.datatable()) used inside runnables.'
+			'Get authoring guidance for scripts, flows, data pipelines, resources, apps, or the datatable SQL SDK (wmill.datatable()) used inside runnables.'
 		),
 		fn: async ({ args, toolId, toolCallbacks }) => {
 			const parsed = getInstructionsSchema.parse(args)
@@ -1521,7 +2112,8 @@ export const globalTools: Tool<{}>[] = [
 			const parsed = askUserQuestionSchema.parse(args)
 			const userQuestion = {
 				question: parsed.question,
-				choices: parsed.choices
+				choices: parsed.choices,
+				multiSelect: parsed.multiSelect
 			}
 
 			toolCallbacks.setToolStatus(toolId, {
@@ -1541,8 +2133,8 @@ export const globalTools: Tool<{}>[] = [
 				return JSON.stringify({ success: false, error: message })
 			}
 
-			const selectedChoice = await toolCallbacks.requestUserQuestion(toolId, userQuestion)
-			if (!selectedChoice) {
+			const selected = await toolCallbacks.requestUserQuestion(toolId, userQuestion)
+			if (!selected?.length) {
 				const message = 'Question cancelled by user'
 				toolCallbacks.setToolStatus(toolId, {
 					content: message,
@@ -1553,16 +2145,99 @@ export const globalTools: Tool<{}>[] = [
 				return JSON.stringify({ success: false, error: message })
 			}
 
+			// Model-facing answer: bare string for one pick (preserves the single-select
+			// contract, even when multiSelect was set), newline-bulleted list for several.
+			// Comma-joining is avoided here so a choice that itself contains a comma
+			// ("Yes, immediately") stays unambiguous to the model reading it back.
+			const answerText =
+				selected.length === 1 ? selected[0] : selected.map((c) => `- ${c}`).join('\n')
+			// The collapsed tool-header is a human glance, not model input, so the picks
+			// read as a compact comma list there instead of a stacked bullet list.
+			const answerSummary = selected.join(', ')
+
 			toolCallbacks.setToolStatus(toolId, {
-				content: `User answered question: ${selectedChoice}`,
+				content: `User answered question: ${answerSummary}`,
 				userQuestion: {
 					...userQuestion,
-					selectedChoice
+					selectedChoices: selected
 				},
-				result: selectedChoice,
+				result: answerText,
 				isLoading: false
 			})
-			return selectedChoice
+			return answerText
+		}
+	},
+	{
+		def: createToolDef(
+			updateUserInstructionsSchema,
+			'update_user_instructions',
+			'Modify your own persistent personal instructions for the Global assistant. Use when the user asks you to remember a preference, always/never do something, or change/stop a behavior. Edits only the user-level instructions (the USER INSTRUCTIONS block, not workspace-level); changes persist in this browser and take effect on your next message.'
+		),
+		showDetails: true,
+		fn: async ({ args, toolId, toolCallbacks, helpers }) => {
+			const parsed = updateUserInstructionsSchema.parse(args)
+			const h = helpers as GlobalToolHelpers
+			if (!h?.getUserInstructions || !h?.setUserInstructions) {
+				const message = 'This chat context cannot modify user instructions.'
+				toolCallbacks.setToolStatus(toolId, { content: message, error: message })
+				return message
+			}
+
+			const current = h.getUserInstructions()
+			let next: string
+			if (parsed.operation === 'append') {
+				const text = parsed.text?.trim()
+				if (!text) {
+					const message = "operation 'append' requires a non-empty text."
+					toolCallbacks.setToolStatus(toolId, { content: message, error: message })
+					return message
+				}
+				next = current.trim() ? `${current.trim()}\n\n${text}` : text
+			} else {
+				if (parsed.old_string === undefined || parsed.new_string === undefined) {
+					const message = "operation 'replace' requires old_string and new_string."
+					toolCallbacks.setToolStatus(toolId, { content: message, error: message })
+					return message
+				}
+				try {
+					next = findAndReplace(
+						current,
+						parsed.old_string,
+						parsed.new_string,
+						parsed.replace_all ?? false,
+						'personal instructions'
+					).trim()
+				} catch (e) {
+					const detail = e instanceof Error ? e.message : String(e)
+					// Echo the current text on this rare recovery path so the model can rebuild a
+					// correct old_string. The system prompt's USER INSTRUCTIONS block can be stale
+					// within a turn that already made a successful edit, but `current` is always live.
+					const hint = current.trim()
+						? `Your current personal instructions are:\n${current.trim()}`
+						: "You have no personal instructions yet; use operation 'append' to add one."
+					const message = `${detail} ${hint}`
+					toolCallbacks.setToolStatus(toolId, { content: detail, error: detail })
+					return message
+				}
+			}
+
+			if (next.length > MAX_USER_INSTRUCTIONS_LENGTH) {
+				const message = `Resulting instructions would be ${next.length} characters, over the ${MAX_USER_INSTRUCTIONS_LENGTH} limit. Make them more concise.`
+				toolCallbacks.setToolStatus(toolId, { content: message, error: message })
+				return message
+			}
+
+			h.setUserInstructions(next)
+
+			const summary = next
+				? parsed.operation === 'append'
+					? 'Added a personal instruction'
+					: 'Updated your personal instructions'
+				: 'Cleared your personal instructions'
+			toolCallbacks.setToolStatus(toolId, { content: summary, result: summary })
+			// Return only a short confirmation. The updated text is re-injected into the system
+			// prompt on the next iteration, so echoing it back here would waste context.
+			return `${summary}. It takes effect from your next message and is editable in the Global chat settings.`
 		}
 	},
 	{
@@ -1636,6 +2311,46 @@ export const globalTools: Tool<{}>[] = [
 			return JSON.stringify(serializeWorkspaceItemForRead(item), null, 2)
 		}
 	},
+	{
+		def: createToolDef(
+			createFolderSchema,
+			'create_folder',
+			'Create a new shared folder (addressable as f/<name>/) in the workspace. The current user is added as an owner.'
+		),
+		requiresConfirmation: true,
+		confirmationMessage: 'Create folder',
+		showDetails: true,
+		fn: async ({ args, workspace, toolId, toolCallbacks }) => {
+			const parsed = createFolderSchema.parse(args)
+			if (!VALID_FOLDER_NAME.test(parsed.name)) {
+				const error =
+					'Folder name can only contain alphanumeric characters, underscores, and hyphens.'
+				toolCallbacks.setToolStatus(toolId, { content: error, error })
+				return JSON.stringify({ success: false, error })
+			}
+			toolCallbacks.setToolStatus(toolId, { content: `Creating folder \`f/${parsed.name}\`...` })
+			try {
+				await FolderService.createFolder({
+					workspace,
+					requestBody: { name: parsed.name, summary: parsed.summary }
+				})
+				// Reflect the new folder in the path-convention context for the rest of this
+				// session, matching FolderPicker's local update (avoids userStore.set()).
+				const user = get(userStore)
+				if (user) {
+					if (!user.folders) user.folders = []
+					if (!user.folders.includes(parsed.name)) user.folders.push(parsed.name)
+				}
+				const message = `Created folder \`f/${parsed.name}\`. You can now write items to \`f/${parsed.name}/<name>\`.`
+				toolCallbacks.setToolStatus(toolId, { content: message })
+				return JSON.stringify({ success: true, message })
+			} catch (e) {
+				const error = e instanceof Error ? e.message : String(e)
+				toolCallbacks.setToolStatus(toolId, { content: `Error: ${error}`, error })
+				return JSON.stringify({ success: false, error })
+			}
+		}
+	},
 	{
 		def: createToolDef(writeScriptSchema, 'write_script', 'Create or overwrite a draft script.'),
 		showDetails: true,
@@ -1824,6 +2539,33 @@ export const globalTools: Tool<{}>[] = [
 			return result
 		}
 	},
+	{
+		def: createToolDef(
+			cancelJobSchema,
+			'cancel_job',
+			'Cancel a running or queued job by its id (e.g. a background test run you started that is no longer needed).'
+		),
+		showDetails: true,
+		fn: async ({ args, workspace, toolId, toolCallbacks }) => {
+			const parsed = cancelJobSchema.parse(args)
+			toolCallbacks.setToolStatus(toolId, { content: `Canceling job ${parsed.id}...` })
+			try {
+				await JobService.cancelQueuedJob({ workspace, id: parsed.id, requestBody: {} })
+			} catch (e) {
+				const msg = e instanceof Error ? e.message : 'Unknown error'
+				toolCallbacks.setToolStatus(toolId, {
+					content: `Could not cancel job ${parsed.id}`,
+					error: msg
+				})
+				return `Failed to cancel job ${parsed.id}: ${msg}. It may have already finished.`
+			}
+			// The tray's background poller will pick up the canceled state (updating
+			// its status + Job snapshot together); a bare status patch here would leave
+			// the badge stale and stop the poller. Just report to the model.
+			toolCallbacks.setToolStatus(toolId, { content: `Canceled job ${parsed.id}` })
+			return `Job ${parsed.id} was canceled.`
+		}
+	},
 	{
 		def: createToolDef(
 			deployWorkspaceItemSchema,
@@ -1840,6 +2582,20 @@ export const globalTools: Tool<{}>[] = [
 			return deployDraft(parsed, { ...ctx, sessionId: sessionIdFromCtx(ctx) })
 		}
 	},
+	{
+		def: createToolDef(
+			rebaseDraftSchema,
+			'rebase_draft',
+			'Discard a stale script, flow, or app draft and return your changes as a diff to re-apply on the latest deployed version. Use when deploy_workspace_item reports the draft was started from an older deployed version.',
+			{ strict: false }
+		),
+		showDetails: true,
+		showFade: true,
+		fn: async (ctx) => {
+			const parsed = rebaseDraftSchema.parse(ctx.args)
+			return rebaseDraft(parsed, ctx)
+		}
+	},
 	{
 		def: createToolDef(
 			deleteWorkspaceItemSchema,
@@ -2074,6 +2830,17 @@ export const globalTools: Tool<{}>[] = [
 		),
 		fn: async (ctx) => getSessionPreviewStatus(sessionIdFromCtx(ctx))
 	},
+	{
+		def: createToolDef(
+			closePageSchema,
+			'close_page',
+			'Close one or more preview tabs in the side panel of this AI session. Pass `match` to close the tab(s) whose page name or item path contains that text, or `all: true` to clear the panel. Use this when the user asks to close/dismiss a tab they no longer need. Only works inside a session.'
+		),
+		fn: async (ctx) => {
+			const parsed = closePageSchema.parse(ctx.args)
+			return closeSessionPreviewTabs(parsed, sessionIdFromCtx(ctx))
+		}
+	},
 	{
 		def: createToolDef(
 			getRuntimeLogsSchema,
@@ -2112,7 +2879,9 @@ export const globalTools: Tool<{}>[] = [
 		}
 	},
 	// Workspace-scoped datatable tools (unrestricted: no whitelist, no creation policy)
-	...getDatatableTools()
+	...getDatatableTools(),
+	// Read-only tools over files the user attached to the conversation
+	...fileTools
 ]
 
 // Tools that only make sense inside an AI session (they drive the session's
@@ -2121,6 +2890,7 @@ export const globalTools: Tool<{}>[] = [
 export const SESSION_PREVIEW_TOOL_NAMES = new Set([
 	'open_preview',
 	'get_preview_status',
+	'close_page',
 	'get_app_runtime_logs',
 	'list_app_runs'
 ])
@@ -2160,12 +2930,26 @@ export type SessionToolHelpers = { sessionId?: string }
 
 export type GlobalToolHelpers = SessionToolHelpers & {
 	testActiveFlow?: (args?: Record<string, any>) => Promise<string | undefined>
+	attachedFiles?: AttachedFilesStore
+	// Read/write the user-level Global instructions. `setUserInstructions` persists the
+	// value and rebuilds the system message so the change applies on the next chat-loop
+	// iteration. Backed by the update_user_instructions tool.
+	getUserInstructions?: () => string
+	setUserInstructions?: (instructions: string) => void
+	// The workspace this chat actually operates on — a session chat targets its own
+	// (possibly forked) workspace while $workspaceStore stays on the navigation workspace,
+	// so permission gating (open_page) must read this, not the global store.
+	operatingWorkspace?: string
 }
 
 function sessionIdFromCtx(ctx: { helpers?: unknown }): string | undefined {
 	return (ctx.helpers as GlobalToolHelpers | undefined)?.sessionId
 }
 
+function operatingWorkspaceFromHelpers(helpers: unknown): string | undefined {
+	return (helpers as GlobalToolHelpers | undefined)?.operatingWorkspace
+}
+
 function activeFlowTestFromCtx(
 	ctx: { workspace: string; helpers?: unknown },
 	path: string
@@ -2179,7 +2963,7 @@ function activeFlowTestFromCtx(
 
 export type OpenPreviewHandler = (req: {
 	sessionId: string | undefined
-	kind: 'script' | 'flow' | 'raw_app'
+	kind: 'script' | 'flow' | 'raw_app' | 'pipeline'
 	path: string
 }) => string
 
@@ -2190,7 +2974,7 @@ export function setOpenPreviewHandler(handler: OpenPreviewHandler | undefined):
 }
 
 function openSessionPreview(
-	args: { kind: 'script' | 'flow' | 'raw_app'; path: string },
+	args: { kind: 'script' | 'flow' | 'raw_app' | 'pipeline'; path: string },
 	sessionId: string | undefined
 ) {
 	if (!openPreviewHandler) {
@@ -2199,6 +2983,34 @@ function openSessionPreview(
 	return openPreviewHandler({ ...args, sessionId })
 }
 
+// Opens a workspace *page* (Runs, Schedules, …) as a page tab in the session's
+// side-panel preview, so open_page can show it next to the chat instead of
+// navigating the whole browser. Registered by the session runtime. Returns a
+// status string when opened in a session, or undefined when there is no active
+// session — signalling open_page to fall back to a link chip / direct navigation.
+export type OpenPagePreviewHandler = (req: {
+	sessionId: string | undefined
+	href: string
+	label: string
+	// Force a separate tab instead of reusing the tab already showing this page.
+	newTab: boolean
+}) => string | undefined
+
+let openPagePreviewHandler: OpenPagePreviewHandler | undefined
+
+export function setOpenPagePreviewHandler(handler: OpenPagePreviewHandler | undefined): void {
+	openPagePreviewHandler = handler
+}
+
+function openPagePreview(req: {
+	sessionId: string | undefined
+	href: string
+	label: string
+	newTab: boolean
+}): string | undefined {
+	return openPagePreviewHandler?.(req)
+}
+
 // Companion to `open_preview`: lets the assistant query the current preview
 // state (open? which item?) so it can avoid re-opening a preview already
 // showing the item it just edited. Registered by the session runtime
@@ -2218,6 +3030,35 @@ function getSessionPreviewStatus(sessionId: string | undefined): string {
 	return getPreviewStatusHandler(sessionId)
 }
 
+// Closes preview tabs in the calling session's side panel. Registered by the
+// session runtime, which owns the tab model. Returns a status string the model
+// relays to the user. `all` clears the panel; otherwise `match` is a
+// case-insensitive substring tested against each tab's page label / item path.
+export type ClosePreviewTabsHandler = (req: {
+	sessionId: string | undefined
+	all: boolean
+	match: string | undefined
+}) => string
+
+let closePreviewTabsHandler: ClosePreviewTabsHandler | undefined
+
+export function setClosePreviewTabsHandler(handler: ClosePreviewTabsHandler | undefined): void {
+	closePreviewTabsHandler = handler
+}
+
+function closeSessionPreviewTabs(
+	args: { all?: boolean; match?: string },
+	sessionId: string | undefined
+): string {
+	if (!closePreviewTabsHandler) {
+		return 'Error: close_page is only available inside an AI session.'
+	}
+	if (!args.all && !args.match?.trim()) {
+		return 'Nothing to close: pass `match` with the tab to close, or `all: true` to close every tab.'
+	}
+	return closePreviewTabsHandler({ sessionId, all: args.all ?? false, match: args.match })
+}
+
 export type GetRuntimeLogsHandler = (req: {
 	sessionId: string | undefined
 	limit: number
@@ -2453,6 +3294,7 @@ function finishAppDraftWrite(
 ): string {
 	const failure = draftWriteFailure(result, ctx)
 	if (failure) return failure
+	ctx.toolCallbacks.onItemModified?.(result.itemKind, result.storagePath)
 	const { content, message } = onSaved()
 	ctx.toolCallbacks.setToolStatus(ctx.toolId, { content, result: 'Saved as draft' })
 	return JSON.stringify({ success: true, message }, null, 2)
@@ -2465,6 +3307,7 @@ function finishDraftWrite(
 ): string {
 	const failure = draftWriteFailure(result, ctx)
 	if (failure) return failure
+	ctx.toolCallbacks.onItemModified?.(result.itemKind, result.storagePath)
 	const stored = result.item
 	const verb = existed ? 'Updated' : 'Created'
 	// Don't echo the flow value back: the model just sent it in the write call,
@@ -2500,7 +3343,7 @@ function finishDraftWrite(
 type WriteSpec<T, A> = {
 	probe: (workspace: string, path: string) => Promise<boolean>
 	fetchDeployed: (workspace: string, path: string) => Promise<T>
-	buildDraft: (base: T | undefined, args: A, path: string) => T
+	buildDraft: (base: T | undefined, args: A, path: string) => T | Promise<T>
 	beforePersist?: (workspace: string, args: A) => void
 }
 
@@ -2523,7 +3366,7 @@ async function writeDraft<T, A>(
 		existed = true
 	}
 
-	const draft = spec.buildDraft(base, args, path)
+	const draft = await spec.buildDraft(base, args, path)
 	spec.beforePersist?.(workspace, args)
 
 	const result = await persistGlobalDraft(workspace, type, path, draft, {
@@ -2547,8 +3390,8 @@ const SCRIPT_SPEC: WriteSpec<NewScript, ScriptDraftArgs> = {
 		const existing = await ScriptService.getScriptByPath({ workspace, path })
 		return { ...(existing as unknown as NewScript), parent_hash: existing.hash }
 	},
-	buildDraft: (base, args, path) =>
-		base
+	buildDraft: async (base, args, path) => {
+		const draft: NewScript = base
 			? {
 					...structuredClone(base),
 					path,
@@ -2566,6 +3409,18 @@ const SCRIPT_SPEC: WriteSpec<NewScript, ScriptDraftArgs> = {
 					language: args.language,
 					kind: 'script'
 				}
+		// Infer the arg schema from the content at save time, like the editor does,
+		// so the persisted draft is the single source of truth at deploy. Keep the
+		// previous schema (or empty) on failure rather than blanking it.
+		try {
+			const schema = emptySchema()
+			await inferArgs(draft.language, draft.content, schema)
+			draft.schema = schema
+		} catch (e) {
+			console.error('Failed to infer script schema before saving draft', e)
+		}
+		return draft
+	}
 }
 
 function writeScriptDraft(args: ScriptDraftArgs, ctx: WriteDraftCtx): Promise<string> {
@@ -2898,7 +3753,10 @@ async function testRunScriptByPath(
 		toolCallbacks,
 		toolId,
 		startMessage: `Running test for script "${args.path}"...`,
-		contextName: 'script'
+		contextName: 'script',
+		background: args.background,
+		detachAfterMs: waitSecondsToDetachMs(args.wait_seconds),
+		label: args.path
 	})
 }
 
@@ -2932,7 +3790,10 @@ async function testRunFlowByPath(
 			toolCallbacks,
 			toolId,
 			startMessage: `Starting flow test run for "${args.path}"...`,
-			contextName: 'flow'
+			contextName: 'flow',
+			background: args.background,
+			detachAfterMs: waitSecondsToDetachMs(args.wait_seconds),
+			label: args.path
 		})
 	}
 
@@ -2952,7 +3813,10 @@ async function testRunFlowByPath(
 		toolCallbacks,
 		toolId,
 		startMessage: `Starting flow test run for "${args.path}"...`,
-		contextName: 'flow'
+		contextName: 'flow',
+		background: args.background,
+		detachAfterMs: waitSecondsToDetachMs(args.wait_seconds),
+		label: args.path
 	})
 }
 
@@ -2972,6 +3836,8 @@ async function testRunFlowStepByPath(
 		workspace,
 		toolCallbacks,
 		toolId,
+		background: args.background,
+		detachAfterMs: waitSecondsToDetachMs(args.wait_seconds),
 		loadScript: loadScriptForFlowStep,
 		loadFlowPreviewValue: loadDraftFlowPreviewValue
 	})
@@ -3253,7 +4119,9 @@ async function searchApp(
 	const header = `${totalMatchCount} match${
 		totalMatchCount === 1 ? '' : 'es'
 	} in ${fileCount} file${fileCount === 1 ? '' : 's'}${
-		truncated ? ` (showing the first ${maxMatches}; narrow with file_glob or a more specific query)` : ''
+		truncated
+			? ` (showing the first ${maxMatches}; narrow with file_glob or a more specific query)`
+			: ''
 	}`
 
 	const out: string[] = [header]
@@ -3558,6 +4426,16 @@ async function discardLocalDraft(
 
 	await deleteGlobalDraft(workspace, type, path, triggerKind)
 
+	// The chat's touch on the item is undone — drop it from the mask so a
+	// pre-existing deployed item doesn't keep reading as this chat's edit.
+	const discardedKind = itemKindFor(type, triggerKind)
+	if (discardedKind) {
+		toolCallbacks.onItemDiscarded?.(
+			discardedKind,
+			getGlobalDraftStoragePath(workspace, type, path, triggerKind)
+		)
+	}
+
 	toolCallbacks.setToolStatus(toolId, {
 		content: `Discarded ${type} "${path}" draft`,
 		result: 'Draft discarded'
@@ -3575,17 +4453,310 @@ async function discardLocalDraft(
 	)
 }
 
+// A draft started from an older deploy would silently overwrite whatever was
+// deployed since. Block the deploy and point the model at rebase_draft, unless it
+// explicitly forces the overwrite. `base`/`head` undefined ⇒ can't tell ⇒ allow.
+function assertDraftBasedOnLatest(
+	type: WorkspaceItemType,
+	path: string,
+	base: string | number | undefined,
+	head: string | number | undefined,
+	force: boolean | undefined
+): void {
+	if (force || base == null || head == null || base === head) return
+	throw new Error(
+		`This ${type} draft "${path}" was started from an older deployed version (forked from ${base}, ` +
+			`latest is ${head}). Deploying now would overwrite the version deployed since. Call rebase_draft to ` +
+			`discard the stale draft and get your changes back as a diff, then re-apply them (the new draft ` +
+			`re-bases onto the latest version) and deploy. To deploy as-is and replace the newer version, call ` +
+			`deploy_workspace_item again with force: true.`
+	)
+}
+
+// Discard a stale draft and return its own changes (vs the fork base) as a diff so
+// the model can re-apply them on the latest deploy. Discarding rather than resetting
+// keeps the base pointer honest (the next write re-bases on the current head) and
+// fails safe: a premature deploy hits "no draft" instead of silently shipping the
+// latest unchanged.
+async function rebaseDraft(
+	args: { type: WorkspaceItemType; path: string },
+	ctx: WriteDraftCtx
+): Promise<string> {
+	switch (args.type) {
+		case 'script':
+			return rebaseScriptDraft(args.path, ctx)
+		case 'flow':
+			return rebaseFlowDraft(args.path, ctx)
+		case 'app':
+			return rebaseAppDraft(args.path, ctx)
+		default:
+			throw new Error('rebase_draft currently supports scripts, flows, and apps.')
+	}
+}
+
+async function rebaseScriptDraft(path: string, ctx: WriteDraftCtx): Promise<string> {
+	const { workspace, toolId, toolCallbacks } = ctx
+
+	const draft = await getGlobalDraft(workspace, 'script', path)
+	if (!draft || typeof draft.value !== 'string' || !draft.language) {
+		throw new Error(`No script draft found for "${path}".`)
+	}
+	if (!(await ScriptService.existsScriptByPath({ workspace, path }))) {
+		throw new Error(`Script "${path}" is not deployed; there is no newer version to rebase onto.`)
+	}
+
+	const latest = await ScriptService.getScriptByPath({ workspace, path })
+	const baseHash = draft.parentHash
+	if (baseHash && baseHash === latest.hash) {
+		const message = `Draft "${path}" is already based on the latest deployed version (${latest.hash}).`
+		toolCallbacks.setToolStatus(toolId, { content: message })
+		return JSON.stringify({ success: true, alreadyLatest: true, latest_hash: latest.hash, message })
+	}
+
+	toolCallbacks.setToolStatus(toolId, { content: `Rebasing draft "${path}" onto latest...` })
+
+	// Capture the draft's own changes (vs its fork base) BEFORE discarding — this
+	// diff is the only clean record of what to replay. Best-effort: if the base
+	// version is gone, diff against empty so the full draft is surfaced.
+	let baseContent = ''
+	if (baseHash) {
+		try {
+			baseContent = (await ScriptService.getScriptByHash({ workspace, hash: baseHash })).content
+		} catch (e) {
+			console.error(`rebase_draft: could not fetch base version ${baseHash} for "${path}"`, e)
+		}
+	}
+	const yourChanges = createTwoFilesPatch(
+		'fork-base',
+		'your-draft',
+		baseContent,
+		draft.value,
+		'',
+		''
+	)
+
+	// Discard the stale draft rather than resetting it to latest: the next write
+	// re-bases on the current head, and a premature deploy fails cleanly ("no
+	// draft") instead of silently shipping the latest unchanged and losing the work.
+	await deleteGlobalDraft(workspace, 'script', path)
+
+	toolCallbacks.setToolStatus(toolId, {
+		content: `Discarded stale draft "${path}"`,
+		result: 'Rebased'
+	})
+	return JSON.stringify(
+		{
+			success: true,
+			message:
+				`Discarded the stale draft for "${path}". Your changes are in "your_changes" (a diff against the ` +
+				`version you forked from). Re-apply them with edit_script / write_script — the new draft will be ` +
+				`based on the latest deployed version (hash ${latest.hash}) — then deploy.`,
+			latest_hash: latest.hash,
+			your_changes: yourChanges
+		},
+		null,
+		2
+	)
+}
+
+async function rebaseFlowDraft(path: string, ctx: WriteDraftCtx): Promise<string> {
+	const { workspace, toolId, toolCallbacks } = ctx
+
+	const draft = await getGlobalDraft(workspace, 'flow', path)
+	if (!draft || draft.value === undefined || typeof draft.value === 'string') {
+		throw new Error(`No flow draft found for "${path}".`)
+	}
+	if (!(await FlowService.existsFlowByPath({ workspace, path }))) {
+		throw new Error(`Flow "${path}" is not deployed; there is no newer version to rebase onto.`)
+	}
+
+	const latest = await FlowService.getFlowByPath({ workspace, path })
+	const baseVersion = draft.parentVersionId
+	if (baseVersion != null && baseVersion === latest.version_id) {
+		const message = `Draft "${path}" is already based on the latest deployed version (${latest.version_id}).`
+		toolCallbacks.setToolStatus(toolId, { content: message })
+		return JSON.stringify({
+			success: true,
+			alreadyLatest: true,
+			latest_version: latest.version_id,
+			message
+		})
+	}
+
+	toolCallbacks.setToolStatus(toolId, { content: `Rebasing draft "${path}" onto latest...` })
+
+	// The draft's own changes vs its fork-base flow value, as a JSON diff for the
+	// model to replay. Best-effort: skip if the base version can't be fetched.
+	let baseValue: unknown = {}
+	if (baseVersion != null) {
+		try {
+			baseValue = (await FlowService.getFlowVersion({ workspace, version: baseVersion })).value
+		} catch (e) {
+			console.error(
+				`rebase_draft: could not fetch base flow version ${baseVersion} for "${path}"`,
+				e
+			)
+		}
+	}
+	const oursValue = (draft.value as FlowDraftValue).value
+	const yourChanges = createTwoFilesPatch(
+		'fork-base',
+		'your-draft',
+		JSON.stringify(baseValue, null, 2),
+		JSON.stringify(oursValue, null, 2),
+		'',
+		''
+	)
+
+	// Discard the stale draft (see rebaseScriptDraft): the next write re-bases on
+	// the current head, and a premature deploy fails cleanly instead of shipping
+	// the latest unchanged.
+	await deleteGlobalDraft(workspace, 'flow', path)
+
+	toolCallbacks.setToolStatus(toolId, {
+		content: `Discarded stale draft "${path}"`,
+		result: 'Rebased'
+	})
+	return JSON.stringify(
+		{
+			success: true,
+			message:
+				`Discarded the stale draft for "${path}". Your changes are in "your_changes" (a JSON diff against ` +
+				`the version you forked from). Re-apply them with the flow edit tools — the new draft will be ` +
+				`based on the latest deployed version (version ${latest.version_id}) — then deploy.`,
+			latest_version: latest.version_id,
+			your_changes: yourChanges
+		},
+		null,
+		2
+	)
+}
+
+async function rebaseAppDraft(path: string, ctx: WriteDraftCtx): Promise<string> {
+	const { workspace, toolId, toolCallbacks } = ctx
+
+	const draft = await getGlobalDraft(workspace, 'app', path)
+	if (!draft || !draft.value || typeof draft.value === 'string' || !('files' in draft.value)) {
+		throw new Error(`No app draft found for "${path}".`)
+	}
+	if (!(await AppService.existsApp({ workspace, path }))) {
+		throw new Error(`App "${path}" is not deployed; there is no newer version to rebase onto.`)
+	}
+
+	const deployed = await AppService.getAppByPath({ workspace, path })
+	const headVersion = deployed.versions?.[deployed.versions.length - 1]
+	const baseVersion = draft.parentVersionId
+	if (baseVersion != null && baseVersion === headVersion) {
+		const message = `Draft "${path}" is already based on the latest deployed version (${headVersion}).`
+		toolCallbacks.setToolStatus(toolId, { content: message })
+		return JSON.stringify({
+			success: true,
+			alreadyLatest: true,
+			latest_version: headVersion,
+			message
+		})
+	}
+
+	toolCallbacks.setToolStatus(toolId, { content: `Rebasing draft "${path}" onto latest...` })
+
+	// The draft's own changes vs its fork-base app source, as a JSON diff for the
+	// model to replay. Best-effort: skip if the base version can't be fetched.
+	const oursValue = draft.value as AppDraftValue
+	let baseSource: Pick<AppDraftValue, 'files' | 'runnables' | 'data'> = {
+		files: {},
+		runnables: {},
+		data: undefined
+	}
+	if (baseVersion != null) {
+		try {
+			const baseApp = await AppService.getAppByVersion({ workspace, id: baseVersion })
+			const base = appSourceToDraftValue(baseApp, baseApp)
+			baseSource = { files: base.files, runnables: base.runnables, data: base.data }
+		} catch (e) {
+			console.error(
+				`rebase_draft: could not fetch base app version ${baseVersion} for "${path}"`,
+				e
+			)
+		}
+	}
+	const yourChanges = createTwoFilesPatch(
+		'fork-base',
+		'your-draft',
+		JSON.stringify(baseSource, null, 2),
+		JSON.stringify(
+			{ files: oursValue.files, runnables: oursValue.runnables, data: oursValue.data },
+			null,
+			2
+		),
+		'',
+		''
+	)
+
+	// Discard the stale draft (see rebaseScriptDraft): the next write re-projects
+	// the deployed app into a fresh draft (re-pinning parent_version to the head),
+	// and a premature deploy fails cleanly instead of shipping the latest unchanged.
+	await deleteGlobalDraft(workspace, 'app', path)
+
+	toolCallbacks.setToolStatus(toolId, {
+		content: `Discarded stale draft "${path}"`,
+		result: 'Rebased'
+	})
+	return JSON.stringify(
+		{
+			success: true,
+			message:
+				`Discarded the stale draft for "${path}". Your changes are in "your_changes" (a JSON diff against ` +
+				`the version you forked from). Re-apply them with the app edit tools — the new draft will be based ` +
+				`on the latest deployed version (version ${headVersion}) — then deploy.`,
+			latest_version: headVersion,
+			your_changes: yourChanges
+		},
+		null,
+		2
+	)
+}
+
+// Flush a draft's pending editor autosave, then verify it actually landed before
+// the caller re-reads the persisted draft. `flush()` resolves even when the save
+// recorded a conflict (server has a newer version) or failed (network/5xx) — it
+// does not throw — so without this check a deploy could publish a stale/conflicting
+// draft. Abort with a clear message instead.
+async function flushDraftOrThrow(
+	query: Parameters<typeof UserDraftDbSyncer.flush>[0],
+	label: string
+): Promise<void> {
+	await UserDraftDbSyncer.flush(query)
+	if (UserDraftDbSyncer.getConflict(query).conflict) {
+		throw new Error(
+			`Cannot deploy ${label}: the draft has a conflicting newer version on the server. Open it in the editor and resolve the conflict first.`
+		)
+	}
+	const { state, failureMessage } = UserDraftDbSyncer.getState(query)
+	if (state === 'failed') {
+		throw new Error(
+			`Cannot deploy ${label}: saving the latest draft failed (${failureMessage ?? 'unknown error'}). Retry once the draft saves.`
+		)
+	}
+}
+
 async function deployDraft(
 	args: {
 		type: WorkspaceItemType
 		path: string
 		trigger_kind?: TriggerKind
 		deployment_message?: string
+		force?: boolean
 	},
 	ctx: WriteDraftCtx
 ): Promise<string> {
 	const { workspace, toolId, toolCallbacks, sessionId } = ctx
-	const { type, path, trigger_kind: triggerKind, deployment_message: deploymentMessage } = args
+	const {
+		type,
+		path,
+		trigger_kind: triggerKind,
+		deployment_message: deploymentMessage,
+		force
+	} = args
 
 	if (type === 'trigger' && !triggerKind) {
 		throw new Error('trigger_kind is required when deploying a trigger.')
@@ -3604,175 +4775,263 @@ async function deployDraft(
 	})
 
 	let actions: ToolDisplayAction[] | undefined
+	// Where the deploy actually lands — the app branch can resolve a different
+	// target from the draft's own path fields; the mask rename below must track it.
+	let deployedPath = path
 
-	switch (type) {
-		case 'script': {
+	if (type === 'script' || type === 'flow') {
+		// Promote the full persisted draft via the shared deploy module — the same
+		// "promote a draft to deployed" code the compare page's Review & Deploy uses.
+		// It deploys every field of the draft; the previous local builders dropped
+		// most config fields (tag, priority, schema, description, concurrency…),
+		// reading them from the already-deployed version instead. The other kinds
+		// below already deploy their draft value directly, so only script/flow need
+		// this. Scripts always create (with parent_hash); a flow on a deployed item
+		// updates, a draft-only flow (no flow row) is created.
+		// Address the draft by its STORAGE path: a draft_only item created in the
+		// editor lives at a synthetic `u/{user}/draft_{uuid}` key while its chosen
+		// path is held in the draft value. The shared deployer reads the draft via
+		// getScriptByPath/getFlowByPath at the path we pass (then deploys at the
+		// draft's own `path`), so passing the display/chosen path would 404. For a
+		// draft on a deployed item the storage path is just the item path.
+		const storagePath = getGlobalDraftStoragePath(workspace, type, path, triggerKind)
+		// The shared deployer re-reads the persisted DB draft, but an open editor's
+		// edit may still be parked in a debounced/disabled autosave. Flush it first so
+		// we deploy the latest value (not a stale persisted one) — and so the
+		// post-deploy draft delete doesn't drop an unsaved edit. `flush` always saves
+		// the parked value (like Ctrl/Cmd+S), since the user explicitly asked to deploy.
+		await flushDraftOrThrow({ workspace, itemKind: type, path: storagePath }, `${type} "${path}"`)
+		// Stale-draft guard: block when the draft was forked from an older deploy than
+		// the current head (unless force), pointing the model at rebase_draft.
+		if (type === 'script') {
 			const existing = (await ScriptService.existsScriptByPath({ workspace, path }))
 				? await ScriptService.getScriptByPath({ workspace, path })
 				: undefined
-			const requestBody = buildScriptDeployRequestBody(path, draft, existing, deploymentMessage)
-			// Infer the arg schema from the content so it matches the code, like the editor does.
-			try {
-				const schema = emptySchema()
-				await inferArgs(requestBody.language, requestBody.content, schema)
-				requestBody.schema = schema
-			} catch (e) {
-				console.error('Failed to infer script schema before deploy', e)
-			}
-			await ScriptService.createScript({ workspace, requestBody })
-			break
-		}
-		case 'flow': {
-			const flowDraft = draft.value as FlowDraftValue
+			assertDraftBasedOnLatest('script', path, draft.parentHash, existing?.hash, force)
+		} else {
 			const existing = (await FlowService.existsFlowByPath({ workspace, path }))
 				? await FlowService.getFlowByPath({ workspace, path })
 				: undefined
-			const requestBody = buildFlowDeployRequestBody(
-				path,
-				draft.summary,
-				flowDraft,
-				existing,
-				deploymentMessage
-			)
-			if (existing) {
-				await FlowService.updateFlow({ workspace, path, requestBody })
-			} else {
-				await FlowService.createFlow({ workspace, requestBody })
-			}
-			break
+			assertDraftBasedOnLatest('flow', path, draft.parentVersionId, existing?.version_id, force)
 		}
-		case 'schedule': {
-			const requestBody = draft.value as any
-			if (await ScheduleService.existsSchedule({ workspace, path })) {
-				await ScheduleService.updateSchedule({ workspace, path, requestBody })
-			} else {
-				await ScheduleService.createSchedule({ workspace, requestBody })
-			}
-			actions = [createOpenScheduleAction(path, requestBody.is_flow ? 'flow' : 'script')]
-			break
+		const draftOnly =
+			type === 'flow'
+				? !(await FlowService.existsFlowByPath({ workspace, path: storagePath }))
+				: false
+		const result = await deployDraftToWorkspace(type, storagePath, workspace, {
+			draftOnly,
+			deploymentMessage
+		})
+		if (!result.success) {
+			throw new Error(result.error ?? `Failed to deploy ${type} "${path}".`)
 		}
-		case 'trigger': {
-			const service = triggerServices[triggerKind!]
-			const requestBody = draft.value as { is_flow?: boolean }
-			if (await service.exists({ workspace, path })) {
-				await service.update({ workspace, path, requestBody })
-			} else {
-				await service.create({ workspace, requestBody })
-			}
-			actions = [
-				createOpenTriggerAction(triggerKind!, path, requestBody.is_flow ? 'flow' : 'script')
-			]
-			break
-		}
-		case 'resource': {
-			const requestBody = draft.value as any
-			if (await ResourceService.existsResource({ workspace, path })) {
-				await ResourceService.updateResource({ workspace, path, requestBody })
-			} else {
-				await ResourceService.createResource({ workspace, requestBody })
-			}
-			actions = [createOpenResourceAction(path)]
-			break
-		}
-		case 'variable': {
-			const requestBody = buildVariableDeployRequestBody(
-				workspace,
-				path,
-				draft.value as CreateVariable
-			)
-			if (await VariableService.existsVariable({ workspace, path })) {
-				await VariableService.updateVariable({ workspace, path, requestBody })
-			} else {
-				await VariableService.createVariable({ workspace, requestBody })
-			}
-			actions = [createOpenVariableAction(path)]
-			break
-		}
-		case 'app': {
-			const appDraft = draft.value as AppDraftValue
-			const appValue: AppDraftValue = {
-				...appDraft,
-				files: { ...(appDraft.files ?? {}) },
-				runnables: { ...(appDraft.runnables ?? {}) },
-				data: appDraft.data ?? { ...DEFAULT_RAW_APP_DATA }
-			}
-			await recomputeAppPolicy(appValue)
-			const policy = appValue.policy
-			if (!policy) {
-				throw new Error(`Draft app "${path}" has no policy to deploy.`)
-			}
-
-			toolCallbacks.setToolStatus(toolId, {
-				content: `Bundling app "${path}"...`
-			})
-			const bundle = await bundleRawAppDraft({
-				workspace,
-				files: appValue.files,
-				onLog: (delta) => {
-					const lines = delta
-						.split('\n')
-						.map((line) => line.trim())
-						.filter(Boolean)
-					const latest = lines[lines.length - 1]
-					if (latest) {
-						toolCallbacks.setToolStatus(toolId, {
-							content: `Bundling app "${path}"... ${latest}`
-						})
-					}
+	} else {
+		switch (type) {
+			case 'schedule': {
+				const requestBody = draft.value as any
+				if (await ScheduleService.existsSchedule({ workspace, path })) {
+					await ScheduleService.updateSchedule({ workspace, path, requestBody })
+				} else {
+					await ScheduleService.createSchedule({ workspace, requestBody })
 				}
-			})
-
-			toolCallbacks.setToolStatus(toolId, {
-				content: `Deploying app "${path}"...`
-			})
-			const rawAppValue = {
-				files: appValue.files,
-				runnables: appValue.runnables,
-				data: appValue.data ?? { ...DEFAULT_RAW_APP_DATA }
+				actions = [createOpenScheduleAction(path, requestBody.is_flow ? 'flow' : 'script')]
+				break
 			}
-			const summary = appValue.summary ?? draft.summary ?? ''
-			if (await AppService.existsApp({ workspace, path })) {
-				// Omit custom_path on update for now. The backend preserves it when absent, while
-				// sending it requires admin privileges; this chat deploy path does not yet mirror
-				// the raw app editor's user/admin-specific custom_path handling.
-				await AppService.updateAppRaw({
+			case 'trigger': {
+				const service = triggerServices[triggerKind!]
+				const requestBody = draft.value as { is_flow?: boolean }
+				if (await service.exists({ workspace, path })) {
+					await service.update({ workspace, path, requestBody })
+				} else {
+					await service.create({ workspace, requestBody })
+				}
+				actions = [
+					createOpenTriggerAction(triggerKind!, path, requestBody.is_flow ? 'flow' : 'script')
+				]
+				break
+			}
+			case 'resource': {
+				const requestBody = draft.value as any
+				if (await ResourceService.existsResource({ workspace, path })) {
+					await ResourceService.updateResource({ workspace, path, requestBody })
+				} else {
+					await ResourceService.createResource({ workspace, requestBody })
+				}
+				actions = [createOpenResourceAction(path)]
+				break
+			}
+			case 'variable': {
+				// The chat keeps secret draft values only in memory (the DB draft
+				// stores `''`); buildVariableDeployRequestBody re-injects the ephemeral
+				// secret, so this can't go through the DB-reading shared deployer.
+				const requestBody = buildVariableDeployRequestBody(
 					workspace,
 					path,
-					formData: {
-						app: {
-							path,
-							value: rawAppValue,
-							summary,
-							policy,
-							deployment_message: deploymentMessage
-						},
-						js: bundle.js,
-						css: bundle.css
-					}
-				})
-			} else {
-				await AppService.createAppRaw({
-					workspace,
-					formData: {
-						app: {
-							path,
-							value: rawAppValue,
-							summary,
-							policy,
-							deployment_message: deploymentMessage,
-							custom_path: appValue.custom_path
-						},
-						js: bundle.js,
-						css: bundle.css
-					}
-				})
+					draft.value as CreateVariable
+				)
+				if (await VariableService.existsVariable({ workspace, path })) {
+					await VariableService.updateVariable({ workspace, path, requestBody })
+				} else {
+					await VariableService.createVariable({ workspace, requestBody })
+				}
+				actions = [createOpenVariableAction(path)]
+				break
+			}
+			case 'app': {
+				// Raw apps store a flat AppDraftValue (files/runnables at top level),
+				// not the deployed app's nested `value` shape the shared raw-app
+				// deployer reads, so they deploy through the chat's own bundle path.
+				const appDraft = draft.value as AppDraftValue
+				// Stale-draft guard: only fetch the deployed head when the draft records
+				// a fork base to compare against (pre-feature drafts have none).
+				if (draft.parentVersionId != null) {
+					const deployedApp = (await AppService.existsApp({ workspace, path }))
+						? await AppService.getAppByPath({ workspace, path })
+						: undefined
+					assertDraftBasedOnLatest(
+						'app',
+						path,
+						draft.parentVersionId,
+						deployedApp?.versions?.[deployedApp.versions.length - 1],
+						force
+					)
+				}
+				const appValue: AppDraftValue = {
+					...appDraft,
+					files: { ...(appDraft.files ?? {}) },
+					runnables: { ...(appDraft.runnables ?? {}) },
+					data: appDraft.data ?? { ...DEFAULT_RAW_APP_DATA }
+				}
+				await recomputeAppPolicy(appValue)
+				const policy = appValue.policy
+				if (!policy) {
+					throw new Error(`Draft app "${path}" has no policy to deploy.`)
+				}
+
+				toolCallbacks.setToolStatus(toolId, {
+					content: `Bundling app "${path}"...`
+				})
+				const bundle = await bundleRawAppDraft({
+					workspace,
+					files: appValue.files,
+					onLog: (delta) => {
+						const lines = delta
+							.split('\n')
+							.map((line) => line.trim())
+							.filter(Boolean)
+						const latest = lines[lines.length - 1]
+						if (latest) {
+							toolCallbacks.setToolStatus(toolId, {
+								content: `Bundling app "${path}"... ${latest}`
+							})
+						}
+					}
+				})
+
+				toolCallbacks.setToolStatus(toolId, {
+					content: `Deploying app "${path}"...`
+				})
+				const rawAppValue = {
+					files: appValue.files,
+					runnables: appValue.runnables,
+					data: appValue.data ?? { ...DEFAULT_RAW_APP_DATA }
+				}
+				const summary = appValue.summary ?? draft.summary ?? ''
+				// Deploy at the draft's chosen path. A draft_only raw app created in the
+				// editor lives at a synthetic `u/{user}/draft_{uuid}` storage key with its
+				// chosen path in the raw_app draft's `draft_path`; the chat's AppDraftValue
+				// doesn't carry it, so read it from the backend draft. For a chat-created app
+				// (real path, no draft_path) or a draft on a deployed app, the storage path
+				// is the deploy path. Same storage-path resolution as script/flow.
+				const storagePath = getGlobalDraftStoragePath(workspace, 'app', path)
+				// `draft_path` is read from the persisted backend draft below, but an
+				// editor rename may still be parked in a debounced/disabled autosave.
+				// Flush first (like script/flow) so we read the latest chosen path.
+				await flushDraftOrThrow(
+					{ workspace, itemKind: 'raw_app', path: storagePath },
+					`app "${path}"`
+				)
+				let targetPath = storagePath
+				try {
+					const row = (await AppService.getAppByPath({
+						workspace,
+						path: storagePath,
+						getDraft: true,
+						rawApp: true
+					})) as { draft?: { draft_path?: string; path?: string }; draft_path?: string }
+					targetPath = row?.draft?.draft_path ?? row?.draft?.path ?? row?.draft_path ?? storagePath
+				} catch (e) {
+					// Only a missing item (404) justifies falling back to the storage path;
+					// a real lookup failure (network/5xx) must abort rather than silently
+					// deploy to the wrong path.
+					if ((e as { status?: number } | null | undefined)?.status === 404) {
+						targetPath = storagePath
+					} else {
+						throw e
+					}
+				}
+				deployedPath = targetPath
+				if (await AppService.existsApp({ workspace, path: targetPath })) {
+					// Omit custom_path on update for now. The backend preserves it when absent, while
+					// sending it requires admin privileges; this chat deploy path does not yet mirror
+					// the raw app editor's user/admin-specific custom_path handling.
+					await AppService.updateAppRaw({
+						workspace,
+						path: targetPath,
+						formData: {
+							app: {
+								path: targetPath,
+								value: rawAppValue,
+								summary,
+								policy,
+								deployment_message: deploymentMessage,
+								// Preserve the policy's on_behalf_of: this chat deploy path has no
+								// on-behalf-of selector, so without the flag the backend resets it to
+								// the deploying user (gated server-side by can_preserve_on_behalf_of).
+								preserve_on_behalf_of: policy.on_behalf_of ? true : undefined
+							},
+							js: bundle.js,
+							css: bundle.css
+						}
+					})
+				} else {
+					await AppService.createAppRaw({
+						workspace,
+						formData: {
+							app: {
+								path: targetPath,
+								value: rawAppValue,
+								summary,
+								policy,
+								deployment_message: deploymentMessage,
+								custom_path: appValue.custom_path,
+								// Preserve the policy's on_behalf_of (see update branch above).
+								preserve_on_behalf_of: policy.on_behalf_of ? true : undefined
+							},
+							js: bundle.js,
+							css: bundle.css
+						}
+					})
+				}
+				break
 			}
-			break
 		}
 	}
 
 	await deleteGlobalDraft(workspace, type, path, triggerKind, { preserveLiveDraft: true })
 
+	// Move the chat's mask entry to the deployed path: a draft-only item's
+	// synthetic storage key never exists deployed, so the entry would otherwise
+	// stop matching anything after the draft is gone.
+	const deployedKind = itemKindFor(type, triggerKind)
+	if (deployedKind) {
+		toolCallbacks.onItemDeployed?.(
+			deployedKind,
+			getGlobalDraftStoragePath(workspace, type, path, triggerKind),
+			deployedPath
+		)
+	}
+
 	// Reload the session preview if it's open on the deployed item. Map the
 	// deploy type to the preview kind — a raw app deploys under 'app' but the
 	// preview addresses it as 'raw_app'; non-previewable types map to undefined.
@@ -3843,6 +5102,17 @@ async function deleteWorkspaceItem(
 
 	await deleteGlobalDraft(workspace, type, path, triggerKind)
 
+	// Record the deletion in the chat's modified-items mask. In a fork this leaves a
+	// reviewable "removed" diff vs the parent that stays scoped to this chat. Keyed
+	// by the same (itemKind, storagePath) as writes so it joins the draft/fork lists.
+	const deletedKind = itemKindFor(type, triggerKind)
+	if (deletedKind) {
+		toolCallbacks.onItemModified?.(
+			deletedKind,
+			getGlobalDraftStoragePath(workspace, type, path, triggerKind)
+		)
+	}
+
 	toolCallbacks.setToolStatus(toolId, {
 		content: `Deleted ${type} "${path}"`,
 		result: 'Deleted'
@@ -3861,13 +5131,36 @@ async function deleteWorkspaceItem(
 }
 
 export function prepareGlobalSystemMessage(
-	customPrompt?: string,
-	opts?: { previewTools?: boolean }
+	instructions?: { workspace?: string; user?: string },
+	opts?: {
+		previewTools?: boolean
+		// Identity the path-convention guidance is built from. Production omits it
+		// (read from userStore); callers that must not touch the process-global
+		// store (the eval harness) pass it explicitly instead.
+		user?: { username: string; is_admin?: boolean; folders?: string[]; folders_read?: string[] }
+		skills?: AiSkillListItem[]
+	}
 ): ChatCompletionSystemMessageParam {
-	const username = get(userStore)?.username ?? ''
-	let content = buildGlobalSystemPrompt(username, opts?.previewTools ?? false)
-	if (customPrompt?.trim()) {
-		content = `${content}\n\nUSER GIVEN INSTRUCTIONS:\n${customPrompt.trim()}`
+	const user = opts?.user ?? get(userStore)
+	const username = user?.username ?? ''
+	const folderCtx: FolderPromptContext | undefined = user
+		? {
+				folders: user.folders ?? [],
+				foldersRead: user.folders_read ?? user.folders ?? [],
+				isAdmin: user.is_admin ?? false
+			}
+		: undefined
+	let content = buildGlobalSystemPrompt(
+		username,
+		opts?.previewTools ?? false,
+		folderCtx,
+		opts?.skills ?? []
+	)
+	if (instructions?.workspace?.trim()) {
+		content = `${content}\n\nWORKSPACE INSTRUCTIONS (configured by a workspace admin, shared by everyone in this workspace — you cannot modify these):\n${instructions.workspace.trim()}`
+	}
+	if (instructions?.user?.trim()) {
+		content = `${content}\n\nUSER INSTRUCTIONS (this user's personal instructions — update them with the update_user_instructions tool when the user asks you to remember, change, or stop something):\n${instructions.user.trim()}`
 	}
 
 	return {
@@ -3893,7 +5186,10 @@ export function prepareGlobalUserMessage(
 	options: GlobalUserMessageOptions = {}
 ): ChatCompletionUserMessageParam {
 	const selectedWorkspaceItems = selectedContext.filter(
-		(context) => context.type === 'workspace_script' || context.type === 'workspace_flow'
+		(context) =>
+			context.type === 'workspace_script' ||
+			context.type === 'workspace_flow' ||
+			context.type === 'workspace_app'
 	)
 	const activeEditor =
 		options.activeEditor ??
@@ -3910,7 +5206,13 @@ export function prepareGlobalUserMessage(
 	if (selectedWorkspaceItems.length > 0) {
 		content += '## SELECTED CONTEXT\n'
 		for (const context of selectedWorkspaceItems) {
-			content += `- type: ${context.type === 'workspace_script' ? 'script' : 'flow'}, path: ${context.path}\n`
+			const itemType =
+				context.type === 'workspace_script'
+					? 'script'
+					: context.type === 'workspace_flow'
+						? 'flow'
+						: 'raw_app'
+			content += `- type: ${itemType}, path: ${context.path}\n`
 		}
 		content += '\n'
 	}
diff --git a/frontend/src/lib/components/copilot/chat/global/deployRequests.test.ts b/frontend/src/lib/components/copilot/chat/global/deployRequests.test.ts
deleted file mode 100644
index 61a6827cbf..0000000000
--- a/frontend/src/lib/components/copilot/chat/global/deployRequests.test.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { Flow, NewScript, Script } from '$lib/gen/types.gen'
-import { buildFlowDeployRequestBody, buildScriptDeployRequestBody } from './deployRequests'
-import type { WorkspaceItem } from './workspaceItems'
-
-describe('global AI deploy request builders', () => {
-	it('preserves existing script metadata while replacing draft-controlled fields', () => {
-		const existing = {
-			hash: 'parent-hash',
-			path: 'f/demo/script',
-			summary: 'existing summary',
-			description: 'existing description',
-			content: 'old content',
-			schema: { properties: { name: { type: 'string' } } },
-			is_template: true,
-			language: 'bun',
-			kind: 'script',
-			tag: 'node',
-			envs: ['ENV_A'],
-			concurrent_limit: 3,
-			concurrency_time_window_s: 60,
-			concurrency_key: 'key',
-			debounce_key: 'debounce',
-			debounce_delay_s: 5,
-			debounce_args_to_accumulate: ['ids'],
-			max_total_debouncing_time: 120,
-			max_total_debounces_amount: 4,
-			cache_ttl: 30,
-			cache_ignore_s3_path: true,
-			dedicated_worker: true,
-			ws_error_handler_muted: true,
-			priority: 9,
-			restart_unless_cancelled: true,
-			timeout: 300,
-			delete_after_secs: 600,
-			visible_to_runner_only: true,
-			auto_kind: 'script',
-			codebase: 'repo',
-			has_preprocessor: true,
-			on_behalf_of_email: 'deployer@example.com',
-			assets: [{ path: 's3://bucket/key', kind: 's3object' }],
-			modules: { 'helper.ts': { content: 'export const helper = 1', language: 'bun' } },
-			labels: ['prod'],
-			lock: 'stale lock'
-		} as unknown as Script & Partial<NewScript>
-		const draft: WorkspaceItem = {
-			type: 'script',
-			path: 'f/demo/script',
-			summary: 'draft summary',
-			language: 'bun',
-			value: 'new content',
-			isDraft: true
-		}
-
-		const requestBody = buildScriptDeployRequestBody('f/demo/script', draft, existing, 'ai deploy')
-
-		expect(requestBody).toMatchObject({
-			path: 'f/demo/script',
-			parent_hash: 'parent-hash',
-			summary: 'draft summary',
-			description: 'existing description',
-			content: 'new content',
-			schema: existing.schema,
-			tag: 'node',
-			envs: ['ENV_A'],
-			concurrent_limit: 3,
-			concurrency_time_window_s: 60,
-			concurrency_key: 'key',
-			debounce_key: 'debounce',
-			debounce_delay_s: 5,
-			debounce_args_to_accumulate: ['ids'],
-			max_total_debouncing_time: 120,
-			max_total_debounces_amount: 4,
-			cache_ttl: 30,
-			cache_ignore_s3_path: true,
-			dedicated_worker: true,
-			ws_error_handler_muted: true,
-			priority: 9,
-			restart_unless_cancelled: true,
-			timeout: 300,
-			delete_after_secs: 600,
-			visible_to_runner_only: true,
-			auto_kind: 'script',
-			codebase: 'repo',
-			has_preprocessor: true,
-			on_behalf_of_email: 'deployer@example.com',
-			preserve_on_behalf_of: true,
-			assets: existing.assets,
-			modules: existing.modules,
-			labels: ['prod'],
-			deployment_message: 'ai deploy'
-		})
-		expect(requestBody.lock).toBeUndefined()
-	})
-
-	it('preserves existing flow metadata and uses draft value/schema overrides', () => {
-		const existing = {
-			path: 'f/demo/flow',
-			summary: 'existing summary',
-			description: 'existing description',
-			value: { modules: [] },
-			schema: { required: ['name'] },
-			tag: 'python',
-			ws_error_handler_muted: true,
-			priority: 7,
-			dedicated_worker: true,
-			timeout: 60,
-			visible_to_runner_only: true,
-			on_behalf_of_email: 'deployer@example.com',
-			labels: ['critical']
-		} as unknown as Flow
-		const draftValue = {
-			value: { modules: [{ id: 'step', value: { type: 'identity' } }] },
-			schema: { properties: { name: { type: 'string' } } },
-			groups: [{ start_id: 'step', end_id: 'step', summary: 'Group' }]
-		}
-
-		const requestBody = buildFlowDeployRequestBody(
-			'f/demo/flow',
-			undefined,
-			draftValue as any,
-			existing,
-			'ai deploy'
-		)
-
-		expect(requestBody).toMatchObject({
-			path: 'f/demo/flow',
-			summary: 'existing summary',
-			description: 'existing description',
-			schema: draftValue.schema,
-			tag: 'python',
-			ws_error_handler_muted: true,
-			priority: 7,
-			dedicated_worker: true,
-			timeout: 60,
-			visible_to_runner_only: true,
-			on_behalf_of_email: 'deployer@example.com',
-			preserve_on_behalf_of: true,
-			labels: ['critical'],
-			deployment_message: 'ai deploy'
-		})
-		expect(requestBody.value.modules).toHaveLength(1)
-		expect(requestBody.value.groups).toEqual(draftValue.groups)
-	})
-
-	it('deploys a draft-set flow description, overriding the existing one', () => {
-		const existing = {
-			path: 'f/demo/flow',
-			summary: 'existing summary',
-			description: 'existing description',
-			value: { modules: [] },
-			schema: {}
-		} as unknown as Flow
-
-		const requestBody = buildFlowDeployRequestBody(
-			'f/demo/flow',
-			undefined,
-			{
-				value: { modules: [] },
-				schema: null,
-				groups: null,
-				description: 'draft-set description'
-			} as any,
-			existing,
-			undefined
-		)
-
-		expect(requestBody.description).toBe('draft-set description')
-	})
-
-	it('falls back to existing flow schema when the draft has no schema', () => {
-		const existing = {
-			path: 'f/demo/flow',
-			summary: 'existing summary',
-			value: { modules: [] },
-			schema: { properties: { existing: { type: 'boolean' } } }
-		} as unknown as Flow
-
-		const requestBody = buildFlowDeployRequestBody(
-			'f/demo/flow',
-			'draft summary',
-			{ value: { modules: [] }, schema: null, groups: null },
-			existing,
-			undefined
-		)
-
-		expect(requestBody.summary).toBe('draft summary')
-		expect(requestBody.schema).toBe(existing.schema)
-	})
-})
diff --git a/frontend/src/lib/components/copilot/chat/global/deployRequests.ts b/frontend/src/lib/components/copilot/chat/global/deployRequests.ts
deleted file mode 100644
index 5fe44566c9..0000000000
--- a/frontend/src/lib/components/copilot/chat/global/deployRequests.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import type { Flow, NewScript, OpenFlowWPath, Script } from '$lib/gen/types.gen'
-import type { FlowDraftValue, WorkspaceItem } from './workspaceItems'
-
-type ScriptWithDeployMetadata = Script & Partial<Pick<NewScript, 'assets' | 'cache_ignore_s3_path'>>
-
-export type FlowDeployRequestBody = OpenFlowWPath & {
-	deployment_message?: string
-}
-
-function preserveOnBehalfOf(email: string | undefined): true | undefined {
-	return email ? true : undefined
-}
-
-export function buildScriptDeployRequestBody(
-	path: string,
-	draft: WorkspaceItem,
-	existing: Script | undefined,
-	deploymentMessage: string | undefined
-): NewScript {
-	if (typeof draft.value !== 'string' || !draft.language) {
-		throw new Error(`Draft script "${path}" is missing content or language.`)
-	}
-
-	const existingWithMetadata = existing as ScriptWithDeployMetadata | undefined
-
-	return {
-		path,
-		summary: draft.summary ?? existing?.summary ?? '',
-		description: existing?.description ?? '',
-		content: draft.value,
-		parent_hash: existing?.hash,
-		schema: existing?.schema,
-		is_template: existing?.is_template,
-		language: draft.language,
-		kind: existing?.kind,
-		tag: existing?.tag,
-		envs: existing?.envs,
-		concurrent_limit: existing?.concurrent_limit,
-		concurrency_time_window_s: existing?.concurrency_time_window_s,
-		debounce_key: existing?.debounce_key,
-		debounce_delay_s: existing?.debounce_delay_s,
-		debounce_args_to_accumulate: existing?.debounce_args_to_accumulate,
-		max_total_debouncing_time: existing?.max_total_debouncing_time,
-		max_total_debounces_amount: existing?.max_total_debounces_amount,
-		cache_ttl: existing?.cache_ttl,
-		cache_ignore_s3_path: existingWithMetadata?.cache_ignore_s3_path,
-		dedicated_worker: existing?.dedicated_worker,
-		ws_error_handler_muted: existing?.ws_error_handler_muted,
-		priority: existing?.priority,
-		restart_unless_cancelled: existing?.restart_unless_cancelled,
-		timeout: existing?.timeout,
-		delete_after_secs: existing?.delete_after_secs,
-		deployment_message: deploymentMessage,
-		concurrency_key: existing?.concurrency_key,
-		visible_to_runner_only: existing?.visible_to_runner_only,
-		auto_kind: existing?.auto_kind,
-		codebase: existing?.codebase,
-		has_preprocessor: existing?.has_preprocessor,
-		on_behalf_of_email: existing?.on_behalf_of_email,
-		preserve_on_behalf_of: preserveOnBehalfOf(existing?.on_behalf_of_email),
-		assets: existingWithMetadata?.assets,
-		modules: existing?.modules,
-		labels: existing?.labels
-	}
-}
-
-function flowValueWithDraftGroups(flowDraft: FlowDraftValue): FlowDraftValue['value'] {
-	if (flowDraft.groups === undefined) {
-		return flowDraft.value
-	}
-	return {
-		...flowDraft.value,
-		groups: flowDraft.groups ?? undefined
-	}
-}
-
-export function buildFlowDeployRequestBody(
-	path: string,
-	draftSummary: string | undefined,
-	flowDraft: FlowDraftValue,
-	existing: Flow | undefined,
-	deploymentMessage: string | undefined
-): FlowDeployRequestBody {
-	return {
-		path,
-		summary: draftSummary ?? existing?.summary ?? '',
-		description: flowDraft.description ?? existing?.description ?? '',
-		value: flowValueWithDraftGroups(flowDraft),
-		schema: flowDraft.schema ?? existing?.schema ?? {},
-		tag: existing?.tag,
-		ws_error_handler_muted: existing?.ws_error_handler_muted,
-		priority: existing?.priority,
-		dedicated_worker: existing?.dedicated_worker,
-		timeout: existing?.timeout,
-		visible_to_runner_only: existing?.visible_to_runner_only,
-		on_behalf_of_email: existing?.on_behalf_of_email,
-		preserve_on_behalf_of: preserveOnBehalfOf(existing?.on_behalf_of_email),
-		labels: existing?.labels,
-		deployment_message: deploymentMessage
-	}
-}
diff --git a/frontend/src/lib/components/copilot/chat/global/gate.ts b/frontend/src/lib/components/copilot/chat/global/gate.ts
index 664f06ff39..df8035de87 100644
--- a/frontend/src/lib/components/copilot/chat/global/gate.ts
+++ b/frontend/src/lib/components/copilot/chat/global/gate.ts
@@ -11,8 +11,8 @@
  * When the mode is ready to ship to everyone, replace every call to
  * `isGlobalAiEnabled()` with `true` and delete this file. The references are
  * intentionally narrow (chat mode visibility, custom prompt settings, the
- * `change_mode` tool enum, and the `/global_drafts` dev route) so the rip-out
- * is a small grep.
+ * `change_mode` tool enum, the AI skills workspace settings tab, and the
+ * `/global_drafts` dev route) so the rip-out is a small grep.
  */
 const STORAGE_KEY = 'wm_dev_global_ai'
 
diff --git a/frontend/src/lib/components/copilot/chat/global/pageNavigation.test.ts b/frontend/src/lib/components/copilot/chat/global/pageNavigation.test.ts
new file mode 100644
index 0000000000..5f7a84ee1c
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/global/pageNavigation.test.ts
@@ -0,0 +1,66 @@
+import { describe, it, expect } from 'vitest'
+import {
+	buildWorkspaceSettingsUrl,
+	buildAuditLogsUrl,
+	buildResourcesUrl,
+	buildVariablesUrl,
+	buildTriggersUrl,
+	buildFoldersUrl
+} from './pageNavigation'
+
+function parse(appPath: string): URL {
+	return new URL(appPath, 'http://x')
+}
+
+describe('pageNavigation builders', () => {
+	it('opens workspace settings on a specific tab', () => {
+		const u = parse(buildWorkspaceSettingsUrl({ tab: 'git_sync' }))
+		expect(u.pathname).toBe('/workspace_settings')
+		expect(u.searchParams.get('tab')).toBe('git_sync')
+	})
+
+	it('opens workspace settings with no tab', () => {
+		const u = parse(buildWorkspaceSettingsUrl({}))
+		expect(u.pathname).toBe('/workspace_settings')
+		expect(u.search).toBe('')
+	})
+
+	it('audit logs allow-lists its own keys and drops others', () => {
+		const u = parse(
+			buildAuditLogsUrl({ username: 'admin', operation: 'jobs.run', status: 'failure' })
+		)
+		expect(u.pathname).toBe('/audit_logs')
+		expect(u.searchParams.get('username')).toBe('admin')
+		expect(u.searchParams.get('operation')).toBe('jobs.run')
+		expect(u.searchParams.has('status')).toBe(false) // not an audit-logs key
+	})
+
+	it('resources keeps resource_type + path, drops runs-only keys', () => {
+		const u = parse(
+			buildResourcesUrl({ resource_type: 'postgres', path: 'f/x', status: 'failure' })
+		)
+		expect(u.searchParams.get('resource_type')).toBe('postgres')
+		expect(u.searchParams.get('path')).toBe('f/x')
+		expect(u.searchParams.has('status')).toBe(false)
+	})
+
+	it('variables keeps path + owner only', () => {
+		const u = parse(buildVariablesUrl({ path: 'f/x', owner: 'u/alice', resource_type: 'postgres' }))
+		expect(u.searchParams.get('path')).toBe('f/x')
+		expect(u.searchParams.get('owner')).toBe('u/alice')
+		expect(u.searchParams.has('resource_type')).toBe(false)
+	})
+
+	it('triggers route to the kind page, opening a specific trigger via hash', () => {
+		expect(parse(buildTriggersUrl({ trigger_kind: 'kafka' })).pathname).toBe('/kafka_triggers')
+		const u = parse(buildTriggersUrl({ trigger_kind: 'http', open: 'f/a/b' }))
+		expect(u.pathname).toBe('/routes')
+		expect(u.hash).toBe('#f/a/b')
+	})
+
+	it('folders opens the list page with no params', () => {
+		const u = parse(buildFoldersUrl())
+		expect(u.pathname).toBe('/folders')
+		expect(u.search).toBe('')
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/global/pageNavigation.ts b/frontend/src/lib/components/copilot/chat/global/pageNavigation.ts
new file mode 100644
index 0000000000..ea783e19e7
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/global/pageNavigation.ts
@@ -0,0 +1,133 @@
+import { buildFilterUrl } from '$lib/navigation'
+import { buildRunsFilterSearchbarSchema } from '$lib/components/runs/runsFilter'
+import { buildSchedulesFilterSchema } from '$lib/components/schedules/schedulesFilter'
+import { TRIGGER_PAGES, type TriggerKind } from '$lib/components/sessions/previewRouter'
+
+// In-app paths for the deep-linkable preview pages the AI chat can open.
+export const RUNS_PATH = '/runs'
+export const SCHEDULES_PATH = '/schedules'
+export const VARIABLES_PATH = '/variables'
+export const RESOURCES_PATH = '/resources'
+export const ASSETS_PATH = '/assets'
+export const AUDIT_LOGS_PATH = '/audit_logs'
+export const WORKSPACE_SETTINGS_PATH = '/workspace_settings'
+export const FOLDERS_PATH = '/folders'
+export const GROUPS_PATH = '/groups'
+
+// Selectable tabs on the Workspace settings page (the `?tab=` query param). Mirrors the
+// union in routes/(root)/(logged)/workspace_settings/+page.svelte.
+export const WORKSPACE_SETTINGS_TABS = [
+	'users',
+	'slack',
+	'teams',
+	'premium',
+	'general',
+	'webhook',
+	'deploy_to',
+	'dev_workspace',
+	'error_handler',
+	'success_handler',
+	'critical_alerts',
+	'ai',
+	'windmill_data_tables',
+	'windmill_lfs',
+	'volume_storage',
+	'ducklake',
+	'git_sync',
+	'default_app',
+	'native_triggers',
+	'encryption',
+	'dependencies',
+	'rulesets',
+	'shared_ui'
+] as const
+
+// Valid query-param keys are derived from the real filter schemas (option arrays are
+// irrelevant to the key set), so a renamed filter key propagates here for free.
+const RUNS_FILTER_KEYS = Object.keys(
+	buildRunsFilterSearchbarSchema({
+		paths: [],
+		usernames: [],
+		folders: [],
+		jobTriggerKinds: [],
+		isSuperAdminOrDevops: false,
+		isAdminsWorkspace: false
+	})
+)
+const SCHEDULES_FILTER_KEYS = Object.keys(
+	buildSchedulesFilterSchema({ paths: [], scriptPaths: [] })
+)
+
+/** Deep-link to the Runs page with the given filters (keys must match `runsFilter`). */
+export function buildRunsUrl(filters: Record<string, unknown>): string {
+	return buildFilterUrl(RUNS_PATH, filters, { validKeys: RUNS_FILTER_KEYS })
+}
+
+/**
+ * Deep-link to the Schedules page. When `open` is set, the schedule at that exact path
+ * is opened in the edit drawer via the `#<schedule_path>` hash the page already handles.
+ */
+export function buildSchedulesUrl({
+	open,
+	filters
+}: {
+	open?: string
+	filters?: Record<string, unknown>
+}): string {
+	return buildFilterUrl(SCHEDULES_PATH, filters ?? {}, {
+		validKeys: SCHEDULES_FILTER_KEYS,
+		hash: open
+	})
+}
+
+// The remaining pages expose a curated subset of each page's real query params (not the
+// full filter schema), so the allow-list is the exact set of keys the builder emits —
+// these names match the query params the pages read (variablesFilter/resourcesFilter/
+// assetsFilter and audit_logs/+page.svelte).
+export function buildVariablesUrl(filters: Record<string, unknown>): string {
+	return buildFilterUrl(VARIABLES_PATH, filters, { validKeys: ['path', 'owner'] })
+}
+
+export function buildResourcesUrl(filters: Record<string, unknown>): string {
+	return buildFilterUrl(RESOURCES_PATH, filters, {
+		validKeys: ['path', 'resource_type', 'owner']
+	})
+}
+
+export function buildAssetsUrl(filters: Record<string, unknown>): string {
+	return buildFilterUrl(ASSETS_PATH, filters, { validKeys: ['path'] })
+}
+
+export function buildAuditLogsUrl(filters: Record<string, unknown>): string {
+	return buildFilterUrl(AUDIT_LOGS_PATH, filters, {
+		validKeys: ['username', 'operation', 'resource']
+	})
+}
+
+/** Deep-link to the Workspace settings page, optionally on a specific `?tab=`. */
+export function buildWorkspaceSettingsUrl({ tab }: { tab?: string }): string {
+	return buildFilterUrl(WORKSPACE_SETTINGS_PATH, tab ? { tab } : {})
+}
+
+/** Folders and Groups list pages have no query filters — just open them. */
+export function buildFoldersUrl(): string {
+	return FOLDERS_PATH
+}
+
+export function buildGroupsUrl(): string {
+	return GROUPS_PATH
+}
+
+/**
+ * Deep-link to a trigger list page (by kind). When `open` is set, the trigger at that
+ * exact path is opened in the edit drawer via the `#<path>` hash the page handles.
+ */
+export function buildTriggersUrl({
+	trigger_kind,
+	open
+}: {
+	trigger_kind: TriggerKind
+	open?: string
+}): string {
+	return buildFilterUrl(TRIGGER_PAGES[trigger_kind].path, {}, { hash: open })
+}
diff --git a/frontend/src/lib/components/copilot/chat/global/userDraftAdapter.ts b/frontend/src/lib/components/copilot/chat/global/userDraftAdapter.ts
index 009050342e..342717f26e 100644
--- a/frontend/src/lib/components/copilot/chat/global/userDraftAdapter.ts
+++ b/frontend/src/lib/components/copilot/chat/global/userDraftAdapter.ts
@@ -1,7 +1,5 @@
 import type { Flow, NewSchedule, NewScript } from '$lib/gen/types.gen'
 import { DraftService } from '$lib/gen'
-import { get } from 'svelte/store'
-import { userStore } from '$lib/stores'
 import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 import { DEFAULT_DATA as DEFAULT_RAW_APP_DATA } from '$lib/components/raw_apps/dataTableRefUtils'
 import { UserDraft, type UserDraftEntry, type UserDraftItemKind } from '$lib/userDraft.svelte'
@@ -66,7 +64,10 @@ function normalizeAppDraftValue(value: AppDraftValue): AppDraftValue {
 		runnables: { ...(value.runnables ?? {}) },
 		data: value.data ?? { ...DEFAULT_RAW_APP_DATA },
 		policy: value.policy === undefined ? undefined : clone(value.policy),
-		custom_path: value.custom_path
+		custom_path: value.custom_path,
+		// Carry the fork-base version through the whitelist — it is dropped on every
+		// save otherwise, which would defeat the stale-draft check.
+		parent_version: value.parent_version
 	}
 }
 
@@ -105,7 +106,7 @@ function clearEphemeralSecretVariableDraftValues(workspace: string): void {
 	secretVariableDraftValues.delete(workspace)
 }
 
-function itemKindFor(
+export function itemKindFor(
 	type: WorkspaceItemType,
 	triggerKind?: TriggerKind
 ): UserDraftItemKind | undefined {
@@ -135,6 +136,7 @@ function scriptDraftToWorkspaceItem(path: string, draft: NewScript): WorkspaceIt
 		summary: draft.summary,
 		language: draft.language,
 		value: draft.content,
+		parentHash: draft.parent_hash,
 		isDraft: true
 	}
 }
@@ -144,6 +146,10 @@ function flowDraftToWorkspaceItem(path: string, draft: Flow): WorkspaceItem {
 		type: 'flow',
 		path,
 		summary: draft.summary,
+		// The persisted flow draft carries `version_id` (the deployed head it was
+		// forked from, pinned at fork by writeDraft/the editor) — the flow analog
+		// of a script's parent_hash.
+		parentVersionId: draft.version_id,
 		value: {
 			value: draft.value,
 			schema: draft.schema ?? null,
@@ -160,6 +166,7 @@ function appDraftToWorkspaceItem(path: string, draft: AppDraftValue): WorkspaceI
 		type: 'app',
 		path,
 		summary: value.summary,
+		parentVersionId: value.parent_version,
 		value,
 		isDraft: true
 	}
@@ -327,29 +334,26 @@ function getGlobalDraftSlot(
 }
 
 // Current user's persisted draft value (+ records the sync baseline so a later
-// save detects external conflicts). undefined on 404 (no draft at that path).
+// save detects external conflicts). undefined when no draft exists at that path.
+// Uses `getOwnDraft` (not `getDraftForUser`): the latter rejects drawer kinds
+// (schedule/trigger/resource/variable drafts are private to their owner), which
+// would make those drafts write-only here — listed but never readable/deployable.
+// Errors (403/500/network) MUST propagate: swallowing one would make the write
+// merge fall through to the deployed item instead of the user's in-progress
+// draft, silently overwriting their draft-only changes.
 async function fetchBackendDraftValue(
 	workspace: string,
 	itemKind: UserDraftItemKind,
 	storagePath: string
 ): Promise<unknown | undefined> {
-	try {
-		const resp = await DraftService.getDraftForUser({
-			workspace,
-			kind: itemKind as any,
-			path: storagePath,
-			username: get(userStore)?.username
-		})
-		UserDraftDbSyncer.recordRemoteSync({ workspace, itemKind, path: storagePath }, resp.created_at)
-		return resp.value ?? undefined
-	} catch (e) {
-		// 404 = no draft for this owner at that path (the intended empty case).
-		// Anything else (403/500/network) MUST propagate: swallowing it would make
-		// the write merge fall through to the deployed item instead of the user's
-		// in-progress draft, silently overwriting their draft-only changes.
-		if ((e as { status?: number } | null | undefined)?.status === 404) return undefined
-		throw e
-	}
+	const resp = await DraftService.getOwnDraft({
+		workspace,
+		kind: itemKind,
+		path: storagePath
+	})
+	if (!resp) return undefined
+	UserDraftDbSyncer.recordRemoteSync({ workspace, itemKind, path: storagePath }, resp.created_at)
+	return resp.value ?? undefined
 }
 
 // Draft VALUE for a write merge: cell-if-present (the user's freshest in-tab
@@ -368,10 +372,25 @@ export async function readGlobalDraftValue<V>(
 	return (await fetchBackendDraftValue(workspace, itemKind, storagePath)) as V | undefined
 }
 
+// `itemKind` + `storagePath` are the canonical identity of the persisted draft
+// (NOT item.path, which is the friendly display path). Callers use them to record
+// the chat's modified-items mask.
 export type DraftPersistResult =
-	| { status: 'saved'; item: WorkspaceItem }
-	| { status: 'conflict'; item: WorkspaceItem; serverTimestamp?: string }
-	| { status: 'error'; item: WorkspaceItem; message: string }
+	| { status: 'saved'; item: WorkspaceItem; itemKind: UserDraftItemKind; storagePath: string }
+	| {
+			status: 'conflict'
+			item: WorkspaceItem
+			itemKind: UserDraftItemKind
+			storagePath: string
+			serverTimestamp?: string
+	  }
+	| {
+			status: 'error'
+			item: WorkspaceItem
+			itemKind: UserDraftItemKind
+			storagePath: string
+			message: string
+	  }
 
 // Persist a built draft value. `UserDraft.seed` reflects it into an open editor's
 // cell WITHOUT a double-POST (no-ops if no cell; its seedNextWrite suppresses the
@@ -408,14 +427,20 @@ export async function persistGlobalDraft(
 	// the chat "saved" while the DB-backed source of truth was never updated.
 	const saveState = UserDraftDbSyncer.getState({ workspace, itemKind, path: storagePath })
 	if (saveState.state === 'failed') {
-		return { status: 'error', item, message: saveState.failureMessage ?? 'Draft save failed' }
+		return {
+			status: 'error',
+			item,
+			itemKind,
+			storagePath,
+			message: saveState.failureMessage ?? 'Draft save failed'
+		}
 	}
 	const conflict = opts.force
 		? undefined
 		: UserDraftDbSyncer.getConflict({ workspace, itemKind, path: storagePath }).conflict
 	return conflict
-		? { status: 'conflict', item, serverTimestamp: conflict.serverTimestamp }
-		: { status: 'saved', item }
+		? { status: 'conflict', item, itemKind, storagePath, serverTimestamp: conflict.serverTimestamp }
+		: { status: 'saved', item, itemKind, storagePath }
 }
 
 export async function getGlobalDraft(
diff --git a/frontend/src/lib/components/copilot/chat/global/workspaceItems.ts b/frontend/src/lib/components/copilot/chat/global/workspaceItems.ts
index 09bbc12da5..a8196a5054 100644
--- a/frontend/src/lib/components/copilot/chat/global/workspaceItems.ts
+++ b/frontend/src/lib/components/copilot/chat/global/workspaceItems.ts
@@ -72,6 +72,9 @@ export type AppDraftValue = {
 	data?: any
 	policy?: Policy
 	custom_path?: string
+	// Fork base: the deployed app version this draft was started from, pinned at
+	// fork. The app analog of a script's parent_hash / a flow's version_id.
+	parent_version?: number
 }
 
 export type ResourceDraftState = {
@@ -99,6 +102,11 @@ export type WorkspaceItem = {
 	summary?: string
 	language?: ScriptLang
 	triggerKind?: TriggerKind
+	// Fork base: the deployed version this draft was started from, compared against
+	// the current deployed head to detect a stale draft. `parentHash` for scripts
+	// (script hash), `parentVersionId` for flows (flow_version id).
+	parentHash?: string
+	parentVersionId?: number
 	value?:
 		| string
 		| FlowDraftValue
diff --git a/frontend/src/lib/components/copilot/chat/mention.test.ts b/frontend/src/lib/components/copilot/chat/mention.test.ts
new file mode 100644
index 0000000000..8d379ce3b4
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/mention.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+import { MENTION_RE, mentionTitle, formatMention } from './mention'
+
+describe('formatMention', () => {
+	it('leaves a simple name bare', () => {
+		expect(formatMention('app.ts')).toBe('@app.ts')
+		expect(formatMention('proj/sub/a.ts')).toBe('@proj/sub/a.ts')
+	})
+	it('brackets a name containing whitespace', () => {
+		expect(formatMention('my file.txt')).toBe('@[my file.txt]')
+		expect(formatMention('my folder/a b.ts')).toBe('@[my folder/a b.ts]')
+	})
+	it('brackets names with HTML-sensitive chars, parens, brackets', () => {
+		expect(formatMention('R&D notes.md')).toBe('@[R&D notes.md]')
+		expect(formatMention('a<b>.txt')).toBe('@[a<b>.txt]')
+		expect(formatMention('report(final).csv')).toBe('@[report(final).csv]')
+	})
+})
+
+describe('mentionTitle', () => {
+	it('strips the @ from a bare mention', () => {
+		expect(mentionTitle('@app.ts')).toBe('app.ts')
+	})
+	it('strips the @[ ] from a bracketed mention', () => {
+		expect(mentionTitle('@[my file.txt]')).toBe('my file.txt')
+	})
+})
+
+describe('MENTION_RE', () => {
+	it('captures a bracketed (spaced) mention whole alongside bare ones', () => {
+		const tokens = [...'see @app.ts and @[my file.txt] ok'.matchAll(MENTION_RE)].map((m) => m[0])
+		expect(tokens).toEqual(['@app.ts', '@[my file.txt]'])
+		expect(tokens.map(mentionTitle)).toEqual(['app.ts', 'my file.txt'])
+	})
+	it('round-trips formatMention → MENTION_RE → mentionTitle for a spaced name', () => {
+		const name = 'my notes (v2).md'
+		const m = `x ${formatMention(name)} y`.match(MENTION_RE)!
+		expect(mentionTitle(m[0])).toBe(name)
+	})
+
+	it('round-trips a name containing both whitespace and a closing bracket', () => {
+		const name = 'notes ] draft.md'
+		expect(formatMention(name)).toBe('@[notes \\] draft.md]')
+		const m = `x ${formatMention(name)} y`.match(MENTION_RE)!
+		expect(m[0]).toBe('@[notes \\] draft.md]')
+		expect(mentionTitle(m[0])).toBe(name)
+	})
+
+	it('round-trips an HTML-sensitive name (highlighter handles HTML-escaping separately)', () => {
+		const name = 'a <b> & c].txt'
+		const m = `x ${formatMention(name)} y`.match(MENTION_RE)!
+		expect(mentionTitle(m[0])).toBe(name)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/mention.ts b/frontend/src/lib/components/copilot/chat/mention.ts
new file mode 100644
index 0000000000..65a2b3b7c6
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/mention.ts
@@ -0,0 +1,31 @@
+/**
+ * `@mention` formatting shared between the chat input (which inserts mentions) and the
+ * textarea highlighter (which parses them) so the two never disagree.
+ *
+ * A simple name is inserted bare (`@app.ts`); a name containing whitespace is bracketed
+ * (`@[my file.txt]`) so it's captured whole instead of truncating at the first space.
+ */
+
+/**
+ * Matches a mention token: a bracketed `@[name with spaces]` (where `\]` and `\\` are
+ * escaped, so a `]` inside the name doesn't end the token early) first, then a bare `@name`.
+ */
+export const MENTION_RE = /@\[(?:\\.|[^\]\\\r\n])*\]|@[\w/.\-\[\]]+/g
+
+/** The title of a mention token (`@name` or `@[name]`), brackets stripped and unescaped. */
+export function mentionTitle(token: string): string {
+	if (token.startsWith('@[') && token.endsWith(']')) {
+		return token.slice(2, -1).replace(/\\(.)/g, '$1')
+	}
+	return token.slice(1)
+}
+
+/** Chars the bare `@name` regex matches without truncating; anything else needs brackets. */
+const BARE_SAFE = /^[\w/.\-]+$/
+
+/** Format a name as a mention token. A bare `@name` only survives for simple names; anything
+ *  with whitespace, HTML-sensitive chars (`< > &`), brackets, parens, etc. is bracketed (with
+ *  `\` and `]` escaped) so the token is captured whole and round-trips through the parser. */
+export function formatMention(name: string): string {
+	return BARE_SAFE.test(name) ? `@${name}` : `@[${name.replace(/[\\\]]/g, '\\$&')}]`
+}
diff --git a/frontend/src/lib/components/copilot/chat/monaco-adapter.ts b/frontend/src/lib/components/copilot/chat/monaco-adapter.ts
index dfe3eb7565..1600d8fe9a 100644
--- a/frontend/src/lib/components/copilot/chat/monaco-adapter.ts
+++ b/frontend/src/lib/components/copilot/chat/monaco-adapter.ts
@@ -129,9 +129,17 @@ export class AIChatEditorHandler {
 			const deletedChange = group.changes[0]
 			const addedChange = group.changes[1]
 			if (deletedChange.type === 'deleted' && addedChange.type === 'added_block') {
-				applyChange(this.editor, deletedChange)
-				addedChange.position.afterLineNumber = deletedChange.range.startLine - 1
-				applyChange(this.editor, addedChange)
+				this.editor.executeEdits('chat', [
+					{
+						range: {
+							startLineNumber: deletedChange.range.startLine,
+							startColumn: 1,
+							endLineNumber: deletedChange.range.endLine + 1,
+							endColumn: 0
+						},
+						text: addedChange.value + '\n'
+					}
+				])
 			} else {
 				throw new Error('Invalid group')
 			}
@@ -284,7 +292,7 @@ export class AIChatEditorHandler {
 			})
 
 			if (!opts?.applyAll) {
-				;({ collection, ids } = await displayVisualChanges(
+				; ({ collection, ids } = await displayVisualChanges(
 					'editor-windmill-chat-style',
 					this.editor,
 					changes,
diff --git a/frontend/src/lib/components/copilot/chat/openai-responses.ts b/frontend/src/lib/components/copilot/chat/openai-responses.ts
index eb1dd2b2d5..426e1e76e2 100644
--- a/frontend/src/lib/components/copilot/chat/openai-responses.ts
+++ b/frontend/src/lib/components/copilot/chat/openai-responses.ts
@@ -454,12 +454,14 @@ export async function getNonStreamingOpenAIResponsesCompletion(
 		workspace?: string
 		resourcePath?: string
 		forceModelProvider?: AIProviderModel
+		maxTokensCap?: number
 	}
 ): Promise<string> {
 	const { provider, config } = getProviderAndCompletionConfig({
 		messages,
 		stream: false,
-		forceModelProvider: options?.forceModelProvider
+		forceModelProvider: options?.forceModelProvider,
+		maxTokensCap: options?.maxTokensCap
 	})
 
 	const { instructions, input } = convertMessagesToResponsesInput(messages)
diff --git a/frontend/src/lib/components/copilot/chat/pipeline/core.test.ts b/frontend/src/lib/components/copilot/chat/pipeline/core.test.ts
new file mode 100644
index 0000000000..4f3e31986d
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/pipeline/core.test.ts
@@ -0,0 +1,171 @@
+import { describe, it, expect, vi } from 'vitest'
+
+// `../shared` transitively pulls in the monaco editor (and its CSS), which the
+// node test environment can't load — mirror the sibling chat tests' stub.
+vi.mock('monaco-editor', () => ({ editor: {} }))
+
+import {
+	pipelineTools,
+	getPipelinePromptSection,
+	type PipelineAIChatHelpers,
+	type PipelineContext
+} from './core'
+import type { ToolCallbacks } from '../shared'
+
+function toolByName(name: string) {
+	const tool = pipelineTools.find((t) => t.def.function.name === name)
+	if (!tool) throw new Error(`tool ${name} not found`)
+	return tool
+}
+
+function noopCallbacks(): ToolCallbacks {
+	return { setToolStatus: () => {}, removeToolStatus: () => {} }
+}
+
+const sampleContext: PipelineContext = {
+	folder: 'analytics',
+	mode: 'edit',
+	nodes: [
+		{
+			path: 'f/analytics/orders',
+			language: 'bun',
+			unsaved: true,
+			writes: ['ducklake://main/orders'],
+			reads: [],
+			triggers: ['schedule']
+		}
+	],
+	assets: ['ducklake://main/orders']
+}
+
+function makeHelpers(overrides: Partial<PipelineAIChatHelpers> = {}): {
+	helpers: { pipeline: PipelineAIChatHelpers }
+	calls: Record<string, any[]>
+} {
+	const calls: Record<string, any[]> = {}
+	const record =
+		(name: string, ret?: any) =>
+		(...args: any[]) => {
+			;(calls[name] ??= []).push(args)
+			return ret
+		}
+	const pipeline: PipelineAIChatHelpers = {
+		getPipelineContext: () => sampleContext,
+		getNodeBody: async (path: string) => {
+			calls.getNodeBody = [...(calls.getNodeBody ?? []), [path]]
+			return { language: 'bun', content: 'export async function main() { return 1 }' }
+		},
+		proposeNode: async (input) => {
+			calls.proposeNode = [...(calls.proposeNode ?? []), [input]]
+			return { path: input.path }
+		},
+		editNode: async (path, content) => {
+			calls.editNode = [...(calls.editNode ?? []), [path, content]]
+		},
+		removeProposedNode: record('removeProposedNode'),
+		testNode: async () => 'job-123',
+		...overrides
+	}
+	return { helpers: { pipeline }, calls }
+}
+
+describe('pipeline tools', () => {
+	it('exposes the expected tool surface', () => {
+		expect(pipelineTools.map((t) => t.def.function.name).sort()).toEqual([
+			'build_pipeline_node',
+			'edit_pipeline_node',
+			'get_pipeline_graph',
+			'read_pipeline_node',
+			'remove_pipeline_node',
+			'test_pipeline_node'
+		])
+	})
+
+	it('get_pipeline_graph returns the live context as JSON', async () => {
+		const { helpers } = makeHelpers()
+		const out = await toolByName('get_pipeline_graph').fn({
+			args: {},
+			workspace: 'w',
+			helpers,
+			toolCallbacks: noopCallbacks(),
+			toolId: 't'
+		})
+		expect(JSON.parse(out)).toMatchObject({ folder: 'analytics' })
+	})
+
+	it('build_pipeline_node forwards to proposeNode and does not deploy', async () => {
+		const { helpers, calls } = makeHelpers()
+		const out = await toolByName('build_pipeline_node').fn({
+			args: {
+				path: 'f/analytics/clean',
+				language: 'bun',
+				content: '// pipeline\nexport async function main() {}',
+				output_kind: 'ducklake'
+			},
+			workspace: 'w',
+			helpers,
+			toolCallbacks: noopCallbacks(),
+			toolId: 't'
+		})
+		expect(calls.proposeNode?.[0]?.[0]).toMatchObject({
+			path: 'f/analytics/clean',
+			language: 'bun',
+			outputKind: 'ducklake'
+		})
+		expect(out).toContain('not deployed')
+	})
+
+	it('edit_pipeline_node reads then applies an exact find/replace', async () => {
+		const { helpers, calls } = makeHelpers({
+			getNodeBody: async () => ({ language: 'bun', content: 'const x = 1\nconst y = 2\n' })
+		})
+		await toolByName('edit_pipeline_node').fn({
+			args: { path: 'f/analytics/orders', old_string: 'const x = 1', new_string: 'const x = 42' },
+			workspace: 'w',
+			helpers,
+			toolCallbacks: noopCallbacks(),
+			toolId: 't'
+		})
+		expect(calls.editNode?.[0]?.[1]).toContain('const x = 42')
+	})
+
+	it('edit_pipeline_node surfaces a clear error when old_string is absent', async () => {
+		const { helpers } = makeHelpers({
+			getNodeBody: async () => ({ language: 'bun', content: 'const x = 1\n' })
+		})
+		await expect(
+			toolByName('edit_pipeline_node').fn({
+				args: { path: 'f/analytics/orders', old_string: 'NOT THERE', new_string: 'x' },
+				workspace: 'w',
+				helpers,
+				toolCallbacks: noopCallbacks(),
+				toolId: 't'
+			})
+		).rejects.toThrow(/was not found/)
+	})
+
+	it('mutation tools fail clearly when no pipeline editor is registered', async () => {
+		await expect(
+			toolByName('build_pipeline_node').fn({
+				args: { path: 'f/a/b', language: 'bun', content: 'x' },
+				workspace: 'w',
+				helpers: {},
+				toolCallbacks: noopCallbacks(),
+				toolId: 't'
+			})
+		).rejects.toThrow(/No pipeline editor is open/)
+	})
+
+	it('test_pipeline_node requires confirmation', () => {
+		expect(toolByName('test_pipeline_node').requiresConfirmation).toBe(true)
+	})
+})
+
+describe('getPipelinePromptSection', () => {
+	it('names the active folder and the direct-draft workflow', () => {
+		const section = getPipelinePromptSection(sampleContext)
+		expect(section).toContain('/pipeline/analytics')
+		expect(section).toContain('build_pipeline_node')
+		expect(section).toContain('directly as unsaved drafts')
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/pipeline/core.ts b/frontend/src/lib/components/copilot/chat/pipeline/core.ts
new file mode 100644
index 0000000000..86fe9eb634
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/pipeline/core.ts
@@ -0,0 +1,328 @@
+import { z } from 'zod'
+import { $ScriptLang } from '$lib/gen/schemas.gen'
+import type { ScriptLang } from '$lib/gen'
+import { createToolDef, executeTestRun, findAndReplace, type Tool } from '../shared'
+import type { PipelineOutputKind } from '$lib/components/assets/AssetGraph/pipelineTemplates'
+
+// ============================================================================
+// Pipeline AI chat tools.
+//
+// These tools extend the GLOBAL chat mode when the user is on a /pipeline/<folder>
+// editor (the page registers `PipelineAIChatHelpers` on the AIChatManager). They
+// let the model read the live pipeline graph and BUILD/EDIT pipeline nodes
+// (scripts annotated with `// pipeline`). Mutations don't deploy: they apply
+// directly as an unsaved DRAFT on the canvas — the same way the flow/script
+// editor applies AI edits — which the user then deploys. There is no separate
+// approve/reject step: the draft IS the change.
+//
+// The pipeline tools are added on top of the full global tool set, so docs
+// search, datatable SQL, and workspace-item tools are already available
+// alongside them — this file only carries the pipeline-graph-specific surface.
+// ============================================================================
+
+/** Compact, model-facing summary of one node in the pipeline graph. */
+export type PipelineNodeSummary = {
+	path: string
+	language?: ScriptLang
+	/** Has an unsaved local edit (draft) not yet deployed. */
+	unsaved: boolean
+	summary?: string
+	/** Asset URIs this node writes (its outputs). */
+	writes: string[]
+	/** Asset URIs this node reads (its inputs). */
+	reads: string[]
+	/** Declared `// on <trigger>` execution-DAG bindings (asset URIs or native kinds). */
+	triggers: string[]
+}
+
+/** Compact, model-facing snapshot of the whole pipeline graph. */
+export type PipelineContext = {
+	folder: string
+	mode: 'view' | 'edit'
+	nodes: PipelineNodeSummary[]
+	/** All storage assets referenced by the graph, as URIs. */
+	assets: string[]
+}
+
+/**
+ * Bridge the pipeline page registers on the AIChatManager. Reads expose the live
+ * graph; writes apply directly as unsaved drafts (never deploy). Kept intentionally
+ * small — the page owns the draft Map and canvas rendering.
+ */
+export interface PipelineAIChatHelpers {
+	getPipelineContext: () => PipelineContext
+	/** Read a node's source (the in-flight draft body if one exists, else deployed). */
+	getNodeBody: (path: string) => Promise<{ language: ScriptLang; content: string } | undefined>
+	/** Create a brand-new pipeline node as an unsaved draft on the canvas. */
+	proposeNode: (input: {
+		path: string
+		language: ScriptLang
+		content: string
+		outputKind?: PipelineOutputKind
+	}) => Promise<{ path: string }>
+	/** Replace an existing node's body, applied as an unsaved draft. */
+	editNode: (path: string, content: string) => Promise<void>
+	/** Discard the unsaved draft at a path (undo a build_pipeline_node). */
+	removeProposedNode: (path: string) => Promise<void>
+	/** Preview-run a node (draft body preferred). Returns the started job id. */
+	testNode: (path: string, args?: Record<string, any>) => Promise<string | undefined>
+}
+
+/** Helper bag the pipeline tools receive from the manager in global mode. */
+export type PipelineToolHelpers = { pipeline?: PipelineAIChatHelpers }
+
+function requirePipeline(helpers: PipelineToolHelpers): PipelineAIChatHelpers {
+	if (!helpers?.pipeline) {
+		throw new Error(
+			'No pipeline editor is open. Pipeline tools only work on a /pipeline/<folder> page in edit mode.'
+		)
+	}
+	return helpers.pipeline
+}
+
+const scriptLangSchema = z.enum($ScriptLang.enum)
+
+const outputKindSchema = z
+	.enum(['none', 'datatable', 'ducklake', 'materialize', 's3_parquet', 's3_object'])
+	.describe(
+		'Kind of output asset this node materializes, used to seed the output edge on the canvas before the body is parsed: "materialize"/"ducklake" → a DuckLake table, "datatable" → a Postgres data table, "s3_parquet"/"s3_object" → an S3 file, "none" → side-effect only. Defaults to none.'
+	)
+
+// ----------------------------------------------------------------------------
+// Read tools
+// ----------------------------------------------------------------------------
+
+const getPipelineGraphSchema = z.object({})
+
+const getPipelineGraphToolDef = createToolDef(
+	getPipelineGraphSchema,
+	'get_pipeline_graph',
+	"Read the live pipeline graph for the open /pipeline/<folder> editor: its nodes (scripts), each node's language, asset reads/writes, declared triggers, and whether it has an unsaved draft edit. Call this before building or editing nodes so you reuse existing assets/paths and understand the current DAG."
+)
+
+const readPipelineNodeSchema = z.object({
+	path: z.string().describe('Workspace path of the pipeline node (script) to read.')
+})
+
+const readPipelineNodeToolDef = createToolDef(
+	readPipelineNodeSchema,
+	'read_pipeline_node',
+	'Read the full source of one pipeline node (its in-flight draft body if it has unsaved edits, otherwise the deployed body). Use before edit_pipeline_node so edits target the exact current text.'
+)
+
+// ----------------------------------------------------------------------------
+// Mutation tools (apply directly as unsaved drafts; never deploy)
+// ----------------------------------------------------------------------------
+
+const buildPipelineNodeSchema = z.object({
+	path: z
+		.string()
+		.describe(
+			"Workspace path for the new node, e.g. f/<folder>/<name>. Use the open pipeline's folder. Must not collide with an existing node."
+		),
+	language: scriptLangSchema.describe(
+		'Script language. SQL-shaped data work uses duckdb (DuckLake/S3) or postgresql (data tables); bun/python3 for general transforms.'
+	),
+	content: z
+		.string()
+		.describe(
+			"Full script source. Start it with the `pipeline` annotation as a top-of-file comment in the LANGUAGE'S comment syntax — `-- pipeline` for SQL (duckdb/postgresql), `# pipeline` for python3/bash, `// pipeline` for bun/TS — to mark it a pipeline member; declare inputs the same way (e.g. `-- on <asset-uri|schedule|webhook|...>`), and write outputs via the wmill SDK / SQL so the lineage edges are inferred. A `// pipeline` line in a SQL node is a syntax error. Read existing node bodies first to match conventions."
+		),
+	output_kind: outputKindSchema.optional()
+})
+
+const buildPipelineNodeToolDef = createToolDef(
+	buildPipelineNodeSchema,
+	'build_pipeline_node',
+	'Build a NEW pipeline node. It is applied directly as an unsaved draft on the canvas (a dashed node wired by its parsed asset reads/writes) — it does NOT deploy; the user deploys it. Prefer this over editing for new scripts.',
+	{ strict: false }
+)
+
+const editPipelineNodeSchema = z.object({
+	path: z.string().describe('Workspace path of the node to edit.'),
+	old_string: z.string().min(1).describe("Exact text to find in the node's current source."),
+	new_string: z.string().describe('Replacement text.'),
+	replace_all: z
+		.boolean()
+		.optional()
+		.default(false)
+		.describe(
+			'When true, replace every exact match. When false, old_string must match exactly once.'
+		)
+})
+
+const editPipelineNodeToolDef = createToolDef(
+	editPipelineNodeSchema,
+	'edit_pipeline_node',
+	'Edit an existing pipeline node by exact find/replace. The result is applied directly as an unsaved draft (does NOT deploy). Call read_pipeline_node first to get the exact current text.',
+	{ strict: false }
+)
+
+const removePipelineNodeSchema = z.object({
+	path: z.string().describe('Workspace path of the node whose unsaved draft should be discarded.')
+})
+
+const removePipelineNodeToolDef = createToolDef(
+	removePipelineNodeSchema,
+	'remove_pipeline_node',
+	'Discard the unsaved draft at a path (undo a build_pipeline_node). Only affects the in-flight draft — to delete a deployed node, ask the user to do it on the canvas.'
+)
+
+const testPipelineNodeSchema = z.object({
+	path: z.string().describe('Workspace path of the node to preview-run.'),
+	args: z
+		.record(z.string(), z.any())
+		.nullable()
+		.optional()
+		.describe('Arguments to pass to the script. Omit or pass null when none are needed.')
+})
+
+const testPipelineNodeToolDef = createToolDef(
+	testPipelineNodeSchema,
+	'test_pipeline_node',
+	'Preview-run one pipeline node (using its draft body when unsaved) and return the result/logs, without deploying. Requires user confirmation before it runs.',
+	{ strict: false }
+)
+
+// ----------------------------------------------------------------------------
+// Tool set
+// ----------------------------------------------------------------------------
+
+export const pipelineTools: Tool<PipelineToolHelpers>[] = [
+	{
+		def: getPipelineGraphToolDef,
+		fn: async ({ helpers, toolId, toolCallbacks }) => {
+			const pipeline = requirePipeline(helpers)
+			toolCallbacks.setToolStatus(toolId, { content: 'Reading pipeline graph...' })
+			const ctx = pipeline.getPipelineContext()
+			toolCallbacks.setToolStatus(toolId, {
+				content: `Read pipeline graph (${ctx.nodes.length} node${ctx.nodes.length === 1 ? '' : 's'})`,
+				result: 'Success'
+			})
+			return JSON.stringify(ctx, null, 2)
+		}
+	},
+	{
+		def: readPipelineNodeToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const pipeline = requirePipeline(helpers)
+			const { path } = readPipelineNodeSchema.parse(args)
+			toolCallbacks.setToolStatus(toolId, { content: `Reading node '${path}'...` })
+			const node = await pipeline.getNodeBody(path)
+			if (!node) {
+				return `No pipeline node found at '${path}'. Call get_pipeline_graph to list the available nodes.`
+			}
+			toolCallbacks.setToolStatus(toolId, { content: `Read node '${path}'`, result: 'Success' })
+			return JSON.stringify({ path, language: node.language, content: node.content })
+		}
+	},
+	{
+		def: buildPipelineNodeToolDef,
+		streamArguments: true,
+		showDetails: true,
+		showFade: true,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const pipeline = requirePipeline(helpers)
+			const { path, language, content, output_kind } = buildPipelineNodeSchema.parse(args)
+			toolCallbacks.setToolStatus(toolId, { content: `Building node '${path}'...` })
+			await pipeline.proposeNode({
+				path,
+				language: language as ScriptLang,
+				content,
+				outputKind: output_kind as PipelineOutputKind | undefined
+			})
+			toolCallbacks.setToolStatus(toolId, {
+				content: `Added draft node '${path}'`,
+				result: 'Success'
+			})
+			return `Pipeline node '${path}' added as an unsaved draft on the canvas. It is not deployed — the user deploys it.`
+		}
+	},
+	{
+		def: editPipelineNodeToolDef,
+		streamArguments: true,
+		showDetails: true,
+		showFade: true,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const pipeline = requirePipeline(helpers)
+			const { path, old_string, new_string, replace_all } = editPipelineNodeSchema.parse(args)
+			const node = await pipeline.getNodeBody(path)
+			if (!node) {
+				return `No pipeline node found at '${path}'. Call get_pipeline_graph to list the available nodes.`
+			}
+			toolCallbacks.setToolStatus(toolId, { content: `Editing node '${path}'...` })
+			const updated = findAndReplace(
+				node.content,
+				old_string,
+				new_string,
+				replace_all ?? false,
+				'node source'
+			)
+			await pipeline.editNode(path, updated)
+			toolCallbacks.setToolStatus(toolId, {
+				content: `Edited draft '${path}'`,
+				result: 'Success'
+			})
+			return `Pipeline node '${path}' updated as an unsaved draft on the canvas (not deployed).`
+		}
+	},
+	{
+		def: removePipelineNodeToolDef,
+		fn: async ({ args, helpers, toolId, toolCallbacks }) => {
+			const pipeline = requirePipeline(helpers)
+			const { path } = removePipelineNodeSchema.parse(args)
+			toolCallbacks.setToolStatus(toolId, { content: `Discarding draft '${path}'...` })
+			await pipeline.removeProposedNode(path)
+			toolCallbacks.setToolStatus(toolId, {
+				content: `Discarded draft '${path}'`,
+				result: 'Success'
+			})
+			return `Discarded the unsaved draft at '${path}'.`
+		}
+	},
+	{
+		def: testPipelineNodeToolDef,
+		requiresConfirmation: true,
+		confirmationMessage: 'Run pipeline node',
+		showDetails: true,
+		autoCollapseDetails: false,
+		fn: async ({ args, workspace, helpers, toolId, toolCallbacks }) => {
+			const pipeline = requirePipeline(helpers)
+			const { path, args: runArgs } = testPipelineNodeSchema.parse(args)
+			return executeTestRun({
+				jobStarter: async () => {
+					const jobId = await pipeline.testNode(path, runArgs ?? undefined)
+					if (!jobId) {
+						throw new Error(`Could not start a run for node '${path}'.`)
+					}
+					return jobId
+				},
+				workspace,
+				toolCallbacks,
+				toolId,
+				startMessage: `Starting run of '${path}'...`,
+				contextName: 'script'
+			})
+		}
+	}
+]
+
+/**
+ * Pipeline-specific guidance appended to the global system prompt when a
+ * /pipeline editor is open. Describes the annotation model and the direct-draft
+ * workflow so the model uses the pipeline tools rather than the generic
+ * write_script draft tools.
+ */
+export function getPipelinePromptSection(ctx: PipelineContext): string {
+	return `
+
+Data Pipeline editor (ACTIVE):
+- The user has the /pipeline/${ctx.folder} editor open. A pipeline is a DAG of scripts (nodes) connected by storage assets (DuckLake tables, data tables, S3 objects, volumes, resources) and execution triggers.
+- Annotations are top-of-file comments in the NODE'S OWN comment syntax: \`--\` for SQL (duckdb/postgresql), \`#\` for python3/bash, \`//\` for bun/TS. The \`//\` shown below is the TS form — translate it (a \`// pipeline\` line in a SQL node is a syntax error that won't deploy).
+- A script becomes a pipeline node when its source starts with the \`// pipeline\` annotation. Declare execution-DAG inputs with \`// on <asset-uri | schedule | webhook | email | kafka | mqtt | nats | postgres | sqs | gcp | data_upload>\` (e.g. \`// on ducklake://main/orders\`). Outputs are inferred from what the body writes (wmill SDK calls / SQL CREATE TABLE / writeS3File); declare a managed output with \`// materialize <asset-uri>\`. Optional badges: \`// partitioned <daily|hourly|weekly|monthly|dynamic>\`, \`// freshness <duration>\`, \`// tag <name>\`, \`// retry <count> [delay]\`, \`// data_test <kind> ...\`.
+- \`materialize\` (the managed output): \`// materialize <asset-uri>\` means the runtime writes the node's output table FOR you — write the body as a single SELECT and the runtime wraps it in the create/replace, so do NOT also write your own CREATE TABLE / INSERT. IMPORTANT: \`// materialize\` is **DuckDB-only** and its target MUST be a DuckLake table (\`ducklake://<name>/<table>\`) — deploy rejects it on any other language or target. For a \`python3\`/\`bun\`/\`postgresql\` node, do NOT use \`// materialize\`; write the output via the SDK instead (e.g. \`wmill.writeS3File(...)\`, a \`CREATE TABLE\` in postgresql, or \`wmill.databaseUrlFromResource\`/ducklake helpers) and let the output be inferred. Reach for \`duckdb\` when a node should materialize a DuckLake table. Write strategy: with no option it REPLACES the whole table each run (full refresh; the only mode whose output columns may change); \`// materialize <uri> append\` INSERT-appends rows (incremental); \`// materialize <uri> key=<col>\` merges/upserts on \`<col>\`. \`// materialize manual <uri>\` opts OUT of managed writes — the script writes its own DDL and the annotation only records the output asset for lineage. \`materialize\` is paired with partitioning for incremental pipelines: a \`// partitioned <daily|hourly|weekly|monthly|dynamic>\` node runs once per partition (append/merge into a fixed-schema table), and the \`{partition}\` token — usable in any asset URI AND in the body SQL — is substituted with the current partition's IDENTITY string at run time. To filter the source to the active slice on a time grain, use the runtime-injected macro: \`WHERE wm_partition(<ts_col>) = {partition}\`. \`wm_partition(ts)\` buckets a timestamp with the exact identity format the runtime used (daily/hourly/weekly/monthly), so it always matches and you never hand-write a \`strftime\` format. Do NOT write \`= TIMESTAMP {partition}\`: the identity string is not a valid timestamp literal for hourly/weekly/monthly and errors at runtime. For \`dynamic\` partitioning the identity is your caller-supplied key (not a timestamp, no macro), so filter on it directly: \`WHERE <your_key_col> = {partition}\`. \`materialize\` is an output DECLARATION on the node — it is not a command; there is no "materialize run".
+- Use get_pipeline_graph to see the current nodes/assets/triggers, and read_pipeline_node before editing one.
+- Build new nodes with build_pipeline_node and edit existing ones with edit_pipeline_node. These apply directly as unsaved drafts on the canvas (like the flow/script editor applies AI edits) — they DO NOT deploy. There is no separate Accept/Reject step. Prefer these over the generic write_script/edit_script draft tools while a pipeline is open.
+- Reuse existing asset paths from the graph when wiring a downstream node to an upstream one (read the upstream's write asset, then \`// on\` that same URI).
+- Only deploy when the user explicitly asks; the user deploys drafts from the canvas.`
+}
diff --git a/frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte b/frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte
index 3709eda53c..2be52a32d2 100644
--- a/frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte
+++ b/frontend/src/lib/components/copilot/chat/script/CodeDisplay.svelte
@@ -1,96 +1,22 @@
 <script lang="ts">
 	import { getAstNode } from 'svelte-exmarkdown'
-	import HighlightCode from '$lib/components/HighlightCode.svelte'
-	import {
-		csharp,
-		go,
-		graphql,
-		javascript,
-		php,
-		python,
-		rust,
-		shell,
-		sql,
-		typescript,
-		yaml
-	} from 'svelte-highlight/languages'
+	import MarkdownCodeBlock from '$lib/components/MarkdownCodeBlock.svelte'
 	import { AIMode } from '../AIChatManager.svelte'
 	import { getAiChatManager } from '../aiChatManagerContext'
 	import { Check, Play } from 'lucide-svelte'
 
+	// Chat `pre` renderer: the shared MarkdownCodeBlock plus the chat-only Apply
+	// button (wired to the script editor) and mermaid diagrams.
 	const aiChatManager = getAiChatManager()
 
 	const astNode = getAstNode()
-
-	function getSmartLang(lang: string) {
-		switch (lang) {
-			case 'python':
-			case 'python3':
-				return 'python'
-			case 'deno':
-			case 'nativets':
-			case 'bun':
-			case 'bunnative':
-			case 'typescript':
-				return 'typescript'
-			case 'go':
-				return 'go'
-			case 'shell':
-			case 'bash':
-				return 'shell'
-			case 'frontend':
-			case 'javascript':
-				return 'javascript'
-			case 'graphql':
-				return 'graphql'
-			case 'mysql':
-			case 'snowflake':
-			case 'bigquery':
-			case 'oracledb':
-			case 'powershell':
-			case 'postgresql':
-			case 'sql':
-				return 'sql'
-			case 'php':
-				return 'php'
-			case 'rust':
-				return 'rust'
-			case 'csharp':
-				return 'csharp'
-			case 'ansible':
-			case 'yaml':
-				return 'yaml'
-			default:
-				return 'typescript'
-		}
-	}
-
-	const SMART_LANG_TO_HIGHLIGHT_LANG = {
-		python: python,
-		typescript: typescript,
-		go: go,
-		shell: shell,
-		javascript: javascript,
-		graphql: graphql,
-		sql: sql,
-		php: php,
-		rust: rust,
-		csharp: csharp,
-		yaml: yaml
-	}
-
 	let code = $derived(astNode.current.children?.[0]?.children?.[0]?.value)
 
-	let language = $derived(
-		(astNode.current.children?.[0]?.properties?.class as string | undefined)?.split('-')[1]
-	)
-
-	// Check if the apply button should be shown
 	let showApplyButton = $derived.by(() => {
 		if (
 			aiChatManager.mode !== AIMode.SCRIPT ||
 			!aiChatManager.scriptEditorApplyCode ||
-			code === aiChatManager.scriptEditorOptions?.code
+			code === aiChatManager.scriptEditorOptions?.getCode()
 		) {
 			return false
 		}
@@ -104,18 +30,9 @@
 	}
 </script>
 
-<div class="flex flex-col gap-0.5 rounded-lg relative not-prose !text-xs">
-	<div
-		class="relative w-full border border-gray-300 dark:border-gray-600 rounded-lg overflow-hidden"
-	>
-		<HighlightCode
-			className="p-1"
-			code={code ?? ''}
-			highlightLanguage={SMART_LANG_TO_HIGHLIGHT_LANG[getSmartLang(language as string)]}
-			language={undefined}
-			onApplyCode={handleApplyCode}
-			{showApplyButton}
-			applyButtonIcon={aiChatManager.pendingNewCode ? Check : Play}
-		/>
-	</div>
-</div>
+<MarkdownCodeBlock
+	{showApplyButton}
+	onApplyCode={handleApplyCode}
+	applyButtonIcon={aiChatManager.pendingNewCode ? Check : Play}
+	renderMermaid
+/>
diff --git a/frontend/src/lib/components/copilot/chat/script/MermaidDisplay.svelte b/frontend/src/lib/components/copilot/chat/script/MermaidDisplay.svelte
new file mode 100644
index 0000000000..dda1892baa
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/script/MermaidDisplay.svelte
@@ -0,0 +1,199 @@
+<script lang="ts">
+	import { randomUUID } from '$lib/utils/uuid'
+	import { useIsDarkMode } from '$lib/components/DarkModeObserver.svelte'
+	import { Button } from '$lib/components/common'
+	import Modal from '$lib/components/common/modal/Modal.svelte'
+	import { copyToClipboard, download } from '$lib/utils'
+	import { ClipboardCopy, Download, Maximize2, Minus, Plus, RotateCcw } from 'lucide-svelte'
+	import type { PanZoom } from 'panzoom'
+
+	let { code }: { code: string } = $props()
+
+	const isDarkMode = useIsDarkMode()
+
+	let svg = $state<string | undefined>(undefined)
+	// The exact source that produced `svg`. The diagram is only shown while this
+	// still matches the current `code`, so a later edit that fails to parse falls
+	// back to the raw source instead of leaving a stale, mismatched diagram.
+	let renderedCode = $state<string | undefined>(undefined)
+	// Monotonic token so an earlier-started render that resolves late can't
+	// overwrite the result of a newer one (out-of-order async on rapid code/theme changes).
+	let renderSeq = 0
+
+	let expanded = $state(false)
+
+	async function render(source: string, dark: boolean) {
+		const seq = ++renderSeq
+		if (!source?.trim()) {
+			svg = undefined
+			renderedCode = undefined
+			return
+		}
+		try {
+			const mermaid = (await import('mermaid')).default
+			mermaid.initialize({
+				startOnLoad: false,
+				theme: dark ? 'dark' : 'default',
+				securityLevel: 'strict',
+				// Throw on parse errors instead of injecting an orphan error diagram into the DOM.
+				suppressErrorRendering: true
+			})
+			// mermaid.render needs a fresh element id per attempt to avoid id collisions.
+			const result = await mermaid.render(`mermaid-${randomUUID()}`, source)
+			if (seq !== renderSeq) return
+			svg = result.svg
+			renderedCode = source
+		} catch {
+			// Parse failure (often a partial block still streaming in): fall back to the
+			// raw source. `showSvg` already hides any previous diagram since `renderedCode`
+			// no longer matches the current `code`.
+		}
+	}
+
+	$effect(() => {
+		void render(code, isDarkMode.val)
+	})
+
+	// Only show the diagram while it corresponds to the current source.
+	let showSvg = $derived(svg !== undefined && renderedCode === code)
+
+	function downloadSvg() {
+		if (svg) {
+			download('mermaid.svg', svg, 'image/svg+xml')
+		}
+	}
+
+	// Pan/zoom is only wired up inside the fullscreen modal so the inline preview
+	// stays a plain, non-interactive thumbnail.
+	let panzoomInstance = $state<PanZoom | undefined>(undefined)
+	let panzoomNode: HTMLElement | undefined = undefined
+
+	function panzoomAction(node: HTMLElement) {
+		let instance: PanZoom | undefined
+		// Guard the async import against a close-before-resolve: without it,
+		// destroy() (instance still undefined) disposes nothing and the late
+		// .then() would build a leaked panzoom on an already-detached node.
+		let disposed = false
+		panzoomNode = node
+		import('panzoom').then(({ default: panzoom }) => {
+			if (disposed) return
+			instance = panzoom(node, {
+				bounds: true,
+				boundsPadding: 0.1,
+				maxZoom: 8,
+				minZoom: 0.2,
+				zoomDoubleClickSpeed: 1,
+				smoothScroll: false
+			})
+			panzoomInstance = instance
+		})
+		return {
+			destroy() {
+				disposed = true
+				instance?.dispose()
+				panzoomInstance = undefined
+				panzoomNode = undefined
+			}
+		}
+	}
+
+	function zoomBy(ratio: number) {
+		if (!panzoomInstance || !panzoomNode) return
+		// smoothZoom anchors on client coordinates — zoom around the viewport center.
+		const rect = panzoomNode.getBoundingClientRect()
+		panzoomInstance.smoothZoom(rect.left + rect.width / 2, rect.top + rect.height / 2, ratio)
+	}
+
+	function resetZoom() {
+		if (!panzoomInstance) return
+		panzoomInstance.moveTo(0, 0)
+		panzoomInstance.zoomAbs(0, 0, 1)
+	}
+</script>
+
+{#if showSvg}
+	<div class="relative">
+		<div class="absolute top-2 right-2 z-20 flex flex-row gap-1">
+			<Button
+				onclick={() => copyToClipboard(code)}
+				color="light"
+				size="xs2"
+				startIcon={{ icon: ClipboardCopy }}
+				iconOnly
+				title="Copy diagram source"
+			/>
+			<Button
+				onclick={downloadSvg}
+				color="light"
+				size="xs2"
+				startIcon={{ icon: Download }}
+				iconOnly
+				title="Download as SVG"
+			/>
+			<Button
+				onclick={() => (expanded = true)}
+				color="light"
+				size="xs2"
+				startIcon={{ icon: Maximize2 }}
+				iconOnly
+				title="Expand and zoom"
+			/>
+		</div>
+		<div class="p-2 flex justify-center overflow-x-auto">
+			<!-- eslint-disable-next-line svelte/no-at-html-tags -->
+			{@html svg}
+		</div>
+	</div>
+
+	<Modal bind:open={expanded} title="Diagram" kind="X" class="sm:max-w-none w-[92vw]">
+		{#snippet settings()}
+			<div class="flex flex-row gap-1 mr-8">
+				<Button
+					onclick={() => zoomBy(1 / 1.3)}
+					color="light"
+					size="xs2"
+					startIcon={{ icon: Minus }}
+					iconOnly
+					title="Zoom out"
+				/>
+				<Button
+					onclick={() => zoomBy(1.3)}
+					color="light"
+					size="xs2"
+					startIcon={{ icon: Plus }}
+					iconOnly
+					title="Zoom in"
+				/>
+				<Button
+					onclick={resetZoom}
+					color="light"
+					size="xs2"
+					startIcon={{ icon: RotateCcw }}
+					iconOnly
+					title="Reset zoom"
+				/>
+				<Button
+					onclick={downloadSvg}
+					color="light"
+					size="xs2"
+					startIcon={{ icon: Download }}
+					iconOnly
+					title="Download as SVG"
+				/>
+			</div>
+		{/snippet}
+		<div
+			class="relative w-full h-[78vh] overflow-hidden rounded border cursor-grab bg-surface-secondary"
+		>
+			{#if expanded}
+				<div use:panzoomAction class="w-full h-full flex items-center justify-center">
+					<!-- eslint-disable-next-line svelte/no-at-html-tags -->
+					{@html svg}
+				</div>
+			{/if}
+		</div>
+	</Modal>
+{:else}
+	<!-- Fallback while loading or when rendering fails: show the raw source -->
+	<pre class="overflow-auto max-h-screen text-xs p-2">{code}</pre>
+{/if}
diff --git a/frontend/src/lib/components/copilot/chat/shared.test.ts b/frontend/src/lib/components/copilot/chat/shared.test.ts
index 56b6bc4d2b..1b77e060c4 100644
--- a/frontend/src/lib/components/copilot/chat/shared.test.ts
+++ b/frontend/src/lib/components/copilot/chat/shared.test.ts
@@ -17,7 +17,7 @@ vi.mock('$lib/components/flows/flowTree', () => ({
 vi.mock('$lib/gen', () => ({
 	ScriptService: {},
 	FlowService: {},
-	JobService: {},
+	JobService: { getJob: vi.fn() },
 	ScheduleService: {
 		previewSchedule: vi.fn(),
 		createSchedule: vi.fn()
@@ -53,6 +53,12 @@ vi.mock('@leeoniya/ufuzzy', () => ({
 	}
 }))
 
+// deriveChatJobStatus's scheduled branch calls forLater; stub it deterministically
+// (a real one pulls in stores/db-clock drift) — "later" = >5s in the future.
+vi.mock('$lib/forLater', () => ({
+	forLater: (scheduled: string | number | Date) => new Date(scheduled).getTime() > Date.now() + 5000
+}))
+
 describe('createToolDef', () => {
 	it('builds the create_trigger schema without top-level composition', async () => {
 		const { createToolDef } = await import('./shared')
@@ -136,14 +142,22 @@ describe('buildContextString', () => {
 				path: 'f/flows/reporting',
 				title: 'f/flows/reporting',
 				summary: 'Reporting flow'
+			},
+			{
+				type: 'workspace_app',
+				path: 'f/apps/dashboard',
+				title: 'f/apps/dashboard',
+				summary: 'Dashboard raw app'
 			}
 		])
 
 		expect(context).toContain('SELECTED WORKSPACE ITEMS:')
 		expect(context).toContain('- type: script, path: f/scripts/report')
 		expect(context).toContain('- type: flow, path: f/flows/reporting')
+		expect(context).toContain('- type: raw_app, path: f/apps/dashboard')
 		expect(context).not.toContain('Report script')
 		expect(context).not.toContain('Reporting flow')
+		expect(context).not.toContain('Dashboard raw app')
 		expect(context).not.toContain('Code:')
 		expect(context).not.toContain('Value:')
 	})
@@ -637,7 +651,18 @@ describe('isActiveUserQuestion', () => {
 		expect(isActiveUserQuestion(toolMessage())).toBe(true)
 	})
 
-	it('is false once a choice has been selected', async () => {
+	it('is false once choices have been selected', async () => {
+		const { isActiveUserQuestion } = await import('./shared')
+		expect(
+			isActiveUserQuestion(
+				toolMessage({
+					userQuestion: { question: 'Pick one', choices: ['a', 'b'], selectedChoices: ['a'] }
+				})
+			)
+		).toBe(false)
+	})
+
+	it('is false once a legacy scalar selectedChoice is present', async () => {
 		const { isActiveUserQuestion } = await import('./shared')
 		expect(
 			isActiveUserQuestion(
@@ -648,6 +673,17 @@ describe('isActiveUserQuestion', () => {
 		).toBe(false)
 	})
 
+	it('stays active when selectedChoices is present but empty', async () => {
+		const { isActiveUserQuestion } = await import('./shared')
+		expect(
+			isActiveUserQuestion(
+				toolMessage({
+					userQuestion: { question: 'Pick one', choices: ['a', 'b'], selectedChoices: [] }
+				})
+			)
+		).toBe(true)
+	})
+
 	it('is false when the question was canceled', async () => {
 		const { isActiveUserQuestion } = await import('./shared')
 		expect(
@@ -681,3 +717,184 @@ describe('isActiveUserQuestion', () => {
 		expect(isActiveUserQuestion(assistantMessage)).toBe(false)
 	})
 })
+
+describe('pollJobCompletion detach', () => {
+	function makeCallbacks() {
+		return {
+			setToolStatus: vi.fn(),
+			removeToolStatus: vi.fn(),
+			onJobStatus: vi.fn()
+		}
+	}
+
+	it('detaches immediately (no polling) when detachAfterMs is 0', async () => {
+		const { pollJobCompletion } = await import('./shared')
+		const { JobService } = await import('$lib/gen')
+		const getJob = vi.mocked(JobService.getJob)
+		getJob.mockReset()
+		const cbs = makeCallbacks()
+
+		const outcome = await pollJobCompletion('job1', 'w', 'tool1', cbs as any, { detachAfterMs: 0 })
+
+		expect(outcome).toBe('detached')
+		expect(getJob).not.toHaveBeenCalled()
+	})
+
+	it('detaches after the inline budget when the job is still running', async () => {
+		vi.useFakeTimers()
+		try {
+			const { pollJobCompletion } = await import('./shared')
+			const { JobService } = await import('$lib/gen')
+			const getJob = vi.mocked(JobService.getJob)
+			getJob.mockReset()
+			getJob.mockResolvedValue({ type: 'QueuedJob', running: true } as any)
+			const cbs = makeCallbacks()
+
+			// detachAfterMs 2000 → 2 polls at 1s each, then detach.
+			const promise = pollJobCompletion('job1', 'w', 'tool1', cbs as any, { detachAfterMs: 2000 })
+			await vi.advanceTimersByTimeAsync(2000)
+
+			expect(await promise).toBe('detached')
+			// Status is reported as running during the wait (alongside the trimmed
+			// Job snapshot that feeds JobStatusIcon).
+			expect(cbs.onJobStatus).toHaveBeenCalledWith(
+				'job1',
+				expect.objectContaining({ status: 'running' })
+			)
+		} finally {
+			vi.useRealTimers()
+		}
+	})
+
+	it('returns the completed job when it finishes within the inline budget', async () => {
+		vi.useFakeTimers()
+		try {
+			const { pollJobCompletion } = await import('./shared')
+			const { JobService } = await import('$lib/gen')
+			const getJob = vi.mocked(JobService.getJob)
+			getJob.mockReset()
+			const completed = { type: 'CompletedJob', success: true, result: 42 }
+			getJob.mockResolvedValue(completed as any)
+			const cbs = makeCallbacks()
+
+			const promise = pollJobCompletion('job1', 'w', 'tool1', cbs as any, { detachAfterMs: 15000 })
+			await vi.advanceTimersByTimeAsync(1000)
+
+			expect(await promise).toBe(completed)
+		} finally {
+			vi.useRealTimers()
+		}
+	})
+
+	it('legacy mode (no detach) throws a timeout error when the job never completes', async () => {
+		vi.useFakeTimers()
+		try {
+			const { pollJobCompletion } = await import('./shared')
+			const { JobService } = await import('$lib/gen')
+			const getJob = vi.mocked(JobService.getJob)
+			getJob.mockReset()
+			getJob.mockResolvedValue({ type: 'QueuedJob', running: true } as any)
+			const cbs = makeCallbacks()
+
+			const promise = pollJobCompletion('job1', 'w', 'tool1', cbs as any)
+			const assertion = expect(promise).rejects.toThrow('timed out')
+			await vi.advanceTimersByTimeAsync(60000)
+			await assertion
+			expect(cbs.setToolStatus).toHaveBeenCalledWith(
+				'tool1',
+				expect.objectContaining({ error: expect.any(String) })
+			)
+		} finally {
+			vi.useRealTimers()
+		}
+	})
+})
+
+describe('deriveChatJobStatus', () => {
+	// CompletedJob is discriminated by the presence of a `success` key; the branch
+	// order deliberately mirrors JobStatusIcon so the badge and scalar never drift.
+	it('maps a canceled completed job to canceled (canceled wins over success=false)', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		expect(deriveChatJobStatus({ success: false, canceled: true } as any)).toBe('canceled')
+	})
+
+	it('maps a successful completed job to success', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		expect(deriveChatJobStatus({ success: true, canceled: false } as any)).toBe('success')
+	})
+
+	it('maps a non-canceled failed completed job to failure', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		expect(deriveChatJobStatus({ success: false, canceled: false } as any)).toBe('failure')
+	})
+
+	it('maps a running suspended queued job to suspended', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		expect(deriveChatJobStatus({ running: true, suspend: 1 } as any)).toBe('suspended')
+	})
+
+	it('maps a running queued job to running', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		expect(deriveChatJobStatus({ running: true } as any)).toBe('running')
+	})
+
+	it('maps a future-scheduled queued job to scheduled', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		const future = new Date(Date.now() + 3_600_000).toISOString()
+		expect(deriveChatJobStatus({ running: false, scheduled_for: future } as any)).toBe('scheduled')
+	})
+
+	it('maps a plain (non-running, non-scheduled) queued job to queued', async () => {
+		const { deriveChatJobStatus } = await import('./shared')
+		expect(deriveChatJobStatus({ running: false } as any)).toBe('queued')
+	})
+})
+
+describe('trimJob', () => {
+	const HEAVY = ['logs', 'args', 'result', 'raw_code', 'raw_flow', 'flow_status']
+
+	it('preserves the ABSENCE of a success key on a queued job (JobStatusIcon in-operator invariant)', async () => {
+		const { trimJob } = await import('./shared')
+		const queued = {
+			id: 'j1',
+			running: true,
+			logs: 'x',
+			args: {},
+			result: 1,
+			raw_code: 'c',
+			raw_flow: {},
+			flow_status: {}
+		}
+		const trimmed = trimJob(queued as any)
+		// The load-bearing invariant: a running/queued job must NOT gain a `success`
+		// key, or deriveChatJobStatus/JobStatusIcon would misread it as completed.
+		expect('success' in trimmed).toBe(false)
+		expect(trimmed.running).toBe(true)
+		expect(trimmed.id).toBe('j1')
+	})
+
+	it('deletes the six heavy fields but keeps the status-discriminant scalar', async () => {
+		const { trimJob } = await import('./shared')
+		const job = {
+			id: 'j1',
+			success: true,
+			logs: 'x',
+			args: { a: 1 },
+			result: [1],
+			raw_code: 'c',
+			raw_flow: { modules: [] },
+			flow_status: { step: 0 }
+		}
+		const trimmed = trimJob(job as any) as Record<string, unknown>
+		for (const k of HEAVY) expect(k in trimmed).toBe(false)
+		expect('success' in trimmed).toBe(true)
+		expect(trimmed.success).toBe(true)
+	})
+
+	it('does not mutate the input job', async () => {
+		const { trimJob } = await import('./shared')
+		const job = { id: 'j1', success: true, result: 42 }
+		trimJob(job as any)
+		expect(job.result).toBe(42)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/shared.ts b/frontend/src/lib/components/copilot/chat/shared.ts
index aecea1ddfc..dd69139e60 100644
--- a/frontend/src/lib/components/copilot/chat/shared.ts
+++ b/frontend/src/lib/components/copilot/chat/shared.ts
@@ -3,6 +3,7 @@ import type {
 	ChatCompletionMessageFunctionToolCall,
 	ChatCompletionMessageParam
 } from 'openai/resources/chat/completions.mjs'
+import type { UserDraftItemKind } from '$lib/gen'
 
 /**
  * Special module IDs used throughout the flow system
@@ -27,6 +28,7 @@ import {
 	ScriptService,
 	FlowService,
 	JobService,
+	type Job,
 	type CompletedJob,
 	type FlowValue,
 	type FlowModule,
@@ -36,6 +38,7 @@ import {
 } from '$lib/gen'
 import uFuzzy from '@leeoniya/ufuzzy'
 import { emptyString } from '$lib/utils'
+import { forLater } from '$lib/forLater'
 import { scriptLangToEditorLang } from '$lib/scripts'
 import { getCurrentModel } from '$lib/aiStore'
 import { type editor as meditor } from 'monaco-editor'
@@ -422,6 +425,11 @@ export function buildContextString(selectedContext: ContextElement[]): string {
 				workspaceItemsContext = 'SELECTED WORKSPACE ITEMS:\n'
 			}
 			workspaceItemsContext += `- type: flow, path: ${context.path}\n`
+		} else if (context.type === 'workspace_app') {
+			if (!workspaceItemsContext) {
+				workspaceItemsContext = 'SELECTED WORKSPACE ITEMS:\n'
+			}
+			workspaceItemsContext += `- type: raw_app, path: ${context.path}\n`
 		}
 	}
 
@@ -484,15 +492,36 @@ export type CreatedResourceAction = {
 	triggerKind?: CreatedResourceTriggerKind
 }
 
-export type ToolDisplayAction = CreatedResourceAction
+// A clickable chip that deep-links the user to an in-app page (e.g. Runs filtered to
+// a script's failures). Used for cross-page navigation from the chat; the handler is
+// registered by a top-level layout and calls `goto(url)`.
+export type NavigateAction = {
+	id: string
+	type: 'navigate'
+	label: string
+	url: string
+	// Which page the chip opens (runs, schedules, variables, …); drives its icon/title.
+	page: string
+}
+
+export type ToolDisplayAction = CreatedResourceAction | NavigateAction
 
 export type UserQuestionDisplay = {
 	question: string
 	choices: string[]
-	selectedChoice?: string
+	multiSelect?: boolean
+	selectedChoices?: string[] // canonical answer (new code writes only this)
+	selectedChoice?: string // legacy/read-only: pre-multiselect persisted history
 	canceled?: boolean
 }
 
+// The single place that understands the legacy answer shape: new code writes
+// selectedChoices, but history persisted before multi-select only has the
+// scalar selectedChoice. Read answers through this so both shapes resolve.
+export function answeredChoices(q: UserQuestionDisplay): string[] | undefined {
+	return q.selectedChoices ?? (q.selectedChoice ? [q.selectedChoice] : undefined)
+}
+
 export type ToolDisplayMessage = {
 	role: 'tool'
 	tool_call_id: string
@@ -553,11 +582,23 @@ export function isActiveUserQuestion(message: DisplayMessage | undefined): boole
 			message.userQuestion &&
 			message.isLoading &&
 			!message.error &&
-			!message.userQuestion.selectedChoice &&
+			!answeredChoices(message.userQuestion)?.length &&
 			!message.userQuestion.canceled
 	)
 }
 
+// Fires after every tool call resolves, with the tool name. Lets a host (e.g.
+// the sessions page) react to mutating tools — refreshing previews — without
+// the tool layer knowing about the UI. Single slot; the consumer filters by name
+// and reads the tool args (e.g. the mutated item's `path`) to scope its refresh.
+let toolCompletionListener: ((toolName: string, args: any) => void) | undefined
+
+export function setToolCompletionListener(
+	fn: ((toolName: string, args: any) => void) | undefined
+): void {
+	toolCompletionListener = fn
+}
+
 async function callTool<T>({
 	tools,
 	functionName,
@@ -581,7 +622,9 @@ async function callTool<T>({
 			`Unknown tool call: ${functionName}. Probably not in the correct mode, use the change_mode tool to switch to the correct mode.`
 		)
 	}
-	return tool.fn({ args, workspace, helpers, toolCallbacks, toolId })
+	const result = await tool.fn({ args, workspace, helpers, toolCallbacks, toolId })
+	toolCompletionListener?.(functionName, args)
+	return result
 }
 
 type MaybePromise<T> = T | Promise<T>
@@ -740,9 +783,100 @@ export interface Tool<T> {
 	showFade?: boolean
 }
 
+/** Status of a job the chat started and tracks in the jobs tray. Mirrors the
+ * runs page: `suspended` = a flow step waiting for approval, `scheduled` = a run
+ * scheduled for later. Kept in lockstep with `ChatJob.job` (see below). */
+export type ChatJobStatus =
+	| 'queued'
+	| 'running'
+	| 'suspended'
+	| 'scheduled'
+	| 'success'
+	| 'failure'
+	| 'canceled'
+
+/** Serializable identity of a tool's terminal result formatter, stored on a ChatJob
+ * so a detached job that survives a reload can still reconstruct the shaped result
+ * its launching tool would have produced (see formatChatJobCompletion). A closure
+ * can't be persisted to IndexedDB; this discriminant can. */
+export type ChatJobResultFormat = { kind: 'datatable'; datatableName: string }
+
+/** A job the chat started and is tracking. Rendered in the jobs tray, persisted
+ * with the chat, and advanced by a single background poller on the manager. */
+export type ChatJob = {
+	jobId: string
+	/** Pairs with the ToolDisplayMessage card that launched it. */
+	toolCallId: string
+	kind: 'script' | 'flow'
+	/** Path or step label shown in the tray row. */
+	label: string
+	workspace: string
+	createdAt: number
+	status: ChatJobStatus
+	durationMs?: number
+	/** True once it left the inline wait and is polled in the background. */
+	detached: boolean
+	/** Notify-only: whether its completion has been surfaced to the model yet. */
+	reported: boolean
+	/** Trimmed snapshot of the last fetched Job (heavy fields stripped, see
+	 * `trimJob`), fed to `<JobStatusIcon>` so the tray badge matches the runs page
+	 * exactly. Always written together with `status` from the SAME job so the two
+	 * can't drift. Undefined only before the first fetch. */
+	job?: Job
+	/** Set by tools that shape their result (e.g. exec_datatable_sql). Persisted, so
+	 * a detached job that finishes after a reload still reports through the tool's
+	 * result contract rather than generic job output. */
+	resultFormat?: ChatJobResultFormat
+}
+
+/** Derive the tray status from a fetched Job. Deliberately mirrors the branch
+ * order of JobStatusIcon.svelte so the scalar status and the badge never
+ * disagree. */
+export function deriveChatJobStatus(job: Job): ChatJobStatus {
+	if ('success' in job) {
+		return job.canceled ? 'canceled' : job.success ? 'success' : 'failure'
+	}
+	// QueuedJob
+	if (job.running && job.suspend) return 'suspended'
+	if (job.running) return 'running'
+	if (job.scheduled_for && forLater(job.scheduled_for)) return 'scheduled'
+	return 'queued'
+}
+
+/** Strip the heavy fields from a fetched Job before storing it on a ChatJob (the
+ * tray only needs the status-discriminant scalars JobStatusIcon reads).
+ *
+ * MUST clone + delete — never rebuild as an object literal. JobStatusIcon
+ * discriminates with the `in` operator (`'success' in job`), which tests KEY
+ * PRESENCE, not truthiness. A literal that always carries a `success` key would
+ * make every running/queued job misrender as a completed (failed) job. */
+export function trimJob(job: Job): Job {
+	const trimmed = { ...job } as Record<string, unknown>
+	delete trimmed.logs
+	delete trimmed.args
+	delete trimmed.result
+	delete trimmed.raw_code
+	delete trimmed.raw_flow
+	delete trimmed.flow_status
+	return trimmed as unknown as Job
+}
+
+/** The subset supplied when a job first starts; the manager fills in the rest. */
+export type ChatJobInit = Pick<
+	ChatJob,
+	'jobId' | 'toolCallId' | 'kind' | 'label' | 'workspace' | 'resultFormat'
+>
+
 export interface ToolCallbacks {
 	setToolStatus: (id: string, metadata?: Partial<ToolDisplayMessage>) => void
 	removeToolStatus: (id: string) => void
+	/** Job-tracking hooks, wired only by the global/sessions chat (mode === GLOBAL).
+	 * Their presence is what enables detach-into-background in executeTestRun; when
+	 * absent (in-editor script/flow/pipeline chats), test runs stay blocking with a
+	 * 60s cap. */
+	onJobStarted?: (job: ChatJobInit) => void
+	onJobStatus?: (jobId: string, update: Partial<ChatJob>) => void
+	onJobDetached?: (jobId: string) => void
 	/** Streamed reasoning/thinking deltas, rendered as a collapsible block in the chat. */
 	onReasoningDelta?: (token: string) => void
 	/** Fired when the model starts reasoning — drives a "Thinking" indicator even when
@@ -753,7 +887,16 @@ export interface ToolCallbacks {
 	requestUserQuestion?: (
 		toolId: string,
 		question: UserQuestionDisplay
-	) => Promise<string | undefined>
+	) => Promise<string[] | undefined>
+	/** Records a workspace item the tool call created/edited/deleted, by its
+	 * canonical (itemKind, storagePath). Session chats wire this to accumulate the
+	 * chat's modified-items mask; the global side-panel chat omits it (no-op). */
+	onItemModified?: (itemKind: UserDraftItemKind, storagePath: string) => void
+	/** A tool deployed a draft: the mask entry moves from the draft's storage path
+	 * to the deployed path (they differ for synthetic draft-only storage keys). */
+	onItemDeployed?: (itemKind: UserDraftItemKind, storagePath: string, deployedPath: string) => void
+	/** A tool discarded a draft: the chat's touch on the item is undone. */
+	onItemDiscarded?: (itemKind: UserDraftItemKind, storagePath: string) => void
 }
 
 export function createToolDef(
@@ -936,14 +1079,20 @@ export async function buildSchemaForTool(
 			throw new Error(`Invalid flow inputs schema: ${invalidProperties.join(', ')}`)
 		}
 
-		toolDef.function.parameters = { ...schema, additionalProperties: false }
+		// Anthropic requires input_schema.type to be present; flows with no inputs
+		// can produce a sparse schema (e.g. { order: [] }) lacking it.
+		toolDef.function.parameters = { type: 'object', ...schema, additionalProperties: false }
 
 		// recursively normalize provider-incompatible schema fragments
 		normalizeToolParameterSchema(toolDef.function.parameters)
 
 		// OPEN AI models don't support strict mode well with schema with complex properties, so we disable it
 		const model = getCurrentModel()
-		if (model.provider === 'openai' || model.provider === 'azure_openai') {
+		if (
+			model.provider === 'openai' ||
+			model.provider === 'azure_openai' ||
+			model.provider === 'azure_foundry'
+		) {
 			toolDef.function.strict = false
 		}
 		return true
@@ -968,6 +1117,16 @@ const MAX_RESULT_LENGTH = 12000
 const MAX_LOG_LENGTH = 4000
 export const MAX_RUNNABLE_CONTENT_LENGTH = 20000
 
+/** How long a test run is awaited inline before it detaches into the background
+ * (global/sessions chat only). Quick runs finish well inside this; slow ones are
+ * handed to the background poller so the chat loop is freed. */
+export const DETACH_AFTER_MS = 15000
+
+/** Upper bound on a model-requested inline wait. Beyond this, backgrounding is
+ * almost always better than holding the chat turn, so we clamp rather than let
+ * the model block the loop for minutes. */
+export const MAX_DETACH_AFTER_MS = 120000
+
 export interface TestRunConfig {
 	jobStarter: () => Promise<string>
 	workspace: string
@@ -975,17 +1134,56 @@ export interface TestRunConfig {
 	toolId: string
 	startMessage?: string
 	contextName: 'script' | 'flow'
+	/** Detach immediately instead of waiting the inline budget (the model's opt-in). */
+	background?: boolean
+	/** Overrides the inline wait budget (ms) before the job detaches into the tray.
+	 * The model's opt-in for jobs it expects to take a bit longer than the 15s
+	 * default but still wants to await in-turn. Ignored when `background` is set
+	 * (that detaches immediately). Clamped to MAX_DETACH_AFTER_MS. */
+	detachAfterMs?: number
+	/** Human label for the jobs tray row (path / step id). Defaults to the job id. */
+	label?: string
+	/** Overrides the default "…test started, waiting for completion" status while the
+	 * job runs inline (e.g. an SQL tool shows "SQL running…"). */
+	runningMessage?: string
+	/** Custom terminal formatting for the INLINE completion path (callers whose
+	 * result isn't a plain test-run summary, e.g. exec_datatable_sql shaping rows).
+	 * Returns the string handed to the model plus the tool-card patch. When omitted,
+	 * the default summary is used. For the DETACHED/rehydrated path, supply
+	 * `resultFormat` too so the completion can be reconstructed without this closure. */
+	formatCompletion?: BackgroundJobFormatter
+	/** Serializable twin of `formatCompletion`, stored on the ChatJob so a detached
+	 * job that finishes after a reload still reports through the tool's result
+	 * contract (see AIChatManager.#onBackgroundJobComplete). */
+	resultFormat?: ChatJobResultFormat
 }
 
-// Common job polling function
+/** Terminal formatter a tool supplies so its result keeps the same model-visible
+ * contract whether the job finishes inline or completes after detaching into the
+ * background. */
+export type BackgroundJobFormatter = (job: CompletedJob) => {
+	llmText: string
+	card: Partial<ToolDisplayMessage>
+}
+
+// Common job polling function.
+//
+// Two modes, selected by whether `detachAfterMs` is provided:
+//  - Blocking (undefined): poll up to 60×1s, then set a timeout error and throw.
+//    Used by in-editor chats, which have no jobs tray to hand off to.
+//  - Detach (a number): poll only for that inline budget; if the job is still
+//    running when it elapses, resolve `'detached'` instead of throwing so the
+//    caller can background the job. `0` detaches without polling at all.
 export async function pollJobCompletion(
 	jobId: string,
 	workspace: string,
 	toolId: string,
-	toolCallbacks: ToolCallbacks
-): Promise<CompletedJob> {
+	toolCallbacks: ToolCallbacks,
+	options?: { detachAfterMs?: number }
+): Promise<CompletedJob | 'detached'> {
+	const detachEnabled = options?.detachAfterMs !== undefined
+	const maxAttempts = detachEnabled ? Math.ceil((options?.detachAfterMs ?? 0) / 1000) : 60
 	let attempts = 0
-	const maxAttempts = 60
 	let job: CompletedJob | null = null
 
 	while (attempts < maxAttempts) {
@@ -1004,14 +1202,22 @@ export async function pollJobCompletion(
 				job = fetchedJob
 				break
 			}
+			// Keep the tray's status + Job snapshot fresh during the inline wait.
+			toolCallbacks.onJobStatus?.(jobId, {
+				status: deriveChatJobStatus(fetchedJob),
+				job: trimJob(fetchedJob)
+			})
 		} catch (error) {
-			if (attempts >= maxAttempts) {
+			if (!detachEnabled && attempts >= maxAttempts) {
 				throw error
 			}
 		}
 	}
 
 	if (!job) {
+		if (detachEnabled) {
+			return 'detached'
+		}
 		toolCallbacks.setToolStatus(toolId, {
 			content: 'Test timed out',
 			error: 'Execution timed out or failed to complete'
@@ -1093,8 +1299,62 @@ export async function buildTestRunArgs(
 	return parsedArgs
 }
 
+// The string handed back to the model when a job is backgrounded. It carries the
+// job id so the model can pull status/logs on demand (get_job_logs / list_runs),
+// and tells it the completion will be reported later (notify-only wake).
+function backgroundedSummary(jobId: string, label: string): string {
+	return (
+		`Job ${jobId} for "${label}" is taking a while and is now running in the background — ` +
+		`the chat is free to continue and you'll be told when it finishes. ` +
+		`To inspect it now, call get_job_logs with id="${jobId}" (or list_runs); ` +
+		`to stop it, call cancel_job with id="${jobId}".`
+	)
+}
+
+// Tool-card status patch for a completed background job. Mirrors the inline
+// terminal branch of executeTestRun so a job that finished in the background
+// fills its card the same way one that finished inline does.
+export function completedJobToolStatus(job: CompletedJob): Partial<ToolDisplayMessage> {
+	// A canceled job isn't a `success`, but it isn't a failure either — the user
+	// stopped it — so don't dress the card as an error.
+	if (job.canceled) {
+		return { content: 'Background job canceled', logs: formatLogs(job.logs) }
+	}
+	return {
+		content: `Background job ${job.success ? 'completed successfully' : 'failed'}`,
+		result: formatResult(job.result),
+		logs: formatLogs(job.logs),
+		...(job.success ? {} : { error: getErrorMessage(job.result) })
+	}
+}
+
+// Short completion note handed to the model on its next turn (notify-only wake).
+// Carries the id so the model can pull full logs via get_job_logs on demand.
+export function backgroundJobCompletionNote(
+	jobId: string,
+	label: string,
+	job: CompletedJob,
+	// When the launching tool supplied a formatter (e.g. exec_datatable_sql), pass its
+	// `llmText` here so the notify-only note carries the same shaped result the inline
+	// path would have returned — row-capped, friendly errors — instead of the raw job
+	// result. Omitted → the generic 2000-char result head.
+	formattedResult?: string
+): string {
+	const status = job.success ? 'succeeded' : 'FAILED'
+	const resultHead = formattedResult ?? formatResult(job.result).slice(0, 2000)
+	return (
+		`Background job ${jobId} for "${label}" ${status}.\n` +
+		`Result: ${resultHead}\n` +
+		`(For full logs call get_job_logs with id="${jobId}".)`
+	)
+}
+
 // Main execution function for test runs
 export async function executeTestRun(config: TestRunConfig): Promise<string> {
+	// Detach-into-background is enabled only when the host wired the job hooks
+	// (global/sessions chat). Otherwise this stays a blocking call.
+	const detachEnabled = !!config.toolCallbacks.onJobStarted
+	const label = config.label ?? config.contextName
 	try {
 		config.toolCallbacks.setToolStatus(config.toolId, {
 			content: config.startMessage || `Starting ${config.contextName} test...`
@@ -1104,17 +1364,58 @@ export async function executeTestRun(config: TestRunConfig): Promise<string> {
 
 		const contextName = config.contextName.charAt(0).toUpperCase() + config.contextName.slice(1)
 
-		config.toolCallbacks.setToolStatus(config.toolId, {
-			content: `${contextName} test started, waiting for completion...`
+		// Register the job so the tray shows it from the moment it is queued. Carry the
+		// serializable resultFormat so a job that later detaches (and may outlive a
+		// reload) can reconstruct the same model-visible contract this inline path
+		// applies below.
+		config.toolCallbacks.onJobStarted?.({
+			jobId,
+			toolCallId: config.toolId,
+			kind: config.contextName,
+			label,
+			workspace: config.workspace,
+			resultFormat: config.resultFormat
 		})
 
-		const job = await pollJobCompletion(
+		config.toolCallbacks.setToolStatus(config.toolId, {
+			content: config.runningMessage ?? `${contextName} test started, waiting for completion...`
+		})
+
+		const outcome = await pollJobCompletion(
 			jobId,
 			config.workspace,
 			config.toolId,
-			config.toolCallbacks
+			config.toolCallbacks,
+			detachEnabled
+				? {
+						detachAfterMs: config.background
+							? 0
+							: Math.min(config.detachAfterMs ?? DETACH_AFTER_MS, MAX_DETACH_AFTER_MS)
+					}
+				: undefined
 		)
 
+		if (outcome === 'detached') {
+			config.toolCallbacks.onJobDetached?.(jobId)
+			config.toolCallbacks.setToolStatus(config.toolId, {
+				content: `${contextName} test running in background (job ${jobId})`
+			})
+			return backgroundedSummary(jobId, label)
+		}
+
+		const job = outcome
+		config.toolCallbacks.onJobStatus?.(jobId, {
+			status: deriveChatJobStatus(job),
+			durationMs: job.duration_ms,
+			job: trimJob(job)
+		})
+
+		if (config.formatCompletion) {
+			const { llmText, card } = config.formatCompletion(job)
+			config.toolCallbacks.setToolStatus(config.toolId, card)
+			return llmText
+		}
+
 		config.toolCallbacks.setToolStatus(config.toolId, {
 			content: `${contextName} test ${job.success ? 'completed successfully' : 'failed'}`,
 			result: formatResult(job.result),
@@ -1147,6 +1448,10 @@ export type FlowStepTestRunConfig = {
 	workspace: string
 	toolCallbacks: ToolCallbacks
 	toolId: string
+	background?: boolean
+	/** Inline wait budget (ms) before the step job detaches into the tray; forwarded
+	 * to executeTestRun. Ignored when `background` is set. */
+	detachAfterMs?: number
 	loadScript?: FlowStepScriptLoader
 	loadFlowPreviewValue?: FlowStepPreviewLoader
 }
@@ -1188,6 +1493,8 @@ export async function executeFlowStepTestRun({
 	workspace,
 	toolCallbacks,
 	toolId,
+	background,
+	detachAfterMs,
 	loadScript = loadDeployedScriptForFlowStep,
 	loadFlowPreviewValue
 }: FlowStepTestRunConfig): Promise<string> {
@@ -1221,7 +1528,10 @@ export async function executeFlowStepTestRun({
 			toolCallbacks,
 			toolId,
 			startMessage: `Starting test run of step "${stepId}"...`,
-			contextName: 'script'
+			contextName: 'script',
+			label: `step ${stepId}`,
+			background,
+			detachAfterMs
 		})
 	}
 
@@ -1242,7 +1552,10 @@ export async function executeFlowStepTestRun({
 			toolCallbacks,
 			toolId,
 			startMessage: `Starting test run of script step "${stepId}"...`,
-			contextName: 'script'
+			contextName: 'script',
+			label: `step ${stepId}`,
+			background,
+			detachAfterMs
 		})
 	}
 
@@ -1263,7 +1576,10 @@ export async function executeFlowStepTestRun({
 				toolCallbacks,
 				toolId,
 				startMessage: `Starting test run of draft flow step "${stepId}"...`,
-				contextName: 'flow'
+				contextName: 'flow',
+				label: `step ${stepId}`,
+				background,
+				detachAfterMs
 			})
 		}
 
@@ -1278,7 +1594,10 @@ export async function executeFlowStepTestRun({
 			toolCallbacks,
 			toolId,
 			startMessage: `Starting test run of flow step "${stepId}"...`,
-			contextName: 'flow'
+			contextName: 'flow',
+			label: `step ${stepId}`,
+			background,
+			detachAfterMs
 		})
 	}
 
diff --git a/frontend/src/lib/components/copilot/chat/toolCallArguments.test.ts b/frontend/src/lib/components/copilot/chat/toolCallArguments.test.ts
new file mode 100644
index 0000000000..53246bc50e
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/toolCallArguments.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it } from 'vitest'
+import type { ChatCompletionMessageParam } from 'openai/resources/chat/completions.mjs'
+import { hasValidToolCallArguments, sanitizeToolCallArguments } from './toolCallArguments'
+
+describe('hasValidToolCallArguments', () => {
+	it('accepts empty or valid JSON arguments', () => {
+		expect(hasValidToolCallArguments(undefined)).toBe(true)
+		expect(hasValidToolCallArguments('')).toBe(true)
+		expect(hasValidToolCallArguments('{}')).toBe(true)
+		expect(hasValidToolCallArguments('{"path": "u/admin/app", "content": "x"}')).toBe(true)
+	})
+
+	it('rejects arguments truncated mid-stream', () => {
+		expect(hasValidToolCallArguments('{"path": "u/admin/app", "old_string": "setMess')).toBe(false)
+		expect(hasValidToolCallArguments('{"path": "u/admin/app"')).toBe(false)
+	})
+})
+
+describe('sanitizeToolCallArguments', () => {
+	const poisoned: ChatCompletionMessageParam = {
+		role: 'assistant',
+		tool_calls: [
+			{
+				id: 'call_bad',
+				type: 'function',
+				function: { name: 'patch_app_file', arguments: '{"path": "u/x", "old_string": "trunc' }
+			},
+			{
+				id: 'call_ok',
+				type: 'function',
+				function: { name: 'read_file', arguments: '{"file": "a.txt"}' }
+			}
+		]
+	}
+
+	it('replaces only unparseable arguments with {}', () => {
+		const [sanitized] = sanitizeToolCallArguments([poisoned]) as any[]
+		expect(sanitized.tool_calls[0].function.arguments).toBe('{}')
+		expect(sanitized.tool_calls[1].function.arguments).toBe('{"file": "a.txt"}')
+		// The stored history object is not mutated
+		expect((poisoned as any).tool_calls[0].function.arguments).toContain('trunc')
+	})
+
+	it('rewrites empty arguments to {} so replayed history stays parseable', () => {
+		const emptyArgs: ChatCompletionMessageParam = {
+			role: 'assistant',
+			tool_calls: [{ id: 'c1', type: 'function', function: { name: 'list_files', arguments: '' } }]
+		}
+		const [sanitized] = sanitizeToolCallArguments([emptyArgs]) as any[]
+		expect(sanitized.tool_calls[0].function.arguments).toBe('{}')
+	})
+
+	it('returns untouched messages by reference', () => {
+		const user: ChatCompletionMessageParam = { role: 'user', content: 'hi' }
+		const validAssistant: ChatCompletionMessageParam = {
+			role: 'assistant',
+			tool_calls: [{ id: 'c1', type: 'function', function: { name: 'read_file', arguments: '{}' } }]
+		}
+		const result = sanitizeToolCallArguments([user, validAssistant])
+		expect(result[0]).toBe(user)
+		expect(result[1]).toBe(validAssistant)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/toolCallArguments.ts b/frontend/src/lib/components/copilot/chat/toolCallArguments.ts
new file mode 100644
index 0000000000..997186a611
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/toolCallArguments.ts
@@ -0,0 +1,58 @@
+import type { ChatCompletionMessageParam } from 'openai/resources/chat/completions.mjs'
+
+/**
+ * A tool call whose `arguments` string is not valid JSON (typically a stream
+ * cut mid-arguments) must never reach a provider: the whole request is
+ * rejected, and once persisted in the session history every follow-up request
+ * fails the same way.
+ *
+ * Empty arguments count as valid: some providers stream '' for no-arg tool
+ * calls, and flagging those would wrongly report the tool as not executed.
+ * Callers persisting arguments must normalize '' to '{}' themselves.
+ */
+export function hasValidToolCallArguments(args: string | undefined): boolean {
+	if (!args) {
+		return true
+	}
+	try {
+		JSON.parse(args)
+		return true
+	} catch {
+		return false
+	}
+}
+
+// '' is valid per hasValidToolCallArguments but JSON.parse('') still throws
+// provider-side, so replaying history additionally requires non-empty args.
+function isReplayableArguments(args: string | undefined): boolean {
+	return !!args && hasValidToolCallArguments(args)
+}
+
+/**
+ * Replaces unparseable or empty assistant tool_call arguments with '{}' in the
+ * outgoing copy of the history, so a session whose persisted history contains
+ * a truncated tool call recovers instead of failing every request. The paired
+ * tool result already tells the model the call failed.
+ */
+export function sanitizeToolCallArguments(
+	messages: ChatCompletionMessageParam[]
+): ChatCompletionMessageParam[] {
+	return messages.map((m) => {
+		if (
+			m.role !== 'assistant' ||
+			!m.tool_calls?.some(
+				(t) => t.type === 'function' && !isReplayableArguments(t.function.arguments)
+			)
+		) {
+			return m
+		}
+		return {
+			...m,
+			tool_calls: m.tool_calls.map((t) =>
+				t.type === 'function' && !isReplayableArguments(t.function.arguments)
+					? { ...t, function: { ...t.function, arguments: '{}' } }
+					: t
+			)
+		}
+	})
+}
diff --git a/frontend/src/lib/components/copilot/chat/typewriterReveal.test.ts b/frontend/src/lib/components/copilot/chat/typewriterReveal.test.ts
new file mode 100644
index 0000000000..b99048c360
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/typewriterReveal.test.ts
@@ -0,0 +1,200 @@
+import { describe, expect, it } from 'vitest'
+import { TypewriterReveal, type TypewriterRevealOptions } from './typewriterReveal'
+
+// A fake clock + manual scheduler modelling requestAnimationFrame: each frame()
+// advances the clock by `dt` ms, then fires whatever callback is currently
+// scheduled (which may reschedule the next). This drives the pacing
+// deterministically without a browser.
+class FakeScheduler {
+	t = 0
+	scheduleCount = 0
+	private queue = new Map<number, () => void>()
+	private id = 0
+
+	now = () => this.t
+	schedule = (cb: () => void) => {
+		this.scheduleCount++
+		const h = ++this.id
+		this.queue.set(h, cb)
+		return h
+	}
+	cancel = (h: unknown) => {
+		this.queue.delete(h as number)
+	}
+	pending() {
+		return this.queue.size
+	}
+	frame(dt: number) {
+		this.t += dt
+		const cbs = [...this.queue.values()]
+		this.queue.clear()
+		cbs.forEach((cb) => cb())
+	}
+	frames(count: number, dt = 16) {
+		for (let i = 0; i < count; i++) this.frame(dt)
+	}
+}
+
+function makeReveal(sched: FakeScheduler, opts: Partial<TypewriterRevealOptions> = {}) {
+	const chunks: string[] = []
+	const reveal = new TypewriterReveal({
+		onReveal: (c) => chunks.push(c),
+		now: sched.now,
+		schedule: sched.schedule,
+		cancel: sched.cancel,
+		...opts
+	})
+	return { reveal, chunks, revealed: () => chunks.join('') }
+}
+
+// No lone surrogate at any string end (a split pair would leave one).
+function hasLoneSurrogate(s: string): boolean {
+	for (let i = 0; i < s.length; i++) {
+		const c = s.charCodeAt(i)
+		if (c >= 0xd800 && c <= 0xdbff) {
+			const next = s.charCodeAt(i + 1)
+			if (!(next >= 0xdc00 && next <= 0xdfff)) return true
+			i++
+		} else if (c >= 0xdc00 && c <= 0xdfff) {
+			return true
+		}
+	}
+	return false
+}
+
+describe('TypewriterReveal', () => {
+	it('reveals gradually — a burst is not fully painted on the first frame', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched)
+		const text = 'x'.repeat(300)
+		reveal.push(text)
+		sched.frame(16)
+		expect(revealed().length).toBeGreaterThan(0)
+		expect(revealed().length).toBeLessThan(text.length)
+	})
+
+	it('preserves text exactly after flush (no loss, no duplication)', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched)
+		const parts = ['Here are ', 'some names: ', 'Charles, George, ', 'Alfred, Harold.']
+		parts.forEach((p) => reveal.push(p))
+		sched.frames(3) // reveal only part of it
+		reveal.flush()
+		expect(revealed()).toBe(parts.join(''))
+	})
+
+	it('flushes repeatedly across tool boundaries without loss or duplication', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched)
+		// Each segment is a message that ends in a flush (as onMessageEnd does at a
+		// tool-call boundary); the buffer is compacted between them.
+		const segments = ['first reply', 'second reply', 'third reply']
+		segments.forEach((seg) => {
+			reveal.push(seg)
+			sched.frames(2) // partially reveal
+			reveal.flush()
+		})
+		expect(revealed()).toBe(segments.join(''))
+	})
+
+	it('reset() drops un-revealed backlog', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched)
+		const text = 'y'.repeat(300)
+		reveal.push(text)
+		sched.frame(16) // reveal a prefix
+		const afterOneFrame = revealed()
+		expect(afterOneFrame.length).toBeLessThan(text.length)
+		expect(text.startsWith(afterOneFrame)).toBe(true)
+		reveal.reset()
+		sched.frames(20)
+		expect(revealed()).toBe(afterOneFrame) // nothing further reached onReveal
+	})
+
+	it('fast-path: a backlog above the cap is revealed whole in one emit', () => {
+		const sched = new FakeScheduler()
+		const { reveal, chunks, revealed } = makeReveal(sched, { maxBacklogChars: 1500 })
+		const text = 'z'.repeat(2000)
+		reveal.push(text)
+		sched.frame(16)
+		expect(revealed()).toBe(text)
+		expect(chunks.length).toBe(1) // dumped, not stretched
+	})
+
+	it('never splits a surrogate pair across chunks', () => {
+		const sched = new FakeScheduler()
+		const { reveal, chunks, revealed } = makeReveal(sched, { smoothingMs: 5000 }) // force ~1 char/frame
+		const text = 'a😀b👨‍👩‍👧c'
+		reveal.push(text)
+		sched.frames(60)
+		reveal.flush()
+		expect(revealed()).toBe(text)
+		chunks.forEach((c) => expect(hasLoneSurrogate(c)).toBe(false))
+	})
+
+	it('instant mode reveals synchronously and never schedules', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched, { instant: true })
+		reveal.push('hello ')
+		reveal.push('world')
+		expect(revealed()).toBe('hello world')
+		expect(sched.scheduleCount).toBe(0)
+	})
+
+	it('steady-state backlog converges to ~arrivalRate × smoothingMs (no runaway, no stall)', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched, { smoothingMs: 500 })
+		const perFrame = 10 // chars pushed each 16ms frame → 0.625 chars/ms
+		let pushed = 0
+		for (let i = 0; i < 200; i++) {
+			reveal.push('c'.repeat(perFrame))
+			pushed += perFrame
+			sched.frame(16)
+		}
+		const backlog = pushed - revealed().length
+		// Target ≈ 0.625 * 500 = ~312. Assert it neither ran away nor drained to zero.
+		expect(backlog).toBeGreaterThan(50)
+		expect(backlog).toBeLessThan(900)
+	})
+
+	it('emit frequency stays bounded by the throttle', () => {
+		const sched = new FakeScheduler()
+		const minEmitIntervalMs = 33
+		const { reveal, chunks } = makeReveal(sched, { minEmitIntervalMs })
+		const frames = 60
+		const dt = 16
+		for (let i = 0; i < frames; i++) {
+			reveal.push('c'.repeat(10))
+			sched.frame(dt)
+		}
+		const windowMs = frames * dt
+		expect(chunks.length).toBeLessThanOrEqual(Math.ceil(windowMs / minEmitIntervalMs) + 2)
+	})
+
+	it('suspends when fully revealed and resumes on the next push', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched)
+		reveal.push('short')
+		sched.frames(30)
+		expect(revealed()).toBe('short')
+		expect(sched.pending()).toBe(0) // idle: no live frame scheduled
+		reveal.push(' more')
+		expect(sched.pending()).toBe(1) // restarted
+		sched.frames(30)
+		expect(revealed()).toBe('short more')
+	})
+
+	it('clamps a large elapsed time (backgrounded-tab resume) instead of blasting the backlog', () => {
+		const sched = new FakeScheduler()
+		const { reveal, revealed } = makeReveal(sched, { smoothingMs: 500, maxCatchupMs: 100 })
+		const text = 'q'.repeat(300)
+		reveal.push(text)
+		sched.frame(16) // first (nominal) emit; lastEmit now set
+		const before = revealed().length
+		sched.frame(5000) // loop kept running but the frame fired seconds late
+		const revealedInBigFrame = revealed().length - before
+		// Without the clamp, rate × 5000ms would reveal the entire backlog at once.
+		expect(revealed().length).toBeLessThan(text.length)
+		expect(revealedInBigFrame).toBeLessThan(text.length / 2)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/chat/typewriterReveal.ts b/frontend/src/lib/components/copilot/chat/typewriterReveal.ts
new file mode 100644
index 0000000000..a4c71212f1
--- /dev/null
+++ b/frontend/src/lib/components/copilot/chat/typewriterReveal.ts
@@ -0,0 +1,204 @@
+// Perceived-smoothness layer for streamed assistant text.
+//
+// Providers (notably Anthropic for some model/tier combos) deliver text in
+// coarse bursts — tens of tokens batched into one delta every ~450 ms — so the
+// raw stream reads as freeze→jump→freeze. This module decouples *display* from
+// *arrival*: pushed text lands in a non-reactive buffer, and a paint loop
+// reveals a slice at a time through `onReveal`, so the bursts read as continuous
+// typing. It is deliberately free of Svelte — the only coupling to reactive
+// state is the `onReveal` callback — so the pacing is unit-testable with an
+// injected clock and scheduler.
+
+type Schedule = (cb: () => void) => unknown
+type Cancel = (handle: unknown) => void
+
+export interface TypewriterRevealOptions {
+	/** Called with each revealed slice; the owner appends it to reactive state. */
+	onReveal: (chunk: string) => void
+	/** Reveal synchronously on push with no pacing (reduced-motion / SSR). */
+	instant?: boolean
+	/** Target lag between arrival and display, in ms. The one meaningful knob. */
+	smoothingMs?: number
+	/** Backlog at/above which the whole buffer is dumped in one emit (fast path). */
+	maxBacklogChars?: number
+	/** Minimum gap between emits, in ms — caps downstream re-parse/reflow frequency. */
+	minEmitIntervalMs?: number
+	/** Upper bound on the per-emit elapsed time, so a backgrounded-tab resume
+	 *  catches up over several emits instead of one large jump. */
+	maxCatchupMs?: number
+	// Injectables for tests:
+	now?: () => number
+	schedule?: Schedule
+	cancel?: Cancel
+}
+
+const defaultNow: () => number =
+	typeof performance !== 'undefined' && typeof performance.now === 'function'
+		? () => performance.now()
+		: () => Date.now()
+
+const hasRAF = typeof requestAnimationFrame !== 'undefined'
+const defaultSchedule: Schedule = hasRAF
+	? (cb) => requestAnimationFrame(cb)
+	: (cb) => setTimeout(cb, 16)
+const defaultCancel: Cancel = hasRAF
+	? (h) => cancelAnimationFrame(h as number)
+	: (h) => clearTimeout(h as ReturnType<typeof setTimeout>)
+
+export class TypewriterReveal {
+	private readonly onReveal: (chunk: string) => void
+	private readonly instant: boolean
+	private readonly smoothingMs: number
+	private readonly maxBacklogChars: number
+	private readonly minEmitIntervalMs: number
+	private readonly maxCatchupMs: number
+	private readonly now: () => number
+	private readonly schedule: Schedule
+	private readonly cancel: Cancel
+
+	// A stable buffer + an index into it: reveal advances `revealed` (O(1) per
+	// emit, no re-split). Everything before `revealed` has been emitted.
+	private buffer = ''
+	private revealed = 0
+	private lastEmit: number | null = null
+	private handle: unknown = null
+	private running = false
+
+	constructor(opts: TypewriterRevealOptions) {
+		this.onReveal = opts.onReveal
+		this.instant = opts.instant ?? false
+		this.smoothingMs = opts.smoothingMs ?? 500
+		this.maxBacklogChars = opts.maxBacklogChars ?? 1500
+		this.minEmitIntervalMs = opts.minEmitIntervalMs ?? 33
+		this.maxCatchupMs = opts.maxCatchupMs ?? 100
+		this.now = opts.now ?? defaultNow
+		this.schedule = opts.schedule ?? defaultSchedule
+		this.cancel = opts.cancel ?? defaultCancel
+	}
+
+	/** Enqueue received text. In instant mode it is revealed synchronously. */
+	push(text: string): void {
+		if (!text) return
+		if (this.instant) {
+			this.onReveal(text)
+			return
+		}
+		this.buffer += text
+		this.ensureRunning()
+	}
+
+	/** Reveal everything still buffered now and stop. Call before reading the
+	 *  owner's reactive state into committed state, so the read sees the full text. */
+	flush(): void {
+		this.stop()
+		if (this.instant) return
+		if (this.revealed < this.buffer.length) {
+			this.onReveal(this.buffer.slice(this.revealed))
+		}
+		// Everything is revealed now, so drop the buffer rather than carry an
+		// ever-growing turn's worth of text: onMessageEnd fires flush() at every
+		// tool-call boundary, and without this the buffer would keep every prior
+		// segment until the turn's reset(). The next push starts a fresh buffer.
+		this.buffer = ''
+		this.revealed = 0
+	}
+
+	/** Drop un-revealed backlog and stop. Call at turn boundaries. */
+	reset(): void {
+		this.stop()
+		this.buffer = ''
+		this.revealed = 0
+		this.lastEmit = null
+	}
+
+	private ensureRunning(): void {
+		if (this.running) return
+		this.running = true
+		// Re-anchor on resume from idle: a long gap since the last emit must not
+		// count as elapsed reveal time (the maxCatchupMs clamp only covers a
+		// still-running loop whose frame fired late).
+		this.lastEmit = null
+		this.handle = this.schedule(this.tick)
+	}
+
+	private stop(): void {
+		if (this.handle != null) {
+			this.cancel(this.handle)
+			this.handle = null
+		}
+		this.running = false
+	}
+
+	private tick = (): void => {
+		this.handle = null
+		const t = this.now()
+		const backlog = this.buffer.length - this.revealed
+		if (backlog <= 0) {
+			this.running = false
+			return
+		}
+
+		if (backlog >= this.maxBacklogChars) {
+			// Fast path: a cached/non-streaming reply dumped as one big delta shows
+			// instantly instead of being stretched. Steady streaming settles well
+			// under the cap, so smoothing only ever applies to genuinely bursty input.
+			this.emit(backlog)
+			this.lastEmit = t
+		} else {
+			const first = this.lastEmit === null
+			// First emit after (re)start reveals a small nominal slice one frame
+			// after arrival, keeping first paint essentially immediate.
+			const sinceLast = first ? this.minEmitIntervalMs : t - this.lastEmit!
+			if (sinceLast < this.minEmitIntervalMs) {
+				// Throttle: too soon since the last emit — wait another frame.
+				this.handle = this.schedule(this.tick)
+				return
+			}
+			const elapsedMs = Math.min(sinceLast, this.maxCatchupMs)
+			const rate = backlog / this.smoothingMs // chars per ms; grows with backlog
+			const n = Math.min(backlog, Math.max(1, Math.floor(rate * elapsedMs)))
+			const emitted = this.emit(n)
+			this.lastEmit = t
+			if (emitted === 0) {
+				// Nothing revealable yet (a lone trailing high surrogate awaiting its
+				// low half). Suspend; the next push restarts the loop.
+				this.running = false
+				return
+			}
+		}
+
+		if (this.revealed < this.buffer.length) {
+			this.handle = this.schedule(this.tick)
+		} else {
+			this.running = false
+		}
+	}
+
+	// Reveal up to `n` chars from `revealed`, never splitting a surrogate pair.
+	// Returns the number of chars actually emitted (0 only when the buffer ends on
+	// a lone high surrogate whose low half hasn't arrived).
+	private emit(n: number): number {
+		let end = Math.min(this.revealed + n, this.buffer.length)
+		if (end < this.buffer.length) {
+			const c = this.buffer.charCodeAt(end)
+			// Landed on a low surrogate → cut before its high half.
+			if (c >= 0xdc00 && c <= 0xdfff) end -= 1
+		}
+		if (end <= this.revealed) {
+			// A floor-1 slice landed inside a pair; take the whole pair so we still
+			// make progress rather than stalling on the same boundary each tick.
+			end = Math.min(this.revealed + 2, this.buffer.length)
+		}
+		if (end === this.buffer.length && end - 1 >= this.revealed) {
+			// Hold back a lone trailing high surrogate: its low half may still be
+			// streaming in, and revealing it alone would emit a broken code unit.
+			const last = this.buffer.charCodeAt(end - 1)
+			if (last >= 0xd800 && last <= 0xdbff) end -= 1
+		}
+		if (end <= this.revealed) return 0
+		const chunk = this.buffer.slice(this.revealed, end)
+		this.revealed = end
+		this.onReveal(chunk)
+		return chunk.length
+	}
+}
diff --git a/frontend/src/lib/components/copilot/chat/workspaceItems.svelte.ts b/frontend/src/lib/components/copilot/chat/workspaceItems.svelte.ts
index bc46d644df..8a7932b8d9 100644
--- a/frontend/src/lib/components/copilot/chat/workspaceItems.svelte.ts
+++ b/frontend/src/lib/components/copilot/chat/workspaceItems.svelte.ts
@@ -20,7 +20,7 @@ import { itemHref as offboardingItemHref } from '$lib/components/offboarding-uti
 import { findAndReplace } from 'mdast-util-find-and-replace'
 import { visit } from 'unist-util-visit'
 import type { Root, InlineCode, Link } from 'mdast'
-import type { ToolDisplayAction } from './shared'
+import type { CreatedResourceAction, ToolDisplayAction } from './shared'
 
 export type WindmillItemKind =
 	| 'script'
@@ -67,9 +67,9 @@ export const WINDMILL_PATH_REGEX =
  */
 const WINDMILL_PATH_EXACT_REGEX = /^[uf]\/[A-Za-z0-9_.\-]+\/[A-Za-z0-9_./\-]*[A-Za-z0-9_\-]$/
 
-function workspaceItemTriggerKind(kind: WindmillItemKind): ToolDisplayAction['triggerKind'] {
+function workspaceItemTriggerKind(kind: WindmillItemKind): CreatedResourceAction['triggerKind'] {
 	if (!kind.endsWith('_trigger')) return undefined
-	return kind.slice(0, -'_trigger'.length) as ToolDisplayAction['triggerKind']
+	return kind.slice(0, -'_trigger'.length) as CreatedResourceAction['triggerKind']
 }
 
 /**
diff --git a/frontend/src/lib/components/copilot/lib.anthropicRouting.test.ts b/frontend/src/lib/components/copilot/lib.anthropicRouting.test.ts
new file mode 100644
index 0000000000..a701c5b47b
--- /dev/null
+++ b/frontend/src/lib/components/copilot/lib.anthropicRouting.test.ts
@@ -0,0 +1,250 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AIProviderModel } from '$lib/gen'
+import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
+
+// getCurrentModel/getMetadataModel are read per call, so a hoisted holder lets
+// each test point the routing at a different provider/model.
+const h = vi.hoisted(() => ({ currentModel: undefined as AIProviderModel | undefined }))
+
+vi.mock('monaco-editor', () => ({ editor: {} }))
+
+vi.mock('$lib/stores', () => ({
+	workspaceStore: { subscribe: () => () => undefined }
+}))
+
+vi.mock('$lib/components/flows/flowTree', () => ({
+	findModuleInModules: () => undefined
+}))
+
+vi.mock('$lib/gen', () => ({
+	OpenAPI: { BASE: '/api', TOKEN: undefined },
+	ResourceService: {},
+	ScriptService: {},
+	FlowService: {},
+	JobService: {},
+	ScheduleService: {},
+	HttpTriggerService: {},
+	WebsocketTriggerService: {},
+	KafkaTriggerService: {},
+	NatsTriggerService: {},
+	PostgresTriggerService: {},
+	MqttTriggerService: {},
+	SqsTriggerService: {},
+	GcpTriggerService: {},
+	AzureTriggerService: {}
+}))
+
+vi.mock('$lib/utils', () => ({
+	emptyString: (value: string | undefined | null) => !value,
+	generateRandomString: () => 'generated_id'
+}))
+
+vi.mock('$lib/scripts', () => ({
+	scriptLangToEditorLang: (language: string) => language
+}))
+
+vi.mock('$lib/aiStore', () => ({
+	getCurrentModel: () => h.currentModel,
+	getMetadataModel: () => h.currentModel,
+	copilotInfo: {
+		subscribe: (run: (value: unknown) => void) => {
+			run({})
+			return () => undefined
+		}
+	}
+}))
+
+vi.mock('@leeoniya/ufuzzy', () => ({
+	default: class {
+		search() {
+			return [[], [], []]
+		}
+	}
+}))
+
+function streamOf(chunks: unknown[]): any {
+	return (async function* () {
+		for (const chunk of chunks) {
+			yield chunk
+		}
+	})()
+}
+
+function textDelta(text: string) {
+	return { type: 'content_block_delta', delta: { type: 'text_delta', text } }
+}
+
+const messages: ChatCompletionMessageParam[] = [{ role: 'user', content: 'hi' }]
+
+let anthropicCreate: ReturnType<typeof vi.fn>
+let anthropicStream: ReturnType<typeof vi.fn>
+let openaiCreate: ReturnType<typeof vi.fn>
+let openaiResponsesCreate: ReturnType<typeof vi.fn>
+
+async function setupClients() {
+	const { workspaceAIClients } = await import('./lib')
+
+	anthropicCreate = vi.fn().mockResolvedValue({
+		content: [
+			{ type: 'text', text: 'Hel' },
+			{ type: 'thinking', thinking: 'ignored' },
+			{ type: 'text', text: 'lo' }
+		]
+	})
+	anthropicStream = vi
+		.fn()
+		.mockReturnValue(
+			streamOf([
+				{ type: 'message_start' },
+				textDelta('Hel'),
+				{ type: 'content_block_delta', delta: { type: 'input_json_delta', partial_json: '{' } },
+				textDelta('lo'),
+				{ type: 'message_stop' }
+			])
+		)
+	openaiCreate = vi.fn().mockResolvedValue({ choices: [{ message: { content: 'openai text' } }] })
+	openaiResponsesCreate = vi.fn().mockResolvedValue({ output_text: 'responses text' })
+
+	vi.spyOn(workspaceAIClients, 'getAnthropicClient').mockReturnValue({
+		messages: { create: anthropicCreate, stream: anthropicStream }
+	} as any)
+	vi.spyOn(workspaceAIClients, 'getOpenaiClient').mockReturnValue({
+		chat: { completions: { create: openaiCreate } },
+		responses: { create: openaiResponsesCreate }
+	} as any)
+}
+
+beforeEach(async () => {
+	await setupClients()
+})
+
+afterEach(() => {
+	vi.restoreAllMocks()
+	h.currentModel = undefined
+})
+
+describe('Anthropic Messages API routing', () => {
+	it('getNonStreamingCompletion routes Foundry Claude through the Anthropic client', async () => {
+		const { getNonStreamingCompletion } = await import('./lib')
+		h.currentModel = { provider: 'azure_foundry', model: 'claude-sonnet-5' }
+
+		const response = await getNonStreamingCompletion(messages, new AbortController())
+
+		expect(anthropicCreate).toHaveBeenCalledTimes(1)
+		expect(openaiCreate).not.toHaveBeenCalled()
+		// text blocks concatenated, non-text blocks dropped
+		expect(response).toBe('Hello')
+
+		const headers = anthropicCreate.mock.calls[0][1].headers
+		// X-Provider must carry the real provider so the backend resolves Foundry
+		// credentials/URL; the SDK header selects the Messages API path.
+		expect(headers['X-Provider']).toBe('azure_foundry')
+		expect(headers['X-Anthropic-SDK']).toBe('true')
+	})
+
+	it('getNonStreamingCompletion routes native Anthropic through the Anthropic client', async () => {
+		const { getNonStreamingCompletion } = await import('./lib')
+		h.currentModel = { provider: 'anthropic', model: 'claude-opus-4-8' }
+
+		await getNonStreamingCompletion(messages, new AbortController())
+
+		expect(anthropicCreate).toHaveBeenCalledTimes(1)
+		expect(anthropicCreate.mock.calls[0][1].headers['X-Provider']).toBe('anthropic')
+	})
+
+	it('getNonStreamingCompletion keeps non-Claude Foundry models on the OpenAI path', async () => {
+		const { getNonStreamingCompletion } = await import('./lib')
+		h.currentModel = { provider: 'azure_foundry', model: 'gpt-4o' }
+
+		await getNonStreamingCompletion(messages, new AbortController())
+
+		expect(anthropicCreate).not.toHaveBeenCalled()
+		expect(openaiCreate).toHaveBeenCalledTimes(1)
+	})
+
+	it('getCompletion adapts the Anthropic stream into OpenAI text chunks', async () => {
+		const { getCompletion, getResponseFromEvent } = await import('./lib')
+		h.currentModel = { provider: 'azure_foundry', model: 'claude-sonnet-5' }
+
+		const completion = await getCompletion(messages, new AbortController())
+
+		let text = ''
+		let chunks = 0
+		for await (const part of completion) {
+			chunks++
+			text += getResponseFromEvent(part)
+		}
+
+		expect(anthropicStream).toHaveBeenCalledTimes(1)
+		// only the two text deltas surface; message_start/stop and input_json are dropped
+		expect(chunks).toBe(2)
+		expect(text).toBe('Hello')
+	})
+
+	it('testKey routes Foundry Claude through the Anthropic client', async () => {
+		const { testKey } = await import('./lib')
+
+		await testKey({
+			resourcePath: 'u/admin/foundry',
+			model: 'claude-sonnet-5',
+			abortController: new AbortController(),
+			messages,
+			aiProvider: 'azure_foundry'
+		})
+
+		expect(anthropicCreate).toHaveBeenCalledTimes(1)
+		const headers = anthropicCreate.mock.calls[0][1].headers
+		expect(headers['X-Provider']).toBe('azure_foundry')
+		expect(headers['X-Resource-Path']).toBe('u/admin/foundry')
+	})
+
+	it('caps max_tokens for metadata completions so the Anthropic SDK stays non-streaming', async () => {
+		const { getNonStreamingCompletion, getNonStreamingMetadataCompletion, METADATA_MAX_TOKENS } =
+			await import('./lib')
+		// claude-sonnet defaults to 64000 max_tokens; the Anthropic SDK refuses a
+		// non-streaming request that large (>10min worst case), which silently broke
+		// session auto-rename and the other metadata generators.
+		h.currentModel = { provider: 'anthropic', model: 'claude-sonnet-4-6' }
+
+		await getNonStreamingCompletion(messages, new AbortController())
+		expect(anthropicCreate.mock.calls[0][0].max_tokens).toBe(64000)
+
+		anthropicCreate.mockClear()
+		await getNonStreamingMetadataCompletion(messages, new AbortController())
+		expect(anthropicCreate.mock.calls[0][0].max_tokens).toBe(METADATA_MAX_TOKENS)
+		expect(METADATA_MAX_TOKENS).toBeLessThanOrEqual(21333)
+	})
+
+	it('caps max_output_tokens for metadata completions on the OpenAI Responses path', async () => {
+		const { getNonStreamingCompletion, getNonStreamingMetadataCompletion, METADATA_MAX_TOKENS } =
+			await import('./lib')
+		// OpenAI/Azure non-streaming routes through the Responses API; the cap must
+		// reach it too, not just the Anthropic and chat.completions paths.
+		h.currentModel = { provider: 'openai', model: 'gpt-4o' }
+
+		await getNonStreamingCompletion(messages, new AbortController())
+		expect(openaiResponsesCreate).toHaveBeenCalledTimes(1)
+		expect(openaiResponsesCreate.mock.calls[0][0].max_output_tokens).toBe(16384)
+
+		openaiResponsesCreate.mockClear()
+		await getNonStreamingMetadataCompletion(messages, new AbortController())
+		expect(openaiResponsesCreate.mock.calls[0][0].max_output_tokens).toBe(METADATA_MAX_TOKENS)
+	})
+
+	it('getFimCompletion no-ops for Anthropic Messages API models', async () => {
+		const { getFimCompletion } = await import('./lib')
+		const fetchSpy = vi.spyOn(globalThis, 'fetch')
+
+		for (const provider of ['anthropic', 'azure_foundry'] as const) {
+			const result = await getFimCompletion(
+				'prefix',
+				'suffix',
+				{ provider, model: 'claude-sonnet-5' },
+				new AbortController()
+			)
+			expect(result).toBeUndefined()
+		}
+		// no autocomplete request should be issued for these models
+		expect(fetchSpy).not.toHaveBeenCalled()
+	})
+})
diff --git a/frontend/src/lib/components/copilot/lib.toolCalls.test.ts b/frontend/src/lib/components/copilot/lib.toolCalls.test.ts
new file mode 100644
index 0000000000..36e667f57d
--- /dev/null
+++ b/frontend/src/lib/components/copilot/lib.toolCalls.test.ts
@@ -0,0 +1,167 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
+
+vi.mock('monaco-editor', () => ({
+	editor: {}
+}))
+
+vi.mock('$lib/stores', () => ({
+	workspaceStore: { subscribe: () => () => undefined }
+}))
+
+vi.mock('$lib/components/flows/flowTree', () => ({
+	findModuleInModules: () => undefined
+}))
+
+vi.mock('$lib/gen', () => ({
+	OpenAPI: {},
+	ResourceService: {},
+	ScriptService: {},
+	FlowService: {},
+	JobService: {},
+	ScheduleService: {},
+	HttpTriggerService: {},
+	WebsocketTriggerService: {},
+	KafkaTriggerService: {},
+	NatsTriggerService: {},
+	PostgresTriggerService: {},
+	MqttTriggerService: {},
+	SqsTriggerService: {},
+	GcpTriggerService: {},
+	AzureTriggerService: {}
+}))
+
+vi.mock('$lib/utils', () => ({
+	emptyString: (value: string | undefined | null) => !value,
+	generateRandomString: () => 'generated_id'
+}))
+
+vi.mock('$lib/scripts', () => ({
+	scriptLangToEditorLang: (language: string) => language
+}))
+
+vi.mock('$lib/aiStore', () => ({
+	getCurrentModel: () => undefined,
+	getMetadataModel: () => undefined,
+	copilotInfo: {
+		subscribe: (run: (value: unknown) => void) => {
+			run({})
+			return () => undefined
+		}
+	}
+}))
+
+vi.mock('@leeoniya/ufuzzy', () => ({
+	default: class {
+		search() {
+			return [[], [], []]
+		}
+	}
+}))
+
+function streamOf(chunks: unknown[]): any {
+	return (async function* () {
+		for (const chunk of chunks) {
+			yield chunk
+		}
+	})()
+}
+
+function toolCallChunk(delta: Record<string, unknown>) {
+	return { choices: [{ delta: { tool_calls: [{ index: 0, ...delta }] } }] }
+}
+
+function createCallbacks() {
+	return {
+		onNewToken: vi.fn(),
+		onMessageEnd: vi.fn(),
+		setToolStatus: vi.fn(),
+		removeToolStatus: vi.fn()
+	}
+}
+
+function createTool(fn = vi.fn().mockResolvedValue('tool ok')) {
+	return {
+		def: {
+			type: 'function' as const,
+			function: { name: 'patch_app_file', parameters: { type: 'object' } }
+		},
+		fn
+	}
+}
+
+describe('parseOpenAICompletion tool call arguments', () => {
+	it('does not execute nor persist a tool call whose streamed arguments are truncated', async () => {
+		const { parseOpenAICompletion } = await import('./lib')
+		const fn = vi.fn()
+		const callbacks = createCallbacks()
+		const messages: ChatCompletionMessageParam[] = []
+		const addedMessages: ChatCompletionMessageParam[] = []
+
+		const result = await parseOpenAICompletion(
+			streamOf([
+				toolCallChunk({
+					id: 'call_1',
+					function: { name: 'patch_app_file', arguments: '{"path": "u/admin/app", ' }
+				}),
+				// The stream ends mid-arguments (e.g. output token limit or dropped connection)
+				toolCallChunk({ function: { arguments: '"old_string": "setMessages(prev' } })
+			]),
+			callbacks,
+			messages,
+			addedMessages,
+			[createTool(fn)] as any,
+			{},
+			undefined,
+			{ workspace: 'test' }
+		)
+
+		expect(fn).not.toHaveBeenCalled()
+		expect(result.shouldContinue).toBe(true)
+
+		const assistant = messages.find((m) => m.role === 'assistant') as any
+		// Persisting the truncated arguments string would make every follow-up
+		// request fail provider-side JSON parsing, bricking the session.
+		expect(assistant.tool_calls[0].function.arguments).toBe('{}')
+
+		const toolResult = messages.find((m) => m.role === 'tool') as any
+		expect(toolResult.tool_call_id).toBe('call_1')
+		expect(toolResult.content).toContain('NOT executed')
+		expect(callbacks.setToolStatus).toHaveBeenCalledWith(
+			'call_1',
+			expect.objectContaining({ error: expect.stringContaining('invalid or truncated') })
+		)
+		expect(addedMessages).toEqual(messages)
+	})
+
+	it('executes a tool call with valid streamed arguments and keeps them verbatim', async () => {
+		const { parseOpenAICompletion } = await import('./lib')
+		const fn = vi.fn().mockResolvedValue('tool ok')
+		const messages: ChatCompletionMessageParam[] = []
+
+		const result = await parseOpenAICompletion(
+			streamOf([
+				toolCallChunk({
+					id: 'call_1',
+					function: { name: 'patch_app_file', arguments: '{"path": ' }
+				}),
+				toolCallChunk({ function: { arguments: '"u/admin/app"}' } })
+			]),
+			createCallbacks(),
+			messages,
+			[],
+			[createTool(fn)] as any,
+			{},
+			undefined,
+			{ workspace: 'test' }
+		)
+
+		expect(fn).toHaveBeenCalledWith(expect.objectContaining({ args: { path: 'u/admin/app' } }))
+		expect(result.shouldContinue).toBe(true)
+
+		const assistant = messages.find((m) => m.role === 'assistant') as any
+		expect(assistant.tool_calls[0].function.arguments).toBe('{"path": "u/admin/app"}')
+		const toolResult = messages.find((m) => m.role === 'tool') as any
+		expect(toolResult.content).toBe('tool ok')
+	})
+})
diff --git a/frontend/src/lib/components/copilot/lib.ts b/frontend/src/lib/components/copilot/lib.ts
index ffa4e5db24..88afa58b7d 100644
--- a/frontend/src/lib/components/copilot/lib.ts
+++ b/frontend/src/lib/components/copilot/lib.ts
@@ -14,10 +14,11 @@ import Anthropic from '@anthropic-ai/sdk'
 import { get, type Writable } from 'svelte/store'
 import { OpenAPI, ResourceService, type Script } from '../../gen'
 import { EDIT_CONFIG, FIX_CONFIG, GEN_CONFIG } from './prompts'
-import { requiresMaxCompletionTokens } from './modelConfig'
+import { requiresMaxCompletionTokens, usesAnthropicMessagesApi } from './modelConfig'
 import { applyReasoningToConfig } from './reasoningRegistry'
 import { formatResourceTypes } from './utils'
 import { processToolCall, type Tool, type ToolCallbacks } from './chat/shared'
+import { hasValidToolCallArguments } from './chat/toolCallArguments'
 import {
 	getNonStreamingOpenAIResponsesCompletion,
 	getOpenAIResponsesCompletionStream
@@ -62,22 +63,10 @@ export const AI_PROVIDERS: Record<AIProvider, AIProviderDetails> = {
 		label: 'OpenAI',
 		defaultModels: OPENAI_MODELS
 	},
-	azure_openai: {
-		label: 'Azure OpenAI',
-		defaultModels: OPENAI_MODELS
-	},
 	anthropic: {
 		label: 'Anthropic',
 		defaultModels: ['claude-sonnet-4-6', 'claude-3-5-haiku-latest']
 	},
-	mistral: {
-		label: 'Mistral',
-		defaultModels: ['codestral-latest']
-	},
-	deepseek: {
-		label: 'DeepSeek',
-		defaultModels: ['deepseek-v4-pro', 'deepseek-chat', 'deepseek-reasoner']
-	},
 	googleai: {
 		label: 'Google AI',
 		defaultModels: [
@@ -89,6 +78,29 @@ export const AI_PROVIDERS: Record<AIProvider, AIProviderDetails> = {
 			'gemini-3.1-flash-lite'
 		]
 	},
+	azure_openai: {
+		label: 'Azure OpenAI',
+		defaultModels: OPENAI_MODELS
+	},
+	azure_foundry: {
+		label: 'Azure AI Foundry',
+		defaultModels: [
+			'gpt-4o',
+			'gpt-4o-mini',
+			'DeepSeek-R1',
+			'Llama-3.3-70B-Instruct',
+			'Phi-4',
+			'Mistral-Large-2411'
+		]
+	},
+	mistral: {
+		label: 'Mistral',
+		defaultModels: ['codestral-latest']
+	},
+	deepseek: {
+		label: 'DeepSeek',
+		defaultModels: ['deepseek-v4-pro', 'deepseek-chat', 'deepseek-reasoner']
+	},
 	groq: {
 		label: 'Groq',
 		defaultModels: ['llama-3.3-70b-versatile', 'llama-3.1-8b-instant']
@@ -267,7 +279,10 @@ export async function fetchAvailableModels(
 export function getModelMaxTokens(provider: AIProvider, model: string) {
 	if (model.includes('gpt-5')) {
 		return 128000
-	} else if ((provider === 'azure_openai' || provider === 'openai') && model.startsWith('o')) {
+	} else if (
+		(provider === 'azure_openai' || provider === 'openai' || provider === 'azure_foundry') &&
+		model.startsWith('o')
+	) {
 		return 100000
 	} else if (
 		model.includes('claude-sonnet') ||
@@ -287,11 +302,12 @@ export function getModelMaxTokens(provider: AIProvider, model: string) {
 	return 8192
 }
 
-
-function getModelSpecificConfig(
-	modelProvider: AIProviderModel,
-	tools?: OpenAI.Chat.Completions.ChatCompletionTool[]
-) {
+// Resolves the completion token cap for a model: the workspace's per-model
+// override when set, otherwise the built-in default. Shared by the OpenAI and
+// Anthropic request paths so both honor the same limit. `cap` bounds the result
+// (used by short metadata completions, see METADATA_MAX_TOKENS) — a hard ceiling
+// that wins over both the workspace override and the default.
+function resolveMaxTokens(modelProvider: AIProviderModel, cap?: number): number {
 	const defaultMaxTokens = getModelMaxTokens(modelProvider.provider, modelProvider.model)
 	const modelKey = `${modelProvider.provider}:${modelProvider.model}`
 	let customMaxTokensStore: Record<string, number> | undefined
@@ -300,9 +316,27 @@ function getModelSpecificConfig(
 	} catch {
 		// copilotInfo store may not be initialized in vitest
 	}
-	const maxTokens = customMaxTokensStore?.[modelKey] ?? defaultMaxTokens
+	const resolved = customMaxTokensStore?.[modelKey] ?? defaultMaxTokens
+	return cap !== undefined ? Math.min(resolved, cap) : resolved
+}
+
+// Token cap for metadata completions (session titles, cron/predicate/step-input
+// generation). These outputs are short, and the Anthropic SDK refuses a
+// non-streaming request whose max_tokens implies a >10-minute worst case
+// (60min × max_tokens / 128000): the model defaults (sonnet/haiku 64000, opus
+// 32000) all trip it. Capping keeps every provider's metadata call non-streaming.
+export const METADATA_MAX_TOKENS = 4096
+
+function getModelSpecificConfig(
+	modelProvider: AIProviderModel,
+	tools?: OpenAI.Chat.Completions.ChatCompletionTool[],
+	maxTokensCap?: number
+) {
+	const maxTokens = resolveMaxTokens(modelProvider, maxTokensCap)
 	if (
-		(modelProvider.provider === 'openai' || modelProvider.provider === 'azure_openai') &&
+		(modelProvider.provider === 'openai' ||
+			modelProvider.provider === 'azure_openai' ||
+			modelProvider.provider === 'azure_foundry') &&
 		requiresMaxCompletionTokens(modelProvider.model)
 	) {
 		return {
@@ -352,6 +386,7 @@ const DEFAULT_COMPLETION_CONFIG: ChatCompletionCreateParams = {
 export const PROVIDER_COMPLETION_CONFIG_MAP: Record<AIProvider, ChatCompletionCreateParams> = {
 	openai: DEFAULT_COMPLETION_CONFIG,
 	azure_openai: DEFAULT_COMPLETION_CONFIG,
+	azure_foundry: DEFAULT_COMPLETION_CONFIG,
 	groq: DEFAULT_COMPLETION_CONFIG,
 	openrouter: DEFAULT_COMPLETION_CONFIG,
 	togetherai: DEFAULT_COMPLETION_CONFIG,
@@ -449,19 +484,10 @@ export async function testKey({
 		throw new Error('Missing a model to test')
 	}
 
-	// Use Anthropic SDK for Anthropic provider
-	if (aiProvider === 'anthropic') {
-		await testAnthropicKey({
-			apiKey,
-			workspace,
-			resourcePath,
-			model: modelToTest,
-			abortController,
-			messages
-		})
-		return
-	}
-
+	// getNonStreamingCompletion routes Anthropic-Messages-API models (native
+	// Anthropic and Claude on Azure Foundry) through the Anthropic SDK and
+	// everything else through OpenAI chat completions, so the test exercises the
+	// same request shape the feature actually sends.
 	await getNonStreamingCompletion(messages, abortController, {
 		apiKey,
 		workspace,
@@ -473,25 +499,37 @@ export async function testKey({
 	})
 }
 
-async function testAnthropicKey({
-	apiKey,
-	workspace,
-	resourcePath,
-	model,
-	abortController,
-	messages
-}: {
+// Providers served through the Anthropic Messages API (native Anthropic, and
+// Claude deployments on Azure Foundry) require the Anthropic SDK request shape:
+// OpenAI chat-completions requests fail against them because the proxy forwards
+// the body verbatim and, for Foundry, rewrites the URL to the /anthropic/v1
+// surface that only serves /messages. This centralizes the client/header/message
+// setup so every completion entry point routes them the same way the chat does.
+interface AnthropicCompletionParams {
+	messages: ChatCompletionMessageParam[]
+	modelProvider: AIProviderModel
+	abortController: AbortController
 	apiKey?: string
 	workspace?: string
 	resourcePath?: string
-	model: string
-	abortController: AbortController
-	messages: ChatCompletionMessageParam[]
-}) {
+	maxTokensCap?: number
+}
+
+function buildAnthropicProxyRequest({
+	messages,
+	modelProvider,
+	apiKey,
+	workspace,
+	resourcePath,
+	maxTokensCap
+}: Omit<AnthropicCompletionParams, 'abortController'>) {
 	const { system, messages: anthropicMessages } = convertOpenAIToAnthropicMessages(messages)
 
+	// X-Provider must be the real provider (e.g. azure_foundry) so the backend
+	// resolves the right credentials and Anthropic URL; the SDK headers tell it to
+	// route through the Anthropic Messages API.
 	const headers: Record<string, string> = {
-		'X-Provider': 'anthropic',
+		'X-Provider': modelProvider.provider,
 		'anthropic-version': '2023-06-01',
 		'X-Anthropic-SDK': 'true'
 	}
@@ -502,24 +540,65 @@ async function testAnthropicKey({
 		headers['X-API-Key'] = apiKey
 	}
 
-	const anthropicClient = apiKey
+	const client = apiKey
 		? createAnthropicProxyClient(getAiProxyBaseURL())
 		: workspace
 			? workspaceAIClients.createAnthropicClient(workspace)
 			: workspaceAIClients.getAnthropicClient()
 
-	await anthropicClient.messages.create(
-		{
-			model,
-			max_tokens: 100,
-			messages: anthropicMessages,
-			...(system && { system })
-		},
-		{
-			signal: abortController.signal,
-			headers
+	const body = {
+		model: modelProvider.model,
+		max_tokens: resolveMaxTokens(modelProvider, maxTokensCap),
+		messages: anthropicMessages,
+		...(system && { system })
+	}
+
+	return { client, headers, body }
+}
+
+async function getAnthropicNonStreamingCompletion({
+	abortController,
+	...params
+}: AnthropicCompletionParams): Promise<string> {
+	const { client, headers, body } = buildAnthropicProxyRequest(params)
+
+	const message = await client.messages.create(body, {
+		signal: abortController.signal,
+		headers
+	})
+
+	return message.content.map((block) => (block.type === 'text' ? block.text : '')).join('')
+}
+
+// Adapts an Anthropic Messages stream into the OpenAI ChatCompletionChunk shape
+// the completion consumers already iterate, so they need no Anthropic-specific
+// handling. Only text deltas are surfaced (these paths don't use tool calls).
+function getAnthropicStreamingCompletion({
+	abortController,
+	...params
+}: AnthropicCompletionParams): Stream<ChatCompletionChunk> {
+	const { client, headers, body } = buildAnthropicProxyRequest(params)
+
+	const stream = client.messages.stream(body, {
+		signal: abortController.signal,
+		headers
+	})
+
+	async function* toOpenAIChunks(): AsyncGenerator<ChatCompletionChunk> {
+		for await (const event of stream) {
+			if (event.type === 'content_block_delta' && event.delta.type === 'text_delta') {
+				yield {
+					id: '',
+					object: 'chat.completion.chunk',
+					created: 0,
+					model: params.modelProvider.model,
+					choices: [{ index: 0, delta: { content: event.delta.text }, finish_reason: null }]
+				}
+			}
 		}
-	)
+	}
+
+	return toOpenAIChunks() as unknown as Stream<ChatCompletionChunk>
 }
 
 interface BaseOptions {
@@ -711,12 +790,14 @@ export function getProviderAndCompletionConfig<K extends boolean>({
 	messages,
 	stream,
 	tools,
-	forceModelProvider
+	forceModelProvider,
+	maxTokensCap
 }: {
 	messages: ChatCompletionMessageParam[]
 	stream: K
 	tools?: OpenAI.Chat.Completions.ChatCompletionTool[]
 	forceModelProvider?: AIProviderModel
+	maxTokensCap?: number
 }): {
 	provider: AIProvider
 	config: K extends true
@@ -730,7 +811,7 @@ export function getProviderAndCompletionConfig<K extends boolean>({
 		provider: modelProvider.provider,
 		config: {
 			...providerConfig,
-			...getModelSpecificConfig(modelProvider, tools),
+			...getModelSpecificConfig(modelProvider, tools, maxTokensCap),
 			messages: processedMessages,
 			stream
 		} as any
@@ -745,13 +826,29 @@ export async function getNonStreamingCompletion(
 		resourcePath?: string // testing resource path passed as a header to the backend proxy
 		workspace?: string // use a specific workspace proxy when testing a workspace resource
 		forceModelProvider?: AIProviderModel
+		maxTokensCap?: number // hard ceiling on output tokens (see METADATA_MAX_TOKENS)
 	}
 ) {
+	const modelProvider = options?.forceModelProvider ?? getCurrentModel()
+
+	if (usesAnthropicMessagesApi(modelProvider.provider, modelProvider.model)) {
+		return getAnthropicNonStreamingCompletion({
+			messages,
+			modelProvider,
+			abortController,
+			apiKey: options?.apiKey,
+			workspace: options?.workspace,
+			resourcePath: options?.resourcePath,
+			maxTokensCap: options?.maxTokensCap
+		})
+	}
+
 	let response: string | undefined = ''
 	const { provider, config } = getProviderAndCompletionConfig({
 		messages,
 		stream: false,
-		forceModelProvider: options?.forceModelProvider
+		forceModelProvider: options?.forceModelProvider,
+		maxTokensCap: options?.maxTokensCap
 	})
 
 	// Use Responses API for OpenAI and Azure OpenAI
@@ -808,7 +905,8 @@ export async function getNonStreamingMetadataCompletion(
 	abortController: AbortController
 ) {
 	return getNonStreamingCompletion(messages, abortController, {
-		forceModelProvider: getMetadataModel()
+		forceModelProvider: getMetadataModel(),
+		maxTokensCap: METADATA_MAX_TOKENS
 	})
 }
 
@@ -820,6 +918,14 @@ export async function getFimCompletion(
 	providerModel: AIProviderModel,
 	abortController: AbortController
 ): Promise<string | undefined> {
+	// The Anthropic Messages API has no fill-in-the-middle endpoint, and Foundry
+	// Claude deployments don't expose the OpenAI-compatible completions surface the
+	// FIM proxy targets. Skip autocomplete for these models rather than issuing a
+	// request that can't succeed.
+	if (usesAnthropicMessagesApi(providerModel.provider, providerModel.model)) {
+		return undefined
+	}
+
 	const fetchOptions: {
 		signal: AbortSignal
 		headers: Record<string, string>
@@ -882,6 +988,12 @@ export async function getCompletion(
 		reasoningEffort?: string
 	}
 ): Promise<Stream<ChatCompletionChunk>> {
+	const modelProvider = options?.forceModelProvider ?? getCurrentModel()
+
+	if (usesAnthropicMessagesApi(modelProvider.provider, modelProvider.model)) {
+		return getAnthropicStreamingCompletion({ messages, modelProvider, abortController })
+	}
+
 	const { provider, config } = getProviderAndCompletionConfig({
 		messages,
 		stream: true,
@@ -906,7 +1018,10 @@ export async function getCompletion(
 	// Use Completions API for other providers
 	const client = options?.openaiClient ?? workspaceAIClients.getOpenaiClient()
 	const completionConfig = applyReasoningToConfig(
-		(provider === 'openai' || provider === 'azure_openai' || provider === 'googleai') &&
+		(provider === 'openai' ||
+			provider === 'azure_openai' ||
+			provider === 'azure_foundry' ||
+			provider === 'googleai') &&
 			config.stream
 			? {
 					...config,
@@ -1094,11 +1209,14 @@ export async function parseOpenAICompletion(
 	}
 
 	if (toolCalls.length > 0) {
+		const invalidToolCallIds = new Set(
+			toolCalls.filter((t) => !hasValidToolCallArguments(t.function.arguments)).map((t) => t.id)
+		)
 		const normalizedToolCalls = toolCalls.map((t) => ({
 			...t,
 			function: {
 				...t.function,
-				arguments: t.function.arguments || '{}'
+				arguments: invalidToolCallIds.has(t.id) ? '{}' : t.function.arguments || '{}'
 			}
 		}))
 		const toAdd = buildAssistantToolCallMessage({
@@ -1113,6 +1231,22 @@ export async function parseOpenAICompletion(
 		messages.push(toAdd)
 		addedMessages.push(toAdd)
 		for (const toolCall of toolCalls) {
+			if (invalidToolCallIds.has(toolCall.id)) {
+				callbacks.setToolStatus(toolCall.id, {
+					isLoading: false,
+					isStreamingArguments: false,
+					error: 'Tool call arguments were invalid or truncated'
+				})
+				const messageToAdd = {
+					role: 'tool' as const,
+					tool_call_id: toolCall.id,
+					content:
+						'The tool call arguments were invalid or truncated JSON, so the tool was NOT executed. Retry the call; if the arguments were long, split the work into several smaller calls.'
+				}
+				messages.push(messageToAdd)
+				addedMessages.push(messageToAdd)
+				continue
+			}
 			const messageToAdd = await processToolCall({
 				tools,
 				toolCall,
diff --git a/frontend/src/lib/components/copilot/modelConfig.test.ts b/frontend/src/lib/components/copilot/modelConfig.test.ts
new file mode 100644
index 0000000000..1788d9c365
--- /dev/null
+++ b/frontend/src/lib/components/copilot/modelConfig.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest'
+import { usesAnthropicMessagesApi } from './modelConfig'
+
+describe('usesAnthropicMessagesApi', () => {
+	it('routes the native Anthropic provider through the Messages API', () => {
+		expect(usesAnthropicMessagesApi('anthropic', 'claude-sonnet-5')).toBe(true)
+	})
+
+	it('routes Azure Foundry Claude deployments through the Messages API', () => {
+		expect(usesAnthropicMessagesApi('azure_foundry', 'claude-sonnet-5')).toBe(true)
+		expect(usesAnthropicMessagesApi('azure_foundry', 'Claude-Opus-4-8')).toBe(true)
+	})
+
+	it('keeps other Azure Foundry models on the OpenAI-compatible path', () => {
+		expect(usesAnthropicMessagesApi('azure_foundry', 'gpt-4o')).toBe(false)
+		expect(usesAnthropicMessagesApi('azure_foundry', 'DeepSeek-R1')).toBe(false)
+	})
+
+	it('does not affect other providers', () => {
+		expect(usesAnthropicMessagesApi('openai', 'gpt-4o')).toBe(false)
+		expect(usesAnthropicMessagesApi('azure_openai', 'gpt-4o')).toBe(false)
+	})
+})
diff --git a/frontend/src/lib/components/copilot/modelConfig.ts b/frontend/src/lib/components/copilot/modelConfig.ts
index 4ab08ce02c..af0dd942b2 100644
--- a/frontend/src/lib/components/copilot/modelConfig.ts
+++ b/frontend/src/lib/components/copilot/modelConfig.ts
@@ -1,3 +1,17 @@
+import type { AIProvider } from '$lib/gen'
+
+// Azure AI Foundry fronts multiple model families under one resource. Claude
+// deployments are served only through the Anthropic Messages API, so the chat must
+// route them like the native Anthropic provider (Anthropic SDK, message format)
+// rather than the OpenAI-compatible surface used for the rest of Foundry's catalog.
+// Mirrors the backend `AIProvider::is_anthropic_model`.
+export function usesAnthropicMessagesApi(provider: AIProvider, model: string): boolean {
+	return (
+		provider === 'anthropic' ||
+		(provider === 'azure_foundry' && model.toLowerCase().startsWith('claude'))
+	)
+}
+
 // gpt-5+ and o-series reasoning models reject the legacy `max_tokens` field on
 // the OpenAI/Azure Chat Completions API and require `max_completion_tokens`
 // instead. The check strips any provider prefix (e.g. OpenRouter's "openai/o3")
diff --git a/frontend/src/lib/components/copilot/reasoningRegistry.test.ts b/frontend/src/lib/components/copilot/reasoningRegistry.test.ts
index 42f0006a1d..2b27ac9d7b 100644
--- a/frontend/src/lib/components/copilot/reasoningRegistry.test.ts
+++ b/frontend/src/lib/components/copilot/reasoningRegistry.test.ts
@@ -243,6 +243,36 @@ describe('supportsReasoning (static registry)', () => {
 	})
 })
 
+describe('Azure AI Foundry reasoning follows the model family', () => {
+	it('treats Foundry Claude deployments like the Anthropic provider', () => {
+		// Live-verified: Foundry Claude accepts the adaptive-thinking effort ladder.
+		expect(supportsReasoning('azure_foundry', 'claude-sonnet-5')).toBe(true)
+		expect(supportsReasoning('azure_foundry', 'claude-opus-4-8')).toBe(true)
+		expect(getReasoningCapability('azure_foundry', 'claude-opus-4-8').levels).toEqual([
+			'low',
+			'medium',
+			'high',
+			'xhigh',
+			'max'
+		])
+		// Off is achieved by omission (Foundry rejects effort 'none'), like Anthropic.
+		expect(getReasoningCapability('azure_foundry', 'claude-sonnet-5').canDisable).toBe(true)
+		expect(
+			resolveRequestReasoning({
+				provider: 'azure_foundry',
+				model: 'claude-sonnet-5',
+				reasoning: REASONING_OFF
+			})
+		).toBeUndefined()
+	})
+
+	it('treats Foundry OpenAI deployments like the OpenAI provider', () => {
+		expect(supportsReasoning('azure_foundry', 'gpt-5.1')).toBe(true)
+		expect(supportsReasoning('azure_foundry', 'gpt-4o')).toBe(false)
+		expect(supportsReasoning('azure_foundry', 'DeepSeek-R1')).toBe(false)
+	})
+})
+
 describe('resolveEffectiveReasoning', () => {
 	it('defaults capable models to high when unset', () => {
 		expect(resolveEffectiveReasoning({ provider: 'anthropic', model: 'claude-sonnet-4-6' })).toBe(
diff --git a/frontend/src/lib/components/copilot/reasoningRegistry.ts b/frontend/src/lib/components/copilot/reasoningRegistry.ts
index e1ce2467f2..519c1a4021 100644
--- a/frontend/src/lib/components/copilot/reasoningRegistry.ts
+++ b/frontend/src/lib/components/copilot/reasoningRegistry.ts
@@ -1,4 +1,5 @@
 import type { AIProvider, AIProviderModel } from '$lib/gen'
+import { usesAnthropicMessagesApi } from './modelConfig'
 
 /**
  * Reasoning effort is provider/model-specific. We never normalize a single
@@ -38,6 +39,20 @@ function baseModelId(model: string): string {
 	return normalized.split('/').pop() ?? normalized
 }
 
+/**
+ * Azure AI Foundry hosts multiple model families under one provider, so reasoning
+ * support follows the underlying model rather than the provider: Claude deployments
+ * reason like the native Anthropic provider (adaptive thinking + `output_config.effort`),
+ * everything else (gpt-5 / o-series) like OpenAI. Resolving to the owning family here
+ * lets the rest of the registry keep its per-family logic unchanged.
+ */
+function reasoningProviderFamily(provider: AIProvider, model: string): AIProvider {
+	if (provider === 'azure_foundry') {
+		return usesAnthropicMessagesApi(provider, model) ? 'anthropic' : 'openai'
+	}
+	return provider
+}
+
 /**
  * Suggested effort levels per provider, sourced from each provider SDK's own
  * vocabulary.
@@ -143,14 +158,16 @@ function anthropicReasoningLevels(model: string): ReasoningEffort[] {
 function supportsReasoningStatic(provider: AIProvider, model: string): boolean {
 	const m = model.toLowerCase()
 	const base = baseModelId(model)
-	switch (provider) {
+	switch (reasoningProviderFamily(provider, model)) {
 		case 'anthropic':
 		// Bedrock serves the same Claude models under prefixed ids
 		// (e.g. `us.anthropic.claude-opus-4-6-v1`), so match on the full string.
 		case 'aws_bedrock':
 			// 4.6+ only: Opus 4.5 rejects adaptive thinking (and, on Bedrock,
 			// the whole output_config surface) — live-verified hard 400.
-			return /claude-opus-4-(6|7|8)/.test(m) || /claude-sonnet-4-6/.test(m) || m.includes('fable')
+			return (
+				/claude-opus-4-(6|7|8)/.test(m) || /claude-sonnet-(4-6|5)/.test(m) || m.includes('fable')
+			)
 		case 'openai':
 		case 'azure_openai':
 			return base.startsWith('gpt-5') || /^o\d/.test(base)
@@ -204,16 +221,17 @@ export function getReasoningCapability(provider: AIProvider, model: string): Rea
 	if (!supported) {
 		return { supported: false, levels: [], canDisable: false }
 	}
+	const family = reasoningProviderFamily(provider, bareModel)
 	const levels =
-		provider === 'anthropic' || provider === 'aws_bedrock'
+		family === 'anthropic' || family === 'aws_bedrock'
 			? anthropicReasoningLevels(bareModel)
-			: provider === 'googleai'
+			: family === 'googleai'
 				? geminiReasoningLevels(bareModel)
-				: provider === 'openai' || provider === 'azure_openai'
+				: family === 'openai' || family === 'azure_openai'
 					? openaiReasoningLevels(bareModel)
-					: provider === 'openrouter'
+					: family === 'openrouter'
 						? openrouterReasoningLevels(bareModel)
-						: (PROVIDER_REASONING_LEVELS[provider] ?? ['low', 'medium', 'high'])
+						: (PROVIDER_REASONING_LEVELS[family] ?? ['low', 'medium', 'high'])
 	return { supported, levels, canDisable: canDisableReasoning(provider, bareModel) }
 }
 
@@ -226,7 +244,7 @@ export function getReasoningCapability(provider: AIProvider, model: string): Rea
 function canDisableReasoning(provider: AIProvider, model: string): boolean {
 	const m = model.toLowerCase()
 	const base = baseModelId(model)
-	switch (provider) {
+	switch (reasoningProviderFamily(provider, model)) {
 		case 'anthropic':
 		case 'aws_bedrock':
 			// Claude 4.6+ only think when asked, so omission is a real off —
@@ -301,8 +319,8 @@ export const DEEPSEEK_OFF_SENTINEL: ReasoningEffort = 'none'
  * model that reasons *by default* — omitting the field would silently keep
  * the default-on behavior. Undefined means omission is the correct off.
  */
-function explicitOffToken(provider: AIProvider, model: string): ReasoningEffort | undefined {
-	switch (provider) {
+export function explicitOffToken(provider: AIProvider, model: string): ReasoningEffort | undefined {
+	switch (reasoningProviderFamily(provider, model)) {
 		case 'googleai':
 			// Gemini 2.5/3 think by default (dynamic budget / level). The backend
 			// proxy maps 'none' to off on Flash, or the floor on Pro (only
diff --git a/frontend/src/lib/components/custom_ui.ts b/frontend/src/lib/components/custom_ui.ts
index 68ecf43a57..a04c9ea4b5 100644
--- a/frontend/src/lib/components/custom_ui.ts
+++ b/frontend/src/lib/components/custom_ui.ts
@@ -94,6 +94,11 @@ export type PreviewPanelUi = {
 	// "what happened the last time this ran". No-op when a test is already
 	// in progress (we don't clobber a live run).
 	loadLastRunOnMount?: boolean
+	// Pipeline-only: when set, the Test split's caret popover gains a "Run
+	// downstream up to…" entry that calls this, letting the user bound the
+	// cascade from the script they're editing. Wired by the pipeline details
+	// pane only when the open script is a valid bounded-run start.
+	onBoundedRun?: () => void
 }
 
 export type EditorBarUi = {
diff --git a/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts b/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts
index c23a864a2b..59345c6ae7 100644
--- a/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts
+++ b/frontend/src/lib/components/dbManagerDrawerModel.svelte.ts
@@ -108,7 +108,10 @@ export interface DbManagerUriState {
 	selectedSchema: string | undefined
 	selectedTable: string | undefined
 	readonly open: boolean
-	openDrawer: (nInput: DbInput) => void
+	/** Workspace the drawer's DB operations run against — the acting workspace of
+	 * the editor that opened it, else the navigation workspace. */
+	workspace: string | undefined
+	openDrawer: (nInput: DbInput, workspace?: string) => void
 	closeDrawer: () => void
 }
 
@@ -148,7 +151,12 @@ export function useDbManagerUriState(): DbManagerUriState {
 		params.dbm = buildDbm(p)
 	}
 
-	function openDrawer(nInput: DbInput) {
+	// Not URL-persisted: the drawer defaults back to the nav workspace on reload,
+	// which is the correct fallback outside the session that opened it.
+	let workspace = $state<string | undefined>(undefined)
+
+	function openDrawer(nInput: DbInput, ws?: string) {
+		workspace = ws
 		if (nInput.type === 'database') {
 			const isDatatable = nInput.resourcePath.startsWith('datatable://')
 			params.dbm = buildDbm({
@@ -203,6 +211,12 @@ export function useDbManagerUriState(): DbManagerUriState {
 		get open() {
 			return !!input
 		},
+		get workspace() {
+			return workspace
+		},
+		set workspace(v: string | undefined) {
+			workspace = v
+		},
 		openDrawer,
 		closeDrawer
 	}
diff --git a/frontend/src/lib/components/dbOps.ts b/frontend/src/lib/components/dbOps.ts
index 9ef67e4f4d..21a6386478 100644
--- a/frontend/src/lib/components/dbOps.ts
+++ b/frontend/src/lib/components/dbOps.ts
@@ -1,5 +1,6 @@
 import {
 	getLanguageByResourceType,
+	ColumnIdentity,
 	type ColumnDef,
 	type TableMetadata
 } from './apps/components/display/dbtable/utils'
@@ -8,6 +9,8 @@ import type { DBSchema, SQLSchema } from '$lib/stores'
 import { stringifySchema } from './copilot/lib'
 import type { DbInput, DbType } from './dbTypes'
 import { assert } from '$lib/utils'
+import { WorkspaceService } from '$lib/gen'
+import { pendingMigrations } from './workspaceSettings/datatableMigrationUtils'
 import {
 	buildTableEditorValues,
 	type TableEditorValues
@@ -45,12 +48,20 @@ export function dbTableOpsWithPreviewScripts({
 	input,
 	tableKey,
 	colDefs,
-	workspace
+	workspace,
+	whereClause,
+	version
 }: {
 	input: DbInput
 	tableKey: string
 	colDefs: ColumnDef[]
 	workspace: string
+	// Optional raw SQL predicate AND-ed into the read queries (count + rows).
+	// Caller-trusted — build it with escaped values.
+	whereClause?: string
+	// DuckLake time-travel: when set, reads are pinned to this catalog snapshot
+	// via `AT (VERSION => n)` (DuckDB/ducklake only). Read-only by nature.
+	version?: number
 }): IDbTableOps {
 	const dbType = getDbType(input)
 	const language = getLanguageByResourceType(dbType)
@@ -67,7 +78,12 @@ export function dbTableOpsWithPreviewScripts({
 		tableKey,
 		colDefs,
 		getCount: async ({ quicksearch }) => {
-			const content = makeMarker('COUNT', { table: tableKey, columnDefs: colDefs })
+			const content = makeMarker('COUNT', {
+				table: tableKey,
+				columnDefs: colDefs,
+				...(whereClause ? { whereClause } : {}),
+				...(version != undefined ? { version } : {})
+			})
 			const result = await runScriptAndPollResult({
 				workspace,
 				requestBody: { args: { ...dbArg, quicksearch }, language, content }
@@ -79,7 +95,9 @@ export function dbTableOpsWithPreviewScripts({
 			const content = makeMarker('SELECT', {
 				table: tableKey,
 				columnDefs: colDefs,
-				fixPgIntTypes: true
+				fixPgIntTypes: true,
+				...(whereClause ? { whereClause } : {}),
+				...(version != undefined ? { version } : {})
 			})
 			let items = (await runScriptAndPollResult({
 				workspace,
@@ -122,11 +140,100 @@ export function dbTableOpsWithPreviewScripts({
 	}
 }
 
+export type DucklakeSnapshot = {
+	snapshot_id: number
+	// DuckLake returns this as microseconds-since-epoch serialized as a string
+	// (TIMESTAMP); callers must convert before formatting.
+	snapshot_time: string | number
+}
+
+/**
+ * Column metadata of a ducklake table *at a specific snapshot*. The catalog's
+ * `information_schema` only reflects the current schema, so a time-travel read
+ * pinned to an older version must enumerate the columns that existed *then* —
+ * otherwise a column added in a later snapshot would break the `SELECT … AT
+ * (VERSION => n)`. `DESCRIBE SELECT * FROM … AT (VERSION => n)` gives exactly
+ * that. Returns minimal `ColumnDef`s (field + datatype) — enough for the
+ * read-only preview's SELECT/COUNT and grid headers.
+ */
+export async function fetchDucklakeColumnsAtVersion({
+	workspace,
+	ducklake,
+	tableKey,
+	version
+}: {
+	workspace: string
+	ducklake: string
+	tableKey: string
+	version: number
+}): Promise<ColumnDef[]> {
+	// Quote each identifier part (schema.table) so a dotted/odd table name can't
+	// break the statement, and double single-quotes in the catalog name so it
+	// can't break out of the ATTACH string literal (mirrors the backend's
+	// `escape_sql_literal`). `version` is a number — injection-safe.
+	const quoted = tableKey
+		.split('.')
+		.map((p) => `"${p.replace(/"/g, '""')}"`)
+		.join('.')
+	const ducklakeLit = ducklake.replace(/'/g, "''")
+	const content =
+		`ATTACH 'ducklake://${ducklakeLit}' AS __dlv__; USE __dlv__; ` +
+		`DESCRIBE SELECT * FROM ${quoted} AT (VERSION => ${version});`
+	const rows = (await runScriptAndPollResult({
+		workspace,
+		requestBody: { args: {}, language: 'duckdb', content }
+	})) as { column_name: string; column_type: string }[]
+	if (!Array.isArray(rows)) return []
+	return rows.map((r) => ({
+		field: r.column_name,
+		datatype: r.column_type,
+		defaultvalue: '',
+		isprimarykey: false,
+		isidentity: ColumnIdentity.No,
+		isnullable: 'YES' as const,
+		isenum: false
+	}))
+}
+
+/**
+ * List a ducklake table's time-travel history, newest first. DuckLake snapshots
+ * are catalog-wide commits; passing `table` (schema-qualified, e.g.
+ * `main.events_daily`) scopes the list to snapshots where the table exists —
+ * otherwise an `AT (VERSION => n)` read could target a version predating the
+ * table's creation and error. Runs the `DUCKLAKE_SNAPSHOTS` marker as a duckdb
+ * preview job (server-side SQL build + ATTACH), so no raw SQL is constructed in
+ * the client.
+ */
+export async function fetchDucklakeSnapshots({
+	workspace,
+	ducklake,
+	table
+}: {
+	workspace: string
+	ducklake: string
+	table?: string
+}): Promise<DucklakeSnapshot[]> {
+	const content = `-- WM_INTERNAL_DB_DUCKLAKE_SNAPSHOTS ${JSON.stringify({
+		ducklake,
+		...(table ? { table } : {})
+	})}`
+	const rows = await runScriptAndPollResult({
+		workspace,
+		requestBody: { args: {}, language: 'duckdb', content }
+	})
+	return Array.isArray(rows) ? (rows as DucklakeSnapshot[]) : []
+}
+
 export type IDbSchemaOps = {
 	onDelete: (params: { tableKey: string; schema?: string }) => Promise<void>
 	onCreate: (params: { values: TableEditorValues; schema?: string }) => Promise<void>
 	previewCreateSql: (params: { values: TableEditorValues; schema?: string }) => Promise<string>
-	onAlter: (params: { values: AlterTableValues; schema?: string }) => Promise<void>
+	onAlter: (params: {
+		values: AlterTableValues
+		/** Reverse diff (new → old), used to generate the down migration. */
+		reverse?: AlterTableValues
+		schema?: string
+	}) => Promise<void>
 	previewAlterSql: (params: { values: AlterTableValues; schema?: string }) => Promise<string>
 	onCreateSchema: (params: { schema: string }) => Promise<void>
 	onDeleteSchema: (params: { schema: string }) => Promise<void>
@@ -137,30 +244,146 @@ export type IDbSchemaOps = {
 	}) => Promise<TableEditorValues>
 }
 
+/** Thrown by a schema op when the user declines the out-of-order run warning.
+ * Callers should treat it as a silent cancel (no error toast). */
+export class MigrationRunCancelled extends Error {
+	constructor() {
+		super('Migration run cancelled')
+		this.name = 'MigrationRunCancelled'
+	}
+}
+
 export function dbSchemaOpsWithPreviewScripts({
 	workspace,
-	input
+	input,
+	confirmRunOutOfOrder
 }: {
 	workspace: string
 	input: DbInput
+	/** Asked before running a just-created migration ahead of `pendingCount`
+	 * still-pending earlier ones. Return false to abort (throws MigrationRunCancelled). */
+	confirmRunOutOfOrder?: (pendingCount: number) => Promise<boolean>
 }): IDbSchemaOps {
 	const dbType = getDbType(input)
 	const dbArg = getDatabaseArg(input)
 	const language = getLanguageByResourceType(dbType)
 	const ducklake = input.type === 'ducklake' ? input.ducklake : undefined
 
+	// When managing a data table, schema changes are recorded as migrations
+	// instead of being run ad-hoc, so the manager stays the source of truth.
+	const datatableName =
+		input.type === 'database' && input.resourcePath.startsWith('datatable://')
+			? input.resourcePath.slice('datatable://'.length)
+			: undefined
+
 	function makeMarker(op: string, payload: Record<string, unknown>): string {
 		if (ducklake) payload.ducklake = ducklake
 		return `-- WM_INTERNAL_DB_${op} ${JSON.stringify(payload)}`
 	}
 
+	// Auto-generated migration name, e.g. `create_customers`. The server allocates
+	// a unique timestamp (bumping on collision), so the name itself need not be unique.
+	function migrationName(op: string, target: string): string {
+		const safe = target.replace(/[^a-zA-Z0-9_-]+/g, '_').replace(/^_+|_+$/g, '')
+		return safe ? `${op}_${safe}` : op
+	}
+
+	// A dropped SERIAL column reports its default as `nextval()` of an owned
+	// sequence that is dropped along with the column. When the down re-adds such a
+	// column, recreate it as its SERIAL type so a fresh sequence is created
+	// instead of referencing the gone one.
+	const SERIAL_FOR: Record<string, string> = {
+		BIGINT: 'BIGSERIAL',
+		INT8: 'BIGSERIAL',
+		INTEGER: 'SERIAL',
+		INT: 'SERIAL',
+		INT4: 'SERIAL',
+		SMALLINT: 'SMALLSERIAL',
+		INT2: 'SMALLSERIAL'
+	}
+	function reverseSerialFix(reverse: AlterTableValues): AlterTableValues {
+		return {
+			...reverse,
+			operations: reverse.operations.map((op) => {
+				if (op.kind !== 'addColumn' || !/nextval\s*\(/i.test(op.column.defaultValue ?? '')) {
+					return op
+				}
+				const serial = SERIAL_FOR[(op.column.datatype ?? '').toUpperCase()]
+				return serial
+					? { ...op, column: { ...op.column, datatype: serial, defaultValue: undefined } }
+					: op
+			})
+		}
+	}
+
+	// Frame a single (or multi-) statement body in an explicit, `;`-terminated
+	// transaction, matching the data table migration convention. Some expanded
+	// markers (e.g. ALTER TABLE) already come wrapped in their own transaction, so
+	// avoid nesting BEGIN/COMMIT in that case.
+	function wrapMigration(sql: string): string {
+		const t = sql.trim()
+		if (/^BEGIN\b/i.test(t)) return t
+		return `BEGIN;\n\n${t.endsWith(';') ? t : `${t};`}\n\nEND;`
+	}
+
+	// Apply a DDL marker. For a data table that has migrations enabled this
+	// creates a migration and runs it (rolling the record back if the run fails);
+	// otherwise it runs ad-hoc via the internal-db job as before. `downContent`,
+	// when provided, is expanded into the migration's down SQL (Postgres only).
+	async function applyDdl(migName: string, content: string, downContent?: string): Promise<void> {
+		// A DDL edit on a migrations-enabled data table must be captured as a
+		// migration. Don't swallow a status-check failure by defaulting to ad-hoc:
+		// that would run the change untracked (schema drift) — exactly what this
+		// feature prevents. Let the error propagate (fail closed); only fall back to
+		// ad-hoc when there's no data table, or `enabled === false` is returned.
+		const status = datatableName
+			? await WorkspaceService.getDatatableMigrationsStatus({ workspace, datatableName })
+			: undefined
+		if (!datatableName || !status?.enabled) {
+			await runScriptAndPollResult({ workspace, requestBody: { args: dbArg, content, language } })
+			return
+		}
+		// The new migration gets the highest timestamp, so any still-pending
+		// migration is earlier: running only this one applies it out of order.
+		// Warn like the row-level Run action does (skipped if no confirm hook).
+		if (confirmRunOutOfOrder) {
+			const pending = pendingMigrations(status.migrations).length
+			if (pending > 0 && !(await confirmRunOutOfOrder(pending))) {
+				throw new MigrationRunCancelled()
+			}
+		}
+		const codeUp = wrapMigration(await expandMarker(workspace, language, content))
+		// Down migrations are only generated for Postgres for now.
+		let codeDown: string | undefined
+		if (downContent && dbType === 'postgresql') {
+			const downSql = (await expandMarker(workspace, language, downContent)).trim()
+			if (downSql) codeDown = wrapMigration(downSql)
+		}
+		const created = await WorkspaceService.createDatatableMigration({
+			workspace,
+			datatableName,
+			requestBody: { name: migName, code_up: codeUp, ...(codeDown ? { code_down: codeDown } : {}) }
+		})
+		try {
+			await WorkspaceService.runDatatableMigrations({
+				workspace,
+				datatableName,
+				only: created.timestamp
+			})
+		} catch (e) {
+			await WorkspaceService.deleteDatatableMigration({
+				workspace,
+				datatableName,
+				timestamp: created.timestamp
+			}).catch(() => {})
+			throw e
+		}
+	}
+
 	return {
 		onDelete: async ({ tableKey, schema }) => {
 			const content = makeMarker('DROP_TABLE', { table: tableKey, schema })
-			await runScriptAndPollResult({
-				workspace,
-				requestBody: { args: { ...dbArg }, language, content }
-			})
+			await applyDdl(migrationName('drop', tableKey), content)
 		},
 		onCreate: async ({ values, schema }) => {
 			const content = makeMarker('CREATE_TABLE', {
@@ -169,10 +392,8 @@ export function dbSchemaOpsWithPreviewScripts({
 				foreignKeys: values.foreignKeys,
 				schema
 			})
-			await runScriptAndPollResult({
-				workspace,
-				requestBody: { args: dbArg, content, language }
-			})
+			const downContent = makeMarker('DROP_TABLE', { table: values.name, schema })
+			await applyDdl(migrationName('create', values.name), content, downContent)
 		},
 		previewCreateSql: async ({ values, schema }) => {
 			const content = makeMarker('CREATE_TABLE', {
@@ -183,16 +404,21 @@ export function dbSchemaOpsWithPreviewScripts({
 			})
 			return expandMarker(workspace, language, content)
 		},
-		onAlter: async ({ values, schema }) => {
+		onAlter: async ({ values, reverse, schema }) => {
 			const content = makeMarker('ALTER_TABLE', {
 				name: values.name,
 				operations: values.operations,
 				schema
 			})
-			await runScriptAndPollResult({
-				workspace,
-				requestBody: { args: dbArg, content, language }
-			})
+			// The down is the same alter run in the opposite direction.
+			const downContent = reverse
+				? makeMarker('ALTER_TABLE', {
+						name: reverse.name,
+						operations: reverseSerialFix(reverse).operations,
+						schema
+					})
+				: undefined
+			await applyDdl(migrationName('alter', values.name), content, downContent)
 		},
 		previewAlterSql: async ({ values, schema }) => {
 			const content = makeMarker('ALTER_TABLE', {
@@ -204,17 +430,13 @@ export function dbSchemaOpsWithPreviewScripts({
 		},
 		onCreateSchema: async ({ schema }) => {
 			const content = makeMarker('CREATE_SCHEMA', { schema })
-			await runScriptAndPollResult({
-				workspace,
-				requestBody: { args: { ...dbArg }, language, content }
-			})
+			const downContent = makeMarker('DROP_SCHEMA', { schema })
+			await applyDdl(migrationName('create_schema', schema), content, downContent)
 		},
 		onDeleteSchema: async ({ schema }) => {
 			const content = makeMarker('DROP_SCHEMA', { schema })
-			await runScriptAndPollResult({
-				workspace,
-				requestBody: { args: { ...dbArg }, language, content }
-			})
+			const downContent = makeMarker('CREATE_SCHEMA', { schema })
+			await applyDdl(migrationName('drop_schema', schema), content, downContent)
 		},
 		onFetchTableEditorDefinition: async ({ table, schema, colDefs }) => {
 			let foreignKeys: import('./apps/components/display/dbtable/tableEditor').TableEditorForeignKey[] =
diff --git a/frontend/src/lib/components/diffEditorTypes.ts b/frontend/src/lib/components/diffEditorTypes.ts
index df93edce31..029c96d3ca 100644
--- a/frontend/src/lib/components/diffEditorTypes.ts
+++ b/frontend/src/lib/components/diffEditorTypes.ts
@@ -5,3 +5,8 @@ export interface ButtonProp {
 	color?: ButtonType.Color
 	onClick: () => void
 }
+
+// Below this editor width, side-by-side is too cramped and the diff falls back
+// to the unified/inline view. Shared so consumers (e.g. WorkspaceDiffDrawer's
+// view toggle) can mirror the same threshold instead of duplicating the number.
+export const SIDE_BY_SIDE_MIN_WIDTH = 700
diff --git a/frontend/src/lib/components/flow_builder.ts b/frontend/src/lib/components/flow_builder.ts
index 1fe043707b..ce848c6f83 100644
--- a/frontend/src/lib/components/flow_builder.ts
+++ b/frontend/src/lib/components/flow_builder.ts
@@ -24,6 +24,9 @@ export type FlowBuilderProps = {
 	disabledFlowInputs?: boolean
 	savedPrimarySchedule?: ScheduleTrigger | undefined // used to set the primary schedule in the legacy primaryScheduleStore
 	version?: number | undefined
+	/** flow_version the draft was forked from; when set, the deploy-time staleness
+	 *  check compares it (not the load-time head `version`) against the latest. */
+	draftBaseVersion?: number | undefined
 	draftTriggersFromUrl?: Trigger[] | undefined
 	selectedTriggerIndexFromUrl?: number | undefined
 	children?: import('svelte').Snippet
@@ -59,4 +62,8 @@ export type FlowBuilderProps = {
 	// Fired whenever a test run is started from the flow editor, with the
 	// preview job id. Used by whitelabel embedders to track test jobs.
 	onTestJob?: (e: { jobId: string }) => void
+	// Condensed top bar: smaller (sm) buttons, a shorter bar, and the
+	// EditorHeader's path/breadcrumb row dropped (summary only). Used by the
+	// session preview to save vertical room.
+	condensedHeader?: boolean
 }
diff --git a/frontend/src/lib/components/flows/FlowAssetsHandler.svelte b/frontend/src/lib/components/flows/FlowAssetsHandler.svelte
index e753fc2892..c216022520 100644
--- a/frontend/src/lib/components/flows/FlowAssetsHandler.svelte
+++ b/frontend/src/lib/components/flows/FlowAssetsHandler.svelte
@@ -7,6 +7,7 @@
 		let s = $state({
 			val: {
 				selectedAsset: undefined,
+				workspace: undefined,
 				s3FilePicker: undefined,
 				resourceEditorDrawer: undefined,
 				resourceMetadataCache: {},
@@ -61,7 +62,13 @@
 	} = $props()
 
 	const flowGraphAssetsCtx = getContext<FlowGraphAssetContext | undefined>('FlowGraphAssetContext')
-	const { selectionManager } = getContext<FlowEditorContext>('FlowEditorContext') || {}
+	const { selectionManager, opWorkspace } = getContext<FlowEditorContext>('FlowEditorContext') || {}
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
+	// Expose the acting workspace to the asset explore controls (ExploreAssetButton
+	// reads it from this context; the DB manager / S3 picker act on it).
+	$effect(() => {
+		if (flowGraphAssetsCtx) flowGraphAssetsCtx.val.workspace = opWs
+	})
 	let selectedId = $derived(selectionManager?.getSelectedId())
 
 	let allModules = $derived(getAllModules(modules))
@@ -79,7 +86,7 @@
 				let truncatedPath = asset.path.split('?table=')[0]
 				if (truncatedPath in resMetadataCache) continue
 				resMetadataCache[truncatedPath] = undefined // avoid fetching multiple times because of async
-				ResourceService.getResource({ path: truncatedPath, workspace: $workspaceStore! })
+				ResourceService.getResource({ path: truncatedPath, workspace: opWs! })
 					.then((r) => (resMetadataCache[truncatedPath] = { resource_type: r.resource_type }))
 					.catch((err) => console.error("Couldn't fetch resource", truncatedPath, err))
 			}
@@ -88,7 +95,7 @@
 
 	// Fetch transitive assets (path scripts and flows)
 	$effect(() => {
-		if (!$workspaceStore || !flowGraphAssetsCtx || !enablePathScriptAndFlowAssets) return
+		if (!opWs || !flowGraphAssetsCtx || !enablePathScriptAndFlowAssets) return
 		let usages: { path: string; kind: AssetUsageKind }[] = []
 		let modIds: string[] = []
 		for (const mod of allModules) {
@@ -101,7 +108,7 @@
 		}
 		if (usages.length) {
 			AssetService.listAssetsByUsage({
-				workspace: $workspaceStore,
+				workspace: opWs,
 				requestBody: { usages }
 			}).then((result) => {
 				result.forEach((assets, idx) => {
@@ -182,6 +189,6 @@
 </script>
 
 {#if flowGraphAssetsCtx}
-	<S3FilePicker bind:this={flowGraphAssetsCtx.val.s3FilePicker} readOnlyMode />
-	<ResourceEditorDrawer bind:this={flowGraphAssetsCtx.val.resourceEditorDrawer} />
+	<S3FilePicker bind:this={flowGraphAssetsCtx.val.s3FilePicker} workspace={opWs} readOnlyMode />
+	<ResourceEditorDrawer bind:this={flowGraphAssetsCtx.val.resourceEditorDrawer} workspace={opWs} />
 {/if}
diff --git a/frontend/src/lib/components/flows/FlowEditor.svelte b/frontend/src/lib/components/flows/FlowEditor.svelte
index ea32afdc52..a484675f83 100644
--- a/frontend/src/lib/components/flows/FlowEditor.svelte
+++ b/frontend/src/lib/components/flows/FlowEditor.svelte
@@ -2,6 +2,7 @@
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import FlowEditorPanel from './content/FlowEditorPanel.svelte'
 	import FlowModuleSchemaMap from './map/FlowModuleSchemaMap.svelte'
+	import type { OpenInSessionSource } from '$lib/components/sessions/OpenInSessionButton.svelte'
 	import WindmillIcon from '../icons/WindmillIcon.svelte'
 	import { Skeleton } from '../common'
 	import { getContext, onDestroy, onMount, setContext } from 'svelte'
@@ -52,6 +53,7 @@
 		aiChatOpen?: boolean
 		showFlowAiButton?: boolean
 		toggleAiChat?: () => void
+		sessionOpen?: OpenInSessionSource
 		localModuleStates?: Record<string, GraphModuleState>
 		testModuleStates?: ModulesTestStates
 		isOwner?: boolean
@@ -90,6 +92,7 @@
 		aiChatOpen,
 		showFlowAiButton,
 		toggleAiChat,
+		sessionOpen,
 		isOwner,
 		onTestFlow,
 		isRunning,
@@ -207,6 +210,7 @@
 						{aiChatOpen}
 						{showFlowAiButton}
 						{toggleAiChat}
+						{sessionOpen}
 						{isOwner}
 						{onTestFlow}
 						{isRunning}
diff --git a/frontend/src/lib/components/flows/FlowHistoryInner.svelte b/frontend/src/lib/components/flows/FlowHistoryInner.svelte
index 10415c970b..1f906c1e45 100644
--- a/frontend/src/lib/components/flows/FlowHistoryInner.svelte
+++ b/frontend/src/lib/components/flows/FlowHistoryInner.svelte
@@ -9,6 +9,8 @@
 	import { Skeleton } from '$lib/components/common'
 	import Button from '../common/button/Button.svelte'
 	import { ArrowRight, Loader2, Pencil, X } from 'lucide-svelte'
+	import { getContext } from 'svelte'
+	import type { FlowEditorContext } from './types'
 
 	interface Props {
 		path: string
@@ -17,6 +19,10 @@
 	}
 
 	let { path, allowFork = false, onHistoryRestore }: Props = $props()
+
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	let loading: boolean = $state(false)
 
 	let versions: FlowVersion[] = $state([])
@@ -29,7 +35,7 @@
 
 	async function loadFlow(version: number) {
 		selected = await FlowService.getFlowVersion({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			version
 		})
 	}
@@ -37,7 +43,7 @@
 	async function loadVersions() {
 		loading = true
 		versions = await FlowService.getFlowHistory({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			path: path
 		})
 		loading = false
@@ -52,7 +58,7 @@
 			return
 		}
 		await FlowService.updateFlowHistory({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			version,
 			requestBody: {
 				deployment_msg: deploymentMsgUpdate!
@@ -66,7 +72,7 @@
 	async function restoreVersion(flow: Flow | undefined) {
 		if (!flow) return
 		await FlowService.updateFlow({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			requestBody: {
 				...flow,
 				path
diff --git a/frontend/src/lib/components/flows/common/FlowCardHeader.svelte b/frontend/src/lib/components/flows/common/FlowCardHeader.svelte
index a5ff48053e..2640fbbba9 100644
--- a/frontend/src/lib/components/flows/common/FlowCardHeader.svelte
+++ b/frontend/src/lib/components/flows/common/FlowCardHeader.svelte
@@ -16,7 +16,8 @@
 	import { ScriptService, type FlowModuleValue, type PathScript } from '$lib/gen'
 	import { hubBaseUrlStore, workspaceStore } from '$lib/stores'
 	import { Flag, Lock, RefreshCw, Unlock } from 'lucide-svelte'
-	import { createEventDispatcher, untrack } from 'svelte'
+	import { createEventDispatcher, getContext, untrack } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 	import { twMerge } from 'tailwind-merge'
 	import { getToolNameError } from '$lib/components/graph/renderers/nodes/AIToolNode.svelte'
 	import { DEFAULT_HUB_BASE_URL, PRIVATE_HUB_MIN_VERSION } from '$lib/hub'
@@ -47,6 +48,9 @@
 
 	let latestHash: string | undefined = $state(undefined)
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	// Extract version_id from hub path (format: hub/{version_id}/{app}/{summary})
 	let hubVersionId = $derived(
 		flowModuleValue?.type === 'script' && flowModuleValue.path?.startsWith('hub/')
@@ -55,7 +59,7 @@
 	)
 
 	function getCachedKey(path: string) {
-		return `${$workspaceStore}-${path}`
+		return `${opWs}-${path}`
 	}
 	function getCachedValues(path: string) {
 		const key = getCachedKey(path)
@@ -68,7 +72,7 @@
 
 	async function loadLatestHash(value: PathScript) {
 		let script = await ScriptService.getScriptByPath({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			path: value.path
 		})
 		const key = getCachedKey(value.path)
diff --git a/frontend/src/lib/components/flows/content/FlowEditorDrawer.svelte b/frontend/src/lib/components/flows/content/FlowEditorDrawer.svelte
index 0ce0843bbf..4478d6e06f 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorDrawer.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorDrawer.svelte
@@ -7,15 +7,19 @@
 	import { ExternalLink, Loader2 } from 'lucide-svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { emptySchema, type StateStore } from '$lib/utils'
-	import { createEventDispatcher } from 'svelte'
+	import { createEventDispatcher, getContext } from 'svelte'
 	import { fade } from 'svelte/transition'
 	import { initFlow } from '$lib/components/flows/flowStore.svelte'
 	import type { FlowState } from '$lib/components/flows/flowState'
+	import type { FlowEditorContext } from '../types'
 
 	let flowEditorDrawer: Drawer | undefined = $state()
 
 	const dispatch = createEventDispatcher()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	export async function openDrawer(path: string, cb: () => void): Promise<void> {
 		flowPath = path
 		flow = undefined
@@ -25,7 +29,7 @@
 
 		try {
 			const backendFlow = await FlowService.getFlowByPath({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				path
 			})
 
@@ -86,6 +90,7 @@
 				{flowStore}
 				{flowStateStore}
 				initialPath={flowPath}
+				autosaveWorkspace={opWs}
 				newFlow={false}
 				selectedId="settings-metadata"
 				loading={false}
diff --git a/frontend/src/lib/components/flows/content/FlowEnvironmentVariables.svelte b/frontend/src/lib/components/flows/content/FlowEnvironmentVariables.svelte
index 3b6b867abe..e0f9a7d319 100644
--- a/frontend/src/lib/components/flows/content/FlowEnvironmentVariables.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEnvironmentVariables.svelte
@@ -32,7 +32,8 @@
 
 	let { noEditor }: Props = $props()
 
-	const { flowStore } = getContext<FlowEditorContext>('FlowEditorContext')
+	const { flowStore, opWorkspace } = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
 
 	if (!flowStore.val.value.flow_env) {
 		flowStore.val.value.flow_env = {}
@@ -244,8 +245,10 @@
 				Flow envs can be referenced in any flow step input using the syntax{' '}
 				<code>flow_env.VARIABLE_NAME</code> or <code>flow_env["VARIABLE_NAME"]</code>. These
 				variables are available in the property picker and can be used in JavaScript expressions and
-				input bindings. String values can link to workspace variables using the <DollarSign size={12}
-					class="inline" /> button. Resource type references workspace resources resolved at runtime.
+				input bindings. String values can link to workspace variables using the <DollarSign
+					size={12}
+					class="inline"
+				/> button. Resource type references workspace resources resolved at runtime.
 			</Alert>
 
 			{#if flowEnvEntries.length === 0}
@@ -303,6 +306,7 @@
 									<ResourcePicker
 										bind:value={resourcePaths[entry.key]}
 										disabled={noEditor}
+										workspace={opWs}
 									/>
 								{:else if entry.type === 'json'}
 									<div class="w-full">
@@ -320,8 +324,7 @@
 										<input
 											type="text"
 											value={entry.displayValue}
-											oninput={(e) =>
-												updateEnvValue(entry.key, e.currentTarget.value, 'string')}
+											oninput={(e) => updateEnvValue(entry.key, e.currentTarget.value, 'string')}
 											disabled={noEditor}
 											class="input w-full"
 											placeholder="Variable value"
@@ -346,8 +349,7 @@
 											Linked to variable <a
 												href="/variables#{entry.value.slice(5)}"
 												target="_blank"
-												class="text-accent underline font-normal"
-												>{entry.value.slice(5)}</a
+												class="text-accent underline font-normal">{entry.value.slice(5)}</a
 											>
 										</div>
 									{/if}
@@ -379,7 +381,7 @@
 	itemName="Variable"
 	extraField="path"
 	loadItems={async () =>
-		(await VariableService.listVariable({ workspace: $workspaceStore ?? '' })).map((x) => ({
+		(await VariableService.listVariable({ workspace: opWs ?? '' })).map((x) => ({
 			name: x.path,
 			...x
 		}))}
diff --git a/frontend/src/lib/components/flows/content/FlowInput.svelte b/frontend/src/lib/components/flows/content/FlowInput.svelte
index 5c7002f147..e20f445e00 100644
--- a/frontend/src/lib/components/flows/content/FlowInput.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInput.svelte
@@ -7,6 +7,7 @@
 	import JsonInputs from '$lib/components/JsonInputs.svelte'
 	import { convert } from '@redocly/json-to-json-schema'
 	import { sendUserToast } from '$lib/toast'
+	import { workspaceStore } from '$lib/stores'
 	import EditableSchemaForm from '$lib/components/EditableSchemaForm.svelte'
 	import AddPropertyV2 from '$lib/components/schema/AddPropertyV2.svelte'
 	import FlowInputViewer from '$lib/components/FlowInputViewer.svelte'
@@ -74,8 +75,11 @@
 		pathStore,
 		initialPathStore,
 		fakeInitialPath,
-		flowInputEditorState
+		flowInputEditorState,
+		opWorkspace
 	} = getContext<FlowEditorContext>('FlowEditorContext')
+	// Acting workspace when the flow editor runs in an AI session; else the nav workspace.
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
 
 	// Get diffManager from the graph
 	const diffManager = $derived(flowModuleSchemaMap?.getDiffManager())
@@ -887,6 +891,7 @@
 								>
 									<HistoricInputs
 										bind:this={historicInputs}
+										workspace={opWs}
 										runnableId={$initialPathStore ?? undefined}
 										runnableType={$pathStore ? 'FlowPath' : undefined}
 										on:select={(e) => {
@@ -910,6 +915,7 @@
 									<div class="h-full">
 										<CaptureTable
 											path={$initialPathStore || fakeInitialPath}
+											workspace={opWs}
 											on:select={(e) => {
 												updatePreviewSchemaAndArgs(e.detail ?? undefined)
 											}}
@@ -929,6 +935,7 @@
 									title="Saved inputs"
 								>
 									<SavedInputsPicker
+										workspace={opWs}
 										runnableId={$initialPathStore ?? undefined}
 										runnableType={$pathStore ? 'FlowPath' : undefined}
 										on:select={(e) => {
diff --git a/frontend/src/lib/components/flows/content/FlowInputsFlow.svelte b/frontend/src/lib/components/flows/content/FlowInputsFlow.svelte
index 9f16d95bab..4938b470af 100644
--- a/frontend/src/lib/components/flows/content/FlowInputsFlow.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInputsFlow.svelte
@@ -6,7 +6,8 @@
 	import { workspaceStore } from '$lib/stores'
 	import { emptyString } from '$lib/utils'
 
-	import { createEventDispatcher, untrack } from 'svelte'
+	import { createEventDispatcher, getContext, untrack } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 	import { flip } from 'svelte/animate'
 	import { fade } from 'svelte/transition'
 	interface Props {
@@ -15,6 +16,9 @@
 
 	let { children }: Props = $props()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	// export let failureModule: boolean
 	const dispatch = createEventDispatcher()
 
@@ -25,10 +29,10 @@
 	let ownerFilter: string | undefined = $state(undefined)
 
 	async function loadFlows() {
-		items = await FlowService.listFlows({ workspace: $workspaceStore!, withoutDescription: true })
+		items = await FlowService.listFlows({ workspace: opWs!, withoutDescription: true })
 	}
 	$effect(() => {
-		$workspaceStore && untrack(() => loadFlows())
+		opWs && untrack(() => loadFlows())
 	})
 	let prefilteredItems = $derived(
 		ownerFilter ? items?.filter((x) => x.path.startsWith(ownerFilter!)) : items
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 1bf578a081..565eee9490 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -94,10 +94,12 @@
 		pathStore,
 		saveDraft,
 		customUi,
-		executionCount
+		executionCount,
+		opWorkspace
 	} = getContext<FlowEditorContext>('FlowEditorContext')
 
 	const selectedId = $derived(selectionManager.getSelectedId())
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
 
 	interface Props {
 		flowModule: FlowModule
@@ -398,7 +400,7 @@
 
 	let preparedSqlQueries = usePreparedAssetSqlQueries(
 		() => flowGraphAssetsCtx?.val.sqlQueries[selectedId],
-		() => $workspaceStore
+		() => opWs
 	)
 
 	// Debug mode state
@@ -532,16 +534,12 @@
 			resetDAPClient()
 			dapClient = getDAPClient(dapServerUrl)
 
-			const env = await fetchContextualVariables($workspaceStore ?? '')
+			const env = await fetchContextualVariables(opWs ?? '')
 			const code = flowModule.value.content
 
 			let signedPayload
 			try {
-				signedPayload = await signDebugRequest(
-					$workspaceStore ?? '',
-					code ?? '',
-					rawScriptLang ?? 'python3'
-				)
+				signedPayload = await signDebugRequest(opWs ?? '', code ?? '', rawScriptLang ?? 'python3')
 				debugSessionJobId = signedPayload.job_id
 			} catch (signError) {
 				sendUserToast(getDebugErrorMessage(signError), true)
@@ -759,14 +757,14 @@
 					on:toggleCache={() => selectAdvanced('cache')}
 					on:toggleStopAfterIf={() => selectAdvanced('early-stop')}
 					on:fork={async () => {
-						const [module, state] = await fork(flowModule)
+						const [module, state] = await fork(flowModule, opWs)
 						flowModule = module
 						flowStateStore.val[module.id] = state
 					}}
 					on:reload={async () => {
 						if (flowModule.value.type == 'script') {
 							if (flowModule.value.hash != undefined) {
-								flowModule.value.hash = await getLatestHashForScript(flowModule.value.path)
+								flowModule.value.hash = await getLatestHashForScript(flowModule.value.path, opWs)
 							}
 							forceReload++
 							await reload(flowModule)
@@ -781,7 +779,8 @@
 							flowModule,
 							selectedId,
 							flowStateStore.val[flowModule.id]?.schema,
-							$pathStore
+							$pathStore,
+							opWs
 						)
 						if (flowModule.value.type == 'rawscript') {
 							module.value.input_transforms = flowModule.value.input_transforms
@@ -797,6 +796,7 @@
 					<div class="shadow-sm px-1 border-b-1 border-gray-200 dark:border-gray-700">
 						<EditorBar
 							customUi={customUi?.editorBar}
+							workspace={opWs}
 							{validCode}
 							{editor}
 							lang={flowModule.value['language'] ?? 'deno'}
@@ -867,7 +867,6 @@
 														bind:this={editor}
 														class="h-full relative"
 														code={flowModule.value.content}
-														syncExternalCode
 														scriptLang={flowModule?.value?.language}
 														automaticLayout={true}
 														cmdEnterAction={async () => {
@@ -904,7 +903,7 @@
 															},
 															{}
 														)}
-														key={`flow-inline-${$workspaceStore}-${$pathStore}-${flowModule.id}`}
+														key={`flow-inline-${opWs}-${$pathStore}-${flowModule.id}`}
 														moduleId={flowModule.id}
 														preparedAssetsSqlQueries={preparedSqlQueries.current}
 														customTag={flowModule.value.tag}
@@ -916,7 +915,7 @@
 													client={dapClient}
 													currentFrameId={currentDebugFrameId}
 													onClose={() => (showDebugConsole = false)}
-													workspace={$workspaceStore}
+													workspace={opWs}
 													jobId={debugSessionJobId ?? undefined}
 												/>
 											</Pane>
@@ -931,7 +930,6 @@
 												bind:this={editor}
 												class="h-full relative"
 												code={flowModule.value.content}
-												syncExternalCode
 												scriptLang={flowModule?.value?.language}
 												automaticLayout={true}
 												cmdEnterAction={async () => {
@@ -968,7 +966,7 @@
 													},
 													{}
 												)}
-												key={`flow-inline-${$workspaceStore}-${$pathStore}-${flowModule.id}`}
+												key={`flow-inline-${opWs}-${$pathStore}-${flowModule.id}`}
 												moduleId={flowModule.id}
 												preparedAssetsSqlQueries={preparedSqlQueries.current}
 												customTag={flowModule.value.tag}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleScript.svelte b/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
index cc3a75fde9..021437d20a 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleScript.svelte
@@ -20,7 +20,8 @@
 	import { getScriptByPath, scriptLangToEditorLang } from '$lib/scripts'
 	import { workspaceStore } from '$lib/stores'
 	import { Loader2 } from 'lucide-svelte'
-	import { untrack } from 'svelte'
+	import { getContext, untrack } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 
 	interface Props {
 		path: string
@@ -44,6 +45,9 @@
 		language = $bindable(undefined)
 	}: Props = $props()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	let code: string | undefined = $state()
 	let previousCode: string | undefined = $state()
 	let lock: string | undefined = $state(undefined)
@@ -51,7 +55,7 @@
 	let notFound = $state(false)
 
 	function getCachedKey(path: string, hash: string | undefined) {
-		return `${$workspaceStore}-${path}-${hash ?? ''}`
+		return `${opWs}-${path}-${hash ?? ''}`
 	}
 	function getCachedValues(path: string, hash: string | undefined) {
 		const key = getCachedKey(path, hash)
@@ -64,12 +68,15 @@
 		notFound = cachedValues[key]?.notFound ?? false
 	}
 
-	getCachedValues(untrack(() => path), untrack(() => hash))
+	getCachedValues(
+		untrack(() => path),
+		untrack(() => hash)
+	)
 
 	async function loadPreviousCode(previousHash: string) {
 		try {
 			const previousScript = await ScriptService.getScriptByHash({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				hash: previousHash
 			})
 			previousCode = previousScript.content
@@ -93,8 +100,8 @@
 			const script = path.startsWith('hub/')
 				? await getScriptByPath(path!)
 				: hash
-				? await ScriptService.getScriptByHash({ workspace: $workspaceStore!, hash })
-				: await getScriptByPath(path!)
+					? await ScriptService.getScriptByHash({ workspace: opWs!, hash })
+					: await getScriptByPath(path!, opWs)
 			code = script.content
 
 			language = script.language
@@ -133,7 +140,7 @@
 		<div class="text-xs text-primary mb-4">tag: {tag}</div>
 	{/if}
 	{#if notFound}
-		<div class="text-red-400">script not found at {path} in workspace {$workspaceStore}</div>
+		<div class="text-red-400">script not found at {path} in workspace {opWs}</div>
 	{:else if showAllCode}
 		{#if showDiff}
 			{#key (previousCode ?? '') + (code ?? '')}
diff --git a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
index d1d946c5cd..3a9e791d2d 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleSuspend.svelte
@@ -18,7 +18,9 @@
 	import EditableSchemaDrawer from '$lib/components/schema/EditableSchemaDrawer.svelte'
 	import AddProperty from '$lib/components/schema/AddProperty.svelte'
 
-	const { selectionManager, flowStateStore } = getContext<FlowEditorContext>('FlowEditorContext')
+	const { selectionManager, flowStateStore, opWorkspace } =
+		getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
 	const result = flowStateStore.val[selectionManager.getSelectedId()]?.previewResult ?? {}
 	let editor: SimpleEditor | undefined = $state(undefined)
 
@@ -37,7 +39,7 @@
 	let isSuspendEnabled = $derived(Boolean(flowModule.suspend))
 
 	async function loadGroups(): Promise<void> {
-		allUserGroups = await GroupService.listGroupNames({ workspace: $workspaceStore! })
+		allUserGroups = await GroupService.listGroupNames({ workspace: opWs! })
 		schema.properties['groups'] = {
 			type: 'array',
 			items: {
diff --git a/frontend/src/lib/components/flows/content/FlowModuleTimeout.svelte b/frontend/src/lib/components/flows/content/FlowModuleTimeout.svelte
index 39aaaa66f2..62a3432995 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleTimeout.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleTimeout.svelte
@@ -108,9 +108,14 @@
 		{/if}
 	</Label>
 
-	<div class="mt-4">
-		<Alert title="Only used when testing the full flow" type="info">
-			<p class="text-xs"> The timeout will be ignored when running "Test this step" </p>
-		</Alert>
-	</div>
+	{#if flowModule.timeout && flowModule.timeout.type !== 'static'}
+		<div class="mt-4">
+			<Alert title="Dynamic timeout only used when testing the full flow" type="info">
+				<p class="text-xs">
+					A dynamic timeout expression is evaluated when running the full flow. It is ignored when
+					running "Test this step" — only a static timeout value applies there.
+				</p>
+			</Alert>
+		</div>
+	{/if}
 </Section>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
index 139251d062..620f0136dd 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWorkerTagSelect.svelte
@@ -19,20 +19,39 @@
 		isPreprocessor: boolean
 	} = $props()
 
-	const { flowStore, selectionManager } = getContext<FlowEditorContext>('FlowEditorContext')
+	const { flowStore, selectionManager, opWorkspace } =
+		getContext<FlowEditorContext>('FlowEditorContext')
+
+	// A fork-scoped session deploys to opWorkspace, not $workspaceStore. Keep a local
+	// tag list in that case so the gate reflects the fork without clobbering the
+	// shared, navigation-scoped `workerTags` cache.
+	let effectiveWorkspace = $derived(opWorkspace?.() ?? $workspaceStore)
+	let usesLocal = $derived(
+		effectiveWorkspace != undefined && effectiveWorkspace !== $workspaceStore
+	)
+	let localWorkerTags = $state<string[] | undefined>(undefined)
+	let currentTags = $derived(usesLocal ? localWorkerTags : $workerTags)
 
 	const dispatch = createEventDispatcher()
 	loadWorkerGroups()
 
 	async function loadWorkerGroups() {
-		if (!$workerTags) {
-			$workerTags = await WorkerService.getCustomTagsForWorkspace({ workspace: $workspaceStore! })
+		if (usesLocal) {
+			if (!localWorkerTags) {
+				localWorkerTags = await WorkerService.getCustomTagsForWorkspace({
+					workspace: effectiveWorkspace!
+				})
+			}
+		} else if (!$workerTags) {
+			$workerTags = await WorkerService.getCustomTagsForWorkspace({
+				workspace: effectiveWorkspace!
+			})
 		}
 	}
 </script>
 
-{#if $workerTags}
-	{#if $workerTags?.length > 0}
+{#if currentTags}
+	{#if currentTags?.length > 0}
 		<div class="w-40">
 			{#if flowStore.val.tag == undefined || isPreprocessor || flowStore.val.value?.preserve_step_tags}
 				<WorkerTagSelect
@@ -40,6 +59,7 @@
 					{placeholder}
 					{nullTag}
 					bind:tag
+					workspaceId={usesLocal ? effectiveWorkspace : undefined}
 					on:change={(e) => dispatch('change', e.detail)}
 				/>
 			{:else}
diff --git a/frontend/src/lib/components/flows/content/FlowPathViewer.svelte b/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
index e51535782f..649a4d9f6c 100644
--- a/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
+++ b/frontend/src/lib/components/flows/content/FlowPathViewer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { run } from 'svelte/legacy';
+	import { run } from 'svelte/legacy'
 
 	import Skeleton from '$lib/components/common/skeleton/Skeleton.svelte'
 	import FlowGraphViewer from '$lib/components/FlowGraphViewer.svelte'
@@ -7,16 +7,20 @@
 	import { Triggers } from '$lib/components/triggers/triggers.svelte'
 	import { FlowService, type Flow, type TriggersCount } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
-	import { setContext } from 'svelte'
+	import { getContext, setContext } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 	import { writable } from 'svelte/store'
 
 	interface Props {
-		path: string;
-		noSide?: boolean;
-		fillAvailableHeight?: boolean;
+		path: string
+		noSide?: boolean
+		fillAvailableHeight?: boolean
 	}
 
-	let { path, noSide = false, fillAvailableHeight = false }: Props = $props();
+	let { path, noSide = false, fillAvailableHeight = false }: Props = $props()
+
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
 
 	let flow: Flow | undefined = $state(undefined)
 
@@ -29,15 +33,13 @@
 	})
 
 	async function loadFlow(path: string) {
-		flow = await FlowService.getFlowByPath({ workspace: $workspaceStore!, path })
-		triggersCount.set(
-			await FlowService.getTriggersCountOfFlow({ workspace: $workspaceStore!, path })
-		)
+		flow = await FlowService.getFlowByPath({ workspace: opWs!, path })
+		triggersCount.set(await FlowService.getTriggersCountOfFlow({ workspace: opWs!, path }))
 	}
 
 	run(() => {
 		path && loadFlow(path)
-	});
+	})
 </script>
 
 <div class="flex flex-col flex-1 h-full overflow-auto">
diff --git a/frontend/src/lib/components/flows/content/FlowResult.svelte b/frontend/src/lib/components/flows/content/FlowResult.svelte
index a3241c7c27..70d783895d 100644
--- a/frontend/src/lib/components/flows/content/FlowResult.svelte
+++ b/frontend/src/lib/components/flows/content/FlowResult.svelte
@@ -2,6 +2,8 @@
 	import FlowExecutionStatus from '$lib/components/runs/FlowExecutionStatus.svelte'
 	import type { Job } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
+	import { getContext } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 	import FlowCard from '../common/FlowCard.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import type { StateStore } from '$lib/utils'
@@ -18,6 +20,9 @@
 	}
 
 	let { job, isOwner, suspendStatus, noEditor, onOpenDetails }: Props = $props()
+
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
 </script>
 
 <FlowCard {noEditor} title="Flow result">
@@ -39,7 +44,7 @@
 			{#if isOwner !== undefined && suspendStatus}
 				<FlowExecutionStatus
 					{job}
-					workspaceId={$workspaceStore}
+					workspaceId={opWs}
 					{isOwner}
 					innerModules={job?.flow_status?.modules}
 					{suspendStatus}
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index c8ebc9c9ae..f2034a456d 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -45,7 +45,8 @@
 		pathStore,
 		customUi,
 		preserveOnBehalfOf,
-		savedOnBehalfOfEmail
+		savedOnBehalfOfEmail,
+		opWorkspace
 	} = getContext<FlowEditorContext>('FlowEditorContext')
 
 	const WM_DEPLOYERS_GROUP = 'wm_deployers'
@@ -146,6 +147,7 @@
 							initialPath={$initialPathStore}
 							namePlaceholder="flow"
 							kind="flow"
+							workspaceOverride={opWorkspace?.()}
 						/>
 						{#if $initialPathStore && $pathStore && $pathStore !== $initialPathStore}
 							<Alert
@@ -205,7 +207,11 @@
 
 						{#if displayWorkerTagPicker}
 							<div transition:slide={{ duration: 120 }} class="mt-2">
-								<WorkerTagPicker bind:tag={flowStore.val.tag} popupPlacement="top-end" />
+								<WorkerTagPicker
+									bind:tag={flowStore.val.tag}
+									popupPlacement="top-end"
+									workspaceId={opWorkspace?.()}
+								/>
 							</div>
 							{#if flowStore.val.tag}
 								<div
@@ -448,7 +454,7 @@
 					/>
 					{#if flowStore.val.on_behalf_of_email && canPreserve}
 						&rarr; <OnBehalfOfSelector
-							targetWorkspace={$workspaceStore ?? ''}
+							targetWorkspace={opWorkspace?.() ?? $workspaceStore ?? ''}
 							targetValue={$savedOnBehalfOfEmail}
 							selected={onBehalfOfChoice}
 							onSelect={(choice, details) => {
diff --git a/frontend/src/lib/components/flows/content/McpOAuthConnect.svelte b/frontend/src/lib/components/flows/content/McpOAuthConnect.svelte
index f97036df20..b6ee442b43 100644
--- a/frontend/src/lib/components/flows/content/McpOAuthConnect.svelte
+++ b/frontend/src/lib/components/flows/content/McpOAuthConnect.svelte
@@ -12,7 +12,8 @@
 	import Path from '$lib/components/Path.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import { sameTopDomainOrigin } from '$lib/cookies'
-	import { onDestroy } from 'svelte'
+	import { getContext, onDestroy } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 
 	interface Props {
 		onConnected: (resourcePath: string, resourceName: string) => void
@@ -21,6 +22,9 @@
 
 	let { onConnected, onCancel }: Props = $props()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	let serverUrl = $state('')
 	let discoveryResult = $state<DiscoverMcpOauthResponse | null>(null)
 	let selectedScopes = $state<string[]>([])
@@ -112,7 +116,7 @@
 			let accountId: number | undefined
 			if (data.expires_in && data.refresh_token) {
 				const accountIdStr = await OauthService.createAccount({
-					workspace: $workspaceStore!,
+					workspace: opWs!,
 					requestBody: {
 						refresh_token: data.refresh_token,
 						expires_in: data.expires_in,
@@ -124,7 +128,7 @@
 			}
 
 			await VariableService.createVariable({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				requestBody: {
 					path: resourcePath,
 					value: data.access_token,
@@ -136,7 +140,7 @@
 			})
 
 			await ResourceService.createResource({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				requestBody: {
 					resource_type: 'mcp',
 					path: resourcePath,
@@ -228,6 +232,7 @@
 			initialPath=""
 			namePlaceholder={resourceName}
 			kind="resource"
+			workspaceOverride={opWs}
 		/>
 
 		<Button size="sm" onClick={startOAuth} disabled={!resourcePath || pathError !== ''}>
diff --git a/frontend/src/lib/components/flows/content/McpToolEditor.svelte b/frontend/src/lib/components/flows/content/McpToolEditor.svelte
index 895fc27e2d..b73cc93ef9 100644
--- a/frontend/src/lib/components/flows/content/McpToolEditor.svelte
+++ b/frontend/src/lib/components/flows/content/McpToolEditor.svelte
@@ -26,9 +26,10 @@
 	import { safeSelectItems } from '$lib/components/select/utils.svelte'
 	import ResourcePicker from '$lib/components/ResourcePicker.svelte'
 	import { usePromise } from '$lib/svelte5Utils.svelte'
-	import { untrack } from 'svelte'
+	import { getContext, untrack } from 'svelte'
 	import Alert from '$lib/components/common/alert/Alert.svelte'
 	import McpOAuthConnect from './McpOAuthConnect.svelte'
+	import type { FlowEditorContext } from '../types'
 
 	interface Props {
 		tool: McpTool
@@ -36,6 +37,9 @@
 
 	let { tool = $bindable() }: Props = $props()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	let showOAuthForm = $state(false)
 	let refreshCount = $state(0)
 	let resourcePicker: ResourcePicker | undefined = $state()
@@ -43,7 +47,7 @@
 	let tools = usePromise(
 		async () =>
 			await loadToolsCached({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				path: tool.value.resource_path,
 				refreshCount
 			}),
@@ -56,7 +60,7 @@
 
 	$effect(() => {
 		resourcePath
-		$workspaceStore
+		opWs
 		refreshCount
 		untrack(() => {
 			if (resourcePath?.length > 0) {
@@ -105,7 +109,12 @@
 
 	<div class="w-full">
 		<Label label="MCP Resource">
-			<ResourcePicker bind:this={resourcePicker} resourceType="mcp" bind:value={tool.value.resource_path} />
+			<ResourcePicker
+				bind:this={resourcePicker}
+				resourceType="mcp"
+				bind:value={tool.value.resource_path}
+				workspace={opWs}
+			/>
 		</Label>
 	</div>
 
diff --git a/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte b/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte
index 91e71796fb..7156b19462 100644
--- a/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte
+++ b/frontend/src/lib/components/flows/content/ScriptEditorDrawer.svelte
@@ -13,20 +13,24 @@
 		orderedJsonStringify,
 		sendUserToast
 	} from '$lib/utils'
-	import { createEventDispatcher } from 'svelte'
+	import { createEventDispatcher, getContext } from 'svelte'
 	import { fade } from 'svelte/transition'
 	import WorkerTagSelect from '$lib/components/WorkerTagSelect.svelte'
+	import type { FlowEditorContext } from '../types'
 
 	let scriptEditorDrawer: Drawer | undefined = $state()
 
 	const dispatch = createEventDispatcher()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	export async function openDrawer(hash: string, cb: () => void): Promise<void> {
 		script = undefined
 		closeAnyway = false
 		scriptEditorDrawer?.openDrawer?.()
 		script = await ScriptService.getScriptByHash({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			hash
 		})
 		savedScript = structuredClone($state.snapshot(script))
@@ -89,7 +93,7 @@
 				}
 
 				await ScriptService.createScript({
-					workspace: $workspaceStore!,
+					workspace: opWs!,
 					requestBody: {
 						...script,
 						language: script.language!,
@@ -200,6 +204,7 @@
 		{#if script && displayEditor}
 			{#key script.hash}
 				<ScriptEditor
+					workspaceOverride={opWs}
 					showCaptures={false}
 					on:saveDraft={() => {
 						saveScript()
@@ -216,7 +221,10 @@
 				>
 					{#snippet editorBarRight()}
 						<div>
-							<WorkerTagSelect bind:tag={() => script?.tag, (v) => script && (script.tag = v)} />
+							<WorkerTagSelect
+								bind:tag={() => script?.tag, (v) => script && (script.tag = v)}
+								workspaceId={opWs}
+							/>
 						</div>
 					{/snippet}
 				</ScriptEditor>
diff --git a/frontend/src/lib/components/flows/conversations/FlowChat.svelte b/frontend/src/lib/components/flows/conversations/FlowChat.svelte
index 95b299e92e..7966caa8c5 100644
--- a/frontend/src/lib/components/flows/conversations/FlowChat.svelte
+++ b/frontend/src/lib/components/flows/conversations/FlowChat.svelte
@@ -3,7 +3,8 @@
 	import { createFlowChatManager } from './FlowChatManager.svelte'
 	import FlowConversationsSidebar from './FlowConversationsSidebar.svelte'
 	import FlowChatInterface from './FlowChatInterface.svelte'
-	import { untrack } from 'svelte'
+	import { getContext, untrack } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 
 	interface Props {
 		onRunFlow: (
@@ -24,10 +25,13 @@
 		useStreaming = false,
 		path,
 		hideSidebar = false,
-		inputSchema = undefined,
+		inputSchema = undefined
 	}: Props = $props()
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+
 	const manager = createFlowChatManager()
+	manager.operatingWorkspace = () => flowEditorContext?.opWorkspace?.()
 
 	// Initialize manager when component mounts
 	$effect(() => {
@@ -52,9 +56,7 @@
 	// Derive additional inputs schema (excluding user_message) for chat mode
 	const additionalInputsSchema = $derived.by(() => {
 		const props = inputSchema?.properties ?? {}
-		const filtered = Object.fromEntries(
-			Object.entries(props).filter(([k]) => k !== 'user_message')
-		)
+		const filtered = Object.fromEntries(Object.entries(props).filter(([k]) => k !== 'user_message'))
 		if (Object.keys(filtered).length === 0) return undefined
 		const required = inputSchema?.required
 		const requiredArray: string[] = Array.isArray(required) ? required : []
diff --git a/frontend/src/lib/components/flows/conversations/FlowChatInterface.svelte b/frontend/src/lib/components/flows/conversations/FlowChatInterface.svelte
index 3689976df2..ab52d06102 100644
--- a/frontend/src/lib/components/flows/conversations/FlowChatInterface.svelte
+++ b/frontend/src/lib/components/flows/conversations/FlowChatInterface.svelte
@@ -93,6 +93,7 @@
 			schema={additionalInputsSchema}
 			bind:args={additionalInputsValues}
 			helperScript={dynamicInputHelperScript}
+			workspace={manager.operatingWorkspace?.()}
 		/>
 		{#snippet actions()}
 			<Button onClick={handleModalConfirm} variant="accent">Save</Button>
diff --git a/frontend/src/lib/components/flows/conversations/FlowChatManager.svelte.ts b/frontend/src/lib/components/flows/conversations/FlowChatManager.svelte.ts
index 2a57ad937e..7cf2c8d6f7 100644
--- a/frontend/src/lib/components/flows/conversations/FlowChatManager.svelte.ts
+++ b/frontend/src/lib/components/flows/conversations/FlowChatManager.svelte.ts
@@ -53,6 +53,15 @@ export class FlowChatManager {
 	#useStreaming = $state(false)
 	#path = $state<string | undefined>(undefined)
 
+	// When the flow editor runs as an AI-session live editor, it acts on a workspace
+	// that can differ from the nav store. FlowChat.svelte wires this to
+	// FlowEditorContext.opWorkspace so workspace-scoped calls hit the acting workspace.
+	operatingWorkspace?: () => string | undefined
+
+	#workspace(): string | undefined {
+		return this.operatingWorkspace?.() ?? get(workspaceStore)
+	}
+
 	initialize(
 		onRunFlow: (
 			userMessage: string,
@@ -112,7 +121,7 @@ export class FlowChatManager {
 		// Create a new conversation object and add it to the top of the list
 		const newConversation: ConversationWithDraft = {
 			id: newConversationId,
-			workspace_id: get(workspaceStore)!,
+			workspace_id: this.#workspace()!,
 			flow_path: this.#path!,
 			title: 'New chat',
 			created_at: new Date().toISOString(),
@@ -160,7 +169,7 @@ export class FlowChatManager {
 		try {
 			this.deletingConversationId = conversationId
 			await FlowConversationsService.deleteFlowConversation({
-				workspace: get(workspaceStore)!,
+				workspace: this.#workspace()!,
 				conversationId
 			})
 			if (this.selectedConversationId === conversationId) {
@@ -178,14 +187,14 @@ export class FlowChatManager {
 	}
 
 	async cancelCurrentJob() {
-		if (!get(workspaceStore)) {
+		if (!this.#workspace()) {
 			return
 		}
 
 		try {
 			if (this.currentJobId) {
 				await JobService.cancelQueuedJob({
-					workspace: get(workspaceStore)!,
+					workspace: this.#workspace()!,
 					id: this.currentJobId,
 					requestBody: {}
 				})
@@ -206,11 +215,11 @@ export class FlowChatManager {
 
 	// Only used by InfiniteList
 	private async loadConversations(page: number, perPage: number) {
-		if (!get(workspaceStore) || !this.#path) return []
+		if (!this.#workspace() || !this.#path) return []
 
 		try {
 			const response = await FlowConversationsService.listFlowConversations({
-				workspace: get(workspaceStore)!,
+				workspace: this.#workspace()!,
 				flowPath: this.#path,
 				page: page,
 				perPage: perPage
@@ -227,7 +236,7 @@ export class FlowChatManager {
 	// Message loading
 	private async loadMessages(reset: boolean, conversationId?: string) {
 		let conversationIdToUse = conversationId ?? this.selectedConversationId
-		if (!get(workspaceStore) || !conversationIdToUse) return
+		if (!this.#workspace() || !conversationIdToUse) return
 
 		if (reset) {
 			if (this.#conversationsCache[conversationIdToUse]) {
@@ -245,7 +254,7 @@ export class FlowChatManager {
 			const previousScrollHeight = this.messagesContainer?.scrollHeight || 0
 
 			const response = await FlowConversationsService.listConversationMessages({
-				workspace: get(workspaceStore)!,
+				workspace: this.#workspace()!,
 				conversationId: conversationIdToUse,
 				page: pageToFetch,
 				perPage: this.#perPage
@@ -318,7 +327,7 @@ export class FlowChatManager {
 	// Polling
 	private async pollJobResult(jobId: string) {
 		try {
-			await waitJob(jobId)
+			await waitJob(jobId, this.#workspace())
 		} catch (error) {
 			console.error('Error polling job result:', error)
 		} finally {
@@ -338,12 +347,12 @@ export class FlowChatManager {
 		conversationId: string,
 		options?: { isNewConversation?: boolean; removeTempMessages?: boolean }
 	) {
-		if (!get(workspaceStore)) return
+		if (!this.#workspace()) return
 
 		try {
 			const lastSeq = this.getLastPersistedMessageSeq()
 			const response = await FlowConversationsService.listConversationMessages({
-				workspace: get(workspaceStore)!,
+				workspace: this.#workspace()!,
 				conversationId: conversationId,
 				page: 1,
 				perPage: 50,
@@ -488,7 +497,7 @@ export class FlowChatManager {
 			}
 
 			// Build the EventSource URL
-			const streamUrl = `/api/w/${get(workspaceStore)}/jobs_u/getupdate_sse/${jobId}`
+			const streamUrl = `/api/w/${this.#workspace()}/jobs_u/getupdate_sse/${jobId}`
 			const url = new URL(streamUrl, window.location.origin)
 			url.searchParams.set('poll_delay_ms', '50')
 			url.searchParams.set('fast', 'true')
diff --git a/frontend/src/lib/components/flows/flowModuleNextId.test.ts b/frontend/src/lib/components/flows/flowModuleNextId.test.ts
new file mode 100644
index 0000000000..dcf007e925
--- /dev/null
+++ b/frontend/src/lib/components/flows/flowModuleNextId.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from 'vitest'
+
+import type { OpenFlow } from '$lib/gen'
+import type { FlowState } from './flowState'
+import { nextId } from './flowModuleNextId'
+
+function flowWith(ids: string[]): OpenFlow {
+	return {
+		summary: '',
+		value: {
+			modules: ids.map((id) => ({ id, value: { type: 'identity' } as any }))
+		}
+	} as OpenFlow
+}
+
+function stateWith(keys: string[]): FlowState {
+	return Object.fromEntries(keys.map((k) => [k, {}])) as FlowState
+}
+
+describe('nextId', () => {
+	it('produces a, b, c, ... for a fresh flow', () => {
+		expect(nextId(stateWith(['failure']), flowWith([]))).toBe('a')
+		expect(nextId(stateWith(['a', 'failure']), flowWith(['a']))).toBe('b')
+		expect(nextId(stateWith(['a', 'b', 'c', 'failure']), flowWith(['a', 'b', 'c']))).toBe('d')
+	})
+
+	it('ignores the reserved failure/preprocessor keys always present in flowState', () => {
+		expect(nextId(stateWith(['failure', 'preprocessor']), flowWith([]))).toBe('a')
+	})
+
+	// Regression: copy ids ("z2"), subflow result keys and other non-canonical keys land in
+	// flowState; charsToNumber on them used to leak into the max and made new steps jump to
+	// garbage ids like "bzw".
+	it('is not poisoned by copy ids', () => {
+		const ids = ['a', 'b', 'c']
+		const state = stateWith([...ids, 'c2', 'a2', 'z2', 'c10', 'failure'])
+		expect(nextId(state, flowWith(ids))).toBe('d')
+	})
+
+	it('is not poisoned by subflow result keys', () => {
+		const ids = ['a', 'b']
+		const state = stateWith([...ids, 'subflow:abcd', 'Result', 'failure'])
+		expect(nextId(state, flowWith(ids))).toBe('c')
+	})
+
+	// A step renamed to a long lowercase word ("process") is a valid base-26 string and would
+	// otherwise inflate the max; the length cutoff keeps such renames out of the sequence.
+	it('is not poisoned by renames to long lowercase words or underscored ids', () => {
+		const ids = ['a', 'b']
+		const state = stateWith([...ids, 'process', 'my_step', 'failure'])
+		expect(nextId(state, flowWith(ids))).toBe('c')
+	})
+})
diff --git a/frontend/src/lib/components/flows/flowModuleNextId.ts b/frontend/src/lib/components/flows/flowModuleNextId.ts
index e10c900982..48b2eb5ac2 100644
--- a/frontend/src/lib/components/flows/flowModuleNextId.ts
+++ b/frontend/src/lib/components/flows/flowModuleNextId.ts
@@ -1,19 +1,35 @@
 import type { OpenFlow } from '$lib/gen'
 import { dfs } from './dfs'
 import type { FlowState } from './flowState'
-import { charsToNumber, numberToChars } from './idUtils'
+import { charsToNumber, forbiddenIds, numberToChars } from './idUtils'
+
+const reservedIds = new Set(forbiddenIds)
+
+// Returns the base-26 value of a key only if it is a short, auto-generated step id
+// (a, b, ..., z, aa, ...). flowState/module-id keys also include copy ids ("a2"), subflow
+// result keys ("subflow:..."), reserved keys and user-renamed ids; feeding those through
+// charsToNumber yields meaningless (often huge) numbers that would poison id generation and
+// make new steps jump to ids like "bzw". Short non-canonical keys are rejected via a
+// round-trip check; longer keys are skipped entirely, which also leaves user renames to long
+// lowercase words (e.g. "process") out of the sequence.
+function autoIdNumber(key: string): number | undefined {
+	if (key.length >= 4 || reservedIds.has(key)) {
+		return undefined
+	}
+	const num = charsToNumber(key)
+	if (num < 0 || numberToChars(num) !== key) {
+		return undefined
+	}
+	return num
+}
 
 // Computes the next available id
 export function nextId(flowState: FlowState, fullFlow: OpenFlow): string {
 	const allIds = dfs(fullFlow.value.modules, (fm) => fm.id)
 
 	const max = allIds.concat(Object.keys(flowState)).reduce((acc, key) => {
-		if (key.length >= 4) {
-			return acc
-		} else {
-			const num = charsToNumber(key)
-			return Math.max(acc, num + 1)
-		}
+		const num = autoIdNumber(key)
+		return num === undefined ? acc : Math.max(acc, num + 1)
 	}, 0)
 	return numberToChars(max)
 }
diff --git a/frontend/src/lib/components/flows/flowStateUtils.svelte.ts b/frontend/src/lib/components/flows/flowStateUtils.svelte.ts
index 04db00b63d..cc784286ce 100644
--- a/frontend/src/lib/components/flows/flowStateUtils.svelte.ts
+++ b/frontend/src/lib/components/flows/flowStateUtils.svelte.ts
@@ -213,14 +213,17 @@ export async function createFlow(id: string): Promise<[FlowModule, FlowModuleSta
 }
 
 export async function fork(
-	flowModule: FlowModule
+	flowModule: FlowModule,
+	// The acting workspace when the flow editor runs in an AI session; else the nav workspace.
+	workspace?: string
 ): Promise<[FlowModule & { value: RawScript }, FlowModuleState]> {
 	if (flowModule.value.type !== 'script') {
 		throw new Error('Can only fork a script module')
 	}
 	const forkedFlowModule = await createInlineScriptModuleFromPath(
 		flowModule.value.path ?? '',
-		flowModule.id
+		flowModule.id,
+		workspace
 	)
 	const flowModuleState = await loadFlowModuleState(forkedFlowModule)
 	return [forkedFlowModule, flowModuleState]
@@ -228,9 +231,10 @@ export async function fork(
 
 async function createInlineScriptModuleFromPath(
 	path: string,
-	id: string
+	id: string,
+	workspace?: string
 ): Promise<FlowModule & { value: RawScript }> {
-	const { content, language } = await getScriptByPath(path)
+	const { content, language } = await getScriptByPath(path, workspace)
 
 	return {
 		id,
@@ -255,7 +259,10 @@ export async function createScriptFromInlineScript(
 	flowModule: FlowModule,
 	suffix: string,
 	schema: Schema | undefined,
-	flowPath: string
+	flowPath: string,
+	// The session's acting workspace when the flow editor runs in an AI session;
+	// falls back to the navigation workspace outside a session.
+	workspace?: string
 ): Promise<[FlowModule & { value: PathScript }, FlowModuleState]> {
 	const user = get(userStore)
 
@@ -275,10 +282,10 @@ export async function createScriptFromInlineScript(
 	const forkedDescription = wasForked ? `as a fork of ${originalScriptPath}` : ''
 	const description = `This script was edited in place of flow ${flowPath} ${forkedDescription} by ${user?.username}.`
 
-	const availablePath = await findNextAvailablePath(path)
+	const availablePath = await findNextAvailablePath(path, workspace)
 
 	const hash = await ScriptService.createScript({
-		workspace: get(workspaceStore)!,
+		workspace: workspace ?? get(workspaceStore)!,
 		requestBody: {
 			path: availablePath,
 			summary: flowModule.summary ?? '',
diff --git a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
index 2f1c016385..dbebc82f70 100644
--- a/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
+++ b/frontend/src/lib/components/flows/header/FlowPreviewButtons.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import Button from '$lib/components/common/button/Button.svelte'
+	import type { ButtonType } from '$lib/components/common/button/model'
 
 	import Drawer from '$lib/components/common/drawer/Drawer.svelte'
 	import FlowPreviewContent from '$lib/components/FlowPreviewContent.svelte'
@@ -18,6 +19,7 @@
 		onJobDone?: () => void
 		localModuleStates?: Record<string, GraphModuleState>
 		suspendStatus: StateStore<Record<string, { job: Job; nb: number }>>
+		unifiedSize?: ButtonType.UnifiedSize
 	}
 
 	let {
@@ -25,7 +27,8 @@
 		onRunPreview,
 		onJobDone,
 		localModuleStates = $bindable({}),
-		suspendStatus
+		suspendStatus,
+		unifiedSize = 'md'
 	}: Props = $props()
 
 	const { selectionManager } = getContext<FlowEditorContext>('FlowEditorContext')
@@ -143,7 +146,7 @@
 <Button
 	variant="accent-secondary"
 	wrapperClasses="whitespace-nowrap"
-	unifiedSize="md"
+	{unifiedSize}
 	on:click={() => {
 		previewMode = 'whole'
 		previewOpen = !previewOpen
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 73ba81296f..21b50ff78e 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import type { FlowEditorContext } from '../types'
+	import type { OpenInSessionSource } from '$lib/components/sessions/OpenInSessionButton.svelte'
 	import { createEventDispatcher, getContext, tick } from 'svelte'
 	import {
 		createInlineScriptModule,
@@ -59,10 +60,7 @@
 		GroupedModulesProxy,
 		type ExtendedOpenFlow
 	} from '$lib/components/graph/groupedModulesProxy.svelte'
-	import {
-		GroupDisplayState,
-		type FlowGroup
-	} from '$lib/components/graph/groupEditor.svelte'
+	import { GroupDisplayState, type FlowGroup } from '$lib/components/graph/groupEditor.svelte'
 	import {
 		type FlowStructureNode,
 		matchStructureNode,
@@ -86,6 +84,7 @@
 		aiChatOpen?: boolean
 		showFlowAiButton?: boolean
 		toggleAiChat?: () => void
+		sessionOpen?: OpenInSessionSource
 		isOwner?: boolean
 		onTestFlow?: () => void
 		isRunning?: boolean
@@ -117,6 +116,7 @@
 		aiChatOpen,
 		showFlowAiButton,
 		toggleAiChat,
+		sessionOpen,
 		isOwner,
 		onTestFlow,
 		isRunning,
@@ -132,9 +132,11 @@
 		flowHasChanged
 	}: Props = $props()
 
-	const { customUi, selectionManager, history, flowStateStore, flowStore, pathStore } =
+	const { customUi, selectionManager, history, flowStateStore, flowStore, pathStore, opWorkspace } =
 		getContext<FlowEditorContext>('FlowEditorContext')
 
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
+
 	const moveManager = new MoveManager()
 	const { triggersCount, triggersState } = getContext<TriggerContext>('TriggerContext')
 
@@ -457,7 +459,7 @@
 			}
 		}
 		const previousJobId = await JobService.listCompletedJobs({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			scriptPathExact: path,
 			jobKinds: ['preview', 'script', 'flowpreview', 'flow'].join(','),
 			page: 1,
@@ -465,7 +467,7 @@
 		})
 		if (previousJobId.length > 0) {
 			const getJobResult = await JobService.getCompletedJobResultMaybe({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				id: previousJobId[0].id
 			})
 			if ('result' in getJobResult) {
@@ -561,6 +563,7 @@
 			on:generateStep
 			{aiChatOpen}
 			{toggleAiChat}
+			{sessionOpen}
 			{noteMode}
 			{toggleNoteMode}
 			{diffManager}
diff --git a/frontend/src/lib/components/flows/map/FlowStickyNode.svelte b/frontend/src/lib/components/flows/map/FlowStickyNode.svelte
index eb93567fad..9a33bd2ce5 100644
--- a/frontend/src/lib/components/flows/map/FlowStickyNode.svelte
+++ b/frontend/src/lib/components/flows/map/FlowStickyNode.svelte
@@ -9,6 +9,9 @@
 	import Popover from '$lib/components/Popover.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { AIBtnClasses } from '$lib/components/copilot/chat/AIButtonStyle'
+	import OpenInSessionButton, {
+		type OpenInSessionSource
+	} from '$lib/components/sessions/OpenInSessionButton.svelte'
 
 	interface Props {
 		disableSettings?: boolean
@@ -17,6 +20,7 @@
 		aiChatOpen?: boolean
 		showFlowAiButton?: boolean
 		toggleAiChat?: () => void
+		sessionOpen?: OpenInSessionSource
 		noteMode?: boolean
 		toggleNoteMode?: () => void
 		disableAi?: boolean
@@ -31,6 +35,7 @@
 		aiChatOpen,
 		showFlowAiButton,
 		toggleAiChat,
+		sessionOpen,
 		noteMode,
 		toggleNoteMode,
 		disableAi,
@@ -68,7 +73,13 @@
 		</Popover>
 	{/if}
 	<Popover>
-		<FlowErrorHandlerItem {disableAi} small={smallErrorHandler} {compact} {diffManager} on:generateStep />
+		<FlowErrorHandlerItem
+			{disableAi}
+			small={smallErrorHandler}
+			{compact}
+			{diffManager}
+			on:generateStep
+		/>
 		{#snippet text()}
 			Error Handler
 		{/snippet}
@@ -90,17 +101,17 @@
 		</Popover>
 	{/if}
 	{#if showFlowAiButton}
-		<Popover>
-			<AIButton
-				togglePanel={() => {
-					toggleAiChat?.()
-				}}
-				btnClasses={AIBtnClasses(aiChatOpen ? 'selected' : 'default')}
-			/>
-			{#snippet text()}
-				Flow AI Chat
+		<OpenInSessionButton source={sessionOpen}>
+			{#snippet fallback()}
+				<AIButton
+					label="Open AI chat"
+					togglePanel={() => {
+						toggleAiChat?.()
+					}}
+					btnClasses={AIBtnClasses(aiChatOpen ? 'selected' : 'default')}
+				/>
 			{/snippet}
-		</Popover>
+		</OpenInSessionButton>
 	{/if}
 	<Popover>
 		<Button
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index f7a08f1933..652cf4041d 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -9,7 +9,11 @@
 	import { Database, Square } from 'lucide-svelte'
 	import FlowGraphPreviewButton from './FlowGraphPreviewButton.svelte'
 	import type { Job } from '$lib/gen'
-	import { getNodeColorClasses, aiActionToNodeState } from '$lib/components/graph'
+	import {
+		getNodeColorClasses,
+		aiActionToNodeState,
+		type FlowNodeState
+	} from '$lib/components/graph'
 	import { getGraphContext } from '$lib/components/graph/graphContext'
 
 	interface Props {
@@ -39,6 +43,9 @@
 		job?: Job
 		showJobStatus?: boolean
 		flowHasChanged?: boolean
+		/** When set, overrides the node outline with this run-state's colored outline.
+		 * Used to mark the branch taken at runtime on branchone/branchall nodes. */
+		borderState?: FlowNodeState
 	}
 
 	let {
@@ -67,14 +74,13 @@
 		individualStepTests = false,
 		job,
 		showJobStatus = false,
-		flowHasChanged = false
+		flowHasChanged = false,
+		borderState = undefined
 	}: Props = $props()
 
 	const flowGraphContext = getGraphContext()
 
-	let isMultiSelected = $derived(
-		(flowGraphContext?.selectionManager?.selectedIds?.length ?? 0) > 1
-	)
+	let isMultiSelected = $derived((flowGraphContext?.selectionManager?.selectedIds?.length ?? 0) > 1)
 
 	const outputPickerVisible = $derived(
 		(nodeKind || (inputJson && Object.keys(inputJson).length > 0)) && editMode
@@ -96,6 +102,10 @@
 	// AI action colors take priority over execution state, fallback to _VirtualItem
 	const effectiveState = $derived(aiActionToNodeState(action) ?? outputType ?? '_VirtualItem')
 	let colorClasses = $derived(getNodeColorClasses(effectiveState, selected))
+	// The branch taken at runtime keeps its outline regardless of selection so it stays visible.
+	let outlineClasses = $derived(
+		borderState ? getNodeColorClasses(borderState, true).outline : colorClasses.outline
+	)
 </script>
 
 <VirtualItemWrapper
@@ -109,7 +119,7 @@
 	{#snippet children({ hover })}
 		<div class="flex flex-col w-full">
 			<div
-				class="flex flex-row justify-between {colorClasses.outline} {center
+				class="flex flex-row justify-between {outlineClasses} {center
 					? 'items-center'
 					: 'items-baseline'} w-full overflow-hidden rounded-md p-2 text-2xs module text-primary"
 			>
diff --git a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPicker.svelte b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPicker.svelte
index ce1a7e63e0..3b93e0c05c 100644
--- a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPicker.svelte
+++ b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPicker.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { workspaceStore } from '$lib/stores'
-	import { createEventDispatcher, untrack } from 'svelte'
+	import { createEventDispatcher, getContext, untrack } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 	import { ScriptService } from '$lib/gen'
 	import SearchItems from '$lib/components/SearchItems.svelte'
 	import { Badge, Skeleton } from '$lib/components/common'
@@ -21,6 +22,9 @@
 	let items = $state(undefined) as Item[] | undefined
 
 	let filteredItems = $state(undefined) as (Item & { marked?: string })[] | undefined
+
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
 	interface Props {
 		kind?: 'script' | 'trigger' | 'approval' | 'failure'
 		isTemplate?: boolean | undefined
@@ -39,7 +43,7 @@
 
 	async function loadItems(): Promise<void> {
 		items = await ScriptService.listScripts({
-			workspace: $workspaceStore!,
+			workspace: opWs!,
 			kinds: kind,
 			isTemplate,
 			withoutDescription: true
diff --git a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
index 74daeaada7..9cb65b46b3 100644
--- a/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
+++ b/frontend/src/lib/components/flows/pickers/WorkspaceScriptPickerQuick.svelte
@@ -37,7 +37,8 @@
 
 <script lang="ts">
 	import { workspaceStore } from '$lib/stores'
-	import { createEventDispatcher, untrack } from 'svelte'
+	import { createEventDispatcher, getContext, untrack } from 'svelte'
+	import type { FlowEditorContext } from '../types'
 	import { FlowService, ScriptService } from '$lib/gen'
 	import SearchItems from '$lib/components/SearchItems.svelte'
 	import { Skeleton } from '$lib/components/common'
@@ -57,9 +58,11 @@
 		hash?: string
 	}
 
+	const flowEditorContext = getContext<FlowEditorContext>('FlowEditorContext')
+	let opWs = $derived(flowEditorContext?.opWorkspace?.() ?? $workspaceStore)
+
 	let items = usePromise(
-		async () =>
-			await loadItemsCached({ workspace: $workspaceStore!, kind, isTemplate, refreshCount }),
+		async () => await loadItemsCached({ workspace: opWs!, kind, isTemplate, refreshCount }),
 		{ loadInit: false, clearValueOnRefresh: false }
 	)
 
diff --git a/frontend/src/lib/components/flows/propPicker/StepHistory.svelte b/frontend/src/lib/components/flows/propPicker/StepHistory.svelte
index 40fbded000..67190154b8 100644
--- a/frontend/src/lib/components/flows/propPicker/StepHistory.svelte
+++ b/frontend/src/lib/components/flows/propPicker/StepHistory.svelte
@@ -39,7 +39,9 @@
 		noHistory = undefined
 	}: Props = $props()
 
-	const { pathStore, flowStateStore } = getContext<FlowEditorContext>('FlowEditorContext') ?? {}
+	const { pathStore, flowStateStore, opWorkspace } =
+		getContext<FlowEditorContext>('FlowEditorContext') ?? {}
+	let opWs = $derived(opWorkspace?.() ?? $workspaceStore)
 	const dispatch = createEventDispatcher()
 
 	let infiniteList: InfiniteList | undefined = $state(undefined)
@@ -51,7 +53,7 @@
 		loadInputsPageFn = async (page: number, perPage: number) => {
 			if (staticInputs) return staticInputs
 			const previousJobs = await JobService.listCompletedJobs({
-				workspace: $workspaceStore!,
+				workspace: opWs!,
 				scriptPathExact: path === '' ? $pathStore + '/' + moduleId : path,
 				jobKinds: ['preview', 'script', 'flowpreview', 'flow', 'flowscript'].join(','),
 				page,
@@ -77,7 +79,7 @@
 	async function getJobResultAndLogs(jobId: string, noLogs: boolean) {
 		try {
 			const job = await JobService.getJob({
-				workspace: $workspaceStore ?? '',
+				workspace: opWs ?? '',
 				id: jobId ?? '',
 				noLogs
 			})
diff --git a/frontend/src/lib/components/flows/stepsInputArgs.svelte.ts b/frontend/src/lib/components/flows/stepsInputArgs.svelte.ts
index 06a4972ee5..8aa7a1f69f 100644
--- a/frontend/src/lib/components/flows/stepsInputArgs.svelte.ts
+++ b/frontend/src/lib/components/flows/stepsInputArgs.svelte.ts
@@ -100,9 +100,11 @@ export class StepsInputArgs {
 		if (modules.length < 1) {
 			return
 		}
+		// dfs returns [step, immediate parent, ..., root]; the prop picker needs the
+		// immediate parent so nested loops resolve flow_input.iter to the innermost loop.
 		let parentModule: FlowModule | undefined = undefined
 		if (modules.length > 1) {
-			parentModule = modules[modules.length - 1]
+			parentModule = modules[1]
 		}
 		const stepPropPicker = getStepPropPicker(
 			flowState,
@@ -175,9 +177,11 @@ export class StepsInputArgs {
 		if (modules.length < 1) {
 			return
 		}
+		// dfs returns [step, immediate parent, ..., root]; the prop picker needs the
+		// immediate parent so nested loops resolve flow_input.iter to the innermost loop.
 		let parentModule: FlowModule | undefined = undefined
 		if (modules.length > 1) {
-			parentModule = modules[modules.length - 1]
+			parentModule = modules[1]
 		}
 		const stepPropPicker = getStepPropPicker(
 			flowState,
diff --git a/frontend/src/lib/components/flows/types.ts b/frontend/src/lib/components/flows/types.ts
index 9b02f7224b..41165865ae 100644
--- a/frontend/src/lib/components/flows/types.ts
+++ b/frontend/src/lib/components/flows/types.ts
@@ -98,10 +98,18 @@ export type FlowEditorContext = {
 	// locally-edited workspace scripts, passed as temp_script_refs on preview
 	// runs so relative imports resolve from local (not-yet-deployed) content
 	devTempScriptRefs?: () => Record<string, string> | undefined
+	// The workspace this editor operates on (deploy/save target). Differs from
+	// $workspaceStore inside a fork-scoped session; worker-tag pickers read it so
+	// their tag list and availability match the deploy target. Getter for reactivity.
+	opWorkspace?: () => string | undefined
 }
 
 export type FlowGraphAssetContext = StateStore<{
 	selectedAsset: Asset | undefined
+	// The workspace asset explore controls (DB manager, S3/volume picker, resource
+	// editor) act on — the flow's acting workspace in an AI session, else the nav
+	// workspace. Set by FlowAssetsHandler.
+	workspace: string | undefined
 	s3FilePicker: S3FilePicker | undefined
 	resourceEditorDrawer: ResourceEditorDrawer | undefined
 	// Maps resource paths to their metadata. undefined is for error
diff --git a/frontend/src/lib/components/flows/utils.svelte.ts b/frontend/src/lib/components/flows/utils.svelte.ts
index 42ff5f57b9..c7ed70acdc 100644
--- a/frontend/src/lib/components/flows/utils.svelte.ts
+++ b/frontend/src/lib/components/flows/utils.svelte.ts
@@ -185,11 +185,14 @@ export async function runFlowPreview(
 	path: string,
 	restartedFrom: RestartedFrom | undefined,
 	conversationId?: string | undefined,
-	tempScriptRefs?: Record<string, string>
+	tempScriptRefs?: Record<string, string>,
+	// The session's acting workspace when previewing inside an AI-session flow
+	// editor; falls back to the navigation workspace for full-page previews.
+	workspace?: string
 ) {
 	const newFlow = flow
 	return await JobService.runFlowPreview({
-		workspace: get(workspaceStore) ?? '',
+		workspace: workspace ?? get(workspaceStore) ?? '',
 		requestBody: {
 			args,
 			value: newFlow.value,
diff --git a/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte
index 0d5a9a14ea..12cf247c9a 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/AssetNode.svelte
@@ -287,6 +287,7 @@
 							noText
 							buttonVariant="accent"
 							s3FilePicker={flowGraphAssetsCtx?.val.s3FilePicker}
+							workspace={flowGraphAssetsCtx?.val.workspace}
 							_resourceMetadata={cachedResourceMetadata}
 						/>
 					</div>
diff --git a/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte b/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte
index 1f2623e552..9682d941b6 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/BranchAllStart.svelte
@@ -6,6 +6,7 @@
 	import { X } from 'lucide-svelte'
 	import type { BranchAllStartN } from '../../graphBuilder.svelte'
 	import { getGraphContext } from '../../graphContext'
+	import { computeBorderStatus } from '../utils'
 	interface Props {
 		data: BranchAllStartN['data']
 		id: string
@@ -14,6 +15,10 @@
 	let { data, id }: Props = $props()
 
 	const { selectionManager } = getGraphContext()
+
+	let borderStatus = $derived(
+		computeBorderStatus(data.branchIndex, 'branchall', data.flowModuleState)
+	)
 </script>
 
 <NodeWrapper nodeId={id}>
@@ -22,6 +27,7 @@
 			label={data.label}
 			selectable
 			selected={selectionManager && selectionManager.isNodeSelected(id)}
+			borderState={borderStatus}
 			on:select={() => {
 				setTimeout(() => data.eventHandlers.select(data.id))
 			}}
diff --git a/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte b/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte
index 6333d32845..9902582ee0 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/BranchOneStart.svelte
@@ -6,6 +6,7 @@
 	import { X } from 'lucide-svelte'
 	import type { BranchOneStartN } from '../../graphBuilder.svelte'
 	import { getGraphContext } from '../../graphContext'
+	import { computeBorderStatus } from '../utils'
 	interface Props {
 		data: BranchOneStartN['data']
 		id: string
@@ -13,6 +14,12 @@
 	const { selectionManager } = getGraphContext()
 
 	let { data, id }: Props = $props()
+
+	// branchIndex is -1 for the default branch and 0-based for explicit branches;
+	// branchChosen is 0 for default and 1-based, hence the +1.
+	let borderStatus = $derived(
+		computeBorderStatus(data.branchIndex + 1, 'branchone', data.flowModuleState)
+	)
 </script>
 
 <NodeWrapper nodeId={id}>
@@ -22,11 +29,12 @@
 			preLabel={data.preLabel}
 			selectable
 			selected={selectionManager && selectionManager.isNodeSelected(id)}
+			borderState={borderStatus}
 			on:select={() => {
 				setTimeout(() => data?.eventHandlers?.select(data.id))
 			}}
 		/>
-		{#if data.insertable}
+		{#if data.insertable && data.branchIndex >= 0}
 			<button
 				title="Delete branch"
 				class="z-50 absolute -translate-y-[100%] top-1 -right-1 rounded-md p-1 center-center text-primary
diff --git a/frontend/src/lib/components/graph/renderers/utils.ts b/frontend/src/lib/components/graph/renderers/utils.ts
index 8b393f1de9..c8c6ca5109 100644
--- a/frontend/src/lib/components/graph/renderers/utils.ts
+++ b/frontend/src/lib/components/graph/renderers/utils.ts
@@ -19,7 +19,8 @@ export function computeBorderStatus(
 	} else {
 		let flow_jobs_success = graphModuleState?.flow_jobs_success
 		if (!flow_jobs_success) {
-			return 'WaitingForPriorSteps'
+			// No run yet: leave the branch border neutral instead of forcing a highlight.
+			return undefined
 		} else {
 			let status = flow_jobs_success?.[branchIndex]
 			if (status == undefined) {
diff --git a/frontend/src/lib/components/home/CreateActionsMenu.svelte b/frontend/src/lib/components/home/CreateActionsMenu.svelte
new file mode 100644
index 0000000000..4d8adb88e9
--- /dev/null
+++ b/frontend/src/lib/components/home/CreateActionsMenu.svelte
@@ -0,0 +1,582 @@
+<script lang="ts">
+	import { base } from '$lib/base'
+	import { goto } from '$lib/navigation'
+	import { Button } from '$lib/components/common'
+	import Drawer from '$lib/components/common/drawer/Drawer.svelte'
+	import DrawerContent from '$lib/components/common/drawer/DrawerContent.svelte'
+	import Tabs from '$lib/components/common/tabs/Tabs.svelte'
+	import Tab from '$lib/components/common/tabs/Tab.svelte'
+	import {
+		Plus,
+		Code2,
+		LayoutDashboard,
+		ChevronDown,
+		ChevronRight,
+		Loader2,
+		Workflow,
+		Import,
+		PanelLeftClose
+	} from 'lucide-svelte'
+	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
+	import { PythonIcon, TypeScriptIcon } from '$lib/components/common/languageIcons'
+	import { HOME_SHOW_CREATE_FLOW, HOME_SHOW_CREATE_APP } from '$lib/consts'
+	import { importFlowStore } from '$lib/components/flows/flowStore.svelte'
+	import { importScriptStore } from '$lib/components/scripts/scriptStore.svelte'
+	import { importStore } from '$lib/components/apps/store'
+	import { conditionalMelt, getLocalSetting, storeLocalSetting } from '$lib/utils'
+	import { createDropdownMenu, melt } from '@melt-ui/svelte'
+	import YAML from 'yaml'
+
+	type Variant = {
+		label: string
+		icon: typeof PythonIcon
+		onSelect: () => void
+	}
+
+	/** an importable artifact kind handled by the shared YAML/JSON import drawer */
+	type ImportKind = 'flow' | 'wac' | 'app-lowcode' | 'app-fullcode'
+
+	type Extra = {
+		label: string
+		onSelect: () => void
+	}
+
+	type Option = {
+		key: string
+		label: string
+		icon: typeof Code2 | typeof BarsStaggered
+		/** tailwind accent token used for the icon tile / hover border */
+		accent: string
+		tagline: string
+		description: string
+		bullets: string[]
+		onSelect: () => void
+		/** optional sub-choices shown in place of the single create button */
+		variants?: Variant[]
+		/** optional pill shown next to the label; class is the full static tailwind tone */
+		badge?: { label: string; class: string }
+		/** secondary actions (import from YAML/JSON, pipeline, …) shown in the detail panel */
+		extras?: Extra[]
+	}
+
+	// kept static so tailwind doesn't purge the badge tones
+	const badgeAdvanced = 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-300'
+	const badgeLegacy = 'bg-amber-100 text-amber-700 dark:bg-amber-900/40 dark:text-amber-300'
+	const badgeAlpha = 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-300'
+
+	const allOptions: Option[] = [
+		{
+			key: 'script',
+			label: 'Script',
+			icon: Code2,
+			accent: 'blue',
+			tagline: 'A single standalone script',
+			description:
+				'Author a script in Python, TypeScript, Go, Bash, SQL, Rust, PHP and more. Windmill auto-generates an input UI, deploys it instantly and exposes it as an API.',
+			bullets: [
+				'20+ languages',
+				'Auto-generated UI from parameters',
+				'Instant deploy & versioning'
+			],
+			onSelect: () => goto(`${base}/scripts/add`)
+		},
+		...(HOME_SHOW_CREATE_FLOW
+			? ([
+					{
+						key: 'flow',
+						label: 'Flow',
+						icon: BarsStaggered,
+						accent: 'teal',
+						tagline: 'Compose scripts into a workflow',
+						description:
+							'Visual builder for chaining scripts together with branches, loops, error handlers, approvals and retries. Each step can be reused from the workspace or the Hub.',
+						bullets: [
+							'Drag-and-drop steps',
+							'Branches, loops & error handling',
+							'Suspend / approval steps'
+						],
+						onSelect: () => goto(`${base}/flows/add`),
+						extras: [{ label: 'Import flow', onSelect: () => openImport('flow') }]
+					}
+				] as Option[])
+			: []),
+		...(HOME_SHOW_CREATE_APP
+			? ([
+					{
+						key: 'app-fullcode',
+						label: 'App (full-code)',
+						icon: LayoutDashboard,
+						accent: 'orange',
+						tagline: 'Build with React or Svelte',
+						description:
+							'Full control over the UI with React or Svelte and a powerful AI agent. Best for complex apps that need full flexibility.',
+						bullets: ['React or Svelte', 'Full flexibility & control', 'AI-assisted authoring'],
+						onSelect: () => goto(`${base}/apps_raw/add`),
+						extras: [{ label: 'Import full-code app', onSelect: () => openImport('app-fullcode') }]
+					}
+				] as Option[])
+			: []),
+		...(HOME_SHOW_CREATE_FLOW
+			? ([
+					{
+						key: 'wac',
+						label: 'Workflow-as-Code',
+						icon: Code2,
+						accent: 'purple',
+						tagline: 'Express a workflow purely in code',
+						description:
+							'Write the whole workflow as a single Python or TypeScript script using the Windmill SDK — parallelism, branching and step orchestration expressed as plain code.',
+						bullets: [
+							'Python or TypeScript',
+							'Full control via the SDK',
+							'Versioned as a regular script'
+						],
+						onSelect: () => goto(`${base}/scripts/add?wac=typescript`),
+						badge: { label: 'Advanced', class: badgeAdvanced },
+						variants: [
+							{
+								label: 'TypeScript',
+								icon: TypeScriptIcon,
+								onSelect: () => goto(`${base}/scripts/add?wac=typescript`)
+							},
+							{
+								label: 'Python',
+								icon: PythonIcon,
+								onSelect: () => goto(`${base}/scripts/add?wac=python`)
+							}
+						],
+						extras: [{ label: 'Import Workflow-as-Code', onSelect: () => openImport('wac') }]
+					},
+					{
+						key: 'pipeline',
+						label: 'Data pipelines',
+						icon: Workflow,
+						accent: 'indigo',
+						tagline: 'Compose data ingestion & transforms',
+						description:
+							'Visual editor for data pipelines — chain ingestion, transformation and materialization steps with partitions and incremental processing.',
+						bullets: [
+							'Ingest, transform & materialize',
+							'Partitioned & incremental',
+							'Asset-aware lineage'
+						],
+						onSelect: () => goto(`${base}/pipeline`),
+						badge: { label: 'Alpha', class: badgeAlpha }
+					}
+				] as Option[])
+			: []),
+		...(HOME_SHOW_CREATE_APP
+			? ([
+					{
+						key: 'app-lowcode',
+						label: 'App (low-code)',
+						icon: LayoutDashboard,
+						accent: 'gray',
+						tagline: 'Drag-and-drop UI builder',
+						description:
+							'Assemble an internal UI from 60+ components wired to your scripts and flows. Best for simple apps or apps that need minimal customization.',
+						bullets: ['60+ ready-made components', 'No code required', 'Backed by scripts & flows'],
+						onSelect: () => goto(`${base}/apps/add`),
+						badge: { label: 'Legacy', class: badgeLegacy },
+						extras: [{ label: 'Import low-code app', onSelect: () => openImport('app-lowcode') }]
+					}
+				] as Option[])
+			: [])
+	]
+
+	// tailwind needs the full class names statically — map accent token -> classes
+	const accentClasses: Record<
+		string,
+		{ tile: string; iconText: string; activeBg: string; activeBorder: string }
+	> = {
+		blue: {
+			tile: 'bg-blue-100 dark:bg-blue-900/40',
+			iconText: 'text-blue-600 dark:text-blue-400',
+			activeBg: 'bg-blue-50 dark:bg-blue-900/20',
+			activeBorder: 'border-blue-500 dark:border-blue-400'
+		},
+		teal: {
+			tile: 'bg-teal-50 dark:bg-teal-900/20',
+			iconText: 'text-teal-600 dark:text-teal-400',
+			activeBg: 'bg-teal-50 dark:bg-teal-900/20',
+			activeBorder: 'border-teal-500 dark:border-teal-400'
+		},
+		purple: {
+			tile: 'bg-purple-100 dark:bg-purple-900/40',
+			iconText: 'text-purple-600 dark:text-purple-400',
+			activeBg: 'bg-purple-50 dark:bg-purple-900/20',
+			activeBorder: 'border-purple-500 dark:border-purple-400'
+		},
+		orange: {
+			tile: 'bg-orange-100 dark:bg-orange-900/40',
+			iconText: 'text-orange-600 dark:text-orange-400',
+			activeBg: 'bg-orange-50 dark:bg-orange-900/20',
+			activeBorder: 'border-orange-500 dark:border-orange-400'
+		},
+		indigo: {
+			tile: 'bg-indigo-100 dark:bg-indigo-900/40',
+			iconText: 'text-indigo-600 dark:text-indigo-400',
+			activeBg: 'bg-indigo-50 dark:bg-indigo-900/20',
+			activeBorder: 'border-indigo-500 dark:border-indigo-400'
+		},
+		gray: {
+			tile: 'bg-gray-100 dark:bg-gray-700',
+			iconText: 'text-gray-600 dark:text-gray-300',
+			activeBg: 'bg-gray-50 dark:bg-gray-800/40',
+			activeBorder: 'border-gray-400 dark:border-gray-500'
+		}
+	}
+
+	let activeKey = $state(allOptions[0]?.key)
+	// every option's import action, surfaced together under the bottom "Import" submenu
+	const importActions: Extra[] = allOptions.flatMap((o) => o.extras ?? [])
+
+	// melt dropdown menu: arrow-key nav, typeahead, focus management and outside/escape
+	// close all come for free; we only drive the doc panel off the highlighted item.
+	const {
+		elements: { trigger: menuTrigger, menu, item },
+		states: { open },
+		builders
+	} = createDropdownMenu({
+		positioning: { placement: 'bottom-end', gutter: 8, fitViewport: true, strategy: 'fixed' },
+		loop: true,
+		forceVisible: true
+	})
+
+	// per-row fan-out submenus: open to the right when there's room. The popover hugs
+	// the right viewport edge on most screens, so the default flip (right → left) would
+	// cover the doc panel — fall back below the trigger row instead.
+	const {
+		elements: { subTrigger: wacSubTrigger, subMenu: wacSubMenu },
+		states: { subOpen: wacSubOpen }
+	} = builders.createSubmenu({
+		positioning: {
+			placement: 'right-start',
+			gutter: 4,
+			flip: { fallbackPlacements: ['bottom-end', 'bottom-start', 'top-end', 'top-start'] },
+			fitViewport: true,
+			overflowPadding: 8
+		}
+	})
+	const {
+		elements: { subTrigger: importSubTrigger, subMenu: importSubMenu },
+		states: { subOpen: importSubOpen }
+	} = builders.createSubmenu({
+		positioning: {
+			placement: 'right-end',
+			gutter: 4,
+			flip: { fallbackPlacements: ['bottom-end', 'bottom-start', 'top-end', 'top-start'] },
+			fitViewport: true,
+			overflowPadding: 8
+		}
+	})
+
+	// When a fan-out submenu falls below its row ('bottom'/'top' data-side), melt aligns
+	// it to the row's right edge, but free viewport space may remain beside the popover —
+	// slide it right until it hugs the viewport edge. Melt repositions on scroll/resize
+	// via style/data-side writes, so re-apply on attribute mutations.
+	function hugViewportRight(node: HTMLElement) {
+		let delta = 0
+		const apply = () => {
+			const side = node.getAttribute('data-side')
+			const baseRight = node.getBoundingClientRect().right - delta
+			const next =
+				side === 'bottom' || side === 'top'
+					? Math.max(0, document.documentElement.clientWidth - 8 - baseRight)
+					: 0
+			if (Math.abs(next - delta) < 0.5) return
+			delta = next
+			node.style.transform = next ? `translateX(${next}px)` : ''
+		}
+		const observer = new MutationObserver(apply)
+		observer.observe(node, { attributeFilter: ['style', 'data-side'] })
+		// melt only rewrites style when the reposition moves the submenu — a resize that
+		// changes clientWidth without moving it (scrollbar appearing, zoom) needs a direct hook
+		window.addEventListener('resize', apply)
+		apply()
+		return {
+			destroy: () => {
+				observer.disconnect()
+				window.removeEventListener('resize', apply)
+			}
+		}
+	}
+
+	// attach the menu trigger to the design-system <Button>'s DOM node, so it keeps its
+	// styling — melt element stores are callable on a node, exactly like `use:melt`.
+	let triggerEl: HTMLButtonElement | HTMLAnchorElement | undefined = $state(undefined)
+	$effect(() => {
+		const el = triggerEl
+		if (!el) return
+		const applied = conditionalMelt(el, menuTrigger as any) as {
+			destroy?: () => void
+		}
+		return applied?.destroy
+	})
+
+	const SHOW_DOC_SETTING = 'home_create_show_doc'
+	let showDoc = $state(getLocalSetting(SHOW_DOC_SETTING) !== 'false')
+	function setShowDoc(value: boolean) {
+		showDoc = value
+		// only persist the non-default (hidden) state, so a cleared key means "shown"
+		storeLocalSetting(SHOW_DOC_SETTING, value ? undefined : 'false')
+	}
+	let active = $derived(allOptions.find((o) => o.key === activeKey) ?? allOptions[0])
+	let activeAc = $derived(accentClasses[active.accent])
+
+	// shared YAML/JSON import drawer, reused by every "Import …" extra
+	let importDrawer: Drawer | undefined = $state(undefined)
+	let importKind: ImportKind = $state('flow')
+	let importType: 'yaml' | 'json' = $state('yaml')
+	let importRaw: string = $state('')
+
+	const importTitles: Record<ImportKind, string> = {
+		flow: 'Import flow',
+		wac: 'Import Workflow-as-Code',
+		'app-lowcode': 'Import low-code app',
+		'app-fullcode': 'Import full-code app'
+	}
+
+	function openImport(kind: ImportKind) {
+		importKind = kind
+		importType = 'yaml'
+		importRaw = ''
+		open.set(false)
+		importDrawer?.openDrawer?.()
+	}
+
+	async function runImport() {
+		const parsed = importType === 'yaml' ? YAML.parse(importRaw) : JSON.parse(importRaw)
+		if (importKind === 'flow') {
+			importFlowStore.set(parsed)
+			await goto(`${base}/flows/add`)
+		} else if (importKind === 'wac') {
+			importScriptStore.set(parsed)
+			await goto(`${base}/scripts/add?import=true`)
+		} else if (importKind === 'app-fullcode') {
+			// /apps_raw/add does a full reload (cross-origin isolation), so the in-memory
+			// store would be lost — hand the payload over via sessionStorage instead.
+			sessionStorage.setItem('rawAppImport', JSON.stringify(parsed))
+			await goto(`${base}/apps_raw/add`)
+		} else {
+			importStore.set(parsed)
+			await goto(`${base}/apps/add`)
+		}
+		importDrawer?.closeDrawer?.()
+	}
+</script>
+
+<div>
+	<Button
+		{...$menuTrigger}
+		id="create-new-button"
+		aiId="home-create-new"
+		aiDescription="Create a new script, flow or app"
+		unifiedSize="md"
+		variant="accent"
+		startIcon={{ icon: Plus }}
+		endIcon={{ icon: ChevronDown }}
+		bind:element={triggerEl}
+	>
+		New
+	</Button>
+
+	{#if $open && active}
+		<div
+			use:melt={$menu}
+			data-arrow-loop
+			class="z-[6000] flex flex-row rounded-lg border border-gray-200 dark:border-gray-700 bg-surface shadow-xl focus:outline-none"
+			style={showDoc ? 'width: 780px;' : ''}
+		>
+			{#if showDoc}
+				<!-- explanation of the highlighted editor -->
+				<div class="flex flex-col gap-3 p-5 flex-1 min-w-0">
+					<div class="flex flex-row items-center gap-3">
+						<div
+							class="w-12 h-12 rounded-xl flex items-center justify-center shrink-0 {activeAc.tile}"
+						>
+							<active.icon size={26} class={activeAc.iconText} />
+						</div>
+						<div class="min-w-0">
+							<div class="flex flex-row items-center gap-2">
+								<h3 class="font-semibold text-primary leading-tight">{active.label}</h3>
+								{#if active.badge}
+									<span
+										class="shrink-0 rounded px-1.5 py-0.5 text-[10px] font-semibold uppercase tracking-wide {active
+											.badge.class}"
+									>
+										{active.badge.label}
+									</span>
+								{/if}
+							</div>
+							<p class="text-xs text-tertiary">{active.tagline}</p>
+						</div>
+					</div>
+
+					<p class="text-xs text-secondary leading-relaxed">{active.description}</p>
+
+					<ul class="flex flex-col gap-1.5 mt-1">
+						{#each active.bullets as bullet (bullet)}
+							<li class="flex flex-row items-center gap-2 text-xs text-secondary">
+								<ChevronRight size={14} class={activeAc.iconText} />
+								{bullet}
+							</li>
+						{/each}
+					</ul>
+
+					<button
+						class="mt-auto self-start inline-flex items-center gap-1 pt-2 text-[10px] text-tertiary hover:text-secondary transition-colors"
+						title="Hide descriptions"
+						tabindex={-1}
+						onclick={() => setShowDoc(false)}
+					>
+						<PanelLeftClose size={12} />
+						Hide descriptions
+					</button>
+				</div>
+			{/if}
+
+			<!-- option list -->
+			<div class="flex flex-col gap-0.5 p-2 w-[18rem] shrink-0">
+				{#snippet rowBody(option: Option, ac: (typeof accentClasses)[string])}
+					<div class="w-6 h-6 rounded-md flex items-center justify-center shrink-0 {ac.tile}">
+						<option.icon size={14} class={ac.iconText} />
+					</div>
+					<span class="text-xs font-medium text-primary flex-1 min-w-0 whitespace-nowrap">
+						{option.label}
+					</span>
+					{#if option.badge}
+						<span
+							class="shrink-0 rounded px-1.5 py-0.5 text-[10px] font-semibold uppercase tracking-wide {option
+								.badge.class}"
+						>
+							{option.badge.label}
+						</span>
+					{/if}
+				{/snippet}
+				{#each allOptions as option (option.key)}
+					{@const ac = accentClasses[option.accent]}
+					{@const rowClass =
+						'w-full flex flex-row items-center gap-2.5 rounded-md px-2 py-1.5 text-left cursor-pointer transition-colors focus:outline-none data-[highlighted]:bg-surface-hover hover:bg-surface-hover'}
+					{#if option.variants}
+						<button
+							use:melt={$wacSubTrigger}
+							class={rowClass}
+							onfocusin={() => (activeKey = option.key)}
+							onpointerenter={() => (activeKey = option.key)}
+						>
+							{@render rowBody(option, ac)}
+							<ChevronRight size={14} class="shrink-0 text-tertiary" />
+						</button>
+						{#if $wacSubOpen}
+							<div
+								use:melt={$wacSubMenu}
+								use:hugViewportRight
+								class="z-[6001] flex flex-col gap-0.5 p-1 w-52 rounded-lg border border-gray-200 dark:border-gray-700 bg-surface shadow-xl focus:outline-none"
+							>
+								{#each option.variants ?? [] as variant (variant.label)}
+									{@const VariantIcon = variant.icon}
+									<button
+										use:melt={$item}
+										class="flex flex-row items-center gap-2.5 rounded-md px-2 py-1.5 text-left cursor-pointer transition-colors focus:outline-none data-[highlighted]:bg-surface-hover hover:bg-surface-hover"
+										onclick={() => variant.onSelect()}
+									>
+										<VariantIcon width={14} height={14} />
+										<span class="text-xs font-medium text-primary">{variant.label}</span>
+									</button>
+								{/each}
+							</div>
+						{/if}
+					{:else}
+						<button
+							use:melt={$item}
+							class={rowClass}
+							onfocusin={() => (activeKey = option.key)}
+							onpointerenter={() => (activeKey = option.key)}
+							onclick={() => option.onSelect()}
+						>
+							{@render rowBody(option, ac)}
+						</button>
+					{/if}
+				{/each}
+
+				<!-- bottom import section: one entry whose submenu imports any artifact -->
+				<div class="mx-1 my-1 border-t border-gray-200 dark:border-gray-700"></div>
+				<button
+					use:melt={$importSubTrigger}
+					class="w-full flex flex-row items-center gap-2.5 rounded-md px-2 py-1.5 text-left cursor-pointer transition-colors focus:outline-none data-[highlighted]:bg-surface-hover hover:bg-surface-hover"
+				>
+					<div
+						class="w-6 h-6 rounded-md flex items-center justify-center shrink-0 bg-gray-100 dark:bg-gray-700"
+					>
+						<Import size={14} class="text-gray-600 dark:text-gray-300" />
+					</div>
+					<span class="text-xs font-medium text-primary flex-1 min-w-0 whitespace-nowrap">
+						Import
+					</span>
+					<ChevronRight size={14} class="shrink-0 text-tertiary" />
+				</button>
+				{#if $importSubOpen}
+					<div
+						use:melt={$importSubMenu}
+						use:hugViewportRight
+						class="z-[6001] flex flex-col gap-0.5 p-1 w-52 rounded-lg border border-gray-200 dark:border-gray-700 bg-surface shadow-xl focus:outline-none"
+					>
+						{#each importActions as action (action.label)}
+							<button
+								use:melt={$item}
+								class="flex flex-row items-center gap-2.5 rounded-md px-2 py-1.5 text-left cursor-pointer transition-colors focus:outline-none data-[highlighted]:bg-surface-hover hover:bg-surface-hover"
+								onclick={() => action.onSelect()}
+							>
+								<Import size={14} class="shrink-0 text-tertiary" />
+								<span class="text-xs font-medium text-primary whitespace-nowrap">
+									{action.label}
+								</span>
+							</button>
+						{/each}
+					</div>
+				{/if}
+
+				{#if !showDoc}
+					<button
+						class="mt-1 px-2 py-1 text-left text-[10px] text-tertiary/70 hover:text-tertiary hover:underline transition-colors"
+						title="Show descriptions"
+						tabindex={-1}
+						onclick={() => setShowDoc(true)}
+					>
+						Show descriptions
+					</button>
+				{/if}
+			</div>
+		</div>
+	{/if}
+</div>
+
+<!-- shared import drawer (YAML / JSON) for the bottom "Import" submenu actions -->
+<Drawer bind:this={importDrawer} size="800px">
+	<DrawerContent title={importTitles[importKind]} on:close={() => importDrawer?.closeDrawer?.()}>
+		<Tabs bind:selected={importType}>
+			<Tab value="yaml" label="YAML" />
+			<Tab value="json" label="JSON" />
+			{#snippet content()}
+				<div class="relative pt-2 h-full">
+					{#key importType}
+						{#await import('$lib/components/SimpleEditor.svelte')}
+							<Loader2 class="animate-spin" />
+						{:then Module}
+							<Module.default
+								bind:code={importRaw}
+								lang={importType}
+								class="h-full"
+								fixedOverflowWidgets={false}
+							/>
+						{/await}
+					{/key}
+				</div>
+			{/snippet}
+		</Tabs>
+		{#snippet actions()}
+			<Button size="sm" onClick={runImport}>Import</Button>
+		{/snippet}
+	</DrawerContent>
+</Drawer>
diff --git a/frontend/src/lib/components/home/ItemsList.svelte b/frontend/src/lib/components/home/ItemsList.svelte
index 256b2277f5..49a0dc62ee 100644
--- a/frontend/src/lib/components/home/ItemsList.svelte
+++ b/frontend/src/lib/components/home/ItemsList.svelte
@@ -13,6 +13,7 @@
 		type ListableRawApp
 	} from '$lib/gen'
 	import { resource } from 'runed'
+	import { getDraftItems } from '$lib/workspaceDrafts.svelte'
 	import { userStore, workspaceStore } from '$lib/stores'
 	import type uFuzzy from '@leeoniya/ufuzzy'
 	import {
@@ -73,23 +74,44 @@
 	type TableApp = TableItem<ListableApp, 'app'>
 	type TableRawApp = TableItem<ListableRawApp, 'raw_app'>
 
-	// Folders with ≥1 pipeline script (auto_kind='pipeline'). Used by
-	// TreeView to surface a "Pipeline" entry inside those folders. Cheap
-	// thanks to the partial index on script.auto_kind.
+	// Folders that are data pipelines, surfaced as their own "Pipeline" entry
+	// (the member scripts are folded into it, not listed individually). Two
+	// sources: deployed pipelines (folders with ≥1 `auto_kind='pipeline'` script,
+	// cheap via the partial index) AND bundle-phase pipelines that only exist as a
+	// `data_pipeline` draft so far — so a pipeline shows up the moment its first
+	// node is drafted, before anything is deployed.
 	let pipelineFoldersRes = resource(
 		() => $workspaceStore,
 		async (ws) => {
 			if (!ws) return new Set<string>()
+			const folders = new Set<string>()
 			try {
-				const rows = await AssetService.listPipelineFolders({ workspace: ws })
-				return new Set(rows.map((r) => r.folder))
+				for (const r of await AssetService.listPipelineFolders({ workspace: ws }))
+					folders.add(r.folder)
 			} catch {
-				// Decorative tree entry — degrade to "no pipelines" on failure.
-				return new Set<string>()
+				// Decorative entry — degrade gracefully on failure.
 			}
+			try {
+				for (const d of await getDraftItems(ws)) {
+					if (d.kind !== 'data_pipeline') continue
+					const m = d.path.match(/^f\/([^/]+)\/data_pipeline$/)
+					if (m) folders.add(m[1])
+				}
+			} catch {
+				// Drafts unavailable — show deployed pipelines only.
+			}
+			return folders
 		}
 	)
-	let pipelineFolders = $derived(pipelineFoldersRes.current ?? new Set<string>())
+	// Folders of pipeline-member scripts present in the current listing (captured
+	// in loadScripts before they're filtered out). Unioned in so a folder whose
+	// only pipeline node is a never-deployed `// pipeline` script draft — not in
+	// listPipelineFolders (deployed-only) nor a `data_pipeline` bundle — still gets
+	// a pipeline entry instead of vanishing.
+	let pipelineMemberFolders = $state(new Set<string>())
+	let pipelineFolders = $derived(
+		new Set<string>([...(pipelineFoldersRes.current ?? []), ...pipelineMemberFolders])
+	)
 
 	let scripts: TableScript[] | undefined = $state()
 	let flows: TableFlow[] | undefined = $state()
@@ -115,12 +137,26 @@
 			withoutDescription: true
 		})
 
-		scripts = loadedScripts.map((script: Script) => {
-			return {
-				canWrite: canWrite(script.path, script.extra_perms, $userStore) && !$userStore?.operator,
-				...script
-			}
-		})
+		// Pipeline-member scripts (`auto_kind='pipeline'`) are represented by their
+		// pipeline's entry, not listed individually — but capture their folders so
+		// the pipeline entry still surfaces (incl. a members-only / draft-only folder).
+		const memberFolders = new Set<string>()
+		scripts = loadedScripts
+			.filter((script: Script) => {
+				if (script.auto_kind === 'pipeline') {
+					const m = script.path.match(/^f\/([^/]+)\//)
+					if (m) memberFolders.add(m[1])
+					return false
+				}
+				return true
+			})
+			.map((script: Script) => {
+				return {
+					canWrite: canWrite(script.path, script.extra_perms, $userStore) && !$userStore?.operator,
+					...script
+				}
+			})
+		pipelineMemberFolders = memberFolders
 		loading = false
 	}
 
@@ -239,13 +275,32 @@
 	const INCLUDE_WITHOUT_MAIN_SETTING_NAME = 'includeWithoutMain'
 	let treeView = $state(getLocalSetting(TREE_VIEW_SETTING_NAME) == 'true')
 	let filterUserFoldersType: 'only f/*' | 'u/username and f/*' | undefined = $derived(
-		$userStore?.is_super_admin && $userStore.username.includes('@')
+		$userStore?.non_member
 			? 'only f/*'
 			: $userStore?.is_admin || $userStore?.is_super_admin
 				? 'u/username and f/*'
 				: undefined
 	)
 	let filterUserFolders = $state(getLocalSetting(FILTER_USER_FOLDER_SETTING_NAME) == 'true')
+
+	// Pipeline entries are rendered independently of the item list, so apply the
+	// same gates the items get — otherwise a pipeline would still show under the
+	// Flows/Apps tabs, in the archived view, under a label filter, or outside a
+	// selected owner. Pipelines are script-based units always at `f/<folder>`, so
+	// kind=script and the user-folder toggle always include them; kind=flow/app,
+	// archived, a label filter (pipelines carry no labels), and a non-matching
+	// owner exclude them.
+	let visiblePipelineFolders = $derived.by(() => {
+		if (archived) return new Set<string>()
+		if (itemKind !== 'all' && itemKind !== 'script') return new Set<string>()
+		if (labelFilter != undefined) return new Set<string>()
+		if (ownerFilter == undefined) return pipelineFolders
+		return new Set(
+			[...pipelineFolders].filter(
+				(f) => `f/${f}` === ownerFilter || `f/${f}`.startsWith(ownerFilter + '/')
+			)
+		)
+	})
 	let includeWithoutMain = $state(
 		getLocalSetting(INCLUDE_WITHOUT_MAIN_SETTING_NAME)
 			? getLocalSetting(INCLUDE_WITHOUT_MAIN_SETTING_NAME) == 'true'
@@ -506,7 +561,8 @@
 		if (menuItem) {
 			if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
 				const menu = menuItem.closest<HTMLElement>('[role="menu"]')
-				if (menu) {
+				// menus marked data-arrow-loop keep melt's cyclic wrap instead of exiting
+				if (menu && !menu.hasAttribute('data-arrow-loop')) {
 					const items = Array.from(menu.querySelectorAll<HTMLElement>('[role="menuitem"]'))
 					const idx = items.indexOf(menuItem)
 					const isFirst = idx === 0
@@ -825,14 +881,17 @@
 			{#each new Array(6) as _}
 				<Skeleton layout={[[4], 0.5]} />
 			{/each}
-		{:else if filteredItems.length === 0}
+		{:else if filteredItems.length === 0 && (filter !== '' || visiblePipelineFolders.size === 0)}
+			<!-- Pipelines aren't part of the text filter, so only fall through to show
+			     them (list rows / injected tree folders) when not actively searching;
+			     a no-match search still reads as empty. -->
 			<NoItemFound hasFilters={filter !== '' || archived || filterUserFolders} />
 		{:else if treeView}
 			<TreeViewRoot
 				{items}
 				{nbDisplayed}
 				{collapseAll}
-				{pipelineFolders}
+				pipelineFolders={visiblePipelineFolders}
 				isSearching={filter !== ''}
 				on:scriptChanged={() => loadScripts(includeWithoutMain)}
 				on:flowChanged={loadFlows}
@@ -849,7 +908,7 @@
 		{:else}
 			<div class="border rounded-md bg-surface-tertiary">
 				{#if filter === ''}
-					{#each [...pipelineFolders].sort() as folder (folder)}
+					{#each [...visiblePipelineFolders].sort() as folder (folder)}
 						<a
 							href="{base}/pipeline/{encodeURIComponent(folder)}"
 							class="w-full inline-flex items-center gap-4 px-4 py-3 border-b last:border-b-0 hover:bg-surface-hover transition-colors text-sm first-of-type:rounded-t-md"
diff --git a/frontend/src/lib/components/home/TreeView.svelte b/frontend/src/lib/components/home/TreeView.svelte
index 3ee1b3c1b4..aa8a3d2b14 100644
--- a/frontend/src/lib/components/home/TreeView.svelte
+++ b/frontend/src/lib/components/home/TreeView.svelte
@@ -27,8 +27,14 @@
 	}: Props = $props()
 
 	const isFolderItem = (i: typeof item): i is FolderItem => i && 'folderName' in i
+	// Hidden while searching: pipelines aren't part of the text filter (the list
+	// view hides their rows on a query too), so a folder matching the search
+	// shouldn't surface an unrelated Pipeline row.
 	let hasPipeline = $derived(
-		depth === 0 && isFolderItem(item) && (pipelineFolders?.has(item.folderName) ?? false)
+		depth === 0 &&
+			!isSearching &&
+			isFolderItem(item) &&
+			(pipelineFolders?.has(item.folderName) ?? false)
 	)
 
 	const isFolder = isFolderItem
diff --git a/frontend/src/lib/components/home/TreeViewRoot.svelte b/frontend/src/lib/components/home/TreeViewRoot.svelte
index 59adf1aaa9..ef5cf25d58 100644
--- a/frontend/src/lib/components/home/TreeViewRoot.svelte
+++ b/frontend/src/lib/components/home/TreeViewRoot.svelte
@@ -24,7 +24,42 @@
 	let groupedItems: ReturnType<typeof groupItems> | 'loading' = $state('loading')
 	$effect(() => {
 		items
-		untrack(() => (groupedItems = groupItems(items)))
+		pipelineFolders
+		isSearching
+		untrack(() => {
+			const grouped = groupItems(items)
+			// Ensure every pipeline folder is present at the top level so its
+			// "Pipeline" entry shows even when it has no listed items — a bundle-phase
+			// pipeline (only a draft so far) or a folder whose only scripts are
+			// pipeline members (folded into the pipeline, hidden from the list).
+			// Skip while searching: pipelines aren't part of the text filter (list view
+			// hides them on `filter !== ''`), so injecting them would surface unrelated
+			// folders in the results.
+			if (!isSearching) {
+				const present = new Set(
+					grouped
+						.filter((g) => 'folderName' in g)
+						.map((g) => (g as { folderName: string }).folderName)
+				)
+				// Insert each missing pipeline folder among the existing folders in name
+				// order — `groupItems` already sorts user groups first then folders
+				// alphabetically, so inserting before the first greater-named folder
+				// keeps that ordering (rather than prepending out of order).
+				for (const folderName of [...(pipelineFolders ?? [])]
+					.filter((f) => !present.has(f))
+					.sort()) {
+					const item = { folderName, items: [] }
+					const idx = grouped.findIndex(
+						(g) =>
+							'folderName' in g &&
+							(g as { folderName: string }).folderName.localeCompare(folderName) > 0
+					)
+					if (idx < 0) grouped.push(item)
+					else grouped.splice(idx, 0, item)
+				}
+			}
+			groupedItems = grouped
+		})
 	})
 </script>
 
diff --git a/frontend/src/lib/components/icons/WhatsappBusinessIcon.svelte b/frontend/src/lib/components/icons/WhatsappBusinessIcon.svelte
new file mode 100644
index 0000000000..fc9c2843ec
--- /dev/null
+++ b/frontend/src/lib/components/icons/WhatsappBusinessIcon.svelte
@@ -0,0 +1,20 @@
+<script lang="ts">
+	interface Props {
+		height?: string;
+		width?: string;
+	}
+
+	let { height = '24px', width = '24px' }: Props = $props();
+</script>
+
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	{width}
+	{height}
+	viewBox="0 0 24 24"
+	style="fill:currentcolor;"
+>
+	<path
+		d="M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.075-.297-.15-1.255-.463-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.52.149-.174.198-.298.298-.497.099-.198.05-.371-.025-.52-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51-.173-.008-.371-.01-.57-.01-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479 0 1.462 1.065 2.875 1.213 3.074.149.198 2.096 3.2 5.077 4.487.709.306 1.262.489 1.694.625.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.289.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 0 1-5.031-1.378l-.361-.214-3.741.982.998-3.648-.235-.374a9.86 9.86 0 0 1-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.825 9.825 0 0 1 2.893 6.994c-.003 5.45-4.437 9.884-9.885 9.884m8.413-18.297A11.815 11.815 0 0 0 12.05 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.882 11.882 0 0 0 5.683 1.448h.005c6.554 0 11.89-5.335 11.893-11.893a11.821 11.821 0 0 0-3.48-8.413Z"
+	/>
+</svg>
diff --git a/frontend/src/lib/components/icons/fileIcon.ts b/frontend/src/lib/components/icons/fileIcon.ts
new file mode 100644
index 0000000000..fef893e398
--- /dev/null
+++ b/frontend/src/lib/components/icons/fileIcon.ts
@@ -0,0 +1,74 @@
+/**
+ * Resolve a file name (or relative path) to an icon by extension. Shared by the
+ * raw-app file tree and the AI-chat file attachments so both stay consistent.
+ */
+import { File, ImageIcon } from 'lucide-svelte'
+import TypeScript from '../common/languageIcons/TypeScript.svelte'
+import JavaScriptIcon from './JavaScriptIcon.svelte'
+import JsonIcon from './JsonIcon.svelte'
+import ReactIcon from './ReactIcon.svelte'
+import SvelteIcon from './SvelteIcon.svelte'
+import VueIcon from './VueIcon.svelte'
+import CssIcon from './CssIcon.svelte'
+import SassIcon from './SassIcon.svelte'
+import LessIcon from './LessIcon.svelte'
+import HtmlIcon from './HtmlIcon.svelte'
+import MarkdownIcon from './MarkdownIcon.svelte'
+import YamlIcon from './YamlIcon.svelte'
+
+export interface ResolvedFileIcon {
+	icon: any
+	className?: string
+}
+
+/** Lowercased extension of a file name or path (basename only); '' if none. */
+export function getFileExtension(filename: string): string {
+	const base = filename.split('/').pop() ?? filename
+	const parts = base.split('.')
+	return parts.length > 1 ? parts[parts.length - 1].toLowerCase() : ''
+}
+
+/** Icon (and optional color class) for a file, by extension. */
+export function getFileIcon(filename: string): ResolvedFileIcon {
+	switch (getFileExtension(filename)) {
+		case 'json':
+			return { icon: JsonIcon }
+		case 'tsx':
+		case 'jsx':
+			return { icon: ReactIcon }
+		case 'ts':
+			return { icon: TypeScript }
+		case 'js':
+			return { icon: JavaScriptIcon }
+		case 'svelte':
+			return { icon: SvelteIcon }
+		case 'vue':
+			return { icon: VueIcon }
+		case 'css':
+			return { icon: CssIcon }
+		case 'scss':
+		case 'sass':
+			return { icon: SassIcon }
+		case 'less':
+			return { icon: LessIcon }
+		case 'png':
+		case 'jpg':
+		case 'jpeg':
+		case 'gif':
+		case 'svg':
+		case 'webp':
+		case 'ico':
+			return { icon: ImageIcon, className: 'text-purple-500' }
+		case 'html':
+		case 'htm':
+			return { icon: HtmlIcon }
+		case 'md':
+		case 'markdown':
+			return { icon: MarkdownIcon }
+		case 'yaml':
+		case 'yml':
+			return { icon: YamlIcon }
+		default:
+			return { icon: File, className: 'text-tertiary' }
+	}
+}
diff --git a/frontend/src/lib/components/icons/index.ts b/frontend/src/lib/components/icons/index.ts
index 9c4a70c041..b39df4310e 100644
--- a/frontend/src/lib/components/icons/index.ts
+++ b/frontend/src/lib/components/icons/index.ts
@@ -185,6 +185,7 @@ import TwitchIcon from './TwitchIcon.svelte'
 import TwitterIcon from './TwitterIcon.svelte'
 import VercelIcon from './VercelIcon.svelte'
 import WebflowIcon from './WebflowIcon.svelte'
+import WhatsappBusinessIcon from './WhatsappBusinessIcon.svelte'
 import WooCommerceIcon from './WooCommerceIcon.svelte'
 import WordpressIcon from './WordpressIcon.svelte'
 import XataIcon from './XataIcon.svelte'
@@ -413,6 +414,7 @@ export const APP_TO_ICON_COMPONENT = {
 	twitter: TwitterIcon,
 	vercel: VercelIcon,
 	webflow: WebflowIcon,
+	whatsapp_business: WhatsappBusinessIcon,
 	woocommerce: WooCommerceIcon,
 	wordpress: WordpressIcon,
 	xata: XataIcon,
diff --git a/frontend/src/lib/components/instanceSettings.ts b/frontend/src/lib/components/instanceSettings.ts
index 72ccbeca2b..81a7b841b7 100644
--- a/frontend/src/lib/components/instanceSettings.ts
+++ b/frontend/src/lib/components/instanceSettings.ts
@@ -443,7 +443,7 @@ export const settings: Record<string, Setting[]> = {
 		{
 			label: 'Store audit logs in object storage',
 			description:
-				'When enabled and instance object storage is configured, audit logs are also exported as newline-delimited JSON to the dedicated logs/audit/ folder (partitioned by day). Export is incremental and runs off the hot path. Pre-existing history is not backfilled: export starts from when the setting is enabled (transactions in flight at that moment may include a bounded set of just-prior rows). No audit log committed after enabling is ever skipped.',
+				'When enabled and instance object storage is configured, audit logs are also exported as newline-delimited JSON to the dedicated logs/audit/ folder (partitioned by day). Export is incremental and runs off the hot path. Enabling (or re-enabling) anchors the export at ~now: while it stays enabled, every audit log committed from that point on is exported (transactions in flight at the moment of enabling may include a bounded set of just-prior rows). Pre-existing history, and any window during which export was disabled, are NOT exported by this cursor — use the opt-in backfill API to export a chosen historical range, back to when audit-log partitioning was introduced (older rows in the legacy audit table are not exported, and a window overlapping them is rejected): POST /settings/audit_logs_s3_backfill {from, to} (status at GET /settings/audit_logs_s3_backfill_status).',
 			key: 'store_audit_logs_s3',
 			fieldType: 'boolean',
 			storage: 'setting',
diff --git a/frontend/src/lib/components/instanceSettings/DbHealth.svelte b/frontend/src/lib/components/instanceSettings/DbHealth.svelte
index b1a16bdad5..647c4390d8 100644
--- a/frontend/src/lib/components/instanceSettings/DbHealth.svelte
+++ b/frontend/src/lib/components/instanceSettings/DbHealth.svelte
@@ -289,6 +289,11 @@
 						<p class="text-secondary">
 							Total connections: <strong>{data.connection_pool.pg_total_connections}</strong> / Max:
 							<strong>{data.connection_pool.pg_max_connections}</strong>
+							{#if data.connection_pool.pg_superuser_reserved_connections > 0}
+								<span class="text-tertiary"
+									>({data.connection_pool.pg_superuser_reserved_connections} reserved for superuser)</span
+								>
+							{/if}
 						</p>
 						<p class="text-secondary">
 							Active: <strong>{data.connection_pool.pg_active_connections}</strong>
@@ -297,6 +302,67 @@
 						<p class="{statusColor(data.connection_pool.status)} mt-1 font-medium">
 							{data.connection_pool.message}
 						</p>
+
+						{#if data.connection_pool.sizing}
+							{@const sizing = data.connection_pool.sizing}
+							{@const undersized =
+								sizing.recommended_max_connections > data.connection_pool.pg_max_connections}
+							<div class="bg-surface-secondary mt-2 flex flex-col gap-2 rounded p-2">
+								<p class="text-secondary font-semibold">Connection sizing guidance</p>
+								<div class="grid grid-cols-2 gap-x-6 gap-y-1">
+									<span class="text-tertiary">Live worker instances</span>
+									<span class="text-primary text-right font-medium"
+										>{formatNumber(sizing.live_worker_instances)}</span
+									>
+									<span class="text-tertiary">Live workers</span>
+									<span class="text-primary text-right font-medium"
+										>{formatNumber(sizing.live_workers)}</span
+									>
+									{#if sizing.live_agent_workers > 0}
+										<span class="text-tertiary">Agent workers (HTTP, excluded)</span>
+										<span class="text-primary text-right font-medium"
+											>{formatNumber(sizing.live_agent_workers)}</span
+										>
+									{/if}
+									<span class="text-tertiary">Est. peak worker connections</span>
+									<span class="text-primary text-right font-medium"
+										>{formatNumber(sizing.estimated_worker_connections)}</span
+									>
+									<span class="text-tertiary"
+										>Per-server pool {sizing.database_connections_override != null
+											? '(DATABASE_CONNECTIONS)'
+											: '(default)'}</span
+									>
+									<span class="text-primary text-right font-medium"
+										>{formatNumber(sizing.server_pool_size)}</span
+									>
+									<span class="text-tertiary"
+										>Per-worker-instance pool {sizing.database_connections_override != null
+											? '(DATABASE_CONNECTIONS)'
+											: '(default)'}</span
+									>
+									<span class="text-primary text-right font-medium"
+										>{formatNumber(sizing.worker_pool_size)}</span
+									>
+									<span class="text-tertiary">Recommended max_connections</span>
+									<span
+										class="text-right font-semibold {undersized
+											? 'text-yellow-600 dark:text-yellow-400'
+											: 'text-green-600 dark:text-green-400'}"
+										>≥ {formatNumber(sizing.recommended_max_connections)}</span
+									>
+								</div>
+								<p class="text-tertiary leading-relaxed">{sizing.message}</p>
+								{#if undersized}
+									<p class="font-medium text-yellow-600 dark:text-yellow-400">
+										Current max_connections ({formatNumber(
+											data.connection_pool.pg_max_connections
+										)}) is below the recommended floor for a single server. Increase max_connections
+										or lower per-process pools via DATABASE_CONNECTIONS.
+									</p>
+								{/if}
+							</div>
+						{/if}
 					</div>
 				{/if}
 			</section>
diff --git a/frontend/src/lib/components/instanceSettings/SettingCard.svelte b/frontend/src/lib/components/instanceSettings/SettingCard.svelte
index 892a3c0d62..96a1244cce 100644
--- a/frontend/src/lib/components/instanceSettings/SettingCard.svelte
+++ b/frontend/src/lib/components/instanceSettings/SettingCard.svelte
@@ -19,6 +19,7 @@
 		}
 		values?: Record<string, any>
 		children: import('svelte').Snippet
+		headerAction?: import('svelte').Snippet
 		class?: string
 	}
 
@@ -31,6 +32,7 @@
 		actionButton,
 		values,
 		children,
+		headerAction,
 		class: clazz
 	}: Props = $props()
 </script>
@@ -54,7 +56,9 @@
 					<Tooltip>{tooltip}</Tooltip>
 				{/if}
 			</div>
-			{#if actionButton}
+			{#if headerAction}
+				{@render headerAction()}
+			{:else if actionButton}
 				<Button
 					disabled={ee_only != undefined && !$enterpriseLicense}
 					variant={actionButton.variant ?? 'default'}
diff --git a/frontend/src/lib/components/instanceSettings/SmtpSettings.svelte b/frontend/src/lib/components/instanceSettings/SmtpSettings.svelte
index c297b1a32f..f7607c5d6c 100644
--- a/frontend/src/lib/components/instanceSettings/SmtpSettings.svelte
+++ b/frontend/src/lib/components/instanceSettings/SmtpSettings.svelte
@@ -5,10 +5,6 @@
 			smtpSettings.smtp_host &&
 			smtpSettings.smtp_host.trim() !== '' &&
 			smtpSettings.smtp_port &&
-			smtpSettings.smtp_username &&
-			smtpSettings.smtp_username.trim() !== '' &&
-			smtpSettings.smtp_password &&
-			smtpSettings.smtp_password.trim() !== '' &&
 			smtpSettings.smtp_from &&
 			smtpSettings.smtp_from.trim() !== ''
 		)
diff --git a/frontend/src/lib/components/markdownPlugins.ts b/frontend/src/lib/components/markdownPlugins.ts
index 4495619868..da403aebe0 100644
--- a/frontend/src/lib/components/markdownPlugins.ts
+++ b/frontend/src/lib/components/markdownPlugins.ts
@@ -3,6 +3,7 @@ import { gfmPlugin } from 'svelte-exmarkdown/gfm'
 import rehypeRaw from 'rehype-raw'
 import rehypeSanitize from 'rehype-sanitize'
 import { rehypeGithubAlerts } from 'rehype-github-alerts'
+import MarkdownCodeBlock from './MarkdownCodeBlock.svelte'
 
 /**
  * Shared plugin chain for rendering user-supplied Markdown (script/flow/resource
@@ -19,6 +20,11 @@ import { rehypeGithubAlerts } from 'rehype-github-alerts'
  *                            injects (including inline SVG icons) is preserved
  *                            without having to allowlist SVG for user input.
  *
+ * The `pre` renderer gives fenced code blocks syntax highlighting, a copy
+ * button, and a subtle scrollbar everywhere this chain is used. It reads the
+ * `language-*` class rehypeSanitize preserves on `<code>`; it highlights code as
+ * escaped text and never renders mermaid on untrusted input (chat opts in).
+ *
  * Any Markdown sink that renders user input MUST use this chain rather than
  * assembling its own `rehypeRaw` pipeline.
  */
@@ -26,5 +32,6 @@ export const markdownPlugins: Plugin[] = [
 	gfmPlugin(),
 	{ rehypePlugin: [rehypeRaw] },
 	{ rehypePlugin: [rehypeSanitize] },
-	{ rehypePlugin: [rehypeGithubAlerts] }
+	{ rehypePlugin: [rehypeGithubAlerts] },
+	{ renderer: { pre: MarkdownCodeBlock } }
 ]
diff --git a/frontend/src/lib/components/meltComponents/Menu.svelte b/frontend/src/lib/components/meltComponents/Menu.svelte
index 879df7bc2c..a7a4463706 100644
--- a/frontend/src/lib/components/meltComponents/Menu.svelte
+++ b/frontend/src/lib/components/meltComponents/Menu.svelte
@@ -3,6 +3,7 @@
 	import { createBubbler } from 'svelte/legacy'
 
 	const bubble = createBubbler()
+	import { placementFly } from '$lib/utils/placementFly'
 	import { melt, createSync } from '@melt-ui/svelte'
 	import type { MenubarBuilders } from '@melt-ui/svelte'
 	import type { Placement } from '@floating-ui/core'
@@ -24,6 +25,11 @@
 		menuClass?: string
 		open?: boolean
 		renderContent?: boolean
+		// Move the scroll/overflow onto an inner wrapper instead of the melt element. The
+		// melt element is the fixed-positioned containing block for any submenu, so overflow
+		// on it clips submenus that open to the side. Opt in only when using a submenu — the
+		// default keeps the existing single-element markup untouched for every other menu.
+		submenuSafe?: boolean
 		classNames?: string
 		triggr?: import('svelte').Snippet<[any]>
 		children?: import('svelte').Snippet<[any]>
@@ -42,6 +48,7 @@
 		menuClass = '',
 		open = $bindable(false),
 		renderContent = false,
+		submenuSafe = false,
 		class: classNames = '',
 		triggr,
 		children
@@ -54,12 +61,21 @@
 			fitViewport: true,
 			strategy: 'fixed'
 		},
-		loop: true
+		loop: true,
+		// Hover tooltips (e.g. NameIdTooltip on menu rows) portal to body, so a
+		// click inside one — like its copy button — registers as an outside click.
+		// Veto the close so interacting with a tooltip doesn't tear the menu down.
+		onOutsideClick: (e) => {
+			if ((e.target as HTMLElement)?.closest?.('[data-melt-tooltip-content]')) {
+				e.preventDefault()
+			}
+		}
 	})
 
 	//Melt
 	const {
 		elements: { trigger, menu: menuElement, item },
+		builders,
 		states
 	} = menu
 
@@ -74,7 +90,11 @@
 	}
 
 	async function getMenuElements(): Promise<HTMLElement[]> {
-		return Array.from(document.querySelectorAll('[data-menu]')) as HTMLElement[]
+		// Tooltip content counts as menu territory for the same reason as the
+		// onOutsideClick veto above.
+		return Array.from(
+			document.querySelectorAll('[data-menu], [data-melt-tooltip-content]')
+		) as HTMLElement[]
 	}
 </script>
 
@@ -105,16 +125,23 @@
 		<div
 			use:melt={$menuElement}
 			data-menu
+			transition:placementFly={{ duration: 100, placement }}
 			class={twMerge(
-				'z-[6000] border w-56 origin-top-right rounded-md shadow-md focus:outline-none overflow-y-auto',
+				'z-[6000] border w-56 origin-top-right rounded-md shadow-md focus:outline-none',
+				// Default: scroll on the melt element. submenuSafe moves it to the inner
+				// wrapper so a side-opening submenu isn't clipped by this element's overflow.
+				submenuSafe ? '' : 'overflow-y-auto',
 				lightMode ? 'bg-surface-inverse' : 'bg-surface',
 				invisible ? 'opacity-0' : '',
 				menuClass
 			)}
 			onclick={bubble('click')}
 		>
-			<div class="py-1" style="max-height: {maxHeight}px; ">
-				{@render children?.({ item, open })}
+			<div
+				class={twMerge('py-1', submenuSafe ? 'overflow-y-auto' : '')}
+				style="max-height: min({maxHeight}px, calc(100vh - 6rem)); "
+			>
+				{@render children?.({ item, open, builders })}
 			</div>
 		</div>
 	{/if}
diff --git a/frontend/src/lib/components/meltComponents/MenuItemWrapper.svelte b/frontend/src/lib/components/meltComponents/MenuItemWrapper.svelte
new file mode 100644
index 0000000000..02557abb71
--- /dev/null
+++ b/frontend/src/lib/components/meltComponents/MenuItemWrapper.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+	import { melt } from '@melt-ui/svelte'
+	import type { MenubarMenuElements } from '@melt-ui/svelte'
+
+	// Registers arbitrary content (not just a button/link, unlike MenuItem) as a melt menu
+	// item, so it participates in the menu's roving focus/highlight. Useful for custom rows
+	// that contain their own interactive controls (e.g. a slider).
+	interface Props {
+		item: MenubarMenuElements['item']
+		class?: string | undefined
+		onClick?: (event: MouseEvent) => void
+		onKeydown?: (event: KeyboardEvent) => void
+		children?: import('svelte').Snippet
+	}
+
+	let { item, class: className = undefined, onClick, onKeydown, children }: Props = $props()
+</script>
+
+<div
+	use:melt={$item}
+	role="menuitem"
+	tabindex="-1"
+	class={className}
+	onclick={onClick}
+	onkeydown={onKeydown}
+>
+	{@render children?.()}
+</div>
diff --git a/frontend/src/lib/components/meltComponents/Popover.svelte b/frontend/src/lib/components/meltComponents/Popover.svelte
index 87d5ff3f83..884dc35c5e 100644
--- a/frontend/src/lib/components/meltComponents/Popover.svelte
+++ b/frontend/src/lib/components/meltComponents/Popover.svelte
@@ -11,7 +11,7 @@
 
 	const bubble = createBubbler()
 	import { createPopover, createSync, melt } from '@melt-ui/svelte'
-	import { fly } from 'svelte/transition'
+	import { placementFly } from '$lib/utils/placementFly'
 	import { X, Minimize2, Maximize2 } from 'lucide-svelte'
 	import type { Placement } from '@floating-ui/core'
 	import { debounce, pointerDownOutside } from '$lib/utils'
@@ -264,7 +264,7 @@
 		}}
 		onmouseleave={debounceClose}
 		use:melt={$_content}
-		transition:fly={{ duration: enableFlyTransition ? 100 : 0, y: -16 }}
+		transition:placementFly={{ duration: enableFlyTransition ? 100 : 0, placement }}
 		class={twMerge(
 			'relative dark:border rounded-md bg-surface-tertiary shadow-lg',
 			fullScreen
diff --git a/frontend/src/lib/components/meltComponents/Tooltip.svelte b/frontend/src/lib/components/meltComponents/Tooltip.svelte
index 86b0d948fd..68dd81226c 100644
--- a/frontend/src/lib/components/meltComponents/Tooltip.svelte
+++ b/frontend/src/lib/components/meltComponents/Tooltip.svelte
@@ -20,6 +20,10 @@
 		customBgClass?: string | undefined
 		style?: string
 		class?: string
+		// 'cursor' anchors the popup to the pointer position where hover started,
+		// instead of the trigger element's box. Useful for wide/full-width triggers
+		// where an element-anchored tooltip lands far from the cursor.
+		anchor?: 'element' | 'cursor'
 		children?: import('svelte').Snippet
 		text?: import('svelte').Snippet
 	}
@@ -36,6 +40,7 @@
 		customBgClass = undefined,
 		style = '',
 		class: className = '',
+		anchor = 'element',
 		children,
 		text
 	}: Props = $props()
@@ -52,9 +57,55 @@
 		group: true,
 		portal: untrack(() => portal)
 	})
+
+	// Cursor anchoring: floating-ui positions against `reference.getBoundingClientRect()`.
+	// melt uses the trigger element as that reference, so we override its rect to a
+	// zero-size box at the pointer. The coords are frozen while the tooltip is open so
+	// it stays put (letting the pointer travel into the popup to reach the copy button);
+	// they only track the pointer while closed, capturing where the next open will land.
+	let triggerEl = $state<HTMLElement | undefined>(undefined)
+	let cursorX = 0
+	let cursorY = 0
+	// Until a pointer is seen, fall back to the element rect so keyboard-focus opens
+	// don't land the popup at (0, 0).
+	let hasCursor = false
+	$effect(() => {
+		if (anchor !== 'cursor' || !triggerEl) return
+		const el = triggerEl
+		// Listeners added imperatively (not `onpointermove` attrs) so the static span
+		// keeps no interaction handlers, avoiding an a11y_no_static_element warning.
+		const track = (e: PointerEvent) => {
+			if ($open) return
+			cursorX = e.clientX
+			cursorY = e.clientY
+			hasCursor = true
+		}
+		el.addEventListener('pointerenter', track)
+		el.addEventListener('pointermove', track)
+		const original = el.getBoundingClientRect.bind(el)
+		el.getBoundingClientRect = () =>
+			hasCursor
+				? ({
+						width: 0,
+						height: 0,
+						x: cursorX,
+						y: cursorY,
+						top: cursorY,
+						left: cursorX,
+						right: cursorX,
+						bottom: cursorY,
+						toJSON() {}
+					} as DOMRect)
+				: original()
+		return () => {
+			el.removeEventListener('pointerenter', track)
+			el.removeEventListener('pointermove', track)
+			el.getBoundingClientRect = original
+		}
+	})
 </script>
 
-<span class={className} {style} use:melt={$trigger}>
+<span bind:this={triggerEl} class={className} {style} use:melt={$trigger}>
 	{@render children?.()}
 </span>
 {#if !children}
diff --git a/frontend/src/lib/components/raw_apps/DefaultDatabaseSelector.svelte b/frontend/src/lib/components/raw_apps/DefaultDatabaseSelector.svelte
index 9e91ef55d0..66e3ab0355 100644
--- a/frontend/src/lib/components/raw_apps/DefaultDatabaseSelector.svelte
+++ b/frontend/src/lib/components/raw_apps/DefaultDatabaseSelector.svelte
@@ -10,6 +10,10 @@
 		toSchemaItems
 	} from './datatableUtils.svelte'
 	import { Button } from '../common'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
 
 	interface Props {
 		/** Currently selected datatable */
@@ -30,8 +34,11 @@
 	}: Props = $props()
 
 	// Load available datatables and schemas using shared utilities
-	const datatables = createDatatablesResource(() => $workspaceStore)
-	const schemas = createSchemasResource(() => datatable)
+	const datatables = createDatatablesResource(() => opWs)
+	const schemas = createSchemasResource(
+		() => datatable,
+		() => opWs
+	)
 
 	const datatableItems = $derived(toDatatableItems(datatables.current))
 	const schemaItems = $derived(toSchemaItems(schemas.current))
@@ -49,47 +56,43 @@
 
 <Popover>
 	{#snippet trigger()}
-	
-			<Button
-				title="Configure default datatable & schema"
-				unifiedSize="xs"
-				variant="subtle"
-				nonCaptureEvent
-				btnClasses="px-1"
-			>
-				<Settings size={12} />
-			</Button>
-		
+		<Button
+			title="Configure default datatable & schema"
+			unifiedSize="xs"
+			variant="subtle"
+			nonCaptureEvent
+			btnClasses="px-1"
+		>
+			<Settings size={12} />
+		</Button>
 	{/snippet}
 	{#snippet content()}
-	
-			<div class="flex flex-col gap-3 p-4 min-w-64 max-w-80">
-				<div class="text-xs font-medium text-primary">Default Datatable & Schema</div>
+		<div class="flex flex-col gap-3 p-4 min-w-64 max-w-80">
+			<div class="text-xs font-medium text-primary">Default Datatable & Schema</div>
 
-				<p class="text-2xs text-tertiary leading-relaxed">
-					{description}
-				</p>
+			<p class="text-2xs text-tertiary leading-relaxed">
+				{description}
+			</p>
 
-				<div class="flex flex-col gap-1">
-					<span class="text-2xs text-tertiary">Database</span>
-					<Select
-						items={datatableItems}
-						bind:value={() => datatable, (v) => onChange?.(v, schema)}
-						placeholder="Select database"
-						size="sm"
-					/>
-				</div>
-
-				<div class="flex flex-col gap-1">
-					<span class="text-2xs text-tertiary">Schema</span>
-					<Select
-						items={schemaItems}
-						bind:value={() => schema ?? '', (v) => onChange?.(datatable, v || undefined)}
-						placeholder="public"
-						size="sm"
-					/>
-				</div>
+			<div class="flex flex-col gap-1">
+				<span class="text-2xs text-tertiary">Database</span>
+				<Select
+					items={datatableItems}
+					bind:value={() => datatable, (v) => onChange?.(v, schema)}
+					placeholder="Select database"
+					size="sm"
+				/>
 			</div>
-		
+
+			<div class="flex flex-col gap-1">
+				<span class="text-2xs text-tertiary">Schema</span>
+				<Select
+					items={schemaItems}
+					bind:value={() => schema ?? '', (v) => onChange?.(datatable, v || undefined)}
+					placeholder="public"
+					size="sm"
+				/>
+			</div>
+		</div>
 	{/snippet}
 </Popover>
diff --git a/frontend/src/lib/components/raw_apps/FileIcon.svelte b/frontend/src/lib/components/raw_apps/FileIcon.svelte
new file mode 100644
index 0000000000..10ff3f4868
--- /dev/null
+++ b/frontend/src/lib/components/raw_apps/FileIcon.svelte
@@ -0,0 +1,88 @@
+<!--
+@component
+Icon for a file (or folder) chosen from its extension. Single source of truth
+for raw-app file icons — used by the file tree (FileTreeNode) and the fork-diff
+rows (via RowIcon). Pass a bare name or a full path; the extension is taken from
+the last path segment. Falls back to a generic file icon.
+-->
+<script lang="ts">
+	import { File, Folder, ImageIcon } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
+	import TypeScript from '../common/languageIcons/TypeScript.svelte'
+	import JavaScriptIcon from '../icons/JavaScriptIcon.svelte'
+	import JsonIcon from '../icons/JsonIcon.svelte'
+	import ReactIcon from '../icons/ReactIcon.svelte'
+	import SvelteIcon from '../icons/SvelteIcon.svelte'
+	import VueIcon from '../icons/VueIcon.svelte'
+	import CssIcon from '../icons/CssIcon.svelte'
+	import SassIcon from '../icons/SassIcon.svelte'
+	import LessIcon from '../icons/LessIcon.svelte'
+	import HtmlIcon from '../icons/HtmlIcon.svelte'
+	import MarkdownIcon from '../icons/MarkdownIcon.svelte'
+	import YamlIcon from '../icons/YamlIcon.svelte'
+
+	interface Props {
+		/** File name or path; extension drives the icon. */
+		name: string
+		isFolder?: boolean
+		size?: number
+		class?: string
+	}
+
+	let { name, isFolder = false, size = 14, class: className = '' }: Props = $props()
+
+	function extOf(n: string): string {
+		const base = n.split('/').pop() ?? n
+		return base.includes('.') ? (base.split('.').pop() ?? '').toLowerCase() : ''
+	}
+
+	const spec = $derived.by(() => {
+		if (isFolder) return { icon: Folder, className: 'text-secondary' }
+		switch (extOf(name)) {
+			case 'json':
+				return { icon: JsonIcon, className: '' }
+			case 'tsx':
+			case 'jsx':
+				return { icon: ReactIcon, className: '' }
+			case 'ts':
+				return { icon: TypeScript, className: '' }
+			case 'js':
+				return { icon: JavaScriptIcon, className: '' }
+			case 'svelte':
+				return { icon: SvelteIcon, className: '' }
+			case 'vue':
+				return { icon: VueIcon, className: '' }
+			case 'css':
+				return { icon: CssIcon, className: '' }
+			case 'scss':
+			case 'sass':
+				return { icon: SassIcon, className: '' }
+			case 'less':
+				return { icon: LessIcon, className: '' }
+			case 'png':
+			case 'jpg':
+			case 'jpeg':
+			case 'gif':
+			case 'svg':
+			case 'webp':
+			case 'ico':
+				return { icon: ImageIcon, className: 'text-purple-500' }
+			case 'html':
+			case 'htm':
+				return { icon: HtmlIcon, className: '' }
+			case 'md':
+			case 'markdown':
+				return { icon: MarkdownIcon, className: '' }
+			case 'yaml':
+			case 'yml':
+				return { icon: YamlIcon, className: '' }
+			default:
+				return { icon: File, className: 'text-tertiary' }
+		}
+	})
+</script>
+
+{#if spec}
+	{@const Icon = spec.icon}
+	<Icon {size} class={twMerge('flex-shrink-0', spec.className, className)} />
+{/if}
diff --git a/frontend/src/lib/components/raw_apps/FileTreeNode.svelte b/frontend/src/lib/components/raw_apps/FileTreeNode.svelte
index 9819ed8796..3d428b9aaf 100644
--- a/frontend/src/lib/components/raw_apps/FileTreeNode.svelte
+++ b/frontend/src/lib/components/raw_apps/FileTreeNode.svelte
@@ -1,32 +1,11 @@
 <script lang="ts">
-	import {
-		ChevronRight,
-		ChevronDown,
-		File,
-		Folder,
-		Pencil,
-		Trash2,
-		Lock,
-		Ellipsis,
-		ImageIcon
-	} from 'lucide-svelte'
+	import { ChevronRight, ChevronDown, Folder, Pencil, Trash2, Lock, Ellipsis } from 'lucide-svelte'
 	import Self from './FileTreeNode.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import DropdownV2 from '../DropdownV2.svelte'
 	import { Button } from '../common'
 	import TextInput from '../text_input/TextInput.svelte'
-	import TypeScript from '../common/languageIcons/TypeScript.svelte'
-	import JavaScriptIcon from '../icons/JavaScriptIcon.svelte'
-	import JsonIcon from '../icons/JsonIcon.svelte'
-	import ReactIcon from '../icons/ReactIcon.svelte'
-	import SvelteIcon from '../icons/SvelteIcon.svelte'
-	import VueIcon from '../icons/VueIcon.svelte'
-	import CssIcon from '../icons/CssIcon.svelte'
-	import SassIcon from '../icons/SassIcon.svelte'
-	import LessIcon from '../icons/LessIcon.svelte'
-	import HtmlIcon from '../icons/HtmlIcon.svelte'
-	import MarkdownIcon from '../icons/MarkdownIcon.svelte'
-	import YamlIcon from '../icons/YamlIcon.svelte'
+	import { getFileIcon } from '../icons/fileIcon'
 	import { tick, untrack } from 'svelte'
 
 	interface TreeNode {
@@ -155,61 +134,9 @@
 		})
 	)
 
-	function getFileExtension(filename: string): string {
-		const parts = filename.split('.')
-		return parts.length > 1 ? parts[parts.length - 1].toLowerCase() : ''
-	}
-
-	const fileIcon = $derived.by(() => {
-		if (node.isFolder) {
-			return { icon: Folder, className: 'text-secondary' }
-		}
-
-		const ext = getFileExtension(node.name)
-
-		switch (ext) {
-			case 'json':
-				return { icon: JsonIcon }
-			case 'tsx':
-				return { icon: ReactIcon }
-			case 'jsx':
-				return { icon: ReactIcon }
-			case 'ts':
-				return { icon: TypeScript }
-			case 'js':
-				return { icon: JavaScriptIcon }
-			case 'svelte':
-				return { icon: SvelteIcon }
-			case 'vue':
-				return { icon: VueIcon }
-			case 'css':
-				return { icon: CssIcon }
-			case 'scss':
-			case 'sass':
-				return { icon: SassIcon }
-			case 'less':
-				return { icon: LessIcon }
-			case 'png':
-			case 'jpg':
-			case 'jpeg':
-			case 'gif':
-			case 'svg':
-			case 'webp':
-			case 'ico':
-				return { icon: ImageIcon, className: 'text-purple-500' }
-			case 'html':
-			case 'htm':
-				return { icon: HtmlIcon }
-			case 'md':
-			case 'markdown':
-				return { icon: MarkdownIcon }
-			case 'yaml':
-			case 'yml':
-				return { icon: YamlIcon }
-			default:
-				return { icon: File, className: 'text-tertiary' }
-		}
-	})
+	const fileIcon = $derived(
+		node.isFolder ? { icon: Folder, className: 'text-secondary' } : getFileIcon(node.name)
+	)
 </script>
 
 <div>
diff --git a/frontend/src/lib/components/raw_apps/RawAppBackgroundRunner.svelte b/frontend/src/lib/components/raw_apps/RawAppBackgroundRunner.svelte
index 73abdf6c34..6cdcd6a427 100644
--- a/frontend/src/lib/components/raw_apps/RawAppBackgroundRunner.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppBackgroundRunner.svelte
@@ -15,6 +15,26 @@
 		jobsById?: Record<string, JobById>
 		editor: boolean
 		workspace: string
+		/**
+		 * Restrict waitJob/getJob/streamJob to job ids launched by this app
+		 * instance (WIN-2006): a SANDBOXED bundle must not read arbitrary
+		 * workspace jobs through the credentialed bridge. Off for unsandboxed
+		 * renders (the default, and editor preview) — there the bundle holds
+		 * the same credential as the bridge, so gating adds nothing and would
+		 * only break unsandboxed apps that poll persisted or runnable-returned
+		 * job ids.
+		 */
+		gateJobIds?: boolean
+		/**
+		 * Additional trusted message source beyond the bundle iframe: the
+		 * detached preview window opened from the editor ("open preview in a
+		 * separate window"). Its app bundle posts runnable requests to
+		 * `window.opener` (this window), so the bridge must accept its
+		 * `event.source` and reply to it. A getter so it tracks the live handle
+		 * without a reactive prop. Editor-only — the detached window runs the
+		 * same unsandboxed bundle as the inline preview.
+		 */
+		extraSourceWindow?: () => Window | null | undefined
 	}
 
 	let {
@@ -24,16 +44,31 @@
 		jobs = $bindable([]),
 		jobsById = $bindable({}),
 		editor,
-		workspace
+		workspace,
+		gateJobIds = true,
+		extraSourceWindow
 	}: Props = $props()
 
+	// Job ids launched by this app instance — see `gateJobIds`.
+	const launchedJobs = new Set<string>()
+
 	let listener = async (event) => {
-		if (!iframe || event.source !== iframe.contentWindow) return
+		// Only accept messages from the bundle iframe (opaque origin) or the
+		// detached preview window we opened, so other frames/extensions can't
+		// drive the runnable bridge (WIN-2006). Reject unconditionally until the
+		// iframe is bound — never process a message from an unknown source.
+		const detachedWindow = extraSourceWindow?.()
+		const sourceWindow = event.source as Window | null
+		if (!iframe || !sourceWindow) return
+		if (sourceWindow !== iframe.contentWindow && sourceWindow !== detachedWindow) return
 
 		const data = event.data
 
+		// Reply to whichever window sent the request (inline iframe or the
+		// detached preview), not a hardcoded target — otherwise the detached
+		// window's calls would hang waiting for a response routed elsewhere.
 		function respond(o: object) {
-			iframe?.contentWindow?.postMessage({ type: data.type + 'Res', ...o, reqId: data.reqId }, '*')
+			sourceWindow?.postMessage({ type: data.type + 'Res', ...o, reqId: data.reqId }, '*')
 		}
 		async function respondWithResult(uuid: string) {
 			let error = false
@@ -115,6 +150,7 @@
 					},
 					undefined
 				)
+				launchedJobs.add(uuid)
 				let job: JobById = { component: runnable_id, created_at: Date.now(), job: uuid }
 				if (event.data.type == 'backendAsync') {
 					let result = uuid
@@ -134,14 +170,29 @@
 				console.error('No runnable found for', runnable_id)
 			}
 		} else if (event.data.type == 'waitJob') {
+			if (gateJobIds && !launchedJobs.has(data.jobId)) {
+				respond({ result: { message: 'Unknown job' }, error: true })
+				return
+			}
 			await respondWithResult(data.jobId)
 		} else if (event.data.type == 'getJob') {
+			if (gateJobIds && !launchedJobs.has(data.jobId)) {
+				respond({ result: { message: 'Unknown job' }, error: true })
+				return
+			}
 			const job = await JobService.getJob({ workspace, id: data.jobId })
 			respond({ result: job })
 		} else if (event.data.type == 'streamJob') {
 			// Stream job results using SSE
 			const jobId = data.jobId
 			const reqId = data.reqId
+			if (gateJobIds && !launchedJobs.has(jobId)) {
+				sourceWindow?.postMessage(
+					{ type: 'streamJobRes', reqId, error: true, result: { message: 'Unknown job' } },
+					'*'
+				)
+				return
+			}
 			const params = new URLSearchParams()
 			params.set('fast', 'true')
 			params.set('only_result', 'true')
@@ -163,7 +214,7 @@
 
 					if (type === 'error') {
 						eventSource.close()
-						iframe?.contentWindow?.postMessage(
+						sourceWindow?.postMessage(
 							{
 								type: 'streamJobRes',
 								reqId,
@@ -177,7 +228,7 @@
 
 					if (type === 'not_found') {
 						eventSource.close()
-						iframe?.contentWindow?.postMessage(
+						sourceWindow?.postMessage(
 							{
 								type: 'streamJobRes',
 								reqId,
@@ -191,7 +242,7 @@
 
 					// Send stream update if there's new stream data
 					if (update.new_result_stream !== undefined) {
-						iframe?.contentWindow?.postMessage(
+						sourceWindow?.postMessage(
 							{
 								type: 'streamJobUpdate',
 								reqId,
@@ -205,7 +256,7 @@
 					// Check if job is completed
 					if (update.completed) {
 						eventSource.close()
-						iframe?.contentWindow?.postMessage(
+						sourceWindow?.postMessage(
 							{
 								type: 'streamJobRes',
 								reqId,
@@ -223,7 +274,7 @@
 			eventSource.onerror = (error) => {
 				console.warn('SSE stream error:', error)
 				eventSource.close()
-				iframe?.contentWindow?.postMessage(
+				sourceWindow?.postMessage(
 					{
 						type: 'streamJobRes',
 						reqId,
diff --git a/frontend/src/lib/components/raw_apps/RawAppDataTableDrawer.svelte b/frontend/src/lib/components/raw_apps/RawAppDataTableDrawer.svelte
index aa53999453..6a6a2a646f 100644
--- a/frontend/src/lib/components/raw_apps/RawAppDataTableDrawer.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppDataTableDrawer.svelte
@@ -12,6 +12,10 @@
 	import DBManagerContent from '../DBManagerContent.svelte'
 	import type { DbInput } from '../dbTypes'
 	import type { SelectedTable } from '../DBManager.svelte'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
 
 	interface Props {
 		onAdd?: (ref: DataTableRef) => void
@@ -40,11 +44,9 @@
 
 	// Load available datatables from workspace
 	const datatables = resource<string[]>([], async () => {
-		if (!$workspaceStore) return []
+		if (!opWs) return []
 		try {
-			return (await WorkspaceService.listDataTables({ workspace: $workspaceStore })).map(
-				(d) => d.name
-			)
+			return (await WorkspaceService.listDataTables({ workspace: opWs })).map((d) => d.name)
 		} catch (e) {
 			console.error('Failed to load datatables:', e)
 			return []
@@ -163,11 +165,12 @@
 		CloseIcon={hasReplResult ? ArrowLeft : undefined}
 		noPadding
 	>
-		{#if dbInput && $workspaceStore}
+		{#if dbInput && opWs}
 			{#key selectedDatatable}
 				<DBManagerContent
 					bind:this={dbManagerContent}
 					input={dbInput}
+					workspace={opWs}
 					bind:hasReplResult
 					bind:selectedSchemaKey
 					bind:selectedTableKey
diff --git a/frontend/src/lib/components/raw_apps/RawAppEditor.svelte b/frontend/src/lib/components/raw_apps/RawAppEditor.svelte
index 07e7c7bb29..0be384169e 100644
--- a/frontend/src/lib/components/raw_apps/RawAppEditor.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppEditor.svelte
@@ -14,6 +14,7 @@
 	// import { addWmillClient } from './utils'
 	import RawAppBackgroundRunner from './RawAppBackgroundRunner.svelte'
 	import { workspaceStore } from '$lib/stores'
+	import { setRawAppOperatingWorkspace } from './rawAppWorkspace'
 	import { useLocalStorageValue } from '$lib/svelte5Utils.svelte'
 	import {
 		genWmillTs,
@@ -29,7 +30,7 @@
 	import type { Modules } from './RawAppModules.svelte'
 	import { isRunnableByName, isRunnableByPath } from '../apps/inputType'
 	import { aiChatManager, AIMode } from '../copilot/chat/AIChatManager.svelte'
-	import { onMount, untrack } from 'svelte'
+	import { onMount, onDestroy, untrack } from 'svelte'
 	import type {
 		AppDatatableMetadata,
 		LintResult,
@@ -38,7 +39,14 @@
 	import { createAppSelectedContext, type AppCodeSelectionElement } from '../copilot/chat/context'
 	import { rawAppLintStore } from './lintStore'
 	import { dbSchemas } from '$lib/stores'
-	import { MousePointerSquareDashed, RefreshCw, Columns2, ChevronDown, Eye } from 'lucide-svelte'
+	import {
+		MousePointerSquareDashed,
+		RefreshCw,
+		Columns2,
+		ChevronDown,
+		Eye,
+		SquareArrowOutUpRight
+	} from 'lucide-svelte'
 	import DraggableTabs, { type TabItem } from '$lib/components/common/tabs/DraggableTabs.svelte'
 	import { runScriptAndPollResult } from '../jobs/utils'
 	import { RawAppHistoryManager } from './RawAppHistoryManager.svelte'
@@ -64,6 +72,8 @@
 		summary?: string
 		path: string
 		newPath?: string | undefined
+		/** Initial labels for the app, threaded from the loaded app data. */
+		labels?: string[]
 		savedApp?:
 			| {
 					value: any
@@ -75,6 +85,7 @@
 					/** No deployed counterpart exists (draft-only); disables Diff. */
 					no_deployed?: boolean
 					custom_path?: string
+					labels?: string[]
 			  }
 			| undefined
 		diffDrawer?: DiffDrawer | undefined
@@ -114,6 +125,18 @@
 		onOpenOthersDrafts?: () => void
 		onRuntimeLogRequester?: (requester: RawAppRuntimeLogRequester | undefined) => void
 		onRunsProvider?: (provider: RawAppRunsProvider | undefined) => void
+		// Restoring an older deployment from the history drawer. A callback prop
+		// (not `on:restore` forwarding): forwarding a `createEventDispatcher`
+		// event up through these runes-mode components silently drops it.
+		onRestore?: (restoredApp: any) => void
+		// Deploy created the app at a new path; the page navigates to it. Callback
+		// prop for the same reason as `onRestore` — `on:savedNewAppPath` forwarding
+		// through these runes-mode components is dropped.
+		onSavedNewAppPath?: (path: string) => void
+		// Condensed top bar: smaller (sm) buttons, a shorter bar, and the
+		// EditorHeader's path/breadcrumb row dropped (summary only). Used by the
+		// session preview to save vertical room.
+		condensedHeader?: boolean
 	}
 
 	let {
@@ -125,6 +148,7 @@
 		summary = $bindable(''),
 		path,
 		newPath = undefined,
+		labels = undefined,
 		savedApp = $bindable(undefined),
 		diffDrawer = undefined,
 		onNavigate,
@@ -141,10 +165,21 @@
 		othersDraftsCount = 0,
 		onOpenOthersDrafts,
 		onRuntimeLogRequester = undefined,
-		onRunsProvider = undefined
+		onRunsProvider = undefined,
+		onRestore,
+		onSavedNewAppPath,
+		condensedHeader = false
 	}: Props = $props()
 	export const version: number | undefined = undefined
 
+	// Workspace this editor operates on: the session's acting workspace when
+	// embedded in a session preview (autosaveWorkspace), else the navigation
+	// workspace. Deploy/save/background-runner must target it, not $workspaceStore.
+	const opWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
+	// Expose it to the sidebar sub-components (inline scripts, datatable/shared-UI
+	// drawers, DB selector) so their lookups target the app's workspace too.
+	setRawAppOperatingWorkspace(() => opWorkspace)
+
 	// Convert to object format for child components
 	let dataTableRefsObjects = $derived(data.tables.map(parseDataTableRef))
 	let dataTableWhitelist = $derived(buildDataTableWhitelist(dataTableRefsObjects))
@@ -240,6 +275,10 @@
 	let previewIframe: HTMLIFrameElement | undefined = $state(undefined)
 	let previewIframeLoaded = $state(false)
 	let lastBuild: { css: string; js: string } | undefined = undefined
+	// Detached preview tab/window rendering the same app-preview bundle as the
+	// inline pane. Kept live-synced: every build is replayed into it until the
+	// user closes it. Not reactive — it's a window handle, not UI state.
+	let externalPreviewWindow: Window | null = null
 	let inspectorEnabled = $state(false)
 	let bundlerType: 'esbuild' | 'rolldown' = $state('esbuild')
 
@@ -250,6 +289,8 @@
 
 	// Latest UI Builder error; cleared on next successful build.
 	let buildError = $state<string | undefined>(undefined)
+	// Latest uncaught runtime error thrown by the rendered app; cleared on next build.
+	let runtimeError = $state<string | undefined>(undefined)
 	let logsCollapsed = $state(false)
 	let logsDiv: HTMLDivElement | undefined = $state(undefined)
 	$effect(() => {
@@ -493,6 +534,24 @@
 		'boolean'
 	)
 
+	// Auto-compact when the editor opens in a narrow container (e.g. the session
+	// preview pane): drop to the merged single-pane view and retract the file
+	// sidebar. Applied once, on the first measured layout — later resizes are the
+	// user's call. The sidebar is set without persisting so a transient narrow
+	// open never overrides the user's saved expand/collapse preference.
+	let rootWidth = $state(0)
+	const NARROW_PX = 900
+	let appliedNarrowDefault = false
+	$effect(() => {
+		const w = rootWidth
+		if (appliedNarrowDefault || w <= 0) return
+		appliedNarrowDefault = true
+		if (w < NARROW_PX) {
+			splitWithPreview = false
+			sidebarCollapsed.setWithoutPersist(true)
+		}
+	})
+
 	function handleYamlApply(update: RawAppYamlUpdate) {
 		if (update.summary !== undefined) {
 			summary = update.summary
@@ -575,10 +634,10 @@
 	let sharedUiLoaded = $state(false)
 
 	async function loadSharedUi() {
-		if (!$workspaceStore) return
+		if (!opWorkspace) return
 		try {
 			const res = (await WorkspaceService.getSharedUi({
-				workspace: $workspaceStore
+				workspace: opWorkspace
 			})) as { files?: Record<string, string>; version?: number }
 			sharedUiFiles = res.files ?? {}
 			sharedUiVersion = res.version ?? 0
@@ -862,12 +921,12 @@
 				handleHistorySelect(id)
 			},
 			listDatatableTables: async (): Promise<AppDatatableMetadata[]> => {
-				if (!$workspaceStore) {
+				if (!opWorkspace) {
 					return []
 				}
 
 				const tables = await WorkspaceService.listDataTableTables({
-					workspace: $workspaceStore
+					workspace: opWorkspace
 				})
 				return filterDatatableTables(tables)
 			},
@@ -876,7 +935,7 @@
 				schemaName: string,
 				tableName: string
 			): Promise<Record<string, string>> => {
-				if (!$workspaceStore) {
+				if (!opWorkspace) {
 					return {}
 				}
 
@@ -890,7 +949,7 @@
 				}
 
 				const schema = await WorkspaceService.getDataTableTableSchema({
-					workspace: $workspaceStore,
+					workspace: opWorkspace,
 					datatableName,
 					schemaName,
 					tableName
@@ -906,13 +965,13 @@
 				sql: string,
 				newTable?: { schema: string; name: string }
 			): Promise<{ success: boolean; result?: Record<string, any>[]; error?: string }> => {
-				if (!$workspaceStore) {
+				if (!opWorkspace) {
 					return { success: false, error: 'Workspace not available' }
 				}
 
 				try {
 					const result = await runScriptAndPollResult({
-						workspace: $workspaceStore,
+						workspace: opWorkspace,
 						requestBody: {
 							language: 'postgresql',
 							content: sql,
@@ -933,6 +992,7 @@
 							// Clear the cached schema so it gets refreshed with the new table
 							const resourcePath = `datatable://${datatableName}`
 							delete $dbSchemas[resourcePath]
+							delete $dbSchemas[`${opWorkspace}:${resourcePath}`]
 						}
 					}
 
@@ -982,6 +1042,22 @@
 	}
 
 	function listener(e: MessageEvent) {
+		// The detached preview window asks for the build every time it (re)loads,
+		// including a manual browser refresh — its app-preview.html shell starts
+		// blank and the one-shot `load` feed can't survive the tab reloading
+		// itself. Re-feed it here so it repaints. Gated to our own window handle
+		// AND a same-origin sender: the preview runs user app code that can
+		// navigate the window away, and a cross-origin doc must not be able to
+		// trigger a bundle replay (the build can carry app source/secrets).
+		if (
+			e.data?.type === 'appPreviewReady' &&
+			e.source === externalPreviewWindow &&
+			e.origin === window.location.origin
+		) {
+			feedExternalPreview()
+			return
+		}
+
 		// Two children speak to us now: the UI Builder iframe (source editor)
 		// and the preview iframe (rendered user app). Gate by source so they
 		// can't be confused or spoofed.
@@ -993,10 +1069,8 @@
 		// the preview iframe so it renders the new app.
 		if (fromUiBuilder && e.data.type === 'preview') {
 			lastBuild = { css: e.data.css, js: e.data.js }
-			previewIframe?.contentWindow?.postMessage(
-				{ type: 'preview', css: e.data.css, js: e.data.js },
-				'*'
-			)
+			feedPreviewIframe(lastBuild)
+			syncExternalPreview()
 			return
 		}
 
@@ -1025,6 +1099,16 @@
 			return
 		}
 
+		// Uncaught error/rejection from the rendered app — surfaced in the preview
+		// overlay so a runtime crash isn't a silent blank error.
+		if (fromPreview && e.data.type === 'runtimeError') {
+			runtimeError =
+				typeof e.data.message === 'string' && e.data.message
+					? e.data.message
+					: 'Unknown runtime error'
+			return
+		}
+
 		// Inspector events come exclusively from the preview iframe.
 		if (fromPreview && e.data.type === 'inspectorSelect') {
 			inspectorElement = e.data.element as InspectorElementInfo
@@ -1097,6 +1181,78 @@
 		}
 	}
 
+	function postToExternalPreview(msg: Record<string, unknown>) {
+		if (!externalPreviewWindow || externalPreviewWindow.closed) {
+			externalPreviewWindow = null
+			return
+		}
+		// Restrict to our own origin: the detached window loads same-origin
+		// app-preview.html, but user app code can navigate it elsewhere — don't
+		// post the build (potential app source/secrets) to a cross-origin doc.
+		externalPreviewWindow.postMessage(msg, window.location.origin)
+	}
+
+	function syncExternalPreview() {
+		if (lastBuild) {
+			postToExternalPreview({ type: 'preview', css: lastBuild.css, js: lastBuild.js })
+		}
+	}
+
+	// Feed a build into the inline preview iframe. Clears any prior runtime-error
+	// overlay first: a fresh render supersedes the old crash, and if the new
+	// render throws again app-preview.html re-posts `runtimeError`.
+	function feedPreviewIframe(build: { css: string; js: string }) {
+		runtimeError = undefined
+		previewIframe?.contentWindow?.postMessage(
+			{ type: 'preview', css: build.css, js: build.js },
+			'*'
+		)
+	}
+
+	// Full (re)feed of the detached window: theme first, then the build. Used
+	// when (re)attaching to a window — open, focus-reuse, load, handshake — so
+	// it always matches the editor's current state. Plain rebuilds use
+	// `syncExternalPreview` alone (the theme hasn't changed).
+	function feedExternalPreview() {
+		postToExternalPreview({ type: 'setDarkMode', dark: darkMode })
+		syncExternalPreview()
+	}
+
+	onDestroy(() => {
+		// Don't leave a detached preview behind when the editor unmounts: it
+		// would stop receiving builds and, once refreshed, has no opener to
+		// re-feed it — a permanently blank orphan.
+		if (externalPreviewWindow && !externalPreviewWindow.closed) externalPreviewWindow.close()
+		externalPreviewWindow = null
+	})
+
+	function openExternalPreview() {
+		// Reuse an already-open window instead of spawning duplicates.
+		if (externalPreviewWindow && !externalPreviewWindow.closed) {
+			externalPreviewWindow.focus()
+			feedExternalPreview()
+			return
+		}
+		// Scope the window name per app path so two open editors don't fight over
+		// (or take over / close) one shared OS-level preview window.
+		const win = window.open(
+			'/ui_builder/app-preview.html',
+			`windmillRawAppPreview:${encodeURIComponent(path)}`
+		)
+		if (!win) {
+			sendUserToast('Could not open the preview window (popup blocked?)', true)
+			return
+		}
+		externalPreviewWindow = win
+		// Initial feed: fires once when the freshly opened tab loads. This is the
+		// only feed path against an app-preview.html that predates the
+		// `appPreviewReady` handshake, so the window isn't blank on first open
+		// regardless of the pinned UI Builder artifact. A manual refresh is
+		// covered separately by the handshake in `listener` (this listener is
+		// bound to the now-stale document and won't fire again).
+		win.addEventListener('load', () => feedExternalPreview())
+	}
+
 	let getBundleResolve: (({ css, js }: { css: string; js: string }) => void) | undefined = undefined
 
 	async function getBundle(): Promise<{ css: string; js: string }> {
@@ -1197,10 +1353,7 @@
 			// Replay the last build so the preview repopulates without
 			// waiting for the user to trigger another bundle.
 			if (lastBuild) {
-				previewIframe?.contentWindow?.postMessage(
-					{ type: 'preview', css: lastBuild.css, js: lastBuild.js },
-					'*'
-				)
+				feedPreviewIframe(lastBuild)
 			}
 			// Escape inside the preview exits inspect mode — the keydown fires in
 			// the iframe's document, so the parent window listener can't see it.
@@ -1226,6 +1379,7 @@
 		if (previewIframe && previewIframeLoaded) {
 			previewIframe.contentWindow?.postMessage({ type: 'setDarkMode', dark: darkMode }, '*')
 		}
+		postToExternalPreview({ type: 'setDarkMode', dark: darkMode })
 	})
 	$effect(() => {
 		// Match VS Code's editor font size to Windmill's text-xs.
@@ -1419,9 +1573,9 @@
 	// Force an immediate flush. No toast — the AutosaveIndicator narrates the
 	// result, and `flush` never rejects (postSave routes errors to the failures map).
 	function flushDraft() {
-		if (!$workspaceStore || !liveEditorDraftStoragePath) return
+		if (!opWorkspace || !liveEditorDraftStoragePath) return
 		void UserDraftDbSyncer.flush({
-			workspace: $workspaceStore,
+			workspace: opWorkspace,
 			itemKind: 'raw_app',
 			path: liveEditorDraftStoragePath
 		})
@@ -1489,27 +1643,30 @@
 <DarkModeObserver bind:darkMode />
 
 <RawAppBackgroundRunner
-	workspace={$workspaceStore ?? ''}
+	workspace={opWorkspace ?? ''}
 	editor
 	iframe={previewIframe}
 	bind:jobs
 	bind:jobsById
 	{runnables}
 	{path}
+	gateJobIds={false}
+	extraSourceWindow={() => externalPreviewWindow}
 />
-<div class="max-h-screen overflow-hidden h-screen min-h-0 flex flex-col">
+<div bind:clientWidth={rootWidth} class="max-h-full overflow-hidden h-full min-h-0 flex flex-col">
 	<RawAppEditorHeader
 		bind:jobs
 		bind:jobsById
 		bind:savedApp
 		bind:summary
 		bind:pendingDraftPath
-		on:restore
-		on:savedNewAppPath
+		{onRestore}
+		{onSavedNewAppPath}
 		{policy}
 		{diffDrawer}
 		{newApp}
 		{newPath}
+		{labels}
 		appPath={path}
 		{liveEditorDraftStoragePath}
 		{autosaveWorkspace}
@@ -1531,6 +1688,7 @@
 		onOpenYamlEditor={() => yamlEditorDrawer?.openDrawer()}
 		sidebarCollapsed={sidebarCollapsed.val}
 		onToggleSidebar={() => (sidebarCollapsed.val = !sidebarCollapsed.val)}
+		{condensedHeader}
 	/>
 
 	<RawAppYamlEditor
@@ -1747,19 +1905,20 @@
 												aria-label="Rebuild"
 												onclick={() => {
 													if (lastBuild) {
-														previewIframe?.contentWindow?.postMessage(
-															{
-																type: 'preview',
-																css: lastBuild.css,
-																js: lastBuild.js
-															},
-															'*'
-														)
+														feedPreviewIframe(lastBuild)
 													}
 												}}
 											>
 												<RefreshCw size={14} />
 											</button>
+											<button
+												class="cursor-pointer bg-surface hover:bg-surface-hover border border-border-light text-primary w-7 h-7 rounded-md inline-flex items-center justify-center"
+												title="Open preview in a separate window"
+												aria-label="Open preview in a separate window"
+												onclick={openExternalPreview}
+											>
+												<SquareArrowOutUpRight size={14} />
+											</button>
 											<button
 												title={splitWithPreview
 													? 'Move preview back into a tab'
@@ -1796,6 +1955,18 @@
 											>
 										</Alert>
 									</div>
+								{:else if runtimeError}
+									<div class="absolute top-12 left-2 right-2 z-20 isolate" role="alert">
+										<Alert
+											type="error"
+											title="Runtime error"
+											class="relative before:absolute before:inset-0 before:-z-10 before:rounded-md before:bg-surface before:content-['']"
+										>
+											<pre class="overflow-auto whitespace-pre-wrap text-xs max-h-60"
+												>{runtimeError}</pre
+											>
+										</Alert>
+									</div>
 								{/if}
 								{#if logs}
 									<div
diff --git a/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte b/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte
index 2ecbc9f369..d57cf36ab7 100644
--- a/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppEditorHeader.svelte
@@ -7,9 +7,17 @@
 
 	import { AppService, type Policy } from '$lib/gen'
 	import { UserDraft } from '$lib/userDraft.svelte'
+	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
+	import OpenInSessionButton from '$lib/components/sessions/OpenInSessionButton.svelte'
 	import { discardDraftAfterDeploy } from '$lib/userDraftToast'
 	import { rawAppToHubUrl } from '$lib/hub'
-	import { enterpriseLicense, hubBaseUrlStore, userStore, workspaceStore } from '$lib/stores'
+	import {
+		enterpriseLicense,
+		hubBaseUrlStore,
+		userStore,
+		userWorkspaces,
+		workspaceStore
+	} from '$lib/stores'
 	import YAML from 'yaml'
 	import {
 		Bug,
@@ -26,7 +34,7 @@
 		Undo,
 		WandSparkles
 	} from 'lucide-svelte'
-	import { createEventDispatcher, untrack } from 'svelte'
+	import { untrack } from 'svelte'
 	import { orderedJsonStringify, type Value, replaceFalseWithUndefined } from '../../utils'
 	import { random_adj } from '$lib/components/random_positive_adjetive'
 
@@ -68,9 +76,9 @@
 	// `runtime.syncPreviewWithDeployed`, which discards the fork draft + reloads
 	// the preview to the deployed version.
 	import { AIBtnClasses } from '../copilot/chat/AIButtonStyle'
+	import { stripRawAppDiffNoise } from './utils'
 	import type { RawAppData } from './dataTableRefUtils'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 
 	// async function hash(message) {
@@ -101,6 +109,7 @@
 					summary: string
 					policy: any
 					custom_path?: string
+					labels?: string[]
 					/** No deployed counterpart exists (draft-only); disables Diff. */
 					no_deployed?: boolean
 			  }
@@ -108,6 +117,8 @@
 		version?: number | undefined
 		newApp: boolean
 		newPath?: string
+		/** Initial labels for the app, threaded from the loaded app data. */
+		labels?: string[]
 		appPath: string
 		runnables: Record<string, Runnable>
 		files: Record<string, string> | undefined
@@ -126,6 +137,10 @@
 		onOpenYamlEditor?: () => void
 		sidebarCollapsed?: boolean
 		onToggleSidebar?: () => void
+		/** Condensed top bar: smaller (sm) buttons, a shorter bar, and the
+		 * EditorHeader's path/breadcrumb row dropped (summary only). Used by the
+		 * session preview to save vertical room. */
+		condensedHeader?: boolean
 		onNavigate?: (item: import('$lib/components/workspacePicker').WorkspaceItem) => void
 		liveEditorDraftStoragePath?: string
 		/** Indicator-only overrides for the sessions preview: the AutosaveIndicator
@@ -150,6 +165,14 @@
 		loadedFromDraft?: boolean
 		othersDraftsCount?: number
 		onOpenOthersDrafts?: () => void
+		// Restoring an older deployment from the history drawer. A callback prop
+		// (not `on:restore` forwarding): forwarding a `createEventDispatcher`
+		// event up through these runes-mode components silently drops it.
+		onRestore?: (restoredApp: any) => void
+		// Deploy created the app at a new path; the page navigates to it. Callback
+		// prop for the same reason as `onRestore` — `on:savedNewAppPath` forwarding
+		// through these runes-mode components is dropped.
+		onSavedNewAppPath?: (path: string) => void
 	}
 
 	let {
@@ -160,6 +183,7 @@
 		version = $bindable(undefined),
 		newApp,
 		newPath = '',
+		labels: initialLabels = undefined,
 		appPath,
 		runnables,
 		data,
@@ -174,6 +198,7 @@
 		onOpenYamlEditor = undefined,
 		sidebarCollapsed = false,
 		onToggleSidebar = undefined,
+		condensedHeader = false,
 		onNavigate = undefined,
 		liveEditorDraftStoragePath = undefined,
 		autosaveWorkspace = undefined,
@@ -183,12 +208,19 @@
 		onResetToDeployed,
 		loadedFromDraft = false,
 		othersDraftsCount = 0,
-		onOpenOthersDrafts
+		onOpenOthersDrafts,
+		onRestore,
+		onSavedNewAppPath
 	}: Props = $props()
 
+	// Set by the on-behalf-of selector when the publisher picks a user other than
+	// themselves. Forwarded as `preserve_on_behalf_of` so the backend keeps the
+	// policy's on_behalf_of instead of resetting it to the deploying user.
+	let preserveOnBehalfOf = $state(false)
+
 	// The AutosaveIndicator watches these; in the sessions preview they're the
 	// session's (workspace, path), else the full-page editor's own values.
-	const indicatorWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
+	const opWorkspace = $derived(autosaveWorkspace ?? $workspaceStore)
 	const indicatorPath = $derived(autosavePath ?? liveEditorDraftStoragePath)
 
 	$effect(() => {
@@ -215,8 +247,8 @@
 	)
 
 	$effect(() => {
-		if (liveEditorDraftStoragePath === undefined || !$workspaceStore) return
-		const workspace = $workspaceStore
+		if (liveEditorDraftStoragePath === undefined || !opWorkspace) return
+		const workspace = opWorkspace
 		UserDraft.setLiveEditorDraft({
 			workspace,
 			itemKind: 'raw_app',
@@ -255,6 +287,10 @@
 	let topbarWidth = $state(0)
 	const compactTopbar = $derived(topbarWidth > 0 && topbarWidth < 720)
 
+	// Top-bar button size + bar height. Condensed (session preview) uses the
+	// smallest well-supported unified size (`sm`) so the bar is thinner.
+	const headerBtnSize = $derived(condensedHeader ? 'sm' : 'md')
+
 	async function publishToHub() {
 		if (!app) return
 		publishingToHub = true
@@ -306,7 +342,7 @@
 		try {
 			const { js, css } = await getBundle()
 			await AppService.createAppRaw({
-				workspace: $workspaceStore!,
+				workspace: opWorkspace!,
 				formData: {
 					app: {
 						value: app,
@@ -314,7 +350,9 @@
 						summary: summary,
 						policy,
 						deployment_message: deploymentMsg,
-						custom_path: customPath
+						custom_path: customPath,
+						preserve_on_behalf_of: preserveOnBehalfOf || undefined,
+						labels
 					},
 					js,
 					css
@@ -322,13 +360,14 @@
 			})
 			// New path now exists server-side — drop the autocomplete cache so
 			// it shows up immediately instead of after the 60s TTL.
-			invalidateWorkspacePaths($workspaceStore!)
+			invalidateWorkspacePaths(opWorkspace!)
 			savedApp = {
 				summary: summary,
 				value: structuredClone(stateSnapshot(app)),
 				path: path,
 				policy: policy,
-				custom_path: customPath
+				custom_path: customPath,
+				labels: $state.snapshot(labels)
 			}
 			closeSaveDrawer()
 			sendUserToast('App deployed successfully')
@@ -345,7 +384,7 @@
 					path: appPath
 				})
 			}
-			dispatch('savedNewAppPath', path)
+			onSavedNewAppPath?.(path)
 			onDeploy?.({ path })
 		} catch (e) {
 			sendUserToast(`Error creating app: ${e.body ?? e.message}`, true)
@@ -369,15 +408,7 @@
 				savedApp &&
 				app &&
 				orderedJsonStringify(deployedValue) ===
-					orderedJsonStringify(
-						replaceFalseWithUndefined({
-							summary: summary,
-							value: app,
-							path: newEditedPath || savedApp.path,
-							policy,
-							custom_path: customPath
-						})
-					)
+					orderedJsonStringify(replaceFalseWithUndefined(currentDiffValue))
 			) {
 				await updateApp(npath)
 			} else {
@@ -393,22 +424,16 @@
 
 	async function syncWithDeployed() {
 		const deployedApp = await AppService.getAppByPath({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: appPath!,
 			withStarredInfo: true
 		})
 
 		deployedBy = deployedApp.created_by
 
-		// Strip off extra information
-		deployedValue = replaceFalseWithUndefined({
-			...deployedApp,
-			id: undefined,
-			created_at: undefined,
-			created_by: undefined,
-			versions: undefined,
-			extra_perms: undefined
-		})
+		// Normalize away post-deploy noise (see stripRawAppDiffNoise) so the
+		// diff/comparison only reflects what the editor actually changed.
+		deployedValue = replaceFalseWithUndefined(stripRawAppDiffNoise(deployedApp))
 	}
 
 	async function openDiffDrawer() {
@@ -422,14 +447,8 @@
 		diffDrawer?.openDrawer()
 		diffDrawer?.setDiff({
 			mode: 'normal',
-			deployed: deployedValue ?? savedApp,
-			current: {
-				summary: summary,
-				value: app,
-				path: newEditedPath || savedApp.path,
-				policy,
-				custom_path: customPath
-			}
+			deployed: deployedValue ?? stripRawAppDiffNoise(savedApp),
+			current: currentDiffValue
 		})
 	}
 
@@ -444,7 +463,7 @@
 			policy.execution_mode = 'publisher'
 		}
 		await AppService.updateAppRaw({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: appPath!,
 			formData: {
 				app: {
@@ -453,25 +472,28 @@
 					policy,
 					path: npath,
 					deployment_message: deploymentMsg,
+					preserve_on_behalf_of: preserveOnBehalfOf || undefined,
 					// custom_path requires admin so to accept update without it, we need to send as undefined when non-admin (when undefined, it will be ignored)
 					// it also means that customPath needs to be set to '' instead of undefined to unset it (when admin)
 					custom_path:
-						$userStore?.is_admin || $userStore?.is_super_admin ? (customPath ?? '') : undefined
+						$userStore?.is_admin || $userStore?.is_super_admin ? (customPath ?? '') : undefined,
+					labels
 				},
 				js,
 				css
 			}
 		})
-		invalidateWorkspacePaths($workspaceStore!)
+		invalidateWorkspacePaths(opWorkspace!)
 		savedApp = {
 			summary: summary,
 			value: structuredClone(stateSnapshot(app)),
 			path: npath,
 			policy,
-			custom_path: customPath
+			custom_path: customPath,
+			labels: $state.snapshot(labels)
 		}
 		const appHistory = await AppService.getAppHistoryByPath({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: npath
 		})
 		version = appHistory[0]?.version
@@ -487,19 +509,21 @@
 			})
 		}
 		if (appPath !== npath) {
-			dispatch('savedNewAppPath', npath)
+			onSavedNewAppPath?.(npath)
 		}
 		onDeploy?.({ path: npath })
 	}
 
-	async function setPublishState() {
+	async function setPublishState(message?: string) {
 		await computeTriggerables()
 		await AppService.updateApp({
-			workspace: $workspaceStore!,
+			workspace: opWorkspace!,
 			path: appPath,
 			requestBody: { policy }
 		})
-		if (policy.execution_mode == 'anonymous') {
+		if (message) {
+			sendUserToast(message)
+		} else if (policy.execution_mode == 'anonymous') {
 			sendUserToast('App require no login to be accessed')
 		} else {
 			sendUserToast('App require login and read-access')
@@ -518,7 +542,7 @@
 		}
 		try {
 			const appVersion = await AppService.getAppLatestVersion({
-				workspace: $workspaceStore!,
+				workspace: opWorkspace!,
 				path: appPath
 			})
 			onLatest = appVersion?.version === undefined || version === appVersion?.version
@@ -585,15 +609,27 @@
 		}
 	])
 
-	const dispatch = createEventDispatcher()
-
 	let customPath = $state(savedApp?.custom_path)
 	let customPathError = $state('')
+	let labels = $state(untrack(() => initialLabels))
 
 	let jobsDrawerOpen = $state(false)
 
 	let app = $derived(files ? { runnables: runnables, files, data } : undefined)
 
+	// Editor-side value for diffing/comparison against the deployed app, with the
+	// same noise stripped as the deployed side (see stripRawAppDiffNoise).
+	let currentDiffValue = $derived(
+		stripRawAppDiffNoise({
+			summary: summary,
+			value: app,
+			path: newEditedPath || savedApp?.path,
+			policy,
+			custom_path: customPath,
+			labels
+		})
+	)
+
 	$effect(() => {
 		saveDrawerOpen && compareVersions()
 	})
@@ -605,13 +641,7 @@
 	bind:open
 	{diffDrawer}
 	bind:deployedValue
-	currentValue={{
-		summary: summary,
-		value: app,
-		path: newEditedPath || savedApp?.path,
-		policy,
-		custom_path: customPath
-	}}
+	currentValue={currentDiffValue}
 />
 
 <Drawer bind:open={saveDrawerOpen} size="800px">
@@ -632,14 +662,8 @@
 						diffDrawer?.openDrawer()
 						diffDrawer?.setDiff({
 							mode: 'normal',
-							deployed: deployedValue ?? savedApp,
-							current: {
-								summary: summary,
-								value: app,
-								path: newEditedPath || savedApp.path,
-								policy,
-								custom_path: customPath
-							},
+							deployed: deployedValue ?? stripRawAppDiffNoise(savedApp),
+							current: currentDiffValue,
 							button: {
 								text: 'Looks good, deploy',
 								onClick: () => {
@@ -685,19 +709,22 @@
 			{onLatest}
 			{savedApp}
 			rawApp
+			operatingWorkspace={opWorkspace}
 			bind:summary
 			bind:customPath
 			bind:deploymentMsg
 			bind:customPathError
 			bind:pathError
 			bind:newEditedPath
+			bind:preserveOnBehalfOf
+			bind:labels
 		/>
 	</DrawerContent>
 </Drawer>
 
 <Drawer bind:open={historyBrowserDrawerOpen} size="1200px">
 	<DrawerContent title="Deployment History" on:close={() => (historyBrowserDrawerOpen = false)}>
-		<DeploymentHistory on:restore {appPath} />
+		<DeploymentHistory on:restore={(e) => onRestore?.(e.detail)} {appPath} />
 	</DrawerContent>
 </Drawer>
 
@@ -753,9 +780,15 @@
 
 <div
 	bind:clientWidth={topbarWidth}
-	class="flex flex-row justify-between gap-2 gap-y-2 px-2 items-center overflow-y-visible overflow-x-auto max-h-12 h-12 shrink-0"
+	class="flex flex-row justify-between gap-2 gap-y-2 px-2 items-center overflow-y-visible overflow-x-auto shrink-0 {condensedHeader
+		? 'max-h-9 h-9'
+		: 'max-h-12 h-12'}"
 >
-	<div class="flex flex-row gap-2 items-center min-w-[200px]">
+	<!-- Identity block: shrinks/truncates first so the cloud indicator and the
+	     action buttons stay visible. Without min-w-0 the breadcrumb + summary
+	     overflow this box on narrow widths and get overlapped by the (formerly
+	     un-pinned) action group, hiding the autosave cloud. -->
+	<div class="flex flex-row gap-2 items-center min-w-0">
 		{#if onToggleSidebar}
 			<Button
 				unifiedSize="sm"
@@ -766,17 +799,21 @@
 				on:click={() => onToggleSidebar?.()}
 			/>
 		{/if}
-		<EditorHeader
-			bind:summary
-			bind:path={newEditedPath}
-			savedPath={appPath || newPath || undefined}
-			kind="app"
-			raw_app
-			onNavigate={(item) => (onNavigate ? onNavigate(item) : goto(editPathFor(item)))}
-		/>
-		{#if indicatorWorkspace && indicatorPath !== undefined}
+		<div class="min-w-0 overflow-hidden">
+			<EditorHeader
+				bind:summary
+				bind:path={newEditedPath}
+				savedPath={appPath || newPath || undefined}
+				kind="app"
+				raw_app
+				hidePath={condensedHeader}
+				workspaceId={autosaveWorkspace}
+				onNavigate={(item) => (onNavigate ? onNavigate(item) : goto(editPathFor(item)))}
+			/>
+		</div>
+		{#if opWorkspace && indicatorPath !== undefined}
 			<AutosaveIndicator
-				workspace={indicatorWorkspace}
+				workspace={opWorkspace}
 				itemKind="raw_app"
 				path={indicatorPath}
 				draftOnly={newApp}
@@ -789,14 +826,16 @@
 	</div>
 
 	{#if $enterpriseLicense && appPath != ''}
-		<Awareness />
+		<div class="shrink-0">
+			<Awareness />
+		</div>
 	{/if}
-	<div class="flex flex-row gap-2 justify-end items-center overflow-visible">
+	<div class="flex flex-row gap-2 justify-end items-center overflow-visible shrink-0">
 		<DropdownV2 items={moreItems} class="h-auto">
 			{#snippet buttonReplacement()}
 				<Button
 					nonCaptureEvent
-					unifiedSize="md"
+					unifiedSize={headerBtnSize}
 					variant="subtle"
 					startIcon={{ icon: EllipsisVertical }}
 					iconOnly
@@ -817,7 +856,7 @@
 		>
 			<Button
 				variant="default"
-				unifiedSize="md"
+				unifiedSize={headerBtnSize}
 				on:click={() => openDiffDrawer()}
 				disabled={!savedApp || newApp || savedApp?.no_deployed === true}
 				btnClasses={!savedApp || newApp || savedApp?.no_deployed === true
@@ -839,7 +878,7 @@
 					jobsDrawerOpen = true
 				}}
 				color="light"
-				unifiedSize="md"
+				unifiedSize={headerBtnSize}
 				variant="default"
 				btnClasses="relative"
 			>
@@ -854,23 +893,42 @@
 			</Button>
 		</div>
 		<AppExportButton bind:this={appExport} />
-		{#if !inSessionPane}
-			<Button
-				unifiedSize="md"
-				variant="default"
-				onClick={() => aiChatManager.toggleOpen()}
-				startIcon={{ icon: WandSparkles }}
-				iconOnly
-				btnClasses={AIBtnClasses('default')}
-			>
-				AI
-			</Button>
-		{/if}
+		<OpenInSessionButton
+			source={appPath
+				? {
+						target: { kind: 'raw_app', path: appPath },
+						workspaceId: opWorkspace ?? undefined,
+						// Flush the autosaved draft so the session preview opens the app
+						// exactly as it is in the editor right now.
+						beforeOpen: () =>
+							opWorkspace && indicatorPath !== undefined
+								? UserDraftDbSyncer.flush({
+										workspace: opWorkspace,
+										itemKind: 'raw_app',
+										path: indicatorPath
+									})
+								: undefined
+					}
+				: undefined}
+		>
+			{#snippet fallback()}
+				<Button
+					unifiedSize={headerBtnSize}
+					variant="default"
+					onClick={() => aiChatManager.toggleOpen()}
+					startIcon={{ icon: WandSparkles }}
+					iconOnly
+					btnClasses={AIBtnClasses('default')}
+				>
+					AI
+				</Button>
+			{/snippet}
+		</OpenInSessionButton>
 		<Button
 			loading={loading.save}
 			startIcon={{ icon: Save }}
 			on:click={save}
-			unifiedSize="md"
+			unifiedSize={headerBtnSize}
 			variant="accent"
 			dropdownItems={appPath != ''
 				? () => [
@@ -880,10 +938,10 @@
 								window.open(`/apps/add?template=${appPath}`)
 							}
 						},
-						...(!isCloudHosted() && !isRuleActive('DisableWorkspaceForking')
+						...(!isCloudHosted() && editInForkAllowed(opWorkspace, $userWorkspaces)
 							? [
 									{
-										label: 'Edit in workspace fork',
+										label: editInForkLabel(opWorkspace, $userWorkspaces),
 										onClick: () => {
 											window.open(buildForkEditUrl('raw_app', appPath))
 										}
diff --git a/frontend/src/lib/components/raw_apps/RawAppFileDiff.svelte b/frontend/src/lib/components/raw_apps/RawAppFileDiff.svelte
new file mode 100644
index 0000000000..bb8e518836
--- /dev/null
+++ b/frontend/src/lib/components/raw_apps/RawAppFileDiff.svelte
@@ -0,0 +1,115 @@
+<!--
+@component
+Diff body for a single raw-app file item (one `RawAppFileItem`). Renders one
+content-sized Monaco diff, with a per-file size guard: a file whose line count
+exceeds `lineBudget` shows a "Load diff" card instead of auto-mounting.
+
+The synthesized `app.yaml` metadata item (isMetadata) additionally offers an
+"Expand to full app YAML" toggle that swaps in the whole serialized app diff —
+the escape hatch, shown only on demand.
+-->
+<script lang="ts">
+	import { Loader2 } from 'lucide-svelte'
+	import { Button } from '$lib/components/common'
+
+	interface Props {
+		original?: string
+		current?: string
+		lang: string
+		inlineDiff?: boolean
+		/** Forward Monaco's auto-inline opt-out to the underlying DiffEditor. */
+		disableAutoInline?: boolean
+		lineBudget?: number
+		isMetadata?: boolean
+		fullYamlOriginal?: string
+		fullYamlCurrent?: string
+		/** Cap (px) on the rendered diff height; the drawer owns the rationale.
+		 * Ignored while ≤ 0 (unmeasured). */
+		maxHeight?: number
+	}
+
+	let {
+		original,
+		current,
+		lang,
+		inlineDiff = false,
+		disableAutoInline = false,
+		lineBudget = 1500,
+		isMetadata = false,
+		fullYamlOriginal,
+		fullYamlCurrent,
+		maxHeight
+	}: Props = $props()
+
+	let showFullYaml = $state(false)
+	let forceLoad = $state(false)
+
+	const canExpandYaml = $derived(
+		isMetadata && (fullYamlOriginal !== undefined || fullYamlCurrent !== undefined)
+	)
+
+	// Active diff sides depend on the metadata expand toggle.
+	const activeOriginal = $derived(showFullYaml ? (fullYamlOriginal ?? '') : (original ?? ''))
+	const activeModified = $derived(showFullYaml ? (fullYamlCurrent ?? '') : (current ?? ''))
+	const activeLang = $derived(showFullYaml ? 'yaml' : lang)
+
+	const LINE_HEIGHT = 19
+	const EDITOR_CHROME = 24
+	function linesIn(s: string): number {
+		return Math.max(s.split('\n').length, 1)
+	}
+	// The larger side's line count: it's what drives Monaco's mount cost (and the
+	// editor height), so it's the right metric for the size guard.
+	const lineCount = $derived(Math.max(linesIn(activeOriginal), linesIn(activeModified)))
+	const height = $derived(`${lineCount * LINE_HEIGHT + EDITOR_CHROME}px`)
+	// Cap the block at the drawer's visible height so a long file scrolls inside
+	// Monaco instead of stretching the card, leaving room for the "expand to full
+	// YAML" toolbar above it (measured). Skipped until measured (> 0).
+	let chromeH = $state(0)
+	const maxHeightStyle = $derived(
+		maxHeight && maxHeight > 0 ? `max-height: ${Math.max(0, maxHeight - chromeH)}px;` : ''
+	)
+	// The full-YAML view is opt-in, so never guard it; only guard the default
+	// per-file view.
+	const guarded = $derived(!showFullYaml && !forceLoad && lineCount > lineBudget)
+</script>
+
+<div class="flex flex-col">
+	{#if canExpandYaml}
+		<div
+			bind:clientHeight={chromeH}
+			class="flex items-center justify-end px-3 py-1 border-b border-light"
+		>
+			<Button variant="subtle" unifiedSize="sm" onclick={() => (showFullYaml = !showFullYaml)}>
+				{showFullYaml ? 'Show metadata only' : 'Expand to full app YAML'}
+			</Button>
+		</div>
+	{/if}
+	{#if guarded}
+		<div class="flex items-center gap-2 px-3 py-3">
+			<span class="text-2xs text-secondary">
+				Large file — {lineCount.toLocaleString()} lines.
+			</span>
+			<Button variant="subtle" unifiedSize="sm" onclick={() => (forceLoad = true)}>Load diff</Button
+			>
+		</div>
+	{:else}
+		{#await import('$lib/components/DiffEditor.svelte')}
+			<div class="p-3"><Loader2 class="w-3.5 h-3.5 animate-spin" /></div>
+		{:then Module}
+			<div style="height: {height}; {maxHeightStyle}">
+				<Module.default
+					open={true}
+					automaticLayout
+					className="h-full"
+					defaultLang={activeLang}
+					defaultOriginal={activeOriginal}
+					defaultModified={activeModified}
+					{inlineDiff}
+					{disableAutoInline}
+					readOnly
+				/>
+			</div>
+		{/await}
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/raw_apps/RawAppInlineScriptEditor.svelte b/frontend/src/lib/components/raw_apps/RawAppInlineScriptEditor.svelte
index 7abaa40b52..42c048878b 100644
--- a/frontend/src/lib/components/raw_apps/RawAppInlineScriptEditor.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppInlineScriptEditor.svelte
@@ -24,6 +24,7 @@
 	import { usePreparedAssetSqlQueries } from '$lib/infer.svelte'
 	import AssetsDropdownButton from '../assets/AssetsDropdownButton.svelte'
 	import { workspaceStore } from '$lib/stores'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
 	import { SvelteSet } from 'svelte/reactivity'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import { editor as meditor } from 'monaco-editor'
@@ -76,6 +77,10 @@
 		onSelectionChange,
 		delete_after_secs = $bindable()
 	}: Props = $props()
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
+
 	let diffEditor = $state() as DiffEditor | undefined
 	let validCode = $state(true)
 
@@ -145,7 +150,7 @@
 	)
 	let preparedSqlQueries = usePreparedAssetSqlQueries(
 		() => inferAssetsRes.current?.sql_queries,
-		() => $workspaceStore
+		() => opWs
 	)
 	$effect(() => {
 		if (!inlineScript || !inferAssetsRes.current || inferAssetsRes.current.status === 'error')
@@ -303,13 +308,13 @@
 			resetDAPClient()
 			dapClient = getDAPClient(dapServerUrl)
 
-			const env = await fetchContextualVariables($workspaceStore ?? '')
+			const env = await fetchContextualVariables(opWs ?? '')
 			const code = inlineScript.content
 
 			let signedPayload
 			try {
 				signedPayload = await signDebugRequest(
-					$workspaceStore ?? '',
+					opWs ?? '',
 					code ?? '',
 					inlineScript.language ?? 'python3'
 				)
@@ -636,6 +641,7 @@
 
 		<div class="shadow-sm px-1 border-b-1 border-gray-200 dark:border-gray-700">
 			<EditorBar
+				workspace={opWs}
 				{validCode}
 				{editor}
 				lang={inlineScript.language}
@@ -733,7 +739,7 @@
 							client={dapClient}
 							currentFrameId={currentDebugFrameId}
 							onClose={() => (showDebugConsole = false)}
-							workspace={$workspaceStore}
+							workspace={opWs}
 							jobId={debugSessionJobId ?? undefined}
 						/>
 					</Pane>
diff --git a/frontend/src/lib/components/raw_apps/RawAppInlineScriptRunnable.svelte b/frontend/src/lib/components/raw_apps/RawAppInlineScriptRunnable.svelte
index c4af7309b4..ca48eb74dc 100644
--- a/frontend/src/lib/components/raw_apps/RawAppInlineScriptRunnable.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppInlineScriptRunnable.svelte
@@ -29,6 +29,10 @@
 	import { userStore, workspaceStore } from '$lib/stores'
 	import { isHubFlowPath } from '$lib/utils'
 	import { sendUserToast } from '$lib/toast'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
 
 	type RunnableWithInlineScript = RunnableWithFields & {
 		inlineScript?: InlineScript & { language: ScriptLang }
@@ -131,7 +135,7 @@
 			case 'groups':
 				return $userStore?.groups ?? []
 			case 'workspace':
-				return $workspaceStore ?? ''
+				return opWs ?? ''
 			case 'author':
 				return $userStore?.email ?? '' // In editor, author is the current user
 			default:
@@ -188,6 +192,7 @@
 
 <JobLoader
 	noCode={true}
+	workspaceOverride={opWs}
 	bind:scriptProgress
 	bind:this={jobLoader}
 	bind:isLoading={testIsLoading}
@@ -299,6 +304,7 @@
 										</div>
 										<SchemaForm
 											on:keydownCmdEnter={testPreview}
+											workspace={opWs}
 											disabledArgs={Object.entries(runnable?.fields ?? {})
 												.filter(([_, v]) => v.type == 'static')
 												.map(([k]) => k)}
diff --git a/frontend/src/lib/components/raw_apps/RawAppInlineScriptsPanel.svelte b/frontend/src/lib/components/raw_apps/RawAppInlineScriptsPanel.svelte
index 17b981c2a9..6d0854ee54 100644
--- a/frontend/src/lib/components/raw_apps/RawAppInlineScriptsPanel.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppInlineScriptsPanel.svelte
@@ -2,6 +2,10 @@
 	import { workspaceStore } from '$lib/stores'
 	import RawAppInlineScripRunnable, { type Runnable } from './RawAppInlineScriptRunnable.svelte'
 	import { createScriptFromInlineScript } from '../apps/editor/inlineScriptsPanel/utils'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
 
 	interface Props {
 		runnables: Record<string, Runnable>
@@ -36,12 +40,7 @@
 		<RawAppInlineScripRunnable
 			{appPath}
 			on:createScriptFromInlineScript={(e) => {
-				createScriptFromInlineScript(
-					selectedRunnable ?? '',
-					e.detail,
-					$workspaceStore ?? '',
-					appPath
-				)
+				createScriptFromInlineScript(selectedRunnable ?? '', e.detail, opWs ?? '', appPath)
 			}}
 			on:delete={() => {
 				if (selectedRunnable) {
diff --git a/frontend/src/lib/components/raw_apps/RawAppInputsSpecEditor.svelte b/frontend/src/lib/components/raw_apps/RawAppInputsSpecEditor.svelte
index be2025baf2..7b3639f41d 100644
--- a/frontend/src/lib/components/raw_apps/RawAppInputsSpecEditor.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppInputsSpecEditor.svelte
@@ -14,6 +14,10 @@
 	import type { InputType } from '../apps/inputType'
 	import Select from '$lib/components/select/Select.svelte'
 	import { userStore, workspaceStore } from '$lib/stores'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
 
 	// Build ctx properties with current user's actual values
 	let ctxProperties = $derived([
@@ -31,7 +35,7 @@
 		{
 			value: 'workspace',
 			label: 'Workspace',
-			subtitle: `string — "${$workspaceStore ?? 'unknown'}"`
+			subtitle: `string — "${opWs ?? 'unknown'}"`
 		},
 		{ value: 'author', label: 'Author', subtitle: `string — "${$userStore?.email ?? 'unknown'}"` }
 	])
diff --git a/frontend/src/lib/components/raw_apps/RawAppPreview.svelte b/frontend/src/lib/components/raw_apps/RawAppPreview.svelte
index 296590a0e4..9a70b162d7 100644
--- a/frontend/src/lib/components/raw_apps/RawAppPreview.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppPreview.svelte
@@ -2,8 +2,8 @@
 	import { type UserExt } from '$lib/stores'
 	import RawAppBackgroundRunner from './RawAppBackgroundRunner.svelte'
 	import type { Runnable } from './rawAppPolicy'
-	import { htmlContent } from './utils'
-	import { onMount, untrack } from 'svelte'
+	import { getContext, onMount, untrack } from 'svelte'
+	import { unsandboxedRawAppHtml } from './utils'
 
 	interface Props {
 		workspace: string
@@ -17,43 +17,190 @@
 
 	let iframe = $state() as HTMLIFrameElement | undefined
 
-	// Get initial hash from parent URL to pass to iframe
-	let initialHash = $state('')
+	// Get initial hash from parent URL to pass to the iframe
+	let initialHash = ''
 
-	onMount(() => {
-		initialHash = window.location.hash || ''
+	// WIN-2006: unless the publisher opted into sandbox isolation, run the bundle
+	// same-origin with full access (the default); otherwise the opaque-origin sandbox.
+	const unsandboxedCtx = getContext<{ value: boolean }>('IS_APP_UNSANDBOXED')
+	let unsandboxed = $derived(unsandboxedCtx?.value ?? false)
+	// Unsandboxed (the default) must match the pre-isolation viewer exactly: NO
+	// sandbox attribute (a same-origin blob with full session — an attribute would
+	// only break leftover features like unsandboxed popups for OAuth flows, while
+	// adding no isolation). The sandboxed path keeps the restrictive attribute; the
+	// wrapper document's `CSP: sandbox` response header enforces the opaque origin
+	// regardless.
+	let sandboxAttr = $derived(
+		unsandboxed
+			? undefined
+			: 'allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-downloads allow-modals allow-top-navigation'
+	)
+
+	// WIN-2006: source of the bundle iframe.
+	// - DEFAULT (isolated): a real API URL serving a sandboxed, opaque-origin
+	//   document (`CSP: sandbox` response header + the iframe sandbox attribute),
+	//   so a malicious bundle can never reach the authenticated Windmill origin
+	//   (no cookie, no window.parent, no token). Root-relative so it resolves
+	//   against the real host even when this component itself runs inside an opaque
+	//   viewer (where `location.origin` is "null"). Context is handed over via
+	//   postMessage — never baked into the document, never a credential.
+	// - UNSANDBOXED (the default — publisher did not opt into isolation): a
+	//   client-built blob: wrapper (same-origin with the SPA) loaded with `allow-same-origin`,
+	//   so relative `fetch('/api/...')` and the session cookie work. The backend
+	//   `.html` is ALWAYS sandboxed, so we must build the same-origin wrapper here
+	//   rather than relax a real-origin endpoint a victim could be linked to.
+	let iframeSrc = $derived.by(() => {
+		if (!secret || typeof window === 'undefined') return undefined
+		if (unsandboxed) {
+			// untrack(user) so userStore refreshes don't regenerate the blob URL and
+			// reload the iframe (losing state); ctx is only needed for initial render.
+			// Always pass the wrapper object — pre-sandbox bundles rely on
+			// `window.ctx.workspace` even for anonymous viewers (ctx.ctx undefined).
+			const u = untrack(() => user)
+			const html = unsandboxedRawAppHtml(
+				workspace,
+				secret,
+				{ ctx: u, workspace },
+				window.location.origin,
+				window.location.hash || ''
+			)
+			return URL.createObjectURL(new Blob([html], { type: 'text/html' }))
+		}
+		// `wm_coep` (embed-in-cross-origin-isolated-page opt-in) must be propagated
+		// to the wrapper document: under a COEP `require-corp` embedder, a nested
+		// document is only allowed to load if it asserts COEP itself, so the
+		// backend adds the header when the flag is present.
+		const coep = new URLSearchParams(window.location.search).has('wm_coep') ? '?wm_coep=1' : ''
+		return `/api/w/${workspace}/apps_u/get_data/v/${secret}.html${coep}`
 	})
 
-	// Use blob URL instead of srcDoc to give the iframe a proper origin.
-	// srcDoc iframes have "null" origin which breaks URL constructor in routers.
-	// untrack(user) so that userStore refreshes don't regenerate the blob URL
-	// and cause the iframe to fully reload (losing all state).
-	// The user context is only needed for initial render.
-	let blobUrl = $derived.by(() => {
-		if (!secret) return undefined
-		const u = untrack(() => user)
-		const baseUrl = typeof window !== 'undefined' ? window.location.origin : ''
-		const html = htmlContent(workspace, secret, { ctx: u, workspace }, baseUrl, initialHash)
-		const blob = new Blob([html], { type: 'text/html' })
-		return URL.createObjectURL(blob)
-	})
-
-	// Cleanup blob URL when it changes or component unmounts
+	// Revoke blob: URLs (unsandboxed path) when they change or on unmount.
 	$effect(() => {
-		const url = blobUrl
+		const url = iframeSrc
 		return () => {
-			if (url) URL.revokeObjectURL(url)
+			if (url && url.startsWith('blob:')) URL.revokeObjectURL(url)
+		}
+	})
+
+	// Persistence for the bundle's (opaque-origin) localStorage, backed by a store
+	// scoped PER APP (keyed by workspace + app path) so one sandboxed app can't read
+	// or clobber another's (even two apps at the same path in different workspaces). On a real origin (workspace viewer, public page — even when
+	// that page sits inside someone else's iframe) it reads/writes real localStorage
+	// directly. Only inside an opaque frame (the Windmill embed viewer), where Web
+	// Storage throws, does it relay per-key ops up to the embedder, the persistence
+	// authority. `framed` therefore probes storage rather than just `window.parent`:
+	// an externally-embedded public page is framed too, but its parent is not the
+	// Windmill embedder and would never answer the relay (leaving the bundle without
+	// ctx). The snapshot is handed to the bundle before it evaluates so its
+	// localStorage is hydrated synchronously.
+	const SHARED_LS_KEY = `wm_apps_localstorage:${workspace}:${path}`
+	function storageAccessible(): boolean {
+		try {
+			localStorage.getItem(SHARED_LS_KEY)
+			return true
+		} catch (_) {
+			return false
+		}
+	}
+	const framed = typeof window !== 'undefined' && window.parent !== window && !storageAccessible()
+	let bundleStorage: Record<string, string> | undefined = undefined
+	let pendingReady = false
+
+	function readDirect(): Record<string, string> {
+		try {
+			return JSON.parse(localStorage.getItem(SHARED_LS_KEY) || '{}')
+		} catch (_) {
+			return {}
+		}
+	}
+
+	function applyDirectOp(d: any) {
+		try {
+			const s = readDirect()
+			if (d.op === 'set') s[d.key] = String(d.value)
+			else if (d.op === 'remove') delete s[d.key]
+			else if (d.op === 'clear') for (const k in s) delete s[k]
+			localStorage.setItem(SHARED_LS_KEY, JSON.stringify(s))
+		} catch (_) {}
+	}
+
+	function respondCtx() {
+		iframe?.contentWindow?.postMessage(
+			{
+				type: 'windmill:ctx',
+				// Same shape as the unsandboxed wrapper: always the object, so
+				// `window.ctx.workspace` works for anonymous viewers too.
+				ctx: { ctx: user, workspace },
+				initialHash,
+				storage: { local: bundleStorage ?? {}, session: {} }
+			},
+			'*'
+		)
+	}
+
+	onMount(() => {
+		initialHash = window.location.hash || ''
+		if (framed) {
+			// Pre-fetch the shared store from the embedder.
+			try {
+				window.parent.postMessage({ type: 'wm_ls_req' }, '*')
+			} catch (_) {}
+			// If the parent never answers (it isn't the Windmill embedder, e.g. an
+			// opaque context created by a third party), don't hold the bundle's ctx
+			// hostage: proceed with empty storage. Must beat the backend wrapper's
+			// own 1.5s no-ctx fallback.
+			const fallback = setTimeout(() => {
+				if (bundleStorage === undefined) {
+					bundleStorage = {}
+					if (pendingReady) {
+						pendingReady = false
+						respondCtx()
+					}
+				}
+			}, 750)
+			return () => clearTimeout(fallback)
 		}
 	})
 
-	// Listen for hash changes from iframe and update parent URL
 	$effect(() => {
 		function handleMessage(event: MessageEvent) {
-			console.log('[Parent] Received message:', event.data)
-			if (event.data?.type === 'windmill:hashchange') {
-				const newHash = event.data.hash || ''
-				console.log('[Parent] Updating hash to:', newHash)
-				// Update parent URL without triggering navigation
+			const data = event.data
+			// Shared-store hydration from the embedder (public mode only).
+			if (framed && event.source === window.parent && data?.type === 'wm_ls_hydrate') {
+				bundleStorage = data.data || {}
+				if (pendingReady) {
+					pendingReady = false
+					respondCtx()
+				}
+				return
+			}
+			// Everything else must come from the bundle iframe.
+			if (event.source !== iframe?.contentWindow) return
+			if (data?.type === 'windmill:ready') {
+				// Hand the bundle its context + shared storage before it evaluates.
+				if (!framed) {
+					bundleStorage = readDirect()
+					respondCtx()
+				} else if (bundleStorage !== undefined) {
+					respondCtx()
+				} else {
+					pendingReady = true
+				}
+			} else if (data?.type === 'wm_ls_op') {
+				// The bundle mutated localStorage — apply it to the shared store.
+				if (!framed) {
+					applyDirectOp(data)
+				} else {
+					try {
+						window.parent.postMessage(
+							{ type: 'wm_ls_op', op: data.op, key: data.key, value: data.value },
+							'*'
+						)
+					} catch (_) {}
+				}
+			} else if (data?.type === 'windmill:hashchange') {
+				// Keep the parent URL hash in sync for shareable URLs.
+				const newHash = data.hash || ''
 				if (window.location.hash !== newHash) {
 					history.replaceState(null, '', newHash || window.location.pathname)
 				}
@@ -65,13 +212,29 @@
 	})
 </script>
 
-<RawAppBackgroundRunner {workspace} editor={false} {iframe} {runnables} {path} />
+<RawAppBackgroundRunner
+	{workspace}
+	editor={false}
+	{iframe}
+	{runnables}
+	{path}
+	gateJobIds={!unsandboxed}
+/>
 
-{#if blobUrl}
+{#if iframeSrc}
+	<!-- `unsandboxed` (the default — publisher did not opt into isolation) adds
+	     allow-same-origin and loads a same-origin blob: wrapper, so the bundle runs
+	     with full access. The sandboxed path loads the always-CSP-sandboxed backend
+	     wrapper, which stays opaque even on direct navigation. -->
+	<!-- referrerpolicy (sandboxed only, for exact legacy parity): the hosting page
+	     URL can carry a viewer credential (the JWT path segment of share links);
+	     without this, the bundle document would see it via document.referrer. -->
 	<iframe
 		bind:this={iframe}
 		title="raw-app"
-		src={blobUrl}
+		src={iframeSrc}
+		sandbox={sandboxAttr}
+		referrerpolicy={unsandboxed ? undefined : 'no-referrer'}
 		class="w-full h-full min-h-screen bg-white border-none"
 	></iframe>
 {/if}
diff --git a/frontend/src/lib/components/raw_apps/RawAppSharedUiDrawer.svelte b/frontend/src/lib/components/raw_apps/RawAppSharedUiDrawer.svelte
index eedf10239f..b84a60ca0f 100644
--- a/frontend/src/lib/components/raw_apps/RawAppSharedUiDrawer.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppSharedUiDrawer.svelte
@@ -6,6 +6,10 @@
 	import DrawerContent from '../common/drawer/DrawerContent.svelte'
 	import Editor from '$lib/components/Editor.svelte'
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
+
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
 
 	let open = $state(false)
 	let files: Record<string, string> = $state({})
@@ -20,10 +24,10 @@
 	}
 
 	async function load() {
-		if (!$workspaceStore) return
+		if (!opWs) return
 		loading = true
 		try {
-			const res = (await WorkspaceService.getSharedUi({ workspace: $workspaceStore })) as any
+			const res = (await WorkspaceService.getSharedUi({ workspace: opWs })) as any
 			files = res.files ?? {}
 			version = res.version ?? 0
 			editedBy = res.edited_by ?? ''
diff --git a/frontend/src/lib/components/raw_apps/RawAppTemplatePicker.svelte b/frontend/src/lib/components/raw_apps/RawAppTemplatePicker.svelte
index 308c554891..e37892516b 100644
--- a/frontend/src/lib/components/raw_apps/RawAppTemplatePicker.svelte
+++ b/frontend/src/lib/components/raw_apps/RawAppTemplatePicker.svelte
@@ -3,6 +3,7 @@
 	import type { Policy } from '$lib/gen'
 	import { userStore, workspaceStore } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
+	import { getRawAppOperatingWorkspace } from './rawAppWorkspace'
 	import Modal from '$lib/components/common/modal/Modal.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import TextInput from '$lib/components/text_input/TextInput.svelte'
@@ -60,8 +61,14 @@
 	let preWhitelistedTables = $state<DataTableRef[]>([])
 	let dataTableDrawer: RawAppDataTableDrawer | undefined = $state()
 
-	const datatables = createDatatablesResource(() => $workspaceStore)
-	const schemas = createSchemasResource(() => selectedDatatable)
+	const getOpWs = getRawAppOperatingWorkspace()
+	let opWs = $derived(getOpWs?.() ?? $workspaceStore)
+
+	const datatables = createDatatablesResource(() => opWs)
+	const schemas = createSchemasResource(
+		() => selectedDatatable,
+		() => opWs
+	)
 
 	const availableDatatables = $derived(datatables.current)
 	const availableSchemas = $derived(schemas.current)
@@ -115,11 +122,11 @@
 	async function start(withPrompt: boolean) {
 		const template = templates[selectedTemplateIndex]
 
-		if (schemaMode === 'new' && newSchemaName && selectedDatatable && $workspaceStore) {
+		if (schemaMode === 'new' && newSchemaName && selectedDatatable && opWs) {
 			try {
 				const { dbSchemaOpsWithPreviewScripts } = await import('$lib/components/dbOps')
 				const dbOps = dbSchemaOpsWithPreviewScripts({
-					workspace: $workspaceStore,
+					workspace: opWs,
 					input: {
 						type: 'database',
 						resourceType: 'postgresql',
diff --git a/frontend/src/lib/components/raw_apps/datatableUtils.svelte.ts b/frontend/src/lib/components/raw_apps/datatableUtils.svelte.ts
index bdb93355c6..5e25b73eca 100644
--- a/frontend/src/lib/components/raw_apps/datatableUtils.svelte.ts
+++ b/frontend/src/lib/components/raw_apps/datatableUtils.svelte.ts
@@ -25,22 +25,29 @@ export function createDatatablesResource(getWorkspace: () => string | undefined)
  * Creates a resource that loads schemas for a given datatable.
  * The getDatatable getter is used as a reactive dependency - when it changes, schemas are refetched.
  */
-export function createSchemasResource(getDatatable: () => string | undefined) {
-	return resource<string[]>([() => getDatatable() ?? ''], async () => {
+export function createSchemasResource(
+	getDatatable: () => string | undefined,
+	getWorkspace: () => string | undefined = () => get(workspaceStore)
+) {
+	return resource<string[]>([() => getDatatable() ?? '', () => getWorkspace() ?? ''], async () => {
 		const datatable = getDatatable()
-		const workspace = get(workspaceStore)
+		const workspace = getWorkspace()
 		if (!datatable || !workspace) return []
 
 		const resourcePath = `datatable://${datatable}`
+		// Key the schema cache by workspace too: a datatable of the same name can
+		// exist in both the nav and the acting workspace, so `datatable://<name>`
+		// alone would let one workspace's schema be reused for the other.
+		const cacheKey = `${workspace}:${resourcePath}`
 		const schemas = get(dbSchemas)
-		let dbSchema = schemas[resourcePath]
+		let dbSchema = schemas[cacheKey]
 
 		if (!dbSchema) {
 			try {
-				schemas[resourcePath] = await getDbSchemas('postgresql', resourcePath, workspace, (msg) =>
+				schemas[cacheKey] = await getDbSchemas('postgresql', resourcePath, workspace, (msg) =>
 					console.error('Schema error:', msg)
 				)
-				dbSchema = get(dbSchemas)[resourcePath]
+				dbSchema = get(dbSchemas)[cacheKey]
 			} catch (e) {
 				console.error(`Failed to load schema for ${datatable}:`, e)
 				return []
diff --git a/frontend/src/lib/components/raw_apps/rawAppDiffUtils.test.ts b/frontend/src/lib/components/raw_apps/rawAppDiffUtils.test.ts
new file mode 100644
index 0000000000..300b5dde1e
--- /dev/null
+++ b/frontend/src/lib/components/raw_apps/rawAppDiffUtils.test.ts
@@ -0,0 +1,299 @@
+import { describe, expect, it } from 'vitest'
+import {
+	parseRawAppDiff,
+	rawAppDiffToItems,
+	RAW_APP_METADATA_PATH,
+	type RawAppDiffEntry
+} from './rawAppDiffUtils'
+
+function byPath(entries: RawAppDiffEntry[], path: string): RawAppDiffEntry | undefined {
+	return entries.find((e) => e.path === path)
+}
+
+describe('parseRawAppDiff — files', () => {
+	it('detects added, removed and modified files, omits unchanged', () => {
+		const original = {
+			files: { 'index.html': '<h1>hi</h1>', 'styles.css': 'body{}', 'gone.js': 'x' }
+		}
+		const current = {
+			files: { 'index.html': '<h1>hello</h1>', 'styles.css': 'body{}', 'new.ts': 'y' }
+		}
+		const entries = parseRawAppDiff(original, current)
+		const paths = entries.map((e) => e.path).sort()
+		// styles.css unchanged → omitted
+		expect(paths).toEqual(['gone.js', 'index.html', 'new.ts'])
+
+		expect(byPath(entries, 'index.html')?.status).toBe('modified')
+		expect(byPath(entries, 'index.html')?.lang).toBe('html')
+		expect(byPath(entries, 'gone.js')?.status).toBe('removed')
+		expect(byPath(entries, 'new.ts')?.status).toBe('added')
+		expect(byPath(entries, 'new.ts')?.lang).toBe('typescript')
+	})
+
+	it('carries original/current content on the right sides', () => {
+		const entries = parseRawAppDiff(
+			{ files: { 'a.txt': 'old', 'b.txt': 'keep' } },
+			{ files: { 'a.txt': 'new', 'b.txt': 'keep' } }
+		)
+		const a = byPath(entries, 'a.txt')!
+		expect(a.original).toBe('old')
+		expect(a.current).toBe('new')
+	})
+})
+
+describe('parseRawAppDiff — runnables', () => {
+	it('emits per-runnable leaves for add/remove/modify', () => {
+		const original = {
+			runnables: { a: { path: 'u/x/a' }, b: { path: 'u/x/b' }, same: { path: 'u/x/same' } }
+		}
+		const current = {
+			runnables: { a: { path: 'u/x/a2' }, c: { path: 'u/x/c' }, same: { path: 'u/x/same' } }
+		}
+		const entries = parseRawAppDiff(original, current)
+		expect(byPath(entries, 'runnables/a')?.status).toBe('modified')
+		expect(byPath(entries, 'runnables/a')?.lang).toBe('yaml')
+		expect(byPath(entries, 'runnables/b')?.status).toBe('removed')
+		expect(byPath(entries, 'runnables/c')?.status).toBe('added')
+		// identical runnable omitted
+		expect(byPath(entries, 'runnables/same')).toBeUndefined()
+	})
+})
+
+describe('parseRawAppDiff — metadata', () => {
+	it('collapses summary/data/policy/custom_path into one app.yaml leaf', () => {
+		const entries = parseRawAppDiff(
+			{ summary: 'old summary', custom_path: 'foo' },
+			{ summary: 'new summary', custom_path: 'foo' }
+		)
+		const meta = byPath(entries, RAW_APP_METADATA_PATH)
+		expect(meta?.status).toBe('modified')
+		expect(meta?.lang).toBe('yaml')
+		expect(meta?.original).toContain('old summary')
+		expect(meta?.current).toContain('new summary')
+	})
+
+	it('omits app.yaml when no metadata field changed', () => {
+		const entries = parseRawAppDiff(
+			{ files: { 'a.txt': '1' }, summary: 's' },
+			{ files: { 'a.txt': '2' }, summary: 's' }
+		)
+		expect(byPath(entries, RAW_APP_METADATA_PATH)).toBeUndefined()
+		expect(entries).toHaveLength(1)
+	})
+})
+
+describe('parseRawAppDiff — whole app added / removed', () => {
+	it('marks everything added when the original side is absent', () => {
+		const current = {
+			files: { 'index.html': '<h1>hi</h1>' },
+			runnables: { a: { path: 'u/x/a' } },
+			summary: 'brand new'
+		}
+		const entries = parseRawAppDiff(undefined, current)
+		expect(entries.every((e) => e.status === 'added')).toBe(true)
+		expect(byPath(entries, 'index.html')?.original).toBeUndefined()
+		expect(byPath(entries, RAW_APP_METADATA_PATH)?.status).toBe('added')
+	})
+
+	it('marks everything removed when the current side is absent', () => {
+		const original = {
+			files: { 'index.html': '<h1>hi</h1>' },
+			runnables: { a: { path: 'u/x/a' } },
+			summary: 'going away'
+		}
+		const entries = parseRawAppDiff(original, undefined)
+		expect(entries.every((e) => e.status === 'removed')).toBe(true)
+		expect(byPath(entries, 'index.html')?.current).toBeUndefined()
+	})
+})
+
+describe('parseRawAppDiff — collisions', () => {
+	it('disambiguates synthesized paths against real files', () => {
+		const original = { files: { 'app.yaml': 'real-old' }, summary: 'sa' }
+		const current = { files: { 'app.yaml': 'real-new' }, summary: 'sb' }
+		const entries = parseRawAppDiff(original, current)
+		// The real file keeps the natural path.
+		const realFile = byPath(entries, 'app.yaml')!
+		expect(realFile.original).toBe('real-old')
+		// The metadata leaf is pushed to a non-colliding path.
+		const meta = byPath(entries, 'app.yaml~2')!
+		expect(meta.original).toContain('sa')
+		expect(meta.current).toContain('sb')
+		// No two entries share a path.
+		const paths = entries.map((e) => e.path)
+		expect(new Set(paths).size).toBe(paths.length)
+	})
+})
+
+describe('parseRawAppDiff — input shapes', () => {
+	// getItemValue returns the deployed app row: files/runnables/data live under
+	// `value`; summary/policy/custom_path at the top level.
+	it('reads files/runnables/data from the `value` wrapper (app-row shape)', () => {
+		const original = {
+			summary: 'classy',
+			policy: { execution_mode: 'viewer' },
+			value: { files: { 'index.html': '<h1>a</h1>' }, runnables: {}, data: {} }
+		}
+		const current = {
+			summary: 'classy',
+			policy: { execution_mode: 'viewer' },
+			value: { files: { 'index.html': '<h1>b</h1>' }, runnables: {}, data: {} }
+		}
+		const entries = parseRawAppDiff(original, current)
+		const file = byPath(entries, 'index.html')
+		expect(file?.status).toBe('modified')
+		expect(file?.original).toBe('<h1>a</h1>')
+		expect(file?.current).toBe('<h1>b</h1>')
+	})
+
+	it('still handles the flat draft shape (files at top level)', () => {
+		const entries = parseRawAppDiff({ files: { 'a.ts': 'x' } }, { files: { 'a.ts': 'y' } })
+		expect(byPath(entries, 'a.ts')?.status).toBe('modified')
+	})
+
+	it('prefers `value` over a stray top-level files key', () => {
+		const entries = parseRawAppDiff(
+			{ files: { 'top.ts': 'ignored' }, value: { files: { 'real.ts': 'a' } } },
+			{ files: { 'top.ts': 'ignored' }, value: { files: { 'real.ts': 'b' } } }
+		)
+		expect(byPath(entries, 'real.ts')?.status).toBe('modified')
+		expect(byPath(entries, 'top.ts')).toBeUndefined()
+	})
+})
+
+describe('rawAppDiffToItems', () => {
+	const appPath = 'u/admin/classy_app'
+
+	it('produces composite-pathed items with status-derived exists flags', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ value: { files: { '/App.tsx': 'a', '/gone.ts': 'x' }, runnables: { r: { p: 1 } } } },
+			{ value: { files: { '/App.tsx': 'b', '/new.ts': 'y' }, runnables: {} } }
+		)
+		const byPath = (p: string) => items.find((i) => i.path === p)
+
+		const app = byPath('u/admin/classy_app/App.tsx')!
+		expect(app.kind).toBe('raw_app_file')
+		expect(app.status).toBe('modified')
+		expect(app.exists_in_source).toBe(true)
+		expect(app.exists_in_fork).toBe(true)
+		expect(app.appPath).toBe(appPath)
+		expect((app as any).lang).toBe('typescript')
+
+		const gone = byPath('u/admin/classy_app/gone.ts')!
+		expect(gone.status).toBe('removed')
+		expect(gone.exists_in_source).toBe(true)
+		expect(gone.exists_in_fork).toBe(false)
+
+		const added = byPath('u/admin/classy_app/new.ts')!
+		expect(added.status).toBe('added')
+		expect(added.exists_in_source).toBe(false)
+		expect(added.exists_in_fork).toBe(true)
+
+		// Runnables render as script/flow rows, not file leaves.
+		const runnable = byPath('u/admin/classy_app/runnables/r')!
+		expect(runnable.kind).toBe('script')
+		expect(runnable.status).toBe('removed')
+	})
+
+	it('renders an inline-script runnable as a script row with code hoisted', () => {
+		const mk = (code: string) => ({
+			value: {
+				files: {},
+				runnables: {
+					a: { name: 'a', type: 'inline', inlineScript: { content: code, language: 'bun' } }
+				}
+			}
+		})
+		const items = rawAppDiffToItems(appPath, mk('old code'), mk('new code'))
+		const r = items.find((i) => i.path === `${appPath}/runnables/a`)
+		expect(r?.kind).toBe('script')
+		expect(r?.status).toBe('modified')
+		// content + language hoisted to the top level for the script-style viewer
+		const cur = (r as any).currentRaw
+		expect(cur.content).toBe('new code')
+		expect(cur.language).toBe('bun')
+		expect(cur.inlineScript.content).toBeUndefined()
+	})
+
+	it('picks the flow kind for a runType:flow runnable', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ value: { files: {}, runnables: {} } },
+			{ value: { files: {}, runnables: { f: { runType: 'flow', path: 'u/x/f' } } } }
+		)
+		const r = items.find((i) => i.path === `${appPath}/runnables/f`)
+		expect(r?.kind).toBe('flow')
+		expect(r?.status).toBe('added')
+	})
+
+	it('flags the metadata item and attaches whole-app YAML for the expand view', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ summary: 'old', value: { files: {} } },
+			{ summary: 'new', value: { files: {} } }
+		)
+		const meta = items.find((i) => i.path === `${appPath}/${RAW_APP_METADATA_PATH}`) as any
+		expect(meta.kind).toBe('raw_app_file')
+		expect(meta.isMetadata).toBe(true)
+		expect(meta.fullYamlOriginal).toContain('old')
+		expect(meta.fullYamlCurrent).toContain('new')
+	})
+
+	it('keeps the metadata flag on the right item when a real file is named app.yaml', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ summary: 'old', value: { files: { 'app.yaml': 'real-old' } } },
+			{ summary: 'new', value: { files: { 'app.yaml': 'real-new' } } }
+		)
+		// Real file keeps the natural path and is NOT the metadata item.
+		const realFile = items.find((i) => i.path === `${appPath}/app.yaml`) as any
+		expect(realFile.isMetadata).toBe(false)
+		expect(realFile.fullYamlCurrent).toBeUndefined()
+		// Synthesized metadata moved to app.yaml~2 but still carries the flag + YAML.
+		const meta = items.find((i) => i.path === `${appPath}/app.yaml~2`) as any
+		expect(meta.isMetadata).toBe(true)
+		expect(meta.fullYamlCurrent).toContain('new')
+	})
+
+	it('keeps the metadata flag on the right item when a real file is named /app.yaml (leading slash)', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ summary: 'old', value: { files: { '/app.yaml': 'real-old' } } },
+			{ summary: 'new', value: { files: { '/app.yaml': 'real-new' } } }
+		)
+		const realFile = items.find((i) => i.path === `${appPath}/app.yaml`) as any
+		const meta = items.find((i) => i.path === `${appPath}/app.yaml~2`) as any
+		expect(realFile.isMetadata).toBe(false)
+		expect(meta.isMetadata).toBe(true)
+		// distinct composite paths → distinct row keys
+		expect(realFile.path).not.toBe(meta.path)
+	})
+
+	it('treats a file keyed /App.tsx on one side and App.tsx on the other as one item', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ value: { files: { '/App.tsx': 'old' } } },
+			{ value: { files: { 'App.tsx': 'new' } } }
+		)
+		const files = items.filter((i) => i.path === `${appPath}/App.tsx`)
+		expect(files).toHaveLength(1)
+		expect(files[0].status).toBe('modified')
+		expect((files[0] as any).original).toBe('old')
+		expect((files[0] as any).current).toBe('new')
+	})
+
+	it('dedups a runnable leaf against a real file named runnables/<name>', () => {
+		const items = rawAppDiffToItems(
+			appPath,
+			{ value: { files: { '/runnables/foo': 'old' }, runnables: { foo: { p: 1 } } } },
+			{ value: { files: { '/runnables/foo': 'new' }, runnables: { foo: { p: 2 } } } }
+		)
+		const realFile = items.find((i) => i.kind === 'raw_app_file')!
+		const runnable = items.find((i) => i.kind === 'script')!
+		expect(realFile.path).toBe(`${appPath}/runnables/foo`)
+		// Reserved away from the real file's composite path (slash-normalized).
+		expect(runnable.path).toBe(`${appPath}/runnables/foo~2`)
+		expect(runnable.path).not.toBe(realFile.path)
+	})
+})
diff --git a/frontend/src/lib/components/raw_apps/rawAppDiffUtils.ts b/frontend/src/lib/components/raw_apps/rawAppDiffUtils.ts
new file mode 100644
index 0000000000..444e03a0a3
--- /dev/null
+++ b/frontend/src/lib/components/raw_apps/rawAppDiffUtils.ts
@@ -0,0 +1,383 @@
+import { extToLang } from '$lib/editorLangUtils'
+import { cleanValueProperties, orderedYamlStringify, replaceFalseWithUndefined } from '$lib/utils'
+
+// A raw app rendered as a *folder of files* for diffing. Each entry is one
+// virtual file: real `files` keep their natural path, runnables become
+// `runnables/<name>`, and the remaining app metadata collapses into a single
+// `app.yaml` leaf. Only changed entries are emitted (unchanged are omitted).
+export type RawAppDiffStatus = 'added' | 'removed' | 'modified'
+
+export interface RawAppDiffEntry {
+	/** Tree path. Real file path, `runnables/<name>`, or `app.yaml`. */
+	path: string
+	status: RawAppDiffStatus
+	/** Original (parent) side content. Undefined when status is `added`. */
+	original?: string
+	/** Current (fork) side content. Undefined when status is `removed`. */
+	current?: string
+	/** Monaco language id for the per-file diff editor. */
+	lang: string
+	/** True for the synthesized metadata leaf. Tracked as a flag (not by matching
+	 * `path === 'app.yaml'`) so it survives `reserveUnique` moving the leaf to
+	 * `app.yaml~2` when a real file is literally named `app.yaml`. */
+	isMetadata?: boolean
+}
+
+// Loose shape — diff inputs come from `getItemValue` / drafts and aren't
+// strictly typed, and arrive in TWO shapes:
+//   - the deployed app row (getAppByPath): `{ summary, policy, custom_path?,
+//     value: { files, runnables, data } }` — files/runnables/data nested under
+//     `value`.
+//   - the flat draft/runtime shape (RawAppDraft / RuntimeRawApp): everything at
+//     the top level.
+// `normalizeRawApp` coalesces both. Anything not present is empty/absent.
+export interface RawAppish {
+	value?: Record<string, unknown>
+	files?: Record<string, string>
+	runnables?: Record<string, unknown>
+	summary?: unknown
+	data?: unknown
+	policy?: unknown
+	custom_path?: unknown
+	[k: string]: unknown
+}
+
+interface NormalizedRawApp {
+	files: Record<string, string>
+	runnables: Record<string, unknown>
+	summary: unknown
+	data: unknown
+	policy: unknown
+	custom_path: unknown
+}
+
+export const RAW_APP_METADATA_PATH = 'app.yaml'
+const RUNNABLES_PREFIX = 'runnables/'
+const METADATA_FIELDS = ['summary', 'data', 'policy', 'custom_path'] as const
+
+// Real file keys may carry a leading slash (`/App.tsx`) which `joinAppPath`
+// strips. Collision reservation must compare in the stripped space, else a real
+// `/app.yaml` and the synthetic `app.yaml` leaf both become `<appPath>/app.yaml`.
+const stripLeadingSlash = (p: string) => p.replace(/^\/+/, '')
+
+function isObject(v: unknown): v is Record<string, unknown> {
+	return !!v && typeof v === 'object'
+}
+
+function asFileMap(f: unknown): Record<string, string> {
+	if (!isObject(f)) return {}
+	const out: Record<string, string> = {}
+	for (const [k, v] of Object.entries(f)) {
+		// Canonicalize the key (strip the leading slash `joinAppPath` would strip
+		// anyway) so the same file keyed `/App.tsx` on one side and `App.tsx` on the
+		// other is treated as one file — not two leaves colliding at the same
+		// composite path. Coerce non-string content so the diff editor gets a string.
+		out[stripLeadingSlash(k)] = typeof v === 'string' ? v : String(v ?? '')
+	}
+	return out
+}
+
+// Coalesce the two raw-app shapes (app row with a `value` wrapper vs flat draft)
+// into a canonical view. Returns undefined when the whole app is absent.
+//
+// Per-field precedence is deliberately asymmetric and mirrors the app-row shape:
+// the editor payload (`files`/`runnables`/`data`) lives under `value`, so those
+// prefer `value` first; the row-level metadata (`summary`/`policy`/`custom_path`)
+// lives at the top level, so those prefer `raw` first. Each falls back to the
+// other side so a flat draft (everything top-level) still normalizes correctly.
+function normalizeRawApp(raw: RawAppish | undefined): NormalizedRawApp | undefined {
+	if (!isObject(raw)) return undefined
+	const value = isObject(raw.value) ? raw.value : undefined
+	return {
+		files: asFileMap(value?.files ?? raw.files),
+		runnables: isObject(value?.runnables ?? raw.runnables)
+			? ((value?.runnables ?? raw.runnables) as Record<string, unknown>)
+			: {},
+		summary: raw.summary ?? value?.summary,
+		data: value?.data ?? raw.data,
+		policy: raw.policy ?? value?.policy,
+		custom_path: raw.custom_path ?? value?.custom_path
+	}
+}
+
+// The serialized metadata blob for one side, or undefined when the whole app
+// is absent (so the `app.yaml` leaf reads as added/removed).
+function metadataYaml(app: NormalizedRawApp | undefined): string | undefined {
+	if (!app) return undefined
+	const meta: Record<string, unknown> = {}
+	for (const field of METADATA_FIELDS) {
+		if (app[field] !== undefined) meta[field] = app[field]
+	}
+	return orderedYamlStringify(meta)
+}
+
+function extOf(path: string): string {
+	const base = path.split('/').pop() ?? path
+	const dot = base.lastIndexOf('.')
+	return dot >= 0 ? base.slice(dot + 1).toLowerCase() : ''
+}
+
+function diffStatus(o: string | undefined, c: string | undefined): RawAppDiffStatus | undefined {
+	if (o === undefined && c !== undefined) return 'added'
+	if (o !== undefined && c === undefined) return 'removed'
+	if (o !== c) return 'modified'
+	return undefined
+}
+
+// Reserve a synthesized path, disambiguating against already-taken paths so a
+// real file literally named `app.yaml` or under `runnables/` never collides
+// with a synthesized leaf.
+function reserveUnique(path: string, taken: Set<string>): string {
+	if (!taken.has(path)) {
+		taken.add(path)
+		return path
+	}
+	let i = 2
+	while (taken.has(`${path}~${i}`)) i++
+	const p = `${path}~${i}`
+	taken.add(p)
+	return p
+}
+
+/**
+ * Diff two raw-app objects into a flat list of changed virtual files. Either
+ * side may be undefined (whole app added or removed). Consumers build a tree
+ * from the returned paths with `buildFileTree`.
+ */
+export function parseRawAppDiff(
+	original: RawAppish | undefined,
+	current: RawAppish | undefined,
+	opts: { includeRunnables?: boolean } = {}
+): RawAppDiffEntry[] {
+	const { includeRunnables = true } = opts
+	const oApp = normalizeRawApp(original)
+	const cApp = normalizeRawApp(current)
+	const oFiles = oApp?.files ?? {}
+	const cFiles = cApp?.files ?? {}
+	const oRunnables = oApp?.runnables ?? {}
+	const cRunnables = cApp?.runnables ?? {}
+
+	// Reserve every real file path (changed or not) up front so synthesized
+	// runnable/metadata paths can dodge collisions — slash-normalized so a real
+	// `/app.yaml` or `/runnables/x` is seen as colliding with the synthetic leaf.
+	const taken = new Set<string>(
+		[...Object.keys(oFiles), ...Object.keys(cFiles)].map(stripLeadingSlash)
+	)
+
+	const entries: RawAppDiffEntry[] = []
+
+	// Real files.
+	for (const path of [...new Set([...Object.keys(oFiles), ...Object.keys(cFiles)])].sort()) {
+		const o = Object.prototype.hasOwnProperty.call(oFiles, path) ? oFiles[path] : undefined
+		const c = Object.prototype.hasOwnProperty.call(cFiles, path) ? cFiles[path] : undefined
+		const status = diffStatus(o, c)
+		if (!status) continue
+		entries.push({ path, status, original: o, current: c, lang: extToLang(extOf(path)) })
+	}
+
+	// Runnables → one YAML leaf each under `runnables/`. Consumers that render
+	// runnables as script/flow rows (rawAppDiffToItems) skip these and diff the
+	// runnable objects themselves.
+	const runnableNames = includeRunnables
+		? [...new Set([...Object.keys(oRunnables), ...Object.keys(cRunnables)])].sort()
+		: []
+	for (const name of runnableNames) {
+		const inO = Object.prototype.hasOwnProperty.call(oRunnables, name)
+		const inC = Object.prototype.hasOwnProperty.call(cRunnables, name)
+		const o = inO ? orderedYamlStringify(oRunnables[name]) : undefined
+		const c = inC ? orderedYamlStringify(cRunnables[name]) : undefined
+		const status = diffStatus(o, c)
+		if (!status) continue
+		entries.push({
+			path: reserveUnique(`${RUNNABLES_PREFIX}${name}`, taken),
+			status,
+			original: o,
+			current: c,
+			lang: 'yaml'
+		})
+	}
+
+	// Remaining metadata → single `app.yaml` leaf.
+	const oMeta = metadataYaml(oApp)
+	const cMeta = metadataYaml(cApp)
+	const metaStatus = diffStatus(oMeta, cMeta)
+	if (metaStatus) {
+		entries.push({
+			path: reserveUnique(RAW_APP_METADATA_PATH, taken),
+			status: metaStatus,
+			original: oMeta,
+			current: cMeta,
+			lang: 'yaml',
+			isMetadata: true
+		})
+	}
+
+	return entries
+}
+
+// A raw-app file rendered as a standalone diff item, shaped like a
+// WorkspaceItemDiff (so it flows through the existing list / tree / search /
+// count machinery) plus the embedded diff payload. `kind: 'raw_app_file'`
+// keeps it distinct from the backend kinds. The composite `path`
+// (`<appPath>/<file>`) nests it under the app's folder in the tree.
+export interface RawAppFileItem {
+	kind: 'raw_app_file'
+	path: string
+	/** Friendly composite path (`<displayAppPath>/<file>`) for tree display only;
+	 * `path` stays storage-keyed so a never-deployed draft still loads/edits via
+	 * its `…/draft_<uuid>` path. Defaults to `path` when no friendly path differs. */
+	displayPath?: string
+	ahead: number
+	behind: number
+	has_changes: boolean
+	exists_in_source: boolean
+	exists_in_fork: boolean
+	/** Workspace path of the owning raw app (for the edit link). */
+	appPath: string
+	status: RawAppDiffStatus
+	original?: string
+	current?: string
+	lang: string
+	/** True for the synthesized `app.yaml` metadata item. */
+	isMetadata: boolean
+	/** Whole serialized app (both sides) — only on the metadata item, for its
+	 * optional "expand to full YAML" view. */
+	fullYamlOriginal?: string
+	fullYamlCurrent?: string
+}
+
+// A raw-app runnable rendered as a script/flow item (what it actually is). It
+// carries the reshaped runnable object per side so the normal script-style
+// diff (Content + Metadata) renders it — inline code shows with proper syntax
+// highlighting instead of a YAML blob. `kind` drives the row icon/label
+// (script vs flow); the body is always rendered script-style.
+export interface RawAppRunnableItem {
+	kind: 'script' | 'flow'
+	path: string
+	/** Friendly composite path for tree display only (see RawAppFileItem). */
+	displayPath?: string
+	ahead: number
+	behind: number
+	has_changes: boolean
+	exists_in_source: boolean
+	exists_in_fork: boolean
+	appPath: string
+	status: RawAppDiffStatus
+	/** Reshaped runnable (content/language hoisted) for the diff viewer. */
+	originalRaw?: unknown
+	currentRaw?: unknown
+}
+
+export type RawAppSyntheticItem = RawAppFileItem | RawAppRunnableItem
+
+function joinAppPath(appPath: string, filePath: string): string {
+	// File keys may carry a leading slash (e.g. `/App.tsx`); strip it so the
+	// composite path has single separators and splits cleanly in the tree.
+	return `${appPath}/${filePath.replace(/^\/+/, '')}`
+}
+
+// The whole serialized app for one side, matching the previous YAML escape
+// hatch (cleaned + ordered). Undefined when the app is absent on that side.
+function wholeAppYaml(raw: RawAppish | undefined): string | undefined {
+	if (!isObject(raw)) return undefined
+	return orderedYamlStringify(cleanValueProperties(replaceFalseWithUndefined(raw)))
+}
+
+// Hoist an inline runnable's code + language to the top level so the
+// script-style diff viewer (which reads top-level `content`/`language`) shows
+// the code in the Content tab and the rest as Metadata. Path-referencing
+// runnables (no inline script) just fall through to a YAML metadata diff.
+function reshapeRunnable(runnable: unknown): unknown {
+	if (!isObject(runnable)) return runnable
+	const inline = isObject(runnable.inlineScript) ? runnable.inlineScript : undefined
+	if (!inline) return runnable
+	return {
+		...runnable,
+		content: inline.content,
+		language: inline.language,
+		// Drop the now-hoisted code so it isn't duplicated in the Metadata tab.
+		inlineScript: { ...inline, content: undefined }
+	}
+}
+
+// Runnables become script/flow rows; `runType: 'flow'` picks the flow icon.
+function runnableKind(...sides: unknown[]): 'script' | 'flow' {
+	return sides.some((s) => isObject(s) && s.runType === 'flow') ? 'flow' : 'script'
+}
+
+/**
+ * Expand a raw-app diff into standalone items for `appPath`:
+ * - files + the `app.yaml` metadata leaf → `RawAppFileItem`s (the metadata item
+ *   also carries the whole-app YAML for its expand view);
+ * - runnables → `RawAppRunnableItem`s (script/flow rows).
+ */
+export function rawAppDiffToItems(
+	appPath: string,
+	original: RawAppish | undefined,
+	current: RawAppish | undefined,
+	displayAppPath: string = appPath
+): RawAppSyntheticItem[] {
+	// Files + metadata (runnables handled separately as script/flow rows).
+	const fileItems = parseRawAppDiff(original, current, { includeRunnables: false }).map(
+		(e): RawAppFileItem => ({
+			kind: 'raw_app_file',
+			path: joinAppPath(appPath, e.path),
+			displayPath: joinAppPath(displayAppPath, e.path),
+			ahead: 0,
+			behind: 0,
+			has_changes: true,
+			exists_in_source: e.status !== 'added',
+			exists_in_fork: e.status !== 'removed',
+			appPath,
+			status: e.status,
+			original: e.original,
+			current: e.current,
+			lang: e.lang,
+			isMetadata: e.isMetadata ?? false
+		})
+	)
+	const metaItem = fileItems.find((i) => i.isMetadata)
+	if (metaItem) {
+		metaItem.fullYamlOriginal = wholeAppYaml(original)
+		metaItem.fullYamlCurrent = wholeAppYaml(current)
+	}
+
+	// Runnables → script/flow rows, diffed on their object value.
+	const oApp = normalizeRawApp(original)
+	const cApp = normalizeRawApp(current)
+	const oRun = oApp?.runnables ?? {}
+	const cRun = cApp?.runnables ?? {}
+	// Reserve each runnable's composite leaf against the real file paths, mirroring
+	// parseRawAppDiff, so a real file literally named `runnables/<name>` can't yield
+	// a second leaf at the same composite path. Normalize the leading slash (which
+	// joinAppPath strips) so `/runnables/x` and `runnables/x` are seen as equal.
+	const taken = new Set<string>(
+		[...Object.keys(oApp?.files ?? {}), ...Object.keys(cApp?.files ?? {})].map(stripLeadingSlash)
+	)
+	const runnableItems: RawAppRunnableItem[] = []
+	for (const name of [...new Set([...Object.keys(oRun), ...Object.keys(cRun)])].sort()) {
+		const inO = Object.prototype.hasOwnProperty.call(oRun, name)
+		const inC = Object.prototype.hasOwnProperty.call(cRun, name)
+		const oStr = inO ? orderedYamlStringify(oRun[name]) : undefined
+		const cStr = inC ? orderedYamlStringify(cRun[name]) : undefined
+		const status = diffStatus(oStr, cStr)
+		if (!status) continue
+		const rel = reserveUnique(`${RUNNABLES_PREFIX}${name}`, taken)
+		runnableItems.push({
+			kind: runnableKind(oRun[name], cRun[name]),
+			path: joinAppPath(appPath, rel),
+			displayPath: joinAppPath(displayAppPath, rel),
+			ahead: 0,
+			behind: 0,
+			has_changes: true,
+			exists_in_source: status !== 'added',
+			exists_in_fork: status !== 'removed',
+			appPath,
+			status,
+			originalRaw: inO ? reshapeRunnable(oRun[name]) : undefined,
+			currentRaw: inC ? reshapeRunnable(cRun[name]) : undefined
+		})
+	}
+
+	return [...fileItems, ...runnableItems]
+}
diff --git a/frontend/src/lib/components/raw_apps/rawAppDraftValue.ts b/frontend/src/lib/components/raw_apps/rawAppDraftValue.ts
index b99704436b..35ff0805d3 100644
--- a/frontend/src/lib/components/raw_apps/rawAppDraftValue.ts
+++ b/frontend/src/lib/components/raw_apps/rawAppDraftValue.ts
@@ -47,6 +47,12 @@ export function appSourceToDraftValue(app: any, fallback?: any): AppDraftValue {
 		runnables: { ...(value.runnables ?? {}) },
 		data: normalizeRawAppData(value),
 		policy: app.policy ?? fallback?.policy,
-		custom_path: app.custom_path ?? fallback?.custom_path
+		custom_path: app.custom_path ?? fallback?.custom_path,
+		// Pin the fork base: a deployed app exposes `versions` (head = last); an
+		// existing draft already carries `parent_version` — preserve it.
+		parent_version:
+			app.parent_version ??
+			(Array.isArray(app.versions) ? app.versions[app.versions.length - 1] : undefined) ??
+			fallback?.parent_version
 	}
 }
diff --git a/frontend/src/lib/components/raw_apps/rawAppPolicy.ts b/frontend/src/lib/components/raw_apps/rawAppPolicy.ts
index f33c6e7eb6..16f588c993 100644
--- a/frontend/src/lib/components/raw_apps/rawAppPolicy.ts
+++ b/frontend/src/lib/components/raw_apps/rawAppPolicy.ts
@@ -19,10 +19,11 @@ export async function updateRawAppPolicy(
 		)
 	).filter((entry): entry is [string, TriggerableV2] => entry != null)
 	const triggerables_v2 = Object.fromEntries(entries)
-	return {
+	const next: Policy = {
 		...currentPolicy,
 		triggerables_v2
 	}
+	return next
 }
 
 type RunnableWithInlineScript = RunnableWithFields & {
diff --git a/frontend/src/lib/components/raw_apps/rawAppWorkspace.ts b/frontend/src/lib/components/raw_apps/rawAppWorkspace.ts
new file mode 100644
index 0000000000..71702fd826
--- /dev/null
+++ b/frontend/src/lib/components/raw_apps/rawAppWorkspace.ts
@@ -0,0 +1,22 @@
+import { getContext, setContext } from 'svelte'
+
+// The workspace a raw-app editor operates on. In a session preview this is the
+// session's acting workspace, which differs from the navigation `$workspaceStore`
+// (a session deliberately leaves the nav store on the workspace the top nav
+// points at). RawAppEditor provides it once; the sidebar sub-components (inline
+// scripts, datatable/shared-UI drawers, DB selector, …) read it so their lookups
+// target the workspace the app actually lives in rather than the nav workspace.
+//
+// A getter (not a value) so the live `$derived` opWorkspace is read reactively at
+// each call site. Consumers fall back to `$workspaceStore` when unset — e.g. the
+// full-page app editor, where the nav workspace IS the operating workspace.
+
+const KEY = 'RawAppOperatingWorkspace'
+
+export function setRawAppOperatingWorkspace(get: () => string | undefined): void {
+	setContext(KEY, get)
+}
+
+export function getRawAppOperatingWorkspace(): (() => string | undefined) | undefined {
+	return getContext(KEY)
+}
diff --git a/frontend/src/lib/components/raw_apps/utils.test.ts b/frontend/src/lib/components/raw_apps/utils.test.ts
index b8ca6d207d..7d087a61ec 100644
--- a/frontend/src/lib/components/raw_apps/utils.test.ts
+++ b/frontend/src/lib/components/raw_apps/utils.test.ts
@@ -1,9 +1,11 @@
 import { describe, expect, it } from 'vitest'
 
 import {
+	canonicalRawAppDiffValue,
 	formatRuntimeLogsForChat,
 	genWmillTs,
 	normalizeRawAppRuntimeLogs,
+	stripRawAppDiffNoise,
 	type Runnable
 } from './utils'
 
@@ -61,3 +63,100 @@ describe('normalizeRawAppRuntimeLogs', () => {
 		expect(formatRuntimeLogsForChat(entries)).toBe('[06:13:20.000] LOG: ready')
 	})
 })
+
+// A deployed raw-app row as returned by getAppByPath: nested `value`, plus the
+// server-managed columns and a recomputed inline-script lock.
+function deployedRow() {
+	return {
+		id: 42,
+		raw_app: true,
+		is_draft: false,
+		created_at: '2024-01-01',
+		created_by: 'admin',
+		versions: [1, 2],
+		extra_perms: { 'u/admin': true },
+		summary: 'app',
+		path: 'u/admin/app',
+		policy: { execution_mode: 'publisher' },
+		value: {
+			files: { '/App.tsx': 'export default 1' },
+			runnables: {
+				a: { type: 'inline', inlineScript: { content: 'main()', language: 'bun', lock: 'deps\n' } }
+			}
+		}
+	}
+}
+
+describe('stripRawAppDiffNoise', () => {
+	it('drops server-managed columns, nulls inline locks and canonicalizes data', () => {
+		const cleaned = stripRawAppDiffNoise(deployedRow())
+
+		for (const key of [
+			'raw_app',
+			'id',
+			'created_at',
+			'created_by',
+			'versions',
+			'extra_perms',
+			'is_draft'
+		]) {
+			expect(cleaned).not.toHaveProperty(key)
+		}
+		expect(cleaned.value.runnables.a.inlineScript.lock).toBeUndefined()
+		// absent `data` is canonicalized to the default empty shape
+		expect(cleaned.value.data).toEqual({ tables: [], datatable: undefined, schema: undefined })
+	})
+
+	it('does not mutate the input (live editor state)', () => {
+		const input = deployedRow()
+		stripRawAppDiffNoise(input)
+		expect(input.raw_app).toBe(true)
+		expect(input.value.runnables.a.inlineScript.lock).toBe('deps\n')
+	})
+
+	it('handles the flat editor/draft shape (files/runnables top-level)', () => {
+		const flat = {
+			summary: 'app',
+			files: { '/App.tsx': 'x' },
+			runnables: {
+				a: { type: 'inline', inlineScript: { content: 'm()', language: 'bun', lock: 'l' } }
+			}
+		}
+		const cleaned = stripRawAppDiffNoise(flat)
+		expect(cleaned.runnables.a.inlineScript.lock).toBeUndefined()
+		expect(cleaned.data).toEqual({ tables: [], datatable: undefined, schema: undefined })
+	})
+})
+
+describe('canonicalRawAppDiffValue', () => {
+	it('collapses a nested deployed row and a flat draft to an identical value when content matches', () => {
+		const deployed = deployedRow()
+		// The flat draft shape a raw app autosaves: top-level files/runnables/data,
+		// no server columns, lock cleared on edit.
+		const draft = {
+			summary: 'app',
+			files: { '/App.tsx': 'export default 1' },
+			runnables: { a: { type: 'inline', inlineScript: { content: 'main()', language: 'bun' } } },
+			data: { tables: [] },
+			policy: { execution_mode: 'publisher' }
+		}
+
+		expect(canonicalRawAppDiffValue(deployed)).toEqual(canonicalRawAppDiffValue(draft))
+	})
+
+	it('still surfaces a real change (summary edit)', () => {
+		const deployed = deployedRow()
+		const draft = {
+			summary: 'app EDITED',
+			files: { '/App.tsx': 'export default 1' },
+			runnables: { a: { type: 'inline', inlineScript: { content: 'main()', language: 'bun' } } },
+			data: { tables: [] }
+		}
+
+		const a = canonicalRawAppDiffValue(deployed)
+		const b = canonicalRawAppDiffValue(draft)
+		expect(a).not.toEqual(b)
+		expect(a.summary).toBe('app')
+		expect(b.summary).toBe('app EDITED')
+	})
+})
diff --git a/frontend/src/lib/components/raw_apps/utils.ts b/frontend/src/lib/components/raw_apps/utils.ts
index 53d84fd97c..c0fba48e18 100644
--- a/frontend/src/lib/components/raw_apps/utils.ts
+++ b/frontend/src/lib/components/raw_apps/utils.ts
@@ -3,6 +3,8 @@ import type { Schema } from '../../common'
 import { schemaToTsType } from '../../schema'
 import { isRunnableByName, isRunnableByPath, type RunnableWithFields } from '../apps/inputType'
 import type { InlineScript } from '../apps/sharedTypes'
+import { stateSnapshot } from '$lib/svelte5Utils.svelte'
+import { appSourceToDraftValue, normalizeRawAppData } from './rawAppDraftValue'
 
 // export type RunnableWithFields = any
 
@@ -15,6 +17,66 @@ export type RawApp = {
 	files: string[]
 }
 
+// Server-managed columns the deployed app row (getAppByPath) carries but the
+// editor's current value never does — leaving them in renders as spurious diff.
+const RAW_APP_DEPLOYED_METADATA_KEYS = [
+	'raw_app',
+	'id',
+	'created_at',
+	'created_by',
+	'versions',
+	'extra_perms',
+	'is_draft'
+] as const
+
+/**
+ * Normalize a raw-app value before a deployed-vs-current diff (or unsaved-change
+ * comparison). Three sources of spurious post-deploy diff:
+ *  - the deployed row carries server-managed columns (`raw_app`, timestamps, …)
+ *    that the editor's current value lacks;
+ *  - inline-script `lock`s are recomputed server-side at every deploy and the
+ *    editor clears them on edit, so the editor value and the freshly deployed
+ *    one always diverge on `lock` even though the user changed nothing there;
+ *  - the deployed value omits an empty `data` while the editor always carries
+ *    the default `{ tables: [] }`, so even an untouched app reads as changed.
+ * All three must be neutralized symmetrically on both sides. Returns a deep
+ * clone; never mutates the input (the current side is live editor state).
+ */
+export function stripRawAppDiffNoise<T extends Record<string, any>>(value: T): T {
+	const cloned = structuredClone(stateSnapshot(value)) as Record<string, any>
+	for (const key of RAW_APP_DEPLOYED_METADATA_KEYS) {
+		delete cloned[key]
+	}
+	// Runnables/data live under `.value` on a deployed row and on the editor's
+	// diff value alike, but a flat draft shape carries them top-level.
+	const source = cloned.value ?? cloned
+	const runnables = source.runnables
+	if (runnables && typeof runnables === 'object') {
+		for (const k of Object.keys(runnables)) {
+			const inlineScript = runnables[k]?.inlineScript
+			if (inlineScript && inlineScript.lock != undefined) {
+				inlineScript.lock = undefined
+			}
+		}
+	}
+	// Canonicalize `data` so an absent and a default-empty `data` compare equal.
+	source.data = normalizeRawAppData(source)
+	return cloned as T
+}
+
+/**
+ * Canonical raw-app value for diffing a *draft* against a *deployed* row. On top
+ * of the noise stripped by stripRawAppDiffNoise, the two also differ in shape: a
+ * deployed row nests its source under `value`, whereas a draft carries
+ * `files`/`runnables`/`data` at the top level. `appSourceToDraftValue` collapses
+ * both onto the same flat field set first. Use this for the session/compare
+ * draft diff so it matches the editor's Diff button (which shares
+ * stripRawAppDiffNoise).
+ */
+export function canonicalRawAppDiffValue(source: Record<string, any>) {
+	return stripRawAppDiffNoise(appSourceToDraftValue(source))
+}
+
 export type RawAppRuntimeLogLevel = 'log' | 'info' | 'warn' | 'error' | 'debug'
 export type RawAppRuntimeLogEntry = {
 	level: RawAppRuntimeLogLevel
@@ -79,65 +141,50 @@ export function formatAppRunsForChat(runs: RawAppRunSummary[]): string {
 	return JSON.stringify(runs, null, 2)
 }
 
-export function htmlContent(
+// The sandboxed (isolated) raw-app wrapper is generated server-side and served as
+// a sandboxed, opaque-origin document (see `get_raw_app_data` in the backend
+// `apps.rs`, WIN-2006) — a blob: URL cannot carry the `CSP: sandbox` response
+// header that enforces isolation, so the wrapper must come from the backend.
+//
+// The function below is used ONLY for the unsandboxed path (the default — the
+// publisher did not opt into sandbox isolation). It is loaded as a blob: URL —
+// same-origin with the SPA — so, with `allow-same-origin`, the bundle runs with
+// the viewer's full session. Crucially this is an in-memory blob, not a
+// real-origin endpoint, so it is not a URL an attacker can navigate a logged-in
+// victim to in order to gain isolation-bypassing access — the backend `.html`
+// document stays sandboxed whenever the publisher did opt in.
+export function unsandboxedRawAppHtml(
 	workspace: string,
-	secret: string | undefined,
+	secret: string,
 	ctx: any,
-	baseUrl: string = '',
-	initialHash: string = ''
+	baseUrl: string,
+	initialHash: string
 ) {
 	return `<!DOCTYPE html>
 <html>
 <head>
 	<meta charset="UTF-8" />
-	<title>App Preview</title>
+	<title>App</title>
 	<link rel="stylesheet" href="${baseUrl}/api/w/${workspace}/apps_u/get_data/v/${secret}.css" />
 	<script>
 		window.ctx = ${ctx ? JSON.stringify(ctx) : 'undefined'};
-
-		// Sync hash with parent window for shareable URLs
-		(function() {
-			// Set initial hash from parent URL
+		(function () {
+			// Keep the parent URL hash in sync for shareable URLs.
+			function notifyParent() {
+				try {
+					if (window.parent !== window) {
+						window.parent.postMessage({ type: 'windmill:hashchange', hash: window.location.hash }, '*');
+					}
+				} catch (_) {}
+			}
 			var initialHash = ${JSON.stringify(initialHash)};
 			if (initialHash && initialHash !== '#' && !window.location.hash) {
-				history.replaceState(null, '', initialHash);
+				try { history.replaceState(null, '', initialHash); } catch (_) {}
 			}
-
-			// Notify parent when hash changes
-			function notifyParent() {
-				var hash = window.location.hash;
-				console.log('[HashSync] notifyParent called, hash:', hash);
-				if (window.parent !== window) {
-					window.parent.postMessage({
-						type: 'windmill:hashchange',
-						hash: hash
-					}, '*');
-				}
-			}
-
-			// Listen for hash changes
-			window.addEventListener('hashchange', function() {
-				console.log('[HashSync] hashchange event');
-				notifyParent();
-			});
-
-			// Also notify on pushState/replaceState
-			var originalPushState = history.pushState;
-			var originalReplaceState = history.replaceState;
-
-			history.pushState = function() {
-				console.log('[HashSync] pushState called with:', arguments[2]);
-				originalPushState.apply(this, arguments);
-				notifyParent();
-			};
-
-			history.replaceState = function() {
-				console.log('[HashSync] replaceState called with:', arguments[2]);
-				originalReplaceState.apply(this, arguments);
-				notifyParent();
-			};
-
-			// Notify parent of initial hash after load
+			window.addEventListener('hashchange', notifyParent);
+			var _ps = history.pushState, _rs = history.replaceState;
+			history.pushState = function () { _ps.apply(this, arguments); notifyParent(); };
+			history.replaceState = function () { _rs.apply(this, arguments); notifyParent(); };
 			setTimeout(notifyParent, 0);
 		})();
 	</script>
diff --git a/frontend/src/lib/components/runs/RunsQueue.svelte b/frontend/src/lib/components/runs/RunsQueue.svelte
index b0c5ed5adb..2cd2914878 100644
--- a/frontend/src/lib/components/runs/RunsQueue.svelte
+++ b/frontend/src/lib/components/runs/RunsQueue.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { Tweened } from 'svelte/motion'
 	import { Button } from '../common'
-	import { Bot, Hourglass, ListFilterPlus, X } from 'lucide-svelte'
+	import { ServerCog, Hourglass, ListFilterPlus, X } from 'lucide-svelte'
 	import RunOption from './RunOption.svelte'
 	import { Popover } from '../meltComponents'
 
@@ -29,7 +29,7 @@
 		<Popover contentClasses="p-4" openOnHover debounceDelay={100}>
 			{#snippet trigger()}
 				<div class="relative">
-					<Bot size={16} />
+					<ServerCog size={16} />
 					{#if queue_count && ($queue_count ?? 0) > 0}
 						<div
 							class="absolute top-0 right-0 translate-x-1/2 -translate-y-1/2 bg-yellow-500 rounded-full text-white text-2xs h-4 min-w-4 px-1"
diff --git a/frontend/src/lib/components/runs/ScriptRetryChain.svelte b/frontend/src/lib/components/runs/ScriptRetryChain.svelte
new file mode 100644
index 0000000000..7ecd104efc
--- /dev/null
+++ b/frontend/src/lib/components/runs/ScriptRetryChain.svelte
@@ -0,0 +1,185 @@
+<script lang="ts">
+	import { JobService, type Job } from '$lib/gen'
+	import { Button } from '$lib/components/common'
+	import { goto } from '$lib/navigation'
+	import { workspaceStore } from '$lib/stores'
+	import { resource } from 'runed'
+
+	let { job }: { job: Job } = $props()
+
+	type AttemptColor = 'green' | 'red' | 'blue' | 'gray'
+	type Attempt = { id: string; color: AttemptColor; current: boolean }
+	type HandlerKind = 'failure' | 'recovery' | 'success'
+	type HandlerLink = { id: string; kind: HandlerKind; color: AttemptColor }
+	type Info = {
+		retries: Attempt[]
+		handlers: HandlerLink[]
+		self?: { kind: HandlerKind; schedulePath?: string; handledJob?: string }
+	}
+
+	const HANDLER_LABEL: Record<HandlerKind, string> = {
+		failure: 'Failure handler',
+		recovery: 'Recovery handler',
+		success: 'Success handler'
+	}
+
+	function statusColor(j: Job | undefined): AttemptColor {
+		if (!j) return 'gray'
+		if (j.type === 'CompletedJob') return j.success ? 'green' : 'red'
+		if (j.type === 'QueuedJob' && j.running) return 'blue'
+		return 'gray'
+	}
+
+	// A schedule completion handler is recognizable by its synthetic `created_by`.
+	// `on_recovery` and `on_success` share it, so the recovery-only `error_started_at`
+	// arg disambiguates them (absent => plain success). Needs the full job (the list
+	// endpoint omits args), so callers pass a job fetched via getJob or the page job.
+	function handlerKind(j: Job | undefined): HandlerKind | undefined {
+		if (j?.created_by === 'schedule_error_handler') return 'failure'
+		if (j?.created_by === 'schedule_recovery_handler') {
+			return j?.args && 'error_started_at' in j.args ? 'recovery' : 'success'
+		}
+		return undefined
+	}
+
+	const info = resource(
+		() => ({ job, ws: job?.workspace_id ?? $workspaceStore }),
+		async ({ job, ws }): Promise<Info> => {
+			if (!ws || !job) return { retries: [], handlers: [] }
+
+			// The current job IS a handler: describe it rather than look for a chain.
+			const self = handlerKind(job)
+			if (self) {
+				return {
+					retries: [],
+					handlers: [],
+					self: {
+						kind: self,
+						schedulePath: (job.args as any)?.schedule_path,
+						handledJob: job.parent_job
+					}
+				}
+			}
+
+			// Native script retries are real `Script` jobs linked by `parent_job` to the
+			// first attempt (the chain root, itself a script). Flow steps also carry
+			// `parent_job`, but their parent is a flow — a non-script root means flow step.
+			if (job.job_kind !== 'script') return { retries: [], handlers: [] }
+			const root = job.parent_job ?? job.id
+			const rootJob = job.id === root ? job : await JobService.getJob({ workspace: ws, id: root })
+			if (rootJob?.job_kind !== 'script') return { retries: [], handlers: [] }
+
+			// No kind filter: retry attempts are scripts (kept via `is_retry` below),
+			// but schedule handlers can be flows (flow/... handler paths), so both
+			// kinds must be fetched for the handler row to find flow handlers.
+			const children = await JobService.listJobs({
+				workspace: ws,
+				parentJob: root
+			})
+			// Retry attempts carry the explicit `is_retry` marker; other children
+			// (WAC v2 inline children, flow/script handlers) do not, so only real
+			// retries are kept here.
+			const retryJobs = (children ?? [])
+				.filter((c) => c.is_retry === true)
+				.sort((a, b) => (a.created_at ?? '').localeCompare(b.created_at ?? ''))
+			const chain: (Job | undefined)[] = [rootJob, ...retryJobs]
+			const retries: Attempt[] =
+				retryJobs.length === 0
+					? []
+					: chain.map((j) => ({
+							id: j?.id ?? root,
+							color: statusColor(j),
+							current: j?.id === job.id
+						}))
+
+			// Schedule handlers fire on the terminal attempt, so they are its children.
+			const terminalId = chain[chain.length - 1]?.id ?? root
+			const handlerChildren =
+				terminalId === root
+					? children
+					: await JobService.listJobs({ workspace: ws, parentJob: terminalId })
+			// `created_by` flags a handler; fetch the full job to read `args` (the list
+			// endpoint omits it) so recovery and success can be told apart.
+			const handlers: HandlerLink[] = (
+				await Promise.all(
+					(handlerChildren ?? [])
+						.filter(
+							(c) =>
+								c.created_by === 'schedule_error_handler' ||
+								c.created_by === 'schedule_recovery_handler'
+						)
+						.map(async (c) => {
+							const full = await JobService.getJob({ workspace: ws, id: c.id })
+							const kind = handlerKind(full)
+							return kind ? { id: c.id, kind, color: statusColor(full) } : undefined
+						})
+				)
+			).filter((h): h is HandlerLink => h !== undefined)
+
+			return { retries, handlers }
+		}
+	)
+
+	const self = $derived(info.current?.self)
+	const retries = $derived(info.current?.retries ?? [])
+	const handlers = $derived(info.current?.handlers ?? [])
+	const ws = $derived(job?.workspace_id ?? $workspaceStore)
+</script>
+
+{#if self}
+	<div class="max-w-7xl mx-auto w-full px-4 mt-12">
+		<div class="text-xs text-emphasis font-semibold mb-1">{HANDLER_LABEL[self.kind]}</div>
+		<div class="flex flex-row flex-wrap gap-2 items-center">
+			{#if self.handledJob}
+				<Button
+					size="xs"
+					color="gray"
+					variant="border"
+					onclick={() => goto(`/run/${self?.handledJob}?workspace=${ws}`)}
+				>
+					Handled run
+				</Button>
+			{/if}
+			{#if self.schedulePath}
+				<span class="text-xs text-secondary">
+					for schedule <span class="font-mono">{self.schedulePath}</span>
+				</span>
+			{/if}
+		</div>
+	</div>
+{:else}
+	{#if retries.length > 1}
+		<div class="max-w-7xl mx-auto w-full px-4 mt-12">
+			<div class="text-xs text-emphasis font-semibold mb-1">Retries ({retries.length - 1})</div>
+			<div class="flex flex-row flex-wrap gap-2">
+				{#each retries as attempt, i (attempt.id)}
+					<Button
+						size="xs"
+						color={attempt.color}
+						variant={attempt.current ? 'contained' : 'border'}
+						onclick={() => goto(`/run/${attempt.id}?workspace=${ws}`)}
+					>
+						{i === 0 ? 'Original' : `Attempt ${i}`}
+					</Button>
+				{/each}
+			</div>
+		</div>
+	{/if}
+	{#if handlers.length > 0}
+		<div class="max-w-7xl mx-auto w-full px-4 mt-4">
+			<div class="text-xs text-emphasis font-semibold mb-1">Handlers</div>
+			<div class="flex flex-row flex-wrap gap-2">
+				{#each handlers as handler (handler.id)}
+					<Button
+						size="xs"
+						color={handler.color}
+						variant="border"
+						onclick={() => goto(`/run/${handler.id}?workspace=${ws}`)}
+					>
+						{HANDLER_LABEL[handler.kind]}
+					</Button>
+				{/each}
+			</div>
+		</div>
+	{/if}
+{/if}
diff --git a/frontend/src/lib/components/runs/UpstreamSnapshotsPanel.svelte b/frontend/src/lib/components/runs/UpstreamSnapshotsPanel.svelte
new file mode 100644
index 0000000000..ee265d5874
--- /dev/null
+++ b/frontend/src/lib/components/runs/UpstreamSnapshotsPanel.svelte
@@ -0,0 +1,82 @@
+<script lang="ts">
+	import { copyToClipboard } from '$lib/utils'
+	import { Button } from '$lib/components/common'
+	import Tooltip from '$lib/components/Tooltip.svelte'
+	import { ClipboardCopy } from 'lucide-svelte'
+
+	// Shape produced by asset-dispatch (backend asset_dispatch.rs
+	// `UpstreamSnapshot`): the substrate version each direct upstream asset was
+	// at when this job was dispatched. Forensic record only — the run's reads
+	// are not pinned to these versions.
+	type UpstreamSnapshot = { asset: string; snapshot_id: number; partition?: string }
+
+	type Props = { args: any }
+	let { args }: Props = $props()
+
+	const snapshots: UpstreamSnapshot[] = $derived.by(() => {
+		const trigger = args?.trigger
+		if (trigger?.kind !== 'asset' || !Array.isArray(trigger?.upstream_snapshots)) return []
+		// args are caller-supplied JSON, so dedupe by asset — a crafted
+		// duplicate would otherwise crash the keyed each below.
+		const seen = new Set<string>()
+		return trigger.upstream_snapshots.filter((s: any) => {
+			if (typeof s?.asset !== 'string' || typeof s?.snapshot_id !== 'number') return false
+			if (seen.has(s.asset)) return false
+			seen.add(s.asset)
+			return true
+		})
+	})
+</script>
+
+{#if snapshots.length > 0}
+	<div class="mr-2 sm:mr-0 mt-12 mb-6">
+		<h3 class="text-xs font-semibold text-emphasis mb-1">
+			Upstream snapshots
+			<Tooltip>
+				Version of each upstream asset when this run was dispatched. Recorded for debugging only —
+				the run reads the latest data, not these versions. To inspect what this run saw, query the
+				asset with the copied <span class="font-mono">AT (VERSION =&gt; n)</span> clause. For partitioned
+				assets, the partition shown is the slice whose write produced that snapshot — the snapshot itself
+				covers the whole table.
+			</Tooltip>
+		</h3>
+		<div class="border rounded-md overflow-hidden">
+			<table class="w-full text-xs">
+				<thead class="bg-surface-secondary text-secondary">
+					<tr>
+						<th class="text-left font-normal px-3 py-2">Asset</th>
+						<th class="text-left font-normal px-3 py-2">Snapshot</th>
+						<th class="text-right font-normal px-3 py-2">Time travel</th>
+					</tr>
+				</thead>
+				<tbody>
+					{#each snapshots as s (s.asset)}
+						<tr class="border-t">
+							<td class="px-3 py-2 align-top">
+								<span class="font-mono">{s.asset}</span>
+							</td>
+							<td class="px-3 py-2 align-top whitespace-nowrap">
+								<span class="font-mono">@ {s.snapshot_id}</span>
+								{#if s.partition}
+									<span class="text-secondary">
+										· partition <span class="font-mono">{s.partition}</span></span
+									>
+								{/if}
+							</td>
+							<td class="px-3 py-2 align-top text-right whitespace-nowrap">
+								<Button
+									variant="subtle"
+									unifiedSize="sm"
+									startIcon={{ icon: ClipboardCopy }}
+									onclick={() => copyToClipboard(`AT (VERSION => ${s.snapshot_id})`)}
+								>
+									AT (VERSION =&gt; {s.snapshot_id})
+								</Button>
+							</td>
+						</tr>
+					{/each}
+				</tbody>
+			</table>
+		</div>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/script_builder.ts b/frontend/src/lib/components/script_builder.ts
index fb9d667da0..0fbd24d904 100644
--- a/frontend/src/lib/components/script_builder.ts
+++ b/frontend/src/lib/components/script_builder.ts
@@ -92,4 +92,8 @@ export interface ScriptBuilderProps {
 	othersDraftsCount?: number
 	// Wired by the route to flip the OtherUsersDraftsModal open.
 	onOpenOthersDrafts?: () => void
+	// Condensed top bar: smaller (sm) buttons, a shorter bar, and the
+	// EditorHeader's path/breadcrumb row dropped (summary only). Used by the
+	// session preview to save vertical room.
+	condensedHeader?: boolean
 }
diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index 19e71530e6..3e631a55e9 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -505,12 +505,16 @@
 				time: new Date(x.edited_at).getTime(),
 				search_id: x.path
 			})),
-			...scripts.map((x) => ({
-				...x,
-				type: 'script' as 'script',
-				time: new Date(x.created_at).getTime(),
-				search_id: x.path
-			})),
+			// Pipeline-member scripts (`auto_kind='pipeline'`) are reached through
+			// their pipeline, not searched individually.
+			...scripts
+				.filter((x) => x.auto_kind !== 'pipeline')
+				.map((x) => ({
+					...x,
+					type: 'script' as 'script',
+					time: new Date(x.created_at).getTime(),
+					search_id: x.path
+				})),
 			...apps.map((x) => ({
 				...x,
 				type: 'app' as 'app',
diff --git a/frontend/src/lib/components/secretArgUtils.ts b/frontend/src/lib/components/secretArgUtils.ts
index 82aee1f53d..91101d4816 100644
--- a/frontend/src/lib/components/secretArgUtils.ts
+++ b/frontend/src/lib/components/secretArgUtils.ts
@@ -11,11 +11,14 @@ import { generateRandomString } from '$lib/utils'
  */
 export async function processSecretArgs(
 	args: Record<string, any>,
-	schema: Schema | undefined
+	schema: Schema | undefined,
+	// Workspace the ephemeral secret variable is created in — must match the
+	// workspace the preview job runs in, else $jsonvar: resolves to a missing var.
+	forceWorkspace?: string
 ): Promise<Record<string, any>> {
 	if (!schema?.properties) return args
 
-	const workspace = get(workspaceStore)
+	const workspace = forceWorkspace ?? get(workspaceStore)
 	const user = get(userStore)
 	if (!workspace || !user) return args
 
diff --git a/frontend/src/lib/components/sessions/DraftDiffDrawer.svelte b/frontend/src/lib/components/sessions/DraftDiffDrawer.svelte
deleted file mode 100644
index 0716398131..0000000000
--- a/frontend/src/lib/components/sessions/DraftDiffDrawer.svelte
+++ /dev/null
@@ -1,118 +0,0 @@
-<script lang="ts">
-	import WorkspaceDiffDrawer, { type DiffRow } from './WorkspaceDiffDrawer.svelte'
-	import { Pencil } from 'lucide-svelte'
-	import { type WorkspaceItemDiff } from '$lib/gen'
-	import { userWorkspaces } from '$lib/stores'
-	import { editUrlFor as buildEditUrl } from './forkEditUrl'
-	import { getDraftDiffValues, type DraftKind } from '$lib/utils_draft_deploy'
-	import { getDraftItems } from '$lib/workspaceDrafts.svelte'
-
-	// Draft rows carry the user-draft itemKind (`trigger_schedule`, `trigger_http`…),
-	// but the shared row icon/label and the edit-link builder speak the deploy-style
-	// kinds (`schedule`, `http_trigger`…) the fork drawer and compare page use. Map
-	// to deploy-style for display, and back for the draft-value getter.
-	const DEPLOY_KIND_BY_DRAFT_KIND: Partial<Record<DraftKind, string>> = {
-		trigger_schedule: 'schedule',
-		trigger_http: 'http_trigger',
-		trigger_websocket: 'websocket_trigger',
-		trigger_kafka: 'kafka_trigger',
-		trigger_nats: 'nats_trigger',
-		trigger_postgres: 'postgres_trigger',
-		trigger_mqtt: 'mqtt_trigger',
-		trigger_sqs: 'sqs_trigger',
-		trigger_gcp: 'gcp_trigger',
-		trigger_azure: 'azure_trigger',
-		trigger_email: 'email_trigger'
-	}
-	const DRAFT_KIND_BY_DEPLOY_KIND = Object.fromEntries(
-		Object.entries(DEPLOY_KIND_BY_DRAFT_KIND).map(([d, p]) => [p, d])
-	) as Record<string, DraftKind>
-
-	// Thin wrapper: supplies the deployed ↔ draft data source (server `draft`
-	// table, same as the compare page) to the generic WorkspaceDiffDrawer.
-	// Read-only, mirroring ForkDiffDrawer; deploy/discard live on the Review page.
-	let { workspaceId }: { workspaceId: string } = $props()
-
-	let inner: WorkspaceDiffDrawer | undefined = $state(undefined)
-	let rows: DiffRow[] = $state([])
-	let loading = $state(false)
-	let error: string | undefined = $state(undefined)
-	// draft_only per item — drives the "added" rendering (empty before).
-	let draftOnlyByKey: Record<string, boolean> = $state({})
-
-	const ws = $derived($userWorkspaces.find((w) => w.id === workspaceId))
-
-	export function open() {
-		void fetchDrafts()
-		inner?.open()
-	}
-
-	async function fetchDrafts() {
-		loading = true
-		error = undefined
-		try {
-			// One source of truth (Workspace Drafts) — same list the compare page and
-			// the count use.
-			const items = await getDraftItems(workspaceId)
-			const donly: Record<string, boolean> = {}
-			rows = items.map((it) => {
-				// Raw apps must surface as `raw_app` so the row's edit link points at the
-				// raw-app editor (mirrors CompareDrafts); `getDraftItems` carries the flag.
-				const baseKind = it.raw_app ? 'raw_app' : it.kind
-				const kind = DEPLOY_KIND_BY_DRAFT_KIND[baseKind] ?? baseKind
-				donly[`${kind}/${it.path}`] = it.draft_only
-				// A never-deployed app/raw_app is parked at a synthetic `…/draft_<uuid>`
-				// storage path with the user's typed name in `draft_path`; show that
-				// (matches the home list) while `path` stays the storage key for loading.
-				// `summary` comes straight from the draft row, so it shows for every kind
-				// up front instead of only after the diff value loads.
-				return {
-					kind,
-					path: it.path,
-					displayPath: it.draft_path ?? it.path,
-					summary: it.summary,
-					status: it.draft_only ? 'added' : 'modified'
-				}
-			})
-			draftOnlyByKey = donly
-		} catch (e) {
-			console.error('Draft diff: list failed', e)
-			error = `Failed to load drafts: ${e}`
-			rows = []
-		} finally {
-			loading = false
-		}
-	}
-
-	async function loadValues(d: DiffRow): Promise<{ before: unknown; after: unknown }> {
-		const draftOnly = draftOnlyByKey[`${d.kind}/${d.path}`] ?? false
-		// getDraftDiffValues keys on the draft itemKind: `raw_app` must stay
-		// `raw_app` (the helper sends rawApp:true only for that exact kind, which a
-		// never-deployed raw app needs, else it hits the normal app endpoint and
-		// 404s). Only the trigger display kinds map back from their deploy-style names.
-		const kind = (DRAFT_KIND_BY_DEPLOY_KIND[d.kind] ?? d.kind) as DraftKind
-		const { deployed, draft } = await getDraftDiffValues(kind, d.path, workspaceId, draftOnly)
-		// draft_only items have never been deployed → render as "added" (empty
-		// before), matching how the fork drawer renders added items.
-		return { before: draftOnly ? undefined : deployed, after: draft }
-	}
-</script>
-
-<WorkspaceDiffDrawer
-	bind:this={inner}
-	diffs={rows}
-	{loadValues}
-	{loading}
-	{error}
-	emptyMessage="No drafts in this workspace."
-	title="Drafts"
-	reviewHref={`/forks/compare?workspace_id=${encodeURIComponent(workspaceId)}&mode=draft`}
-	editUrlFor={(d) => buildEditUrl(d as unknown as WorkspaceItemDiff, workspaceId)}
->
-	{#snippet titleExtra()}
-		<div class="flex items-center gap-2 text-xs text-secondary">
-			<Pencil class="w-3.5 h-3.5 shrink-0" />
-			<span class="font-medium truncate">{ws?.name ?? workspaceId}</span>
-		</div>
-	{/snippet}
-</WorkspaceDiffDrawer>
diff --git a/frontend/src/lib/components/sessions/FlowEditorView.svelte b/frontend/src/lib/components/sessions/FlowEditorView.svelte
index fb98e05496..845c6e2bdc 100644
--- a/frontend/src/lib/components/sessions/FlowEditorView.svelte
+++ b/frontend/src/lib/components/sessions/FlowEditorView.svelte
@@ -15,7 +15,8 @@
 		path,
 		workspaceId,
 		onNavigate,
-		isActiveSession = true
+		isActiveSession = true,
+		active = true
 	}: {
 		runtime: SessionRuntime
 		path: string
@@ -24,8 +25,12 @@
 		/** Forwarded to SessionEditorTarget — only the visible session claims the
 		 * workspace's single live-editor slot. */
 		isActiveSession?: boolean
+		/** Whether this is the visible preview tab (forwarded as isActiveTab). */
+		active?: boolean
 	} = $props()
 
+	// This tab's own flow cell; each open flow editor binds its own store.
+	const cell = $derived(runtime.flowCell(path))
 	let selectedId = $state('settings-metadata')
 	let diffDrawer: DiffDrawer | undefined = $state()
 
@@ -35,7 +40,7 @@
 	// baseline — useUserDraftSync's inbound effect then syncs the editor preview.
 	// Mirrors ScriptEditorView.
 	async function restoreDeployed() {
-		const saved = runtime.savedFlow.val
+		const saved = cell.saved.val
 		if (!saved) {
 			sendUserToast('Could not restore to deployed', true)
 			return
@@ -61,7 +66,7 @@
 	}
 </script>
 
-{#if runtime.savedFlow.val}
+{#if cell.saved.val}
 	<DiffDrawer bind:this={diffDrawer} {restoreDeployed} isFlow />
 {/if}
 <SessionEditorTarget
@@ -71,7 +76,8 @@
 	{workspaceId}
 	{onNavigate}
 	{isActiveSession}
-	effectivePath={() => runtime.flowStore.val?.path ?? path}
+	isActiveTab={active}
+	effectivePath={() => cell.store.val?.path ?? path}
 >
 	{#snippet editor()}
 		<!-- customUi hides the in-editor "Flow AI Chat" button: the session already
@@ -83,18 +89,24 @@
 		     its intended name in `draft_path`; seed the builder from `draft_path`
 		     (as the full-page editor does) so the Path widget and deploy use the
 		     friendly name rather than creating a flow literally named draft_<uuid>. -->
+		<!-- bind:savedFlow / flowStore target this tab's editor cell (cell.saved /
+		     cell.store), reactive state owned by the SessionRuntime class (via
+		     flowCell), not by a component ancestor — so Svelte's ownership check
+		     flags a false positive here. -->
+		<!-- svelte-ignore ownership_invalid_binding -->
 		<FlowBuilder
-			flowStore={runtime.flowStore}
-			flowStateStore={runtime.flowStateStore}
-			initialPath={(runtime.savedFlow.val as any)?.draft_path ?? path}
+			flowStore={cell.store}
+			flowStateStore={cell.stateStore}
+			initialPath={(cell.saved.val as any)?.draft_path ?? path}
 			autosaveWorkspace={workspaceId}
 			autosavePath={path}
-			newFlow={!runtime.savedFlow.val || runtime.savedFlow.val.no_deployed === true}
+			newFlow={!cell.saved.val || cell.saved.val.no_deployed === true}
 			{selectedId}
 			loading={false}
-			bind:savedFlow={runtime.savedFlow.val}
+			bind:savedFlow={cell.saved.val}
 			{diffDrawer}
 			{onNavigate}
+			condensedHeader={true}
 			customUi={{ topBar: { aiBuilder: false } }}
 			onDeploy={() => {
 				// FlowBuilder has no deploy toast and the session stays put, so toast
diff --git a/frontend/src/lib/components/sessions/ForkDiffDrawer.svelte b/frontend/src/lib/components/sessions/ForkDiffDrawer.svelte
deleted file mode 100644
index e03fc5a49c..0000000000
--- a/frontend/src/lib/components/sessions/ForkDiffDrawer.svelte
+++ /dev/null
@@ -1,125 +0,0 @@
-<script lang="ts">
-	import WorkspaceDiffDrawer, { type DiffRow } from './WorkspaceDiffDrawer.svelte'
-	import Badge from '$lib/components/common/badge/Badge.svelte'
-	import { AlertTriangle, ArrowRight, GitFork } from 'lucide-svelte'
-	import { WorkspaceService, type WorkspaceComparison, type WorkspaceItemDiff } from '$lib/gen'
-	import { getItemValue } from '$lib/utils_workspace_deploy'
-	import { userWorkspaces } from '$lib/stores'
-	import { editUrlFor as buildEditUrl } from './forkEditUrl'
-
-	// Thin wrapper: supplies the deployed-parent ↔ deployed-fork data source to
-	// the generic WorkspaceDiffDrawer. Display/behavior unchanged from before.
-	let {
-		forkWorkspaceId,
-		parentWorkspaceId
-	}: { forkWorkspaceId: string; parentWorkspaceId: string } = $props()
-
-	let inner: WorkspaceDiffDrawer | undefined = $state(undefined)
-	let comparison: WorkspaceComparison | undefined = $state(undefined)
-	let loading = $state(false)
-	let error: string | undefined = $state(undefined)
-
-	const forkWs = $derived($userWorkspaces.find((w) => w.id === forkWorkspaceId))
-	const parentWs = $derived($userWorkspaces.find((w) => w.id === parentWorkspaceId))
-
-	function statusOf(d: WorkspaceItemDiff): DiffRow['status'] {
-		if (d.exists_in_fork && !d.exists_in_source) return 'added'
-		if (!d.exists_in_fork && d.exists_in_source) return 'removed'
-		if (d.ahead > 0 && d.behind > 0) return 'conflict'
-		return 'modified'
-	}
-
-	// Keep the original diffs by key so loadValues can honor exists flags
-	// (skip the non-existent side for added/removed items).
-	let diffByKey: Record<string, WorkspaceItemDiff> = $state({})
-
-	const rows = $derived.by<DiffRow[]>(() =>
-		(comparison?.diffs ?? []).map((d) => ({
-			kind: d.kind,
-			path: d.path,
-			status: statusOf(d),
-			ahead: d.ahead,
-			behind: d.behind
-		}))
-	)
-
-	function skipNotice(c: WorkspaceComparison | undefined): string | undefined {
-		return c?.skipped_comparison
-			? 'This fork was created before change tracking was added — diffs are not available.'
-			: undefined
-	}
-	const notice = $derived(skipNotice(comparison))
-
-	export function open() {
-		void fetchComparison()
-		inner?.open()
-	}
-
-	async function fetchComparison() {
-		loading = true
-		error = undefined
-		try {
-			comparison = await WorkspaceService.compareWorkspaces({
-				workspace: parentWorkspaceId,
-				targetWorkspaceId: forkWorkspaceId
-			})
-			diffByKey = Object.fromEntries(
-				(comparison?.diffs ?? []).map((d) => [`${d.kind}/${d.path}`, d])
-			)
-		} catch (e) {
-			console.error('Fork diff: comparison failed', e)
-			error = `Failed to load comparison: ${e}`
-			comparison = undefined
-		} finally {
-			loading = false
-		}
-	}
-
-	async function loadValues(d: DiffRow): Promise<{ before: unknown; after: unknown }> {
-		const od = diffByKey[`${d.kind}/${d.path}`]
-		const existsSource = od ? od.exists_in_source !== false : true
-		const existsFork = od ? od.exists_in_fork !== false : true
-		const [before, after] = await Promise.all([
-			existsSource
-				? getItemValue(d.kind as any, d.path, parentWorkspaceId).catch(() => undefined)
-				: Promise.resolve(undefined),
-			existsFork
-				? getItemValue(d.kind as any, d.path, forkWorkspaceId).catch(() => undefined)
-				: Promise.resolve(undefined)
-		])
-		return { before, after }
-	}
-</script>
-
-<WorkspaceDiffDrawer
-	bind:this={inner}
-	diffs={rows}
-	{loadValues}
-	{loading}
-	{error}
-	{notice}
-	emptyMessage="No changes between this fork and its parent."
-	title="Fork changes"
-	reviewHref={`/forks/compare?workspace_id=${encodeURIComponent(forkWorkspaceId)}`}
-	editUrlFor={(d) => buildEditUrl(d as unknown as WorkspaceItemDiff, forkWorkspaceId)}
->
-	{#snippet titleExtra()}
-		<div class="flex items-center gap-2 text-xs text-secondary">
-			<GitFork class="w-3.5 h-3.5 shrink-0" />
-			<span class="font-medium truncate">{forkWs?.name ?? forkWorkspaceId}</span>
-			<ArrowRight class="w-3 h-3 shrink-0 text-tertiary" />
-			<span class="font-medium truncate">{parentWs?.name ?? parentWorkspaceId}</span>
-			{#if comparison}
-				<Badge color="transparent" class="ml-2">
-					{comparison.summary.total_diffs} item{comparison.summary.total_diffs !== 1 ? 's' : ''}
-				</Badge>
-				{#if comparison.summary.conflicts > 0}
-					<Badge color="orange">
-						<AlertTriangle class="w-3 h-3 inline mr-1" />
-						{comparison.summary.conflicts} conflict{comparison.summary.conflicts !== 1 ? 's' : ''}
-					</Badge>
-				{/if}
-			{/if}
-		</div>
-	{/snippet}
-</WorkspaceDiffDrawer>
diff --git a/frontend/src/lib/components/sessions/OpenInSessionButton.svelte b/frontend/src/lib/components/sessions/OpenInSessionButton.svelte
new file mode 100644
index 0000000000..6470e556bd
--- /dev/null
+++ b/frontend/src/lib/components/sessions/OpenInSessionButton.svelte
@@ -0,0 +1,61 @@
+<script lang="ts" module>
+	import type { SessionTarget } from './sessionState.svelte'
+
+	// What an editor hands over for "Open in AI session": the session target it
+	// maps to, the workspace it lives in, and a persist hook run before routing
+	// so the session preview opens the item exactly as currently edited.
+	export type OpenInSessionSource = {
+		target: SessionTarget
+		workspaceId?: string
+		beforeOpen?: () => void | Promise<void>
+	}
+</script>
+
+<script lang="ts">
+	import { getContext, type Snippet } from 'svelte'
+	import { BROWSER } from 'esm-env'
+	import AIButton from '$lib/components/copilot/chat/AIButton.svelte'
+	import { AIBtnClasses } from '$lib/components/copilot/chat/AIButtonStyle'
+	import { isGlobalAiEnabled } from '$lib/components/copilot/chat/global/gate'
+	import { openEditorInSession } from './sessionSwitch.svelte'
+
+	let {
+		source,
+		btnClasses,
+		fallback
+	}: {
+		/** Undefined (e.g. an item without a path yet) renders the fallback. */
+		source?: OpenInSessionSource
+		btnClasses?: string
+		/** Rendered instead when the global-AI flag is off (typically the
+		 * editor's inline-chat toggle). Never rendered inside the session panel. */
+		fallback?: Snippet
+	} = $props()
+
+	// Inside the session panel the chat is already on screen — a second entry
+	// point would nest sessions, so render nothing at all there. In-realm
+	// preview editors sit under the 'aiChatManager' context (set by
+	// SessionEditorTarget / the session wrapper); iframe preview tabs are not
+	// the top window.
+	const inSessionPanel = !!getContext('aiChatManager') || (BROWSER && window.self !== window.top)
+	const show = $derived(!inSessionPanel && !!source && isGlobalAiEnabled())
+
+	// Not $state: only read inside open() as a re-entrancy latch, never rendered.
+	let opening = false
+	async function open() {
+		if (opening || !source) return
+		opening = true
+		try {
+			await source.beforeOpen?.()
+			await openEditorInSession(source.target, source.workspaceId)
+		} finally {
+			opening = false
+		}
+	}
+</script>
+
+{#if show}
+	<AIButton togglePanel={open} btnClasses={btnClasses ?? AIBtnClasses('default')} />
+{:else if !inSessionPanel}
+	{@render fallback?.()}
+{/if}
diff --git a/frontend/src/lib/components/sessions/PipelineEditorView.svelte b/frontend/src/lib/components/sessions/PipelineEditorView.svelte
new file mode 100644
index 0000000000..0e30d0959d
--- /dev/null
+++ b/frontend/src/lib/components/sessions/PipelineEditorView.svelte
@@ -0,0 +1,404 @@
+<script lang="ts">
+	import { resource } from 'runed'
+	import { tick, untrack } from 'svelte'
+	import { Loader2, Workflow } from 'lucide-svelte'
+	import PipelineGraphEditor from '$lib/components/assets/AssetGraph/PipelineGraphEditor.svelte'
+	import PipelineTriggerEditors from '$lib/components/assets/AssetGraph/PipelineTriggerEditors.svelte'
+	import { resolveGraph } from '$lib/components/assets/AssetGraph/resolveGraph'
+	import { useActiveRunnableIds } from '$lib/components/assets/AssetGraph/activeRunnables.svelte'
+	import type {
+		AssetGraphResponse,
+		AssetGraphSelection,
+		NativeTriggerKind
+	} from '$lib/components/assets/AssetGraph/types'
+	import { AssetService, JobService, type AssetKind } from '$lib/gen'
+	import { sendUserToast } from '$lib/utils'
+	import { createPipelineAiHelpers } from '$lib/components/assets/AssetGraph/pipelineAiHelpers'
+	import type { SessionRuntime } from './sessionRuntime.svelte'
+
+	let {
+		runtime,
+		path,
+		workspaceId,
+		isActiveSession = true,
+		active = true
+	}: {
+		/** Per-session runtime; owns the pipeline editor state so it survives the
+		 * editor pane unmounting on hide/show. */
+		runtime: SessionRuntime
+		/** Folder name the pipeline graph is scoped to (not a workspace item path). */
+		path: string
+		workspaceId: string
+		/** Only the visible session registers the pipeline tools on its manager. */
+		isActiveSession?: boolean
+		/** Whether this is the foreground preview tab. */
+		active?: boolean
+	} = $props()
+
+	// This session's own chat manager — used directly rather than via
+	// getAiChatManager()'s context lookup: PreviewTabHost mounts this view in the
+	// preview panel, outside the SessionWrapper subtree that provides the scoped
+	// manager context, so a lookup would fall back to the app-wide singleton and
+	// register the pipeline tools (build_pipeline_node / edit_pipeline_node) on the
+	// wrong chat — leaving this session's chat unable to build canvas nodes.
+	const aiChatManager = runtime.manager
+
+	// Only the foreground tab of the foreground session owns the chat's pipeline
+	// tools and runs the live-badge poll — a background tab (another preview tab is
+	// showing, or another session is active) must not shadow that context or poll.
+	const engaged = $derived(isActiveSession && active)
+
+	// Externalized editor state — lives on the runtime so the drafts persist across
+	// hide/show of the preview pane (the pane unmounts on hide).
+	const pe = runtime.pipelineEditorState
+
+	// The reused `pe` is scoped to a folder. A same-folder remount (hide→show)
+	// keeps the drafts; a retarget to a different folder resets so stale drafts
+	// don't bleed across folders. untrack the writes so this can't self-loop.
+	$effect(() => {
+		const folder = path
+		untrack(() => {
+			if (pe.folder !== folder) {
+				if (pe.folder !== undefined) {
+					pe.reset()
+					// A retarget without remount re-scopes the poll, so the release
+					// effect could never match the old folder's job — drop the hint.
+					activeRunnable = undefined
+					activeRunnableJobId = undefined
+					// Re-scope the Global pipeline prompt to the new folder (the helper
+					// methods already read the reactive path, but the system message
+					// string was built for the old one). Only when this tab is engaged —
+					// its helpers are the registered set; a background tab reconfigures
+					// when it next becomes the foreground one.
+					if (engaged) aiChatManager.rebuildGlobalSystemMessage()
+				}
+				pe.folder = folder
+			}
+		})
+	})
+
+	const EMPTY_GRAPH: AssetGraphResponse = { assets: [], runnables: [], edges: [], triggers: [] }
+	const EMPTY_PATH_MAP = new Map<string, Array<{ kind: AssetKind; path: string }>>()
+	const EMPTY_NATIVE_MAP = new Map<string, Set<any>>()
+
+	const graphRes = resource(
+		() => ({ workspace: workspaceId, folder: path }),
+		async ({ workspace, folder }) =>
+			workspace && folder ? await AssetService.getAssetsGraph({ workspace, folder }) : EMPTY_GRAPH
+	)
+
+	// Folder whose graph is actually rendered — `graphRes.current` is stale-
+	// while-revalidate on a folder retarget, so the canvas's one-shot initial
+	// fit is keyed on the folder captured when a graph lands, not on `path`
+	// (same rationale as the pipeline route page).
+	let viewportFitFolder = $state('')
+	$effect(() => {
+		if (graphRes.current) untrack(() => (viewportFitFolder = path))
+	})
+
+	// Deployed graph + the in-flight draft overlay (AI-built nodes render as plain
+	// dashed unsaved drafts, same as manual drafts). The session
+	// skips the route page's folder-wide asset prefetch (empty inferred maps); the
+	// open script's live overlays still feed the graph. (resolveGraph's base is the
+	// pipeline runnables subset; the 'job' usage_kind of the wire type never appears.)
+	let resolvedGraph = $derived.by<AssetGraphResponse>(() =>
+		resolveGraph({
+			base: (graphRes.current ?? EMPTY_GRAPH) as AssetGraphResponse,
+			drafts: pe.drafts,
+			liveBodyAssets: pe.liveBodyAssets,
+			liveAnnotations: pe.liveAnnotations,
+			inferredWritesByPath: EMPTY_PATH_MAP,
+			inferredReadsByPath: EMPTY_PATH_MAP,
+			annotatedNativeKindsByPath: EMPTY_NATIVE_MAP
+		})
+	)
+
+	const helpers = createPipelineAiHelpers({
+		getFolder: () => path,
+		getWorkspace: () => workspaceId,
+		getResolvedGraph: () => resolvedGraph,
+		getDrafts: () => pe.drafts,
+		setDrafts: (next) => (pe.drafts = next),
+		newDraftLocalId: pe.newDraftLocalId,
+		onForgetPath: pe.forgetPath,
+		// Open the staged node in the details pane so its code is visible.
+		onProposeNode: (p) => {
+			pe.activeDraftPath = p
+			pe.selection = undefined
+		},
+		// An AI test_pipeline_node run lights up the same live badge as the run button.
+		onRunStarted: (jobId, p) => {
+			activeRunnables.arm(`script:${p}`)
+			activeRunnable = { kind: 'script', path: p }
+			activeRunnableJobId = jobId
+		}
+	})
+
+	function handleCanvasSelect(s: AssetGraphSelection | undefined) {
+		if (s && s.kind === 'runnable' && s.runnable_kind === 'script' && pe.drafts.has(s.path)) {
+			pe.activeDraftPath = s.path
+			pe.selection = undefined
+		} else {
+			pe.activeDraftPath = undefined
+			pe.selection = s
+		}
+	}
+
+	async function afterSaved(savedPath: string) {
+		const next = new Map(pe.drafts)
+		next.delete(savedPath)
+		pe.drafts = next
+		if (pe.activeDraftPath === savedPath) {
+			pe.selection = { kind: 'runnable', runnable_kind: 'script', path: savedPath }
+			pe.activeDraftPath = undefined
+		}
+		await graphRes.refetch()
+	}
+
+	// Native trigger editor drawers — the shared <PipelineTriggerEditors> the route
+	// page uses; the canvas drives them imperatively. The draft guards mirror the
+	// route page: a trigger row stores a hard `script_path`, so it can only attach
+	// to a deployed script.
+	let triggerEditors: PipelineTriggerEditors | undefined = $state(undefined)
+	let focusDataUploadSignal = $state(0)
+
+	function openMissingTriggerDrawer(kind: NativeTriggerKind, scriptPath: string) {
+		if (pe.drafts.has(scriptPath)) {
+			sendUserToast(
+				`Save the script "${scriptPath}" first — triggers can only be attached to deployed scripts.`,
+				true
+			)
+			return
+		}
+		triggerEditors?.openNew(kind, scriptPath)
+	}
+
+	function openEditTriggerDrawer(kind: NativeTriggerKind, triggerPath: string, scriptPath: string) {
+		triggerEditors?.openEdit(kind, triggerPath, scriptPath)
+	}
+
+	function deleteAttachedTrigger(kind: NativeTriggerKind, triggerPath: string) {
+		triggerEditors?.requestDelete(kind, triggerPath)
+	}
+
+	function openWebhookDrawer(scriptPath: string) {
+		if (pe.drafts.has(scriptPath)) {
+			sendUserToast(
+				`Save the script "${scriptPath}" first — webhooks only trigger the deployed version.`,
+				true
+			)
+			return
+		}
+		triggerEditors?.openWebhook(scriptPath)
+	}
+
+	// Data upload has no trigger row — open the target in the details pane and pulse
+	// the signal so its auto-generated run form focuses the S3 input.
+	function openDataUploadRun(scriptPath: string) {
+		if (pe.drafts.has(scriptPath)) {
+			pe.activeDraftPath = scriptPath
+			pe.selection = undefined
+		} else {
+			pe.activeDraftPath = undefined
+			pe.selection = { kind: 'runnable', runnable_kind: 'script', path: scriptPath }
+		}
+		void tick().then(() => focusDataUploadSignal++)
+	}
+
+	// ── Run dispatch + live run state ──────────────────────────────────────────
+	// Reuses the shared folder-scoped job poll (node badges + event log) the route
+	// page uses. The session runs ONE node at a time (preview for an unsaved draft,
+	// the deployed version otherwise) — it skips the route page's cascade/deploy
+	// queue, which the AI-session run UX doesn't need.
+	const pathPrefix = $derived(`f/${path}/`)
+	const activeRunnables = useActiveRunnableIds(
+		() => workspaceId,
+		() => pathPrefix
+	)
+	// Zero-latency "running" hint for a node run launched from the canvas (the poll
+	// hasn't seen the job yet). Released when that exact job reaches a terminal
+	// status in the poll, so the badge hands off to the poll's status with no flash.
+	let activeRunnable = $state<{ kind: 'script' | 'flow'; path: string } | undefined>(undefined)
+	let activeRunnableJobId = $state<string | undefined>(undefined)
+	$effect(() => {
+		pathPrefix // re-scope the poll when the folder changes
+		// Only the engaged (foreground) tab needs live badges/event-log; a
+		// background tab or a hidden session shouldn't poll.
+		activeRunnables.setObserving(engaged)
+		return () => activeRunnables.dispose()
+	})
+	$effect(() => {
+		if (!activeRunnableJobId) return
+		const ev = activeRunnables.events.find((e) => e.id === activeRunnableJobId)
+		if (ev && (ev.status === 'success' || ev.status === 'failure')) {
+			activeRunnable = undefined
+			activeRunnableJobId = undefined
+		}
+	})
+
+	function runProducer(producer: { kind: 'script' | 'flow'; path: string; cascade?: boolean }) {
+		// Pipeline nodes are scripts; a flow producer can't be preview/by-path run.
+		if (producer.kind !== 'script') return Promise.resolve(undefined)
+		return runNode(producer.path, {}, producer.cascade ?? false)
+	}
+
+	async function runNode(
+		nodePath: string,
+		args: Record<string, any> = {},
+		cascade = false
+	): Promise<string | undefined> {
+		const draft = pe.drafts.get(nodePath)
+		activeRunnables.arm(`script:${nodePath}`)
+		try {
+			let jobId: string
+			if (draft) {
+				// Preview-run the draft content; a preview never dispatches downstream.
+				jobId = await JobService.runScriptPreview({
+					workspace: workspaceId,
+					requestBody: {
+						path: nodePath,
+						content: draft.script.content,
+						language: draft.script.language,
+						args
+					}
+				})
+			} else {
+				// A single-node run must NOT fan out to downstream deployed subscribers
+				// via the backend asset dispatcher unless the user explicitly chose
+				// "run + downstream" (cascade) — otherwise clicking one node's Run would
+				// fire side-effecting production scripts.
+				jobId = await JobService.runScriptByPath({
+					workspace: workspaceId,
+					path: nodePath,
+					requestBody: { ...args, ...(cascade ? {} : { _wmill_skip_asset_dispatch: true }) }
+				})
+			}
+			activeRunnable = { kind: 'script', path: nodePath }
+			activeRunnableJobId = jobId
+			return jobId
+		} catch (e: any) {
+			sendUserToast(`Run failed: ${e?.body ?? e?.message ?? e}`, true)
+			return undefined
+		}
+	}
+
+	// Register the pipeline tools on this session's manager while this tab is the
+	// engaged (foreground) one. setPipelineHelpers rebuilds the global tool set to
+	// include the pipeline tools and tears them down on cleanup — so switching to
+	// another preview tab or session releases them.
+	$effect(() => {
+		if (!engaged) return
+		return aiChatManager.setPipelineHelpers(helpers)
+	})
+</script>
+
+<div class="flex flex-col h-full w-full bg-surface">
+	<div
+		class="flex items-center gap-2 px-3 py-1.5 border-b border-light text-xs text-secondary shrink-0"
+	>
+		<Workflow size={14} />
+		<span class="font-mono text-emphasis truncate">f/{path}</span>
+		<span class="text-tertiary">· data pipeline</span>
+	</div>
+	<div class="flex-1 min-h-0">
+		<!-- Only block on the deployed-graph fetch when there's nothing to show yet.
+		     When the runtime already holds drafts (e.g. returning to a session whose
+		     editor pane was LRU-unmounted, so `graphRes` re-fetches from scratch),
+		     render the editor immediately so the drafts stay visible — `resolveGraph`
+		     overlays them on an empty base and the deployed nodes fill in when the
+		     fetch resolves. -->
+		{#if graphRes.loading && !graphRes.current && pe.drafts.size === 0}
+			<div class="h-full flex items-center justify-center gap-2 text-tertiary">
+				<Loader2 size={18} class="animate-spin" />
+				<span>Loading pipeline…</span>
+			</div>
+		{:else if graphRes.error && pe.drafts.size === 0}
+			<div class="h-full flex items-center justify-center text-red-500 text-sm px-4 text-center">
+				Failed to load pipeline: {graphRes.error.message}
+			</div>
+		{:else}
+			<!-- The session preview shares the route page's editor body and persists
+			     drafts to the same per-folder DB draft, so AI drafts survive a reload /
+			     session switch (and an LRU-evicted runtime). It wires the shared run +
+			     trigger affordances (handlers above) but omits the route page's
+			     cascade / bounded-run / add-script-from-asset callbacks, so those stay
+			     hidden. -->
+			<PipelineGraphEditor
+				editor={pe}
+				folder={path}
+				viewportFitKey={viewportFitFolder}
+				persistDrafts={true}
+				displayGraph={resolvedGraph}
+				mode="edit"
+				workspace={workspaceId}
+				{pathPrefix}
+				onCreateMissingTrigger={openMissingTriggerDrawer}
+				onEditTrigger={openEditTriggerDrawer}
+				onDeleteTrigger={deleteAttachedTrigger}
+				onOpenWebhook={openWebhookDrawer}
+				onOpenDataUpload={openDataUploadRun}
+				focusUploadSignal={focusDataUploadSignal}
+				{activeRunnable}
+				activeRunnableIds={activeRunnables.ids}
+				runStates={activeRunnables.states}
+				eventLogEvents={activeRunnables.events}
+				onRunProducer={runProducer}
+				onRunByPath={(path, args) => runNode(path, args)}
+				canRunByPath
+				onTestStateChange={(running) => {
+					const openPath = pe.openScriptPath
+					if (running && openPath) {
+						activeRunnable = { kind: 'script', path: openPath }
+						activeRunnables.arm(`script:${openPath}`)
+						activeRunnableJobId = undefined
+					} else if (!running && activeRunnable?.path === openPath) {
+						// Only clear the hint for the script the pane just finished — a
+						// canvas per-node run of a different script keeps its own hint.
+						activeRunnable = undefined
+						activeRunnableJobId = undefined
+					}
+				}}
+				onRunCompleted={() => {
+					activeRunnable = undefined
+					activeRunnableJobId = undefined
+				}}
+				onSelect={handleCanvasSelect}
+				onDraftSaved={afterSaved}
+				onPersistedSaved={afterSaved}
+				onScriptRemoved={async (removedPath) => {
+					pe.forgetPath(removedPath)
+					await graphRes.refetch()
+				}}
+				onScriptRenamed={async (oldPath, newPath) => {
+					// Repoint the selection so the canvas follows the renamed node instead
+					// of staying on the now-gone old path until an unrelated refetch.
+					if (pe.selection?.kind === 'runnable' && pe.selection.path === oldPath) {
+						pe.selection = { ...pe.selection, path: newPath }
+					}
+					await graphRes.refetch()
+				}}
+				onDiscard={() => {
+					if (pe.activeDraftPath) pe.discardDraft(pe.activeDraftPath)
+				}}
+				onClose={() => {
+					pe.selection = undefined
+					pe.activeDraftPath = undefined
+					pe.clearLiveOverlays()
+				}}
+			/>
+		{/if}
+	</div>
+</div>
+
+<!-- Native trigger editor drawers (schedule/kafka/webhook/…), shared with the
+     route page; opened imperatively from the canvas via the handlers above.
+     NOTE: these operate on the global `$workspaceStore`, not the `workspaceId`
+     prop. That's correct only because activating a session syncs the store to
+     the session's workspace (SessionPicker), and triggers are only opened from
+     the visible/active session — so for a forked-workspace session the store is
+     already pointed at the right workspace by the time a drawer opens. -->
+<PipelineTriggerEditors
+	bind:this={triggerEditors}
+	mountTriggerEditors
+	onUpdate={() => graphRes.refetch()}
+/>
diff --git a/frontend/src/lib/components/sessions/PreviewRouterPicker.svelte b/frontend/src/lib/components/sessions/PreviewRouterPicker.svelte
new file mode 100644
index 0000000000..80d09b6004
--- /dev/null
+++ b/frontend/src/lib/components/sessions/PreviewRouterPicker.svelte
@@ -0,0 +1,192 @@
+<!--
+@component
+Preview "router" picker — a `WorkspaceItemDrillPicker` superset used by the
+session preview breadcrumb. Same drill model and workspace-item branches, plus
+a leading "Pages" branch (Home, Runs, Workspace settings, …) so the breadcrumb
+can route the preview iframe to non-item pages too, not just scripts/flows/apps.
+
+Kept separate from `WorkspaceItemDrillPicker` so the editor breadcrumb (which
+only ever navigates between items) doesn't grow a Pages section.
+-->
+<script lang="ts" module>
+	export type Scope = { kind: 'flow' | 'script' | 'app' | 'all'; dir?: string } | undefined
+</script>
+
+<script lang="ts">
+	import { untrack } from 'svelte'
+	import { Compass } from 'lucide-svelte'
+	import { resource } from 'runed'
+	import { workspaceStore } from '$lib/stores'
+	import RowIcon from '$lib/components/common/table/RowIcon.svelte'
+	import { type WorkspaceItem, type WorkspaceItemKind } from '$lib/components/workspacePicker'
+	import { useWorkspaceItemsLoader } from '$lib/components/workspaceItemsLoader.svelte'
+	import DrillPicker from '../DrillPicker.svelte'
+	import type { DrillBranch, DrillLeaf, DrillNode } from '$lib/components/drillPicker'
+	import {
+		buildWorkspaceTree,
+		legacyScopeToPath,
+		relativizeWorkspacePath
+	} from '$lib/components/workspaceTree'
+	import { listGlobalDrafts } from '$lib/components/copilot/chat/global/userDraftAdapter'
+	import { isGlobalAiEnabled } from '$lib/components/copilot/chat/global/gate'
+	import { PREVIEW_PAGES, pageHref, pageKey, type PreviewTarget } from './previewRouter'
+
+	type Kind = WorkspaceItemKind
+	type DrillPickerHandle = {
+		focus: () => void
+		handleKeydown: (e: KeyboardEvent) => void
+		pickHighlighted: () => void
+	}
+
+	interface Props {
+		onPick: (target: PreviewTarget) => void
+		initialScope?: Scope
+		initialHighlight?: string
+		currentItem?: WorkspaceItem & { savedPath?: string }
+		externalFilter?: string
+		autoFocus?: boolean
+		flush?: boolean
+		// The session's effective workspace. Items and drafts must load from it,
+		// not the navigation workspace ($workspaceStore) — a fork-scoped session
+		// leaves the global store on the nav workspace, so keying off it would
+		// list root items and miss fork-only ones. Falls back to $workspaceStore
+		// for non-session consumers.
+		workspaceId?: string
+	}
+
+	let {
+		onPick,
+		initialScope,
+		initialHighlight,
+		currentItem,
+		externalFilter,
+		autoFocus = true,
+		flush = false,
+		workspaceId
+	}: Props = $props()
+
+	const kinds: Kind[] = ['flow', 'script', 'app']
+	const effectiveWorkspace = $derived(workspaceId ?? $workspaceStore)
+
+	let inner = $state<DrillPickerHandle | undefined>(undefined)
+	export function focus() {
+		inner?.focus()
+	}
+	export function handleKeydown(e: KeyboardEvent) {
+		inner?.handleKeydown(e)
+	}
+	export function pickHighlighted() {
+		inner?.pickHighlighted()
+	}
+
+	const loader = useWorkspaceItemsLoader(
+		() => effectiveWorkspace,
+		() => kinds
+	)
+
+	// Surface AI-created drafts the same way the editor picker does so in-flight
+	// chat-scaffolded items are navigable (see WorkspaceItemDrillPicker).
+	const KIND_TO_DRAFT_TYPE = { flow: 'flow', script: 'script', app: 'app' } as const
+	const globalDraftsResource = resource(
+		() => ({ ws: effectiveWorkspace, enabled: isGlobalAiEnabled() }),
+		async ({ ws, enabled }) => (enabled && ws ? await listGlobalDrafts(ws) : [])
+	)
+	function aiDraftsForKind(k: Kind): WorkspaceItem[] {
+		const targetType = KIND_TO_DRAFT_TYPE[k]
+		return (globalDraftsResource.current ?? [])
+			.filter((d) => d.type === targetType)
+			.map((d) => ({
+				path: d.path,
+				summary: d.summary ?? '',
+				kind: k,
+				raw_app: k === 'app' ? !!(d.value as { files?: unknown })?.files : undefined
+			}))
+	}
+	const extraItemsByKind = $derived<Partial<Record<Kind, WorkspaceItem[]>>>(
+		Object.fromEntries(kinds.map((k) => [k, aiDraftsForKind(k)]))
+	)
+
+	// Wrap item leaves as PreviewTargets so the tree can carry page leaves too.
+	// Branch structure is untouched — only leaf `data` is re-tagged.
+	function tagItems(nodes: DrillNode<WorkspaceItem>[]): DrillNode<PreviewTarget>[] {
+		return nodes.map((n) =>
+			n.type === 'leaf'
+				? { ...n, data: { type: 'item', item: n.data } }
+				: { ...n, children: tagItems(n.children) }
+		)
+	}
+
+	function pageLeaf(p: (typeof PREVIEW_PAGES)[number]): DrillLeaf<PreviewTarget> {
+		return {
+			type: 'leaf',
+			key: pageKey(p.path),
+			label: p.label,
+			icon: p.icon,
+			data: { type: 'page', href: pageHref(p.path), label: p.label }
+		}
+	}
+
+	// Home is deliberately not navigable from the session preview — it stays in
+	// PREVIEW_PAGES only so a tab already sitting on '/' keeps its label.
+	const pagesBranch = $derived<DrillBranch<PreviewTarget>>({
+		type: 'branch',
+		key: 'pages',
+		label: 'Pages',
+		icon: Compass,
+		searchGroup: true,
+		children: PREVIEW_PAGES.filter((p) => p.path !== '/').map(pageLeaf)
+	})
+
+	const tree = $derived<DrillNode<PreviewTarget>[]>([
+		pagesBranch,
+		...tagItems(
+			buildWorkspaceTree({
+				loaded: loader.loaded,
+				kinds,
+				currentItem,
+				loadingKind: loader.loadingKind,
+				extraItemsByKind
+			})
+		)
+	])
+
+	const computedInitialScope = untrack(() => legacyScopeToPath(initialScope, kinds))
+</script>
+
+{#snippet leafIcon(leaf: DrillLeaf<PreviewTarget>)}
+	{#if leaf.data.type === 'item'}
+		<RowIcon kind={leaf.data.item.kind} size={12} />
+	{:else if leaf.icon}
+		{@const Icon = leaf.icon}
+		<Icon size={12} class="shrink-0 text-tertiary" />
+	{/if}
+{/snippet}
+
+{#snippet branchIcon(branch: DrillBranch<PreviewTarget>)}
+	{#if branch.key === 'kind:flow' || branch.key === 'kind:script' || branch.key === 'kind:app'}
+		{@const k = branch.key.slice(5) as Kind}
+		<RowIcon kind={k} size={12} />
+	{:else if branch.icon}
+		{@const Icon = branch.icon}
+		<Icon size={12} class="shrink-0 text-tertiary" />
+	{/if}
+{/snippet}
+
+<DrillPicker
+	bind:this={inner}
+	{tree}
+	onPick={(leaf) => onPick(leaf.data)}
+	initialScope={computedInitialScope}
+	{initialHighlight}
+	{externalFilter}
+	{autoFocus}
+	{flush}
+	{leafIcon}
+	{branchIcon}
+	leafSecondary={(leaf, scope) =>
+		leaf.data.type === 'item' ? relativizeWorkspacePath(leaf.data.item.path, scope) : undefined}
+	onScopeChange={(scope) => {
+		if (scope.length > 0) loader.ensureForScopeSegment(scope[0])
+	}}
+	onFilterChange={loader.onFilterChange}
+/>
diff --git a/frontend/src/lib/components/sessions/PreviewTabHost.svelte b/frontend/src/lib/components/sessions/PreviewTabHost.svelte
new file mode 100644
index 0000000000..2a25cff3a5
--- /dev/null
+++ b/frontend/src/lib/components/sessions/PreviewTabHost.svelte
@@ -0,0 +1,124 @@
+<script lang="ts">
+	import { workspaceStore } from '$lib/stores'
+	import type { WorkspaceItem } from '$lib/components/workspacePicker'
+	import {
+		getEffectiveWorkspaceId,
+		sessionState,
+		type Session,
+		type SessionPreviewTab
+	} from './sessionState.svelte'
+	import type { SessionRuntime } from './sessionRuntime.svelte'
+	import { resolvePreviewTab } from './previewRouter'
+	import { withMenuHidden } from './sessionMode.svelte'
+	import ScriptEditorView from './ScriptEditorView.svelte'
+	import FlowEditorView from './FlowEditorView.svelte'
+	import RawAppEditorView from './RawAppEditorView.svelte'
+	import PipelineEditorView from './PipelineEditorView.svelte'
+
+	let {
+		tab,
+		session,
+		runtime,
+		active,
+		mounted,
+		label,
+		onNavigate,
+		onLoad
+	}: {
+		tab: SessionPreviewTab
+		session: Session | undefined
+		runtime: SessionRuntime | undefined
+		/** Visible tab — only one is at a time; the rest stay mounted but hidden. */
+		active: boolean
+		/** Lazy-mount gate: content only renders once the tab has been activated. */
+		mounted: boolean
+		/** Short tab label, for the iframe title. */
+		label: string
+		/** A link click inside a live editor re-points the active preview tab. */
+		onNavigate: (item: WorkspaceItem) => void
+		/** Iframe finished loading — the page reads back its observed location. */
+		onLoad: (frame: HTMLIFrameElement) => void
+	} = $props()
+
+	// Editor vs iframe is decided purely from the tab URL (see resolvePreviewTab):
+	// any editable item (script/flow/raw app) or a pipeline folder mounts its own
+	// live editor.
+	const slot = $derived(resolvePreviewTab(tab.url))
+	const workspaceId = $derived(
+		session ? (getEffectiveWorkspaceId(session) ?? $workspaceStore ?? '') : ''
+	)
+	const isActiveSession = $derived(!!session && sessionState.currentSessionId === session.id)
+
+	let frame: HTMLIFrameElement | undefined = $state()
+
+	export function reload() {
+		// A live editor shares the runtime store the chat mutates, so generic chat
+		// edits are already reflected — no reload needed. Deploys refresh it via
+		// each editor view's onDeploy → runtime.syncPreviewWithDeployed. So only the
+		// iframe fallback (a separate page) has to be told to refresh.
+		if (slot.kind === 'editor') return
+		try {
+			const win = frame?.contentWindow
+			if (!win) return
+			// Reload the page the user is actually viewing (observed `loc`, canonical
+			// with nomenubar/workspace stripped), re-injecting nomenubar + workspace.
+			// A plain location.reload() would reload the iframe's current URL, which
+			// in-frame navigation may have stripped of ?workspace= — booting the frame
+			// into the top-level navigation workspace instead of the session fork
+			// (sessionStorage/localStorage are shared with the top window, so the
+			// scoping can only live in the URL). replace() forces the load even when
+			// the target equals the current URL.
+			win.location.replace(withMenuHidden(tab.loc || tab.url, workspaceId || undefined))
+		} catch {
+			// Cross-navigation timing — skip; the next mutation reloads again.
+		}
+	}
+
+	const visibility = $derived(
+		active ? 'z-10 opacity-100 pointer-events-auto' : 'z-0 opacity-0 pointer-events-none'
+	)
+</script>
+
+{#if slot.kind === 'editor' && mounted && runtime}
+	<div class="absolute inset-0 flex flex-col min-h-0 bg-surface {visibility}" aria-hidden={!active}>
+		{#if slot.editorKind === 'flow'}
+			<FlowEditorView
+				{runtime}
+				path={slot.path}
+				{workspaceId}
+				{onNavigate}
+				{isActiveSession}
+				{active}
+			/>
+		{:else if slot.editorKind === 'script'}
+			<ScriptEditorView
+				{runtime}
+				path={slot.path}
+				{workspaceId}
+				{onNavigate}
+				{isActiveSession}
+				{active}
+				initialTestPanelCollapsed
+			/>
+		{:else if slot.editorKind === 'pipeline'}
+			<PipelineEditorView {runtime} path={slot.path} {workspaceId} {isActiveSession} {active} />
+		{:else}
+			<RawAppEditorView
+				{runtime}
+				path={slot.path}
+				{workspaceId}
+				{onNavigate}
+				{isActiveSession}
+				{active}
+			/>
+		{/if}
+	</div>
+{:else if mounted}
+	<iframe
+		bind:this={frame}
+		src={withMenuHidden(tab.url, workspaceId || undefined)}
+		onload={(e) => onLoad(e.currentTarget as HTMLIFrameElement)}
+		title="Session preview: {label}"
+		class="absolute inset-0 w-full h-full border-0 bg-surface {visibility}"
+	></iframe>
+{/if}
diff --git a/frontend/src/lib/components/sessions/RawAppEditorView.svelte b/frontend/src/lib/components/sessions/RawAppEditorView.svelte
index 3e600e5114..e5f9dfe30e 100644
--- a/frontend/src/lib/components/sessions/RawAppEditorView.svelte
+++ b/frontend/src/lib/components/sessions/RawAppEditorView.svelte
@@ -17,7 +17,8 @@
 		path,
 		workspaceId,
 		onNavigate,
-		isActiveSession = true
+		isActiveSession = true,
+		active = true
 	}: {
 		runtime: SessionRuntime
 		path: string
@@ -26,13 +27,17 @@
 		/** Forwarded to SessionEditorTarget — only the visible session claims the
 		 * workspace's single live-editor slot. */
 		isActiveSession?: boolean
+		/** Whether this is the visible preview tab (forwarded as isActiveTab). */
+		active?: boolean
 	} = $props()
 
+	// This tab's own raw-app cell; each open app editor binds its own store.
+	const cell = $derived(runtime.rawAppCell(path))
 	let diffDrawer: DiffDrawer | undefined = $state()
 
 	// Path typed in the editor header, surfaced when it differs from the stored
 	// path. Mirror it into the runtime draft as `draft_path` so the rename
-	// mutates runtime.rawApp.val → the autosave sig changes → the draft is saved
+	// mutates this cell's store → the autosave sig changes → the draft is saved
 	// (and the home/review/Drafts lists show the friendly name). Mirrors the
 	// full-page /apps_raw/edit route.
 	let pendingDraftPath = $state<string | undefined>(undefined)
@@ -45,7 +50,7 @@
 	$effect(() => {
 		const dp = pendingDraftPath
 		untrack(() => {
-			const val = runtime.rawApp.val
+			const val = cell.store.val
 			if (!val) return
 			if (dp !== undefined) {
 				surfacedDraftPath = true
@@ -80,7 +85,7 @@
 	}
 </script>
 
-{#if runtime.savedRawApp.val}
+{#if cell.saved.val}
 	<DiffDrawer bind:this={diffDrawer} {restoreDeployed} />
 {/if}
 <SessionEditorTarget
@@ -90,29 +95,36 @@
 	{workspaceId}
 	{onNavigate}
 	{isActiveSession}
-	effectivePath={() => runtime.rawApp.val?.path ?? path}
+	isActiveTab={active}
+	effectivePath={() => cell.store.val?.path ?? path}
 >
 	{#snippet editor()}
-		{#if runtime.rawApp.val}
+		{#if cell.store.val}
 			<!-- newApp: a draft-only app (no_deployed=true) has a truthy synthesized
 			     savedApp but no deployed row, so it must deploy via createApp — keying
 			     on !savedApp alone would updateApp a never-deployed path and 404
 			     "not found". -->
+			<!-- These bind: targets live on this tab's editor cell (cell.store.val /
+			     cell.saved.val), reactive state owned by the SessionRuntime class (via
+			     rawAppCell), not by a component ancestor — so Svelte's ownership check
+			     flags a false positive here. -->
+			<!-- svelte-ignore ownership_invalid_binding -->
 			<RawAppEditor
-				bind:files={runtime.rawApp.val.files}
-				bind:runnables={runtime.rawApp.val.runnables}
-				bind:data={runtime.rawApp.val.data}
-				bind:summary={runtime.rawApp.val.summary}
+				bind:files={cell.store.val.files}
+				bind:runnables={cell.store.val.runnables}
+				bind:data={cell.store.val.data}
+				bind:summary={cell.store.val.summary}
 				bind:pendingDraftPath
-				newPath={runtime.rawApp.val.draft_path ?? runtime.rawApp.val.path}
+				newPath={cell.store.val.draft_path ?? cell.store.val.path}
 				{path}
 				autosaveWorkspace={workspaceId}
 				autosavePath={path}
-				policy={runtime.rawApp.val.policy}
-				bind:savedApp={runtime.savedRawApp.val}
-				newApp={!runtime.savedRawApp.val || runtime.savedRawApp.val.no_deployed === true}
+				policy={cell.store.val.policy}
+				bind:savedApp={cell.saved.val}
+				newApp={!cell.saved.val || cell.saved.val.no_deployed === true}
 				{diffDrawer}
 				{onNavigate}
+				condensedHeader={true}
 				onResetToDeployed={reloadDeployed}
 				onDeploy={(e) => {
 					// Sync the preview to deployed (raw apps deploy only from this editor).
diff --git a/frontend/src/lib/components/sessions/ScriptEditorView.svelte b/frontend/src/lib/components/sessions/ScriptEditorView.svelte
index 563ddf9e55..e040fec744 100644
--- a/frontend/src/lib/components/sessions/ScriptEditorView.svelte
+++ b/frontend/src/lib/components/sessions/ScriptEditorView.svelte
@@ -16,7 +16,8 @@
 		workspaceId,
 		onNavigate,
 		initialTestPanelCollapsed = false,
-		isActiveSession = true
+		isActiveSession = true,
+		active = true
 	}: {
 		runtime: SessionRuntime
 		path: string
@@ -26,8 +27,12 @@
 		/** Forwarded to SessionEditorTarget — only the visible session claims the
 		 * workspace's single live-editor slot. */
 		isActiveSession?: boolean
+		/** Whether this is the visible preview tab (forwarded as isActiveTab). */
+		active?: boolean
 	} = $props()
 
+	// This tab's own script cell; each open script editor binds its own store.
+	const cell = $derived(runtime.scriptCell(path))
 	let diffDrawer: DiffDrawer | undefined = $state()
 
 	// Restore actions for the diff drawer. The previous shared
@@ -36,7 +41,7 @@
 	// reset the live UserDraft handle to the target baseline — the inbound
 	// effect then syncs the editor preview. Mirrors /scripts/edit's restore.
 	async function restoreDeployed() {
-		const saved = runtime.savedScript.val
+		const saved = cell.saved.val
 		if (!saved) {
 			sendUserToast('Could not restore to deployed', true)
 			return
@@ -71,7 +76,7 @@
 	}
 </script>
 
-{#if runtime.savedScript.val}
+{#if cell.saved.val}
 	<DiffDrawer bind:this={diffDrawer} {restoreDeployed} />
 {/if}
 <SessionEditorTarget
@@ -81,10 +86,11 @@
 	{workspaceId}
 	{onNavigate}
 	{isActiveSession}
-	effectivePath={() => runtime.scriptStore.val?.path ?? path}
+	isActiveTab={active}
+	effectivePath={() => cell.store.val?.path ?? path}
 >
 	{#snippet editor()}
-		{#if runtime.scriptStore.val}
+		{#if cell.store.val}
 			<!--
 				A script with no backend version yet (AI-created, never saved or deployed
 				→ savedScript undefined) is a *new* script: pass an empty initialPath so
@@ -94,15 +100,16 @@
 				edit mode (Save draft + Diff) without navigating away.
 			-->
 			<ScriptBuilder
-				bind:script={runtime.scriptStore.val}
-				bind:savedScript={runtime.savedScript.val}
-				initialPath={runtime.savedScript.val ? path : ''}
+				bind:script={cell.store.val}
+				bind:savedScript={cell.saved.val}
+				initialPath={cell.saved.val ? path : ''}
 				autosaveWorkspace={workspaceId}
 				autosavePath={path}
 				initialPathChosen={true}
 				neverShowMeta={true}
-				fullyLoaded={!runtime.slot('script').loading}
+				fullyLoaded={!cell.slot.loading}
 				disableHistoryChange={true}
+				condensedHeader={true}
 				{diffDrawer}
 				{onNavigate}
 				{initialTestPanelCollapsed}
diff --git a/frontend/src/lib/components/sessions/SessionChangesBar.svelte b/frontend/src/lib/components/sessions/SessionChangesBar.svelte
new file mode 100644
index 0000000000..1bf47117cb
--- /dev/null
+++ b/frontend/src/lib/components/sessions/SessionChangesBar.svelte
@@ -0,0 +1,313 @@
+<script lang="ts">
+	import {
+		Archive,
+		ExternalLink,
+		GitPullRequestClosed,
+		MoveRight,
+		Pencil,
+		Trash2
+	} from 'lucide-svelte'
+	import { Button } from '$lib/components/common'
+	import Badge from '$lib/components/common/badge/Badge.svelte'
+	import WorkspaceFamilyPicker from './WorkspaceFamilyPicker.svelte'
+	import { isPremiumStore, userStore, userWorkspaces, workspaceStore } from '$lib/stores'
+	import { canCreateFork } from '$lib/utils/editInFork'
+	import { isCloudHosted } from '$lib/cloud'
+	import { sessionState, type Session } from './sessionState.svelte'
+	import { getRuntime } from './sessionRuntime.svelte'
+	import SessionDiffDrawer from './SessionDiffDrawer.svelte'
+	import { useWorkspaceDrafts } from '$lib/workspaceDrafts.svelte'
+	import { badgeCounts, buildDeployItems } from './sessionDeployModel'
+	import { useExistingMaskKeys } from './sessionDeployModel.svelte'
+	import JobsSegment from '$lib/components/copilot/chat/JobsSegment.svelte'
+
+	// Unified session bar: surfaces what the CURRENT chat changed — pending
+	// drafts and deployed items — as one count badge per status that opens the
+	// session diff drawer.
+	let {
+		session,
+		onMove,
+		onCreateForkAndMove,
+		onArchive,
+		onDelete
+	}: {
+		session: Session
+		onMove?: (workspaceId: string) => void
+		onCreateForkAndMove?: (fork: {
+			parent_workspace_id: string
+			id: string
+			name: string
+		}) => void | Promise<void>
+		onArchive?: () => void
+		onDelete?: () => void
+	} = $props()
+
+	// Only meaningful once the session committed to a workspace (post first send).
+	const committedId = $derived(session.workspace_id)
+	const sessionWorkspace = $derived(
+		committedId ? $userWorkspaces.find((w) => w.id === committedId) : undefined
+	)
+	const parentWorkspaceId = $derived(sessionWorkspace?.parent_workspace_id ?? undefined)
+	const parentWorkspace = $derived(
+		parentWorkspaceId ? $userWorkspaces.find((w) => w.id === parentWorkspaceId) : undefined
+	)
+	const isFork = $derived(!!parentWorkspaceId)
+
+	// Same gate as the sidebar WorkspaceMenu / SessionWorkspaceBar. On cloud,
+	// forking is a premium-only feature (backend caps it per paid seat).
+	const forksAllowed = $derived(
+		(!isCloudHosted() || $isPremiumStore) &&
+			canCreateFork($userStore) &&
+			$workspaceStore !== 'admins'
+	)
+
+	const runtime = $derived(getRuntime(session.id))
+
+	// The chat's modified-items mask (`${UserDraftItemKind}:${storagePath}`).
+	// undefined = legacy/untracked chat → fall back to showing every draft.
+	// A Set (even empty) → filter to just this chat's items.
+	const mask = $derived(runtime?.manager.modifiedItems)
+
+	// Workspace Drafts (fetches on mount and on every Server-Draft invalidation);
+	// scoped to the chat's mask inside the deploy model below.
+	const drafts = useWorkspaceDrafts(() => committedId)
+
+	// The committed workspace vanished from the user's list (deleted, archived,
+	// or access revoked) — the session can't operate in it anymore.
+	const isUnavailable = $derived(!!committedId && !sessionWorkspace)
+
+	// The committed workspace is gone, so we can't read its parent to know if
+	// it was a fork — fall back to the fork-id convention for the wording.
+	const committedIsFork = $derived(committedId?.startsWith('wm-fork-') ?? false)
+
+	// Full dock refresh: re-run existence checks + draft list. Both are
+	// stale-while-revalidate — a hard reset would blank dockItems for the
+	// round-trip, hiding the bar (and unmounting the drawer) mid-deploy.
+	function refreshDock() {
+		existing.refresh()
+		drafts.refresh()
+	}
+
+	// Refresh the draft list when the AI finishes a turn (loading true → false):
+	// tool calls may have created/edited/deleted items. Deploys happen
+	// server-side, so the frontend only has this coarse signal.
+	let wasLoading = $state(false)
+	$effect(() => {
+		const isLoading = runtime?.manager.loading ?? false
+		if (wasLoading && !isLoading) refreshDock()
+		wasLoading = isLoading
+	})
+
+	// Refresh when the user comes back to this view — covers edits made
+	// elsewhere while we were away. Two signals: visibilitychange (another tab
+	// in the same window) and window focus (a second browser window, where this
+	// tab never goes hidden so visibilitychange never fires — e.g. deploying
+	// from the full-page editor side by side).
+	$effect(() => {
+		if (!committedId) return
+		function refreshIfCurrent() {
+			if (document.visibilityState !== 'visible') return
+			if (sessionState.currentSessionId !== session.id) return
+			refreshDock()
+		}
+		document.addEventListener('visibilitychange', refreshIfCurrent)
+		window.addEventListener('focus', refreshIfCurrent)
+		return () => {
+			document.removeEventListener('visibilitychange', refreshIfCurrent)
+			window.removeEventListener('focus', refreshIfCurrent)
+		}
+	})
+
+	let diffDrawer: SessionDiffDrawer | undefined = $state(undefined)
+
+	// Opening the drawer re-fetches its own data, so it can show fresher state
+	// than the badge just clicked (e.g. "1 draft" that was deployed elsewhere in
+	// the meantime). Re-sync the dock alongside so the two never disagree.
+	function openDrawer() {
+		refreshDock()
+		diffDrawer?.open()
+	}
+
+	// The dock counts are computed from the same pure model over this chat's
+	// drafts; the readout mirrors the drawer's item states.
+	// Existence check for mask-only (deployed) items — without it they'd be
+	// dropped from the dock counts while the drawer (which runs the same check)
+	// still shows them as Deployed.
+	const existing = useExistingMaskKeys(() => ({
+		draftItems: drafts.items,
+		mask: committedId ? mask : undefined,
+		workspaceId: committedId ?? ''
+	}))
+	const dockItems = $derived(
+		committedId
+			? buildDeployItems({ draftItems: drafts.items, mask, existingKeys: existing.keys })
+			: []
+	)
+	const dockCounts = $derived(badgeCounts(dockItems))
+
+	// Deletion-only fork chat: the mask has entries but every one failed the
+	// (resolved) existence check — the chat's edits were deletions, which have no
+	// dock row by design. The pending fork→parent removal is still reviewable on
+	// the compare page, so the bar must keep that doorway instead of vanishing.
+	// Gated on a resolved check (undefined = still loading) so the bar doesn't
+	// flash this state while deployed rows are being confirmed, and on isFork —
+	// a non-fork deletion is immediate and final, with nothing left to review.
+	const deletionOnly = $derived(
+		isFork && (mask?.size ?? 0) > 0 && existing.keys !== undefined && dockItems.length === 0
+	)
+	const compareHref = $derived(
+		committedId
+			? `/forks/compare?workspace_id=${encodeURIComponent(committedId)}&mode=fork` +
+					(session.chatId ? `&from_session=${encodeURIComponent(session.chatId)}` : '')
+			: undefined
+	)
+
+	// One "Edits" bar for both fork and non-fork sessions, shown when this chat
+	// edited anything. The fork's identity lives in the modal (SessionDiffDrawer's
+	// title), not on the bar. Fork sessions still need the forking gate + a
+	// resolvable fork/parent pair.
+	const showBar = $derived(
+		!!committedId &&
+			(dockItems.length > 0 || deletionOnly) &&
+			(!isFork || (forksAllowed && !!sessionWorkspace && !!parentWorkspace && !!parentWorkspaceId))
+	)
+
+	// Background jobs the chat started (rendered as the Jobs segment). The session
+	// bar shows if there are edits OR jobs; each segment hides when its side is empty.
+	const hasJobs = $derived((runtime?.manager.backgroundJobs.length ?? 0) > 0)
+</script>
+
+{#snippet dock()}
+	<!-- One count badge per row status, same vocabulary/colors as the drawer's
+	     badges (draft/deployed) so the bar reads at a glance. Display-only: the
+	     enclosing Edits segment button opens the drawer. -->
+	<div class="flex items-center gap-1 shrink-0">
+		{#if dockCounts.draft > 0}
+			<Badge small color="indigo">
+				{dockCounts.draft} draft{dockCounts.draft === 1 ? '' : 's'}
+			</Badge>
+		{/if}
+		{#if dockCounts.deployed > 0}
+			<Badge small color="green">
+				{dockCounts.deployed} deployed
+			</Badge>
+		{/if}
+	</div>
+{/snippet}
+
+{#if committedId && isUnavailable}
+	<!-- Committed workspace is no longer in the user's list (deleted, archived,
+	     or access revoked). Surface an actionable banner: move the session
+	     to a still-valid workspace, or discard it (archive / delete). The
+	     chat input is disabled by SessionWrapper while this is shown. Shown even
+	     for an archived session — unarchiving in place can't help when the
+	     workspace is gone, so move/discard is the only real recovery path. -->
+	<div class="flex flex-col gap-2 py-2 px-3 text-xs border rounded-md bg-surface-tertiary">
+		<div class="flex flex-row items-start gap-2">
+			<GitPullRequestClosed class="w-4 h-4 shrink-0 text-tertiary mt-0.5" />
+			<div class="flex flex-col min-w-0 flex-1">
+				<span class="text-primary font-medium"
+					>The {committedIsFork ? 'fork' : 'workspace'} has been archived or deleted</span
+				>
+				<span class="text-2xs text-tertiary">
+					Move this session to another workspace, or discard it.
+					<span class="font-mono text-tertiary" title={committedId}>{committedId}</span>
+				</span>
+			</div>
+		</div>
+		<div class="flex flex-row items-center justify-end gap-1.5">
+			<WorkspaceFamilyPicker
+				onPick={(workspaceId) => onMove?.(workspaceId)}
+				onCreateFork={async (fork) => {
+					await onCreateForkAndMove?.(fork)
+				}}
+				createForkCaption="Created immediately and the session moved into it."
+			>
+				{#snippet trigger()}
+					<Button variant="default" unifiedSize="sm" startIcon={{ icon: MoveRight }}>
+						Move to workspace
+					</Button>
+				{/snippet}
+			</WorkspaceFamilyPicker>
+			<Button
+				variant="default"
+				unifiedSize="sm"
+				startIcon={{ icon: Archive }}
+				dropdownItems={[{ label: 'Delete', icon: Trash2, onClick: () => onDelete?.() }]}
+				onclick={() => onArchive?.()}
+			>
+				Archive
+			</Button>
+		</div>
+	</div>
+{:else if committedId && (showBar || hasJobs)}
+	<!-- Segmented session bar: an Edits segment (what the AI changed this session)
+	     and a Jobs segment (background jobs it started), sharing one border box.
+	     The Edits segment (or, in its absence, a flex-1 spacer) fills the left so the
+	     Jobs segment stays pinned to the right whether or not there are edits. Fork
+	     identity / sync status lives inside the modal. -->
+	<div
+		class="flex h-[38px] items-stretch overflow-hidden rounded-md border bg-surface-tertiary text-xs"
+	>
+		{#if showBar}
+			{#if deletionOnly && compareHref}
+				<!-- Deleted items have no drawer row; the pending fork→parent removal is
+				     reviewed on the compare page, so the segment links there instead. -->
+				<a
+					href={compareHref}
+					target="_blank"
+					rel="noopener noreferrer"
+					title="This chat's edits were deletions — review and promote them on the compare page"
+					class="flex min-w-0 flex-1 items-center gap-1.5 px-3 hover:bg-surface-hover"
+				>
+					<Pencil class="h-3.5 w-3.5 shrink-0 text-secondary" />
+					<span class="shrink-0 font-normal text-primary">Edits</span>
+					<span
+						class="ml-auto inline-flex items-center gap-1 truncate text-2xs font-medium text-accent"
+					>
+						Review deletions <ExternalLink class="h-3 w-3 shrink-0" />
+					</span>
+				</a>
+			{:else}
+				<!-- Raw <button> (like the other clickable session rows/segments, e.g.
+				     SessionPicker/WorkspaceFamilyPicker): a full-width bar segment, not a
+				     discrete design-system action control. aria-haspopup marks the drawer. -->
+				<button
+					type="button"
+					class="flex min-w-0 flex-1 items-center gap-1.5 px-3 hover:bg-surface-hover"
+					title="Edited by the chat during this session"
+					aria-haspopup="dialog"
+					onclick={openDrawer}
+				>
+					<Pencil class="h-3.5 w-3.5 shrink-0 text-secondary" />
+					<span class="shrink-0 font-normal text-primary">Edits</span>
+					<span class="ml-auto">{@render dock()}</span>
+				</button>
+			{/if}
+		{:else}
+			<!-- No edits: a spacer fills the left so the Jobs segment stays right-aligned. -->
+			<div class="flex-1"></div>
+		{/if}
+		{#if hasJobs}
+			<!-- standalone={false}: renders just the chip trigger as a full-height
+			     segment; the border box above provides the chrome. -->
+			<JobsSegment />
+		{/if}
+	</div>
+{/if}
+
+<!-- Mounted independently of the bar: a transient dip of the dock counts to
+     zero (mid-refresh after a deploy) must not unmount an open drawer. -->
+{#if committedId && !isUnavailable}
+	<SessionDiffDrawer
+		bind:this={diffDrawer}
+		workspaceId={committedId}
+		{parentWorkspaceId}
+		chatId={session.chatId}
+		keys={mask}
+		onDataChanged={refreshDock}
+		onItemDeployed={(item) =>
+			void runtime?.manager.renameModifiedItem(item.draftKind, item.path, item.displayPath)}
+		onItemDiscarded={(item) => void runtime?.manager.removeModifiedItem(item.draftKind, item.path)}
+	/>
+{/if}
diff --git a/frontend/src/lib/components/sessions/SessionDiffDrawer.svelte b/frontend/src/lib/components/sessions/SessionDiffDrawer.svelte
new file mode 100644
index 0000000000..ff50e8d438
--- /dev/null
+++ b/frontend/src/lib/components/sessions/SessionDiffDrawer.svelte
@@ -0,0 +1,112 @@
+<script lang="ts">
+	import WorkspaceDiffDrawer from './WorkspaceDiffDrawer.svelte'
+	import { ArrowRight, GitFork, Pencil } from 'lucide-svelte'
+	import { userWorkspaces } from '$lib/stores'
+	import Badge from '$lib/components/common/badge/Badge.svelte'
+	import { devBadgeText } from '$lib/utils/devWorkspaceLabel'
+	import { useSessionDeployModel } from './sessionDeployModel.svelte'
+	import type { DeployItem } from './sessionDeployModel'
+
+	// Session "Edits" drawer. Builds the deploy model over the session
+	// workspace's drafts and hands it to WorkspaceDiffDrawer, which renders the
+	// tree + scroll-through diff column. The parent workspace only informs the
+	// title identity and the compare-page link — deploys land in the session
+	// workspace itself.
+	let {
+		workspaceId,
+		parentWorkspaceId,
+		chatId,
+		keys,
+		onDataChanged,
+		onItemDeployed,
+		onItemDiscarded
+	}: {
+		workspaceId: string
+		parentWorkspaceId?: string
+		/** CHAT id (Session.chatId — the IndexedDB `chats` key, NOT the session id),
+		 *  threaded to the footer's compare-page link as `from_session`: the compare
+		 *  page resolves it via readChatModifiedItems to preselect this chat's edits. */
+		chatId?: string
+		keys?: Set<string>
+		/** Notified after a deploy/discard mutated workspace state, so the owner
+		 *  (session bar) can refresh its cached draft sources. */
+		onDataChanged?: () => void
+		/** Mask maintenance, forwarded to the deploy model (see its args' docs):
+		 *  a deploy moves the item's mask entry to its deployed path, a discard
+		 *  drops it. */
+		onItemDeployed?: (item: DeployItem) => void
+		onItemDiscarded?: (item: DeployItem) => void
+	} = $props()
+
+	const isFork = $derived(!!parentWorkspaceId)
+	const ws = $derived($userWorkspaces.find((w) => w.id === workspaceId))
+	const parentWs = $derived(
+		parentWorkspaceId ? $userWorkspaces.find((w) => w.id === parentWorkspaceId) : undefined
+	)
+
+	let inner: WorkspaceDiffDrawer | undefined = $state(undefined)
+
+	const model = useSessionDeployModel(() => ({
+		workspaceId,
+		mask: keys,
+		onDataChanged,
+		onItemDeployed,
+		onItemDiscarded
+	}))
+
+	// Editor URL for a row (every item lives in the session workspace).
+	function editUrlFor(item: DeployItem): string | undefined {
+		const ws = encodeURIComponent(workspaceId)
+		const path = item.path
+		if (item.deployKind === 'flow') return `/flows/edit/${path}?workspace=${ws}`
+		if (item.deployKind === 'script') return `/scripts/edit/${path}?workspace=${ws}`
+		if (item.deployKind === 'app') return `/apps/edit/${path}?workspace=${ws}`
+		if (item.deployKind === 'raw_app') return `/apps_raw/edit/${path}?workspace=${ws}`
+		return undefined
+	}
+
+	const title = 'Edited during session'
+
+	// Compare page = the batch/PR surface. The footer hands off THIS session's
+	// edits via `from_session`, so the compare page opens preselected.
+	const compareSessionHref = $derived(
+		`/forks/compare?workspace_id=${encodeURIComponent(workspaceId)}&mode=${isFork ? 'fork' : 'draft'}` +
+			(chatId ? `&from_session=${encodeURIComponent(chatId)}` : '')
+	)
+
+	export function open() {
+		inner?.open()
+	}
+</script>
+
+<WorkspaceDiffDrawer
+	bind:this={inner}
+	{model}
+	{title}
+	{editUrlFor}
+	{compareSessionHref}
+	workspaceLabel={ws?.name ?? workspaceId}
+>
+	{#snippet titleExtra()}
+		<div class="flex items-center gap-1.5 text-xs text-secondary min-w-0">
+			{#if isFork}
+				<GitFork class="w-3.5 h-3.5 shrink-0" />
+				<span class="font-medium truncate" title={ws?.name ?? workspaceId}>
+					{ws?.name ?? workspaceId}
+				</span>
+				{#if ws?.is_dev_workspace}
+					<Badge color="indigo" small>{devBadgeText(ws.dev_workspace_label)}</Badge>
+				{/if}
+				<ArrowRight class="w-3 h-3 shrink-0 text-tertiary" />
+				<span class="font-medium truncate" title={parentWs?.name ?? parentWorkspaceId}>
+					{parentWs?.name ?? parentWorkspaceId}
+				</span>
+			{:else}
+				<Pencil class="w-3.5 h-3.5 shrink-0" />
+				<span class="font-medium truncate" title={ws?.name ?? workspaceId}>
+					{ws?.name ?? workspaceId}
+				</span>
+			{/if}
+		</div>
+	{/snippet}
+</WorkspaceDiffDrawer>
diff --git a/frontend/src/lib/components/sessions/SessionDraftBar.svelte b/frontend/src/lib/components/sessions/SessionDraftBar.svelte
deleted file mode 100644
index dcc5640f2c..0000000000
--- a/frontend/src/lib/components/sessions/SessionDraftBar.svelte
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts">
-	import { Pencil } from 'lucide-svelte'
-	import { Button } from '$lib/components/common'
-	import { goto } from '$lib/navigation'
-	import { sessionState, type Session } from './sessionState.svelte'
-	import { getRuntime } from './sessionRuntime.svelte'
-	import DraftDiffDrawer from './DraftDiffDrawer.svelte'
-	import SessionDiffButton from './SessionDiffButton.svelte'
-	import { useWorkspaceDrafts } from '$lib/workspaceDrafts.svelte'
-
-	let { session }: { session: Session } = $props()
-
-	// Only meaningful once the session committed to a workspace (post first send).
-	// The Draft Count comes from the shared Workspace Drafts resource: it fetches
-	// on mount and whenever a Server-Draft mutation invalidates the workspace, so
-	// the count is fresh on every (re)open with no per-session caching.
-	const committedId = $derived(session.workspace_id)
-	const drafts = useWorkspaceDrafts(() => committedId)
-	const count = $derived(drafts.count)
-
-	// Deploys/saves from the Preview editor invalidate the workspace directly
-	// (ScriptEditorView / FlowEditorView / RawAppEditorView call
-	// invalidateWorkspaceDrafts). The chat itself can also deploy items, but
-	// those happen server-side and the frontend never sees the individual calls —
-	// so refresh on the same coarse signals the fork bar uses: the AI turn ending
-	// and the tab regaining visibility.
-	const runtime = $derived(getRuntime(session.id))
-
-	let wasLoading = $state(false)
-	$effect(() => {
-		const isLoading = runtime?.manager.loading ?? false
-		if (wasLoading && !isLoading) drafts.refresh()
-		wasLoading = isLoading
-	})
-
-	$effect(() => {
-		if (!committedId) return
-		function onVisibilityChange() {
-			if (document.visibilityState !== 'visible') return
-			if (sessionState.currentSessionId !== session.id) return
-			drafts.refresh()
-		}
-		document.addEventListener('visibilitychange', onVisibilityChange)
-		return () => document.removeEventListener('visibilitychange', onVisibilityChange)
-	})
-
-	let drawer: DraftDiffDrawer | undefined = $state(undefined)
-
-	function openReview() {
-		if (!committedId) return
-		goto(`/forks/compare?workspace_id=${encodeURIComponent(committedId)}&mode=draft`)
-	}
-</script>
-
-{#if committedId && count > 0}
-	<div
-		class="flex flex-row items-center justify-between gap-2 py-2 px-3 text-xs border rounded-md bg-surface-tertiary"
-	>
-		<div class="flex items-center gap-1.5 min-w-0">
-			<span class="inline-flex shrink-0"><Pencil class="w-3.5 h-3.5 text-secondary" /></span>
-			<span class="truncate text-secondary">{count} draft{count === 1 ? '' : 's'}</span>
-		</div>
-		<div class="flex items-center gap-1 shrink-0">
-			<SessionDiffButton {count} onclick={() => drawer?.open()} />
-			<Button variant="default" unifiedSize="xs" onclick={openReview}>Review</Button>
-		</div>
-	</div>
-
-	<DraftDiffDrawer bind:this={drawer} workspaceId={committedId} />
-{/if}
diff --git a/frontend/src/lib/components/sessions/SessionEditorTarget.svelte b/frontend/src/lib/components/sessions/SessionEditorTarget.svelte
index f4c29188f9..ce1fd38221 100644
--- a/frontend/src/lib/components/sessions/SessionEditorTarget.svelte
+++ b/frontend/src/lib/components/sessions/SessionEditorTarget.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { untrack, type Snippet } from 'svelte'
+	import { setContext, untrack, type Snippet } from 'svelte'
 	import { Loader2 } from 'lucide-svelte'
 	import type { WorkspaceItem } from '$lib/components/workspacePicker'
 	import { UserDraft } from '$lib/userDraft.svelte'
@@ -16,7 +16,8 @@
 		effectivePath,
 		editor,
 		onNavigate,
-		isActiveSession = true
+		isActiveSession = true,
+		isActiveTab = true
 	}: {
 		runtime: SessionRuntime
 		kind: SessionTargetKind
@@ -31,15 +32,33 @@
 		/** The heavy editor for this kind; remounted on a data-ready target swap. */
 		editor: Snippet
 		onNavigate?: (item: WorkspaceItem) => void
-		/**
-		 * Only the visible session claims the workspace's single live-editor slot
-		 * (one per (workspace, kind)); a warm-but-hidden session must not, else
-		 * chat actions on the visible session resolve to the hidden one's path.
-		 */
+		/** A warm-but-hidden session must not claim the live-editor slot. */
 		isActiveSession?: boolean
+		/**
+		 * Only the visible editor tab claims the workspace's single live-editor slot
+		 * (one per (workspace, kind)); with several editors open at once, a hidden
+		 * tab must not, else chat actions resolve to the wrong item's path.
+		 */
+		isActiveTab?: boolean
 	} = $props()
 
-	const slot = $derived(runtime.slot(kind))
+	// Mark this subtree as the session side panel: editors below detect the
+	// context to hide their own AI entry points (an AI button here would nest
+	// sessions), and chat-aware components resolve the session's scoped manager
+	// instead of the app singleton. The value is captured at init — a reused
+	// component instance keeps the first runtime's manager — so descendants may
+	// rely on its presence, not its identity.
+	setContext('aiChatManager', runtime.manager)
+
+	// This tab's own editor cell (per (kind, path)); several tabs can be live at once.
+	const cell = $derived(
+		kind === 'flow'
+			? runtime.flowCell(path)
+			: kind === 'script'
+				? runtime.scriptCell(path)
+				: runtime.rawAppCell(path)
+	)
+	const slot = $derived(cell.slot)
 
 	function triggerLoad(): Promise<void> {
 		if (kind === 'flow') return runtime.loadFlow(workspaceId, path)
@@ -48,10 +67,15 @@
 	}
 
 	function buildCodec(): DraftSyncCodec<any> {
-		if (kind === 'flow') return makeFlowCodec(runtime)
-		if (kind === 'script') return makeScriptCodec(runtime, () => path)
-		return makeRawAppCodec(runtime)
+		if (kind === 'flow')
+			return makeFlowCodec(runtime.flowCell(path).store, runtime.flowCell(path).stateStore)
+		if (kind === 'script') return makeScriptCodec(runtime.scriptCell(path).store, () => path)
+		return makeRawAppCodec(runtime.rawAppCell(path).store)
 	}
+	// Rebuilds when `path` changes so the sync always binds this tab's current
+	// cell: retargeting the tab (in-editor link / breadcrumb) swaps `path` without
+	// remounting, and each codec closes over one cell's store.
+	const codec = $derived(buildCodec())
 
 	$effect(() => {
 		if (workspaceId && path) {
@@ -61,11 +85,11 @@
 
 	// Mark this editor as the live editor draft for the session's workspace so
 	// the chat's `isLiveDraft` hint / `discard_local_draft` tool resolve to this
-	// path — same registration the regular edit pages do. Gated on
-	// `isActiveSession` (see prop doc).
+	// path — same registration the regular edit pages do. Only the visible tab of
+	// the active session claims the (workspace, kind) slot (see prop docs).
 	$effect(() => {
 		if (!workspaceId || !path) return
-		if (!isActiveSession) return
+		if (!isActiveSession || !isActiveTab) return
 		UserDraft.setLiveEditorDraft({
 			workspace: workspaceId,
 			itemKind: kind,
@@ -79,7 +103,7 @@
 		path: () => path,
 		workspace: () => workspaceId,
 		ready: () => slot.loadedPath === path,
-		codec: buildCodec()
+		codec: () => codec
 	})
 
 	// Debounced loading affordance for a breadcrumb swap: while the loaded path
diff --git a/frontend/src/lib/components/sessions/SessionFilterMenu.svelte b/frontend/src/lib/components/sessions/SessionFilterMenu.svelte
new file mode 100644
index 0000000000..6a2c726782
--- /dev/null
+++ b/frontend/src/lib/components/sessions/SessionFilterMenu.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+	import { untrack } from 'svelte'
+	import { melt } from '@melt-ui/svelte'
+	import type { MenubarMenuBuilders } from '@melt-ui/svelte'
+	import { ChevronRight, Filter } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
+	import Toggle from '$lib/components/Toggle.svelte'
+
+	interface Props {
+		// Submenu builders from the enclosing melt Menu — createSubmenu must be
+		// called against this specific menu instance (same pattern as DropdownSubmenuItem).
+		builders: MenubarMenuBuilders
+		showArchived: boolean
+		archivedCount: number
+	}
+
+	let { builders, showArchived = $bindable(), archivedCount }: Props = $props()
+
+	const {
+		elements: { subTrigger, subMenu },
+		states: { subOpen }
+	} = untrack(() => builders).createSubmenu()
+
+	// Count of active (non-default) filters, surfaced as a subtle badge on the
+	// trigger so an applied filter is visible without opening the submenu.
+	let activeCount = $derived(showArchived ? 1 : 0)
+</script>
+
+<button
+	use:melt={$subTrigger}
+	class={twMerge(
+		'px-3 py-1.5 w-full text-left text-xs font-normal text-secondary',
+		'flex flex-row items-center gap-2 rounded-sm',
+		'data-[highlighted]:bg-surface-hover data-[highlighted]:text-primary'
+	)}
+>
+	<Filter size={14} class="shrink-0 text-tertiary" />
+	<span class="grow">Filter</span>
+	{#if activeCount > 0}
+		<span class="text-2xs text-tertiary tabular-nums">{activeCount}</span>
+	{/if}
+	<ChevronRight size={14} class="shrink-0 text-tertiary" />
+</button>
+
+{#if $subOpen}
+	<div
+		use:melt={$subMenu}
+		class="z-[6000] w-48 bg-surface dark:border rounded-md shadow-md focus:outline-none py-1"
+	>
+		<!-- Rendered as plain content (not a MenuItem) so toggling a filter keeps
+		     the submenu open instead of selecting-and-closing the whole menu. -->
+		<div class="px-3 py-1.5 flex flex-col gap-2">
+			<div class="flex flex-col gap-0.5">
+				<Toggle bind:checked={showArchived} size="xs" options={{ right: 'Show archived' }} />
+				{#if archivedCount > 0}
+					<span class="text-2xs text-tertiary pl-1">
+						{archivedCount} archived session{archivedCount === 1 ? '' : 's'}
+					</span>
+				{/if}
+			</div>
+		</div>
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/sessions/SessionForkBar.svelte b/frontend/src/lib/components/sessions/SessionForkBar.svelte
deleted file mode 100644
index b1e74b43eb..0000000000
--- a/frontend/src/lib/components/sessions/SessionForkBar.svelte
+++ /dev/null
@@ -1,201 +0,0 @@
-<script lang="ts">
-	import {
-		Archive,
-		ArrowRight,
-		GitCompareArrows,
-		GitFork,
-		GitPullRequestArrow,
-		GitPullRequestClosed,
-		MoveRight,
-		Trash2
-	} from 'lucide-svelte'
-	import { Button } from '$lib/components/common'
-	import WorkspaceFamilyPicker from './WorkspaceFamilyPicker.svelte'
-	import { userWorkspaces, workspaceStore } from '$lib/stores'
-	import { goto } from '$lib/navigation'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { isCloudHosted } from '$lib/cloud'
-	import { deriveForkStatus, sessionState, type Session } from './sessionState.svelte'
-	import { getRuntime } from './sessionRuntime.svelte'
-	import ForkDiffDrawer from './ForkDiffDrawer.svelte'
-	import SessionDiffButton from './SessionDiffButton.svelte'
-
-	let {
-		session,
-		onMove,
-		onCreateForkAndMove,
-		onArchive,
-		onDelete
-	}: {
-		session: Session
-		onMove?: (workspaceId: string) => void
-		onCreateForkAndMove?: (fork: {
-			parent_workspace_id: string
-			id: string
-			name: string
-		}) => void | Promise<void>
-		onArchive?: () => void
-		onDelete?: () => void
-	} = $props()
-
-	// The fork bar surfaces a committed workspace relationship — only
-	// visible after the session locked its workspace at first send. Drafts
-	// (workspace_id undefined) get nothing here.
-	const committedId = $derived(session.workspace_id)
-	const sessionWorkspace = $derived(
-		committedId ? $userWorkspaces.find((w) => w.id === committedId) : undefined
-	)
-	const parentWorkspaceId = $derived(sessionWorkspace?.parent_workspace_id ?? undefined)
-	const parentWorkspace = $derived(
-		parentWorkspaceId ? $userWorkspaces.find((w) => w.id === parentWorkspaceId) : undefined
-	)
-	const isFork = $derived(!!parentWorkspaceId)
-
-	// Same gate as the sidebar WorkspaceMenu / SessionWorkspaceBar.
-	// When forking isn't available the diff/review surface is moot.
-	const forksAllowed = $derived(
-		!isCloudHosted() && !isRuleActive('DisableWorkspaceForking') && $workspaceStore !== 'admins'
-	)
-
-	let diffDrawer: ForkDiffDrawer | undefined = $state(undefined)
-
-	// Comparison data lives on the shared SessionRuntime resource so any
-	// future consumer (e.g. the diff drawer, a merge action) reads the
-	// same cache and can invalidate it after mutating the fork.
-	const runtime = $derived(getRuntime(session.id))
-	const comparison = $derived(runtime?.forkComparison.val)
-	const totalDiffs = $derived(comparison?.summary?.total_diffs ?? 0)
-	const forkStatus = $derived(deriveForkStatus(session, $userWorkspaces, comparison))
-	const isUnavailable = $derived(forkStatus === 'unavailable')
-
-	$effect(() => {
-		if (!runtime || !committedId || !parentWorkspaceId) return
-		void runtime.ensureForkComparison(parentWorkspaceId, committedId)
-	})
-
-	function refreshComparison() {
-		if (!runtime || !committedId || !parentWorkspaceId) return
-		runtime.invalidateForkComparison()
-		void runtime.ensureForkComparison(parentWorkspaceId, committedId)
-	}
-
-	// Refresh when the AI finishes a turn (loading transitions true →
-	// false). Tool calls in that turn may have created / edited / deleted
-	// fork items, so the diff count needs to reflect them immediately.
-	let wasLoading = $state(false)
-	$effect(() => {
-		const isLoading = runtime?.manager.loading ?? false
-		if (wasLoading && !isLoading) refreshComparison()
-		wasLoading = isLoading
-	})
-
-	// Refresh when the tab regains visibility — covers edits made in
-	// another tab or by another user while we were away.
-	$effect(() => {
-		if (!runtime || !committedId || !parentWorkspaceId) return
-		function onVisibilityChange() {
-			if (document.visibilityState !== 'visible') return
-			if (sessionState.currentSessionId !== session.id) return
-			refreshComparison()
-		}
-		document.addEventListener('visibilitychange', onVisibilityChange)
-		return () => document.removeEventListener('visibilitychange', onVisibilityChange)
-	})
-
-	export const refresh = refreshComparison
-
-	function openReview() {
-		if (!committedId || isUnavailable) return
-		goto(`/forks/compare?workspace_id=${encodeURIComponent(committedId)}`)
-	}
-</script>
-
-{#if committedId && isUnavailable}
-	<!-- Fork workspace is no longer in the user's list (deleted, archived,
-	     or access revoked). Surface an actionable banner: move the session
-	     to a still-valid workspace, or discard it (archive / delete). The
-	     chat input is disabled by SessionWrapper while this is shown. -->
-	<div class="flex flex-col gap-2 py-2 px-3 text-xs border rounded-md bg-surface-tertiary">
-		<div class="flex flex-row items-start gap-2">
-			<GitPullRequestClosed class="w-4 h-4 shrink-0 text-tertiary mt-0.5" />
-			<div class="flex flex-col min-w-0 flex-1">
-				<span class="text-primary font-medium">The fork has been archived or deleted</span>
-				<span class="text-2xs text-tertiary">
-					Move this session to another workspace, or discard it.
-					<span class="font-mono text-tertiary" title={committedId}>{committedId}</span>
-				</span>
-			</div>
-		</div>
-		<div class="flex flex-row items-center justify-end gap-1.5">
-			<WorkspaceFamilyPicker
-				onPick={(workspaceId) => onMove?.(workspaceId)}
-				onCreateFork={async (fork) => {
-					await onCreateForkAndMove?.(fork)
-				}}
-				createForkCaption="Created immediately and the session moved into it."
-			>
-				{#snippet trigger()}
-					<Button variant="default" unifiedSize="sm" startIcon={{ icon: MoveRight }}>
-						Move to workspace
-					</Button>
-				{/snippet}
-			</WorkspaceFamilyPicker>
-			<Button
-				variant="default"
-				unifiedSize="sm"
-				startIcon={{ icon: Archive }}
-				dropdownItems={[{ label: 'Delete', icon: Trash2, onClick: () => onDelete?.() }]}
-				onclick={() => onArchive?.()}
-			>
-				Archive
-			</Button>
-		</div>
-	</div>
-{:else if forksAllowed && isFork && sessionWorkspace && parentWorkspace && parentWorkspaceId && committedId}
-	{@const StatusIcon =
-		forkStatus === 'ahead'
-			? GitPullRequestArrow
-			: forkStatus === 'diverged'
-				? GitCompareArrows
-				: GitFork}
-	{@const statusColor =
-		forkStatus === 'ahead'
-			? 'text-blue-500'
-			: forkStatus === 'diverged'
-				? 'text-amber-500'
-				: 'text-secondary'}
-	{@const statusTitle =
-		forkStatus === 'ahead'
-			? 'Ahead of parent'
-			: forkStatus === 'diverged'
-				? 'Diverged from parent'
-				: forkStatus === 'in_sync'
-					? 'In sync with parent'
-					: 'Fork'}
-	<div
-		class="flex flex-row items-center justify-between gap-2 py-2 px-3 text-xs border rounded-md bg-surface-tertiary"
-	>
-		<div class="flex items-center gap-1.5 min-w-0">
-			<span title={statusTitle} class="inline-flex shrink-0">
-				<StatusIcon class="w-3.5 h-3.5 {statusColor}" />
-			</span>
-			<span class="truncate text-secondary" title={sessionWorkspace.name}>
-				{sessionWorkspace.name}
-			</span>
-			<ArrowRight class="w-3 h-3 shrink-0 text-tertiary" />
-			<span class="truncate text-secondary" title={parentWorkspace.name}>
-				{parentWorkspace.name}
-			</span>
-		</div>
-		<div class="flex items-center gap-1 shrink-0">
-			<SessionDiffButton
-				count={totalDiffs}
-				disabled={totalDiffs === 0}
-				onclick={() => diffDrawer?.open()}
-			/>
-			<Button variant="default" unifiedSize="xs" onclick={openReview}>Review</Button>
-		</div>
-	</div>
-
-	<ForkDiffDrawer bind:this={diffDrawer} forkWorkspaceId={committedId} {parentWorkspaceId} />
-{/if}
diff --git a/frontend/src/lib/components/sessions/SessionItemNotFound.svelte b/frontend/src/lib/components/sessions/SessionItemNotFound.svelte
index dc1a088c53..77c5173813 100644
--- a/frontend/src/lib/components/sessions/SessionItemNotFound.svelte
+++ b/frontend/src/lib/components/sessions/SessionItemNotFound.svelte
@@ -3,7 +3,11 @@
 	import type { WorkspaceItem, WorkspaceItemKind } from '$lib/components/workspacePicker'
 	import type { SessionTarget } from './sessionState.svelte'
 
-	const KIND_NOT_FOUND_LABEL: Record<SessionTarget['kind'], string> = {
+	// `pipeline` targets never hit this component (they aren't slot-loaded, so they
+	// can't 404 through SessionEditorTarget) — exclude it from the kinds here.
+	type NotFoundKind = Exclude<SessionTarget['kind'], 'pipeline'>
+
+	const KIND_NOT_FOUND_LABEL: Record<NotFoundKind, string> = {
 		flow: 'Flow',
 		script: 'Script',
 		raw_app: 'Raw app'
@@ -14,7 +18,7 @@
 		path,
 		onNavigate
 	}: {
-		kind: SessionTarget['kind']
+		kind: NotFoundKind
 		path: string
 		onNavigate?: (item: WorkspaceItem) => void
 	} = $props()
diff --git a/frontend/src/lib/components/sessions/SessionModeSwitch.svelte b/frontend/src/lib/components/sessions/SessionModeSwitch.svelte
new file mode 100644
index 0000000000..5b297b4bc8
--- /dev/null
+++ b/frontend/src/lib/components/sessions/SessionModeSwitch.svelte
@@ -0,0 +1,55 @@
+<script lang="ts">
+	import { House, MessagesSquare } from 'lucide-svelte'
+	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
+	import { enterSessionMode, exitSessionMode } from './sessionSwitch.svelte'
+
+	// Which side of the switch is active. `nav` = workspace navigation (the classic
+	// app), `session` = the sessions sidebar + chat + preview.
+	let {
+		mode,
+		isCollapsed = false,
+		// Fired right before the toggle navigates. Lets a host (e.g. the mobile menu
+		// drawer) keep itself open across the mode switch.
+		onToggle
+	}: { mode: 'nav' | 'session'; isCollapsed?: boolean; onToggle?: () => void } = $props()
+
+	function onSelected(next: 'nav' | 'session') {
+		if (next === mode) return
+		onToggle?.()
+		if (next === 'session') void enterSessionMode()
+		else void exitSessionMode()
+	}
+</script>
+
+<!-- Each ToggleButton renders inside a Tooltip wrapper, which is the actual flex
+     child of the group's track — so the buttons fill the rail width only if those
+     wrappers grow. `[&>*]:flex-1` makes every direct child split the track evenly. -->
+<ToggleButtonGroup
+	selected={mode}
+	{onSelected}
+	tabListClass={isCollapsed ? 'flex-col w-full [&>*]:w-full' : 'w-full [&>*]:flex-1'}
+>
+	{#snippet children({ item })}
+		<ToggleButton
+			{item}
+			value="nav"
+			icon={isCollapsed ? House : undefined}
+			label="Workspace"
+			iconOnly={isCollapsed}
+			tooltip={isCollapsed ? 'Workspace' : undefined}
+			size="sm"
+			class="w-full justify-center"
+		/>
+		<ToggleButton
+			{item}
+			value="session"
+			icon={isCollapsed ? MessagesSquare : undefined}
+			label="AI Sessions"
+			iconOnly={isCollapsed}
+			tooltip={isCollapsed ? 'AI Sessions' : undefined}
+			size="sm"
+			class="w-full justify-center"
+		/>
+	{/snippet}
+</ToggleButtonGroup>
diff --git a/frontend/src/lib/components/sessions/SessionPicker.svelte b/frontend/src/lib/components/sessions/SessionPicker.svelte
index 55683b4d96..e3d1c5d21e 100644
--- a/frontend/src/lib/components/sessions/SessionPicker.svelte
+++ b/frontend/src/lib/components/sessions/SessionPicker.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
-	import { Button } from '$lib/components/common'
 	import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
 	import {
 		Archive,
 		ArchiveRestore,
+		Building,
 		ChevronDown,
 		ChevronRight,
 		EllipsisVertical,
 		Filter,
+		GitFork,
 		MessageSquare,
 		Pencil,
 		PencilLine,
@@ -15,15 +16,15 @@
 		Trash2
 	} from 'lucide-svelte'
 	import { twMerge } from 'tailwind-merge'
+	import TextInput from '$lib/components/text_input/TextInput.svelte'
 	import { goto } from '$lib/navigation'
-	import { page } from '$app/state'
 	import { useLocalStorageValue } from '$lib/svelte5Utils.svelte'
 	import { slide } from 'svelte/transition'
 	import {
 		createSession,
-		deriveForkStatus,
-		getEffectiveWorkspaceId,
+		deleteSessionsForWorkspace,
 		isForkSession,
+		reconcileAfterWorkspaceChange,
 		renameSession,
 		selectSession,
 		sessionState,
@@ -38,25 +39,30 @@
 		getOrCreateRuntime,
 		getRuntime,
 		getSessionChatStatus,
-		removeSession
+		removeSession,
+		resetSessionPreviewTabs
 	} from './sessionRuntime.svelte'
 	import SessionStatusDot from './SessionStatusDot.svelte'
+	import WorkspaceIcon from '$lib/components/workspace/WorkspaceIcon.svelte'
+	import { buildWorkspaceHierarchy } from '$lib/utils/workspaceHierarchy'
+	import SessionFilterMenu from './SessionFilterMenu.svelte'
 	import { Menu, Menubar, MenuItem } from '$lib/components/meltComponents'
-	import MenuButton from '$lib/components/sidebar/MenuButton.svelte'
+	import MenuButton, { sidebarClasses } from '$lib/components/sidebar/MenuButton.svelte'
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
-	import { visibleWorkspaceIds } from './sessionScope.svelte'
 	import { isGlobalAiEnabled } from '$lib/components/copilot/chat/global/gate'
-	import { userWorkspaces, usersWorkspaceStore, workspaceStore } from '$lib/stores'
+	import { userWorkspaces, workspaceStore } from '$lib/stores'
+	import { workspaceIsFork } from '$lib/utils/workspaceHierarchy'
 	import { WorkspaceService } from '$lib/gen'
 	import { sendUserToast } from '$lib/toast'
+	import { currentWorkspaceRootId, workspaceRootId } from './sessionScope.svelte'
+	import { page } from '$app/state'
+	import { base } from '$app/paths'
 
-	// Look up the cached fork comparison for a session through its runtime
-	// (if any). The deriveForkStatus helper handles the "no runtime yet"
-	// and "comparison not loaded" cases by returning undefined; we render
-	// a neutral fork icon in that interim, then upgrade to the proper
-	// status icon once the comparison lands.
-	function forkStatusFor(session: Session) {
-		return deriveForkStatus(session, $userWorkspaces, getRuntime(session.id)?.forkComparison.val)
+	// The row icon only distinguishes "the session's fork workspace no longer
+	// exists" (detached) — never the fork's ahead/behind sync state, which is
+	// the fork bar's job.
+	function forkDetachedFor(session: Session): boolean {
+		return isUnavailableFork(session)
 	}
 
 	function isForkFor(session: Session): boolean {
@@ -84,16 +90,39 @@
 	// the feature flag is off, the sidebar section is hidden entirely.
 	const globalEnabled = isGlobalAiEnabled()
 
-	// Only highlight the active session while we're actually on the session
-	// page — once the user navigates away, `currentSessionId` lingers but no
-	// row should appear selected.
-	const onSessionsPage = $derived(page.route.id?.includes('/sessions') ?? false)
+	// Only highlight the active session while the sessions page is open — elsewhere
+	// `currentSessionId` lingers but no row should appear selected.
+	const onSessionsPage = $derived(page.url.pathname.startsWith(`${base}/sessions`))
+	const sessionActive = $derived(onSessionsPage)
 
 	interface Props {
 		isCollapsed?: boolean
+		// When false, the section is always expanded (no collapse chevron) — used
+		// where the picker is the whole rail rather than one sidebar section.
+		collapsible?: boolean
+		// Render the full workspace tree (every workspace, not just ones with
+		// sessions) with clickable workspace rows on top of the nested sessions.
+		workspaceTree?: boolean
+		// The workspace currently being browsed (highlighted) in tree mode.
+		browsedWorkspaceId?: string
+		// Clicking a workspace row → browse it (preview its home, no chat).
+		onBrowseWorkspace?: (workspaceId: string) => void
+		// Clicking a session row → leave browse mode (bring the chat back).
+		onSelectSession?: () => void
+		// Drop the section's own outer padding/border so it sits flush inside a
+		// parent container (e.g. gathered with Favorites/Search in the sidebar).
+		embedded?: boolean
 	}
 
-	let { isCollapsed = false }: Props = $props()
+	let {
+		isCollapsed = false,
+		collapsible = true,
+		workspaceTree = false,
+		browsedWorkspaceId = undefined,
+		onBrowseWorkspace = undefined,
+		onSelectSession = undefined,
+		embedded = false
+	}: Props = $props()
 
 	const sectionCollapsed = useLocalStorageValue(
 		'windmill_sessions_section_collapsed',
@@ -101,40 +130,124 @@
 		'boolean'
 	)
 	const showArchived = useLocalStorageValue('windmill_sessions_show_archived', false, 'boolean')
-
 	let listRoot: HTMLDivElement | undefined = $state()
 
-	// Sessions visible in the current workspace (active workspace + its
-	// forks). Drafts (no committed workspace) are scoped by their
-	// pending workspace pick — set at create time to the workspace the
-	// user was in. Archived sessions are filtered out unless the user
-	// has opted in via the filter popover.
+	// A session's family root: the stored grouping id, else derived live.
+	function sessionRootOf(s: Session): string | undefined {
+		return (
+			s.workspace_root_id ??
+			workspaceRootId(s.workspace_id ?? s.pending_workspace_id, $userWorkspaces)
+		)
+	}
+
+	// Flat list passing the archive + scope filters. Grouping for display happens
+	// in `sessionGroups`; this flat view drives the runtime effect, the unread
+	// total, and keyboard navigation.
 	const visibleSessions = $derived(
 		sessionState.sessions.filter((s) => {
-			// Transient (not-yet-sent) sessions live as their own page but
-			// don't clutter the sidebar list.
 			if (s.transient) return false
+			// The open session always stays in the list, ignoring both filters.
+			if (s.id === sessionState.currentSessionId) return true
 			if (s.archived && !showArchived.val) return false
-			const ws = getEffectiveWorkspaceId(s)
-			if (!ws) return false
-			if ($visibleWorkspaceIds.has(ws)) return true
-			// Unavailable sessions (committed workspace was deleted /
-			// archived / access revoked) stay visible everywhere so the
-			// user can resolve them — move, archive, or delete. They'd
-			// otherwise be permanently hidden the moment their workspace
-			// disappeared.
-			if (s.workspace_id && !$userWorkspaces.find((w) => w.id === s.workspace_id)) return true
-			return false
+			// Scope to the current workspace family only.
+			const currentRoot = $currentWorkspaceRootId
+			if (currentRoot && sessionRootOf(s) !== currentRoot) return false
+			return true
 		})
 	)
+
+	// Sessions grouped by workspace family for display, each group newest-first.
+	// Family order is stable (by most-recent activity) and deliberately NOT tied
+	// to the current workspace: pinning the active family first reshuffled the
+	// whole list on every workspace switch, which is disorienting.
+	const sessionGroups = $derived.by(() => {
+		const byRoot = new Map<string, Session[]>()
+		for (const s of visibleSessions) {
+			const root = sessionRootOf(s) ?? s.workspace_id ?? s.pending_workspace_id ?? ''
+			const arr = byRoot.get(root)
+			if (arr) arr.push(s)
+			else byRoot.set(root, [s])
+		}
+		const groups = [...byRoot.entries()].map(([rootId, sessions]) => {
+			sessions.sort((a, b) => b.createdAt - a.createdAt)
+			return {
+				rootId,
+				name: $userWorkspaces.find((w) => w.id === rootId)?.name || rootId || 'Workspace',
+				sessions,
+				mostRecent: sessions[0]?.createdAt ?? 0
+			}
+		})
+		groups.sort((a, b) => b.mostRecent - a.mostRecent)
+		return groups
+	})
+
+	// Workspace tree scoped to the current family (root + its forks), so the rail
+	// only shows the workspaces in the family we're in — not every workspace.
+	const workspaceTreeItems = $derived.by(() => {
+		const all = buildWorkspaceHierarchy($userWorkspaces)
+		const currentRoot = $currentWorkspaceRootId
+		if (!currentRoot) return all
+		return all.filter((i) => workspaceRootId(i.workspace.id, $userWorkspaces) === currentRoot)
+	})
+
+	// Sessions keyed by their exact workspace, newest-first — nested under each
+	// workspace node in tree mode.
+	const sessionsByWorkspace = $derived.by(() => {
+		const map = new Map<string, Session[]>()
+		for (const s of visibleSessions) {
+			const wsId = s.workspace_id ?? s.pending_workspace_id
+			if (!wsId) continue
+			const arr = map.get(wsId)
+			if (arr) arr.push(s)
+			else map.set(wsId, [s])
+		}
+		for (const arr of map.values()) arr.sort((a, b) => b.createdAt - a.createdAt)
+		return map
+	})
+
+	// Collapsed workspaces in the tree, persisted to localStorage so the state is
+	// shared between the rail and the collapsed popover (separate picker instances)
+	// and survives reloads. A collapsed workspace hides its sessions + fork subtree.
+	const collapsedWorkspaces = useLocalStorageValue<string[]>(
+		'windmill_sessions_collapsed_workspaces',
+		[]
+	)
+	function isWorkspaceCollapsed(id: string): boolean {
+		return collapsedWorkspaces.val.includes(id)
+	}
+	function toggleWorkspaceCollapsed(id: string) {
+		collapsedWorkspaces.val = isWorkspaceCollapsed(id)
+			? collapsedWorkspaces.val.filter((x) => x !== id)
+			: [...collapsedWorkspaces.val, id]
+	}
+
+	// Ids of tree items hidden because an ancestor workspace is collapsed. Computed
+	// in pre-order: once a collapsed node is seen, everything deeper is hidden until
+	// the depth returns to its level or shallower.
+	const hiddenWorkspaceIds = $derived.by(() => {
+		const hidden = new Set<string>()
+		let collapseDepth = Infinity
+		for (const item of workspaceTreeItems) {
+			if (item.depth > collapseDepth) {
+				hidden.add(item.workspace.id)
+				continue
+			}
+			collapseDepth = isWorkspaceCollapsed(item.workspace.id) ? item.depth : Infinity
+		}
+		return hidden
+	})
+
+	// Family labels are redundant when scoped to a single family — only show them
+	// if the active-session override surfaces a second family.
+	const showGroupHeaders = $derived(sessionGroups.length > 1)
+
 	const archivedCount = $derived(
 		sessionState.sessions.filter((s) => {
 			if (!s.archived || s.transient) return false
-			const ws = getEffectiveWorkspaceId(s)
-			if (!ws) return false
-			if ($visibleWorkspaceIds.has(ws)) return true
-			if (s.workspace_id && !$userWorkspaces.find((w) => w.id === s.workspace_id)) return true
-			return false
+			const currentRoot = $currentWorkspaceRootId
+			return (
+				!currentRoot || sessionRootOf(s) === currentRoot || s.id === sessionState.currentSessionId
+			)
 		}).length
 	)
 
@@ -167,40 +280,19 @@
 		}
 	})
 
-	// Pre-fetch the fork comparison for every visible fork session so the
-	// sidebar icons reflect the right ahead/diverged state without
-	// requiring the user to click into each session. Cheap enough at
-	// typical session counts; falls back to a plain dot until the
-	// fetch lands.
-	$effect(() => {
-		if (sectionCollapsed.val) return
-		for (const session of visibleSessions) {
-			if (!session.workspace_id) continue
-			const ws = $userWorkspaces.find((w) => w.id === session.workspace_id)
-			if (!ws?.parent_workspace_id) continue
-			const rt = getRuntime(session.id)
-			if (!rt) continue
-			void rt.ensureForkComparison(ws.parent_workspace_id, session.workspace_id)
-		}
-	})
-
 	function isUnavailableFork(session: Session): boolean {
 		return !!session.workspace_id && !$userWorkspaces.find((w) => w.id === session.workspace_id)
 	}
 
 	async function activate(session: Session, restoreFocus: boolean = false) {
+		// Picking a session leaves browse mode so the chat comes back.
+		onSelectSession?.()
 		selectSession(session.id)
-		// If the session has a committed workspace different from the
-		// active one, switch globally so the editor/forks resolve correctly.
-		// Skip for unavailable forks — switching to a deleted workspace
-		// would error out and leave the user in limbo.
-		if (!isUnavailableFork(session)) {
-			syncWorkspaceTo(session.workspace_id)
-		}
-		// Refresh the fork diff count — users typically click back into a
-		// session after editing items elsewhere in the SPA, where neither
-		// the visibility-change nor the AI-loading signal would fire.
-		void getRuntime(session.id)?.refreshForkComparison()
+		// The global workspaceStore is intentionally NOT switched here: a session
+		// runs against its own workspace via the chat manager's workspace resolver,
+		// so opening one must not change the user's active (navigation) workspace.
+		// Open the dedicated sessions page; its preview panel iframes the
+		// session's view (captured page / editor target).
 		await goto(`/sessions?session_name=${encodeURIComponent(session.name)}`)
 		if (restoreFocus) {
 			// goto() resets focus to <body> — put it back on the active session button
@@ -215,7 +307,17 @@
 	}
 
 	async function createAndOpen() {
-		await activate(createSession())
+		const fresh = createSession()
+		// A new session opened from a Windmill page adopts that page as its first
+		// preview tab (resetSessionPreviewTabs handles a reused transient whose
+		// tabs still show a previous destination). Skip when already on the
+		// sessions page (nothing meaningful to capture) so the preview starts
+		// empty until the chat opens something.
+		if (!onSessionsPage) {
+			const url = page.url.pathname + page.url.search
+			resetSessionPreviewTabs(fresh.id, url)
+		}
+		await activate(fresh)
 	}
 
 	let editingId: string | undefined = $state(undefined)
@@ -238,15 +340,18 @@
 	}
 
 	let pendingDelete: Session | undefined = $state(undefined)
-	// Default to also deleting the fork: it's tied to this session and would be
-	// orphaned otherwise. The user can still untick it in the modal.
-	let deleteAlsoFork = $state(true)
+	// Default off: deleting a fork workspace is destructive and not what deleting a
+	// session implies. The user can tick it in the modal to also drop the fork.
+	let deleteAlsoFork = $state(false)
 	// Fork workspace tied to `pendingDelete`, if any, and still accessible.
 	const pendingDeleteForkId = $derived.by(() => {
 		const wsId = pendingDelete?.workspace_id
-		if (!wsId || !wsId.startsWith('wm-fork-')) return undefined
+		if (!wsId) return undefined
 		const ws = $userWorkspaces.find((w) => w.id === wsId)
-		if (!ws || !ws.parent_workspace_id) return undefined
+		// Fork = prefix OR parent (so an orphaned wm-fork- fork still qualifies); exclude persistent
+		// dev workspaces, which are not ephemeral session forks.
+		if (!ws || !workspaceIsFork(wsId, $userWorkspaces)) return undefined
+		if (ws.is_dev_workspace) return undefined
 		return wsId
 	})
 
@@ -260,15 +365,16 @@
 			? $userWorkspaces.find((w) => w.id === forkToDelete)?.parent_workspace_id
 			: undefined
 		pendingDelete = undefined
-		deleteAlsoFork = true
+		deleteAlsoFork = false
 		if (!session) return
 		const wasActive = sessionState.currentSessionId === session.id
 		removeSession(session.id)
 		if (forkToDelete) {
 			try {
 				await WorkspaceService.deleteWorkspace({ workspace: forkToDelete })
+				await deleteSessionsForWorkspace(forkToDelete)
 				sendUserToast(`Deleted forked workspace ${forkToDelete}`)
-				usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
+				await reconcileAfterWorkspaceChange()
 			} catch (e: any) {
 				sendUserToast(`Failed to delete fork ${forkToDelete}: ${e?.body ?? e}`, true)
 			}
@@ -281,7 +387,14 @@
 		if (wasActive) {
 			const next = sessionState.sessions[0]
 			if (next) await activate(next)
-			else await goto('/sessions')
+			else {
+				// No sessions left — create a fresh one and navigate to it. The page
+				// derives the visible session from the `session_name` query, so just
+				// clearing currentSessionId would strand the URL on the deleted session
+				// and render its not-found state instead of a ready-to-type composer.
+				const fresh = createSession()
+				await goto(`/sessions?session_name=${encodeURIComponent(fresh.name)}`)
+			}
 		}
 	}
 
@@ -323,10 +436,10 @@
 	     the section still shows — the per-session chat input is disabled with an
 	     explanatory message, mirroring the sidebar AI chat. -->
 {:else if isCollapsed}
-	<div class="px-2 pt-3 pb-2 border-b border-light dark:border-gray-700">
+	<div class={embedded ? '' : 'px-2 pt-3 pb-2 border-b border-light'}>
 		<Menubar>
 			{#snippet children({ createMenu })}
-				<Menu {createMenu} usePointerDownOutside>
+				<Menu {createMenu} usePointerDownOutside submenuSafe>
 					{#snippet triggr({ trigger })}
 						<div class="relative">
 							<MenuButton
@@ -338,7 +451,7 @@
 							/>
 							{#if totalUnread > 0}
 								<span
-									class="absolute top-1 right-1 pointer-events-none inline-block w-2 h-2 rounded-full bg-blue-500"
+									class="absolute top-1 right-1 pointer-events-none inline-block w-2 h-2 rounded-full bg-surface-accent-primary"
 									aria-label="{totalUnread} unread message{totalUnread === 1
 										? ''
 										: 's'} across all sessions"
@@ -346,7 +459,7 @@
 							{/if}
 						</div>
 					{/snippet}
-					{#snippet children({ item })}
+					{#snippet children({ item, builders })}
 						<div class="divide-y min-w-48" role="none">
 							<div class="py-1" role="none">
 								<MenuItem class={menuItemBase} onClick={createAndOpen} {item}>
@@ -355,47 +468,70 @@
 								</MenuItem>
 							</div>
 							<div class="py-1" role="none">
-								{#each visibleSessions as session (session.id)}
-									{@const runtime = getRuntime(session.id)}
-									{@const status = runtime ? getSessionChatStatus(runtime) : 'idle'}
-									{@const isSelected =
-										onSessionsPage && session.id === sessionState.currentSessionId}
-									{@const unread = unreadFor(session)}
-									{@const draft = hasDraft(session)}
-									<MenuItem
-										class={twMerge(menuItemBase, isSelected ? 'bg-surface-hover' : '')}
-										onClick={() => activate(session)}
-										{item}
-									>
-										<SessionStatusDot
-											{status}
-											isFork={isForkFor(session)}
-											forkStatus={forkStatusFor(session)}
-										/>
-										<span
-											class={twMerge(
-												'truncate flex-1 text-left',
-												unread > 0 ? 'font-semibold text-primary' : ''
-											)}
+								<SessionFilterMenu
+									{builders}
+									bind:showArchived={showArchived.val}
+									{archivedCount}
+								/>
+							</div>
+							<div class="py-1" role="none">
+								{#each sessionGroups as group (group.rootId)}
+									{#if showGroupHeaders}
+										<div
+											class="px-3 pt-1.5 pb-0.5 text-[0.5rem] uppercase text-tertiary truncate"
+											role="none"
+											title={group.name}
 										>
-											{session.summary ?? 'Untitled session'}
-										</span>
-										{#if draft || unread > 0}
-											<span class="ml-auto shrink-0 inline-flex items-center gap-1">
-												{#if draft}
-													<PencilLine class="w-3 h-3 text-tertiary" aria-label="Unsent draft" />
-												{/if}
-												{#if unread > 0}
-													<span
-														class="inline-flex items-center justify-center rounded-full bg-blue-500 text-white font-medium leading-none min-w-4 h-4 px-1 text-[10px]"
-														aria-label="{unread} unread message{unread === 1 ? '' : 's'}"
-													>
-														{unread > 9 ? '9+' : unread}
-													</span>
-												{/if}
+											{group.name}
+										</div>
+									{/if}
+									{#each group.sessions as session (session.id)}
+										{@const runtime = getRuntime(session.id)}
+										{@const status = runtime ? getSessionChatStatus(runtime) : 'idle'}
+										{@const isSelected =
+											sessionActive && session.id === sessionState.currentSessionId}
+										{@const unread = unreadFor(session)}
+										{@const draft = hasDraft(session)}
+										<MenuItem
+											class={twMerge(
+												menuItemBase,
+												isSelected
+													? twMerge(sidebarClasses.selectedBg, sidebarClasses.selectedText)
+													: ''
+											)}
+											onClick={() => activate(session)}
+											{item}
+										>
+											<SessionStatusDot
+												{status}
+												isFork={isForkFor(session)}
+												forkDetached={forkDetachedFor(session)}
+											/>
+											<span
+												class={twMerge(
+													'truncate flex-1 text-left',
+													unread > 0 ? 'font-semibold text-primary' : ''
+												)}
+											>
+												{session.summary ?? 'Untitled session'}
 											</span>
-										{/if}
-									</MenuItem>
+											{#if draft || unread > 0}
+												<span class="ml-auto shrink-0 inline-flex items-center gap-1">
+													{#if draft}
+														<PencilLine class="w-3 h-3 text-tertiary" aria-label="Unsent draft" />
+													{/if}
+													{#if unread > 0}
+														<span
+															class="inline-flex items-center justify-center rounded-full bg-surface-accent-primary text-white font-medium leading-none min-w-4 h-4 px-1 text-[10px]"
+															aria-label="{unread} unread message{unread === 1 ? '' : 's'}"
+														>
+															{unread > 9 ? '9+' : unread}
+														</span>
+													{/if}
+												</span>
+											{/if}
+										</MenuItem>
+									{/each}
 								{/each}
 							</div>
 						</div>
@@ -405,9 +541,13 @@
 		</Menubar>
 	</div>
 {:else}
-	<div class="px-2 pt-3 pb-2 flex flex-col gap-1 border-b border-light dark:border-gray-700">
+	<div
+		class="flex flex-col gap-1 {embedded ? '' : 'px-2 pt-3 pb-2'} {!embedded && collapsible
+			? 'border-b border-light'
+			: ''}"
+	>
 		<div class="flex flex-row items-center justify-between pl-1 pr-0.5">
-			{#if visibleSessions.length > 0}
+			{#if collapsible && visibleSessions.length > 0}
 				<button
 					type="button"
 					onclick={() => (sectionCollapsed.val = !sectionCollapsed.val)}
@@ -430,6 +570,15 @@
 				</span>
 			{/if}
 			<div class="flex flex-row items-center gap-0.5">
+				<button
+					type="button"
+					title="New session"
+					aria-label="New session"
+					onclick={createAndOpen}
+					class="inline-flex items-center justify-center w-5 h-5 rounded text-tertiary hover:bg-surface-hover hover:text-primary"
+				>
+					<Plus size={12} />
+				</button>
 				<Popover placement="bottom-end" usePointerDownOutside disableFocusTrap class="inline-flex">
 					{#snippet trigger()}
 						<button
@@ -445,74 +594,89 @@
 					{/snippet}
 					{#snippet content()}
 						<div
-							class="w-56 p-2 bg-surface-tertiary dark:border rounded-md shadow-lg flex flex-col gap-1"
+							class="w-56 p-2 bg-surface-tertiary dark:border rounded-md shadow-lg flex flex-col gap-2"
 						>
-							<Toggle
-								bind:checked={showArchived.val}
-								size="xs"
-								options={{ right: 'Show archived' }}
-							/>
-							{#if archivedCount > 0}
-								<span class="text-2xs text-tertiary pl-1">
-									{archivedCount} archived session{archivedCount === 1 ? '' : 's'}
-								</span>
-							{/if}
+							<div class="flex flex-col gap-0.5">
+								<Toggle
+									bind:checked={showArchived.val}
+									size="xs"
+									options={{ right: 'Show archived' }}
+								/>
+								{#if archivedCount > 0}
+									<span class="text-2xs text-tertiary pl-1">
+										{archivedCount} archived session{archivedCount === 1 ? '' : 's'}
+									</span>
+								{/if}
+							</div>
 						</div>
 					{/snippet}
 				</Popover>
-				<Button
-					variant="subtle"
-					size="xs2"
-					iconOnly
-					startIcon={{ icon: Plus }}
-					onclick={createAndOpen}
-					title="New session"
-				/>
 			</div>
 		</div>
-		{#if !sectionCollapsed.val}
+		{#if !collapsible || !sectionCollapsed.val}
 			<div
 				bind:this={listRoot}
 				transition:slide={{ duration: 180 }}
-				class="flex flex-col gap-0.5 max-h-[40vh] overflow-y-auto"
+				class={twMerge(
+					'flex flex-col gap-0.5 overflow-y-auto',
+					// In the rail the picker is the whole list and the rail scrolls;
+					// only cap height when it's one section among others (normal sidebar).
+					collapsible ? 'max-h-[40vh]' : ''
+				)}
 				onkeydown={handleListKeydown}
 				role="listbox"
 				tabindex="-1"
 			>
-				{#each visibleSessions as session (session.id)}
+				{#snippet vline()}
+					<span class="relative w-3.5 shrink-0 self-stretch">
+						<span class="absolute inset-y-0 left-1/2 w-px bg-surface-tertiary"></span>
+					</span>
+				{/snippet}
+				{#snippet sessionRow(session, indented, treeDepth)}
 					{@const runtime = getRuntime(session.id)}
 					{@const status = runtime ? getSessionChatStatus(runtime) : 'idle'}
-					{@const isSelected = onSessionsPage && session.id === sessionState.currentSessionId}
+					{@const isSelected = sessionActive && session.id === sessionState.currentSessionId}
 					{@const isEditing = editingId === session.id}
 					{@const unread = unreadFor(session)}
 					{@const draft = hasDraft(session)}
 					<div
 						class={twMerge(
-							'flex flex-row items-center group rounded',
-							isSelected ? 'bg-surface-hover text-primary' : 'hover:bg-surface-hover',
-							session.archived ? 'italic opacity-60' : ''
+							'flex flex-row group rounded',
+							treeDepth === undefined ? 'items-center' : 'items-stretch',
+							isSelected ? sidebarClasses.selectedBg : 'hover:bg-surface-hover',
+							session.archived ? 'opacity-60' : '',
+							// Family mode indents under the header; tree mode uses guide columns.
+							treeDepth === undefined && indented ? 'pl-5' : ''
 						)}
 					>
+						{#if treeDepth !== undefined}
+							{#each Array(treeDepth) as _}{@render vline()}{/each}
+						{/if}
 						{#if isEditing}
 							<span class="flex flex-row items-center gap-2 flex-1 px-2 py-1 min-w-0">
-								<SessionStatusDot
-									{status}
-									isFork={isForkFor(session)}
-									forkStatus={forkStatusFor(session)}
-								/>
-								<!-- svelte-ignore a11y_autofocus -->
-								<input
-									type="text"
+								{#if treeDepth === undefined}
+									<SessionStatusDot
+										{status}
+										isFork={isForkFor(session)}
+										forkDetached={forkDetachedFor(session)}
+									/>
+								{/if}
+								<TextInput
 									bind:value={renameDraft}
-									onkeydown={(e) => {
-										if (e.key === 'Enter') commitRename()
-										else if (e.key === 'Escape') cancelRename()
+									size="xs"
+									unifiedHeight={false}
+									class="flex-1 min-w-0 !bg-transparent !border-0 !border-transparent !shadow-none focus:!ring-0 px-0 text-xs font-normal text-primary"
+									inputProps={{
+										type: 'text',
+										placeholder: 'Untitled session',
+										autofocus: true,
+										spellcheck: false,
+										onkeydown: (e) => {
+											if (e.key === 'Enter') commitRename()
+											else if (e.key === 'Escape') cancelRename()
+										},
+										onblur: commitRename
 									}}
-									onblur={commitRename}
-									placeholder="Untitled session"
-									autofocus
-									spellcheck="false"
-									class="flex-1 min-w-0 bg-transparent border-0 outline-none text-xs font-normal text-primary"
 								/>
 							</span>
 						{:else}
@@ -524,14 +688,16 @@
 								onclick={() => activate(session)}
 								class={twMerge(
 									'flex flex-row items-center gap-2 text-left text-xs font-normal focus:outline-none flex-1 min-w-0 px-2 py-1',
-									unread > 0 ? 'text-primary font-semibold' : 'text-secondary'
+									isSelected ? sidebarClasses.selectedText : 'text-secondary'
 								)}
 							>
-								<SessionStatusDot
-									{status}
-									isFork={isForkFor(session)}
-									forkStatus={forkStatusFor(session)}
-								/>
+								{#if treeDepth === undefined}
+									<SessionStatusDot
+										{status}
+										isFork={isForkFor(session)}
+										forkDetached={forkDetachedFor(session)}
+									/>
+								{/if}
 								<span class="truncate flex-1">{session.summary ?? 'Untitled session'}</span>
 								{#if draft || unread > 0}
 									<span class="shrink-0 inline-flex items-center gap-1">
@@ -540,7 +706,7 @@
 										{/if}
 										{#if unread > 0}
 											<span
-												class="inline-flex items-center justify-center rounded-full bg-blue-500 text-white font-medium leading-none min-w-4 h-4 px-1 text-[10px]"
+												class="inline-flex items-center justify-center rounded-full bg-surface-accent-primary text-white font-medium leading-none min-w-4 h-4 px-1 text-[10px]"
 												aria-label="{unread} unread message{unread === 1 ? '' : 's'}"
 											>
 												{unread > 9 ? '9+' : unread}
@@ -555,23 +721,32 @@
 								<DropdownV2
 									fixedHeight={false}
 									placement="bottom-end"
+									enableFlyTransition
 									items={[
 										{
 											displayName: 'Rename',
 											icon: Pencil,
 											action: () => startRename(session)
 										},
-										session.archived
-											? {
-													displayName: 'Unarchive',
-													icon: ArchiveRestore,
-													action: () => setSessionArchived(session.id, false)
-												}
-											: {
-													displayName: 'Archive',
-													icon: Archive,
-													action: () => setSessionArchived(session.id, true)
-												},
+										...(session.archived
+											? // No Unarchive when the workspace is gone — it can't persist
+												// (putSession guard) and reconcile would re-archive it.
+												isUnavailableFork(session)
+												? []
+												: [
+														{
+															displayName: 'Unarchive',
+															icon: ArchiveRestore,
+															action: () => setSessionArchived(session.id, false)
+														}
+													]
+											: [
+													{
+														displayName: 'Archive',
+														icon: Archive,
+														action: () => setSessionArchived(session.id, true)
+													}
+												]),
 										{
 											displayName: 'Delete',
 											icon: Trash2,
@@ -592,7 +767,90 @@
 							</div>
 						{/if}
 					</div>
-				{/each}
+				{/snippet}
+				{#if workspaceTree}
+					{#each workspaceTreeItems as item, wi (item.workspace.id)}
+						{#if !hiddenWorkspaceIds.has(item.workspace.id)}
+							{@const wsSessions = sessionsByWorkspace.get(item.workspace.id) ?? []}
+							{@const collapsed = isWorkspaceCollapsed(item.workspace.id)}
+							{@const collapsible = item.hasChildren || wsSessions.length > 0}
+							<!-- Workspace = folder. Stroke-colored building/fork glyph; the guide
+							     columns render the workspace tree (fork nesting). A chevron
+							     collapses the workspace (hides its sessions + fork subtree). -->
+							<div
+								class={twMerge(
+									'flex items-stretch w-full rounded',
+									wi > 0 && item.depth === 0 ? 'mt-3' : '',
+									browsedWorkspaceId === item.workspace.id
+										? sidebarClasses.selectedBg
+										: 'hover:bg-surface-hover'
+								)}
+							>
+								{#each Array(item.depth) as _}{@render vline()}{/each}
+								<button
+									type="button"
+									onclick={() => onBrowseWorkspace?.(item.workspace.id)}
+									title={item.workspace.name}
+									class="flex items-center gap-1.5 py-1 pl-1 pr-2 min-w-0 flex-1 text-left"
+								>
+									{#if item.isForked}
+										<GitFork size={14} class="shrink-0" style="color: {item.workspace.color}" />
+									{:else}
+										<Building size={14} class="shrink-0" style="color: {item.workspace.color}" />
+									{/if}
+									<span
+										class={twMerge(
+											'text-xs truncate font-normal',
+											browsedWorkspaceId === item.workspace.id
+												? 'text-emphasis font-medium'
+												: 'text-primary'
+										)}>{item.workspace.name}</span
+									>
+								</button>
+								{#if collapsible}
+									<button
+										type="button"
+										onclick={() => toggleWorkspaceCollapsed(item.workspace.id)}
+										title={collapsed ? 'Expand' : 'Collapse'}
+										aria-label={collapsed ? 'Expand workspace' : 'Collapse workspace'}
+										class="shrink-0 flex items-center justify-center w-6 text-tertiary hover:text-primary"
+									>
+										{#if collapsed}
+											<ChevronRight size={12} />
+										{:else}
+											<ChevronDown size={12} />
+										{/if}
+									</button>
+								{/if}
+							</div>
+							{#if !collapsed}
+								{#each wsSessions as session (session.id)}
+									{@render sessionRow(session, true, item.depth + 1)}
+								{/each}
+							{/if}
+						{/if}
+					{/each}
+				{:else}
+					{#each sessionGroups as group, groupIdx (group.rootId)}
+						{#if showGroupHeaders}
+							{@const groupWs = $userWorkspaces.find((w) => w.id === group.rootId)}
+							<div
+								class={twMerge(
+									'flex items-center gap-2 px-2 pt-2 pb-1 min-w-0',
+									// Space families apart so group boundaries read clearly.
+									groupIdx > 0 ? 'mt-4' : ''
+								)}
+								title={group.name}
+							>
+								<WorkspaceIcon workspaceColor={groupWs?.color} size={12} />
+								<span class="text-xs font-medium text-secondary truncate">{group.name}</span>
+							</div>
+						{/if}
+						{#each group.sessions as session (session.id)}
+							{@render sessionRow(session, showGroupHeaders, undefined)}
+						{/each}
+					{/each}
+				{/if}
 			</div>
 		{/if}
 	</div>
@@ -605,7 +863,7 @@
 	onConfirmed={handleConfirmedDelete}
 	onCanceled={() => {
 		pendingDelete = undefined
-		deleteAlsoFork = true
+		deleteAlsoFork = false
 	}}
 >
 	<div class="flex flex-col gap-3">
diff --git a/frontend/src/lib/components/sessions/SessionStatusDot.svelte b/frontend/src/lib/components/sessions/SessionStatusDot.svelte
index b47816ab19..4c0ef4c408 100644
--- a/frontend/src/lib/components/sessions/SessionStatusDot.svelte
+++ b/frontend/src/lib/components/sessions/SessionStatusDot.svelte
@@ -3,19 +3,19 @@
 		AlertCircle,
 		AlertTriangle,
 		Building,
-		GitCompareArrows,
 		GitFork,
-		GitPullRequestArrow,
 		GitPullRequestClosed
 	} from 'lucide-svelte'
 	import type { SessionChatStatus } from './sessionRuntime.svelte'
-	import type { ForkStatus } from './sessionState.svelte'
 
+	// The fork icon is deliberately sync-state-agnostic (no ahead/behind/
+	// diverged variants — that detail lives in the fork bar). Its only special
+	// state is detached: the session's fork workspace no longer exists.
 	let {
 		status,
 		isFork,
-		forkStatus
-	}: { status: SessionChatStatus; isFork: boolean; forkStatus?: ForkStatus } = $props()
+		forkDetached = false
+	}: { status: SessionChatStatus; isFork: boolean; forkDetached?: boolean } = $props()
 
 	const statusTooltip: Record<SessionChatStatus, string> = {
 		idle: 'No chat activity',
@@ -26,13 +26,6 @@
 		error: 'Last message had an error'
 	}
 
-	const forkTooltip: Record<ForkStatus, string> = {
-		in_sync: 'Fork — in sync with parent',
-		ahead: 'Fork — ahead of parent',
-		diverged: 'Fork — diverged from parent',
-		unavailable: 'Fork — no longer available'
-	}
-
 	// Live chat signals take precedence over the persistent kind/fork
 	// indicator: streaming, needs-confirmation, and error are time-critical
 	// and warrant briefly hijacking the icon slot.
@@ -41,7 +34,11 @@
 	)
 
 	const persistentTitle = $derived(
-		isFork ? (forkStatus ? forkTooltip[forkStatus] : 'Fork session') : 'Root workspace session'
+		isFork
+			? forkDetached
+				? 'Fork — no longer available'
+				: 'Fork session'
+			: 'Root workspace session'
 	)
 
 	const title = $derived(liveOverride ? statusTooltip[status] : persistentTitle)
@@ -50,20 +47,16 @@
 <span class="inline-flex items-center justify-center w-4 h-3 shrink-0" {title}>
 	{#if status === 'streaming'}
 		<span class="inline-flex items-end gap-0.5">
-			<span class="w-1 h-1 rounded-full bg-blue-500 typing-dot"></span>
-			<span class="w-1 h-1 rounded-full bg-blue-500 typing-dot dot-2"></span>
-			<span class="w-1 h-1 rounded-full bg-blue-500 typing-dot dot-3"></span>
+			<span class="w-[3px] h-[3px] rounded-full bg-blue-500 typing-dot"></span>
+			<span class="w-[3px] h-[3px] rounded-full bg-blue-500 typing-dot dot-2"></span>
+			<span class="w-[3px] h-[3px] rounded-full bg-blue-500 typing-dot dot-3"></span>
 		</span>
 	{:else if status === 'needs-confirmation'}
 		<AlertCircle class="w-3 h-3 text-amber-500" />
 	{:else if status === 'error'}
 		<AlertTriangle class="w-3 h-3 text-red-500" />
 	{:else if isFork}
-		{#if forkStatus === 'ahead'}
-			<GitPullRequestArrow class="w-3 h-3 text-blue-500" />
-		{:else if forkStatus === 'diverged'}
-			<GitCompareArrows class="w-3 h-3 text-amber-500" />
-		{:else if forkStatus === 'unavailable'}
+		{#if forkDetached}
 			<GitPullRequestClosed class="w-3 h-3 text-red-500" />
 		{:else}
 			<GitFork class="w-3 h-3 text-tertiary" />
diff --git a/frontend/src/lib/components/sessions/SessionWorkspaceBar.svelte b/frontend/src/lib/components/sessions/SessionWorkspaceBar.svelte
index 310d43e5be..1a992b818b 100644
--- a/frontend/src/lib/components/sessions/SessionWorkspaceBar.svelte
+++ b/frontend/src/lib/components/sessions/SessionWorkspaceBar.svelte
@@ -1,51 +1,35 @@
 <script lang="ts">
-	import { userWorkspaces, workspaceStore, type UserWorkspace } from '$lib/stores'
+	import { workspaceStore } from '$lib/stores'
 	import {
 		getEffectiveWorkspaceId,
 		setSessionPendingFork,
 		setSessionPendingWorkspace,
-		syncWorkspaceTo,
 		type Session
 	} from './sessionState.svelte'
 	import WorkspaceFamilyPicker from './WorkspaceFamilyPicker.svelte'
-	import { Building, ChevronDown, GitFork } from 'lucide-svelte'
+	import WorkspaceScopeTrigger from '$lib/components/WorkspaceScopeTrigger.svelte'
 
 	let { session }: { session: Session } = $props()
 
-	function findRoot(id: string | undefined, all: UserWorkspace[]): UserWorkspace | undefined {
-		if (!id) return undefined
-		let current = all.find((w) => w.id === id)
-		while (current?.parent_workspace_id) {
-			const parent = all.find((w) => w.id === current!.parent_workspace_id)
-			if (!parent) break
-			current = parent
-		}
-		return current
-	}
-
 	// Effective workspace for display: committed → pending pick → active store.
 	const effectiveId = $derived(getEffectiveWorkspaceId(session) ?? $workspaceStore ?? undefined)
-	const root = $derived(findRoot(effectiveId, $userWorkspaces))
-	const currentWs = $derived(
-		effectiveId ? $userWorkspaces.find((w) => w.id === effectiveId) : undefined
-	)
 	const pendingFork = $derived(session.pending_fork)
 
 	function pick(id: string) {
-		// Pre-send only: writes the pending pick. workspace_id stays
-		// undefined until the user sends their first message.
+		// Pre-send only: writes the pending pick. workspace_id stays undefined until
+		// the user sends their first message. The global workspaceStore is left
+		// untouched — the chat targets this pending workspace via the manager's
+		// workspace resolver, so picking here must not switch the active workspace.
 		setSessionPendingWorkspace(session.id, id)
-		syncWorkspaceTo(id)
 	}
 
 	function stageFork(req: { parent_workspace_id: string; id: string; name: string }) {
 		setSessionPendingFork(session.id, req)
-		syncWorkspaceTo(req.parent_workspace_id)
 	}
 </script>
 
 <div class="flex flex-row items-center gap-1 py-0.5 px-1 text-2xs text-secondary">
-	<span class="shrink-0">Run in</span>
+	<span class="shrink-0">Acting on</span>
 	<WorkspaceFamilyPicker
 		selectedId={effectiveId}
 		{pendingFork}
@@ -54,22 +38,7 @@
 		createForkCaption="Created when you send your first message."
 	>
 		{#snippet trigger()}
-			<span
-				class="inline-flex flex-row items-center gap-1 px-1.5 py-0.5 rounded hover:bg-surface-hover text-2xs"
-			>
-				{#if pendingFork || (currentWs && currentWs.id !== root?.id)}
-					<GitFork class="w-3 h-3 shrink-0" />
-				{:else}
-					<Building class="w-3 h-3 shrink-0" />
-				{/if}
-				<span class="font-medium text-primary truncate max-w-[180px]">
-					{pendingFork?.name ?? currentWs?.name ?? effectiveId ?? 'Pick workspace'}
-				</span>
-				{#if pendingFork}
-					<span class="text-2xs text-tertiary italic shrink-0">(new)</span>
-				{/if}
-				<ChevronDown class="w-3 h-3 shrink-0 text-tertiary" />
-			</span>
+			<WorkspaceScopeTrigger workspaceId={effectiveId} {pendingFork} class="max-w-[16rem]" />
 		{/snippet}
 	</WorkspaceFamilyPicker>
 </div>
diff --git a/frontend/src/lib/components/sessions/SessionWrapper.svelte b/frontend/src/lib/components/sessions/SessionWrapper.svelte
index c74bf294e6..f5fa09c6d0 100644
--- a/frontend/src/lib/components/sessions/SessionWrapper.svelte
+++ b/frontend/src/lib/components/sessions/SessionWrapper.svelte
@@ -3,11 +3,12 @@
 	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import AIChat from '$lib/components/copilot/chat/AIChat.svelte'
 	import EditableInput from '$lib/components/common/EditableInput.svelte'
-	import { Button } from '$lib/components/common'
+	import { Button, NameIdTooltip } from '$lib/components/common'
 	import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
 	import { AIChatManager } from '$lib/components/copilot/chat/AIChatManager.svelte'
-	import { userWorkspaces, usersWorkspaceStore, workspaceStore } from '$lib/stores'
+	import { userWorkspaces, workspaceStore } from '$lib/stores'
+	import { workspaceIsFork } from '$lib/utils/workspaceHierarchy'
 	import { WorkspaceService } from '$lib/gen'
 	import { sendUserToast } from '$lib/toast'
 	import Toggle from '$lib/components/Toggle.svelte'
@@ -15,45 +16,46 @@
 	import {
 		Archive,
 		ArchiveRestore,
+		ArrowUpRight,
 		EllipsisVertical,
-		PanelRightClose,
-		PanelRightOpen,
+		ExternalLink,
 		Pencil,
+		Settings,
 		Trash2
 	} from 'lucide-svelte'
-	import type { WorkspaceItem } from '$lib/components/workspacePicker'
-	import Popover from '$lib/components/meltComponents/Popover.svelte'
-	import WorkspaceItemDrillPicker from '$lib/components/WorkspaceItemDrillPicker.svelte'
-	import FlowEditorView from './FlowEditorView.svelte'
-	import ScriptEditorView from './ScriptEditorView.svelte'
-	import RawAppEditorView from './RawAppEditorView.svelte'
+	import { type Item } from '$lib/utils'
+	import WorkspaceScopeTrigger from '$lib/components/WorkspaceScopeTrigger.svelte'
 	import SessionWorkspaceBar from './SessionWorkspaceBar.svelte'
-	import SessionForkBar from './SessionForkBar.svelte'
-	import SessionDraftBar from './SessionDraftBar.svelte'
+	import SessionChangesBar from './SessionChangesBar.svelte'
 	import {
 		createSession,
+		deleteSessionsForWorkspace,
 		getEffectiveWorkspaceId,
 		moveSessionToNewFork,
 		moveSessionToWorkspace,
+		peekTransientDraftPrompt,
+		queueTransientDraftPrompt,
+		reconcileAfterWorkspaceChange,
 		renameSession,
 		selectSession,
 		sessionState,
 		setSessionArchived,
-		setSessionTarget,
-		syncWorkspaceTo,
-		type SessionTarget
+		syncWorkspaceTo
 	} from './sessionState.svelte'
-	import { editorWarmIds, getOrCreateRuntime, removeSession } from './sessionRuntime.svelte'
+	import { getOrCreateRuntime, removeSession } from './sessionRuntime.svelte'
 	import { goto } from '$lib/navigation'
-	import { slide } from 'svelte/transition'
+	import { base } from '$app/paths'
+	import { splitterPointerCapture } from '$lib/utils/splitterPointerCapture'
 
-	let { sessionId }: { sessionId: string } = $props()
-
-	// LRU-warm sessions get their editor pane mounted; others render
-	// chat-only. Reading from the reactive Set keeps SessionWrapper in
-	// sync with promoteEditorWarm without an explicit prop round-trip
-	// through the page route.
-	const mountEditor = $derived(editorWarmIds.has(sessionId))
+	// headerInset: extra left padding on the chat header so it clears a floating
+	// control (the collapsed-rail launcher) sitting at the screen's top-left.
+	let {
+		sessionId,
+		headerInset = false
+	}: {
+		sessionId: string
+		headerInset?: boolean
+	} = $props()
 
 	// Parent keys by sessionId; this wrapper only mounts when the session exists.
 	// Captured at script-init so we can synchronously bind context.
@@ -67,9 +69,51 @@
 	// Reactive session reference (mutations to summary/target propagate via the $state proxy)
 	const session = $derived(sessionState.sessions.find((s) => s.id === sessionId))
 
+	// Seed the composer with the unsent prompt a reload preserved in the
+	// transient draft slot (script-init: AIChatInput reads it once at mount).
+	const restoredDraftPrompt = peekTransientDraftPrompt(sessionId)
+
+	// The workspace the session acts on, shown in the header "Acting on" strip via the shared
+	// WorkspaceScopeTrigger chip. `targetId` is also the workspace the chip's ellipsis menu targets.
+	const acting = $derived.by(() => {
+		const wsId = session ? getEffectiveWorkspaceId(session) : undefined
+		if (!wsId) return undefined
+		const name = $userWorkspaces.find((w) => w.id === wsId)?.name ?? wsId
+		return { targetId: wsId, name }
+	})
+
+	// Ellipsis menu on the "Acting on" chip. Both entries are real links (so
+	// modifier/middle clicks open a new tab); the `workspace` query param
+	// points the navigation at the acting workspace — the layout applies it on
+	// both full loads and client-side query changes. The trailing external-link
+	// glyphs make the leave-the-session navigation explicit.
+	const actingMenu = $derived<Item[]>([
+		{
+			displayName: 'Workspace settings',
+			icon: Settings,
+			href: `${base}/workspace_settings?workspace=${acting?.targetId ?? ''}`,
+			extra: externalLinkHint
+		},
+		{
+			displayName: 'Go to this workspace',
+			icon: ArrowUpRight,
+			href: `${base}/?workspace=${acting?.targetId ?? ''}`,
+			extra: externalLinkHint
+		}
+	])
+
+	// Load copilot config (models, providers) for the workspace the session acts
+	// on, not the navigation workspace — a session deliberately leaves
+	// $workspaceStore on the nav workspace, so keying off it would pick the model
+	// and provider from the wrong workspace's AI config for a fork-scoped session.
+	// Only the active session may write this: copilotInfo/copilotSessionModel are
+	// global, and warm background wrappers (each in their own workspace) would
+	// otherwise race to clobber the active chat's model config.
 	$effect(() => {
-		if ($workspaceStore) {
-			loadCopilot($workspaceStore)
+		if (sessionState.currentSessionId !== sessionId) return
+		const ws = acting?.targetId ?? $workspaceStore
+		if (ws) {
+			loadCopilot(ws)
 		}
 	})
 
@@ -81,6 +125,9 @@
 	async function resetToNewSession() {
 		const fresh = createSession()
 		selectSession(fresh.id)
+		// The page derives the visible session from the `session_name` query, not
+		// currentSessionId — navigate so the URL leaves the deleted/archived session
+		// (else it renders the not-found state or stays on the archived one).
 		await goto(`/sessions?session_name=${encodeURIComponent(fresh.name)}`)
 	}
 
@@ -89,10 +136,13 @@
 	// the fork lingers as an orphan whose only purpose was this session.
 	const sessionForkId = $derived.by(() => {
 		const wsId = session?.workspace_id
-		if (!wsId || !wsId.startsWith('wm-fork-')) return undefined
+		if (!wsId) return undefined
 		const ws = $userWorkspaces.find((w) => w.id === wsId)
-		// Don't offer the option if the fork is gone or not user-accessible.
-		if (!ws || !ws.parent_workspace_id) return undefined
+		// Don't offer the option if the fork is gone/not user-accessible or isn't a fork (prefix OR
+		// parent, so an orphaned wm-fork- fork still qualifies).
+		if (!ws || !workspaceIsFork(wsId, $userWorkspaces)) return undefined
+		// A persistent dev workspace is not an ephemeral session fork — never offer to delete it.
+		if (ws.is_dev_workspace) return undefined
 		return wsId
 	})
 
@@ -101,16 +151,6 @@
 	let archiveConfirmOpen = $state(false)
 	let archiveAlsoFork = $state(false)
 
-	async function refreshWorkspaceList() {
-		// Match the SidebarContent.deleteFork pattern: replace the in-memory
-		// list rather than nulling it. See B1 fix.
-		try {
-			usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
-		} catch (e) {
-			console.error('Failed to refresh workspaces', e)
-		}
-	}
-
 	async function handleConfirmedDelete() {
 		deleteConfirmOpen = false
 		if (!session) return
@@ -125,8 +165,9 @@
 		if (forkToDelete) {
 			try {
 				await WorkspaceService.deleteWorkspace({ workspace: forkToDelete })
+				await deleteSessionsForWorkspace(forkToDelete)
 				sendUserToast(`Deleted forked workspace ${forkToDelete}`)
-				await refreshWorkspaceList()
+				await reconcileAfterWorkspaceChange()
 			} catch (e: any) {
 				sendUserToast(`Failed to delete fork ${forkToDelete}: ${e?.body ?? e}`, true)
 			}
@@ -150,7 +191,7 @@
 			try {
 				await WorkspaceService.archiveWorkspace({ workspace: forkToArchive })
 				sendUserToast(`Archived forked workspace ${forkToArchive}`)
-				await refreshWorkspaceList()
+				await reconcileAfterWorkspaceChange()
 			} catch (e: any) {
 				sendUserToast(`Failed to archive fork ${forkToArchive}: ${e?.body ?? e}`, true)
 			}
@@ -184,43 +225,6 @@
 		runtime?.manager.displayMessages.some((m) => m.role === 'user') ?? false
 	)
 
-	// Effective workspace for routing editor views — committed if set,
-	// otherwise the pending pick, otherwise the current active workspace.
-	const effectiveWorkspaceId = $derived(
-		session ? (getEffectiveWorkspaceId(session) ?? $workspaceStore ?? '') : ''
-	)
-
-	// Core mutation: assign a target via the canonical setter, then re-open
-	// the editor pane. Shared by every code path that swaps the session's
-	// editor target (drill picker, fork-bar dropdown, …).
-	function applyEditorTarget(target: SessionTarget, summary?: string) {
-		if (!session) return
-		setSessionTarget(session.id, target, summary)
-		// Picking a target also re-opens the editor pane (the user just chose
-		// what to view).
-		editorVisible = true
-	}
-
-	function pickEditorTarget(item: WorkspaceItem) {
-		// Legacy drag-and-drop apps aren't hosted in the session preview pane —
-		// open them in the standalone app editor instead. Only code-based raw
-		// apps (item.raw_app) are previewable here.
-		if (item.kind === 'app' && !item.raw_app) {
-			goto(`/apps/edit/${item.path}?workspace=${effectiveWorkspaceId}`)
-			return
-		}
-		// WorkspaceItem.kind is 'flow'|'script'|'app'; any 'app' reaching here is
-		// a raw app. The diff-API uses 'raw_app' as its kind so we align
-		// SessionTarget on the same canonical string.
-		const kind: SessionTarget['kind'] = item.kind === 'app' ? 'raw_app' : item.kind
-		applyEditorTarget({ kind, path: item.path }, item.summary)
-	}
-
-	// Editor pane visibility. Toggling this just hides/shows the pane via CSS
-	// — the editor stays mounted, so re-opening doesn't pay a remount cost
-	// and xy-flow / Monaco keep their viewport state.
-	let editorVisible = $state(true)
-
 	// Focus the chat input whenever this session is the active one.
 	// The textarea is disabled until copilotInfo loads (otherwise focus is
 	// a silent no-op), so we wait for that too. Triggers on initial mount,
@@ -237,7 +241,7 @@
 
 	// True when the session committed to a workspace that's no longer in
 	// the user's list (deleted / archived / access revoked). The chat is
-	// disabled and SessionForkBar shows a move/discard banner.
+	// disabled and SessionChangesBar shows a move/discard banner.
 	const isUnavailable = $derived(
 		!!session?.workspace_id && !$userWorkspaces.find((w) => w.id === session!.workspace_id)
 	)
@@ -262,32 +266,52 @@
 	}
 </script>
 
+{#snippet externalLinkHint()}
+	<ExternalLink size={12} class="shrink-0 text-tertiary" />
+{/snippet}
+
 {#if !session || !runtime}
 	<div class="p-8 text-secondary text-sm">Session not found</div>
 {:else}
-	{@const hasTarget =
-		session.target?.kind === 'flow' ||
-		session.target?.kind === 'script' ||
-		session.target?.kind === 'raw_app'}
-	{@const hasEditor = mountEditor && hasTarget && editorVisible}
-
 	{#snippet inputPreface()}
 		{#if !hasFirstUserMessage}
 			<SessionWorkspaceBar {session} />
 		{/if}
-		<!-- gap-1 (4px) spaces the fork bar and draft bar when both are visible.
-		     Each bar renders a single in-flow root (or nothing); the draft drawer
-		     is position:fixed, so it doesn't count as a flex item — no stray gap
-		     when only one bar shows. -->
+		<!-- gap-1 (4px) spaces the archived banner and the changes bar when both
+		     are visible. Each renders a single in-flow root (or nothing); the diff
+		     drawer is position:fixed, so it doesn't count as a flex item — no stray
+		     gap when only one shows. -->
 		<div class="flex flex-col gap-1">
-			<SessionForkBar
+			{#if session.archived && !isUnavailable}
+				<!-- Unarchive is only meaningful when the workspace is still live:
+				     putSession refuses to resurrect a session whose workspace is gone,
+				     and reconcile would re-archive a workspace-archived one anyway. When
+				     the workspace is unavailable the SessionChangesBar below shows the
+				     move/discard banner instead (its actions are the real recovery path). -->
+				<div
+					class="flex flex-row items-center justify-between gap-2 py-2 px-3 text-xs border rounded-md bg-surface-tertiary"
+				>
+					<div class="flex flex-row items-center gap-2 min-w-0">
+						<Archive class="w-4 h-4 shrink-0 text-tertiary" />
+						<span class="text-primary font-medium">This session is archived</span>
+					</div>
+					<Button
+						variant="default"
+						unifiedSize="sm"
+						startIcon={{ icon: ArchiveRestore }}
+						onclick={() => setSessionArchived(session.id, false)}
+					>
+						Unarchive
+					</Button>
+				</div>
+			{/if}
+			<SessionChangesBar
 				{session}
 				onMove={(workspaceId) => moveAndActivate(workspaceId)}
 				onCreateForkAndMove={(fork) => createForkAndMove(fork)}
 				onArchive={() => archiveAndReset()}
 				onDelete={() => (deleteConfirmOpen = true)}
 			/>
-			<SessionDraftBar {session} />
 		</div>
 	{/snippet}
 
@@ -295,159 +319,116 @@
 	     sessions have their own empty-state affordances above. -->
 	{#snippet sessionEmptyHint()}{/snippet}
 
-	<!-- Undefined pane sizes (not an explicit `size`): Splitpanes auto-distributes —
-	     a lone chat pane fills 100%, and when the editor pane mounts the two split
-	     50/50. A reactive `size={hasEditor ? 50 : 100}` here instead races the
-	     sibling pane appearing on reload → "Could not resize panes due to constraints"
-	     and a wrong split. -->
-	<Splitpanes horizontal={false} class="flex-1 min-h-0 splitter-hidden">
-		<Pane minSize={25} class="flex flex-col min-h-0 pb-2">
-			<header class="flex flex-row items-center gap-1 pl-4 pr-4 py-2 shrink-0">
-				<EditableInput
-					bind:this={summaryInput}
-					value={session.summary ?? ''}
-					placeholder="Untitled session"
-					onSave={(v) => renameSession(session.id, v)}
-					class="text-sm font-semibold"
-					inputClass="!text-sm !font-semibold"
-				/>
-				<DropdownV2
-					fixedHeight={false}
-					placement="bottom-start"
-					items={[
-						{
-							displayName: 'Rename',
-							icon: Pencil,
-							action: () => summaryInput?.edit()
-						},
-						session.archived
-							? {
-									displayName: 'Unarchive',
-									icon: ArchiveRestore,
-									action: () => setSessionArchived(session.id, false)
-								}
-							: {
-									displayName: 'Archive',
-									icon: Archive,
-									action: () => archiveAndReset()
-								},
-						{
-							displayName: 'Delete',
-							icon: Trash2,
-							type: 'delete',
-							action: () => (deleteConfirmOpen = true)
-						}
-					]}
+	<!-- The wrapper contributes only the chat column; edited items are shown in the
+	     page's preview tabs (PreviewTabHost) beside it, not a second pane here. The
+	     single Pane fills 100% (no explicit `size`, so Splitpanes auto-distributes). -->
+	<div class="flex-1 min-h-0 flex flex-col" use:splitterPointerCapture>
+		<Splitpanes horizontal={false} class="flex-1 min-h-0 splitter-hidden">
+			<Pane minSize={25} class="flex flex-col min-h-0 pb-2">
+				<header
+					class="flex flex-row items-center gap-1 {headerInset
+						? 'pl-11'
+						: 'pl-4'} pr-4 py-2 shrink-0"
 				>
-					{#snippet buttonReplacement()}
-						<span
-							class="inline-flex items-center justify-center w-5 h-5 rounded text-tertiary hover:bg-surface-hover hover:text-primary"
-							title="More"
-						>
-							<EllipsisVertical size={14} />
-						</span>
-					{/snippet}
-				</DropdownV2>
-				{#if !session.target && hasFirstUserMessage}
-					<!-- Drill-picker for sessions that have started but haven't
-				     picked an editor target yet. Hidden on fresh sessions
-				     (no messages yet) — the workspace bar is the only
-				     header affordance during the empty state. -->
-					<div class="ml-auto">
-						<Popover
-							placement="bottom-end"
-							usePointerDownOutside
-							disableFocusTrap
-							class="inline-flex"
-						>
-							{#snippet trigger()}
-								<Button variant="default" unifiedSize="xs" startIcon={{ icon: PanelRightOpen }}>
-									Open editor
-								</Button>
-							{/snippet}
-							{#snippet content()}
-								<WorkspaceItemDrillPicker
-									onPick={(item: WorkspaceItem) => pickEditorTarget(item)}
+					<EditableInput
+						bind:this={summaryInput}
+						value={session.summary ?? ''}
+						placeholder="Untitled session"
+						onSave={(v) => renameSession(session.id, v)}
+						class="text-sm font-semibold"
+						inputClass="!text-sm !font-semibold"
+					/>
+					<DropdownV2
+						fixedHeight={false}
+						placement="bottom-start"
+						enableFlyTransition
+						items={[
+							{
+								displayName: 'Rename',
+								icon: Pencil,
+								action: () => summaryInput?.edit()
+							},
+							...(session.archived
+								? // No Unarchive when the workspace is gone — it can't persist
+									// (putSession guard) and reconcile would re-archive it.
+									isUnavailable
+									? []
+									: [
+											{
+												displayName: 'Unarchive',
+												icon: ArchiveRestore,
+												action: () => setSessionArchived(session.id, false)
+											}
+										]
+								: [
+										{
+											displayName: 'Archive',
+											icon: Archive,
+											action: () => archiveAndReset()
+										}
+									]),
+							{
+								displayName: 'Delete',
+								icon: Trash2,
+								type: 'delete',
+								action: () => (deleteConfirmOpen = true)
+							}
+						]}
+					>
+						{#snippet buttonReplacement()}
+							<span
+								class="inline-flex items-center justify-center w-5 h-5 rounded text-tertiary hover:bg-surface-hover hover:text-primary"
+								title="More"
+							>
+								<EllipsisVertical size={14} />
+							</span>
+						{/snippet}
+					</DropdownV2>
+					{#if acting && hasFirstUserMessage}
+						<!-- "Acting on" context: workspace root (avatar + name) and, when the
+					     session runs in a fork, the fork name (accent pill) — with a button
+					     to jump into that workspace. Compact; sits right after the title.
+					     Hidden until the session has started — a new (un-sent) session shows
+					     the "Run in" picker (SessionWorkspaceBar) instead. -->
+						<div class="flex items-center gap-1 min-w-0 text-2xs text-tertiary">
+							<span class="shrink-0">Acting on</span>
+							<!-- Hover reveals the workspace name + id + copy button (shared
+							     NameIdTooltip, same as the sidebar family picker), so the chip
+							     carries the copy affordance without an inline button. -->
+							<NameIdTooltip name={acting.name} id={acting.targetId}>
+								<WorkspaceScopeTrigger
+									workspaceId={acting.targetId}
+									showChevron={false}
+									interactive={false}
+									disableTitle
+									class="max-w-[16rem]"
+									menuItems={actingMenu}
 								/>
-							{/snippet}
-						</Popover>
-					</div>
-				{:else if hasTarget && mountEditor && !editorVisible}
-					<div class="ml-auto">
-						<Button
-							variant="subtle"
-							unifiedSize="xs"
-							startIcon={{ icon: PanelRightOpen }}
-							onclick={() => (editorVisible = true)}
-						>
-							Show editor
-						</Button>
-					</div>
-				{:else if hasEditor}
-					<div class="ml-auto flex flex-row items-center gap-1">
-						<button
-							type="button"
-							onclick={() => (editorVisible = false)}
-							title="Close editor"
-							aria-label="Close editor"
-							class="inline-flex items-center justify-center w-6 h-6 rounded text-tertiary hover:text-primary hover:bg-surface-hover"
-						>
-							<PanelRightClose size={14} />
-						</button>
-					</div>
-				{/if}
-			</header>
-			<div class="flex-1 min-h-0 w-full flex flex-col {hasFirstUserMessage ? '' : 'pt-8'}">
-				<AIChat
-					bind:this={aiChat}
-					hideHeader
-					hideModeSelector
-					wideLayout
-					forceDisabled={isUnavailable}
-					forceDisabledMessage={isUnavailable
-						? 'This session is linked to a workspace that no longer exists. Move it or discard it from the banner above to keep working.'
-						: ''}
-					emptyHint={sessionEmptyHint}
-					{inputPreface}
-				/>
-			</div>
-		</Pane>
-		{#if hasEditor && session.target}
-			<Pane minSize={30} class="flex flex-col min-h-0 p-2 pl-0">
-				<div
-					transition:slide={{ axis: 'x', duration: 200 }}
-					class="flex flex-col flex-1 min-h-0 rounded-md border border-light overflow-hidden relative"
-				>
-					{#if session.target.kind === 'flow'}
-						<FlowEditorView
-							{runtime}
-							path={session.target.path}
-							workspaceId={effectiveWorkspaceId}
-							onNavigate={pickEditorTarget}
-							isActiveSession={sessionState.currentSessionId === sessionId}
-						/>
-					{:else if session.target.kind === 'script'}
-						<ScriptEditorView
-							{runtime}
-							path={session.target.path}
-							workspaceId={effectiveWorkspaceId}
-							onNavigate={pickEditorTarget}
-							initialTestPanelCollapsed
-							isActiveSession={sessionState.currentSessionId === sessionId}
-						/>
-					{:else if session.target.kind === 'raw_app'}
-						<RawAppEditorView
-							{runtime}
-							path={session.target.path}
-							workspaceId={effectiveWorkspaceId}
-							onNavigate={pickEditorTarget}
-							isActiveSession={sessionState.currentSessionId === sessionId}
-						/>
+							</NameIdTooltip>
+						</div>
 					{/if}
+				</header>
+				<div class="flex-1 min-h-0 w-full flex flex-col {hasFirstUserMessage ? '' : 'pt-8'}">
+					<AIChat
+						bind:this={aiChat}
+						hideHeader
+						hideModeSelector
+						wideLayout
+						initialInstructions={restoredDraftPrompt}
+						onDraftChange={(text) => queueTransientDraftPrompt(sessionId, text)}
+						forceDisabled={isUnavailable || !!session.archived}
+						forceDisabledMessage={isUnavailable
+							? 'This session is linked to a workspace that no longer exists. Move it or discard it from the banner above to keep working.'
+							: session.archived
+								? 'This session is archived. Unarchive it from the banner above to keep working.'
+								: ''}
+						emptyHint={sessionEmptyHint}
+						{inputPreface}
+					/>
 				</div>
 			</Pane>
-		{/if}
-	</Splitpanes>
+		</Splitpanes>
+	</div>
 
 	<ConfirmationModal
 		open={deleteConfirmOpen}
@@ -515,9 +496,13 @@
 {/if}
 
 <style>
-	:global(.splitter-hidden .splitpanes__splitter) {
+	/* Invisible-but-draggable splitter: a real (layout-occupying) gutter, wide
+	   enough to grab. No overlap tricks — the zone can't cover the left pane's
+	   scrollbar or the right pane's edge. */
+	:global(.splitpanes--vertical.splitter-hidden) > :global(.splitpanes__splitter) {
 		background-color: transparent !important;
 		border: none !important;
 		opacity: 0 !important;
+		width: 10px !important;
 	}
 </style>
diff --git a/frontend/src/lib/components/sessions/WorkspaceDiffDrawer.svelte b/frontend/src/lib/components/sessions/WorkspaceDiffDrawer.svelte
index 472ea1515b..360c08a9f3 100644
--- a/frontend/src/lib/components/sessions/WorkspaceDiffDrawer.svelte
+++ b/frontend/src/lib/components/sessions/WorkspaceDiffDrawer.svelte
@@ -1,301 +1,384 @@
-<script lang="ts" module>
-	export type DiffStatus = 'added' | 'removed' | 'modified' | 'conflict'
-	// One changed item. `status` drives the dot/badge; `ahead`/`behind` are
-	// optional (fork-only) and only render when present.
-	export type DiffRow = {
-		kind: string
-		path: string
-		status: DiffStatus
-		ahead?: number
-		behind?: number
-		/** Human-facing path; defaults to `path`. Lets a draft parked at a
-		 * synthetic storage path (`…/draft_<uuid>`) show its friendly typed path
-		 * while keys, value-loading and edit links stay keyed on `path`. */
-		displayPath?: string
-		/** Summary supplied by the data source. Preferred over the one derived
-		 * from the loaded diff value, and shown before that value loads. */
-		summary?: string
-	}
-</script>
-
 <script lang="ts">
-	import { parentFolderKey } from './forkDiffNav'
+	import { buildDiffTree, folderKeyFor, type AppRootMeta, type TreeNode } from './diffTree'
 	import { Button, Drawer, DrawerContent } from '$lib/components/common'
 	import Badge from '$lib/components/common/badge/Badge.svelte'
 	import {
 		AlertTriangle,
+		Check,
+		CheckCircle2,
 		ChevronDown,
 		ChevronRight,
+		ExternalLink,
 		Folder,
-		GitMerge,
 		Loader2,
-		Minus,
-		Pencil,
-		Plus,
+		Save,
 		User
 	} from 'lucide-svelte'
-	import { goto } from '$lib/navigation'
 	import RowIcon from '$lib/components/common/table/RowIcon.svelte'
 	import WorkspaceItemRow from '$lib/components/WorkspaceItemRow.svelte'
 	import WorkspaceItemDiffViewer from '$lib/components/WorkspaceItemDiffViewer.svelte'
+	import {
+		rawAppDiffToItems,
+		type RawAppish,
+		type RawAppFileItem,
+		type RawAppRunnableItem,
+		type RawAppSyntheticItem
+	} from '$lib/components/raw_apps/rawAppDiffUtils'
 	import SearchItems from '$lib/components/SearchItems.svelte'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import { DiffIcon, SquareSplitHorizontal } from 'lucide-svelte'
-	import { untrack, type Snippet } from 'svelte'
+	import { tick, untrack } from 'svelte'
+	import { fade, fly, slide } from 'svelte/transition'
+	import { cubicOut } from 'svelte/easing'
+	import type { Snippet } from 'svelte'
+	import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
+	import { createAsyncConfirmationModal } from '$lib/components/common/confirmationModal/asyncConfirmationModal.svelte'
 	import ExternalEditLink from '../ExternalEditLink.svelte'
+	import Popover from '$lib/components/meltComponents/Popover.svelte'
+	import { actionFor, badgeOf, type DeployItem } from './sessionDeployModel'
+	import { maskKey } from './modifiedItemsMask'
+	import type { SessionDeployModel, DiffValues } from './sessionDeployModel.svelte'
+	import { SIDE_BY_SIDE_MIN_WIDTH } from '$lib/components/diffEditorTypes'
 
-	// Read-only, multi-item before/after diff viewer with a file tree. The data
-	// source (fork comparison vs deployed-vs-draft) is supplied by the parent
-	// wrapper via `diffs` + `loadValues`; everything here is generic rendering.
+	// The session "Edits" surface. Reads a unified item model (the session's
+	// drafts, scoped to what this session edited) and renders a folder tree
+	// (left) plus a scroll-through diff column with per-block sticky headers
+	// (right). Deploy is granular per-item; batch/PR flows and fork→parent
+	// promotion are handed to the compare page via the footer link.
 	let {
-		diffs,
-		loadValues,
-		loading = false,
-		error = undefined,
-		notice = undefined,
-		emptyMessage = 'No changes.',
+		model,
 		title,
-		reviewHref,
-		reviewLabel = 'Review',
 		editUrlFor = undefined,
-		titleExtra
+		titleExtra,
+		compareSessionHref,
+		workspaceLabel,
+		successHoldMs = 1200
 	}: {
-		diffs: DiffRow[]
-		loadValues: (d: DiffRow) => Promise<{ before: unknown; after: unknown }>
-		loading?: boolean
-		error?: string | undefined
-		/** Replaces the diff list with an informational message (e.g. fork
-		 * created before change tracking). */
-		notice?: string | undefined
-		emptyMessage?: string
+		model: SessionDeployModel
 		title: string
-		reviewHref: string
-		reviewLabel?: string
-		editUrlFor?: (d: DiffRow) => string | undefined
+		/** Editor URL for a row (opens in the workspace the item lives in). */
+		editUrlFor?: (item: DeployItem) => string | undefined
 		titleExtra?: Snippet
+		/** Display name of the workspace deploys land in — the deployed tick's
+		 *  hover reads "Deployed in <label>". */
+		workspaceLabel?: string
+		/** How long the post-deploy check beat holds before the row flips. */
+		successHoldMs?: number
+		/** Compare page for this session's edits (footer) — preselected via
+		 *  `from_session`. Where "deploy all / request review" happens. */
+		compareSessionHref?: string
 	} = $props()
 
 	let drawer: Drawer | undefined = $state(undefined)
 	let searchQuery = $state('')
+	// The user's explicit view choice. The *effective* view can still be inline
+	// when the column is too narrow — see `narrow`/`inlineDiff` below.
 	let diffStyle = $state<'sbs' | 'inline'>('sbs')
-	const inlineDiff = $derived(diffStyle === 'inline')
+
+	// Width of the diff column (the scrolling <main>). The editor sits inside it
+	// behind ~18px of chrome (main padding + card border), so subtract that to
+	// compare against the editor's own SIDE_BY_SIDE_MIN_WIDTH gate. Forcing inline
+	// here (rather than leaving it to each DiffEditor) keeps the toggle honest:
+	// the button shown always matches what renders.
+	const DIFF_COLUMN_CHROME = 18
+	let mainWidth = $state(0)
+	const narrow = $derived(mainWidth > 0 && mainWidth - DIFF_COLUMN_CHROME < SIDE_BY_SIDE_MIN_WIDTH)
+	const inlineDiff = $derived(diffStyle === 'inline' || narrow)
+	const effectiveStyle = $derived<'sbs' | 'inline'>(inlineDiff ? 'inline' : 'sbs')
+
+	// The sidebar's inner right padding must ADAPT to the reserved scrollbar
+	// gutter (platform-dependent: 0 for overlay scrollbars, ~15px classic) so
+	// gutter + padding always totals the same 6px inset the left side uses.
+	// Pure CSS can't express "6px minus the gutter", hence the measurement.
+	function padRightForGutter(node: HTMLElement) {
+		const apply = () => {
+			const gutter = node.offsetWidth - node.clientWidth
+			node.style.paddingRight = `${Math.max(0, 6 - gutter)}px`
+		}
+		apply()
+		const ro = new ResizeObserver(apply)
+		ro.observe(node)
+		return { destroy: () => ro.disconnect() }
+	}
+
+	// Discard is destructive (a draft-only item disappears entirely) — confirm.
+	const discardConfirm = createAsyncConfirmationModal()
+	async function confirmDiscard(item: DeployItem) {
+		const confirmed = await discardConfirm.ask({
+			title: 'Discard draft?',
+			confirmationText: 'Discard draft',
+			children: item.draftOnly
+				? `${item.displayPath} was never deployed — discarding its draft deletes it entirely.`
+				: `The draft changes on ${item.displayPath} will be permanently discarded; the deployed version is kept.`
+		})
+		if (confirmed) void model.discardRow(item)
+	}
+
+	// Post-deploy staging (same pattern as SaveButton): on success, the row keeps
+	// rendering its pre-deploy snapshot while a green check flies in over the
+	// Deploy button; after the hold it releases, letting the collapse + badge
+	// transitions play on the real (deployed) state.
+	let staged = $state<Record<string, DeployItem>>({})
+	let stagedTimers: ReturnType<typeof setTimeout>[] = []
+	$effect(() => {
+		return () => stagedTimers.forEach(clearTimeout)
+	})
+	async function deployStaged(item: DeployItem) {
+		if (!(await model.deployRow(item))) return
+		// The deploy can re-key the row before this renders: a draft-only (or
+		// renamed) item deploys to its displayPath and the mask entry moves with
+		// it. Stage the snapshot under both keys so the re-keyed card still
+		// renders the held check beat instead of skipping straight to done.
+		const keys = [item.key, maskKey(item.draftKind, item.displayPath)]
+		const next = { ...staged }
+		for (const k of keys) next[k] = item
+		staged = next
+		stagedTimers.push(
+			setTimeout(() => {
+				const after = { ...staged }
+				for (const k of keys) delete after[k]
+				staged = after
+			}, successHoldMs)
+		)
+	}
 
 	export function open() {
-		// Reset per-item caches so an edit-then-reopen doesn't show stale
-		// expanded content. The wrapper re-fetches `diffs`, which re-triggers
-		// the eager-load effect below.
 		loadedDiffs = {}
-		summaries = {}
+		mountedRows = {}
+		folderOpen = {}
+		staged = {}
+		model.load()
 		drawer?.openDrawer()
 		setTimeout(() => searchInputEl?.focus(), 50)
 	}
 
-	function itemKey(d: DiffRow): string {
-		return `${d.kind}/${d.path}`
+	// ── Badge presentation ─────────────────────────────────────────────────────
+	// One footprint for both status pills (draft / deployed) so they line up at a
+	// compact, uniform size.
+	const STATUS_BADGE_CLASS = 'px-1.5 py-0.5 gap-0.5 text-2xs'
+
+	// ── Rendered list: all session items, then text-searched (no filter tabs) ──
+	const segmentItems = $derived(model.items)
+
+	// A tree row is either a real deploy item or — once its raw app's values
+	// have loaded — a synthetic per-file/per-runnable item: the app's leaf row
+	// is replaced by its files, and the folder at the app's path becomes the app
+	// root (tagged via appRootMeta). Synthetics carry `appPath`.
+	type DisplayEntry = DeployItem | RawAppSyntheticItem
+	function isSynthetic(e: DisplayEntry): e is RawAppSyntheticItem {
+		return 'appPath' in e
+	}
+	// Synthetic keys are prefixed so they can't collide with a real item that
+	// happens to live at `<appPath>/runnables/foo`.
+	function displayKey(e: DisplayEntry): string {
+		return isSynthetic(e) ? `rawapp:${e.kind}/${e.path}` : e.key
+	}
+	function displayPathOf(e: DisplayEntry): string {
+		return e.displayPath ?? e.path
 	}
 
-	// Friendly path for display only; `path` stays the storage key everywhere
-	// keys/loads happen, so a never-deployed draft still loads from `…/draft_<uuid>`.
-	function displayPathOf(d: DiffRow): string {
-		return d.displayPath ?? d.path
-	}
+	// Raw-app storage path → its deploy item (owning-app lookup for synthetics).
+	const appByPath = $derived(
+		new Map(segmentItems.filter((d) => d.deployKind === 'raw_app').map((d) => [d.path, d]))
+	)
 
-	const KIND_LABELS: Record<string, string> = {
-		script: 'Script',
-		flow: 'Flow',
-		app: 'App',
-		raw_app: 'Raw app',
-		resource: 'Resource',
-		variable: 'Variable',
-		resource_type: 'Resource type',
-		folder: 'Folder',
-		schedule: 'Schedule',
-		http_trigger: 'HTTP route',
-		websocket_trigger: 'Websocket trigger',
-		kafka_trigger: 'Kafka trigger',
-		nats_trigger: 'NATS trigger',
-		postgres_trigger: 'Postgres trigger',
-		mqtt_trigger: 'MQTT trigger',
-		sqs_trigger: 'SQS trigger',
-		gcp_trigger: 'GCP trigger',
-		azure_trigger: 'Azure trigger',
-		email_trigger: 'Email trigger'
-	}
-
-	type LoadedDiff = {
-		state: 'loading' | 'ready' | 'error'
-		error?: string
-		before?: unknown
-		after?: unknown
-	}
-	let loadedDiffs: Record<string, LoadedDiff> = $state({})
-	let summaries: Record<string, string | undefined> = $state({})
-
-	async function loadDiffFor(d: DiffRow) {
-		const key = itemKey(d)
-		if (loadedDiffs[key]) return
-		loadedDiffs[key] = { state: 'loading' }
-		try {
-			const { before, after } = await loadValues(d)
-			loadedDiffs[key] = { state: 'ready', before, after }
-			const summary =
-				(after && typeof after === 'object' && (after as any).summary) ||
-				(before && typeof before === 'object' && (before as any).summary) ||
-				undefined
-			if (typeof summary === 'string' && summary.trim().length > 0) {
-				summaries[key] = summary
+	const displayEntries = $derived.by(() => {
+		const out: DisplayEntry[] = []
+		for (const d of segmentItems) {
+			if (d.deployKind === 'raw_app') {
+				const loaded = loadedDiffs[d.key]
+				if (loaded?.state === 'ready') {
+					// A deployed (done) app has no changed files to diff — unwrap it
+					// into its full current contents instead (one-sided → every file
+					// listed; rows are plain so the 'added' status never shows).
+					const subs = d.done
+						? rawAppDiffToItems(
+								d.path,
+								undefined,
+								loaded.after as RawAppish | undefined,
+								d.displayPath
+							)
+						: rawAppItems(d, loaded)
+					if (subs.length > 0) {
+						out.push(...subs)
+						continue
+					}
+				}
 			}
-		} catch (e) {
-			console.error('WorkspaceDiffDrawer: loadValues failed', d, e)
-			loadedDiffs[key] = { state: 'error', error: String(e) }
+			out.push(d)
 		}
-	}
+		return out
+	})
 
-	// Eagerly load each row (diffs render expanded). Tracks `diffs` only; the
-	// cache reads/writes are untracked so this doesn't loop on itself.
+	function searchableText(e: DisplayEntry): string {
+		if (isSynthetic(e)) return [displayPathOf(e), e.kind].join(' ')
+		return [e.displayPath, e.deployKind, e.summary ?? ''].join(' ')
+	}
+	let searchedEntries: (DisplayEntry & { marked?: string })[] | undefined = $state(undefined)
+	const searchActive = $derived(searchQuery.trim().length > 0)
+	const filteredEntries = $derived.by(() => {
+		if (!searchActive) return displayEntries
+		return (searchedEntries ?? []) as DisplayEntry[]
+	})
+
+	// File names inside unexpanded apps don't exist client-side until the app's
+	// values load — a live search loads every raw app so matches are complete.
 	$effect(() => {
-		const ds = diffs
+		if (!searchActive) return
+		const items = segmentItems
 		untrack(() => {
-			for (const d of ds) void loadDiffFor(d)
+			for (const d of items) if (d.deployKind === 'raw_app') void loadDiffFor(d)
 		})
 	})
 
-	function onDetailsToggle(d: DiffRow, e: Event) {
-		const target = e.currentTarget as HTMLDetailsElement | null
-		if (target?.open) void loadDiffFor(d)
-	}
-
-	function statusBadgeColor(s: DiffStatus): 'green' | 'red' | 'orange' | 'blue' {
-		if (s === 'added') return 'green'
-		if (s === 'removed') return 'red'
-		if (s === 'conflict') return 'orange'
-		return 'blue'
-	}
-
-	const statusIcons = { added: Plus, removed: Minus, modified: Pencil, conflict: AlertTriangle }
-
-	// ── File tree ───────────────────────────────────────────────────────────
-	type FolderNode = {
-		type: 'folder'
-		name: string
-		fullPath: string
-		isScope: boolean
-		children: TreeNode[]
-	}
-	type FileNode = { type: 'file'; name: string; diff: DiffRow }
-	type TreeNode = FolderNode | FileNode
-
-	function buildTree(rows: DiffRow[]): FolderNode {
-		const root: FolderNode = {
-			type: 'folder',
-			name: '',
-			fullPath: '',
-			isScope: false,
-			children: []
-		}
-		const folderCache = new Map<string, FolderNode>()
-		for (const d of rows) {
-			const parts = displayPathOf(d).split('/')
-			if (parts.length < 2) {
-				root.children.push({ type: 'file', name: displayPathOf(d), diff: d })
-				continue
-			}
-			const scopeKey = parts.slice(0, 2).join('/')
-			let scope = folderCache.get(scopeKey)
-			if (!scope) {
-				scope = { type: 'folder', name: scopeKey, fullPath: scopeKey, isScope: true, children: [] }
-				folderCache.set(scopeKey, scope)
-				root.children.push(scope)
-			}
-			if (parts.length === 2) {
-				scope.children.push({ type: 'file', name: parts[1], diff: d })
-				continue
-			}
-			const rest = parts.slice(2)
-			let parent = scope
-			let fkey = scopeKey
-			for (let i = 0; i < rest.length - 1; i++) {
-				fkey = `${fkey}/${rest[i]}`
-				let folder = folderCache.get(fkey)
-				if (!folder) {
-					folder = { type: 'folder', name: rest[i], fullPath: fkey, isScope: false, children: [] }
-					folderCache.set(fkey, folder)
-					parent.children.push(folder)
-				}
-				parent = folder
-			}
-			parent.children.push({ type: 'file', name: rest[rest.length - 1], diff: d })
-		}
-		const sortRec = (n: FolderNode) => {
-			n.children.sort((a, b) => {
-				if (a.type !== b.type) return a.type === 'folder' ? -1 : 1
-				return a.name.localeCompare(b.name)
+	// ── Tree ─────────────────────────────────────────────────────────────────
+	const appRootMeta = $derived.by(() => {
+		const m = new Map<string, AppRootMeta>()
+		for (const it of model.items) {
+			if (it.deployKind !== 'raw_app') continue
+			m.set(it.displayPath, {
+				summaryKey: it.key,
+				summary: it.summary,
+				hasDraft: it.hasDraft,
+				draftOnly: it.draftOnly,
+				draftUsers: it.draftUsers,
+				draftItemKind: it.draftKind
 			})
-			for (const c of n.children) if (c.type === 'folder') sortRec(c)
 		}
-		sortRec(root)
-		return root
-	}
-
-	function searchableText(d: DiffRow): string {
-		const parts = [displayPathOf(d), KIND_LABELS[d.kind] ?? d.kind]
-		const s = summaries[itemKey(d)] ?? d.summary
-		if (s) parts.push(s)
-		return parts.join(' ')
-	}
-	let searchedDiffs: (DiffRow & { marked?: string })[] | undefined = $state(undefined)
-
-	const filteredDiffs = $derived.by(() => {
-		const q = searchQuery.trim()
-		if (!q) return diffs
-		return (searchedDiffs ?? []) as DiffRow[]
+		return m
 	})
 
-	const tree = $derived(buildTree(filteredDiffs))
+	const treeModel = $derived(
+		buildDiffTree(
+			filteredEntries.map((e) => ({
+				key: displayKey(e),
+				structurePath: displayPathOf(e),
+				data: e
+			})),
+			appRootMeta
+		)
+	)
 
-	function rowId(d: DiffRow): string {
-		return `ws-diff-${itemKey(d)}`
-	}
-
-	function scrollToDiff(d: DiffRow) {
-		const el = document.getElementById(rowId(d)) as HTMLDetailsElement | null
-		if (!el) return
-		el.open = true
-		el.scrollIntoView({ behavior: 'smooth', block: 'start' })
-	}
-
-	// ── Keyboard nav (matches WorkspaceItemDrillPicker) ─────────────────────
-	let folderOpen: Record<string, boolean> = $state({})
-	function isFolderOpen(key: string): boolean {
-		return folderOpen[key] ?? true
-	}
-	function folderKey(node: FolderNode): string {
-		return `folder:${node.fullPath}`
-	}
-
-	type NavEntry =
-		| { type: 'folder'; key: string; node: FolderNode }
-		| { type: 'file'; key: string; diff: DiffRow }
-
-	function flattenVisible(node: FolderNode): NavEntry[] {
-		const out: NavEntry[] = []
-		const walk = (n: TreeNode) => {
-			if (n.type === 'file') {
-				out.push({ type: 'file', key: itemKey(n.diff), diff: n.diff })
-				return
+	// Content blocks follow the sidebar's order: walk the tree (all folders open,
+	// so collapsing the sidebar never hides a block) and emit each owning deploy
+	// item once, so the diff column top-to-bottom matches the tree.
+	const orderedItems = $derived.by(() => {
+		const seen = new Set<string>()
+		const out: DeployItem[] = []
+		for (const entry of treeModel.order(() => true)) {
+			if (entry.type !== 'file') continue
+			const item = isSynthetic(entry.data) ? appByPath.get(entry.data.appPath) : entry.data
+			if (item && !seen.has(item.key)) {
+				seen.add(item.key)
+				out.push(item)
 			}
-			const fkey = folderKey(n)
-			out.push({ type: 'folder', key: fkey, node: n })
-			if (isFolderOpen(fkey)) for (const c of n.children) walk(c)
 		}
-		for (const c of node.children) walk(c)
 		return out
+	})
+
+	function rowId(d: DeployItem): string {
+		return `ws-diff-${d.key}`
 	}
-	const navEntries = $derived(flattenVisible(tree))
+
+	// Keep the column's pt-3 breathing room when a click scrolls a card to the top.
+	const SCROLL_TOP_INSET = 12
+
+	// Smooth-scroll the row's card near the top (leaving the column's top inset).
+	// Native scrollIntoView lands short here because lazily-mounted diffs grow the
+	// list mid-scroll; instead we ease toward the target and re-measure it every
+	// frame, so the animation stays smooth while still landing flush once the
+	// layout settles. Bails on user scroll.
+	function scrollToDiff(d: DeployItem) {
+		const el = document.getElementById(rowId(d))
+		const container = mainScrollEl
+		if (!el || !container) return
+		let frames = 0
+		let settled = 0
+		let cancelled = false
+		const cancel = () => (cancelled = true)
+		container.addEventListener('wheel', cancel, { once: true, passive: true })
+		container.addEventListener('touchstart', cancel, { once: true, passive: true })
+		const teardown = () => {
+			container.removeEventListener('wheel', cancel)
+			container.removeEventListener('touchstart', cancel)
+		}
+		const step = () => {
+			if (cancelled) return teardown()
+			const off =
+				el.getBoundingClientRect().top - container.getBoundingClientRect().top - SCROLL_TOP_INSET
+			if (Math.abs(off) < 1) {
+				if (++settled >= 2) return teardown()
+			} else {
+				settled = 0
+				// Ease-out for the long haul; snap the final approach so it settles fast.
+				container.scrollTop += Math.abs(off) < 20 ? off : Math.round(off * 0.22)
+			}
+			if (frames++ < 120) requestAnimationFrame(step)
+			else teardown()
+		}
+		step()
+	}
+
+	// Transient ring pulse on the card a tree click just revealed, so the eye
+	// lands on the right block after the scroll.
+	let flashKey = $state<string | undefined>(undefined)
+	let flashTimer: ReturnType<typeof setTimeout> | undefined
+	function flashRow(key: string) {
+		flashKey = key
+		clearTimeout(flashTimer)
+		flashTimer = setTimeout(() => (flashKey = undefined), 800)
+	}
+
+	function revealDiff(d: DeployItem, key?: string) {
+		if (key) highlightedKey = key
+		flashRow(d.key)
+		scrollToDiff(d)
+	}
+
+	// A file's sub-diff anchor lives inside the app's main-panel block, which
+	// mounts lazily on scroll — force-mount it before scrolling to the anchor.
+	// A deployed app's block has no per-file sections ("no pending changes"), so
+	// fall back to the app block itself.
+	async function revealSynthetic(s: RawAppSyntheticItem, key?: string) {
+		if (key) highlightedKey = key
+		const app = appByPath.get(s.appPath)
+		if (!app) return
+		flashRow(app.key)
+		if (!mountedRows[app.key]) {
+			mountedRows[app.key] = true
+			await tick()
+		}
+		const target =
+			document.getElementById(`ws-diff-${displayKey(s)}`) ?? document.getElementById(rowId(app))
+		target?.scrollIntoView({ behavior: 'smooth', block: 'start' })
+	}
+
+	// ── Keyboard nav ─────────────────────────────────────────────────────────
+	let folderOpen: Record<string, boolean> = $state({})
+	// Folders default open, raw-app roots default collapsed; a live search
+	// forces everything open so matches inside apps are visible.
+	const appFolderKeys = $derived(new Set([...appRootMeta.keys()].map((p) => folderKeyFor(p))))
+	function isFolderOpen(key: string): boolean {
+		if (searchActive) return true
+		return folderOpen[key] ?? !appFolderKeys.has(key)
+	}
+
+	// Expand a still-unloaded raw app from its leaf row: mark the future app
+	// folder open and fetch the values; once ready, the leaf is replaced by the
+	// app root + file children. Re-expanding after a failure retries the load.
+	function expandApp(d: DeployItem) {
+		const fkey = folderKeyFor(d.displayPath)
+		folderOpen[fkey] = true
+		if (loadedDiffs[d.key]?.state === 'error') delete loadedDiffs[d.key]
+		const wasHighlighted = highlightedKey === d.key
+		void loadDiffFor(d).then(() => {
+			if (wasHighlighted) highlightedKey = fkey
+		})
+	}
+	const navEntries = $derived(treeModel.order((k) => isFolderOpen(k)))
 	const navKeys = $derived(navEntries.map((e) => e.key))
 	const entryByKey = $derived(new Map(navEntries.map((e) => [e.key, e])))
-
 	let highlightedKey: string | undefined = $state(undefined)
 	let mouseActive = $state(false)
 	let searchInputEl: HTMLInputElement | undefined = $state()
@@ -303,60 +386,46 @@
 
 	$effect(() => {
 		if (navKeys.length === 0) return
-		if (!highlightedKey || !navKeys.includes(highlightedKey)) {
-			highlightedKey = navKeys[0]
-		}
+		if (!highlightedKey || !navKeys.includes(highlightedKey)) highlightedKey = navKeys[0]
 	})
-
 	function scrollHighlightIntoView() {
 		if (!sidebarRoot || !highlightedKey) return
-		const el = sidebarRoot.querySelector<HTMLElement>(
-			`[data-nav-key="${CSS.escape(highlightedKey)}"]`
-		)
-		el?.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
+		sidebarRoot
+			.querySelector<HTMLElement>(`[data-nav-key="${CSS.escape(highlightedKey)}"]`)
+			?.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
 	}
-
 	function moveHighlight(delta: 1 | -1) {
 		if (navKeys.length === 0) return
 		const cur = navKeys.indexOf(highlightedKey ?? '')
-		const next = cur < 0 ? 0 : (cur + delta + navKeys.length) % navKeys.length
-		highlightedKey = navKeys[next]
+		highlightedKey = navKeys[cur < 0 ? 0 : (cur + delta + navKeys.length) % navKeys.length]
 		mouseActive = false
 		requestAnimationFrame(scrollHighlightIntoView)
 	}
-
 	function setHoverHighlight(key: string) {
 		if (mouseActive) highlightedKey = key
 	}
-
 	function activateHighlighted() {
 		if (!highlightedKey) return
 		const entry = entryByKey.get(highlightedKey)
 		if (!entry) return
 		if (entry.type === 'file') {
-			scrollToDiff(entry.diff)
-		} else {
-			folderOpen[entry.key] = !isFolderOpen(entry.key)
+			if (isSynthetic(entry.data)) void revealSynthetic(entry.data)
+			else void revealDiff(entry.data)
+			return
 		}
+		// App roots activate like rows (reveal the diff); folding stays on the
+		// chevron / ArrowRight. Plain folders keep Enter-to-toggle.
+		const appItem = entry.node.app
+			? segmentItems.find((d) => d.key === entry.node.app?.summaryKey)
+			: undefined
+		if (appItem) revealDiff(appItem)
+		else folderOpen[entry.key] = !isFolderOpen(entry.key)
 	}
-
-	function parentFolderKeyFor(entry: NavEntry): string | undefined {
-		const path = entry.type === 'folder' ? entry.node.fullPath : entry.diff.path
-		return parentFolderKey(entry.type, path)
-	}
-
-	function firstChildKey(node: FolderNode): string | undefined {
-		const c = node.children[0]
-		if (!c) return undefined
-		return c.type === 'folder' ? folderKey(c) : itemKey(c.diff)
-	}
-
 	function selectKey(key: string) {
 		highlightedKey = key
 		mouseActive = false
 		requestAnimationFrame(scrollHighlightIntoView)
 	}
-
 	function handleSearchKeydown(e: KeyboardEvent) {
 		if (e.key === 'ArrowDown') {
 			e.preventDefault()
@@ -369,13 +438,21 @@
 			activateHighlighted()
 		} else if (e.key === 'ArrowRight') {
 			const entry = highlightedKey ? entryByKey.get(highlightedKey) : undefined
-			if (!entry || entry.type !== 'folder') return
+			if (!entry) return
+			if (entry.type === 'file') {
+				// An unloaded raw app is still a leaf — ArrowRight expands it.
+				if (!isSynthetic(entry.data) && entry.data.deployKind === 'raw_app') {
+					e.preventDefault()
+					expandApp(entry.data)
+				}
+				return
+			}
 			if (!isFolderOpen(entry.key)) {
 				e.preventDefault()
 				folderOpen[entry.key] = true
 				return
 			}
-			const child = firstChildKey(entry.node)
+			const child = treeModel.firstChildKeyOf(entry.key)
 			if (child) {
 				e.preventDefault()
 				selectKey(child)
@@ -388,92 +465,410 @@
 				folderOpen[entry.key] = false
 				return
 			}
-			const parent = parentFolderKeyFor(entry)
+			const parent = treeModel.parentKeyOf(entry.key)
 			if (parent && entryByKey.has(parent)) {
 				e.preventDefault()
 				selectKey(parent)
 			}
 		}
 	}
+
+	// ── Diff values (lazy Monaco mount, one resolver via the model) ──────────
+	type LoadedDiff = {
+		state: 'loading' | 'ready' | 'error'
+		error?: string
+		before?: unknown
+		after?: unknown
+	}
+	let loadedDiffs: Record<string, LoadedDiff> = $state({})
+	let mainScrollEl: HTMLElement | undefined = $state()
+	// Visible height of the scroll area, used to size the trailing spacer so the
+	// last item can always be scrolled until its header reaches the top.
+	let mainHeight = $state(0)
+	// Height of a card's sticky header (measured — all cards share it), so the diff
+	// cap can reserve exactly that plus a small gap and the whole card (header +
+	// diff) fits the viewport instead of overflowing it.
+	let cardHeaderH = $state(0)
+	// Cap each diff block so a long one (a big script/app file) scrolls inside
+	// Monaco instead of stretching its card past a screenful: the visible height
+	// less the card header and an inter-card gap so a whole card fits the viewport.
+	// 0 (unmeasured) means "no cap" so nothing collapses before mainHeight lands.
+	const CARD_GAP = 24
+	const maxHeight = $derived(mainHeight > 0 ? mainHeight - cardHeaderH - CARD_GAP : 0)
+	// The trailing spacer only needs to cover the gap the last item can't fill on
+	// its own: viewport − lastItemHeight (0 when the item already fills the view).
+	// Reserving the full viewport would let you scroll a whole item-height into
+	// blank space past the end. A ResizeObserver keeps it right as the row grows.
+	let lastRowHeight = $state(0)
+	$effect(() => {
+		const last = orderedItems.at(-1)
+		const el = last && mainScrollEl ? document.getElementById(rowId(last)) : undefined
+		if (!el) {
+			lastRowHeight = 0
+			return
+		}
+		lastRowHeight = el.offsetHeight
+		const ro = new ResizeObserver(() => (lastRowHeight = el.offsetHeight))
+		ro.observe(el)
+		return () => ro.disconnect()
+	})
+	const trailingSpace = $derived(Math.max(0, mainHeight - lastRowHeight))
+	let mountedRows: Record<string, boolean> = $state({})
+	const MOUNT_MARGIN = '200px 0px'
+
+	async function loadDiffFor(item: DeployItem) {
+		if (loadedDiffs[item.key]) return
+		loadedDiffs[item.key] = { state: 'loading' }
+		try {
+			const { before, after }: DiffValues = await model.loadDiffValues(item)
+			loadedDiffs[item.key] = { state: 'ready', before, after }
+		} catch (e) {
+			console.error('WorkspaceDiffDrawer: loadDiffValues failed', item, e)
+			loadedDiffs[item.key] = { state: 'error', error: String(e) }
+		}
+	}
+
+	function lazyMount(node: HTMLElement, item: DeployItem) {
+		const io = new IntersectionObserver(
+			(entries) => {
+				if (entries.some((e) => e.isIntersecting)) {
+					mountedRows[item.key] = true
+					void loadDiffFor(item)
+					io.disconnect()
+				}
+			},
+			{ root: mainScrollEl ?? null, rootMargin: MOUNT_MARGIN }
+		)
+		io.observe(node)
+		return { destroy: () => io.disconnect() }
+	}
+
+	// Raw-app blocks explode into their per-file / per-runnable sub-diffs; other
+	// kinds render one before/after viewer.
+	function rawAppItems(
+		item: DeployItem,
+		loaded: LoadedDiff
+	): (RawAppFileItem | RawAppRunnableItem)[] {
+		return rawAppDiffToItems(
+			item.path,
+			loaded.before as RawAppish | undefined,
+			loaded.after as RawAppish | undefined,
+			item.displayPath
+		)
+	}
 </script>
 
 <SearchItems
 	filter={searchQuery}
-	items={diffs}
-	bind:filteredItems={searchedDiffs}
-	f={(d: DiffRow) => searchableText(d)}
+	items={displayEntries}
+	bind:filteredItems={searchedEntries}
+	f={(e: DisplayEntry) => searchableText(e)}
 />
 
-{#snippet renderTreeNode(node: TreeNode, depth: number)}
+<!-- The single row badge. Everything here was edited by the AI this session,
+     so the draft badge is a plain pill — no author avatars. -->
+{#snippet rowBadge(item: DeployItem)}
+	{#if badgeOf(item) === 'draft'}
+		{#if model.staleOf(item.key)}
+			<!-- Same warning as the compare page: the deployed head moved after this
+			     draft began, so deploying it reverts the newer deploy. Warn, don't
+			     block — reviewing the diff is exactly what this surface is for. -->
+			<Popover openOnHover debounceDelay={50}>
+				{#snippet trigger()}
+					<AlertTriangle size={14} class="text-orange-500" />
+				{/snippet}
+				{#snippet content()}
+					<div class="text-xs p-3 max-w-xs text-primary">
+						Started from an older deployed version. A newer version was deployed after this draft
+						began. Review the latest deploy before deploying.
+					</div>
+				{/snippet}
+			</Popover>
+		{/if}
+		<Badge
+			color="indigo"
+			small
+			class={STATUS_BADGE_CLASS}
+			title={item.draftOnly ? 'Never deployed and is only a draft' : 'Is deployed and has a draft'}
+		>
+			{item.draftOnly ? 'Draft only' : 'Draft'}
+		</Badge>
+	{:else}
+		<!-- Deployed is the quiet terminal state — an icon-only green badge; the
+		     hover carries the words. Fades in when a row transitions on deploy. -->
+		<span in:fade={{ duration: 200 }} class="inline-flex shrink-0">
+			<Badge
+				color="green"
+				small
+				class="px-1 py-0.5"
+				title={`Deployed in ${workspaceLabel ?? 'this workspace'}`}
+			>
+				<Check class="w-3 h-3" aria-label="Deployed" />
+			</Badge>
+		</span>
+	{/if}
+{/snippet}
+
+<!-- Failure only — while deploying the button itself carries a spinner, and a
+     success flies the green check over the button (see deployStaged). -->
+{#snippet deployFailed(item: DeployItem)}
+	{@const s = model.statusOf(item.key)}
+	{#if s?.status === 'failed'}
+		<span class="inline-flex items-center gap-1" title={s.error}>
+			<Badge color="red" small>Failed</Badge>
+			<Button
+				variant="subtle"
+				unifiedSize="xs"
+				disabled={model.deploying}
+				onclick={() => deployStaged(item)}
+			>
+				Retry
+			</Button>
+		</span>
+	{/if}
+{/snippet}
+
+{#snippet renderTreeNode(node: TreeNode<DisplayEntry>, depth: number)}
 	{#if node.type === 'folder'}
 		{@const isUserScope = node.isScope && node.name.startsWith('u/')}
-		{@const fkey = folderKey(node)}
+		{@const fkey = node.key}
 		{@const open = isFolderOpen(fkey)}
 		{@const isHl = fkey === highlightedKey}
 		<details
 			{open}
-			ontoggle={(e) => (folderOpen[fkey] = (e.currentTarget as HTMLDetailsElement).open)}
+			ontoggle={(e) => {
+				// Record real user toggles only; skip the echo fired when the `open`
+				// attribute is driven by state (search force-open, expandApp).
+				const domOpen = (e.currentTarget as HTMLDetailsElement).open
+				if (domOpen !== isFolderOpen(fkey)) folderOpen[fkey] = domOpen
+			}}
 			class="select-none"
 		>
-			<summary
-				role="option"
-				aria-selected={isHl}
-				data-nav-key={fkey}
-				onmouseenter={() => setHoverHighlight(fkey)}
-				class="flex items-center gap-1.5 px-3 py-1 cursor-pointer text-xs font-medium font-mono text-emphasis hover:bg-surface-hover list-none [&::-webkit-details-marker]:hidden tree-summary {isHl
-					? 'bg-surface-hover'
-					: ''}"
-				style="padding-left: {depth * 12 + 8}px"
-			>
-				<ChevronDown class="w-3 h-3 shrink-0 text-tertiary tree-chevron-open" />
-				<ChevronRight class="w-3 h-3 shrink-0 text-tertiary tree-chevron-closed" />
-				{#if isUserScope}
-					<User size={12} class="shrink-0 text-tertiary" />
-				{:else}
-					<Folder size={12} class="shrink-0 text-tertiary" />
-				{/if}
-				<span class="truncate" title={node.name}>{node.name}</span>
-			</summary>
-			<div>
+			{#if node.app}
+				{@const appItem = segmentItems.find((it) => it.key === node.app?.summaryKey)}
+				<!-- App root: the row click reveals the app's diff like any item row;
+				     folding is chevron-only (preventDefault blocks the native toggle). -->
+				<summary
+					role="option"
+					aria-selected={isHl}
+					data-nav-key={fkey}
+					onmouseenter={() => setHoverHighlight(fkey)}
+					onclick={(e) => {
+						e.preventDefault()
+						if (appItem) revealDiff(appItem, fkey)
+					}}
+					title={node.fullPath}
+					class="flex items-center gap-2 pl-3 pr-1 py-2 rounded-md cursor-pointer hover:bg-surface-hover list-none [&::-webkit-details-marker]:hidden tree-summary {isHl
+						? 'bg-surface-hover'
+						: ''}"
+					style="padding-left: {depth * 12 + 8}px"
+				>
+					<RowIcon kind="raw_app" size={12} />
+					<span
+						class="flex-1 min-w-0 truncate text-xs font-normal text-primary {node.app.summary
+							? ''
+							: 'font-mono'}"
+					>
+						{node.app.summary ?? node.name}
+					</span>
+					{#if appItem}
+						{@render rowBadge(staged[appItem.key] ?? appItem)}
+					{/if}
+					<!-- Raw button (not the design-system Button) on purpose: it nests inside
+					     the <summary> whose native toggle is preventDefault'd, and needs the
+					     tree rows' compact w-5 footprint — Button's smallest size doesn't fit
+					     and its styling fights the row hover. -->
+					<button
+						type="button"
+						aria-expanded={open}
+						title={open ? 'Hide files' : 'Show files'}
+						class="w-5 h-5 flex items-center justify-center shrink-0 rounded hover:bg-surface-secondary"
+						onclick={(e) => {
+							e.preventDefault()
+							e.stopPropagation()
+							folderOpen[fkey] = !open
+						}}
+					>
+						<ChevronDown class="w-3 h-3 shrink-0 text-tertiary tree-chevron-open" />
+						<ChevronRight class="w-3 h-3 shrink-0 text-tertiary tree-chevron-closed" />
+					</button>
+				</summary>
+			{:else}
+				<summary
+					role="option"
+					aria-selected={isHl}
+					data-nav-key={fkey}
+					onmouseenter={() => setHoverHighlight(fkey)}
+					class="flex items-center gap-2 pl-3 pr-1 py-2 rounded-md cursor-pointer text-xs font-normal font-mono text-secondary hover:bg-surface-hover list-none [&::-webkit-details-marker]:hidden tree-summary {isHl
+						? 'bg-surface-hover'
+						: ''}"
+					style="padding-left: {depth * 12 + 8}px"
+				>
+					{#if isUserScope}
+						<User size={12} class="shrink-0 text-tertiary" />
+					{:else}
+						<Folder size={12} class="shrink-0 text-tertiary" />
+					{/if}
+					<span class="flex-1 min-w-0 truncate" title={node.name}>{node.name}</span>
+					<span class="w-5 flex items-center justify-center shrink-0">
+						<ChevronDown class="w-3 h-3 shrink-0 text-tertiary tree-chevron-open" />
+						<ChevronRight class="w-3 h-3 shrink-0 text-tertiary tree-chevron-closed" />
+					</span>
+				</summary>
+			{/if}
+			<div class="relative">
+				<div
+					class="pointer-events-none absolute top-0 bottom-0 border-l border-light"
+					style="left: {depth * 12 + 14}px"
+					aria-hidden="true"
+				></div>
 				{#each node.children as child}
 					{@render renderTreeNode(child, depth + 1)}
 				{/each}
 			</div>
 		</details>
 	{:else}
-		{@const status = node.diff.status}
-		{@const key = itemKey(node.diff)}
-		<WorkspaceItemRow
-			kind={node.diff.kind as any}
-			uniformHeight
-			summary={summaries[key] ?? node.diff.summary}
-			secondary={node.name}
-			highlighted={key === highlightedKey}
-			navKey={key}
-			indent={depth * 12 + 20}
-			title={displayPathOf(node.diff)}
-			onclick={() => {
-				highlightedKey = key
-				scrollToDiff(node.diff)
-			}}
-			onmouseenter={() => setHoverHighlight(key)}
-		>
-			{#snippet extras()}
-				<span
-					class="w-1.5 h-1.5 rounded-full shrink-0 {status === 'added'
-						? 'bg-green-500'
-						: status === 'removed'
-							? 'bg-red-500'
-							: status === 'conflict'
-								? 'bg-orange-500'
-								: 'bg-blue-500'}"
-				></span>
-			{/snippet}
-		</WorkspaceItemRow>
+		{@const d = node.data}
+		{@const key = node.key}
+		<!-- Indentation lives on the wrapper (outside the row's hover surface) so the
+		     highlight starts at the row content instead of bleeding across the indent.
+		     Every row ends with a w-5 slot (chevron or spacer) to keep badges aligned
+		     with the folder rows' chevrons. -->
+		<div class="flex items-stretch" style="padding-left: {depth * 12 + 4}px">
+			{#if isSynthetic(d)}
+				<WorkspaceItemRow
+					kind={d.kind as any}
+					iconPath={d.path}
+					baseClass="py-2 min-w-0 pr-1 pl-1 rounded-md"
+					singleLine
+					secondary={node.name}
+					highlighted={key === highlightedKey}
+					navKey={key}
+					indent={0}
+					title={displayPathOf(d)}
+					onclick={() => void revealSynthetic(d, key)}
+					onmouseenter={() => setHoverHighlight(key)}
+				>
+					{#snippet extras()}
+						<span class="w-5 shrink-0"></span>
+					{/snippet}
+				</WorkspaceItemRow>
+			{:else}
+				<WorkspaceItemRow
+					kind={d.deployKind as any}
+					iconPath={d.path}
+					baseClass="py-2 min-w-0 pr-1 pl-1 rounded-md"
+					singleLine
+					summary={d.summary}
+					secondary={node.name}
+					highlighted={key === highlightedKey}
+					navKey={key}
+					indent={0}
+					title={d.displayPath}
+					onclick={() => revealDiff(d, key)}
+					onmouseenter={() => setHoverHighlight(key)}
+				>
+					{#snippet extras()}
+						{@render rowBadge(staged[d.key] ?? d)}
+						{#if d.deployKind === 'raw_app'}
+							<!-- Unloaded app leaf: row click reveals the diff, the chevron
+							     loads the values and unwraps the file tree. A span (not a
+							     button/Button) because it nests inside WorkspaceItemRow's
+							     clickable row — nested interactive elements are invalid — and
+							     it stays out of the tab order: the keyboard path is ArrowRight
+							     on the highlighted row (handleSearchKeydown). -->
+							<span
+								role="button"
+								tabindex="-1"
+								title="Show files"
+								class="w-5 h-5 flex items-center justify-center shrink-0 rounded cursor-pointer hover:bg-surface-secondary"
+								onclick={(e) => {
+									e.stopPropagation()
+									expandApp(d)
+								}}
+							>
+								{#if loadedDiffs[d.key]?.state === 'loading'}
+									<Loader2 class="w-3 h-3 animate-spin text-tertiary" />
+								{:else}
+									<ChevronRight class="w-3 h-3 text-tertiary" />
+								{/if}
+							</span>
+						{:else}
+							<span class="w-5 shrink-0"></span>
+						{/if}
+					{/snippet}
+				</WorkspaceItemRow>
+			{/if}
+		</div>
 	{/if}
 {/snippet}
 
-<Drawer bind:this={drawer} size="1200px">
+<!-- Live (non-done) diff content only — the done state renders at the card
+     level so the two can cross-animate on deploy. -->
+{#snippet diffBlock(item: DeployItem)}
+	{@const loaded = loadedDiffs[item.key]}
+	{#if !mountedRows[item.key]}
+		<div
+			use:lazyMount={item}
+			class="flex items-center gap-2 text-2xs text-tertiary p-3 min-h-[10rem]"
+		>
+			<Loader2 class="w-3.5 h-3.5 animate-spin" />
+			Diff loads on scroll…
+		</div>
+	{:else if !loaded || loaded.state === 'loading'}
+		<div class="flex items-center gap-2 text-xs text-secondary p-3">
+			<Loader2 class="w-3.5 h-3.5 animate-spin" />
+			Loading diff…
+		</div>
+	{:else if loaded.state === 'error'}
+		<div class="text-xs text-red-600 dark:text-red-400 p-3">{loaded.error}</div>
+	{:else if item.deployKind === 'raw_app'}
+		<div class="flex flex-col">
+			{#each rawAppItems(item, loaded) as sub (displayKey(sub))}
+				<!-- Anchor target for the sidebar's per-file rows; scroll-mt clears the
+				     app block's sticky header. -->
+				<div
+					id={`ws-diff-${displayKey(sub)}`}
+					class="border-t border-light first:border-t-0 scroll-mt-10"
+				>
+					<div class="px-3 py-1.5 text-2xs text-secondary font-mono truncate" title={sub.path}>
+						{sub.path}
+					</div>
+					{#if sub.kind === 'raw_app_file'}
+						<WorkspaceItemDiffViewer
+							kind="raw_app_file"
+							rawFile={sub as RawAppFileItem}
+							{inlineDiff}
+							disableAutoInline
+							{maxHeight}
+						/>
+					{:else}
+						{@const runnable = sub as RawAppRunnableItem}
+						<WorkspaceItemDiffViewer
+							kind="script"
+							originalRaw={runnable.originalRaw}
+							currentRaw={runnable.currentRaw}
+							{inlineDiff}
+							disableAutoInline
+							{maxHeight}
+						/>
+					{/if}
+				</div>
+			{/each}
+		</div>
+	{:else}
+		<WorkspaceItemDiffViewer
+			kind={item.deployKind}
+			originalRaw={loaded.before}
+			currentRaw={loaded.after}
+			{inlineDiff}
+			disableAutoInline
+			{maxHeight}
+		/>
+	{/if}
+{/snippet}
+
+<Drawer bind:this={drawer} size="1500px">
 	<DrawerContent
 		{title}
 		{titleExtra}
@@ -483,13 +878,26 @@
 		overflow_y={false}
 	>
 		{#snippet actions()}
-			<ToggleButtonGroup bind:selected={diffStyle} noWFull>
+			<!-- Controlled (not bind:selected): the shown button is the *effective*
+			     view, which is forced to unified when the column is too narrow.
+			     Clicks still record the user's preference in `diffStyle`. -->
+			<ToggleButtonGroup
+				selected={effectiveStyle}
+				onSelected={(v) => {
+					// Ignore the programmatic flip to 'inline' when `narrow` forces it —
+					// only a real click (when not narrow) should change the preference,
+					// so widening again restores the user's choice.
+					if (!narrow) diffStyle = v
+				}}
+				noWFull
+			>
 				{#snippet children({ item })}
 					<ToggleButton
 						value="sbs"
 						label="Side-by-side"
 						icon={SquareSplitHorizontal}
-						tooltip="Side-by-side diff"
+						tooltip={narrow ? 'Side-by-side needs a wider view' : 'Side-by-side diff'}
+						disabled={narrow}
 						iconOnly
 						{item}
 					/>
@@ -503,147 +911,220 @@
 					/>
 				{/snippet}
 			</ToggleButtonGroup>
-			<Button
-				variant="accent"
-				unifiedSize="sm"
-				startIcon={{ icon: GitMerge }}
-				onclick={() => goto(reviewHref)}
-			>
-				{reviewLabel}
-			</Button>
 		{/snippet}
-		<div class="flex flex-row h-full min-h-0">
-			{#if diffs.length > 0}
-				<aside
-					bind:this={sidebarRoot}
-					onmousemove={() => (mouseActive = true)}
-					class="flex-none w-56 border-r border-light flex flex-col min-h-0"
-				>
-					<div class="px-3 pt-3 pb-2 shrink-0">
-						<!-- Raw input (not the design-system TextInput) on purpose: this is a
-						     bespoke filter wired to the file tree's keyboard navigation — it
-						     needs a direct element ref to focus (the `/` shortcut) and a
-						     keydown handler that hands ArrowDown/Enter off to the tree.
-						     TextInput/ClearableInput swallow/rebubble those and don't expose
-						     the element ref. -->
-						<input
-							bind:this={searchInputEl}
-							type="search"
-							bind:value={searchQuery}
-							placeholder="Filter files..."
-							onkeydown={handleSearchKeydown}
-							class="w-full text-xs px-2 py-1 rounded border border-light bg-surface focus:outline-none focus:border-accent"
-						/>
-					</div>
-					<div class="flex-1 min-h-0 overflow-y-auto pb-3 flex flex-col gap-1">
-						{#if tree.children.length > 0}
-							{#each tree.children as child}
-								{@render renderTreeNode(child, 0)}
-							{/each}
-						{:else}
-							<div class="text-2xs text-tertiary px-3 py-2">No matches</div>
-						{/if}
-					</div>
-				</aside>
-			{/if}
-			<main class="flex-1 min-w-0 overflow-y-auto">
-				<div class="px-3 pt-3 pb-4 flex flex-col gap-3">
-					{#if loading && diffs.length === 0}
-						<div class="flex items-center gap-2 text-sm text-secondary py-8 self-center">
-							<Loader2 class="w-4 h-4 animate-spin" />
-							Loading comparison...
+		<div class="flex flex-col h-full min-h-0">
+			<div class="flex flex-row flex-1 min-h-0">
+				{#if model.items.length > 0}
+					<aside
+						bind:this={sidebarRoot}
+						onmousemove={() => (mouseActive = true)}
+						class="flex-none w-96 flex flex-col min-h-0 pt-3 px-1"
+					>
+						<!-- Both containers reserve the same stable scrollbar gutter (the input
+						     wrapper never actually scrolls), so input and tree rows share one
+						     right edge. padRightForGutter tops the gutter up to the 6px inner
+						     padding target so the visual right margin equals the left one no
+						     matter the platform's scrollbar width (0 for overlay scrollbars). -->
+						<div
+							class="pl-2 pb-1 shrink-0 overflow-y-auto"
+							style="scrollbar-gutter: stable;"
+							use:padRightForGutter
+						>
+							<!-- Raw input (not the design-system TextInput) on purpose: this is a
+							     bespoke filter wired to the file tree's keyboard navigation — it
+							     needs a direct element ref (focused on open) and a keydown handler
+							     that hands ArrowDown/Enter/ArrowLeft/Right off to the tree.
+							     TextInput/ClearableInput swallow/rebubble those and don't expose
+							     the element ref. -->
+							<input
+								bind:this={searchInputEl}
+								type="search"
+								bind:value={searchQuery}
+								placeholder="Filter files..."
+								onkeydown={handleSearchKeydown}
+								class="w-full text-xs px-2 py-1 rounded border border-light bg-surface focus:outline-none focus:border-accent"
+							/>
 						</div>
-					{:else if error}
-						<div class="text-sm text-red-600 dark:text-red-400 py-4">{error}</div>
-					{:else if notice}
-						<div class="text-sm text-secondary py-4">{notice}</div>
-					{:else if diffs.length === 0}
-						<div class="text-sm text-secondary py-4">{emptyMessage}</div>
-					{:else if filteredDiffs.length === 0}
-						<div class="text-sm text-secondary py-4">No files match "{searchQuery}".</div>
-					{:else}
-						<div class="flex flex-col gap-2">
-							{#each filteredDiffs as d (itemKey(d))}
-								{@const key = itemKey(d)}
-								{@const status = d.status}
-								{@const StatusIcon = statusIcons[status]}
-								{@const loaded = loadedDiffs[key]}
-								{@const editUrl = editUrlFor?.(d)}
-								{@const dpath = displayPathOf(d)}
-								<details
-									open
-									id={rowId(d)}
-									class="border border-light rounded-md bg-surface scroll-mt-2"
-									ontoggle={(e) => onDetailsToggle(d, e)}
-								>
-									<summary
-										class="sticky top-0 z-30 bg-surface flex items-center gap-2 px-3 py-2 cursor-pointer list-none [&::-webkit-details-marker]:hidden border-b border-transparent rounded-md relative before:content-[''] before:absolute before:inset-0 before:bg-surface-hover before:opacity-0 before:pointer-events-none before:transition-opacity hover:before:opacity-100"
+						<div
+							class="flex-1 min-h-0 overflow-y-auto overflow-x-hidden pl-2 pt-1.5 pb-2 flex flex-col gap-1"
+							style="scrollbar-gutter: stable;"
+							use:padRightForGutter
+						>
+							{#if treeModel.root.children.length > 0}
+								{#each treeModel.root.children as child}
+									{@render renderTreeNode(child, 0)}
+								{/each}
+							{:else}
+								<div class="text-2xs text-tertiary px-3 py-2">No matches</div>
+							{/if}
+						</div>
+					</aside>
+				{/if}
+				<main
+					bind:this={mainScrollEl}
+					bind:clientHeight={mainHeight}
+					bind:clientWidth={mainWidth}
+					class="flex-1 min-w-0 overflow-y-auto bg-surface"
+				>
+					<div class="pl-1 pr-3 pt-3 pb-4 flex flex-col gap-3">
+						{#if model.loading && model.items.length === 0}
+							<div class="flex items-center gap-2 text-sm text-secondary py-8 self-center">
+								<Loader2 class="w-4 h-4 animate-spin" />
+								Loading changes...
+							</div>
+						{:else if model.error}
+							<div class="text-sm text-red-600 dark:text-red-400 py-4">{model.error}</div>
+						{:else if model.items.length === 0}
+							<div class="text-sm text-secondary py-4">No changes.</div>
+						{:else if orderedItems.length === 0}
+							<div class="text-sm text-secondary py-4">No files match.</div>
+						{:else}
+							<div class="flex flex-col">
+								{#each orderedItems as d (d.key)}
+									<!-- While a deploy's success is being staged, the card renders its
+									     pre-deploy snapshot so the state flip waits for the check-mark
+									     beat instead of racing it. -->
+									{@const view = staged[d.key] ?? d}
+									{@const action = actionFor(view)}
+									{@const editUrl = editUrlFor?.(d)}
+									{@const status = model.statusOf(d.key)}
+									<div
+										id={rowId(d)}
+										class="mb-6 scroll-mt-3 rounded-md border border-light transition-shadow duration-500 {flashKey ===
+										d.key
+											? 'ring-1 ring-border-accent'
+											: 'ring-0 ring-transparent'}"
 									>
-										<ChevronDown
-											class="w-3.5 h-3.5 shrink-0 text-tertiary transition-transform chevron"
-										/>
-										<RowIcon kind={d.kind as any} size={14} />
-										<div class="min-w-0 flex-1">
-											{#if editUrl}
-												<ExternalEditLink
-													href={editUrl}
-													title={dpath}
-													class="text-xs text-primary font-mono truncate"
+										<div
+											bind:clientHeight={cardHeaderH}
+											class="sticky top-0 z-30 bg-surface-tertiary rounded-t-md flex items-center gap-2 px-3 py-2 border-b border-transparent"
+										>
+											<RowIcon kind={d.deployKind as any} path={d.path} size={14} />
+											<!-- flex+items-center so the path (a block div, or ExternalEditLink's
+											     inline-flex <a>) is centered by its box against the icon — an inline
+											     <a> would otherwise sit ~2px low on the line-box baseline. -->
+											<div class="min-w-0 flex-1 flex items-center">
+												{#if editUrl}
+													<ExternalEditLink
+														href={editUrl}
+														title={d.displayPath}
+														class="min-w-0 text-xs text-primary font-mono truncate"
+													>
+														<span class="truncate">{d.displayPath}</span>
+													</ExternalEditLink>
+												{:else}
+													<div
+														class="min-w-0 text-xs text-primary font-mono truncate"
+														title={d.displayPath}
+													>
+														{d.displayPath}
+													</div>
+												{/if}
+											</div>
+											<div class="shrink-0 flex items-center gap-2">
+												{@render rowBadge(view)}
+												{#if status?.status === 'failed'}
+													{@render deployFailed(d)}
+												{:else if action.op !== 'none'}
+													{#if action.secondary?.length}
+														<Button
+															variant="subtle"
+															unifiedSize="sm"
+															destructive
+															disabled={model.deploying || !!staged[d.key]}
+															onclick={() => confirmDiscard(d)}
+														>
+															{action.secondary[0].label}
+														</Button>
+													{/if}
+													<div class="relative overflow-hidden rounded-md">
+														<Button
+															variant="accent"
+															unifiedSize="sm"
+															disabled={model.deploying ||
+																!!staged[d.key] ||
+																!view.canWrite ||
+																!model.deployPermission.ok}
+															startIcon={status?.status === 'loading'
+																? { icon: Loader2, classes: 'animate-spin' }
+																: { icon: Save }}
+															title={!view.canWrite
+																? "You don't have write permission on this path"
+																: model.deployPermission.ok
+																	? undefined
+																	: model.deployPermission.reason}
+															onclick={() => deployStaged(d)}
+														>
+															{action.label}
+														</Button>
+														{#if staged[d.key]}
+															<!-- Success beat: green check flies in over the button
+															     (SaveButton pattern), holds, then the row flips. -->
+															<div
+																class="absolute inset-0 flex items-center justify-center bg-green-200 dark:bg-green-800 rounded-md"
+																transition:fly={{ y: -10, duration: 300 }}
+															>
+																<CheckCircle2 class="w-4 h-4 text-green-700 dark:text-green-300" />
+															</div>
+														{/if}
+													</div>
+												{/if}
+											</div>
+										</div>
+										<div class="bg-surface-tertiary rounded-b-md overflow-hidden">
+											<!-- Deploy collapses the (tall) diff into the one-line done note —
+											     slide both branches so the card height animates instead of
+											     snapping. Transitions are local: nothing plays on drawer open. -->
+											{#if view.done}
+												<div
+													transition:slide={{ duration: 300, easing: cubicOut }}
+													class="text-2xs text-tertiary p-3"
 												>
-													<span class="truncate">{dpath}</span>
-												</ExternalEditLink>
+													Deployed — no pending changes.
+												</div>
 											{:else}
-												<div class="text-xs text-primary font-mono truncate" title={dpath}>
-													{dpath}
+												<div transition:slide={{ duration: 300, easing: cubicOut }}>
+													{@render diffBlock(view)}
 												</div>
 											{/if}
 										</div>
-										<div class="shrink-0 flex items-center gap-2">
-											{#if d.ahead && d.ahead > 0}
-												<span class="text-2xs text-secondary">{d.ahead} ahead</span>
-											{/if}
-											{#if d.behind && d.behind > 0}
-												<span class="text-2xs text-secondary">{d.behind} behind</span>
-											{/if}
-											<Badge color={statusBadgeColor(status)}>
-												<StatusIcon class="w-3 h-3 inline mr-0.5" />
-												{status}
-											</Badge>
-										</div>
-									</summary>
-									<div
-										class="border-t border-light bg-surface-tertiary rounded-b-md overflow-hidden"
-									>
-										{#if !loaded || loaded.state === 'loading'}
-											<div class="flex items-center gap-2 text-xs text-secondary p-3">
-												<Loader2 class="w-3.5 h-3.5 animate-spin" />
-												Loading diff…
-											</div>
-										{:else if loaded.state === 'error'}
-											<div class="text-xs text-red-600 dark:text-red-400">{loaded.error}</div>
-										{:else if loaded.state === 'ready'}
-											<WorkspaceItemDiffViewer
-												kind={d.kind}
-												originalRaw={loaded.before}
-												currentRaw={loaded.after}
-												{inlineDiff}
-											/>
-										{/if}
 									</div>
-								</details>
-							{/each}
-						</div>
-					{/if}
-				</div></main
-			>
+								{/each}
+							</div>
+							<!-- Just enough trailing room for the last item to reach the top;
+							     without it the container bottoms out and short lists sit low. -->
+							<div aria-hidden="true" class="shrink-0" style="height: {trailingSpace}px"></div>
+						{/if}
+					</div>
+				</main>
+			</div>
+			<!-- Batch / PR (deploy all, request review, reconcile) is the compare page's
+			     job — the dock deploys per item; this footer is just the doorway there.
+			     A plain anchor (not Button href): it's a text-level navigation link, and
+			     the design-system Button renders link-hrefs with button chrome. -->
+			{#if model.items.length > 0 && compareSessionHref}
+				<div
+					class="shrink-0 border-t border-light bg-surface px-3 py-1.5 flex items-center justify-end text-xs"
+				>
+					<a
+						href={compareSessionHref}
+						target="_blank"
+						rel="noopener noreferrer"
+						class="inline-flex items-center gap-1 font-medium text-accent hover:underline shrink-0"
+					>
+						Deploy all / request review on compare page
+						<ExternalLink class="w-3 h-3" />
+					</a>
+				</div>
+			{/if}
+			<!-- Inside the drawer subtree: the drawer is portaled/elevated, so a
+			     sibling modal would stack beneath it. -->
+			<ConfirmationModal {...discardConfirm.props} />
 		</div>
 	</DrawerContent>
 </Drawer>
 
 <style>
-	details:not([open]) :global(.chevron) {
-		transform: rotate(-90deg);
-	}
 	details:not([open]) > .tree-summary :global(.tree-chevron-open) {
 		display: none;
 	}
diff --git a/frontend/src/lib/components/sessions/WorkspaceFamilyPicker.svelte b/frontend/src/lib/components/sessions/WorkspaceFamilyPicker.svelte
index 668a28b7d0..b6b6c4beb0 100644
--- a/frontend/src/lib/components/sessions/WorkspaceFamilyPicker.svelte
+++ b/frontend/src/lib/components/sessions/WorkspaceFamilyPicker.svelte
@@ -1,21 +1,39 @@
 <script lang="ts">
-	import { tick, type Snippet } from 'svelte'
+	import type { Snippet } from 'svelte'
 	import {
 		enterpriseLicense,
+		isPremiumStore,
+		userStore,
 		userWorkspaces,
-		workspaceStore,
-		type UserWorkspace
+		workspaceStore
 	} from '$lib/stores'
-	import { findWorkspaceDescendants } from '$lib/utils/workspaceHierarchy'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
+	import {
+		findWorkspaceDescendants,
+		findCanonicalDevWorkspace,
+		findWorkspaceRoot,
+		buildWorkspaceHierarchy
+	} from '$lib/utils/workspaceHierarchy'
+	import { canCreateFork } from '$lib/utils/editInFork'
+	import { forkAccentStyle } from '$lib/utils/forkColor'
+	import { getUserExt } from '$lib/user'
+	import { WorkspaceService } from '$lib/gen'
+	import {
+		fetchProtectionRulesForWorkspace,
+		isRuleActiveInRulesets,
+		canUserBypassRuleKindInRulesets
+	} from '$lib/workspaceProtectionRules.svelte'
+	import { resource } from 'runed'
 	import { isCloudHosted } from '$lib/cloud'
 	import { random_adj } from '$lib/components/random_positive_adjetive'
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
 	import InputError from '$lib/components/InputError.svelte'
-	import TextInput from '$lib/components/text_input/TextInput.svelte'
-	import { Building, Check, GitFork, Plus } from 'lucide-svelte'
+	import PrefixedInput from '$lib/components/PrefixedInput.svelte'
+	import { Badge, Button, CopyButton } from '$lib/components/common'
+	import { devBadgeText, devLabelNoun } from '$lib/utils/devWorkspaceLabel'
+	import Select from '../select/Select.svelte'
+	import { Building, Check, GitFork, Plus, Settings } from 'lucide-svelte'
 
-	type PendingFork = { id: string; name: string }
+	type PendingFork = { parent_workspace_id: string; id: string; name: string }
 	type ForkRequest = { parent_workspace_id: string; id: string; name: string }
 
 	let {
@@ -28,44 +46,115 @@
 		pendingFork,
 		onPick,
 		onCreateFork,
+		// Alternative to onCreateFork's inline staging: when set, the
+		// "Create new fork…" row becomes a one-shot button that delegates to
+		// this callback (e.g. opening the global fork modal) instead of
+		// revealing the inline name input. Used where there's no pending draft
+		// to stage (the sidebar scope picker).
+		onRequestCreateFork,
 		allowCreateFork = true,
 		// Optional caption rendered under the new-fork input. Lets the
 		// consumer differentiate "staged for first send" vs. "will be
 		// created immediately" semantics.
 		createForkCaption = '',
+		// Forwarded to the dropdown trigger wrapper — e.g. `min-w-0` so the
+		// trigger can shrink and its label truncate inside a narrow container.
+		class: triggerClass = undefined,
+		// Optional settings link rendered at the very bottom of the menu (e.g.
+		// "<workspace> settings"). The consumer decides visibility (admin gate)
+		// and target href.
+		settingsHref,
+		settingsLabel,
 		trigger
 	}: {
 		selectedId?: string
 		pendingFork?: PendingFork
 		onPick: (workspaceId: string) => void | Promise<void>
 		onCreateFork?: (fork: ForkRequest) => void | Promise<void>
+		onRequestCreateFork?: () => void
 		allowCreateFork?: boolean
 		createForkCaption?: string
+		class?: string
+		settingsHref?: string
+		settingsLabel?: string
 		trigger: Snippet<[{ open: boolean }]>
 	} = $props()
 
 	const WM_FORK_PREFIX = 'wm-fork-'
 
-	function findRoot(id: string | undefined, all: UserWorkspace[]): UserWorkspace | undefined {
-		if (!id) return undefined
-		let current = all.find((w) => w.id === id)
-		while (current?.parent_workspace_id) {
-			const parent = all.find((w) => w.id === current!.parent_workspace_id)
-			if (!parent) break
-			current = parent
-		}
-		return current
-	}
-
 	const effectiveId = $derived(selectedId ?? $workspaceStore ?? undefined)
-	const root = $derived(findRoot(effectiveId, $userWorkspaces))
+	const root = $derived(findWorkspaceRoot(effectiveId, $userWorkspaces))
 	const forks = $derived(root ? findWorkspaceDescendants(root.id, $userWorkspaces) : [])
 
-	// Structural gate, same as the sidebar WorkspaceMenu / SessionWorkspaceBar:
-	// when closed (cloud / DisableWorkspaceForking rule / admins workspace) the
-	// fork affordance is hidden entirely.
+	// The family's canonical dev workspace, if any — still used for gating (a forking-locked root can be
+	// forked via its dev) and as a selectable base with a "dev" badge.
+	const devOfRoot = $derived(root ? findCanonicalDevWorkspace(root.id, $userWorkspaces) : undefined)
+	const createForkLabel = 'Create new fork…'
+	// Candidate bases ("targets") for a new fork: the root plus every fork/dev in the family, so a fork
+	// can itself be the base — i.e. a fork of a fork. Root first, matching the list order below.
+	const baseOptions = $derived(root ? [root, ...forks] : [])
+	// Options for the base-branch <Select>. The nesting (fork of a fork) is rendered via the Select's
+	// per-item `startSnippet` as a depth-based spacer, so the label text itself stays clean.
+	const baseItems = $derived(
+		baseOptions.map((w) => ({
+			value: w.id,
+			label: w.name,
+			subtitle: w.id === root?.id ? 'root' : w.is_dev_workspace ? 'dev workspace' : undefined
+		}))
+	)
+
+	// Depth of each workspace within its family (root = 0, its forks = 1, forks of forks = 2, …), from
+	// the shared hierarchy builder — the same one the sidebar workspace menu uses — so the list indents
+	// forks of forks under their parent the same way. `forks` is a DFS of descendants (parent before
+	// child), so indenting each row by its depth nests it under its parent.
+	const familyDepths = $derived(
+		new Map(buildWorkspaceHierarchy($userWorkspaces).map((h) => [h.workspace.id, h.depth]))
+	)
+	// Extra left padding (on top of the row's base px-3) to nest a workspace one step per depth level,
+	// matching the sidebar menu's `depth * 16px`.
+	function indentStyle(id: string): string | undefined {
+		const depth = familyDepths.get(id) ?? 0
+		return depth > 0 ? `padding-left: ${12 + depth * 16}px` : undefined
+	}
+
+	// Judge the prod root off its OWN protection rules (fetched), not the active
+	// workspace's — so it reads correctly from a dev/fork too, the same way
+	// ParentWorkspaceProtectionAlert checks the parent. It's selectable when you
+	// can deploy to it, and "Fork from prod" shows when you can fork it.
+	const rootRulesetsResource = resource(
+		() => root?.id,
+		async (id) => (id ? await fetchProtectionRulesForWorkspace(id) : [])
+	)
+	const rootRulesets = $derived(rootRulesetsResource.current ?? [])
+	// Bypass must be judged with the user's identity IN THE ROOT (is_admin/groups are per-workspace),
+	// not the active workspace's `$userStore` — otherwise an admin of the dev/active workspace who is a
+	// non-admin of the root would get a false bypass. `getUserExt` returns undefined for a non-member,
+	// which `canUserBypassRuleKindInRulesets` treats as no bypass.
+	const rootUserInfoResource = resource(
+		() => root?.id,
+		async (id) => (id ? await getUserExt(id) : undefined)
+	)
+	const rootUserInfo = $derived(rootUserInfoResource.current)
+	const canDeployRoot = $derived(
+		!isRuleActiveInRulesets(rootRulesets, 'DisableDirectDeployment') ||
+			canUserBypassRuleKindInRulesets(rootRulesets, 'DisableDirectDeployment', rootUserInfo)
+	)
+	// A genuinely deploy-locked root (you can't deploy and can't bypass) is disabled regardless of
+	// whether a dev workspace exists to steer to — being deploy-locked is the gate, not dev presence.
+	// Roots with no rules resolve `canDeployRoot` to true, so ordinary families aren't affected. Kept
+	// disabled while either fetch is in flight (both default to the conservative locked state).
+	const rootDisabled = $derived(
+		rootRulesetsResource.loading || rootUserInfoResource.loading || !canDeployRoot
+	)
+
+	// Structural gate: hidden in the admins workspace, or when the user can't fork; on cloud, forking
+	// is premium-only (backend caps it per paid seat). DisableWorkspaceForking on the active workspace
+	// (a locked prod) doesn't apply when there's a dev to fork from instead — the dev isn't locked, and
+	// devOfRoot only resolves when the user is a member of it.
 	const forksGateOpen = $derived(
-		!isCloudHosted() && !isRuleActive('DisableWorkspaceForking') && $workspaceStore !== 'admins'
+		(!isCloudHosted() || $isPremiumStore) &&
+			$workspaceStore !== 'admins' &&
+			(canCreateFork($userStore) || !!devOfRoot)
 	)
 	// A fork is a new workspace, so it's subject to the community-edition cap on
 	// the number of non-'admins' workspaces (backend _check_nb_of_workspaces,
@@ -81,23 +170,36 @@
 	// The interactive create-fork row is shown unless the cap is reached;
 	// otherwise (structural gate open but cap hit) we surface a disabled row
 	// explaining the limit — never stage a fork the backend would reject.
-	const forkAffordanceOpen = $derived(allowCreateFork && forksGateOpen && !!onCreateFork && !!root)
-	const showCreateFork = $derived(forkAffordanceOpen && !ceWorkspaceCapReached)
-	const showForkUpsell = $derived(forkAffordanceOpen && ceWorkspaceCapReached)
+	const forkAffordanceOpen = $derived(
+		allowCreateFork && forksGateOpen && (!!onCreateFork || !!onRequestCreateFork) && !!root
+	)
+	// The upsell (CE workspace cap) only applies to in-place inline creation;
+	// onRequestCreateFork delegates to a flow that enforces its own limits.
+	const showCreateFork = $derived(
+		forkAffordanceOpen && (!ceWorkspaceCapReached || !!onRequestCreateFork)
+	)
+	const showForkUpsell = $derived(
+		forkAffordanceOpen && ceWorkspaceCapReached && !onRequestCreateFork
+	)
 
 	let dropdownOpen = $state(false)
 	let creatingFork = $state(false)
-	let newForkName = $state('')
-	let forkInput: TextInput | undefined = $state(undefined)
+	// Bare fork id, without the wm-fork- prefix. Forks have no separate display
+	// name — the id is the name (it also becomes the git branch).
+	let newForkId = $state('')
+	// The base ("target") a new fork will branch from. Defaults to the root; the user can pick any fork
+	// in the family (via the inline target selector) to create a fork of a fork.
+	let createForkBaseId = $state<string | undefined>(undefined)
 
 	// Manual keyboard navigation, modelled after SelectDropdown. melt's
 	// menu API couples Enter/Space to closing the menu, which we explicitly
 	// don't want for the "Create new fork" row — it swaps to inline input.
 	type NavRow = { kind: 'create' } | { kind: 'root'; id: string } | { kind: 'fork'; id: string }
+	// Visual order: family first, create-fork last — keep in sync with the markup.
 	const navRows = $derived<NavRow[]>([
-		...(showCreateFork ? [{ kind: 'create' as const }] : []),
 		...(root ? [{ kind: 'root' as const, id: root.id }] : []),
-		...forks.map((f) => ({ kind: 'fork' as const, id: f.id }))
+		...forks.map((f) => ({ kind: 'fork' as const, id: f.id })),
+		...(showCreateFork ? [{ kind: 'create' as const }] : [])
 	])
 	let keyArrowPos = $state<number | undefined>(undefined)
 	$effect(() => {
@@ -106,20 +208,34 @@
 
 	function activateRow(row: NavRow) {
 		if (row.kind === 'create') {
-			void enterCreateMode()
-		} else if (row.kind === 'root' || row.kind === 'fork') {
+			requestCreateFork()
+		} else if (row.kind === 'root') {
+			if (!rootDisabled) void pick(row.id)
+		} else if (row.kind === 'fork') {
 			void pick(row.id)
 		}
 	}
 
-	function defaultForkName(): string {
+	// Delegated-create mode (onRequestCreateFork) closes the dropdown and hands
+	// off; inline mode reveals the name input.
+	function requestCreateFork() {
+		if (onRequestCreateFork) {
+			dropdownOpen = false
+			creatingFork = false
+			onRequestCreateFork()
+		} else {
+			void enterCreateMode()
+		}
+	}
+
+	function defaultForkId(): string {
 		const taken = new Set($userWorkspaces.map((w) => w.id))
 		if (pendingFork) taken.add(pendingFork.id)
 		for (let i = 0; i < 50; i++) {
-			const name = `${random_adj()}-fork`
-			if (!taken.has(`${WM_FORK_PREFIX}${name}`)) return name
+			const candidate = random_adj()
+			if (!taken.has(`${WM_FORK_PREFIX}${candidate}`)) return candidate
 		}
-		const base = `${random_adj()}-fork`
+		const base = random_adj()
 		let n = 1
 		while (taken.has(`${WM_FORK_PREFIX}${base}-${n}`)) n++
 		return `${base}-${n}`
@@ -131,50 +247,64 @@
 		await onPick(id)
 	}
 
-	async function enterCreateMode(initialName?: string) {
+	function enterCreateMode(initialId?: string, baseId?: string) {
+		// Default the target to the root; the user can switch to any fork in the family (fork of a fork).
+		createForkBaseId = baseId ?? root?.id
 		creatingFork = true
-		newForkName = initialName ?? defaultForkName()
-		await tick()
-		forkInput?.focus()
-		forkInput?.select()
+		newForkId = initialId ?? defaultForkId()
+		// Focus + select is handled by the input's own autofocus (it mounts with
+		// the create form).
 	}
 
 	function cancelCreate() {
 		creatingFork = false
-		newForkName = ''
+		newForkId = ''
+		serverIdError = undefined
 	}
 
-	function slugForkBaseId(name: string): string {
-		return name
-			.toLowerCase()
-			.replace(/[^a-z0-9-]/g, '-')
-			.replace(/-+/g, '-')
-			.replace(/^-|-$/g, '')
-	}
-
-	const forkNameError = $derived.by<string | undefined>(() => {
-		const trimmed = newForkName.trim()
+	// Mirror the backend's fork validation so a bad id is caught before the create call rather than
+	// failing mid-creation: with the `wm-fork-` prefix the id must stay within 50 chars (a hard
+	// DB/git-branch limit) and only contain slug characters.
+	const clientIdError = $derived.by<string | undefined>(() => {
+		const trimmed = newForkId.trim()
 		if (!trimmed) return undefined
-		const baseId = slugForkBaseId(trimmed)
-		if (!baseId) return 'Name must contain at least one letter or number'
-		const prefixed = `${WM_FORK_PREFIX}${baseId}`
+		if (!/^\w+(-\w+)*$/.test(trimmed))
+			return 'ID can only contain letters, numbers and dashes and must not finish by a dash'
+		const prefixed = `${WM_FORK_PREFIX}${trimmed}`
+		if (prefixed.length > 50) return `ID is too long (max ${50 - WM_FORK_PREFIX.length} characters)`
 		const taken = new Set($userWorkspaces.map((w) => w.id))
 		if (pendingFork) taken.delete(pendingFork.id)
-		if (taken.has(prefixed)) return 'A workspace with this name already exists'
+		if (taken.has(prefixed)) return 'A workspace with this ID already exists'
 		return undefined
 	})
+	// Server-reported reservation (e.g. an archived fork keeps its id, invisible
+	// to the client workspace list). Set at stage time, cleared on edit.
+	let serverIdError = $state<string | undefined>(undefined)
+	const forkIdError = $derived(clientIdError ?? serverIdError)
 
+	let staging = $state(false)
 	async function stageNewFork() {
-		const name = newForkName.trim()
-		if (!root || !name || forkNameError || !onCreateFork) return
-		const baseId = slugForkBaseId(name)
-		if (!baseId) return
-		const prefixed = `${WM_FORK_PREFIX}${baseId}`
+		const bareId = newForkId.trim()
+		if (!createForkBaseId || !bareId || clientIdError || staging || !onCreateFork) return
+		const prefixed = `${WM_FORK_PREFIX}${bareId}`
+		staging = true
+		try {
+			if (await WorkspaceService.existsWorkspace({ requestBody: { id: prefixed } })) {
+				serverIdError = `'${prefixed}' already exists — it may be an archived fork (archiving keeps the id reserved)`
+				return
+			}
+		} catch {
+			// Availability check failed (network/API): fall through — the create
+			// call re-checks server-side anyway.
+		} finally {
+			staging = false
+		}
 		// Close optimistically; consumer can re-open + toast on error.
 		creatingFork = false
-		newForkName = ''
+		newForkId = ''
 		dropdownOpen = false
-		await onCreateFork({ parent_workspace_id: root.id, id: prefixed, name })
+		// The bare id doubles as the display name — forks have no separate name.
+		await onCreateFork({ parent_workspace_id: createForkBaseId, id: prefixed, name: bareId })
 	}
 
 	function isSelected(id: string): boolean {
@@ -183,14 +313,21 @@
 	}
 
 	// Reopening the dropdown while a pending fork is staged drops the user
-	// directly into edit mode so they can refine the name. Avoids re-
+	// directly into edit mode so they can refine the id. Avoids re-
 	// entering edit mode after an explicit cancel.
 	let lastDropdownOpen = $state(false)
 	$effect(() => {
 		const wasOpen = lastDropdownOpen
 		lastDropdownOpen = dropdownOpen
 		if (dropdownOpen && !wasOpen && pendingFork && !creatingFork && showCreateFork) {
-			void enterCreateMode(pendingFork.name)
+			// Preserve the base the fork was staged from; without this the re-entry defaults to the root
+			// and silently re-parents a fork that was staged off another fork.
+			void enterCreateMode(
+				pendingFork.id.startsWith(WM_FORK_PREFIX)
+					? pendingFork.id.slice(WM_FORK_PREFIX.length)
+					: pendingFork.name,
+				pendingFork.parent_workspace_id
+			)
 		}
 	})
 </script>
@@ -222,79 +359,186 @@
 	placement="bottom-start"
 	fixedHeight={false}
 	usePointerDownOutside
+	class={triggerClass}
 >
 	{#snippet buttonReplacement()}
 		{@render trigger({ open: dropdownOpen })}
 	{/snippet}
 	{#snippet menu()}
 		{@const rowBase =
-			'px-3 py-1.5 text-xs text-primary flex flex-row gap-2 items-center text-left rounded-sm w-full'}
+			'px-3 py-1.5 text-xs font-normal text-primary flex flex-row gap-2 items-center text-left rounded-sm w-full'}
 		<div
-			class="bg-surface-tertiary dark:border w-64 origin-top-left rounded-lg shadow-lg focus:outline-none py-1 flex flex-col max-h-80 overflow-y-auto"
+			class="bg-surface-tertiary dark:border w-64 origin-top-left rounded-lg shadow-lg focus:outline-none py-1 flex flex-col max-h-[min(50vh,26rem)]"
 		>
+			<!-- Scrollable rows; the create-fork section and settings footer below stay pinned. -->
+			<div class="flex flex-col overflow-y-auto min-h-0">
+				{#if root}
+					{@const rootIdx = 0}
+					<!-- Rows are <button>s, so the copy affordance lives in a hover-revealed
+					     absolute sibling (nested buttons are invalid HTML). pr-8 reserves its
+					     spot so nothing shifts or gets covered on hover. -->
+					<div class="relative group shrink-0">
+						<button
+							type="button"
+							disabled={rootDisabled}
+							title={rootDisabled
+								? devOfRoot
+									? `${root.name} is locked. Run in its ${devLabelNoun(devOfRoot.dev_workspace_label)} instead.`
+									: `${root.name} is locked for direct deploys.`
+								: undefined}
+							class={`${rowBase} pr-8 ${rootDisabled ? 'opacity-50 cursor-not-allowed' : ''} ${isSelected(root.id) && !pendingFork ? 'bg-surface-selected' : ''} ${!rootDisabled && keyArrowPos === rootIdx ? 'bg-surface-hover' : !rootDisabled ? 'hover:bg-surface-hover' : ''}`}
+							onmouseenter={() => !rootDisabled && (keyArrowPos = rootIdx)}
+							onclick={() => !rootDisabled && void pick(root.id)}
+						>
+							<Building size={14} class="shrink-0 text-tertiary" />
+							<span class="truncate">{root.name}</span>
+							<span class="text-2xs text-tertiary shrink-0 ml-auto"
+								>{rootDisabled ? 'locked' : 'root'}</span
+							>
+							{#if isSelected(root.id) && !pendingFork}
+								<Check size={14} class="shrink-0 text-accent" />
+							{/if}
+						</button>
+						<CopyButton
+							value={root.id}
+							title={`Copy id: ${root.id}`}
+							class="absolute right-1.5 top-1/2 -translate-y-1/2 opacity-0 group-hover:opacity-100 focus-within:opacity-100 transition-opacity"
+						/>
+					</div>
+				{/if}
+				{#each forks as f, fi (f.id)}
+					{@const forkIdx = (root ? 1 : 0) + fi}
+					{@const accentStyle = forkAccentStyle(f.color)}
+					<div class="relative group shrink-0">
+						<button
+							type="button"
+							style={[indentStyle(f.id), accentStyle].filter(Boolean).join('; ')}
+							class={`${rowBase} pr-8 ${isSelected(f.id) ? 'bg-surface-selected' : ''} ${keyArrowPos === forkIdx ? 'bg-surface-hover' : 'hover:bg-surface-hover'}`}
+							onmouseenter={() => (keyArrowPos = forkIdx)}
+							onclick={() => void pick(f.id)}
+						>
+							<GitFork
+								size={14}
+								class={`shrink-0 ${accentStyle ? 'text-[color:var(--fork-accent-text)] dark:text-[color:var(--fork-accent-text-dark)]' : 'text-tertiary'}`}
+							/>
+							<span
+								class={`truncate ${accentStyle ? 'text-[color:var(--fork-accent-text)] dark:text-[color:var(--fork-accent-text-dark)]' : ''}`}
+								>{f.name}</span
+							>
+							{#if f.is_dev_workspace}
+								<Badge
+									color="dark-blue"
+									small
+									class="text-3xs px-1 py-0 dark:bg-surface-accent-primary text-white dark:text-white"
+									>{devBadgeText(f.dev_workspace_label)}</Badge
+								>
+							{/if}
+							{#if isSelected(f.id)}
+								<Check size={14} class="shrink-0 ml-auto text-accent" />
+							{/if}
+						</button>
+						<CopyButton
+							value={f.id}
+							title={`Copy id: ${f.id}`}
+							class="absolute right-1.5 top-1/2 -translate-y-1/2 opacity-0 group-hover:opacity-100 focus-within:opacity-100 transition-opacity"
+						/>
+					</div>
+				{/each}
+				{#if pendingFork && !creatingFork}
+					<div
+						class="px-3 py-1.5 text-xs text-primary flex flex-row gap-2 items-center text-left rounded-sm bg-surface-selected cursor-default"
+					>
+						<GitFork size={14} class="shrink-0 text-tertiary" />
+						<span class="truncate">{pendingFork.name}</span>
+						<span class="text-2xs text-tertiary italic shrink-0 ml-auto">New</span>
+					</div>
+				{/if}
+			</div>
 			{#if showCreateFork}
+				<div class="my-1 border-t border-border-light shrink-0"></div>
 				{#if creatingFork}
-					<div class="flex flex-col gap-1 px-2 py-1.5">
-						<div class="flex flex-row items-center gap-1.5">
-							<Plus size={14} class="shrink-0 text-tertiary" />
-							<!-- svelte-ignore a11y_autofocus -->
-							<TextInput
-								bind:this={forkInput}
-								bind:value={newForkName}
-								size="xs"
-								error={forkNameError}
-								class="flex-1 min-w-0"
-								inputProps={{
-									placeholder: 'Fork name',
-									autofocus: true,
-									'aria-invalid': forkNameError ? 'true' : undefined,
-									onkeydown: (e: KeyboardEvent) => {
-										if (e.key === 'Enter') {
-											e.preventDefault()
-											e.stopPropagation()
-											void stageNewFork()
-										} else if (e.key === 'Escape') {
-											e.preventDefault()
-											e.stopPropagation()
-											cancelCreate()
-										}
+					<!-- Small inline form with labels: fork id + base ("target") workspace. The base
+							     defaults to the root; picking a fork there creates a fork of a fork. -->
+					<div class="flex flex-col gap-2 px-2.5 py-2">
+						<div class="flex flex-col gap-0.5">
+							<span class="text-2xs font-normal text-hint">Fork ID</span>
+							<PrefixedInput
+								prefix={WM_FORK_PREFIX}
+								bind:value={newForkId}
+								placeholder="my-fork"
+								autofocus
+								error={!!forkIdError}
+								class="min-h-7"
+								aria-invalid={forkIdError ? 'true' : undefined}
+								oninput={() => (serverIdError = undefined)}
+								onkeydown={(e: KeyboardEvent) => {
+									if (e.key === 'Enter') {
+										e.preventDefault()
+										e.stopPropagation()
+										void stageNewFork()
+									} else if (e.key === 'Escape') {
+										e.preventDefault()
+										e.stopPropagation()
+										cancelCreate()
 									}
 								}}
 							/>
-							<button
-								type="button"
-								aria-label="Confirm"
-								title="Stage fork"
-								onclick={() => void stageNewFork()}
-								disabled={!newForkName.trim() || !!forkNameError}
-								class="inline-flex items-center justify-center w-5 h-5 rounded text-accent hover:bg-surface-hover disabled:opacity-40 disabled:cursor-not-allowed"
-							>
-								<Check size={14} />
-							</button>
 						</div>
-						{#if forkNameError || createForkCaption}
-							<div class="pl-6">
-								<InputError error={forkNameError} />
-								{#if !forkNameError && createForkCaption}
+						<div class="flex flex-col gap-0.5">
+							<span class="text-2xs font-normal text-hint">Base workspace</span>
+							<Select
+								size="sm"
+								class="w-full"
+								disablePortal
+								placeholder="Base workspace"
+								items={baseItems}
+								bind:value={createForkBaseId}
+							>
+								{#snippet startSnippet({ item })}
+									{@const d = familyDepths.get(item.value) ?? 0}
+									{#if d > 0}
+										<span class="inline-block shrink-0" style="width: {d * 14}px"></span>
+									{/if}
+								{/snippet}
+							</Select>
+						</div>
+						{#if forkIdError || createForkCaption}
+							<div>
+								<InputError error={forkIdError} />
+								{#if !forkIdError && createForkCaption}
 									<span class="text-2xs text-tertiary">{createForkCaption}</span>
 								{/if}
 							</div>
 						{/if}
+						<div class="flex flex-row justify-end items-center gap-1.5 pt-0.5">
+							<Button variant="subtle" unifiedSize="xs" on:click={() => cancelCreate()}>
+								Cancel
+							</Button>
+							<Button
+								variant="accent"
+								unifiedSize="xs"
+								startIcon={{ icon: Check }}
+								disabled={!newForkId.trim() || !!forkIdError || staging}
+								on:click={() => void stageNewFork()}
+							>
+								Set as target
+							</Button>
+						</div>
 					</div>
 				{:else}
-					{@const createIdx = 0}
+					{@const createIdx = (root ? 1 : 0) + forks.length}
 					<button
 						type="button"
 						class={`${rowBase} ${keyArrowPos === createIdx ? 'bg-surface-hover' : 'hover:bg-surface-hover'}`}
 						onmouseenter={() => (keyArrowPos = createIdx)}
-						onclick={() => enterCreateMode()}
+						onclick={() => requestCreateFork()}
 					>
 						<Plus size={14} class="shrink-0 text-tertiary" />
-						<span>Create new fork…</span>
+						<span>{createForkLabel}</span>
 					</button>
 				{/if}
-				<div class="my-1 border-t border-border-light shrink-0"></div>
 			{:else if showForkUpsell}
+				<div class="my-1 border-t border-border-light shrink-0"></div>
 				<div
 					class={`${rowBase} opacity-60 cursor-not-allowed`}
 					aria-disabled="true"
@@ -302,45 +546,21 @@
 						1} workspaces. Archive a workspace or upgrade to an enterprise license to create more forks."
 				>
 					<Plus size={14} class="shrink-0 text-tertiary" />
-					<span>Create new fork…</span>
+					<span>{createForkLabel}</span>
 					<span class="ml-auto shrink-0 text-2xs text-tertiary"> Workspace limit reached </span>
 				</div>
+			{/if}
+			{#if settingsHref}
+				<!-- Pinned footer: stays visible while the fork list above scrolls. -->
 				<div class="my-1 border-t border-border-light shrink-0"></div>
-			{/if}
-
-			{#if root}
-				{@const rootIdx = showCreateFork ? 1 : 0}
-				<button
-					type="button"
-					class={`${rowBase} ${isSelected(root.id) && !pendingFork ? 'bg-surface-selected' : ''} ${keyArrowPos === rootIdx ? 'bg-surface-hover' : 'hover:bg-surface-hover'}`}
-					onmouseenter={() => (keyArrowPos = rootIdx)}
-					onclick={() => void pick(root.id)}
+				<a
+					href={settingsHref}
+					onclick={() => (dropdownOpen = false)}
+					class={`${rowBase} shrink-0 hover:bg-surface-hover`}
 				>
-					<Building size={14} class="shrink-0 text-tertiary" />
-					<span class="truncate">{root.name}</span>
-					<span class="text-2xs text-tertiary shrink-0 ml-auto">root</span>
-				</button>
-			{/if}
-			{#each forks as f, fi (f.id)}
-				{@const forkIdx = (showCreateFork ? 1 : 0) + (root ? 1 : 0) + fi}
-				<button
-					type="button"
-					class={`${rowBase} ${isSelected(f.id) ? 'bg-surface-selected' : ''} ${keyArrowPos === forkIdx ? 'bg-surface-hover' : 'hover:bg-surface-hover'}`}
-					onmouseenter={() => (keyArrowPos = forkIdx)}
-					onclick={() => void pick(f.id)}
-				>
-					<GitFork size={14} class="shrink-0 text-tertiary" />
-					<span class="truncate">{f.name}</span>
-				</button>
-			{/each}
-			{#if pendingFork && !creatingFork}
-				<div
-					class="px-3 py-1.5 text-xs text-primary flex flex-row gap-2 items-center text-left rounded-sm bg-surface-selected cursor-default"
-				>
-					<GitFork size={14} class="shrink-0 text-tertiary" />
-					<span class="truncate">{pendingFork.name}</span>
-					<span class="text-2xs text-tertiary italic shrink-0 ml-auto">New</span>
-				</div>
+					<Settings size={14} class="shrink-0 text-tertiary" />
+					<span class="truncate">{settingsLabel ?? 'Workspace settings'}</span>
+				</a>
 			{/if}
 		</div>
 	{/snippet}
diff --git a/frontend/src/lib/components/sessions/appDraftCodec.ts b/frontend/src/lib/components/sessions/appDraftCodec.ts
index 5f870be92d..10752b8d8f 100644
--- a/frontend/src/lib/components/sessions/appDraftCodec.ts
+++ b/frontend/src/lib/components/sessions/appDraftCodec.ts
@@ -18,9 +18,9 @@ export type RawAppDraft = {
 	draft_path?: string
 }
 
-// The shape `runtime.rawApp.val` actually holds (see SessionRuntime in
-// sessionRuntime.svelte.ts). Adds `path` (a key, not a draft field) and
-// makes `policy` required for the editor's live binding.
+// The shape a raw-app cell's store (`RawAppRuntimeValue` in
+// sessionRuntime.svelte.ts) actually holds. Adds `path` (a key, not a draft
+// field) and makes `policy` required for the editor's live binding.
 export type RuntimeRawApp = {
 	summary: string
 	path: string
diff --git a/frontend/src/lib/components/sessions/diffTree.test.ts b/frontend/src/lib/components/sessions/diffTree.test.ts
new file mode 100644
index 0000000000..44f1cb9ca5
--- /dev/null
+++ b/frontend/src/lib/components/sessions/diffTree.test.ts
@@ -0,0 +1,165 @@
+import { describe, it, expect } from 'vitest'
+import { buildDiffTree, type AppRootMeta, type DiffTreeItem, type NavEntry } from './diffTree'
+
+// A diff item identified by its storage `key` but placed in the tree by its
+// friendly `structurePath` — mirroring how the drawer feeds raw-app files.
+function item(key: string, structurePath: string): DiffTreeItem<string> {
+	return { key, structurePath, data: key }
+}
+
+const noApps = new Map<string, AppRootMeta>()
+const allOpen = () => true
+
+function orderKeys(model: ReturnType<typeof buildDiffTree<string>>, isOpen = allOpen) {
+	return model.order(isOpen).map((e) => e.key)
+}
+
+describe('buildDiffTree — structure', () => {
+	it('groups items by their 2-segment scope', () => {
+		const t = buildDiffTree([item('a', 'u/admin/foo'), item('b', 'u/admin/bar')], noApps)
+		expect(t.root.children).toHaveLength(1)
+		const scope = t.root.children[0]
+		expect(scope.type).toBe('folder')
+		if (scope.type !== 'folder') return
+		expect(scope.fullPath).toBe('u/admin')
+		expect(scope.isScope).toBe(true)
+		expect(scope.children.map((c) => c.type)).toEqual(['file', 'file'])
+	})
+
+	it('nests deeper segments as folders and sorts folders-first then alphabetically', () => {
+		const t = buildDiffTree(
+			[item('z', 'u/admin/zeta'), item('a', 'u/admin/alpha'), item('s', 'u/admin/sub/leaf')],
+			noApps
+		)
+		const scope = t.root.children[0]
+		if (scope.type !== 'folder') throw new Error('expected scope folder')
+		// folder ('sub') before files, files alphabetical
+		expect(scope.children.map((c) => `${c.type}:${c.name}`)).toEqual([
+			'folder:sub',
+			'file:alpha',
+			'file:zeta'
+		])
+	})
+
+	it('keeps a single-segment item at the root with no scope', () => {
+		const t = buildDiffTree([item('orphan', 'orphan')], noApps)
+		expect(t.root.children).toHaveLength(1)
+		expect(t.root.children[0]).toMatchObject({ type: 'file', name: 'orphan', key: 'orphan' })
+	})
+
+	it('app roots sort as items among leaves — same position before and after unwrap', () => {
+		const apps = new Map<string, AppRootMeta>([['u/admin/beta_app', { summaryKey: 'raw_app/b' }]])
+		// Unloaded: the app is a plain leaf between alpha and zeta.
+		const before = buildDiffTree(
+			[
+				item('a', 'u/admin/alpha'),
+				item('raw_app/b', 'u/admin/beta_app'),
+				item('z', 'u/admin/zeta')
+			],
+			apps
+		)
+		const scopeBefore = before.root.children[0]
+		if (scopeBefore.type !== 'folder') throw new Error('expected scope')
+		expect(scopeBefore.children.map((c) => `${c.type}:${c.name}`)).toEqual([
+			'file:alpha',
+			'file:beta_app',
+			'file:zeta'
+		])
+		// Loaded: the leaf is replaced by the app-root folder — same position,
+		// not hoisted to the folder group.
+		const after = buildDiffTree(
+			[
+				item('a', 'u/admin/alpha'),
+				item('f', 'u/admin/beta_app/App.tsx'),
+				item('z', 'u/admin/zeta')
+			],
+			apps
+		)
+		const scopeAfter = after.root.children[0]
+		if (scopeAfter.type !== 'folder') throw new Error('expected scope')
+		expect(scopeAfter.children.map((c) => `${c.type}:${c.name}`)).toEqual([
+			'file:alpha',
+			'folder:beta_app',
+			'file:zeta'
+		])
+	})
+
+	it('tags the folder matching an app root and leaves others untagged', () => {
+		const apps = new Map<string, AppRootMeta>([
+			['u/admin/my_app', { summaryKey: 'raw_app/x', summary: 'My app' }]
+		])
+		const t = buildDiffTree(
+			[item('f1', 'u/admin/my_app/App.tsx'), item('f2', 'u/admin/other/x.ts')],
+			apps
+		)
+		const scope = t.root.children[0]
+		if (scope.type !== 'folder') throw new Error('expected scope')
+		const myApp = scope.children.find((c) => c.type === 'folder' && c.fullPath === 'u/admin/my_app')
+		const other = scope.children.find((c) => c.type === 'folder' && c.fullPath === 'u/admin/other')
+		expect(myApp && myApp.type === 'folder' && myApp.app?.summary).toBe('My app')
+		expect(other && other.type === 'folder' && other.app).toBeUndefined()
+	})
+})
+
+describe('buildDiffTree — order(isOpen)', () => {
+	const t = buildDiffTree(
+		[item('a', 'u/admin/app/App.tsx'), item('b', 'u/admin/app/index.css')],
+		new Map([['u/admin/app', { summaryKey: 'raw_app/app' }]])
+	)
+
+	it('lists scope → app folder → files when everything is open', () => {
+		expect(orderKeys(t)).toEqual(['folder:u/admin', 'folder:u/admin/app', 'a', 'b'])
+	})
+
+	it('hides a folder’s children when it is collapsed', () => {
+		const closedApp = (key: string) => key !== 'folder:u/admin/app'
+		expect(orderKeys(t, closedApp)).toEqual(['folder:u/admin', 'folder:u/admin/app'])
+	})
+})
+
+describe('buildDiffTree — parentKeyOf (ArrowLeft)', () => {
+	// The regression that shipped: a raw-app file keyed on its STORAGE path
+	// (`…/draft_<uuid>/…`) but placed by its FRIENDLY path. The parent must be the
+	// friendly folder it actually nests under — not anything derived from the key.
+	it('returns the friendly parent folder for a storage-keyed file', () => {
+		const t = buildDiffTree(
+			[item('raw_app_file/u/admin/draft_x/App.tsx', 'u/admin/my_app/App.tsx')],
+			noApps
+		)
+		expect(t.parentKeyOf('raw_app_file/u/admin/draft_x/App.tsx')).toBe('folder:u/admin/my_app')
+	})
+
+	it('returns the immediate folder for a deeper file', () => {
+		const t = buildDiffTree([item('k', 'u/admin/app/runnables/a')], noApps)
+		expect(t.parentKeyOf('k')).toBe('folder:u/admin/app/runnables')
+		expect(t.parentKeyOf('folder:u/admin/app/runnables')).toBe('folder:u/admin/app')
+	})
+
+	it('returns the scope folder for a file directly under it', () => {
+		const t = buildDiffTree([item('k', 'u/alice/script')], noApps)
+		expect(t.parentKeyOf('k')).toBe('folder:u/alice')
+	})
+
+	it('returns undefined for a scope folder and a root-level leaf', () => {
+		const t = buildDiffTree([item('k', 'u/admin/app/App.tsx'), item('o', 'orphan')], noApps)
+		expect(t.parentKeyOf('folder:u/admin')).toBeUndefined()
+		expect(t.parentKeyOf('o')).toBeUndefined()
+	})
+})
+
+describe('buildDiffTree — firstChildKeyOf (ArrowRight)', () => {
+	it('returns the first child key (folders sort first)', () => {
+		const t = buildDiffTree(
+			[item('file', 'u/admin/app/App.tsx'), item('run', 'u/admin/app/runnables/a')],
+			noApps
+		)
+		// 'runnables' folder sorts before the 'App.tsx' file
+		expect(t.firstChildKeyOf('folder:u/admin/app')).toBe('folder:u/admin/app/runnables')
+		expect(t.firstChildKeyOf('folder:u/admin/app/runnables')).toBe('run')
+	})
+
+	it('returns undefined for an unknown or empty folder', () => {
+		const t = buildDiffTree([item('k', 'u/admin/app/App.tsx')], noApps)
+		expect(t.firstChildKeyOf('folder:does/not/exist')).toBeUndefined()
+	})
+})
diff --git a/frontend/src/lib/components/sessions/diffTree.ts b/frontend/src/lib/components/sessions/diffTree.ts
new file mode 100644
index 0000000000..a91d2c1d90
--- /dev/null
+++ b/frontend/src/lib/components/sessions/diffTree.ts
@@ -0,0 +1,173 @@
+// Pure file-tree model for the diff drawer (WorkspaceDiffDrawer).
+//
+// Turns a flat list of diff items into a navigable folder tree and answers the
+// keyboard-navigation queries the drawer needs (visible order, parent, first
+// child). It is generic over the leaf payload `T` on purpose: the drawer's
+// `DiffRow` type lives in WorkspaceDiffDrawer, which its two adapters import —
+// importing it here would make a cycle.
+//
+// Items are grouped by "scope" (the first two path segments, e.g. `f/foo` or
+// `u/alice`); deeper segments become nested folders. Folder keys are
+// `folder:<fullPath>`. The crucial invariant: every structural answer
+// (parent/first-child/order) comes from the tree as it was *built*, never from
+// re-splitting a path at the call site — so a node's tree position and its
+// navigation parent can never drift apart.
+//
+// Two path spaces meet here. `structurePath` decides tree placement (it's the
+// friendly path, so a never-deployed draft nests under `u/me/my_app` rather
+// than `u/me/draft_<uuid>`); `key` is the caller's stable identity (the storage
+// key — used for the load cache, the row id and `data-nav-key`). Structure code
+// only ever reads `structurePath`; it carries `key` through opaquely.
+
+export type DiffTreeItem<T> = {
+	/** Stable identity (storage key). Becomes the file node's key + nav key. */
+	key: string
+	/** Friendly path that decides where the item sits in the tree. */
+	structurePath: string
+	data: T
+}
+
+/** Marks a folder as a raw app's root so the drawer renders its header as the
+ * raw-app row instead of a plain folder. Keyed by the app's friendly path. */
+export type AppRootMeta = {
+	summaryKey: string
+	summary?: string
+	hasDraft?: boolean
+	draftOnly?: boolean
+	draftUsers?: { username?: string | null }[]
+	draftItemKind?: import('$lib/gen').UserDraftItemKind
+}
+
+export type FolderNode<T> = {
+	type: 'folder'
+	name: string
+	fullPath: string
+	isScope: boolean
+	key: string
+	children: TreeNode<T>[]
+	app?: AppRootMeta
+}
+export type FileNode<T> = { type: 'file'; name: string; key: string; data: T }
+export type TreeNode<T> = FolderNode<T> | FileNode<T>
+
+export type NavEntry<T> =
+	| { type: 'folder'; key: string; node: FolderNode<T> }
+	| { type: 'file'; key: string; data: T }
+
+export type DiffTreeModel<T> = {
+	root: FolderNode<T>
+	/** Visible entries top-to-bottom, honoring the caller's fold state. */
+	order(isOpen: (key: string) => boolean): NavEntry<T>[]
+	/** Folder key containing `key`, or undefined at the top (no parent folder). */
+	parentKeyOf(key: string): string | undefined
+	/** Key of a folder's first child (ArrowRight target), or undefined if empty. */
+	firstChildKeyOf(folderKey: string): string | undefined
+}
+
+export function folderKeyFor(fullPath: string): string {
+	return `folder:${fullPath}`
+}
+
+export function buildDiffTree<T>(
+	items: DiffTreeItem<T>[],
+	appMeta: Map<string, AppRootMeta>
+): DiffTreeModel<T> {
+	const root: FolderNode<T> = {
+		type: 'folder',
+		name: '',
+		fullPath: '',
+		isScope: false,
+		key: folderKeyFor(''),
+		children: []
+	}
+	const folderCache = new Map<string, FolderNode<T>>()
+	const nodeByKey = new Map<string, FolderNode<T>>()
+	// child key → parent folder key. Direct children of `root` are intentionally
+	// absent (they have no navigable parent), so parentKeyOf returns undefined
+	// for scope folders and root-level leaves — matching ArrowLeft's old behavior.
+	const parentByKey = new Map<string, string>()
+
+	function getFolder(parent: FolderNode<T>, fullPath: string, name: string, isScope: boolean) {
+		let f = folderCache.get(fullPath)
+		if (!f) {
+			f = { type: 'folder', name, fullPath, isScope, key: folderKeyFor(fullPath), children: [] }
+			folderCache.set(fullPath, f)
+			nodeByKey.set(f.key, f)
+			parent.children.push(f)
+			if (parent !== root) parentByKey.set(f.key, parent.key)
+		}
+		return f
+	}
+
+	function addFile(parent: FolderNode<T>, name: string, it: DiffTreeItem<T>) {
+		parent.children.push({ type: 'file', name, key: it.key, data: it.data })
+		if (parent !== root) parentByKey.set(it.key, parent.key)
+	}
+
+	for (const it of items) {
+		const parts = it.structurePath.split('/')
+		if (parts.length < 2) {
+			addFile(root, it.structurePath, it)
+			continue
+		}
+		const scopeKey = parts.slice(0, 2).join('/')
+		const scope = getFolder(root, scopeKey, scopeKey, true)
+		if (parts.length === 2) {
+			addFile(scope, parts[1], it)
+			continue
+		}
+		const rest = parts.slice(2)
+		let parent = scope
+		let fkey = scopeKey
+		for (let i = 0; i < rest.length - 1; i++) {
+			fkey = `${fkey}/${rest[i]}`
+			parent = getFolder(parent, fkey, rest[i], false)
+		}
+		addFile(parent, rest[rest.length - 1], it)
+	}
+
+	// Tag the folder matching each raw app's friendly path as its app root.
+	// Must happen before sorting: app roots sort as items, not as folders.
+	for (const [fp, meta] of appMeta) {
+		const f = folderCache.get(fp)
+		if (f) f.app = meta
+	}
+
+	// Path folders group first; everything item-like — leaves AND app roots —
+	// sorts together by name, so a raw app keeps its position when expanding
+	// turns its leaf row into an app-root folder.
+	const isGrouping = (n: TreeNode<T>) => n.type === 'folder' && !n.app
+	const sortRec = (n: FolderNode<T>) => {
+		n.children.sort((a, b) => {
+			const ga = isGrouping(a) ? 0 : 1
+			const gb = isGrouping(b) ? 0 : 1
+			if (ga !== gb) return ga - gb
+			return a.name.localeCompare(b.name)
+		})
+		for (const c of n.children) if (c.type === 'folder') sortRec(c)
+	}
+	sortRec(root)
+
+	return {
+		root,
+		order(isOpen) {
+			const out: NavEntry<T>[] = []
+			const walk = (n: TreeNode<T>) => {
+				if (n.type === 'file') {
+					out.push({ type: 'file', key: n.key, data: n.data })
+					return
+				}
+				out.push({ type: 'folder', key: n.key, node: n })
+				if (isOpen(n.key)) for (const c of n.children) walk(c)
+			}
+			for (const c of root.children) walk(c)
+			return out
+		},
+		parentKeyOf(key) {
+			return parentByKey.get(key)
+		},
+		firstChildKeyOf(folderKey) {
+			return nodeByKey.get(folderKey)?.children[0]?.key
+		}
+	}
+}
diff --git a/frontend/src/lib/components/sessions/forkDiffCache.test.ts b/frontend/src/lib/components/sessions/forkDiffCache.test.ts
index 2d38320a6a..9b5bc6d9d5 100644
--- a/frontend/src/lib/components/sessions/forkDiffCache.test.ts
+++ b/frontend/src/lib/components/sessions/forkDiffCache.test.ts
@@ -1,15 +1,15 @@
 import { describe, it, expect } from 'vitest'
 
-// Documents the cache-invalidation contract that ForkDiffDrawer.fetchComparison
-// relies on. The bug (cubic P2): per-item raw diffs (`loadedDiffs[key]`) and
-// per-item `summaries` are component-local $state that persist for the
-// drawer's lifetime. fetchComparison re-fetches the comparison on every
-// open(), but loadDiffFor short-circuits on `loadedDiffs[key]` — so an
-// edit-then-reopen would show fresh counts but the prior open's cached
-// expanded raw content. The fix clears both records at the top of
-// fetchComparison before the await. This test pins the contract from the
-// outside: nothing is allowed to read a stale per-item value across a
-// fetchComparison invocation.
+// Documents the cache-invalidation contract behind the session fork diff. The
+// bug (cubic P2): per-item raw diffs (`loadedDiffs[key]`) and per-item
+// `summaries` are component-local $state in WorkspaceDiffDrawer that persist for
+// the drawer's lifetime. The comparison is re-fetched on every open(), but
+// loadDiffFor short-circuits on `loadedDiffs[key]` — so an edit-then-reopen
+// would show fresh counts but the prior open's cached expanded raw content. The
+// fix clears both records on open() (and, for an in-place data-source swap like
+// the draft↔fork toggle, on a `resetKey` change). This test pins the contract
+// from the outside: nothing is allowed to read a stale per-item value across a
+// re-fetch.
 
 type LoadedDiff = { state: 'ready'; parentRaw: string; forkRaw: string }
 
diff --git a/frontend/src/lib/components/sessions/forkDiffNav.test.ts b/frontend/src/lib/components/sessions/forkDiffNav.test.ts
deleted file mode 100644
index 3266ffaa9f..0000000000
--- a/frontend/src/lib/components/sessions/forkDiffNav.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { parentFolderKey } from './forkDiffNav'
-
-describe('parentFolderKey', () => {
-	describe('folders', () => {
-		it('a scope folder (2 segments) has no parent', () => {
-			expect(parentFolderKey('folder', 'f/foo')).toBeUndefined()
-			expect(parentFolderKey('folder', 'u/alice')).toBeUndefined()
-		})
-		it('a nested folder belongs to its parent folder', () => {
-			expect(parentFolderKey('folder', 'f/foo/sub')).toBe('folder:f/foo')
-			expect(parentFolderKey('folder', 'f/foo/sub/deep')).toBe('folder:f/foo/sub')
-		})
-	})
-
-	describe('files', () => {
-		it('a single-segment leaf has no scope folder', () => {
-			expect(parentFolderKey('file', 'orphan')).toBeUndefined()
-		})
-		it('a 2-segment file maps to its scope folder (the cubic fix)', () => {
-			// Regression: previously returned `folder:f` (nonexistent) → ArrowLeft broke.
-			expect(parentFolderKey('file', 'f/foo')).toBe('folder:f/foo')
-		})
-		it('a 3-segment file (directly under scope) maps to the scope folder', () => {
-			expect(parentFolderKey('file', 'f/foo/bar')).toBe('folder:f/foo')
-			expect(parentFolderKey('file', 'u/alice/script')).toBe('folder:u/alice')
-		})
-		it('a deeper file belongs to its immediate folder', () => {
-			expect(parentFolderKey('file', 'f/foo/sub/bar')).toBe('folder:f/foo/sub')
-		})
-	})
-})
diff --git a/frontend/src/lib/components/sessions/forkDiffNav.ts b/frontend/src/lib/components/sessions/forkDiffNav.ts
deleted file mode 100644
index 6dfe829cf3..0000000000
--- a/frontend/src/lib/components/sessions/forkDiffNav.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Keyboard-navigation helpers for the fork-diff tree (ForkDiffDrawer).
-//
-// The tree groups diffs by "scope" (the first two path segments, e.g. `f/foo`
-// or `u/alice`); deeper segments become nested folders. Folder keys are
-// `folder:<fullPath>`. See ForkDiffDrawer's tree builder.
-
-/**
- * The folder key that contains an entry (for ArrowLeft "go to parent"), or
- * `undefined` when the entry sits at the top with no parent folder.
- *
- * - A scope folder (≤2 segments) has no parent.
- * - A single-segment file leaf sits at the tree root with no scope folder.
- * - A file directly at its scope (`f/foo` or `f/foo/bar`) belongs to the scope
- *   folder = first two segments (`folder:f/foo`).
- * - Anything deeper belongs to its immediate folder.
- */
-export function parentFolderKey(kind: 'folder' | 'file', path: string): string | undefined {
-	const parts = path.split('/')
-	if (kind === 'folder' && parts.length <= 2) return undefined
-	if (kind === 'file') {
-		if (parts.length < 2) return undefined
-		if (parts.length <= 3) return `folder:${parts.slice(0, 2).join('/')}`
-	}
-	return `folder:${parts.slice(0, -1).join('/')}`
-}
diff --git a/frontend/src/lib/components/sessions/modifiedItemsMask.test.ts b/frontend/src/lib/components/sessions/modifiedItemsMask.test.ts
new file mode 100644
index 0000000000..b66b83b2f1
--- /dev/null
+++ b/frontend/src/lib/components/sessions/modifiedItemsMask.test.ts
@@ -0,0 +1,66 @@
+import { describe, it, expect } from 'vitest'
+import { maskKey, forkDiffKindToUserDraftKind, diffInMask } from './modifiedItemsMask'
+import type { WorkspaceItemDiff } from '$lib/gen'
+
+// The fork-diff → user-draft kind bridge must stay the inverse of
+// CompareDrafts.toLayoutKind (different taxonomies: `http_trigger` vs
+// `trigger_http`, `schedule` vs `trigger_schedule`). A drift here silently breaks
+// the chat-scoped mask join, so pin the table.
+
+describe('maskKey', () => {
+	it('joins kind and path with a colon', () => {
+		expect(maskKey('script', 'u/admin/foo')).toBe('script:u/admin/foo')
+		expect(maskKey('raw_app', 'f/bar/app')).toBe('raw_app:f/bar/app')
+	})
+})
+
+describe('forkDiffKindToUserDraftKind', () => {
+	it('maps trigger/schedule/app fork-diff kinds to their user-draft kind', () => {
+		const cases: Array<[WorkspaceItemDiff['kind'], string]> = [
+			['schedule', 'trigger_schedule'],
+			['http_trigger', 'trigger_http'],
+			['websocket_trigger', 'trigger_websocket'],
+			['kafka_trigger', 'trigger_kafka'],
+			['nats_trigger', 'trigger_nats'],
+			['postgres_trigger', 'trigger_postgres'],
+			['mqtt_trigger', 'trigger_mqtt'],
+			['sqs_trigger', 'trigger_sqs'],
+			['gcp_trigger', 'trigger_gcp'],
+			['azure_trigger', 'trigger_azure'],
+			['email_trigger', 'trigger_default_email'],
+			['app', 'raw_app']
+		]
+		for (const [forkKind, expected] of cases) {
+			expect(forkDiffKindToUserDraftKind(forkKind)).toBe(expected)
+		}
+	})
+
+	it('passes identity kinds through unchanged', () => {
+		for (const k of ['script', 'flow', 'raw_app', 'resource', 'variable'] as const) {
+			expect(forkDiffKindToUserDraftKind(k)).toBe(k)
+		}
+	})
+
+	it('returns undefined for kinds with no user-draft equivalent', () => {
+		expect(forkDiffKindToUserDraftKind('resource_type')).toBeUndefined()
+		expect(forkDiffKindToUserDraftKind('folder')).toBeUndefined()
+	})
+})
+
+describe('diffInMask', () => {
+	const diff = (kind: WorkspaceItemDiff['kind'], path: string): WorkspaceItemDiff =>
+		({ kind, path }) as WorkspaceItemDiff
+
+	it('matches a fork diff against the mask via the bridged kind', () => {
+		const mask = new Set(['trigger_http:f/foo/route', 'script:u/me/s'])
+		expect(diffInMask(diff('http_trigger', 'f/foo/route'), mask)).toBe(true)
+		expect(diffInMask(diff('script', 'u/me/s'), mask)).toBe(true)
+	})
+
+	it('does not match when path or kind differ, or kind has no equivalent', () => {
+		const mask = new Set(['trigger_http:f/foo/route'])
+		expect(diffInMask(diff('http_trigger', 'f/other/route'), mask)).toBe(false)
+		expect(diffInMask(diff('script', 'f/foo/route'), mask)).toBe(false)
+		expect(diffInMask(diff('folder', 'f/foo/route'), mask)).toBe(false)
+	})
+})
diff --git a/frontend/src/lib/components/sessions/modifiedItemsMask.ts b/frontend/src/lib/components/sessions/modifiedItemsMask.ts
new file mode 100644
index 0000000000..14ab16a653
--- /dev/null
+++ b/frontend/src/lib/components/sessions/modifiedItemsMask.ts
@@ -0,0 +1,52 @@
+import type { UserDraftItemKind, WorkspaceItemDiff } from '$lib/gen'
+
+// The "modified items mask" tracks which workspace items an AI chat touched via
+// tool calls. Each key is `${UserDraftItemKind}:${storagePath}`. UserDraftItemKind
+// is canonical because it is what `itemKindFor`/`persistGlobalDraft` emit at capture
+// time and what `DraftItem.kind` (GET /drafts/list) already uses — so the mask joins
+// directly against the draft list. The fork comparison (`compareWorkspaces`) uses a
+// DIFFERENT kind taxonomy (`http_trigger` vs `trigger_http`, `schedule` vs
+// `trigger_schedule`), so `forkDiffKindToUserDraftKind` bridges the two.
+
+export function maskKey(kind: UserDraftItemKind, path: string): string {
+	return `${kind}:${path}`
+}
+
+type ForkDiffKind = WorkspaceItemDiff['kind']
+
+// Inverse of the draft→layout naming used in CompareDrafts.toLayoutKind. Only the
+// non-identity cases need an entry; everything else falls through to identity.
+// `resource_type`/`folder` have no UserDraftItemKind (never AI-authored) → undefined.
+const FORK_DIFF_KIND_TO_USER_DRAFT_KIND: Partial<Record<ForkDiffKind, UserDraftItemKind>> = {
+	schedule: 'trigger_schedule',
+	http_trigger: 'trigger_http',
+	websocket_trigger: 'trigger_websocket',
+	kafka_trigger: 'trigger_kafka',
+	nats_trigger: 'trigger_nats',
+	postgres_trigger: 'trigger_postgres',
+	mqtt_trigger: 'trigger_mqtt',
+	sqs_trigger: 'trigger_sqs',
+	gcp_trigger: 'trigger_gcp',
+	azure_trigger: 'trigger_azure',
+	email_trigger: 'trigger_default_email',
+	app: 'raw_app'
+}
+
+const IDENTITY_FORK_DIFF_KINDS = new Set<ForkDiffKind>([
+	'script',
+	'flow',
+	'raw_app',
+	'resource',
+	'variable'
+])
+
+export function forkDiffKindToUserDraftKind(kind: ForkDiffKind): UserDraftItemKind | undefined {
+	if (IDENTITY_FORK_DIFF_KINDS.has(kind)) return kind as UserDraftItemKind
+	return FORK_DIFF_KIND_TO_USER_DRAFT_KIND[kind]
+}
+
+// True when a fork-comparison diff names an item present in the chat-modified mask.
+export function diffInMask(diff: WorkspaceItemDiff, mask: Set<string>): boolean {
+	const kind = forkDiffKindToUserDraftKind(diff.kind)
+	return kind !== undefined && mask.has(maskKey(kind, diff.path))
+}
diff --git a/frontend/src/lib/components/sessions/previewReload.test.ts b/frontend/src/lib/components/sessions/previewReload.test.ts
new file mode 100644
index 0000000000..de11805b9a
--- /dev/null
+++ b/frontend/src/lib/components/sessions/previewReload.test.ts
@@ -0,0 +1,87 @@
+import { describe, it, expect } from 'vitest'
+import { toolReloadEffect, tabsToReload } from './previewReload'
+import type { SessionPreviewTab } from './sessionState.svelte'
+
+describe('toolReloadEffect', () => {
+	it('maps a non-item mutation to its own list page only', () => {
+		expect(toolReloadEffect('write_schedule', { path: 'u/me/s' }).pages).toEqual(['/schedules'])
+		expect(toolReloadEffect('write_resource', {}).pages).toEqual(['/resources'])
+		expect(toolReloadEffect('write_variable', {}).pages).toEqual(['/variables'])
+		expect(toolReloadEffect('create_folder', { name: 'f' }).pages).toEqual(['/folders'])
+	})
+
+	it('maps a trigger write to its kind-specific page', () => {
+		expect(toolReloadEffect('write_trigger', { kind: 'kafka' }).pages).toEqual(['/kafka_triggers'])
+		expect(toolReloadEffect('write_trigger', { kind: 'http' }).pages).toEqual(['/routes'])
+	})
+
+	it('maps a generic item tool to the page for its type', () => {
+		expect(toolReloadEffect('deploy_workspace_item', { type: 'schedule' }).pages).toEqual([
+			'/schedules'
+		])
+		expect(toolReloadEffect('delete_workspace_item', { type: 'resource' }).pages).toEqual([
+			'/resources'
+		])
+		expect(
+			toolReloadEffect('discard_local_draft', { type: 'trigger', trigger_kind: 'nats' }).pages
+		).toEqual(['/nats_triggers'])
+	})
+
+	it('reloads no page for item-editor kinds (they self-sync via their live editor)', () => {
+		for (const type of ['script', 'flow', 'app']) {
+			expect(toolReloadEffect('deploy_workspace_item', { type }).pages).toEqual([])
+		}
+		for (const name of [
+			'write_script',
+			'edit_script',
+			'write_flow',
+			'init_app',
+			'write_app_file'
+		]) {
+			expect(toolReloadEffect(name, { path: 'u/me/x' }).pages).toEqual([])
+		}
+	})
+
+	it('reloads nothing for a purely local or unknown tool (the silent-stale guard)', () => {
+		expect(toolReloadEffect('update_user_instructions', {}).pages).toEqual([])
+		expect(toolReloadEffect('some_future_tool', { path: 'p' }).pages).toEqual([])
+	})
+
+	it('reloads nothing for a trigger of unknown kind rather than guessing', () => {
+		expect(toolReloadEffect('write_trigger', { kind: 'not_a_kind' }).pages).toEqual([])
+	})
+})
+
+describe('tabsToReload', () => {
+	const scheduleTab: SessionPreviewTab = { id: 's', url: '/schedules', loc: '/schedules' }
+	const resourceTab: SessionPreviewTab = { id: 'r', url: '/resources', loc: '/resources' }
+	const scriptTab: SessionPreviewTab = {
+		id: 'sc',
+		url: '/scripts/edit/f/foo/bar',
+		loc: '/scripts/edit/f/foo/bar'
+	}
+	const pipelineTab: SessionPreviewTab = { id: 'p', url: '/pipeline/crm', loc: '/pipeline/crm' }
+	const tabs = [scheduleTab, resourceTab, scriptTab, pipelineTab]
+
+	it('returns only the tabs whose page is in the set', () => {
+		expect(tabsToReload(tabs, new Set(['/schedules']))).toEqual([scheduleTab])
+	})
+
+	it('returns list-page tabs but never item-editor or pipeline tabs', () => {
+		// toolReloadEffect only ever emits list-page paths, so item/pipeline route
+		// paths are never in `pages` — those tabs self-sync and stay put.
+		expect(tabsToReload(tabs, new Set(['/schedules', '/resources']))).toEqual([
+			scheduleTab,
+			resourceTab
+		])
+	})
+
+	it('is empty when no pages were touched', () => {
+		expect(tabsToReload(tabs, new Set())).toEqual([])
+	})
+
+	it('matches on the observed loc (with query/hash stripped) over the seeded url', () => {
+		const navigated: SessionPreviewTab = { id: 'n', url: '/runs', loc: '/schedules?workspace=w' }
+		expect(tabsToReload([navigated], new Set(['/schedules']))).toEqual([navigated])
+	})
+})
diff --git a/frontend/src/lib/components/sessions/previewReload.ts b/frontend/src/lib/components/sessions/previewReload.ts
new file mode 100644
index 0000000000..82a87285e1
--- /dev/null
+++ b/frontend/src/lib/components/sessions/previewReload.ts
@@ -0,0 +1,75 @@
+import type { SessionPreviewTab } from './sessionState.svelte'
+import { stripBase, TRIGGER_PAGES, type TriggerKind } from './previewRouter'
+
+// Which list pages a completed chat tool can change, as base-stripped paths
+// (e.g. `/schedules`). This allowlist is the single source of truth for "does
+// this tool change a list page a preview tab might show". A new mutating tool
+// that surfaces on one of these pages must be added here or that tab silently
+// goes stale — match by exact tool name, never a name regex, which mis-classifies
+// purely-local tools (e.g. `update_user_instructions`) as page mutations.
+//
+// Item-editor writes (write_script / write_flow / init_app / write_app_*) are
+// deliberately absent: every editable item is a live in-process editor that
+// self-syncs from the store the chat mutates, so its tab needs no reload — and
+// no list page we preview lists open drafts. They fall through to NO_RELOAD.
+// This "live editors self-sync, only list pages reload" invariant is the reason
+// the callers below and in the sessions page reload nothing for item tabs.
+export type ToolReloadEffect = { pages: string[] }
+const NO_RELOAD: ToolReloadEffect = { pages: [] }
+
+export function toolReloadEffect(name: string, args: any): ToolReloadEffect {
+	switch (name) {
+		case 'write_schedule':
+			return { pages: ['/schedules'] }
+		case 'write_trigger':
+			return { pages: triggerPages(args?.kind) }
+		case 'write_resource':
+			return { pages: ['/resources'] }
+		case 'write_variable':
+			return { pages: ['/variables'] }
+		case 'create_folder':
+			return { pages: ['/folders'] }
+		// Generic item tools carry a workspace-item `type`; refresh its list page
+		// when it lives on one (schedule/resource/variable/trigger). script/flow/app
+		// have their own live editor tab and no previewed list page → nothing.
+		case 'delete_workspace_item':
+		case 'discard_local_draft':
+		case 'deploy_workspace_item':
+		case 'rebase_draft':
+			return { pages: pagesForItemType(args?.type, args) }
+		default:
+			return NO_RELOAD
+	}
+}
+
+function pagesForItemType(type: unknown, args: any): string[] {
+	switch (type) {
+		case 'schedule':
+			return ['/schedules']
+		case 'resource':
+			return ['/resources']
+		case 'variable':
+			return ['/variables']
+		case 'trigger':
+			return triggerPages(args?.trigger_kind)
+		default:
+			return []
+	}
+}
+
+function triggerPages(kind: unknown): string[] {
+	const page = TRIGGER_PAGES[kind as TriggerKind]
+	return page ? [page.path] : []
+}
+
+// The open tabs a page-reload should refresh: those whose observed page path is
+// in `pages`. Item-editor and pipeline tab routes are never list pages, so they
+// never match (see the self-sync invariant above). Pure over a tab snapshot so
+// the sessions page can reload by id and this stays unit-testable.
+export function tabsToReload(
+	tabs: SessionPreviewTab[],
+	pages: ReadonlySet<string>
+): SessionPreviewTab[] {
+	if (pages.size === 0) return []
+	return tabs.filter((t) => pages.has(stripBase(t.loc || t.url)))
+}
diff --git a/frontend/src/lib/components/sessions/previewRouter.test.ts b/frontend/src/lib/components/sessions/previewRouter.test.ts
new file mode 100644
index 0000000000..747ecda6b7
--- /dev/null
+++ b/frontend/src/lib/components/sessions/previewRouter.test.ts
@@ -0,0 +1,111 @@
+import { describe, it, expect } from 'vitest'
+import { parsePreviewItemRoute, previewTabLabel, resolvePreviewTab } from './previewRouter'
+
+describe('parsePreviewItemRoute', () => {
+	it('maps edit/get routes to item kinds', () => {
+		expect(parsePreviewItemRoute('/scripts/edit/f/foo/bar')).toEqual({
+			kind: 'script',
+			raw_app: false,
+			itemPath: 'f/foo/bar'
+		})
+		expect(parsePreviewItemRoute('/flows/get/u/admin/baz')).toEqual({
+			kind: 'flow',
+			raw_app: false,
+			itemPath: 'u/admin/baz'
+		})
+		expect(parsePreviewItemRoute('/apps_raw/edit/f/a/b')).toEqual({
+			kind: 'app',
+			raw_app: true,
+			itemPath: 'f/a/b'
+		})
+		expect(parsePreviewItemRoute('/apps/edit/f/a/b')).toEqual({
+			kind: 'app',
+			raw_app: false,
+			itemPath: 'f/a/b'
+		})
+	})
+
+	it('returns null for non-item pages', () => {
+		expect(parsePreviewItemRoute('/')).toBeNull()
+		expect(parsePreviewItemRoute('/runs')).toBeNull()
+		expect(parsePreviewItemRoute('/workspace_settings')).toBeNull()
+	})
+})
+
+describe('previewTabLabel', () => {
+	it('labels a new raw app by its pending friendly path, not the draft uuid', () => {
+		const rawApp = { path: 'u/admin/draft_abc123', draft_path: 'u/admin/my_pretty_app' }
+		expect(previewTabLabel('/apps_raw/edit/u/admin/draft_abc123', rawApp)).toBe('my_pretty_app')
+	})
+
+	it('falls back to the uuid leaf when no friendly draft_path is pending', () => {
+		const rawApp = { path: 'u/admin/draft_abc123' }
+		expect(previewTabLabel('/apps_raw/edit/u/admin/draft_abc123', rawApp)).toBe('draft_abc123')
+	})
+
+	it('keeps the real leaf for a raw app already at a named (non-draft) path', () => {
+		const rawApp = { path: 'u/admin/my_app', draft_path: 'u/admin/renamed' }
+		expect(previewTabLabel('/apps_raw/edit/u/admin/my_app', rawApp)).toBe('my_app')
+	})
+
+	it('ignores a draft_path that belongs to a different raw app than the tab shows', () => {
+		const rawApp = { path: 'u/admin/draft_other', draft_path: 'u/admin/friendly' }
+		expect(previewTabLabel('/apps_raw/edit/u/admin/draft_abc123', rawApp)).toBe('draft_abc123')
+	})
+
+	it('does not touch non-raw-app tabs', () => {
+		const rawApp = { path: 'u/admin/draft_abc123', draft_path: 'u/admin/friendly' }
+		expect(previewTabLabel('/scripts/edit/f/foo/bar', rawApp)).toBe('bar')
+		expect(previewTabLabel('/runs', rawApp)).toBe('Runs')
+	})
+
+	it('falls back to the plain location label when no raw app is loaded', () => {
+		expect(previewTabLabel('/apps_raw/edit/u/admin/draft_abc123', undefined)).toBe('draft_abc123')
+	})
+})
+
+describe('resolvePreviewTab', () => {
+	it('routes a static page to the iframe fallback', () => {
+		expect(resolvePreviewTab('/runs')).toEqual({ kind: 'iframe' })
+	})
+
+	it('routes any script item to a live editor', () => {
+		expect(resolvePreviewTab('/scripts/edit/f/foo/bar')).toEqual({
+			kind: 'editor',
+			editorKind: 'script',
+			path: 'f/foo/bar'
+		})
+	})
+
+	it('routes any flow item to a live editor', () => {
+		expect(resolvePreviewTab('/flows/edit/f/foo/bar')).toEqual({
+			kind: 'editor',
+			editorKind: 'flow',
+			path: 'f/foo/bar'
+		})
+	})
+
+	it('maps a raw app to the raw_app editor kind', () => {
+		expect(resolvePreviewTab('/apps_raw/edit/f/a/b')).toEqual({
+			kind: 'editor',
+			editorKind: 'raw_app',
+			path: 'f/a/b'
+		})
+	})
+
+	it('never routes a regular drag-and-drop app to an editor (no wrapper exists)', () => {
+		expect(resolvePreviewTab('/apps/edit/f/a/b')).toEqual({ kind: 'iframe' })
+	})
+
+	it('routes a pipeline folder to the pipeline editor kind', () => {
+		expect(resolvePreviewTab('/pipeline/my_folder')).toEqual({
+			kind: 'editor',
+			editorKind: 'pipeline',
+			path: 'my_folder'
+		})
+	})
+
+	it('routes the bare pipeline list page to the iframe fallback', () => {
+		expect(resolvePreviewTab('/pipeline')).toEqual({ kind: 'iframe' })
+	})
+})
diff --git a/frontend/src/lib/components/sessions/previewRouter.ts b/frontend/src/lib/components/sessions/previewRouter.ts
new file mode 100644
index 0000000000..9bc46fce0f
--- /dev/null
+++ b/frontend/src/lib/components/sessions/previewRouter.ts
@@ -0,0 +1,185 @@
+import { base } from '$lib/base'
+import {
+	Home,
+	Play,
+	DollarSign,
+	Boxes,
+	Calendar,
+	Database,
+	FolderOpen,
+	Users,
+	Settings,
+	ScrollText
+} from 'lucide-svelte'
+import type { DrillIcon } from '$lib/components/drillPicker'
+import type { WorkspaceItem, WorkspaceItemKind } from '$lib/components/workspacePicker'
+import type { SessionTargetKind } from './sessionRuntime.svelte'
+
+/** What the preview breadcrumb picker can route to: a static workspace page
+ * or a workspace item (script/flow/app). The sessions page turns either into
+ * an iframe URL. */
+export type PreviewTarget =
+	| { type: 'page'; href: string; label: string }
+	| { type: 'item'; item: WorkspaceItem }
+
+export type PreviewPage = { label: string; path: string; icon: DrillIcon }
+
+// Core workspace-level destinations the preview can route to. Intentionally
+// curated — the main pages, not every trigger sub-page (those live behind
+// EE/feature gating in SidebarContent and aren't worth duplicating here).
+export const PREVIEW_PAGES: PreviewPage[] = [
+	{ label: 'Home', path: '/', icon: Home },
+	{ label: 'Runs', path: '/runs', icon: Play },
+	{ label: 'Variables', path: '/variables', icon: DollarSign },
+	{ label: 'Resources', path: '/resources', icon: Boxes },
+	{ label: 'Schedules', path: '/schedules', icon: Calendar },
+	{ label: 'Assets', path: '/assets', icon: Database },
+	{ label: 'Folders', path: '/folders', icon: FolderOpen },
+	{ label: 'Groups', path: '/groups', icon: Users },
+	{ label: 'Workspace settings', path: '/workspace_settings', icon: Settings },
+	{ label: 'Audit logs', path: '/audit_logs', icon: ScrollText }
+]
+
+// Trigger list pages, by kind. Deliberately kept out of PREVIEW_PAGES (the curated
+// breadcrumb picker) but shared here so open_page can route to them and the preview tab
+// can label them. `ee` kinds require an enterprise license. Each supports `#<path>` to
+// open a specific trigger, like Schedules.
+export type TriggerKind =
+	| 'http'
+	| 'websocket'
+	| 'postgres'
+	| 'kafka'
+	| 'nats'
+	| 'sqs'
+	| 'gcp'
+	| 'azure'
+	| 'mqtt'
+	| 'email'
+
+export const TRIGGER_PAGES: Record<TriggerKind, { path: string; label: string; ee?: boolean }> = {
+	http: { path: '/routes', label: 'HTTP routes' },
+	websocket: { path: '/websocket_triggers', label: 'WebSocket triggers' },
+	postgres: { path: '/postgres_triggers', label: 'Postgres triggers' },
+	kafka: { path: '/kafka_triggers', label: 'Kafka triggers', ee: true },
+	nats: { path: '/nats_triggers', label: 'NATS triggers', ee: true },
+	sqs: { path: '/sqs_triggers', label: 'SQS triggers', ee: true },
+	gcp: { path: '/gcp_triggers', label: 'GCP Pub/Sub triggers', ee: true },
+	azure: { path: '/azure_triggers', label: 'Azure Event Grid triggers', ee: true },
+	mqtt: { path: '/mqtt_triggers', label: 'MQTT triggers' },
+	email: { path: '/email_triggers', label: 'Email triggers' }
+}
+
+/** Label a trigger list page from its (base-stripped) pathname, or undefined. */
+export function triggerLabelForPath(path: string): string | undefined {
+	const clean = stripBase(path)
+	return Object.values(TRIGGER_PAGES).find((t) => t.path === clean)?.label
+}
+
+export const pageKey = (path: string) => `page:${path}`
+export const pageHref = (path: string) => `${base}${path}`
+
+/** Strip the deployment base prefix (and any query/hash) from a preview path
+ * so it can be matched against `PREVIEW_PAGES` / parsed as an item route. */
+export function stripBase(path: string): string {
+	let p = path.split('?')[0].split('#')[0]
+	if (base && p.startsWith(base)) p = p.slice(base.length)
+	return p || '/'
+}
+
+// Match a base-stripped preview pathname to a known page, for breadcrumb
+// labelling + picker highlight. Exact match; '/' only matches home.
+export function matchPreviewPage(path: string): PreviewPage | undefined {
+	const clean = stripBase(path)
+	return PREVIEW_PAGES.find((p) => p.path === clean)
+}
+
+/** Human label for a preview tab's location — the workspace page name, trigger
+ * page, run detail, or item path. Shared by the sessions tab strip and the
+ * close_page matcher so both name a tab the same way. */
+export function previewLocationLabel(url: string): string {
+	const page = matchPreviewPage(url)
+	if (page) return page.label
+	const trigger = triggerLabelForPath(url)
+	if (trigger) return trigger
+	const run = stripBase(url).match(/^\/run\/([^/?#]+)/)
+	if (run) return `Run ${decodeURIComponent(run[1]).slice(0, 8)}`
+	const pipelineFolder = parsePipelineRoute(url)
+	if (pipelineFolder) return pipelineFolder
+	const parsed = parsePreviewItemRoute(url)
+	if (parsed) return parsed.itemPath.split('/').pop() ?? parsed.itemPath
+	return stripBase(url)
+}
+
+/** Tab label for a preview location, preferring the friendly path a raw-app
+ * editor was renamed to while still parked at its throwaway `…/draft_<uuid>`
+ * storage path. `rawAppDraft` is the session's live raw app (its storage `path`
+ * plus the pending `draft_path` the user typed in the editor). When the tab
+ * shows that app at a draft placeholder path, it's labelled by the friendly
+ * leaf rather than the uuid. Display-only — the tab's URL keeps the storage
+ * path. Falls back to `previewLocationLabel` for every other tab. */
+export function previewTabLabel(
+	url: string,
+	rawAppDraft?: { path: string; draft_path?: string }
+): string {
+	const route = parsePreviewItemRoute(url)
+	if (
+		route?.raw_app &&
+		rawAppDraft?.draft_path &&
+		rawAppDraft.path === route.itemPath &&
+		route.itemPath.split('/').pop()?.startsWith('draft_')
+	) {
+		return rawAppDraft.draft_path.split('/').pop() ?? rawAppDraft.draft_path
+	}
+	return previewLocationLabel(url)
+}
+
+export type PreviewItemRoute = { kind: WorkspaceItemKind; raw_app: boolean; itemPath: string }
+
+// Parse a preview URL/pathname into the workspace item it edits, or null for a
+// non-item page (home, runs, …). Shared by the breadcrumb (drill segments) and
+// the tab resolver below so both agree on what counts as an item route.
+export function parsePreviewItemRoute(fullPath: string): PreviewItemRoute | null {
+	const p = stripBase(fullPath)
+	const m = p.match(/^\/(scripts|flows|apps|apps_raw)\/(?:edit|get)\/(.+)$/)
+	if (!m) return null
+	const itemPath = decodeURIComponent(m[2])
+	if (m[1] === 'scripts') return { kind: 'script', raw_app: false, itemPath }
+	if (m[1] === 'flows') return { kind: 'flow', raw_app: false, itemPath }
+	if (m[1] === 'apps_raw') return { kind: 'app', raw_app: true, itemPath }
+	return { kind: 'app', raw_app: false, itemPath }
+}
+
+// A `/pipeline/<folder>` route is the data-pipeline graph editor for that folder
+// (the folder is a single path segment, not a workspace item path). The bare
+// `/pipeline` list page is not an editor. Returns the folder name, or null.
+export function parsePipelineRoute(fullPath: string): string | null {
+	const m = stripBase(fullPath).match(/^\/pipeline\/([^/?#]+)/)
+	return m ? decodeURIComponent(m[1]) : null
+}
+
+// How a preview tab should render: as an in-process live editor or an iframe
+// fallback. Any editable item of a wrappable kind (script, flow, raw app) mounts
+// its per-(kind,path) cell editor; a `/pipeline/<folder>` route mounts the
+// data-pipeline graph editor (single, shared runtime.pipelineEditorState — `path`
+// is the folder); everything else (static pages, regular drag-and-drop apps, any
+// other route) stays an iframe.
+export type PreviewSlot =
+	| { kind: 'editor'; editorKind: SessionTargetKind | 'pipeline'; path: string }
+	| { kind: 'iframe' }
+
+export function resolvePreviewTab(url: string): PreviewSlot {
+	const pipelineFolder = parsePipelineRoute(url)
+	if (pipelineFolder) return { kind: 'editor', editorKind: 'pipeline', path: pipelineFolder }
+	const route = parsePreviewItemRoute(url)
+	if (!route) return { kind: 'iframe' }
+	const editorKind: SessionTargetKind | undefined =
+		route.kind === 'script'
+			? 'script'
+			: route.kind === 'flow'
+				? 'flow'
+				: route.kind === 'app' && route.raw_app
+					? 'raw_app'
+					: undefined
+	if (!editorKind) return { kind: 'iframe' }
+	return { kind: 'editor', editorKind, path: route.itemPath }
+}
diff --git a/frontend/src/lib/components/sessions/sessionDeployModel.svelte.ts b/frontend/src/lib/components/sessions/sessionDeployModel.svelte.ts
new file mode 100644
index 0000000000..28f0075880
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionDeployModel.svelte.ts
@@ -0,0 +1,351 @@
+import { getDraftItems, type DraftItem } from '$lib/workspaceDrafts.svelte'
+import {
+	checkDeployPermission,
+	checkItemExists,
+	getItemValue,
+	type DeployPermission,
+	type DeployResult
+} from '$lib/utils_workspace_deploy'
+import {
+	deployDraft,
+	discardDraft,
+	fetchDraftBaseStale,
+	getDraftDiffValues
+} from '$lib/utils_draft_deploy'
+import { untrack } from 'svelte'
+import {
+	buildDeployItems,
+	deployPlanFor,
+	diffBaseFor,
+	discardPlanFor,
+	maskOnlyCandidates,
+	type DeployItem,
+	type DeployPlanEntry
+} from './sessionDeployModel'
+import { maskKey } from './modifiedItemsMask'
+
+export type DeploymentStatus = { status: 'loading' | 'failed'; error?: string }
+
+// Reactive wrapper over the pure sessionDeployModel: owns the async draft list
+// and builds the unified item list. The diff-value loader lives here too so both
+// the tree and the diff column read one resolver. The dock is granular per-item
+// deploy (deployRow/discardRow); batch flows and fork→parent promotion are the
+// compare page's concern.
+
+export interface SessionDeployModelArgs {
+	workspaceId: string
+	/** Called after a deploy/discard mutated workspace state. Lets the consumer
+	 *  refresh ITS OWN data sources — without this, the bar shows stale counts
+	 *  until the next turn end / tab refocus / reload. */
+	onDataChanged?: () => void
+	/** A draft deployed: the consumer owning the mask moves the item's entry to
+	 *  its deployed path (`displayPath` — differs from the synthetic storage
+	 *  `path` for draft-only items, which never exists deployed). */
+	onItemDeployed?: (item: DeployItem) => void
+	/** A draft was discarded: the chat's touch is undone — the consumer drops
+	 *  the item's mask entry so a pre-existing deployed item doesn't keep
+	 *  reading as this chat's "Deployed" edit. */
+	onItemDiscarded?: (item: DeployItem) => void
+	/** Chat-modified-items mask; undefined shows every draft. */
+	mask?: Set<string>
+}
+
+export interface DiffValues {
+	before: unknown
+	after: unknown
+}
+
+/** Resolves which mask-only candidates still exist in the session workspace
+ *  (deployed) vs are gone (discarded drafts / deleted items) — the
+ *  `existingKeys` input of `buildDeployItems`. Undefined while resolving, so
+ *  deployed rows only appear once confirmed. Shared by the drawer model and the
+ *  bar's dock counts. */
+export function useExistingMaskKeys(
+	getInput: () => Omit<Parameters<typeof buildDeployItems>[0], 'existingKeys'> & {
+		workspaceId: string
+	}
+) {
+	let existingKeys = $state<Set<string> | undefined>(undefined)
+	// Existence is checked once per distinct candidate set; the signature avoids
+	// re-firing while results stream back.
+	let lastCandidateSig = ''
+	// Bumped by refresh() to force a re-check even when the candidate set (the
+	// effect's other dependency) is unchanged.
+	let recheck = $state(0)
+	$effect(() => {
+		void recheck
+		const { workspaceId, ...buildInput } = getInput()
+		const cands = maskOnlyCandidates(buildInput)
+		// The workspace is part of the identity: the same candidate keys in a
+		// different workspace must re-check, not reuse the previous verdict.
+		const sig =
+			workspaceId +
+			'|' +
+			cands
+				.map((c) => c.key)
+				.sort()
+				.join(',')
+		untrack(() => {
+			if (sig === lastCandidateSig) return
+			lastCandidateSig = sig
+			if (cands.length === 0) {
+				existingKeys = new Set()
+				return
+			}
+			// A mask-only item that was deployed still exists in the session
+			// workspace; a discarded or deleted one doesn't.
+			void Promise.all(
+				cands.map((c) =>
+					checkItemExists(c.deployKind, c.path, workspaceId)
+						.then((exists) => (exists ? c.key : null))
+						.catch(() => null)
+				)
+			).then((keys) => {
+				// A slower batch for a superseded candidate set (or one voided by
+				// reset()) must not overwrite the current result.
+				if (sig !== lastCandidateSig) return
+				existingKeys = new Set(keys.filter((k): k is string => !!k))
+			})
+		})
+	})
+	return {
+		get keys() {
+			return existingKeys
+		},
+		/** Force a fresh existence check (an item may have been deleted since).
+		 *  Hard invalidate: current keys are dropped until the check resolves, so
+		 *  rows derived from them disappear meanwhile — use on a fresh surface
+		 *  (drawer open), not on a live one. */
+		reset() {
+			lastCandidateSig = ''
+			existingKeys = undefined
+		},
+		/** Re-check while keeping the current keys (stale-while-revalidate), so a
+		 *  live surface doesn't blank out during the round-trip. */
+		refresh() {
+			lastCandidateSig = ''
+			recheck++
+		}
+	}
+}
+
+export function useSessionDeployModel(getArgs: () => SessionDeployModelArgs) {
+	let draftItems = $state<DraftItem[]>([])
+	let loading = $state(false)
+	let error = $state<string | undefined>(undefined)
+
+	// Mask keys confirmed to still exist → allowed to show as terminal deployed
+	// rows (a discarded draft is a mask entry with no item, so it stays out).
+	const existing = useExistingMaskKeys(() => ({
+		draftItems,
+		mask: getArgs().mask,
+		workspaceId: getArgs().workspaceId
+	}))
+
+	// Optimistic knowledge from this model's own deploys: a deployed key exists
+	// in the session workspace before the async existence check confirms it.
+	// Without this a deployed row falls out of the list for ~1s, unmounting its
+	// card.
+	let deployedKeys = $state<ReadonlySet<string>>(new Set())
+
+	const items = $derived.by(() => {
+		const existingKeys =
+			deployedKeys.size === 0 ? existing.keys : new Set([...(existing.keys ?? []), ...deployedKeys])
+		return buildDeployItems({ draftItems, mask: getArgs().mask, existingKeys })
+	})
+
+	async function fetchDrafts() {
+		loading = true
+		error = undefined
+		try {
+			draftItems = await getDraftItems(getArgs().workspaceId)
+		} catch (e) {
+			console.error('Session deploy model: draft list failed', e)
+			error = `Failed to load drafts: ${e}`
+			draftItems = []
+		} finally {
+			loading = false
+		}
+	}
+
+	/** (Re)fetch. Called on open. */
+	function load() {
+		// Re-check existence fresh (an item may have been deleted since last open).
+		existing.reset()
+		// Drop the optimistic bridge with it: it only covers the gap until the
+		// fresh check resolves, and a stale entry would keep a since-deleted item
+		// reading as deployed forever.
+		deployedKeys = new Set()
+		// Staleness can change between opens (a deploy elsewhere moves the head).
+		staleFetched.clear()
+		staleKeys = new Set()
+		void fetchDrafts()
+	}
+
+	// ── Stale drafts (base ≠ deployed head) ──────────────────────────────────
+	// A draft forked from a version that is no longer the deployed head: someone
+	// deployed in between, so deploying the draft would silently revert them.
+	// Same detection as the compare page; surfaced as a warning, deploy stays
+	// allowed. Only own drafts on deployed script/flow/app items carry a base.
+	let staleKeys = $state<ReadonlySet<string>>(new Set())
+	const staleFetched = new Set<string>()
+	$effect(() => {
+		const list = items
+		const ws = getArgs().workspaceId
+		untrack(() => {
+			for (const it of list) {
+				if (!it.hasDraft || it.draftOnly || !it.mine) continue
+				if (!['script', 'flow', 'app', 'raw_app'].includes(it.draftKind)) continue
+				if (staleFetched.has(it.key)) continue
+				staleFetched.add(it.key)
+				void fetchDraftBaseStale(it.draftKind, it.path, ws).then((stale) => {
+					if (stale) staleKeys = new Set(staleKeys).add(it.key)
+				})
+			}
+		})
+	})
+
+	// ── Deploy permission ────────────────────────────────────────────────────
+	// Preflight the shared checkDeployPermission (operator / RestrictDeployToDeployers)
+	// for the session workspace so the button disables with a reason instead of
+	// failing on click. `ok` defaults true while resolving (fail-open).
+	let deployPerm = $state<DeployPermission>({ ok: true })
+	let deployPermFetchedFor = ''
+	$effect(() => {
+		const ws = getArgs().workspaceId
+		untrack(() => {
+			if (!ws || deployPermFetchedFor === ws) return
+			deployPermFetchedFor = ws
+			// Reset to fail-open for the new workspace and drop a stale resolution
+			// (a slower fetch for the previous workspace must not gate this one).
+			deployPerm = { ok: true }
+			void checkDeployPermission(ws).then((perm) => {
+				if (deployPermFetchedFor === ws) deployPerm = perm
+			})
+		})
+	})
+
+	// ── Deploy execution ─────────────────────────────────────────────────────
+	// Per-item transient deploy state (keyed by DeployItem.key): loading or
+	// failed. Success has no status — the row's badge flipping to Deployed is
+	// the feedback. Reassigned, not mutated.
+	let deploymentStatus = $state<Record<string, DeploymentStatus>>({})
+	let deploying = $state(false)
+
+	function setStatus(key: string, s: DeploymentStatus | undefined) {
+		const next = { ...deploymentStatus }
+		if (s) next[key] = s
+		else delete next[key]
+		deploymentStatus = next
+	}
+
+	async function runPlan(entry: DeployPlanEntry): Promise<DeployResult> {
+		const cur = getArgs().workspaceId
+		switch (entry.op) {
+			case 'deploy_draft':
+				return deployDraft(entry.draftKind, entry.path, cur, {
+					draftOnly: entry.draftOnly,
+					rawApp: entry.rawApp
+				})
+			case 'discard':
+				return discardDraft(entry.draftKind, entry.path, cur, entry.draftOnly, entry.legacy)
+		}
+	}
+
+	function refreshData() {
+		void fetchDrafts()
+		getArgs().onDataChanged?.()
+	}
+
+	/** Deploy (or discard) a single item; returns whether it succeeded. */
+	async function deployOne(item: DeployItem, discard = false): Promise<boolean> {
+		const plan = discard ? discardPlanFor(item) : deployPlanFor(item)
+		if (!plan) return false
+		// Don't attempt a deploy we know the user can't make (no write permission
+		// on the path, or blocked by the operator / deployer rule) — the UI
+		// disables it too; this is the guard behind that.
+		if (!discard && (!item.canWrite || !deployPerm.ok)) return false
+		setStatus(item.key, { status: 'loading' })
+		deploying = true
+		try {
+			const res = await runPlan(plan)
+			setStatus(item.key, res.success ? undefined : { status: 'failed', error: res.error })
+			if (res.success) {
+				if (discard) {
+					getArgs().onItemDiscarded?.(item)
+				} else {
+					// Bridge under the DEPLOYED path's key too: the mask rewrite
+					// (onItemDeployed) re-keys a synthetic-storage row to displayPath.
+					deployedKeys = new Set(deployedKeys)
+						.add(item.key)
+						.add(maskKey(item.draftKind, item.displayPath))
+					getArgs().onItemDeployed?.(item)
+				}
+			}
+			return res.success
+		} finally {
+			deploying = false
+		}
+	}
+
+	/** Returns success so the UI can stage its post-deploy animation. */
+	async function deployRow(item: DeployItem): Promise<boolean> {
+		const ok = await deployOne(item)
+		if (ok) refreshData()
+		return ok
+	}
+
+	async function discardRow(item: DeployItem) {
+		if (await deployOne(item, true)) refreshData()
+	}
+
+	// ── Diff values (one resolver for tree + column) ─────────────────────────
+	async function loadDiffValues(item: DeployItem): Promise<DiffValues> {
+		const base = diffBaseFor(item, getArgs().workspaceId)
+		if (base.kind === 'draft') {
+			const { deployed, draft } = await getDraftDiffValues(
+				base.draftKind,
+				item.path,
+				base.workspaceId,
+				base.draftOnly
+			)
+			return { before: base.draftOnly ? undefined : deployed, after: draft }
+		}
+		const v = await getItemValue(base.deployKind, base.path, base.workspaceId).catch(
+			() => undefined
+		)
+		return { before: v, after: v }
+	}
+
+	return {
+		get items() {
+			return items
+		},
+		get loading() {
+			return loading
+		},
+		get error() {
+			return error
+		},
+		load,
+		loadDiffValues,
+		get deploying() {
+			return deploying
+		},
+		statusOf(key: string): DeploymentStatus | undefined {
+			return deploymentStatus[key]
+		},
+		/** Whether a draft row's base is stale (deployed head moved since). */
+		staleOf(key: string): boolean {
+			return staleKeys.has(key)
+		},
+		/** Whether the user may deploy into the session workspace. */
+		get deployPermission(): DeployPermission {
+			return deployPerm
+		},
+		deployRow,
+		discardRow
+	}
+}
+
+export type SessionDeployModel = ReturnType<typeof useSessionDeployModel>
diff --git a/frontend/src/lib/components/sessions/sessionDeployModel.test.ts b/frontend/src/lib/components/sessions/sessionDeployModel.test.ts
new file mode 100644
index 0000000000..7fa4e3cca8
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionDeployModel.test.ts
@@ -0,0 +1,232 @@
+import { describe, it, expect } from 'vitest'
+import type { UserDraftItemKind } from '$lib/gen'
+import type { DraftItem } from '$lib/workspaceDrafts.svelte'
+import {
+	buildDeployItems,
+	maskOnlyCandidates,
+	badgeOf,
+	actionFor,
+	diffBaseFor,
+	badgeCounts,
+	deployPlanFor,
+	discardPlanFor
+} from './sessionDeployModel'
+import { maskKey } from './modifiedItemsMask'
+
+// ── Fixtures ────────────────────────────────────────────────────────────────
+
+function draft(kind: UserDraftItemKind, path: string, over: Partial<DraftItem> = {}): DraftItem {
+	return {
+		kind,
+		path,
+		summary: undefined,
+		draft_path: undefined,
+		draft_only: false,
+		legacy_draft: false,
+		raw_app: kind === 'raw_app',
+		can_write: true,
+		draft_users: undefined,
+		mine: true,
+		...over
+	}
+}
+
+// ── buildDeployItems ─────────────────────────────────────────────────────────
+
+describe('buildDeployItems', () => {
+	it('a draft is a live (not done) row carrying the draft flags', () => {
+		const items = buildDeployItems({
+			draftItems: [draft('script', 'u/a/foo', { draft_only: true })]
+		})
+		expect(items).toHaveLength(1)
+		expect(items[0].hasDraft).toBe(true)
+		expect(items[0].done).toBe(false)
+		expect(items[0].draftOnly).toBe(true)
+		expect(items[0].key).toBe(maskKey('script', 'u/a/foo'))
+	})
+
+	it('maps the trigger taxonomy to the deploy kind (trigger_schedule → schedule)', () => {
+		const items = buildDeployItems({ draftItems: [draft('trigger_schedule', 'u/a/sched')] })
+		expect(items[0].deployKind).toBe('schedule')
+		expect(items[0].draftKind).toBe('trigger_schedule')
+	})
+
+	it('maps both email draft kinds to the email_trigger deploy kind', () => {
+		const items = buildDeployItems({
+			draftItems: [draft('trigger_email', 'u/a/em'), draft('trigger_default_email', 'u/a/dem')]
+		})
+		expect(items.map((i) => i.deployKind)).toEqual(['email_trigger', 'email_trigger'])
+	})
+
+	it('mask scopes drafts to touched items', () => {
+		const mask = new Set([maskKey('script', 'u/a/keep')])
+		const items = buildDeployItems({
+			draftItems: [draft('script', 'u/a/keep'), draft('flow', 'u/a/other')],
+			mask
+		})
+		expect(items.map((i) => i.path)).toEqual(['u/a/keep'])
+	})
+
+	it('mask-only entries that still exist surface as terminal deployed rows', () => {
+		const key = maskKey('script', 'u/a/done')
+		const items = buildDeployItems({
+			draftItems: [],
+			mask: new Set([key]),
+			existingKeys: new Set([key])
+		})
+		expect(items).toHaveLength(1)
+		expect(items[0].done).toBe(true)
+		expect(items[0].hasDraft).toBe(false)
+		expect(items[0].path).toBe('u/a/done')
+	})
+
+	it('a mask-only entry that no longer exists (discarded or deleted) is dropped', () => {
+		const key = maskKey('script', 'u/a/gone')
+		// Existence unresolved → no mask-only rows yet.
+		expect(buildDeployItems({ draftItems: [], mask: new Set([key]) })).toHaveLength(0)
+		// Existence resolved to gone → dropped.
+		expect(
+			buildDeployItems({ draftItems: [], mask: new Set([key]), existingKeys: new Set() })
+		).toHaveLength(0)
+	})
+
+	it('a draft covers its mask entry (no duplicate deployed row)', () => {
+		const key = maskKey('script', 'u/a/foo')
+		const items = buildDeployItems({
+			draftItems: [draft('script', 'u/a/foo')],
+			mask: new Set([key]),
+			existingKeys: new Set([key])
+		})
+		expect(items).toHaveLength(1)
+		expect(items[0].hasDraft).toBe(true)
+	})
+
+	it('maskOnlyCandidates returns keys not covered by a draft', () => {
+		const cands = maskOnlyCandidates({
+			draftItems: [draft('script', 'u/a/draft')],
+			mask: new Set([maskKey('script', 'u/a/draft'), maskKey('trigger_schedule', 'u/a/done')])
+		})
+		expect(cands.map((c) => c.key)).toEqual([maskKey('trigger_schedule', 'u/a/done')])
+		expect(cands[0].deployKind).toBe('schedule')
+	})
+
+	it('no mask lists every draft', () => {
+		const items = buildDeployItems({
+			draftItems: [draft('script', 'u/a/x'), draft('flow', 'u/a/y')]
+		})
+		expect(items).toHaveLength(2)
+	})
+})
+
+// ── badge ────────────────────────────────────────────────────────────────────
+
+describe('badgeOf / badgeCounts', () => {
+	it('draft row → draft; deployed row → deployed', () => {
+		const key = maskKey('script', 'u/a/done')
+		const items = buildDeployItems({
+			draftItems: [draft('script', 'u/a/d')],
+			mask: new Set([maskKey('script', 'u/a/d'), key]),
+			existingKeys: new Set([key])
+		})
+		const by = new Map(items.map((i) => [i.path, i]))
+		expect(badgeOf(by.get('u/a/d')!)).toBe('draft')
+		expect(badgeOf(by.get('u/a/done')!)).toBe('deployed')
+		expect(badgeCounts(items)).toEqual({ draft: 1, deployed: 1 })
+	})
+})
+
+// ── action ──────────────────────────────────────────────────────────────────
+
+describe('actionFor', () => {
+	it('draft → Deploy + discard secondary', () => {
+		const [item] = buildDeployItems({ draftItems: [draft('script', 'u/a/f')] })
+		const a = actionFor(item)
+		expect(a.op).toBe('deploy_draft')
+		expect(a.label).toBe('Deploy')
+		expect(a.secondary?.[0].op).toBe('discard')
+	})
+
+	it('draft-only discard is labelled "Discard draft"', () => {
+		const [item] = buildDeployItems({
+			draftItems: [draft('script', 'u/a/f', { draft_only: true })]
+		})
+		expect(actionFor(item).secondary?.[0].label).toBe('Discard draft')
+	})
+
+	it('deployed (done) → op none', () => {
+		const key = maskKey('script', 'u/a/done')
+		const [item] = buildDeployItems({
+			draftItems: [],
+			mask: new Set([key]),
+			existingKeys: new Set([key])
+		})
+		expect(actionFor(item).op).toBe('none')
+	})
+})
+
+// ── diff base ───────────────────────────────────────────────────────────────
+
+describe('diffBaseFor', () => {
+	it('draft row → deployed↔draft base', () => {
+		const [item] = buildDeployItems({
+			draftItems: [draft('script', 'u/a/f', { draft_only: true })]
+		})
+		const b = diffBaseFor(item, 'ws')
+		expect(b.kind).toBe('draft')
+		if (b.kind === 'draft') {
+			expect(b.draftKind).toBe('script')
+			expect(b.draftOnly).toBe(true)
+			expect(b.workspaceId).toBe('ws')
+		}
+	})
+
+	it('deployed row → self base in the session workspace', () => {
+		const key = maskKey('script', 'u/a/done')
+		const [item] = buildDeployItems({
+			draftItems: [],
+			mask: new Set([key]),
+			existingKeys: new Set([key])
+		})
+		const b = diffBaseFor(item, 'ws')
+		expect(b.kind).toBe('self')
+		if (b.kind === 'self') {
+			expect(b.workspaceId).toBe('ws')
+			expect(b.path).toBe('u/a/done')
+		}
+	})
+})
+
+// ── deploy plan ─────────────────────────────────────────────────────────────
+
+describe('deployPlanFor / discardPlanFor', () => {
+	it('draft → deploy_draft carrying rawApp/draftOnly', () => {
+		const [item] = buildDeployItems({
+			draftItems: [draft('raw_app', 'u/a/app', { raw_app: true, draft_only: true })]
+		})
+		const p = deployPlanFor(item)!
+		expect(p.op).toBe('deploy_draft')
+		expect(p.rawApp).toBe(true)
+		expect(p.draftOnly).toBe(true)
+	})
+
+	it('deployed (done) rows have no plan', () => {
+		const key = maskKey('script', 'u/a/done')
+		const [item] = buildDeployItems({
+			draftItems: [],
+			mask: new Set([key]),
+			existingKeys: new Set([key])
+		})
+		expect(item.done).toBe(true)
+		expect(deployPlanFor(item)).toBeUndefined()
+		expect(discardPlanFor(item)).toBeUndefined()
+	})
+
+	it('discardPlanFor carries the legacy flag', () => {
+		const [d] = buildDeployItems({
+			draftItems: [draft('script', 'u/a/f', { legacy_draft: true })]
+		})
+		const p = discardPlanFor(d)!
+		expect(p.op).toBe('discard')
+		expect(p.legacy).toBe(true)
+	})
+})
diff --git a/frontend/src/lib/components/sessions/sessionDeployModel.ts b/frontend/src/lib/components/sessions/sessionDeployModel.ts
new file mode 100644
index 0000000000..173f732132
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionDeployModel.ts
@@ -0,0 +1,274 @@
+import type { UserDraftItemKind } from '$lib/gen'
+import type { DraftItem } from '$lib/workspaceDrafts.svelte'
+import type { Kind } from '$lib/utils_deployable'
+import { maskKey } from './modifiedItemsMask'
+
+// Unified item model for the session Review & Deploy surface. This is the pure,
+// UI-free core: every item the session touched is either a pending **draft** or
+// **deployed** in the session workspace (terminal). Deploying always lands in
+// the session's own workspace — promoting a fork's changes to its parent is the
+// compare page's concern, not modeled here.
+//
+// Kept free of Svelte runes and async so it unit-tests in the node project. The
+// reactive wrapper (data loading, deploy execution) lives in the sibling
+// `.svelte.ts` and consumes these functions.
+
+// ── Item taxonomy bridge ────────────────────────────────────────────────────
+// The draft list speaks UserDraftItemKind (`trigger_schedule`, `raw_app`); the
+// deploy utils speak the layout `Kind` (`schedule`, `raw_app`, `http_trigger`).
+// This maps draft→deploy to key deploy calls and row icons. Only non-identity
+// cases listed; everything else is identity.
+const DEPLOY_KIND_BY_DRAFT_KIND: Partial<Record<UserDraftItemKind, Kind>> = {
+	trigger_schedule: 'schedule',
+	trigger_http: 'http_trigger',
+	trigger_websocket: 'websocket_trigger',
+	trigger_kafka: 'kafka_trigger',
+	trigger_nats: 'nats_trigger',
+	trigger_postgres: 'postgres_trigger',
+	trigger_mqtt: 'mqtt_trigger',
+	trigger_sqs: 'sqs_trigger',
+	trigger_gcp: 'gcp_trigger',
+	trigger_azure: 'azure_trigger',
+	// Both email draft kinds deploy as the one email trigger kind: the editor
+	// saves per-path email-trigger drafts as `trigger_email`, the fork diff
+	// speaks `trigger_default_email`.
+	trigger_default_email: 'email_trigger',
+	trigger_email: 'email_trigger',
+	raw_app: 'raw_app'
+}
+
+function deployKindOf(draftKind: UserDraftItemKind, rawApp: boolean): Kind {
+	if (rawApp) return 'raw_app'
+	return DEPLOY_KIND_BY_DRAFT_KIND[draftKind] ?? (draftKind as unknown as Kind)
+}
+
+// ── Public types ────────────────────────────────────────────────────────────
+
+export interface DeployItem {
+	/** Canonical identity `${UserDraftItemKind}:${path}`. */
+	key: string
+	/** Layout/deploy kind (script, flow, raw_app, http_trigger, schedule…). */
+	deployKind: Kind
+	/** UserDraftItemKind for draft ops. */
+	draftKind: UserDraftItemKind
+	path: string
+	/** Friendly path for display; storage `path` stays the op/edit key. */
+	displayPath: string
+	summary?: string
+	/** Deployed with no pending draft — the terminal state. */
+	done: boolean
+	hasDraft: boolean
+	draftOnly: boolean
+	draftUsers?: { username?: string | null }[]
+	/** Own draft (deployable/discardable). */
+	mine: boolean
+	canWrite: boolean
+	/** Legacy workspace-level draft (drives discard's `legacy` flag). */
+	legacy: boolean
+	rawApp: boolean
+}
+
+export interface BuildInput {
+	draftItems: DraftItem[]
+	/** Chat-modified-items mask (`UserDraftItemKind:path`). When set, only masked
+	 *  items are included, and mask-only entries (no draft) surface as terminal
+	 *  deployed rows — but only when confirmed to still exist (see `existingKeys`). */
+	mask?: Set<string>
+	/** Mask keys confirmed to still exist in the workspace (deployed). A mask-only
+	 *  key that isn't here is treated as gone (a discarded draft or a deleted item)
+	 *  and dropped, so it doesn't masquerade as deployed. Undefined → no mask-only
+	 *  rows are emitted yet (existence still resolving). */
+	existingKeys?: Set<string>
+}
+
+// ── Build: draft list + mask-only deployed rows into unified items ──────────
+
+export function buildDeployItems(input: BuildInput): DeployItem[] {
+	const { draftItems, mask, existingKeys } = input
+	const scopedDrafts = mask
+		? draftItems.filter((it) => mask.has(maskKey(it.kind, it.path)))
+		: draftItems
+
+	const out: DeployItem[] = []
+	const seen = new Set<string>()
+
+	// 1. Pending drafts.
+	for (const it of scopedDrafts) {
+		const canonical = maskKey(it.kind, it.path)
+		if (seen.has(canonical)) continue
+		seen.add(canonical)
+		out.push({
+			key: canonical,
+			deployKind: deployKindOf(it.kind, it.raw_app),
+			draftKind: it.kind,
+			path: it.path,
+			displayPath: it.draft_path ?? it.path,
+			summary: it.summary,
+			done: false,
+			hasDraft: true,
+			draftOnly: it.draft_only,
+			draftUsers: it.draft_users,
+			mine: it.mine,
+			canWrite: it.can_write,
+			legacy: it.legacy_draft,
+			rawApp: it.raw_app
+		})
+	}
+
+	// 2. Mask-only items (touched by the chat, no pending draft) → terminal
+	//    deployed rows, but ONLY when confirmed to still exist. A discarded draft
+	//    or a deleted item leaves a mask entry with no item; without this guard it
+	//    would masquerade as deployed.
+	if (mask) {
+		for (const k of mask) {
+			if (seen.has(k)) continue
+			if (!existingKeys?.has(k)) continue
+			const sep = k.indexOf(':')
+			if (sep < 0) continue
+			const udk = k.slice(0, sep) as UserDraftItemKind
+			const path = k.slice(sep + 1)
+			seen.add(k)
+			out.push({
+				key: k,
+				deployKind: deployKindOf(udk, udk === 'raw_app'),
+				draftKind: udk,
+				path,
+				displayPath: path,
+				summary: undefined,
+				done: true,
+				hasDraft: false,
+				draftOnly: false,
+				draftUsers: undefined,
+				mine: true,
+				canWrite: true,
+				legacy: false,
+				rawApp: udk === 'raw_app'
+			})
+		}
+	}
+
+	return out
+}
+
+/** Mask keys not covered by a current draft — the candidates for a terminal
+ *  deployed row. The reactive layer existence-checks these (in the session
+ *  workspace) to tell a deployed item from a discarded/deleted one, then feeds
+ *  the survivors back as `existingKeys`. */
+export function maskOnlyCandidates(
+	input: Omit<BuildInput, 'existingKeys'>
+): { key: string; deployKind: Kind; draftKind: UserDraftItemKind; path: string }[] {
+	const { draftItems, mask } = input
+	if (!mask) return []
+	const covered = new Set<string>()
+	for (const it of draftItems) {
+		const k = maskKey(it.kind, it.path)
+		if (mask.has(k)) covered.add(k)
+	}
+	const out: { key: string; deployKind: Kind; draftKind: UserDraftItemKind; path: string }[] = []
+	for (const k of mask) {
+		if (covered.has(k)) continue
+		const sep = k.indexOf(':')
+		if (sep < 0) continue
+		const udk = k.slice(0, sep) as UserDraftItemKind
+		const path = k.slice(sep + 1)
+		out.push({ key: k, draftKind: udk, deployKind: deployKindOf(udk, udk === 'raw_app'), path })
+	}
+	return out
+}
+
+// ── Status badge ─────────────────────────────────────────────────────────────
+
+export type BadgeKind = 'draft' | 'deployed'
+
+/** The single status badge a row shows: a pending draft, or deployed (green,
+ *  terminal). Every built row is one of the two. */
+export function badgeOf(item: DeployItem): BadgeKind {
+	return item.done ? 'deployed' : 'draft'
+}
+
+/** Per-status tallies over `badgeOf` — the bar's at-a-glance readout, so its
+ *  counts always agree with the badges the drawer rows show. */
+export function badgeCounts(items: DeployItem[]): Record<BadgeKind, number> {
+	const out: Record<BadgeKind, number> = { draft: 0, deployed: 0 }
+	for (const it of items) out[badgeOf(it)]++
+	return out
+}
+
+// ── Action ──────────────────────────────────────────────────────────────────
+
+export type DeployOp = 'deploy_draft' | 'discard' | 'none'
+
+export interface DeployAction {
+	op: DeployOp
+	label: string
+	secondary?: DeployAction[]
+}
+
+/** The primary (and secondary) action for a row: a draft deploys into the
+ *  session workspace, a deployed row has nothing left to do. */
+export function actionFor(item: DeployItem): DeployAction {
+	if (item.done) return { op: 'none', label: 'Done' }
+	return {
+		op: 'deploy_draft',
+		label: 'Deploy',
+		secondary: [{ op: 'discard', label: item.draftOnly ? 'Discard draft' : 'Discard' }]
+	}
+}
+
+// ── Diff base ───────────────────────────────────────────────────────────────
+
+export type DiffBase =
+	| { kind: 'draft'; draftKind: UserDraftItemKind; workspaceId: string; draftOnly: boolean }
+	| { kind: 'self'; deployKind: Kind; path: string; workspaceId: string }
+
+/** Where a row's before/after diff values come from. A draft row diffs
+ *  deployed↔draft; a deployed row has nothing to diff but its value is still
+ *  loadable (`self`) — the sidebar unwraps a deployed raw app into its files.
+ *  The executor maps this to getDraftDiffValues / getItemValue. */
+export function diffBaseFor(item: DeployItem, workspaceId: string): DiffBase {
+	if (item.hasDraft) {
+		return { kind: 'draft', draftKind: item.draftKind, workspaceId, draftOnly: item.draftOnly }
+	}
+	return { kind: 'self', deployKind: item.deployKind, path: item.path, workspaceId }
+}
+
+// ── Deploy plan (executed by the reactive layer) ─────────────────────────────
+
+export interface DeployPlanEntry {
+	key: string
+	op: Exclude<DeployOp, 'none'>
+	draftKind: UserDraftItemKind
+	path: string
+	draftOnly: boolean
+	rawApp: boolean
+	legacy: boolean
+}
+
+/** Concrete util arguments for deploying one item's draft into the session
+ *  workspace. Returns undefined for deployed (terminal) rows. Mirrors actionFor. */
+export function deployPlanFor(item: DeployItem): DeployPlanEntry | undefined {
+	if (!item.hasDraft) return undefined
+	return {
+		key: item.key,
+		op: 'deploy_draft',
+		draftKind: item.draftKind,
+		path: item.path,
+		draftOnly: item.draftOnly,
+		rawApp: item.rawApp,
+		legacy: item.legacy
+	}
+}
+
+/** Discard plan for a draft row (secondary action). */
+export function discardPlanFor(item: DeployItem): DeployPlanEntry | undefined {
+	if (!item.hasDraft) return undefined
+	return {
+		key: item.key,
+		op: 'discard',
+		draftKind: item.draftKind,
+		path: item.path,
+		draftOnly: item.draftOnly,
+		rawApp: item.rawApp,
+		legacy: item.legacy
+	}
+}
diff --git a/frontend/src/lib/components/sessions/sessionDraftCodecs.test.ts b/frontend/src/lib/components/sessions/sessionDraftCodecs.test.ts
index fd20c4e2dc..dc2d8cd132 100644
--- a/frontend/src/lib/components/sessions/sessionDraftCodecs.test.ts
+++ b/frontend/src/lib/components/sessions/sessionDraftCodecs.test.ts
@@ -6,12 +6,11 @@ import { describe, it, expect, vi } from 'vitest'
 vi.mock('$lib/components/flows/flowState', () => ({ initFlowState: () => Promise.resolve() }))
 
 import { makeScriptCodec } from './sessionDraftCodecs'
-import type { SessionRuntime } from './sessionRuntime.svelte'
 import type { NewScript } from '$lib/gen'
 
-// Minimal runtime stub: the script codec only touches `runtime.scriptStore.val`.
-function runtimeWith(script: Partial<NewScript> & { path: string }): SessionRuntime {
-	return { scriptStore: { val: script as NewScript } } as unknown as SessionRuntime
+// The script codec closes over one cell's store — a plain `{ val }` object.
+function storeWith(script: Partial<NewScript> & { path: string }): { val: NewScript } {
+	return { val: script as NewScript }
 }
 
 const STORAGE = 'u/admin/draft_abc'
@@ -19,7 +18,7 @@ const STORAGE = 'u/admin/draft_abc'
 describe('makeScriptCodec — draft_path (path rename)', () => {
 	it('writes draft_path when the typed path differs from the storage key', () => {
 		const codec = makeScriptCodec(
-			runtimeWith({ path: 'u/admin/friendly', content: 'c', summary: 's' }),
+			storeWith({ path: 'u/admin/friendly', content: 'c', summary: 's' }),
 			() => STORAGE
 		)
 		const draft = codec.storeToDraft(undefined) as (NewScript & { draft_path?: string }) | undefined
@@ -28,7 +27,7 @@ describe('makeScriptCodec — draft_path (path rename)', () => {
 
 	it('drops draft_path when the typed path equals the storage key', () => {
 		const codec = makeScriptCodec(
-			runtimeWith({ path: STORAGE, content: 'c', summary: 's' }),
+			storeWith({ path: STORAGE, content: 'c', summary: 's' }),
 			() => STORAGE
 		)
 		const draft = codec.storeToDraft(undefined) as (NewScript & { draft_path?: string }) | undefined
@@ -36,9 +35,9 @@ describe('makeScriptCodec — draft_path (path rename)', () => {
 	})
 
 	it('signature changes on a rename, so the outbound sync persists it', () => {
-		const before = makeScriptCodec(runtimeWith({ path: STORAGE, content: 'c' }), () => STORAGE)
+		const before = makeScriptCodec(storeWith({ path: STORAGE, content: 'c' }), () => STORAGE)
 		const after = makeScriptCodec(
-			runtimeWith({ path: 'u/admin/renamed', content: 'c' }),
+			storeWith({ path: 'u/admin/renamed', content: 'c' }),
 			() => STORAGE
 		)
 		expect(before.sig(before.storeToDraft(undefined)!)).not.toBe(
diff --git a/frontend/src/lib/components/sessions/sessionDraftCodecs.ts b/frontend/src/lib/components/sessions/sessionDraftCodecs.ts
index 9222438534..2f531f2406 100644
--- a/frontend/src/lib/components/sessions/sessionDraftCodecs.ts
+++ b/frontend/src/lib/components/sessions/sessionDraftCodecs.ts
@@ -2,35 +2,41 @@ import type { Flow, NewScript } from '$lib/gen'
 import { initFlowState } from '$lib/components/flows/flowState'
 import { flowDraftSig } from './flowDraftSig'
 import { applyDraftToRuntimeRawApp, runtimeRawAppToDraft, type RawAppDraft } from './appDraftCodec'
-import type { SessionRuntime } from './sessionRuntime.svelte'
+import type { RawAppRuntimeValue } from './sessionRuntime.svelte'
+import type { StateStore } from '$lib/utils'
 import type { DraftSyncCodec } from './useUserDraftSync.svelte'
 
 // Outbound debounce, uniform across kinds (script was previously immediate;
 // unified to 150ms so a typing burst coalesces into one persist like flow/raw_app).
 const DEBOUNCE_MS = 150
 
-export function makeFlowCodec(runtime: SessionRuntime): DraftSyncCodec<Flow> {
+// Each codec closes over one editor cell's store, so two live editors of the
+// same kind sync to their own drafts without crossing.
+export function makeFlowCodec(
+	store: StateStore<Flow>,
+	stateStore: { val: Record<string, any> }
+): DraftSyncCodec<Flow> {
 	return {
 		itemKind: 'flow',
 		sig: flowDraftSig,
 		debounceMs: DEBOUNCE_MS,
 		applyDraftToStore(incoming) {
-			const current = runtime.flowStore.val
+			const current = store.val
 			if (!current) return
-			runtime.flowStore.val = {
+			store.val = {
 				...current,
 				value: incoming.value,
 				schema: incoming.schema ?? current.schema,
 				summary: incoming.summary ?? current.summary,
 				description: incoming.description ?? current.description
 			}
-			// flowStateStore is keyed by module_id; after an AI write the set of
+			// stateStore is keyed by module_id; after an AI write the set of
 			// module ids may differ, so rebuild the UI state. This wipes per-module
 			// test args / preview output — a known v1 trade-off.
-			void initFlowState(runtime.flowStore.val, runtime.flowStateStore)
+			void initFlowState(store.val, stateStore)
 		},
 		storeToDraft() {
-			return runtime.flowStore.val
+			return store.val
 		}
 	}
 }
@@ -40,7 +46,7 @@ export function makeFlowCodec(runtime: SessionRuntime): DraftSyncCodec<Flow> {
 type ScriptDraft = NewScript & { draft_path?: string }
 
 export function makeScriptCodec(
-	runtime: SessionRuntime,
+	store: { val: NewScript | undefined },
 	// The draft's storage key (the URL path). A never-deployed script is parked
 	// here at `…/draft_<uuid>` while the user's typed name lives in `script.path`.
 	storagePath: () => string
@@ -63,7 +69,7 @@ export function makeScriptCodec(
 			}),
 		debounceMs: DEBOUNCE_MS,
 		applyDraftToStore(incoming) {
-			const script = runtime.scriptStore.val
+			const script = store.val
 			if (!script) return
 			if (typeof incoming.content !== 'string') return
 			script.content = incoming.content
@@ -71,7 +77,7 @@ export function makeScriptCodec(
 			if (incoming.summary !== undefined) script.summary = incoming.summary
 		},
 		storeToDraft(current) {
-			const script = runtime.scriptStore.val
+			const script = store.val
 			if (!script) return undefined
 			// Merge over the existing entry so fields the preview doesn't edit
 			// (set by the chat) survive a content-only save.
@@ -89,18 +95,20 @@ export function makeScriptCodec(
 	}
 }
 
-export function makeRawAppCodec(runtime: SessionRuntime): DraftSyncCodec<RawAppDraft> {
+export function makeRawAppCodec(store: {
+	val: RawAppRuntimeValue | undefined
+}): DraftSyncCodec<RawAppDraft> {
 	return {
 		itemKind: 'raw_app',
 		sig: (d) => JSON.stringify(d),
 		debounceMs: DEBOUNCE_MS,
 		applyDraftToStore(incoming) {
-			const current = runtime.rawApp.val
+			const current = store.val
 			if (!current) return
-			runtime.rawApp.val = applyDraftToRuntimeRawApp(current, incoming)
+			store.val = applyDraftToRuntimeRawApp(current, incoming)
 		},
 		storeToDraft() {
-			const raw = runtime.rawApp.val
+			const raw = store.val
 			if (!raw) return undefined
 			return runtimeRawAppToDraft(raw)
 		}
diff --git a/frontend/src/lib/components/sessions/sessionMode.svelte.ts b/frontend/src/lib/components/sessions/sessionMode.svelte.ts
new file mode 100644
index 0000000000..54a27d977a
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionMode.svelte.ts
@@ -0,0 +1,50 @@
+import { base } from '$app/paths'
+import type { SessionTarget } from './sessionState.svelte'
+
+// Maps a session's editor target to the canonical full-page Windmill route.
+export function sessionTargetHref(target: SessionTarget | undefined): string | undefined {
+	if (!target) return undefined
+	const seg =
+		target.kind === 'script'
+			? 'scripts/edit'
+			: target.kind === 'flow'
+				? 'flows/edit'
+				: target.kind === 'raw_app'
+					? 'apps_raw/edit'
+					: undefined
+	if (!seg) return undefined
+	return `${base}/${seg}/${target.path}`
+}
+
+// Force the global sidebar off in the previewed page (the sessions page already
+// has its own navigation rail) by setting Windmill's `nomenubar` query flag.
+// A session deliberately never switches the global workspaceStore, so the iframe
+// must carry the session's effective workspace as `?workspace=` — the logged
+// layout reads that param to scope the page, otherwise it renders against the
+// navigation workspace (wrong data for a fork-scoped session). Returns a
+// relative URL so the iframe stays same-origin.
+export function withMenuHidden(url: string, workspaceId?: string): string {
+	try {
+		const u = new URL(url, 'http://_')
+		u.searchParams.set('nomenubar', 'true')
+		if (workspaceId) u.searchParams.set('workspace', workspaceId)
+		return u.pathname + u.search + u.hash
+	} catch {
+		return url
+	}
+}
+
+// Append `?workspace=` to a canonical route so a full-page navigation (e.g.
+// "Open in workspace") lands on the session's effective workspace instead of
+// the navigation workspace. Unlike withMenuHidden, the menu is kept visible —
+// this leaves the session for the real workspace UI. No-op without a workspace.
+export function withWorkspaceParam(url: string, workspaceId?: string): string {
+	if (!workspaceId) return url
+	try {
+		const u = new URL(url, 'http://_')
+		u.searchParams.set('workspace', workspaceId)
+		return u.pathname + u.search + u.hash
+	} catch {
+		return url
+	}
+}
diff --git a/frontend/src/lib/components/sessions/sessionMode.test.ts b/frontend/src/lib/components/sessions/sessionMode.test.ts
new file mode 100644
index 0000000000..0a9dab80eb
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionMode.test.ts
@@ -0,0 +1,63 @@
+import { describe, it, expect } from 'vitest'
+import { sessionTargetHref, withMenuHidden, withWorkspaceParam } from './sessionMode.svelte'
+
+describe('sessionTargetHref', () => {
+	it('maps each editor kind to its full-page route', () => {
+		expect(sessionTargetHref({ kind: 'script', path: 'u/me/foo' })).toBe('/scripts/edit/u/me/foo')
+		expect(sessionTargetHref({ kind: 'flow', path: 'u/me/bar' })).toBe('/flows/edit/u/me/bar')
+		expect(sessionTargetHref({ kind: 'raw_app', path: 'u/me/app' })).toBe('/apps_raw/edit/u/me/app')
+	})
+
+	it('returns undefined for no target or a kind without a full-page route', () => {
+		expect(sessionTargetHref(undefined)).toBeUndefined()
+		expect(sessionTargetHref({ kind: 'pipeline', path: 'u/me/pipe' })).toBeUndefined()
+	})
+})
+
+describe('withMenuHidden', () => {
+	it('appends the nomenubar flag', () => {
+		expect(withMenuHidden('/runs')).toBe('/runs?nomenubar=true')
+	})
+
+	it('preserves existing query params and the hash', () => {
+		expect(withMenuHidden('/runs?tag=x#frag')).toBe('/runs?tag=x&nomenubar=true#frag')
+	})
+
+	it('overwrites an existing nomenubar value instead of duplicating it', () => {
+		expect(withMenuHidden('/runs?nomenubar=false')).toBe('/runs?nomenubar=true')
+	})
+
+	it('scopes the page to a workspace when one is given', () => {
+		expect(withMenuHidden('/runs', 'fork_ws')).toBe('/runs?nomenubar=true&workspace=fork_ws')
+	})
+
+	it('omits the workspace param when none is given', () => {
+		expect(withMenuHidden('/runs', undefined)).toBe('/runs?nomenubar=true')
+	})
+
+	it('returns unparseable input unchanged', () => {
+		expect(withMenuHidden('http://[bad')).toBe('http://[bad')
+	})
+})
+
+describe('withWorkspaceParam', () => {
+	it('appends the workspace param without touching the menu', () => {
+		expect(withWorkspaceParam('/scripts/get/abc', 'fork_ws')).toBe(
+			'/scripts/get/abc?workspace=fork_ws'
+		)
+	})
+
+	it('preserves existing query params and the hash', () => {
+		expect(withWorkspaceParam('/runs?tag=x#frag', 'fork_ws')).toBe(
+			'/runs?tag=x&workspace=fork_ws#frag'
+		)
+	})
+
+	it('is a no-op without a workspace', () => {
+		expect(withWorkspaceParam('/runs')).toBe('/runs')
+	})
+
+	it('returns unparseable input unchanged when a workspace is given', () => {
+		expect(withWorkspaceParam('http://[bad', 'fork_ws')).toBe('http://[bad')
+	})
+})
diff --git a/frontend/src/lib/components/sessions/sessionPreviewTabs.svelte.ts b/frontend/src/lib/components/sessions/sessionPreviewTabs.svelte.ts
new file mode 100644
index 0000000000..be25a3a75d
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionPreviewTabs.svelte.ts
@@ -0,0 +1,385 @@
+import { base } from '$lib/base'
+import { randomUUID } from '$lib/utils/uuid'
+import { editPathFor, type WorkspaceItem } from '$lib/components/workspacePicker'
+import {
+	matchPreviewPage,
+	parsePipelineRoute,
+	parsePreviewItemRoute,
+	previewLocationLabel,
+	resolvePreviewTab,
+	stripBase,
+	type PreviewTarget
+} from './previewRouter'
+import type { SessionPreviewTab, SessionTarget } from './sessionState.svelte'
+
+// The single live owner of a session's preview tabs. Runs behind a small
+// interface both the sessions page (renderer) and the `open_preview` tool cross,
+// so there is exactly one live copy of the tab model instead of three drifting
+// ones synced by effects. Persistence (and cell pruning) are injected as an
+// adapter, so the class is pure runes with no sessionState / IDB coupling
+// (mirrors PipelineEditorState). Held on SessionRuntime.previewTabs.
+
+export type PreviewTabsSnapshot = {
+	tabs: SessionPreviewTab[]
+	activeId: string
+	collapsed: boolean
+}
+
+export type PreviewTabsAdapter = {
+	// Write-behind the full tab model onto the durable backing (debounced by the
+	// owner). Fire-and-forget.
+	persist: (snapshot: PreviewTabsSnapshot) => void
+	// Fired synchronously on every tab-set change, so the runtime can drop editor
+	// cells no open tab references anymore (a closed / navigated-away item).
+	onTabsChanged?: () => void
+}
+
+// True when a tab's URL is the live editor for a specific editable item. Every
+// editable route resolves to an editor, so this doubles as the "same item" dedupe
+// test in open()/navigate().
+function isEditorTabFor(url: string, target: SessionTarget): boolean {
+	const slot = resolvePreviewTab(url)
+	return slot.kind === 'editor' && slot.editorKind === target.kind && slot.path === target.path
+}
+
+// URL a tab should load for a destination: a page's href, or an item's edit route.
+function targetUrl(target: PreviewTarget): string {
+	return target.type === 'page' ? target.href : `${base}${editPathFor(target.item)}`
+}
+
+// Strip the query params the sessions preview injects into iframe URLs
+// (`nomenubar` to hide the nav, `workspace` to scope the page): they aren't part
+// of the canonical page URL. The observed `loc` must drop them to stay symmetric
+// with `url` (targetUrl, which never carries them), else reopening the same page
+// spawns a duplicate tab instead of focusing the existing one.
+export function canonicalizeObservedLoc(loc: string): string {
+	try {
+		const u = new URL(loc, 'http://_')
+		u.searchParams.delete('nomenubar')
+		u.searchParams.delete('workspace')
+		return u.pathname + u.search + u.hash
+	} catch {
+		return loc
+	}
+}
+
+// The editor target a destination maps to, or undefined when it isn't an item we
+// host live (static pages, legacy drag-and-drop apps). Drives the open()/navigate()
+// dedupe — one editor tab per (kind, path).
+function editorTargetFor(target: PreviewTarget): SessionTarget | undefined {
+	if (target.type !== 'item') return undefined
+	const item = target.item
+	if (item.kind === 'script') return { kind: 'script', path: item.path }
+	if (item.kind === 'flow') return { kind: 'flow', path: item.path }
+	if (item.kind === 'app' && item.raw_app) return { kind: 'raw_app', path: item.path }
+	return undefined
+}
+
+// Adapt a session editor target (`open_preview` tool arg) to a preview
+// destination. A pipeline target's `path` is a folder name, not a workspace
+// item — it maps to the `/pipeline/<folder>` route, which resolvePreviewTab
+// mounts as the in-process graph editor.
+export function previewTargetForSessionTarget(
+	kind: SessionTarget['kind'],
+	path: string
+): PreviewTarget | undefined {
+	if (kind === 'pipeline') {
+		return { type: 'page', href: `${base}/pipeline/${encodeURIComponent(path)}`, label: path }
+	}
+	const item: WorkspaceItem =
+		kind === 'raw_app'
+			? { kind: 'app', raw_app: true, path, summary: '' }
+			: { kind, path, summary: '' }
+	return { type: 'item', item }
+}
+
+// Build the initial tab model for a session: its saved tabs, else empty. Default
+// collapse: collapsed only for a session with nothing to preview.
+export function hydratePreviewTabs(session: {
+	previewTabs?: SessionPreviewTab[]
+	activePreviewTabId?: string
+	previewCollapsed?: boolean
+}): PreviewTabsSnapshot {
+	// Saved tabs come straight from IndexedDB — drop malformed records (missing
+	// id/url) and duplicate ids, which would break the page's keyed {#each}.
+	const seen = new Set<string>()
+	const tabs: SessionPreviewTab[] = []
+	for (const t of session.previewTabs ?? []) {
+		if (!t?.id || !t?.url || seen.has(t.id)) continue
+		seen.add(t.id)
+		// Rebuilt field-by-field so stray properties on old saved records (e.g. the
+		// retired `pinned` flag) don't survive hydration and get persisted back.
+		tabs.push({ id: t.id, url: t.url, loc: t.loc ?? t.url })
+	}
+	if (tabs.length > 0) {
+		const wantActive = session.activePreviewTabId
+		const activeId = wantActive && tabs.some((t) => t.id === wantActive) ? wantActive : tabs[0].id
+		return { tabs, activeId, collapsed: session.previewCollapsed ?? false }
+	}
+	return { tabs: [], activeId: '', collapsed: session.previewCollapsed ?? true }
+}
+
+const FLUSH_DELAY_MS = 400
+
+export class SessionPreviewTabs {
+	// Each tab tracks two URLs: `url` is what we command the iframe to load
+	// (changes only on an explicit open/navigate), `loc` the last observed
+	// location. Keeping them separate lets a tab stay mounted — in-iframe
+	// navigation updates `loc` only, so `url` (bound to `src`) never reloads.
+	#tabs = $state<SessionPreviewTab[]>([])
+	#activeId = $state('')
+	#collapsed = $state(false)
+	readonly #adapter: PreviewTabsAdapter
+	readonly #flushDelay: number
+	#flushHandle: ReturnType<typeof setTimeout> | undefined
+
+	constructor(
+		initial: PreviewTabsSnapshot,
+		adapter: PreviewTabsAdapter,
+		flushDelay = FLUSH_DELAY_MS
+	) {
+		this.#tabs = initial.tabs.map((t) => ({ ...t }))
+		this.#activeId = initial.activeId
+		this.#collapsed = initial.collapsed
+		this.#adapter = adapter
+		this.#flushDelay = flushDelay
+	}
+
+	get tabs(): SessionPreviewTab[] {
+		return this.#tabs
+	}
+	get activeId(): string {
+		return this.#activeId
+	}
+	get activeTab(): SessionPreviewTab | undefined {
+		return this.#tabs.find((t) => t.id === this.#activeId) ?? this.#tabs[0]
+	}
+	get collapsed(): boolean {
+		return this.#collapsed
+	}
+
+	// Open — or focus, if already shown — a tab for a destination, and reveal the
+	// panel. An editable item dedupes against the tab already hosting that same
+	// (kind, path); anything else dedupes on the tab's observed location.
+	open(target: PreviewTarget): { status: 'opened' | 'focused' } {
+		const editorTarget = editorTargetFor(target)
+		// A fresh session starts collapsed, so without this the tab opens behind a
+		// collapsed panel and the user sees nothing change.
+		this.#collapsed = false
+		if (editorTarget) {
+			// One editor tab per item: focus the tab already hosting this exact item.
+			const existing = this.#tabs.find((t) => isEditorTabFor(t.url, editorTarget))
+			if (existing) {
+				this.#activeId = existing.id
+				this.#flush()
+				return { status: 'focused' }
+			}
+		}
+		const url = targetUrl(target)
+		// Pipeline previews all share one runtime.pipelineEditorState, so keep at
+		// most one pipeline tab: re-point the existing one to the requested folder
+		// rather than opening a second pipeline editor that would fight over the
+		// shared state (`focused` when it already showed this folder, else `opened`
+		// since the view now shows a different pipeline).
+		const pipelineFolder = parsePipelineRoute(url)
+		if (pipelineFolder) {
+			const existing = this.#tabs.find((t) => parsePipelineRoute(t.url) !== null)
+			if (existing) {
+				const same = existing.url === url
+				existing.url = url
+				existing.loc = url
+				this.#activeId = existing.id
+				this.#flush()
+				return { status: same ? 'focused' : 'opened' }
+			}
+		}
+		// Focus the tab currently *showing* this destination instead of opening a
+		// duplicate. Matched on the observed `loc`, not `url`: a tab that was
+		// opened here but navigated away no longer counts as showing it.
+		const shown = this.#tabs.find((t) => t.loc === url)
+		if (shown) {
+			this.#activeId = shown.id
+			this.#flush()
+			return { status: 'focused' }
+		}
+		const tab: SessionPreviewTab = { id: randomUUID(), url, loc: url }
+		this.#tabs.push(tab)
+		this.#activeId = tab.id
+		this.#flush()
+		return { status: 'opened' }
+	}
+
+	// Re-point the active tab at a destination (breadcrumb pick / in-editor link /
+	// iframe-posted editor navigation).
+	navigate(target: PreviewTarget): void {
+		const t = this.#tabs.find((x) => x.id === this.#activeId)
+		if (!t) return
+		const editorTarget = editorTargetFor(target)
+		if (editorTarget) {
+			// Same dedupe as open(): if another tab already hosts this exact item,
+			// focus it instead of re-pointing this one — two tabs for one item would
+			// mount two editors racing the same (kind, path) cell.
+			const existing = this.#tabs.find((x) => isEditorTabFor(x.url, editorTarget))
+			if (existing && existing.id !== t.id) {
+				this.#activeId = existing.id
+				this.#flush()
+				return
+			}
+		}
+		const url = targetUrl(target)
+		// Keep at most one pipeline tab (all share runtime.pipelineEditorState): if a
+		// *different* tab already hosts a pipeline, retarget and focus it rather than
+		// turning the active tab into a second pipeline editor racing the shared
+		// state. Same invariant as open(); a no-op when the active tab is that tab.
+		const pipelineFolder = parsePipelineRoute(url)
+		if (pipelineFolder) {
+			const existing = this.#tabs.find((x) => parsePipelineRoute(x.url) !== null)
+			if (existing && existing.id !== t.id) {
+				existing.url = url
+				existing.loc = url
+				this.#activeId = existing.id
+				this.#flush()
+				return
+			}
+		}
+		t.url = url
+		t.loc = url
+		this.#flush()
+	}
+
+	// Replace the whole tab model and reveal the panel. For re-pointing an
+	// existing draft session at a new destination, where the current tabs
+	// (persisted and/or live) still show the previous one.
+	reset(tabs: SessionPreviewTab[], activeId: string): void {
+		this.#tabs = tabs.map((t) => ({ ...t }))
+		this.#activeId = activeId
+		this.#collapsed = false
+		this.#flush()
+	}
+
+	select(id: string): void {
+		if (this.#activeId === id) return
+		this.#activeId = id
+		this.#flush()
+	}
+
+	// Reorder the tabs to the given id order (drag-and-drop). Ids absent from the
+	// current set are ignored; any current tab the caller omitted is kept at the
+	// end so a stale/partial order can never drop a tab. No-op if unchanged.
+	reorder(orderedIds: string[]): void {
+		const byId = new Map(this.#tabs.map((t) => [t.id, t]))
+		const next: SessionPreviewTab[] = []
+		for (const id of orderedIds) {
+			const t = byId.get(id)
+			if (t) {
+				next.push(t)
+				byId.delete(id)
+			}
+		}
+		for (const t of this.#tabs) if (byId.has(t.id)) next.push(t)
+		if (next.length === this.#tabs.length && next.every((t, i) => t === this.#tabs[i])) return
+		this.#tabs = next
+		this.#flush()
+	}
+
+	close(id: string): void {
+		const idx = this.#tabs.findIndex((t) => t.id === id)
+		if (idx < 0) return
+		this.#tabs.splice(idx, 1)
+		if (this.#activeId === id) {
+			this.#activeId = (this.#tabs[idx] ?? this.#tabs[idx - 1] ?? this.#tabs[0])?.id ?? ''
+		}
+		this.#flush()
+	}
+
+	setCollapsed(collapsed: boolean): void {
+		if (this.#collapsed === collapsed) return
+		this.#collapsed = collapsed
+		this.#flush()
+	}
+
+	// Feed back the location an iframe reported on load (only the page can read
+	// contentWindow.location). Updates the observed `loc`, leaving `url` alone so
+	// the tab doesn't reload.
+	observeLocation(id: string, loc: string): void {
+		const t = this.#tabs.find((x) => x.id === id)
+		if (!t) return
+		const canonical = canonicalizeObservedLoc(loc)
+		if (t.loc === canonical) return
+		t.loc = canonical
+		this.#flush()
+	}
+
+	// Persist a pending write immediately, cancelling the debounce. Called on
+	// page hide — a mutation inside the debounce window would otherwise be lost
+	// to a reload/navigation. No-op when nothing is pending.
+	flushNow(): void {
+		if (this.#flushHandle === undefined) return
+		clearTimeout(this.#flushHandle)
+		this.#flushHandle = undefined
+		this.#persistNow()
+	}
+
+	#flush(): void {
+		// Prune cells promptly (cheap, synchronous) even though the durable persist
+		// stays debounced — a closed tab's editor cell should be reclaimable now.
+		this.#adapter.onTabsChanged?.()
+		clearTimeout(this.#flushHandle)
+		this.#flushHandle = setTimeout(() => {
+			this.#flushHandle = undefined
+			this.#persistNow()
+		}, this.#flushDelay)
+	}
+
+	#persistNow(): void {
+		this.#adapter.persist({
+			tabs: this.#tabs.map((t) => ({ ...t })),
+			activeId: this.#activeId,
+			collapsed: this.#collapsed
+		})
+	}
+}
+
+// Which tabs the `close_page` AI tool should close: every tab when `all`, else
+// those whose page label or stripped path contains `match` (case-insensitive).
+// Pure over a tab snapshot so the runtime handler can close by id and this stays
+// unit-testable. An empty/whitespace match closes nothing (the handler reports it).
+export function selectPreviewTabsToClose(
+	tabs: SessionPreviewTab[],
+	opts: { all: boolean; match: string | undefined }
+): SessionPreviewTab[] {
+	if (opts.all) return tabs.slice()
+	const needle = opts.match?.trim().toLowerCase()
+	if (!needle) return []
+	return tabs.filter((t) => {
+		const where = t.loc || t.url
+		return (
+			previewLocationLabel(where).toLowerCase().includes(needle) ||
+			where.toLowerCase().includes(needle)
+		)
+	})
+}
+
+// Human-readable summary of a session's open preview tabs, for the
+// `get_preview_status` AI tool. Pure over the owner's model. The "no session"
+// case is the caller's (the tool handler has the session context).
+export function describePreview(tabs: SessionPreviewTab[], activeId: string): string {
+	if (tabs.length === 0) return 'No preview tabs are open in the side panel.'
+	const lines = tabs.map((t) => {
+		const where = t.loc || t.url
+		const page = matchPreviewPage(where)
+		const pipelineFolder = parsePipelineRoute(where)
+		const route = parsePreviewItemRoute(where)
+		const label = page
+			? `page "${page.label}"`
+			: pipelineFolder
+				? `pipeline "${pipelineFolder}"`
+				: route
+					? `${route.raw_app ? 'raw_app' : route.kind} "${route.itemPath}"`
+					: stripBase(where)
+		const live = resolvePreviewTab(t.url).kind === 'editor' ? ', live editor' : ''
+		const active = t.id === activeId ? ', active' : ''
+		return `- ${label}${live}${active}`
+	})
+	return `${tabs.length} preview tab${tabs.length === 1 ? '' : 's'} open in the side panel:\n${lines.join('\n')}`
+}
diff --git a/frontend/src/lib/components/sessions/sessionPreviewTabs.test.ts b/frontend/src/lib/components/sessions/sessionPreviewTabs.test.ts
new file mode 100644
index 0000000000..00e3f6cc90
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionPreviewTabs.test.ts
@@ -0,0 +1,501 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import {
+	SessionPreviewTabs,
+	describePreview,
+	hydratePreviewTabs,
+	previewTargetForSessionTarget,
+	selectPreviewTabsToClose,
+	type PreviewTabsAdapter,
+	type PreviewTabsSnapshot
+} from './sessionPreviewTabs.svelte'
+import type { PreviewTarget } from './previewRouter'
+import type { SessionPreviewTab } from './sessionState.svelte'
+import { base } from '$lib/base'
+
+// In-memory adapter spy: records persisted snapshots, no IDB.
+function makeAdapter() {
+	const persisted: PreviewTabsSnapshot[] = []
+	const adapter: PreviewTabsAdapter = {
+		persist: (snap) => persisted.push(snap)
+	}
+	return { adapter, persisted }
+}
+
+function owner(initial: Partial<PreviewTabsSnapshot> = {}, adapter?: PreviewTabsAdapter) {
+	return new SessionPreviewTabs(
+		{ tabs: [], activeId: '', collapsed: false, ...initial },
+		adapter ?? makeAdapter().adapter,
+		// Deterministic debounce for the tests.
+		0
+	)
+}
+
+const scriptTarget: PreviewTarget = {
+	type: 'item',
+	item: { kind: 'script', path: 'u/me/foo', summary: '' }
+}
+const flowTarget: PreviewTarget = {
+	type: 'item',
+	item: { kind: 'flow', path: 'u/me/bar', summary: '' }
+}
+const rawAppTarget: PreviewTarget = {
+	type: 'item',
+	item: { kind: 'app', raw_app: true, path: 'u/me/app', summary: '' }
+}
+const dndAppTarget: PreviewTarget = {
+	type: 'item',
+	item: { kind: 'app', path: 'u/me/legacy', summary: '' }
+}
+const pageTarget: PreviewTarget = { type: 'page', href: '/runs', label: 'Runs' }
+const pipelineTarget: PreviewTarget = { type: 'page', href: `${base}/pipeline/crm`, label: 'crm' }
+const pipelineTarget2: PreviewTarget = {
+	type: 'page',
+	href: `${base}/pipeline/sales`,
+	label: 'sales'
+}
+
+beforeEach(() => {
+	vi.useFakeTimers()
+})
+afterEach(() => {
+	vi.useRealTimers()
+})
+
+describe('hydratePreviewTabs', () => {
+	it('uses saved tabs and a valid active id, panel open', () => {
+		const tabs: SessionPreviewTab[] = [
+			{ id: 'a', url: '/x', loc: '/x' },
+			{ id: 'b', url: '/y', loc: '/y' }
+		]
+		const snap = hydratePreviewTabs({ previewTabs: tabs, activePreviewTabId: 'b' })
+		expect(snap.tabs).toHaveLength(2)
+		expect(snap.activeId).toBe('b')
+		expect(snap.collapsed).toBe(false)
+	})
+
+	it('falls back to the first tab when the saved active id is stale', () => {
+		const snap = hydratePreviewTabs({
+			previewTabs: [{ id: 'a', url: '/x', loc: '/x' }],
+			activePreviewTabId: 'gone'
+		})
+		expect(snap.activeId).toBe('a')
+	})
+
+	it('is empty and collapsed for a session with nothing to preview', () => {
+		const snap = hydratePreviewTabs({})
+		expect(snap.tabs).toEqual([])
+		expect(snap.activeId).toBe('')
+		expect(snap.collapsed).toBe(true)
+	})
+
+	it('honours an explicit previewCollapsed override', () => {
+		expect(hydratePreviewTabs({ previewCollapsed: true }).collapsed).toBe(true)
+		expect(hydratePreviewTabs({ previewCollapsed: false }).collapsed).toBe(false)
+	})
+
+	it('drops malformed saved tabs, duplicate ids and stray fields, defaulting loc to url', () => {
+		const snap = hydratePreviewTabs({
+			previewTabs: [
+				// `pinned: true` mimics a record saved before the flag was retired.
+				{ id: 'a', url: '/x', pinned: true } as unknown as SessionPreviewTab,
+				{ id: '', url: '/no-id', loc: '/no-id' },
+				{ id: 'b', url: '', loc: '' },
+				{ id: 'a', url: '/dupe', loc: '/dupe' }
+			],
+			activePreviewTabId: 'a'
+		})
+		expect(snap.tabs).toEqual([{ id: 'a', url: '/x', loc: '/x' }])
+		expect(snap.activeId).toBe('a')
+	})
+
+	it('is empty when every saved tab is malformed', () => {
+		const snap = hydratePreviewTabs({
+			previewTabs: [{ id: '', url: '', loc: '' }]
+		})
+		expect(snap.tabs).toEqual([])
+		expect(snap.activeId).toBe('')
+	})
+})
+
+describe('previewTargetForSessionTarget', () => {
+	it('maps raw_app to a raw app item', () => {
+		expect(previewTargetForSessionTarget('raw_app', 'u/me/app')).toEqual({
+			type: 'item',
+			item: { kind: 'app', raw_app: true, path: 'u/me/app', summary: '' }
+		})
+	})
+	it('maps script/flow straight through', () => {
+		expect(previewTargetForSessionTarget('script', 'p')).toEqual({
+			type: 'item',
+			item: { kind: 'script', path: 'p', summary: '' }
+		})
+		expect(previewTargetForSessionTarget('flow', 'p')).toEqual({
+			type: 'item',
+			item: { kind: 'flow', path: 'p', summary: '' }
+		})
+	})
+	it('maps pipeline to its folder route page target', () => {
+		expect(previewTargetForSessionTarget('pipeline', 'my_folder')).toEqual({
+			type: 'page',
+			href: `${base}/pipeline/my_folder`,
+			label: 'my_folder'
+		})
+	})
+})
+
+describe('SessionPreviewTabs.open', () => {
+	it('opens an editor item, activates it, and reveals the panel', () => {
+		const o = owner({ collapsed: true })
+		const res = o.open(scriptTarget)
+		expect(res.status).toBe('opened')
+		expect(o.tabs).toHaveLength(1)
+		expect(o.tabs[0].url).toBe('/scripts/edit/u/me/foo')
+		expect(o.activeId).toBe(o.tabs[0].id)
+		expect(o.collapsed).toBe(false)
+	})
+
+	it('focuses the existing tab instead of duplicating when the item is already shown', () => {
+		const o = owner()
+		o.open(scriptTarget)
+		const firstId = o.tabs[0].id
+		o.select('nonexistent-noop') // no-op: not present
+		const res = o.open(scriptTarget)
+		expect(res.status).toBe('focused')
+		expect(o.tabs).toHaveLength(1)
+		expect(o.activeId).toBe(firstId)
+	})
+
+	it('opens a second tab for a different editor item', () => {
+		const o = owner()
+		o.open(scriptTarget)
+		const res = o.open(flowTarget)
+		expect(res.status).toBe('opened')
+		expect(o.tabs).toHaveLength(2)
+		expect(o.tabs.at(-1)!.url).toBe('/flows/edit/u/me/bar')
+	})
+
+	it('opens a raw app via its apps_raw route', () => {
+		const o = owner()
+		o.open(rawAppTarget)
+		expect(o.tabs[0].url).toBe('/apps_raw/edit/u/me/app')
+	})
+
+	it('focuses the tab already showing a page instead of duplicating', () => {
+		const o = owner()
+		o.open(pageTarget)
+		const firstId = o.activeId
+		o.open(scriptTarget)
+		const res = o.open(pageTarget)
+		expect(res.status).toBe('focused')
+		expect(o.tabs).toHaveLength(2)
+		expect(o.activeId).toBe(firstId)
+	})
+
+	it('opens a fresh page tab when the original navigated away', () => {
+		const o = owner()
+		o.open(pageTarget)
+		o.observeLocation(o.activeId, '/variables')
+		const res = o.open(pageTarget)
+		expect(res.status).toBe('opened')
+		expect(o.tabs).toHaveLength(2)
+	})
+
+	it('focuses (not duplicates) a page tab whose iframe reported the injected workspace/nomenubar params', () => {
+		const o = owner()
+		o.open(pageTarget) // /runs
+		// The iframe loads with the params the preview injects on the src.
+		o.observeLocation(o.activeId, '/runs?nomenubar=true&workspace=wm-fork-x')
+		const res = o.open(pageTarget)
+		expect(res.status).toBe('focused')
+		expect(o.tabs).toHaveLength(1)
+	})
+
+	it('opens a legacy drag-and-drop app as an iframe route', () => {
+		const o = owner()
+		o.open(dndAppTarget)
+		expect(o.tabs[0].url).toBe('/apps/edit/u/me/legacy')
+	})
+})
+
+describe('SessionPreviewTabs.navigate', () => {
+	it('retargets the active tab to an editor item', () => {
+		const o = owner()
+		o.open(pageTarget)
+		const tabId = o.activeId
+		o.navigate(flowTarget)
+		expect(o.tabs).toHaveLength(1)
+		expect(o.activeId).toBe(tabId)
+		expect(o.tabs[0].url).toBe('/flows/edit/u/me/bar')
+		expect(o.tabs[0].loc).toBe('/flows/edit/u/me/bar')
+	})
+
+	it('no-ops with no active tab', () => {
+		const o = owner()
+		o.navigate(flowTarget)
+		expect(o.tabs).toHaveLength(0)
+	})
+
+	it('retargets to a page', () => {
+		const o = owner()
+		o.open(scriptTarget)
+		o.navigate(pageTarget)
+		expect(o.tabs[0].url).toBe('/runs')
+	})
+
+	it('focuses the tab already hosting the item instead of duplicating the editor', () => {
+		const { adapter } = makeAdapter()
+		const o = owner({}, adapter)
+		o.open(scriptTarget)
+		const editorTabId = o.activeId
+		o.open(pageTarget)
+		const pageTabId = o.activeId
+		o.navigate(scriptTarget)
+		expect(o.activeId).toBe(editorTabId)
+		expect(o.tabs).toHaveLength(2)
+		// The page tab must keep its own url — only focus moved.
+		expect(o.tabs.find((t) => t.id === pageTabId)?.url).toBe('/runs')
+	})
+
+	it('retargets the one pipeline tab instead of turning the active tab into a second', () => {
+		const o = owner()
+		o.open(pipelineTarget)
+		const pipelineTabId = o.activeId
+		o.open(scriptTarget) // a second, non-pipeline tab is now active
+		const scriptTabId = o.activeId
+		o.navigate(pipelineTarget2)
+		// No second pipeline editor: the existing one is retargeted and focused.
+		expect(o.tabs).toHaveLength(2)
+		expect(o.activeId).toBe(pipelineTabId)
+		expect(o.tabs.find((t) => t.id === pipelineTabId)?.url).toBe(`${base}/pipeline/sales`)
+		// The script tab is untouched.
+		expect(o.tabs.find((t) => t.id === scriptTabId)?.url).toBe('/scripts/edit/u/me/foo')
+	})
+
+	it('retargets the active pipeline tab in place to a new folder', () => {
+		const o = owner()
+		o.open(pipelineTarget)
+		const tabId = o.activeId
+		o.navigate(pipelineTarget2)
+		expect(o.tabs).toHaveLength(1)
+		expect(o.activeId).toBe(tabId)
+		expect(o.tabs[0].url).toBe(`${base}/pipeline/sales`)
+	})
+})
+
+describe('SessionPreviewTabs.select / close / setCollapsed', () => {
+	it('selects a tab', () => {
+		const o = owner({
+			tabs: [
+				{ id: 'a', url: '/x', loc: '/x' },
+				{ id: 'b', url: '/y', loc: '/y' }
+			],
+			activeId: 'a'
+		})
+		o.select('b')
+		expect(o.activeId).toBe('b')
+		expect(o.activeTab?.id).toBe('b')
+	})
+
+	it('closes a tab and picks a neighbour when the active one goes', () => {
+		const o = owner({
+			tabs: [
+				{ id: 'a', url: '/x', loc: '/x' },
+				{ id: 'b', url: '/y', loc: '/y' },
+				{ id: 'c', url: '/z', loc: '/z' }
+			],
+			activeId: 'b'
+		})
+		o.close('b')
+		expect(o.tabs.map((t) => t.id)).toEqual(['a', 'c'])
+		expect(o.activeId).toBe('c')
+	})
+
+	it('closing the last tab empties the model', () => {
+		const o = owner({
+			tabs: [{ id: 'session', url: '/x', loc: '/x' }],
+			activeId: 'session'
+		})
+		o.close('session')
+		expect(o.tabs).toHaveLength(0)
+		expect(o.activeId).toBe('')
+	})
+
+	it('toggles collapsed', () => {
+		const o = owner({ collapsed: false })
+		o.setCollapsed(true)
+		expect(o.collapsed).toBe(true)
+	})
+
+	it('reset replaces the whole model and reveals the panel', () => {
+		const { adapter, persisted } = makeAdapter()
+		const o = owner(
+			{
+				tabs: [
+					{ id: 'a', url: '/x', loc: '/x' },
+					{ id: 'b', url: '/y', loc: '/y' }
+				],
+				activeId: 'b',
+				collapsed: true
+			},
+			adapter
+		)
+		o.reset([{ id: 'session', url: '/z', loc: '/z' }], 'session')
+		expect(o.tabs.map((t) => t.id)).toEqual(['session'])
+		expect(o.activeId).toBe('session')
+		expect(o.collapsed).toBe(false)
+		vi.runAllTimers()
+		expect(persisted.at(-1)?.tabs.map((t) => t.url)).toEqual(['/z'])
+	})
+})
+
+describe('SessionPreviewTabs.reorder', () => {
+	it('reorders tabs to the given id order and persists, keeping the active id', () => {
+		const { adapter, persisted } = makeAdapter()
+		const o = owner(
+			{
+				tabs: [
+					{ id: 'a', url: '/x', loc: '/x' },
+					{ id: 'b', url: '/y', loc: '/y' },
+					{ id: 'c', url: '/z', loc: '/z' }
+				],
+				activeId: 'a'
+			},
+			adapter
+		)
+		o.reorder(['c', 'a', 'b'])
+		expect(o.tabs.map((t) => t.id)).toEqual(['c', 'a', 'b'])
+		expect(o.activeId).toBe('a')
+		vi.runAllTimers()
+		expect(persisted.at(-1)?.tabs.map((t) => t.id)).toEqual(['c', 'a', 'b'])
+	})
+
+	it('ignores unknown ids and keeps omitted tabs at the end', () => {
+		const o = owner({
+			tabs: [
+				{ id: 'a', url: '/x', loc: '/x' },
+				{ id: 'b', url: '/y', loc: '/y' },
+				{ id: 'c', url: '/z', loc: '/z' }
+			],
+			activeId: 'a'
+		})
+		// 'zzz' doesn't exist (ignored); 'c' omitted from the order (kept at the end).
+		o.reorder(['b', 'zzz', 'a'])
+		expect(o.tabs.map((t) => t.id)).toEqual(['b', 'a', 'c'])
+	})
+
+	it('is a no-op (no persist) when the order is unchanged', () => {
+		const { adapter, persisted } = makeAdapter()
+		const o = owner(
+			{
+				tabs: [
+					{ id: 'a', url: '/x', loc: '/x' },
+					{ id: 'b', url: '/y', loc: '/y' }
+				],
+				activeId: 'a'
+			},
+			adapter
+		)
+		o.reorder(['a', 'b'])
+		vi.runAllTimers()
+		expect(persisted).toHaveLength(0)
+	})
+})
+
+describe('SessionPreviewTabs.observeLocation', () => {
+	it('updates loc without touching url', () => {
+		const o = owner({
+			tabs: [{ id: 'a', url: '/scripts/edit/u/me/foo', loc: '/scripts/edit/u/me/foo' }],
+			activeId: 'a'
+		})
+		o.observeLocation('a', '/scripts/edit/u/me/foo?tab=logs')
+		expect(o.tabs[0].url).toBe('/scripts/edit/u/me/foo')
+		expect(o.tabs[0].loc).toBe('/scripts/edit/u/me/foo?tab=logs')
+	})
+})
+
+describe('SessionPreviewTabs persistence', () => {
+	it('debounces a write-behind of the full model after mutations', () => {
+		const { adapter, persisted } = makeAdapter()
+		const o = owner({}, adapter)
+		o.open(scriptTarget)
+		o.open(flowTarget)
+		expect(persisted).toHaveLength(0) // nothing flushed synchronously
+		vi.runAllTimers()
+		expect(persisted).toHaveLength(1) // coalesced to one write
+		expect(persisted[0].tabs).toHaveLength(2)
+		expect(persisted[0].activeId).toBe(o.activeId)
+		expect(persisted[0].collapsed).toBe(false)
+	})
+
+	it('flushNow persists a pending write immediately and cancels the debounce', () => {
+		const { adapter, persisted } = makeAdapter()
+		const o = owner({}, adapter)
+		o.open(scriptTarget)
+		o.flushNow()
+		expect(persisted).toHaveLength(1)
+		vi.runAllTimers()
+		expect(persisted).toHaveLength(1) // debounce cancelled, no second write
+	})
+
+	it('flushNow is a no-op when nothing is pending', () => {
+		const { adapter, persisted } = makeAdapter()
+		const o = owner({}, adapter)
+		o.flushNow()
+		expect(persisted).toHaveLength(0)
+	})
+})
+
+describe('describePreview', () => {
+	it('reports no tabs when there are none', () => {
+		expect(describePreview([], '')).toContain('No preview tabs')
+	})
+
+	it('lists tabs, marks the active one, and flags the live editor', () => {
+		const tabs: SessionPreviewTab[] = [
+			{ id: 'a', url: '/scripts/edit/u/me/foo', loc: '/scripts/edit/u/me/foo' }
+		]
+		const out = describePreview(tabs, 'a')
+		expect(out).toContain('1 preview tab')
+		expect(out).toContain('script "u/me/foo"')
+		expect(out).toContain('live editor')
+		expect(out).toContain('active')
+	})
+
+	it('labels a known page and omits the live-editor flag for a non-item page', () => {
+		const tabs: SessionPreviewTab[] = [{ id: 'a', url: '/runs', loc: '/runs' }]
+		const out = describePreview(tabs, 'a')
+		expect(out).toContain('page "Runs"')
+		expect(out).not.toContain('live editor')
+	})
+})
+
+describe('selectPreviewTabsToClose', () => {
+	const tabs: SessionPreviewTab[] = [
+		{ id: 'runs', url: '/runs?status=failure', loc: '/runs?status=failure' },
+		{ id: 'sched', url: '/schedules', loc: '/schedules' },
+		{ id: 'script', url: '/scripts/edit/u/me/foo', loc: '/scripts/edit/u/me/foo' }
+	]
+
+	it('closes every tab when `all`', () => {
+		expect(
+			selectPreviewTabsToClose(tabs, { all: true, match: undefined }).map((t) => t.id)
+		).toEqual(['runs', 'sched', 'script'])
+	})
+
+	it('matches a page by its label, case-insensitively', () => {
+		expect(selectPreviewTabsToClose(tabs, { all: false, match: 'Runs' }).map((t) => t.id)).toEqual([
+			'runs'
+		])
+	})
+
+	it('matches an item tab by its path fragment', () => {
+		expect(
+			selectPreviewTabsToClose(tabs, { all: false, match: 'u/me/foo' }).map((t) => t.id)
+		).toEqual(['script'])
+	})
+
+	it('closes nothing for an empty/whitespace match or no match', () => {
+		expect(selectPreviewTabsToClose(tabs, { all: false, match: '   ' })).toEqual([])
+		expect(selectPreviewTabsToClose(tabs, { all: false, match: 'nonexistent' })).toEqual([])
+	})
+})
diff --git a/frontend/src/lib/components/sessions/sessionRuntime.svelte.ts b/frontend/src/lib/components/sessions/sessionRuntime.svelte.ts
index a575a19ab8..f55fbe68ec 100644
--- a/frontend/src/lib/components/sessions/sessionRuntime.svelte.ts
+++ b/frontend/src/lib/components/sessions/sessionRuntime.svelte.ts
@@ -1,17 +1,17 @@
-import { SvelteMap, SvelteSet } from 'svelte/reactivity'
+import { SvelteMap } from 'svelte/reactivity'
 import { get } from 'svelte/store'
+import { base } from '$lib/base'
 import { AIChatManager, AIMode } from '$lib/components/copilot/chat/AIChatManager.svelte'
+import { PipelineEditorState } from '$lib/components/assets/AssetGraph/pipelineEditorState.svelte'
 import { initFlow } from '$lib/components/flows/flowStore.svelte'
 import {
 	AppService,
 	FlowService,
 	ScriptService,
-	WorkspaceService,
 	type Flow,
 	type NewScript,
 	type Script,
-	type UserDraftOverlay,
-	type WorkspaceComparison
+	type UserDraftOverlay
 } from '$lib/gen'
 
 // `get_draft=true` does NOT merge: the top-level fields stay the deployed
@@ -26,28 +26,40 @@ type SavedFlow = Omit<Flow & UserDraftOverlay, 'draft'> & { draft?: Flow }
 import type { HiddenRunnable } from '$lib/components/apps/types'
 import { type RawAppData, DEFAULT_DATA } from '$lib/components/raw_apps/dataTableRefUtils'
 import { workspaceStore } from '$lib/stores'
+import { loadCopilot, copilotWorkspace } from '$lib/aiStore'
 import { emptySchema, type StateStore } from '$lib/utils'
 import {
 	commitSessionWorkspace,
 	deleteSession as deleteSessionState,
 	ensureChatIdsSeeded,
+	getEffectiveWorkspaceId,
 	materializeTransient,
 	sessionState,
 	setGeneratedSessionSummary,
 	setSessionChatId,
-	setSessionTarget,
-	type Session,
-	type SessionTarget
+	setSessionPreviewCollapsed,
+	setSessionTabs,
+	type Session
 } from './sessionState.svelte'
+import {
+	SessionPreviewTabs,
+	describePreview,
+	hydratePreviewTabs,
+	previewTargetForSessionTarget,
+	selectPreviewTabsToClose
+} from './sessionPreviewTabs.svelte'
+import { matchPreviewPage, parsePreviewItemRoute, previewLocationLabel } from './previewRouter'
 import { UserDraft } from '$lib/userDraft.svelte'
 import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 import { armRestartOnFirstInteraction } from '$lib/userDraftToast'
 import { applyDraftToRuntimeRawApp, runtimeRawAppToDraft, type RawAppDraft } from './appDraftCodec'
 import {
 	setDeployedInSessionHandler,
+	setClosePreviewTabsHandler,
 	setGetPreviewStatusHandler,
 	setGetRuntimeLogsHandler,
 	setListAppRunsHandler,
+	setOpenPagePreviewHandler,
 	setOpenPreviewHandler
 } from '$lib/components/copilot/chat/global/core'
 import {
@@ -70,63 +82,87 @@ import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
 // (synchronous) target swap.
 export interface LoadSlot {
 	loadedPath: string | undefined
+	// The workspace `loadedPath`'s content was fetched from. A session can retarget
+	// the same item path to a different fork, so the cache must key on both — else
+	// the editor keeps the old workspace's content while save/deploy write to the new.
+	loadedWorkspace: string | undefined
 	loading: boolean
 	notFound: boolean
 }
 
 export type SessionTargetKind = 'flow' | 'script' | 'raw_app'
 
+// The live runtime value a raw-app editor cell binds. Legacy drag-and-drop apps
+// are intentionally NOT hosted in the session preview (only code-based raw apps).
+export interface RawAppRuntimeValue {
+	files: Record<string, string>
+	runnables: Record<string, any>
+	data: RawAppData
+	policy: any
+	summary: string
+	path: string
+	custom_path?: string
+	draft_path?: string
+}
+// The deployed baseline a raw-app cell diffs against (topbar Diff drawer).
+export interface RawAppSavedValue {
+	value: {
+		files: Record<string, { code: string }>
+		runnables: Record<string, HiddenRunnable>
+	}
+	draft?: any
+	path: string
+	summary: string
+	policy: any
+	draft_only?: boolean
+	/** No deployed counterpart (draft-only); disables the topbar Diff. */
+	no_deployed?: boolean
+	custom_path?: string
+}
+
+// One editor cell per (kind, path) the session loads: the load slot plus the
+// content/baseline stores for that item. Keying by path lets several items of the
+// same kind stay loaded — and mounted as separate live editors — at once. A tab's
+// editor resolves its own cell via the accessors below.
+export interface FlowCell {
+	slot: LoadSlot
+	store: StateStore<Flow>
+	stateStore: { val: Record<string, any> }
+	saved: { val: SavedFlow | undefined }
+}
+export interface ScriptCell {
+	slot: LoadSlot
+	store: { val: NewScript | undefined }
+	saved: { val: SavedScript | undefined }
+}
+export interface RawAppCell {
+	slot: LoadSlot
+	store: { val: RawAppRuntimeValue | undefined }
+	saved: { val: RawAppSavedValue | undefined }
+}
+
 export interface SessionRuntime {
 	readonly sessionId: string
 	readonly manager: AIChatManager
-	// Kind-agnostic accessor over the per-kind load slots, for consumers (the
-	// editor-target gate) that only need load state and not the typed store.
-	slot(kind: SessionTargetKind): LoadSlot
-	// Flow target state
-	readonly flowStore: StateStore<Flow>
-	readonly flowStateStore: { val: Record<string, any> }
-	readonly savedFlow: { val: SavedFlow | undefined }
+	// Single live owner of this session's preview tabs. Both the sessions page
+	// (renderer) and the open_preview/get_preview_status tools cross it, so the
+	// tab model has exactly one live copy.
+	readonly previewTabs: SessionPreviewTabs
+	// Pipeline target state — persists across editor hide/show (the pane unmounts
+	// on hide, so this can't be component-local) and across session switches.
+	readonly pipelineEditorState: PipelineEditorState
+	// Per-(kind, path) editor cells (content/baseline stores + load slot), created
+	// on demand. Each editable preview tab resolves its own cell, so several items
+	// stay live at once.
+	flowCell(path: string): FlowCell
 	loadFlow(workspace: string, path: string, force?: boolean): Promise<void>
-	// Script target state (parallel to flow, populated only for script-targeted sessions)
-	readonly scriptStore: { val: NewScript | undefined }
-	readonly savedScript: { val: SavedScript | undefined }
+	scriptCell(path: string): ScriptCell
 	loadScript(workspace: string, path: string, force?: boolean): Promise<void>
-	// Note: legacy drag-and-drop apps are intentionally NOT hosted in the
-	// session preview pane (only code-based raw apps are), so there's no
-	// app target state here.
-	// Raw App (HTML-based) target state
-	readonly rawApp: {
-		val:
-			| {
-					files: Record<string, string>
-					runnables: Record<string, any>
-					data: RawAppData
-					policy: any
-					summary: string
-					path: string
-					custom_path?: string
-					draft_path?: string
-			  }
-			| undefined
-	}
-	readonly savedRawApp: {
-		val:
-			| {
-					value: {
-						files: Record<string, { code: string }>
-						runnables: Record<string, HiddenRunnable>
-					}
-					draft?: any
-					path: string
-					summary: string
-					policy: any
-					draft_only?: boolean
-					/** No deployed counterpart (draft-only); disables the topbar Diff. */
-					no_deployed?: boolean
-					custom_path?: string
-			  }
-			| undefined
-	}
+	rawAppCell(path: string): RawAppCell
+	// Non-creating peek at an editor cell's settled path (undefined when no cell
+	// exists yet for this (kind, path)), so callers can check load state without
+	// the cell accessors' create-on-miss side effect.
+	loadedEditorPath(kind: SessionTargetKind, path: string): string | undefined
 	loadRawApp(
 		workspace: string,
 		path: string,
@@ -137,37 +173,13 @@ export interface SessionRuntime {
 	requestRuntimeLogs(limit: number): Promise<RawAppRuntimeLogEntry[] | undefined>
 	setAppRunsProvider(provider: RawAppRunsProvider | undefined): void
 	getAppRuns(): RawAppRunSummary[] | undefined
-	// Discard the local draft + refresh the fork diff + force-reload the editor,
-	// so the preview matches the deployed version. Used by editor onDeploy + the
-	// chat deploy handler.
+	// Discard the local draft + force-reload the editor, so the preview matches
+	// the deployed version. Used by editor onDeploy + the chat deploy handler.
 	syncPreviewWithDeployed(
 		workspace: string,
 		kind: 'script' | 'flow' | 'raw_app',
 		path: string
 	): void
-	// Fork comparison cache: shared between SessionForkBar (count + dropdown)
-	// and any future consumer that needs the parent ↔ fork diff list. Keyed
-	// implicitly by the (parent, fork) pair last passed to ensureForkComparison;
-	// invalidateForkComparison() forces a refresh after a known-mutating action.
-	readonly forkComparison: { val: WorkspaceComparison | undefined }
-	readonly loadingForkComparison: boolean
-	ensureForkComparison(parent: string, fork: string): Promise<void>
-	invalidateForkComparison(): void
-	// Force-refresh against the last (parent, fork) pair the runtime
-	// fetched for. No-op if no comparison has ever been loaded. Useful
-	// for session-activation hooks that need a fresh count regardless of
-	// the dedupe key match.
-	refreshForkComparison(): Promise<void>
-	// Re-fetch the comparison shortly after a local mutation (e.g. an
-	// editor "Save draft"). The backend tally that registers the change
-	// lands asynchronously, so an immediate refresh races it — this
-	// schedules a couple of delayed refreshes so the fork-bar count
-	// updates without waiting for an AI turn or a tab refocus.
-	scheduleForkComparisonRefresh(): void
-	// Cancel pending fork-comparison refresh timers. Called by disposeRuntime so
-	// a torn-down (e.g. LRU-evicted, deleted) runtime can't fire a stray
-	// refreshForkComparisonNow / compareWorkspaces after it's gone.
-	dispose(): void
 }
 
 const runtimes = new SvelteMap<string, SessionRuntime>()
@@ -185,6 +197,32 @@ function emptyFlow(): Flow {
 	}
 }
 
+function emptyLoadSlot(): LoadSlot {
+	return { loadedPath: undefined, loadedWorkspace: undefined, loading: false, notFound: false }
+}
+
+// Cell factories — a cell starts in the empty-editor state (empty flow / no
+// script / no app) until its first load populates it.
+function makeFlowCell(): FlowCell {
+	const slot: LoadSlot = $state(emptyLoadSlot())
+	const store: StateStore<Flow> = $state({ val: emptyFlow() })
+	const stateStore: { val: Record<string, any> } = $state({ val: {} })
+	const saved: { val: SavedFlow | undefined } = $state({ val: undefined })
+	return { slot, store, stateStore, saved }
+}
+function makeScriptCell(): ScriptCell {
+	const slot: LoadSlot = $state(emptyLoadSlot())
+	const store: { val: NewScript | undefined } = $state({ val: undefined })
+	const saved: { val: SavedScript | undefined } = $state({ val: undefined })
+	return { slot, store, saved }
+}
+function makeRawAppCell(): RawAppCell {
+	const slot: LoadSlot = $state(emptyLoadSlot())
+	const store: { val: RawAppRuntimeValue | undefined } = $state({ val: undefined })
+	const saved: { val: RawAppSavedValue | undefined } = $state({ val: undefined })
+	return { slot, store, saved }
+}
+
 const GENERATED_SUMMARY_TIMEOUT_MS = 15000
 const GENERATED_SUMMARY_MAX_TRANSCRIPT_CHARS = 4000
 const GENERATED_SUMMARY_MAX_LENGTH = 60
@@ -268,12 +306,21 @@ function createRuntime(session: Session): SessionRuntime {
 	// Carried into the tool helpers so this session's preview/deploy tool calls
 	// dispatch to THIS session even when another session is the UI-active one.
 	manager.sessionId = session.id
+	// The chat targets the session's OWN (possibly forked) workspace without
+	// switching the global workspaceStore. Resolved live from the session record
+	// so it tracks the pending → committed (and staged-fork) transitions.
+	manager.workspaceResolver = () => {
+		const s = sessionState.sessions.find((x) => x.id === session.id)
+		return s ? getEffectiveWorkspaceId(s) : undefined
+	}
 	// Pre-flight: materialise the (still-transient) session, then commit
 	// the workspace (creating a staged fork if needed) before any send.
 	// AIChatManager awaits this so the first message hits a persisted
 	// session targeting the right workspace. Both calls are idempotent.
 	manager.beforeSend = async () => {
 		materializeTransient(session.id)
+		// Session is now persisted → flush any linked files buffered while it was transient.
+		await manager.attachedFiles.flushPending()
 		const committed = await commitSessionWorkspace(session.id, get(workspaceStore) ?? undefined)
 		// commitSessionWorkspace returns undefined only when the session did NOT
 		// commit to a workspace — most importantly when a staged fork failed to
@@ -287,71 +334,117 @@ function createRuntime(session: Session): SessionRuntime {
 				'the session workspace could not be created or committed (fork creation may have failed)'
 			)
 		}
+		// The composer may have been enabled by a previous workspace's copilot
+		// config (copilotInfo is global). getCurrentModel() reads it when the
+		// request builds just after this hook, so load the committed workspace's
+		// config first — otherwise a send right after switching workspaces could
+		// pick the old provider/model while the proxy + tools target the new one.
+		// SessionWrapper's active-session load usually already did this; skip the
+		// fetch when it matches (a staged fork commits to a fresh id its load missed).
+		if (get(copilotWorkspace) !== committed) {
+			await loadCopilot(committed)
+		}
 	}
 	manager.afterFirstTurnSaved = () => generateAndApplySessionSummary(session.id, manager)
 
-	const flowStore: StateStore<Flow> = $state({ val: emptyFlow() })
-	const flowStateStore: { val: Record<string, any> } = $state({ val: {} })
-	const savedFlow: { val: SavedFlow | undefined } = $state({
-		val: undefined
+	// One cell per (kind, path). Created on demand by the load methods; each holds
+	// cached content (KB–MB), not a mounted editor. Bounded to the items open
+	// preview tabs reference: pruneEditorCells (below) drops the rest when the tab
+	// set changes, so re-pointing one tab through many items can't leak cells.
+	const flowCells = new Map<string, FlowCell>()
+	const scriptCells = new Map<string, ScriptCell>()
+	const rawAppCells = new Map<string, RawAppCell>()
+	function flowCell(path: string): FlowCell {
+		let c = flowCells.get(path)
+		if (!c) flowCells.set(path, (c = makeFlowCell()))
+		return c
+	}
+	function scriptCell(path: string): ScriptCell {
+		let c = scriptCells.get(path)
+		if (!c) scriptCells.set(path, (c = makeScriptCell()))
+		return c
+	}
+	function rawAppCell(path: string): RawAppCell {
+		let c = rawAppCells.get(path)
+		if (!c) rawAppCells.set(path, (c = makeRawAppCell()))
+		return c
+	}
+	function loadedEditorPath(kind: SessionTargetKind, path: string): string | undefined {
+		const cell =
+			kind === 'flow'
+				? flowCells.get(path)
+				: kind === 'script'
+					? scriptCells.get(path)
+					: rawAppCells.get(path)
+		return cell?.slot.loadedPath
+	}
+	// Drop every editor cell no open preview tab still points at. Called on each
+	// tab-set change: a closed or navigated-away item's cell (and its cached
+	// content) is reclaimed. Deduping keeps at most one editor tab per item, so an
+	// item absent from the open tabs has no live editor to strand.
+	function pruneEditorCells(): void {
+		const keep = { flow: new Set<string>(), script: new Set<string>(), raw_app: new Set<string>() }
+		for (const t of previewTabs.tabs) {
+			const route = parsePreviewItemRoute(t.url)
+			if (!route) continue
+			const kind = route.raw_app ? 'raw_app' : route.kind
+			if (kind === 'flow' || kind === 'script' || kind === 'raw_app') keep[kind].add(route.itemPath)
+		}
+		for (const p of [...flowCells.keys()]) if (!keep.flow.has(p)) flowCells.delete(p)
+		for (const p of [...scriptCells.keys()]) if (!keep.script.has(p)) scriptCells.delete(p)
+		for (const p of [...rawAppCells.keys()]) if (!keep.raw_app.has(p)) rawAppCells.delete(p)
+	}
+
+	// Hydrate the preview-tab owner from the session record (the durable backing);
+	// from here on the owner is the single live copy and writes back through the
+	// adapter. setSessionTabs / setSessionPreviewCollapsed stay the low-level record
+	// writers (a transient session's writes land in the localStorage draft slot
+	// until it materialises).
+	const previewTabs = new SessionPreviewTabs(hydratePreviewTabs(session), {
+		persist: (snap) => {
+			setSessionTabs(session.id, snap.tabs, snap.activeId)
+			setSessionPreviewCollapsed(session.id, snap.collapsed)
+		},
+		onTabsChanged: pruneEditorCells
 	})
 
-	const flowSlot: LoadSlot = $state({ loadedPath: undefined, loading: false, notFound: false })
+	// Let the jobs tray open a run in this session's preview panel (as an iframe
+	// tab over the run page). The global side-panel chat leaves this unset and
+	// falls back to a new browser tab.
+	manager.openRunInPreview = ({ jobId, workspace, label }) => {
+		previewTabs.open({
+			type: 'page',
+			href: `${base}/run/${jobId}?workspace=${workspace}`,
+			label
+		})
+	}
 
-	const scriptStore: { val: NewScript | undefined } = $state({ val: undefined })
-	const savedScript: { val: SavedScript | undefined } = $state({ val: undefined })
-	const scriptSlot: LoadSlot = $state({ loadedPath: undefined, loading: false, notFound: false })
+	// Pipeline target state lives on the runtime (not the PipelineEditorView
+	// component) so the in-session drafts survive hide/show of the editor pane —
+	// the pane unmounts on hide, and a component-local store would be discarded.
+	const pipelineEditorState = new PipelineEditorState()
 
-	const rawApp: { val: SessionRuntime['rawApp']['val'] } = $state({ val: undefined })
-	const savedRawApp: { val: SessionRuntime['savedRawApp']['val'] } = $state({ val: undefined })
-	const rawAppSlot: LoadSlot = $state({ loadedPath: undefined, loading: false, notFound: false })
 	let runtimeLogRequester: RawAppRuntimeLogRequester | undefined = undefined
 	let appRunsProvider: RawAppRunsProvider | undefined = undefined
 
-	const forkComparison: { val: WorkspaceComparison | undefined } = $state({ val: undefined })
-	let loadingForkComparison = $state(false)
-	let forkComparisonKey: string | undefined = undefined
-	let forkRefreshTimers: ReturnType<typeof setTimeout>[] = []
-
-	// Stale-while-revalidate re-fetch against the last (parent, fork) pair.
-	// Shared by refreshForkComparison() and scheduleForkComparisonRefresh().
-	async function refreshForkComparisonNow() {
-		const key = forkComparisonKey
-		if (!key) return
-		const sep = key.indexOf('|')
-		if (sep < 0) return
-		const parent = key.slice(0, sep)
-		const fork = key.slice(sep + 1)
-		if (loadingForkComparison) return
-		loadingForkComparison = true
-		try {
-			forkComparison.val = await WorkspaceService.compareWorkspaces({
-				workspace: parent,
-				targetWorkspaceId: fork
-			})
-		} catch (e) {
-			console.error('SessionRuntime: forkComparison refresh failed', e)
-		} finally {
-			loadingForkComparison = false
-		}
-	}
-
 	return {
 		sessionId: session.id,
 		manager,
-		slot(kind: SessionTargetKind): LoadSlot {
-			return kind === 'flow' ? flowSlot : kind === 'script' ? scriptSlot : rawAppSlot
-		},
-		flowStore,
-		flowStateStore,
-		savedFlow,
+		previewTabs,
+		pipelineEditorState,
+		flowCell,
+		loadedEditorPath,
 
 		async loadFlow(workspace: string, path: string, force = false) {
-			if (flowSlot.loadedPath === path && !force) return
-			// See loadScript: forced reload remounts via the render gate.
-			if (force) flowSlot.loadedPath = undefined
-			flowSlot.loading = true
-			flowSlot.notFound = false
+			const { slot, store, stateStore, saved } = flowCell(path)
+			if (slot.loadedPath === path && slot.loadedWorkspace === workspace && !force) return
+			// See loadScript: forced reload remounts via the render gate. A workspace
+			// retarget (same path, new fork) drops the stale content the same way so
+			// the editor gate shows loading and outbound sync can't write the old
+			// workspace's content into the new one before the fetch lands.
+			if (force || slot.loadedWorkspace !== workspace) slot.loadedPath = undefined
+			slot.loading = true
+			slot.notFound = false
 			try {
 				// Draft first. UserDraft is the shared authoritative content
 				// source — the chat (write_flow / patch_flow_json /
@@ -375,20 +468,20 @@ function createRuntime(session: Session): SessionRuntime {
 					// yet on the backend — draft-only flows are a valid state.
 					try {
 						const result = await FlowService.getFlowByPath({ workspace, path, getDraft: true })
-						savedFlow.val = result as SavedFlow
+						saved.val = result as SavedFlow
 					} catch {
-						savedFlow.val = undefined
+						saved.val = undefined
 					}
-					await initFlow(aiDraft, flowStore, flowStateStore)
-					if (deployedVersionId != null && flowStore.val)
-						flowStore.val.version_id = deployedVersionId
-					flowSlot.loadedPath = path
+					await initFlow(aiDraft, store, stateStore)
+					if (deployedVersionId != null && store.val) store.val.version_id = deployedVersionId
+					slot.loadedPath = path
+					slot.loadedWorkspace = workspace
 					return
 				}
 
 				// No local draft yet — seed from `result.draft ?? result`.
 				const result = await FlowService.getFlowByPath({ workspace, path, getDraft: true })
-				savedFlow.val = result as SavedFlow
+				saved.val = result as SavedFlow
 				const flow: Flow = ((result as SavedFlow).draft ?? (result as Flow)) as Flow
 				// Seed the per-tab last_sync from the server draft's timestamp so the
 				// seeding save below attaches a matching last_sync and the server can
@@ -401,29 +494,30 @@ function createRuntime(session: Session): SessionRuntime {
 					(result as SavedFlow).draft_saved_at
 				)
 				UserDraft.save('flow', path, flow, { workspace })
-				await initFlow(flow, flowStore, flowStateStore)
-				if (deployedVersionId != null && flowStore.val) flowStore.val.version_id = deployedVersionId
-				flowSlot.loadedPath = path
+				await initFlow(flow, store, stateStore)
+				if (deployedVersionId != null && store.val) store.val.version_id = deployedVersionId
+				slot.loadedPath = path
+				slot.loadedWorkspace = workspace
 			} catch (err) {
 				console.error('Failed to load flow', err)
-				flowSlot.notFound = true
+				slot.notFound = true
 			} finally {
-				flowSlot.loading = false
+				slot.loading = false
 			}
 		},
 
-		scriptStore,
-		savedScript,
+		scriptCell,
 
 		async loadScript(workspace: string, path: string, force = false) {
-			if (scriptSlot.loadedPath === path && !force) return
+			const { slot, store, saved } = scriptCell(path)
+			if (slot.loadedPath === path && slot.loadedWorkspace === workspace && !force) return
 			// Forced reload: clearing the slot's loadedPath drops us into
 			// SessionEditorTarget's `{:else if slot.loadedPath === undefined}` gate,
 			// which unmounts then remounts the editor — avoids the Monaco init race a
 			// synchronous {#key} would hit.
-			if (force) scriptSlot.loadedPath = undefined
-			scriptSlot.loading = true
-			scriptSlot.notFound = false
+			if (force || slot.loadedWorkspace !== workspace) slot.loadedPath = undefined
+			slot.loading = true
+			slot.notFound = false
 			try {
 				// Draft first. UserDraft is the shared authoritative content
 				// source — the chat (write_script / edit_script) and the
@@ -438,16 +532,16 @@ function createRuntime(session: Session): SessionRuntime {
 					// savedScript undefined and skip parent_hash.
 					try {
 						const result = await ScriptService.getScriptByPath({ workspace, path, getDraft: true })
-						savedScript.val = result as SavedScript
+						saved.val = result as SavedScript
 					} catch {
-						savedScript.val = undefined
+						saved.val = undefined
 					}
 					// Clone before layering the AI draft on top, else we'd mutate
-					// `savedScript.val` in place and lose the pristine diff baseline.
-					const baseline: NewScript = savedScript.val
+					// `saved.val` in place and lose the pristine diff baseline.
+					const baseline: NewScript = saved.val
 						? (structuredClone(
 								$state.snapshot(
-									(savedScript.val.draft as NewScript | undefined) ?? (savedScript.val as NewScript)
+									(saved.val.draft as NewScript | undefined) ?? (saved.val as NewScript)
 								)
 							) as NewScript)
 						: {
@@ -466,20 +560,21 @@ function createRuntime(session: Session): SessionRuntime {
 								schema: emptySchema(),
 								language: (aiDraft.language ?? 'bun') as any
 							}
-					if (savedScript.val?.hash) {
-						baseline.parent_hash = savedScript.val.hash
+					if (saved.val?.hash) {
+						baseline.parent_hash = saved.val.hash
 					}
 					baseline.content = aiDraft.content
 					if (aiDraft.language) baseline.language = aiDraft.language
 					if (aiDraft.summary !== undefined) baseline.summary = aiDraft.summary
-					scriptStore.val = baseline
-					scriptSlot.loadedPath = path
+					store.val = baseline
+					slot.loadedPath = path
+					slot.loadedWorkspace = workspace
 					return
 				}
 
 				// No local draft yet — seed from `result.draft ?? result`.
 				const result = await ScriptService.getScriptByPath({ workspace, path, getDraft: true })
-				savedScript.val = result as SavedScript
+				saved.val = result as SavedScript
 				// Clone before mutating, else `baseline` aliases `result` and
 				// `baseline.parent_hash` corrupts the diff baseline.
 				const baseline = structuredClone(
@@ -497,25 +592,26 @@ function createRuntime(session: Session): SessionRuntime {
 					(result as SavedScript).draft_saved_at
 				)
 				UserDraft.save<NewScript>('script', path, baseline, { workspace })
-				scriptStore.val = baseline
-				scriptSlot.loadedPath = path
+				store.val = baseline
+				slot.loadedPath = path
+				slot.loadedWorkspace = workspace
 			} catch (err) {
 				console.error('Failed to load script', err)
-				scriptSlot.notFound = true
+				slot.notFound = true
 			} finally {
-				scriptSlot.loading = false
+				slot.loading = false
 			}
 		},
 
-		rawApp,
-		savedRawApp,
+		rawAppCell,
 
 		async loadRawApp(workspace: string, path: string, force = false, deployedOnly = false) {
-			if (rawAppSlot.loadedPath === path && !force) return
+			const { slot, store, saved } = rawAppCell(path)
+			if (slot.loadedPath === path && slot.loadedWorkspace === workspace && !force) return
 			// See loadScript: forced reload remounts via the render gate.
-			if (force) rawAppSlot.loadedPath = undefined
-			rawAppSlot.loading = true
-			rawAppSlot.notFound = false
+			if (force || slot.loadedWorkspace !== workspace) slot.loadedPath = undefined
+			slot.loading = true
+			slot.notFound = false
 			try {
 				// Draft first. UserDraft is the shared authoritative content
 				// source — the chat (init_app / write_app_file / ...) and the
@@ -539,7 +635,7 @@ function createRuntime(session: Session): SessionRuntime {
 						})
 						// Top-level fields are the deployed payload — the diff
 						// baseline, since the session has its own `aiDraft`.
-						savedRawApp.val = {
+						saved.val = {
 							summary: result.summary,
 							value: result.value as any,
 							path: result.path,
@@ -548,9 +644,9 @@ function createRuntime(session: Session): SessionRuntime {
 							no_deployed: result.no_deployed
 						}
 					} catch {
-						savedRawApp.val = undefined
+						saved.val = undefined
 					}
-					rawApp.val = applyDraftToRuntimeRawApp(
+					store.val = applyDraftToRuntimeRawApp(
 						{
 							files: {},
 							runnables: {},
@@ -561,7 +657,8 @@ function createRuntime(session: Session): SessionRuntime {
 						},
 						aiDraft
 					)
-					rawAppSlot.loadedPath = path
+					slot.loadedPath = path
+					slot.loadedWorkspace = workspace
 					return
 				}
 
@@ -574,7 +671,7 @@ function createRuntime(session: Session): SessionRuntime {
 					rawApp: true
 				})
 				// Deployed baseline for the diff drawer (top-level fields).
-				savedRawApp.val = {
+				saved.val = {
 					summary: result.summary,
 					value: result.value as any,
 					path: result.path,
@@ -621,18 +718,18 @@ function createRuntime(session: Session): SessionRuntime {
 					(result as any).draft_saved_at as string | undefined
 				)
 				UserDraft.save('raw_app', path, runtimeRawAppToDraft(runtimeValue), { workspace })
-				rawApp.val = runtimeValue
-				rawAppSlot.loadedPath = path
+				store.val = runtimeValue
+				slot.loadedPath = path
+				slot.loadedWorkspace = workspace
 			} catch (err) {
 				console.error('Failed to load raw app', err)
-				rawAppSlot.notFound = true
+				slot.notFound = true
 			} finally {
-				rawAppSlot.loading = false
+				slot.loading = false
 			}
 		},
 
 		syncPreviewWithDeployed(workspace, kind, path) {
-			this.scheduleForkComparisonRefresh()
 			// After deploy the editor state equals the deployed value; the reload
 			// below re-seeds the cell from it, which must NOT POST as a fresh draft.
 			// The full-page editor guards this with discardDraftAfterDeploy, but the
@@ -658,63 +755,6 @@ function createRuntime(session: Session): SessionRuntime {
 		},
 		getAppRuns() {
 			return appRunsProvider ? appRunsProvider() : undefined
-		},
-
-		forkComparison,
-		get loadingForkComparison() {
-			return loadingForkComparison
-		},
-
-		async ensureForkComparison(parent: string, fork: string) {
-			const key = `${parent}|${fork}`
-			if (forkComparisonKey === key && forkComparison.val) return
-			if (loadingForkComparison && forkComparisonKey === key) return
-			forkComparisonKey = key
-			loadingForkComparison = true
-			try {
-				forkComparison.val = await WorkspaceService.compareWorkspaces({
-					workspace: parent,
-					targetWorkspaceId: fork
-				})
-			} catch (e) {
-				console.error('SessionRuntime: forkComparison fetch failed', e)
-				forkComparison.val = undefined
-				// On error, clear the key so the next call retries.
-				if (forkComparisonKey === key) forkComparisonKey = undefined
-			} finally {
-				loadingForkComparison = false
-			}
-		},
-
-		invalidateForkComparison() {
-			forkComparisonKey = undefined
-			forkComparison.val = undefined
-		},
-
-		// Stale-while-revalidate: re-fetch in place so the cached status
-		// (driving the sidebar dot, fork bar, etc.) stays put until the new
-		// result lands. Clearing forkComparison.val here flickered the icon
-		// back to the neutral GitFork on every session-activate refresh.
-		refreshForkComparison() {
-			return refreshForkComparisonNow()
-		},
-
-		scheduleForkComparisonRefresh() {
-			// The backend fork tally registers a draft save (createScript
-			// draft_only / DraftService.createDraft) asynchronously — ~300ms
-			// after the API call returns — so an immediate refresh races it.
-			// Fetch once after the tally typically lands, then again as a
-			// backstop for slower backends. Coalesce rapid saves by clearing
-			// any still-pending timers first.
-			for (const t of forkRefreshTimers) clearTimeout(t)
-			forkRefreshTimers = [
-				setTimeout(() => void refreshForkComparisonNow(), 700),
-				setTimeout(() => void refreshForkComparisonNow(), 2200)
-			]
-		},
-		dispose() {
-			for (const t of forkRefreshTimers) clearTimeout(t)
-			forkRefreshTimers = []
 		}
 	}
 }
@@ -723,13 +763,31 @@ async function initRuntime(runtime: SessionRuntime, session: Session) {
 	const { manager } = runtime
 	await manager.historyManager.init()
 	manager.historyManager.setSessionId(session.id)
+	// Restore linked files persisted for this session (live handles re-grant on send;
+	// snapshots restore directly). Non-transient sessions persist immediately.
+	await manager.attachedFiles.restore(session.id, !session.transient)
 	await ensureChatIdsSeeded(manager.historyManager)
 
+	// Keep the session record's chatId following the manager's active chat: a
+	// "/clear" rotation or a history switch would otherwise leave it pointing at
+	// the previous chat, and the compare-page handoff (`from_session`) would
+	// preselect the wrong chat's items.
+	manager.onChatRotated = (chatId) => setSessionChatId(session.id, chatId)
+
 	if (session.chatId) {
 		manager.historyManager.setCurrentChatId(session.chatId)
 		await manager.historyManager.tagChatWithSession(session.chatId, session.id)
 		await manager.loadPastChat(session.chatId)
+		// loadPastChat only seeds the mask when the chat exists in history; a chatId
+		// pointing at a chat not yet persisted (no turn saved) would leave it
+		// undefined, and the Edits surface would then show every workspace draft.
+		// Start tracking so this session is scoped to its own edits from the outset.
+		if (manager.modifiedItems === undefined) manager.initModifiedItemsTracking()
 	} else {
+		// Brand-new session chat: start tracking modified items now (empty mask)
+		// so the session bar filters to this chat's changes from the first turn.
+		// (loadPastChat handles seeding for the existing-chat branch above.)
+		manager.initModifiedItemsTracking()
 		setSessionChatId(session.id, manager.historyManager.getCurrentChatId())
 	}
 }
@@ -747,7 +805,6 @@ export function getOrCreateRuntime(session: Session): SessionRuntime {
 export function disposeRuntime(sessionId: string) {
 	const runtime = runtimes.get(sessionId)
 	if (!runtime) return
-	runtime.dispose()
 	runtime.manager.cancel('runtime disposed')
 	runtime.manager.historyManager.close()
 	runtimes.delete(sessionId)
@@ -761,6 +818,23 @@ export function getRuntime(sessionId: string): SessionRuntime | undefined {
 	return runtimes.get(sessionId)
 }
 
+// Point a session's preview at a single seed tab. For re-pointing an existing
+// draft session at a new destination ("Open in AI session" / new-session-from-
+// page on a reused transient): its previous tabs — persisted with the draft
+// and/or held by a live owner — would otherwise keep showing the old target.
+// Must write through the live owner when one exists; a bare record write would
+// be clobbered by the owner's next flush.
+export function resetSessionPreviewTabs(sessionId: string, url: string): void {
+	const tabs = [{ id: 'session', url, loc: url }]
+	const rt = runtimes.get(sessionId)
+	if (rt) {
+		rt.previewTabs.reset(tabs, 'session')
+	} else {
+		setSessionTabs(sessionId, tabs, 'session')
+		setSessionPreviewCollapsed(sessionId, false)
+	}
+}
+
 export type SessionChatStatus =
 	| 'idle'
 	| 'streaming'
@@ -769,33 +843,14 @@ export type SessionChatStatus =
 	| 'draft'
 	| 'error'
 
-// MRU set of session ids whose FlowEditorView is currently mounted. Capped at
-// MAX_WARM_EDITORS — sessions outside the set show chat-only. Module-scoped so
-// both the page (which mutates) and the sidebar (which reads for the dev clue)
-// see the same state.
-const MAX_WARM_EDITORS = 3
-export const editorWarmIds = new SvelteSet<string>()
-
-// Full session teardown: dispose the runtime, drop the LRU entry, and remove
-// from sessionState in one call. Callers (sidebar / header dropdowns) just
-// invoke this; navigation away from a deleted active session is the caller's
-// responsibility.
+// Full session teardown: dispose the runtime and remove from sessionState in one
+// call. Callers (sidebar / header dropdowns) just invoke this; navigation away
+// from a deleted active session is the caller's responsibility.
 export function removeSession(sessionId: string): void {
 	disposeRuntime(sessionId)
-	editorWarmIds.delete(sessionId)
 	deleteSessionState(sessionId)
 }
 
-export function promoteEditorWarm(sessionId: string): void {
-	editorWarmIds.delete(sessionId)
-	editorWarmIds.add(sessionId)
-	while (editorWarmIds.size > MAX_WARM_EDITORS) {
-		const oldest = editorWarmIds.values().next().value
-		if (oldest === undefined) break
-		editorWarmIds.delete(oldest)
-	}
-}
-
 // Register the global open_preview tool handler once at module load. It
 // dispatches to the *calling* session (sessionId threaded from the tool ctx),
 // falling back to the UI-active session only when none was passed — so a
@@ -807,25 +862,84 @@ setOpenPreviewHandler(({ sessionId: callerSessionId, kind, path }) => {
 	if (!sessionId) {
 		return 'Error: no active session to open the preview in.'
 	}
-	const current = sessionState.sessions.find((s) => s.id === sessionId)?.target
-	if (current && current.kind === kind && current.path === path) {
-		return `Preview is already open showing ${kind} "${path}".`
+	const session = sessionState.sessions.find((s) => s.id === sessionId)
+	if (!session) {
+		return 'Error: no active session to open the preview in.'
 	}
-	const target: SessionTarget = { kind, path }
-	setSessionTarget(sessionId, target)
-	promoteEditorWarm(sessionId)
-	return `Opened ${kind} preview for ${path} in the side panel.`
+	const target = previewTargetForSessionTarget(kind, path)
+	if (!target) {
+		return `Error: ${kind} targets cannot be shown in the preview panel.`
+	}
+	const result = getOrCreateRuntime(session).previewTabs.open(target)
+	return result.status === 'focused'
+		? `A preview tab is already showing ${kind} "${path}" — focused it.`
+		: `Opened ${kind} preview for ${path} in a new tab in the side panel.`
 })
 
-// Companion to the open_preview handler: report whether the calling session's
-// preview is open and which item it shows, so the assistant can avoid
-// re-opening a preview already showing the item it just edited.
+// open_page dispatches here to show a workspace page (Runs/Schedules) as a page
+// tab in the calling session's preview panel. Returns undefined when there is no
+// session so open_page can fall back to browser navigation.
+setOpenPagePreviewHandler(({ sessionId: callerSessionId, href, label, newTab }) => {
+	const sessionId = callerSessionId ?? sessionState.currentSessionId
+	if (!sessionId) return undefined
+	const session = sessionState.sessions.find((s) => s.id === sessionId)
+	if (!session) return undefined
+	const owner = getOrCreateRuntime(session).previewTabs
+	// Re-point the tab already showing this page (matched ignoring query/hash) so a
+	// filter change updates it in place instead of spawning a duplicate — unless the
+	// user asked for a separate tab. open() dedupes on the exact URL, so differing
+	// filters would otherwise always open a new tab.
+	const targetPage = matchPreviewPage(href)
+	if (!newTab && targetPage) {
+		const existing = owner.tabs.find(
+			(t) => matchPreviewPage(t.loc || t.url)?.path === targetPage.path
+		)
+		if (existing) {
+			owner.select(existing.id)
+			owner.navigate({ type: 'page', href, label })
+			owner.setCollapsed(false)
+			return `Updated the ${label} preview tab with the new filters.`
+		}
+	}
+	const result = owner.open({ type: 'page', href, label })
+	return result.status === 'focused'
+		? `A preview tab is already showing ${label} — focused it and applied the filters.`
+		: `Opened ${label} in a new preview tab in the side panel.`
+})
+
+// Companion to the open_preview handler: report the calling session's open
+// preview tabs (the panel is multi-tab), so the assistant can avoid re-opening
+// a tab already showing the item it just edited.
 setGetPreviewStatusHandler((callerSessionId) => {
 	const sessionId = callerSessionId ?? sessionState.currentSessionId
 	if (!sessionId) return 'No active session; the preview panel is unavailable.'
-	const target = sessionState.sessions.find((s) => s.id === sessionId)?.target
-	if (!target) return 'No preview is currently open in the side panel.'
-	return `The preview is currently open showing ${target.kind} "${target.path}".`
+	const session = sessionState.sessions.find((s) => s.id === sessionId)
+	if (!session) return 'No active session; the preview panel is unavailable.'
+	const owner = getOrCreateRuntime(session).previewTabs
+	return describePreview(owner.tabs, owner.activeId)
+})
+
+// close_page dispatches here to close preview tabs in the calling session's
+// panel. `all` clears every tab; otherwise `match` is a case-insensitive
+// substring tested against each tab's page label and stripped path.
+setClosePreviewTabsHandler(({ sessionId: callerSessionId, all, match }) => {
+	const sessionId = callerSessionId ?? sessionState.currentSessionId
+	if (!sessionId) return 'No active session; the preview panel is unavailable.'
+	const session = sessionState.sessions.find((s) => s.id === sessionId)
+	if (!session) return 'No active session; the preview panel is unavailable.'
+	const owner = getOrCreateRuntime(session).previewTabs
+	if (owner.tabs.length === 0) return 'The preview panel has no open tabs.'
+
+	const labelFor = (t: (typeof owner.tabs)[number]) => previewLocationLabel(t.loc || t.url)
+	// Resolve the doomed tabs to ids up front — close() re-indexes on each call.
+	const doomed = selectPreviewTabsToClose(owner.tabs, { all, match })
+	if (doomed.length === 0) {
+		const open = owner.tabs.map(labelFor).join(', ')
+		return `No open tab matched "${match}". Open tabs: ${open}.`
+	}
+	const closedLabels = doomed.map(labelFor)
+	for (const t of doomed) owner.close(t.id)
+	return `Closed ${closedLabels.length} preview tab${closedLabels.length === 1 ? '' : 's'} (${closedLabels.join(', ')}).`
 })
 
 // After a chat deploy, reload the calling session's preview — only if it's open
@@ -836,7 +950,9 @@ setDeployedInSessionHandler(({ sessionId: callerSessionId, kind, path }) => {
 	const session = sessionState.sessions.find((s) => s.id === sessionId)
 	const runtime = runtimes.get(sessionId)
 	if (!session?.workspace_id || !runtime) return
-	if (runtime.slot(kind).loadedPath !== path) return
+	// Peek without creating a cell: a deploy for an item with no open editor tab
+	// must not allocate an empty cell that lingers until the next prune.
+	if (runtime.loadedEditorPath(kind, path) !== path) return
 	runtime.syncPreviewWithDeployed(session.workspace_id, kind, path)
 })
 
diff --git a/frontend/src/lib/components/sessions/sessionScope.svelte.ts b/frontend/src/lib/components/sessions/sessionScope.svelte.ts
index a69074fdf8..9bcf1bfd8a 100644
--- a/frontend/src/lib/components/sessions/sessionScope.svelte.ts
+++ b/frontend/src/lib/components/sessions/sessionScope.svelte.ts
@@ -1,32 +1,20 @@
 import { derived, type Readable } from 'svelte/store'
 import { workspaceStore, userWorkspaces, type UserWorkspace } from '$lib/stores'
-import { findWorkspaceDescendants } from '$lib/utils/workspaceHierarchy'
 
-// Walk up parent_workspace_id chain to find the root of the fork family
-// containing `id`. Falls back to the workspace itself if it has no parent
-// (or its parent isn't in the user's list).
-function findFamilyRoot(id: string, all: UserWorkspace[]): UserWorkspace | undefined {
-	let current = all.find((w) => w.id === id)
-	while (current?.parent_workspace_id) {
-		const parent = all.find((w) => w.id === current!.parent_workspace_id)
-		if (!parent) break
-		current = parent
+export function workspaceRootId(id: string | undefined, all: UserWorkspace[]): string | undefined {
+	if (!id) return undefined
+	let cur = all.find((w) => w.id === id)
+	if (!cur) return id
+	while (cur?.parent_workspace_id) {
+		const parentId = cur.parent_workspace_id
+		const parent = all.find((w) => w.id === parentId)
+		if (!parent) return parentId
+		cur = parent
 	}
-	return current
+	return cur?.id ?? id
 }
 
-// Set of workspace ids a session must belong to for the user to see it in
-// the sidebar list. The whole fork family is visible from any node: when
-// the user is inside fork A whose root is R, sessions belonging to R or
-// any sibling fork of A are listed too. Recomputes when the user switches
-// workspace or when the workspace list refreshes.
-export const visibleWorkspaceIds: Readable<Set<string>> = derived(
+export const currentWorkspaceRootId: Readable<string | undefined> = derived(
 	[workspaceStore, userWorkspaces],
-	([ws, all]) => {
-		if (!ws) return new Set<string>()
-		const root = findFamilyRoot(ws, all) ?? ({ id: ws } as UserWorkspace)
-		const ids = new Set<string>([root.id])
-		for (const d of findWorkspaceDescendants(root.id, all)) ids.add(d.id)
-		return ids
-	}
+	([ws, all]) => workspaceRootId(ws ?? undefined, all)
 )
diff --git a/frontend/src/lib/components/sessions/sessionState.svelte.ts b/frontend/src/lib/components/sessions/sessionState.svelte.ts
index 75a98efff5..8382c201ce 100644
--- a/frontend/src/lib/components/sessions/sessionState.svelte.ts
+++ b/frontend/src/lib/components/sessions/sessionState.svelte.ts
@@ -4,15 +4,24 @@ import { createLongHash } from '$lib/editorLangUtils'
 import { random_adj } from '$lib/components/random_positive_adjetive'
 import {
 	enterpriseLicense,
+	userStore,
 	userWorkspaces,
 	usersWorkspaceStore,
 	workspaceStore,
 	type UserWorkspace
 } from '$lib/stores'
 import { switchWorkspace } from '$lib/storeUtils'
+import { findCanonicalDevWorkspace } from '$lib/utils/workspaceHierarchy'
+import {
+	isRuleActive,
+	canUserBypassRuleKind,
+	protectionRulesState
+} from '$lib/workspaceProtectionRules.svelte'
 import { getLocalSetting, storeLocalSetting } from '$lib/utils'
+import { workspaceRootId } from './sessionScope.svelte'
+import { type DBSchema, type IDBPDatabase } from 'idb'
 import { userScopedDb } from '$lib/userScopedDb'
-import type { DBSchema, IDBPDatabase } from 'idb'
+import { deleteItemsForSession } from '../copilot/chat/files/attachedFilesDB'
 
 // Switch the global workspace iff the target differs from the active one
 // and is non-empty. Centralises the "session needs its workspace in focus"
@@ -23,39 +32,20 @@ export function syncWorkspaceTo(workspaceId: string | undefined): void {
 	if (workspaceId === get(workspaceStore)) return
 	switchWorkspace(workspaceId)
 }
-import { WorkspaceService, type WorkspaceComparison } from '$lib/gen'
+import { WorkspaceService } from '$lib/gen'
 import { sendUserToast } from '$lib/toast'
 import type HistoryManager from '$lib/components/copilot/chat/HistoryManager.svelte'
-import { onUserChange } from '$lib/userScopedStorage'
+import { onUserChange, scopedKey } from '$lib/userScopedStorage'
 
-// Kinds the in-session editor pane can host. Legacy drag-and-drop apps are
-// intentionally not previewable — only code-based 'raw_app' apps are.
-export type SessionTarget = { kind: 'flow' | 'script' | 'raw_app'; path: string }
-
-// Useful for filtering dropdowns / pickers to "items the side panel can open".
-export const EDITOR_TARGET_KINDS: ReadonlySet<SessionTarget['kind']> = new Set([
-	'flow',
-	'script',
-	'raw_app'
-])
-
-// Lifecycle status for a fork session. Git-parallel:
-//   in_sync     — fork is up to date with parent (or only behind — treated
-//                 the same since the user has no unmerged work either way).
-//   ahead       — fork has unmerged changes vs parent (branch ahead).
-//   diverged    — fork has unmerged changes AND parent has moved (branch
-//                 diverged from upstream — potential conflicts).
-//   unavailable — fork workspace is no longer in the user's list (deleted,
-//                 archived, or access revoked). Read-only fallback.
-//
-// `undefined` is the loading / not-applicable state (root session,
-// comparison not yet fetched).
-export type ForkStatus = 'in_sync' | 'ahead' | 'diverged' | 'unavailable'
+// A destination the session preview can open as an editor: a workspace item
+// (`path`) for flow/script/raw_app, or — for 'pipeline' — a folder name (not an
+// item path), which resolves to the data-pipeline graph editor for that folder.
+// Legacy drag-and-drop apps aren't previewable; only code-based 'raw_app' apps.
+export type SessionTarget = { kind: 'flow' | 'script' | 'raw_app' | 'pipeline'; path: string }
 
 // Whether the session points at a workspace that is itself a fork (i.e.
-// has a parent). Independent of comparison-fetch state — used by the
-// sidebar to pick between a root (Building) icon and a fork-status icon
-// before the comparison has loaded.
+// has a parent). Used by the sidebar to pick between a root (Building)
+// icon and a fork icon.
 //
 // Sessions whose committed workspace is no longer in the user's list are
 // still treated as forks (the "unavailable" terminal state) so we don't
@@ -68,29 +58,6 @@ export function isForkSession(session: Session, allWorkspaces: UserWorkspace[]):
 	return !!ws.parent_workspace_id
 }
 
-export function deriveForkStatus(
-	session: Session,
-	allWorkspaces: UserWorkspace[],
-	comparison: WorkspaceComparison | undefined
-): ForkStatus | undefined {
-	const wsId = session.workspace_id ?? session.pending_workspace_id
-	if (!wsId) return undefined
-	const ws = allWorkspaces.find((w) => w.id === wsId)
-	// Committed fork workspaces that disappear from the user's list
-	// (deleted, archived, or access lost) are flagged unavailable so
-	// the UI can render a terminal state without trying to switch into
-	// them. Drafts whose pending workspace also vanished get the same
-	// treatment.
-	if (!ws) return session.workspace_id ? 'unavailable' : undefined
-	if (!ws.parent_workspace_id) return undefined
-	if (!comparison) return undefined
-	const ahead = comparison.summary?.total_ahead ?? 0
-	const behind = comparison.summary?.total_behind ?? 0
-	if (ahead > 0 && behind > 0) return 'diverged'
-	if (ahead > 0) return 'ahead'
-	return 'in_sync'
-}
-
 export type PendingFork = {
 	// Existing workspace to fork from (drives routing/scope pre-send).
 	parent_workspace_id: string
@@ -117,8 +84,10 @@ export type Session = {
 	// deferred to first send (via commitSessionWorkspace) so cancelling
 	// the draft doesn't leave an orphan fork behind.
 	pending_fork?: PendingFork
+	// Stable root workspace id used only for sidebar grouping. Lifecycle follows
+	// workspace_id, not this field. Root sessions store the same id in both fields.
+	workspace_root_id?: string
 	chatId?: string
-	target?: SessionTarget
 	summary?: string
 	summarySource?: SessionSummarySource
 	createdAt: number
@@ -126,6 +95,10 @@ export type Session = {
 	// (toggleable via the picker filter). Archive is reversible — distinct
 	// from delete, which removes the session entirely.
 	archived?: boolean
+	// Set when `archived` was applied because the session's workspace was
+	// archived (not by the user). Lets reconciliation auto-unarchive the session
+	// when the workspace is unarchived, while leaving user-archived sessions be.
+	archivedByWorkspace?: boolean
 	// In-memory-only flag: the session exists but isn't written to
 	// IndexedDB until the user sends their first message. Avoids
 	// piling abandoned drafts across `+` clicks — createSession reuses
@@ -136,27 +109,44 @@ export type Session = {
 	// current message count to derive the unread badge (see sessionUnread).
 	// Travels on the record so it is scoped, migrated, and deleted with it.
 	lastSeenCount?: number
+	// Preview tabs the user opened in the sessions page, restored when the
+	// session is reopened.
+	previewTabs?: SessionPreviewTab[]
+	// Which preview tab was active. Falls back to the first tab on restore.
+	activePreviewTabId?: string
+	// Whether the user collapsed the preview panel for this session (to give the
+	// chat full width). Per-session so each session restores its own layout.
+	previewCollapsed?: boolean
 }
 
-// Sessions live in a per-user IndexedDB (windmill-sessions::email), one record
-// per session in the `sessions` store keyed by `id`. IndexedDB is the sole
-// store — no localStorage fallback. The bare localStorage keys below are the
-// pre-namespacing source migrated once into the first connecting user's DB.
+// One preview tab: `url` is the URL we command the iframe to load, `loc` the
+// last observed location (see the sessions page for the url/loc split).
+export type SessionPreviewTab = { id: string; url: string; loc: string }
+
+// Sessions live in one per-user IndexedDB, one record per session in the
+// `sessions` store keyed by `id`. IndexedDB is the sole store — no localStorage
+// fallback. The bare localStorage keys below are the oldest (pre-namespacing)
+// source, claimed once during the legacy migration.
 const SESSIONS_DB = 'windmill-sessions'
 const LEGACY_SESSIONS_KEY = 'windmill_sessions'
 const LEGACY_LAST_SEEN_KEY = 'windmill_sessions_last_seen_counts'
+// The single unsent (transient) draft, kept in localStorage (user-scoped) so a
+// reload doesn't lose what the user set up before their first message: name,
+// workspace/fork choice, editor target, preview tabs and the typed-but-unsent
+// prompt.
+const TRANSIENT_DRAFT_KEY = 'wm_session_transient_draft'
 
 interface SessionSchema extends DBSchema {
 	sessions: { key: string; value: Session }
 }
 
 // Normalise legacy localStorage records in place: drop empty-string
-// workspace_id (older drafts used '' as a missing marker), migrate the
-// deprecated 'rawapp' target.kind, and coerce unknown summarySource values.
-// Operates on raw parsed JSON, so the record is loosely typed.
+// workspace_id (older drafts used '' as a missing marker), drop the retired
+// `target` field (the preview is tab-driven now), and coerce unknown
+// summarySource values. Operates on raw parsed JSON, so the record is loosely typed.
 function normalizeLegacySession(s: Record<string, any>): void {
 	if (s.workspace_id === '') delete s.workspace_id
-	if (s.target?.kind === 'rawapp') s.target.kind = 'raw_app'
+	delete s.target
 	if (
 		s.summarySource !== undefined &&
 		s.summarySource !== 'placeholder' &&
@@ -215,6 +205,58 @@ async function migrateSessionsFromLocalStorage(db: IDBPDatabase<SessionSchema>):
 	storeLocalSetting(LEGACY_LAST_SEEN_KEY, undefined)
 }
 
+function sessionRootId(s: Session): string | undefined {
+	return (
+		s.workspace_root_id ??
+		workspaceRootId(s.workspace_id ?? s.pending_workspace_id, get(userWorkspaces)) ??
+		s.workspace_id ??
+		s.pending_workspace_id
+	)
+}
+
+// Whether a session belongs to the active workspace's family. Only in-memory
+// drafts (transient) may lack a root and still count as in-family — they follow
+// the user until a workspace is picked. A persisted session with no workspace
+// binding must fail closed: counting it as in-family would surface it in every
+// family, including freshly created workspaces.
+export function sessionInCurrentFamily(s: Session): boolean {
+	const currentRoot = workspaceRootId(get(workspaceStore) ?? undefined, get(userWorkspaces))
+	if (!currentRoot) return true
+	const root = sessionRootId(s)
+	if (root === undefined) return !!s.transient
+	return root === currentRoot
+}
+
+function ensureSessionRootId(s: Session): boolean {
+	if (s.workspace_root_id || s.transient) return false
+	const workspaceId = s.workspace_id ?? s.pending_workspace_id
+	if (workspaceId && get(userWorkspaces).length === 0) return false
+	const root = sessionRootId(s)
+	if (!root) return false
+	s.workspace_root_id = root
+	return true
+}
+
+// Recompute workspace_root_id from the live parent chain, replacing a stale
+// stored value. A fork family is re-rooted when an ancestor is deleted: the
+// FK's ON DELETE SET NULL nulls the child's parent_workspace_id, so the topmost
+// member shifts down. Without this, a sub-fork session keeps a root pointing at
+// the deleted ancestor and drops out of the sidebar (grouped under a dead root)
+// even though its own workspace is still alive. Only re-roots when the
+// workspace resolves in the live list — otherwise workspaceRootId falls back to
+// the id itself and would clobber a valid root for a merely-unavailable workspace.
+function refreshSessionRootId(s: Session): boolean {
+	if (s.transient) return false
+	const workspaceId = s.workspace_id ?? s.pending_workspace_id
+	if (!workspaceId) return false
+	const all = get(userWorkspaces)
+	if (!all.some((w) => w.id === workspaceId)) return false
+	const root = workspaceRootId(workspaceId, all)
+	if (!root || root === s.workspace_root_id) return false
+	s.workspace_root_id = root
+	return true
+}
+
 const sessionsDb = userScopedDb<SessionSchema>(SESSIONS_DB, {
 	version: 1,
 	upgrade(db) {
@@ -222,7 +264,9 @@ const sessionsDb = userScopedDb<SessionSchema>(SESSIONS_DB, {
 			db.createObjectStore('sessions', { keyPath: 'id' })
 		}
 	},
-	migrate: migrateSessionsFromLocalStorage
+	async migrate(db) {
+		await migrateSessionsFromLocalStorage(db)
+	}
 })
 
 // Starts empty: the list is hydrated from the user's IndexedDB by the
@@ -232,18 +276,91 @@ const sessionsDb = userScopedDb<SessionSchema>(SESSIONS_DB, {
 export const sessionState = $state<{
 	sessions: Session[]
 	currentSessionId: string | undefined
+	// False until the first IndexedDB hydration completes. Consumers gate their
+	// "not found" / empty states on it — before that, an empty list only means
+	// "still loading", not "the user has no sessions".
+	hydrated: boolean
 }>({
 	sessions: [],
-	currentSessionId: undefined
+	currentSessionId: undefined,
+	hydrated: false
 })
 
-// Write-behind a single session record. Transient (unsent) sessions stay in
-// memory only — they materialise via materializeTransient() at first send.
+type TransientDraft = Session & {
+	prompt?: string
+}
+
+// The unsent prompt for the current transient session, held here so every
+// draft write (which snapshots only the Session record) can carry it along.
+let transientPrompt: { sessionId: string; text: string } | undefined
+
+function writeTransientDraft(s: Session): void {
+	const key = scopedKey(TRANSIENT_DRAFT_KEY)
+	if (!key) return
+	const draft: TransientDraft = {
+		...($state.snapshot(s) as Session),
+		prompt: transientPrompt?.sessionId === s.id ? transientPrompt.text : undefined
+	}
+	storeLocalSetting(key, JSON.stringify(draft))
+}
+
+function readTransientDraft(): TransientDraft | undefined {
+	const key = scopedKey(TRANSIENT_DRAFT_KEY)
+	if (!key) return undefined
+	const raw = getLocalSetting(key)
+	if (!raw) return undefined
+	try {
+		const d = JSON.parse(raw)
+		if (!d || typeof d.id !== 'string' || typeof d.name !== 'string') return undefined
+		return d as TransientDraft
+	} catch {
+		return undefined
+	}
+}
+
+function clearTransientDraft(): void {
+	const key = scopedKey(TRANSIENT_DRAFT_KEY)
+	if (key) storeLocalSetting(key, undefined)
+	transientPrompt = undefined
+}
+
+// Debounced write-behind of the chat input for a transient session, so the
+// typed-but-unsent prompt survives a reload with the rest of the draft.
+let transientPromptFlushHandle: ReturnType<typeof setTimeout> | undefined
+export function queueTransientDraftPrompt(sessionId: string, text: string): void {
+	const s = sessionState.sessions.find((x) => x.id === sessionId)
+	if (!s?.transient) return
+	transientPrompt = { sessionId, text }
+	clearTimeout(transientPromptFlushHandle)
+	transientPromptFlushHandle = setTimeout(() => writeTransientDraft(s), 400)
+}
+
+// Read back the restored draft prompt when the session's runtime (and its chat
+// manager) is created. Peek, not take: later draft writes keep carrying it.
+export function peekTransientDraftPrompt(sessionId: string): string | undefined {
+	return transientPrompt?.sessionId === sessionId ? transientPrompt.text : undefined
+}
+
+// Write-behind a single session record. Transient (unsent) sessions are not
+// written to IndexedDB — they live in memory plus a single localStorage draft
+// slot until materializeTransient() promotes them at first send.
 // Awaits DB-open so a write racing hydration still lands; no-ops (degrades to
 // in-memory) when the DB can't be opened. In-memory $state is the read surface,
 // so callers fire-and-forget.
 export async function putSession(s: Session): Promise<void> {
-	if (!BROWSER || s.transient) return
+	if (!BROWSER) return
+	if (s.transient) {
+		writeTransientDraft(s)
+		return
+	}
+	// Never resurrect a session whose committed workspace is gone. A live runtime
+	// can still write through here after reconciliation deletes its record (chatId
+	// seed, unread watermark), so guard once the workspace list is loaded.
+	if (s.workspace_id) {
+		const all = get(userWorkspaces)
+		if (all.length > 0 && !all.some((w) => w.id === s.workspace_id)) return
+	}
+	ensureSessionRootId(s)
 	const db = await sessionsDb.whenReady()
 	if (!db) return
 	try {
@@ -269,69 +386,289 @@ export async function deleteSessionRecord(id: string): Promise<void> {
 // createSession() maintains (it prepends). whenReady() reopens for the current
 // user automatically, so this also handles user switch; an absent DB (logged
 // out / open failed) yields an empty list.
-async function hydrateSessions(): Promise<void> {
+async function hydrateSessions({ dropTransients = false } = {}): Promise<void> {
+	// Transient (unsent) drafts live only in memory and belong to the current
+	// user; preserve them across an intra-user reconcile, but drop them on a user
+	// change so one user's draft (and its pending fork/workspace state) never
+	// bleeds into the next user's list.
+	const transients = dropTransients ? [] : sessionState.sessions.filter((s) => s.transient)
 	const db = await sessionsDb.whenReady()
 	if (!db) {
-		sessionState.sessions = []
+		sessionState.sessions = transients
 		return
 	}
 	try {
 		const all = await db.getAll('sessions')
+		const changed = all.filter((s) => ensureSessionRootId(s))
+		for (const s of changed) await db.put('sessions', s)
 		all.sort((a, b) => b.createdAt - a.createdAt)
-		sessionState.sessions = all
+		// Restore the (user-scoped) unsent draft, unless it already materialised
+		// (present in the DB — e.g. sent from another browser tab) or the same
+		// draft is still live in memory.
+		const draft = readTransientDraft()
+		if (draft) {
+			if (all.some((s) => s.id === draft.id)) {
+				clearTransientDraft()
+			} else if (!transients.some((s) => s.id === draft.id)) {
+				const { prompt, ...rec } = draft
+				transients.push({ ...rec, transient: true })
+				if (prompt) transientPrompt = { sessionId: rec.id, text: prompt }
+			}
+		}
+		sessionState.sessions = [...transients, ...all]
 	} catch (e) {
 		console.error('Failed to load sessions from IndexedDB', e)
-		sessionState.sessions = []
+		sessionState.sessions = transients
 	}
 }
 
-// Re-hydrate whenever the logged-in email resolves or changes. On logout
-// (email → undefined) or a genuine user switch (X → Y) the in-memory list and
-// active-session pointer reset so one user's sessions never bleed into another.
+export type WorkspaceLifecycleStatus = 'active' | 'archived' | 'deleted'
+
+// The never-orphaned rule as a pure function of (session, its workspace's
+// status) — no IO, so the whole truth table is unit-testable. An `undefined`
+// status (workspace absent from the queried set) is a no-op, never a delete.
+//   deleted  → delete the session
+//   archived → archive it, tagged archivedByWorkspace (idempotent)
+//   active   → auto-unarchive iff WE archived it (has archivedByWorkspace)
+export function decideSessionLifecycle(
+	session: Session,
+	status: WorkspaceLifecycleStatus | undefined
+): { action: 'delete' | 'archive' | 'unarchive' | 'noop'; patch?: Partial<Session> } {
+	if (status === 'deleted') return { action: 'delete' }
+	if (status === 'archived') {
+		return session.archived
+			? { action: 'noop' }
+			: { action: 'archive', patch: { archived: true, archivedByWorkspace: true } }
+	}
+	if (status === 'active' && session.archivedByWorkspace) {
+		return { action: 'unarchive', patch: { archived: undefined, archivedByWorkspace: undefined } }
+	}
+	return { action: 'noop' }
+}
+
+// Apply a decision patch in place: `undefined` removes the key (the unarchive
+// path needs the flags gone, not set to undefined), any other value assigns.
+function applyLifecyclePatch(session: Session, patch: Partial<Session>): void {
+	for (const [k, v] of Object.entries(patch)) {
+		if (v === undefined) delete (session as Record<string, unknown>)[k]
+		else (session as Record<string, unknown>)[k] = v
+	}
+}
+
+// Workspace switches reconcile too (to catch a workspace deleted/archived on
+// another device), but throttled so rapid switching doesn't spam the status
+// endpoint. Mutation-driven reconciles are unthrottled.
+let lastReconcileAt = 0
+const RECONCILE_THROTTLE_MS = 30_000
+
+// Reconcile every stored session against its workspace's lifecycle. Sessions are
+// client-only, so the backend can't delete/archive them directly — instead the
+// client asks the backend for the status of every workspace its sessions
+// reference and applies the rule (see decideSessionLifecycle) the user can't see
+// happen otherwise. Reached via reconcileAfterWorkspaceChange (mutations),
+// load, and a throttled workspace switch.
+export async function reconcileSessionsLifecycle(): Promise<void> {
+	if (!BROWSER) return
+	lastReconcileAt = Date.now()
+	const db = await sessionsDb.whenReady()
+	if (!db) return
+	const wsIds = new Set<string>()
+	const sessions = await db.getAll('sessions')
+	for (const s of sessions) if (s.workspace_id) wsIds.add(s.workspace_id)
+	if (wsIds.size === 0) return
+
+	let status: Record<string, 'active' | 'archived' | 'deleted'>
+	try {
+		status = await WorkspaceService.getSessionWorkspaceStatus({
+			requestBody: { workspace_ids: [...wsIds] }
+		})
+	} catch (e) {
+		console.error('Failed to reconcile session lifecycle', e)
+		return
+	}
+
+	const deletedIds = new Set<string>()
+	try {
+		for (const s of sessions) {
+			if (!s.workspace_id) continue
+			const { action, patch } = decideSessionLifecycle(s, status[s.workspace_id])
+			if (action === 'delete') {
+				await db.delete('sessions', s.id)
+				// GC linked files too, matching deleteSession — a record-only delete
+				// here would orphan the session's attached-file blobs/handles.
+				void deleteItemsForSession(s.id)
+				deletedIds.add(s.id)
+				continue
+			}
+			let changed = action === 'archive' || action === 'unarchive'
+			if (changed && patch) applyLifecyclePatch(s, patch)
+			// Re-root surviving sessions whose family topmost member shifted (an
+			// ancestor was deleted); fall back to backfilling a missing root.
+			if (refreshSessionRootId(s) || ensureSessionRootId(s)) changed = true
+			if (changed) await db.put('sessions', s)
+		}
+	} catch (e) {
+		// The connection can go stale mid-loop (user switch reopens the per-user
+		// DB); this pass is best-effort — the next reconcile trigger retries.
+		console.error('Failed to reconcile session lifecycle', e)
+		return
+	}
+	await hydrateSessions()
+	// If the session the user was on lived in a now-deleted workspace, it was just
+	// removed — drop the dangling pointer so the page falls back to "no session
+	// selected" instead of a ghost.
+	if (sessionState.currentSessionId && deletedIds.has(sessionState.currentSessionId)) {
+		sessionState.currentSessionId = undefined
+	}
+}
+
+// The single seam for "a workspace just changed — bring sessions back in sync."
+// Refresh the workspace list FIRST — both reconcile and the putSession guard
+// read it, so it must reflect the change before reconcile runs — then reconcile.
+// Call this from every workspace create/delete/archive/unarchive site.
+export async function reconcileAfterWorkspaceChange(): Promise<void> {
+	if (!BROWSER) return
+	try {
+		usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
+	} catch (e) {
+		console.error('Failed to refresh workspace list before reconcile', e)
+	}
+	await reconcileSessionsLifecycle()
+}
+
+// Count non-transient sessions committed to a given workspace — used to warn the
+// user, before archiving/deleting a workspace, how many AI sessions go with it.
+export async function countSessionsForWorkspace(workspaceId: string): Promise<number> {
+	if (!BROWSER) return 0
+	const db = await sessionsDb.whenReady()
+	if (!db) return 0
+	try {
+		const all = await db.getAll('sessions')
+		return all.filter((s) => s.workspace_id === workspaceId && !s.transient).length
+	} catch {
+		return 0
+	}
+}
+
+export async function archiveSessionsForWorkspace(workspaceId: string): Promise<void> {
+	if (!BROWSER || !workspaceId) return
+	const db = await sessionsDb.whenReady()
+	if (!db) return
+	const all = await db.getAll('sessions')
+	for (const s of all) {
+		// Skip sessions the user already archived: tagging them archivedByWorkspace
+		// would make a later workspace-unarchive auto-restore them, discarding the
+		// user's manual archive. Mirrors decideSessionLifecycle's already-archived noop.
+		if (s.transient || s.workspace_id !== workspaceId || s.archived) continue
+		s.archived = true
+		s.archivedByWorkspace = true
+		ensureSessionRootId(s)
+		await db.put('sessions', s)
+	}
+	for (const s of sessionState.sessions) {
+		if (s.transient || s.workspace_id !== workspaceId || s.archived) continue
+		s.archived = true
+		s.archivedByWorkspace = true
+	}
+}
+
+export async function deleteSessionsForWorkspace(workspaceId: string): Promise<void> {
+	if (!BROWSER || !workspaceId) return
+	const db = await sessionsDb.whenReady()
+	if (!db) return
+	const all = await db.getAll('sessions')
+	const ids = new Set(
+		all.filter((s) => s.workspace_id === workspaceId && !s.transient).map((s) => s.id)
+	)
+	for (const id of ids) {
+		await db.delete('sessions', id)
+		// GC linked files too (matches deleteSession) so a workspace teardown
+		// doesn't leave the sessions' attached-file blobs/handles orphaned.
+		void deleteItemsForSession(id)
+	}
+	sessionState.sessions = sessionState.sessions.filter((s) => !ids.has(s.id))
+	if (sessionState.currentSessionId && ids.has(sessionState.currentSessionId)) {
+		sessionState.currentSessionId = undefined
+	}
+}
+
+// Re-hydrate on user (email) change. The new user's persisted sessions are
+// re-read from their own scoped DB (different email → different DB name); the
+// in-memory list is rebuilt from scratch — including dropping the previous
+// user's transient drafts — and the active-session pointer is cleared, so one
+// user's sessions never bleed into another.
 onUserChange(async (email, prevEmail) => {
 	if (!BROWSER) return
-	await hydrateSessions()
+	await hydrateSessions({ dropTransients: prevEmail !== email })
+	// onUserChange also fires at registration time, before the email resolves —
+	// that hydration is an empty no-op and must not clear the loading state.
+	if (email !== undefined) sessionState.hydrated = true
 	if (prevEmail !== undefined && prevEmail !== email) {
 		sessionState.currentSessionId = undefined
 	}
+	// Load-time reconcile: catch workspaces archived/deleted while away.
+	void reconcileSessionsLifecycle()
 })
 
+// Workspace switches do not reload or clear the active session. The sidebar
+// filters the single loaded session list by workspace_root_id, while the current
+// chat survives workspace switches.
+if (BROWSER) {
+	let lastWorkspace: string | undefined
+	let initialized = false
+	workspaceStore.subscribe((ws) => {
+		const isSwitch = initialized && ws !== lastWorkspace
+		initialized = true
+		lastWorkspace = ws
+		if (isSwitch && Date.now() - lastReconcileAt > RECONCILE_THROTTLE_MS) {
+			void reconcileSessionsLifecycle()
+		}
+	})
+}
+
 export function findSessionByName(name: string): Session | undefined {
 	return sessionState.sessions.find((s) => s.name === name)
 }
 
-// Walk up parent_workspace_id to the family root, given a starting
-// workspace id. Returns the input id if no parent chain is visible.
-function familyRootId(id: string | undefined, all: UserWorkspace[]): string | undefined {
-	if (!id) return undefined
-	let cur = all.find((w) => w.id === id)
-	while (cur?.parent_workspace_id) {
-		const parent = all.find((w) => w.id === cur!.parent_workspace_id)
-		if (!parent) break
-		cur = parent
-	}
-	return cur?.id ?? id
-}
-
 export function createSession(): Session {
 	// Reuse the existing transient session (if any) so the user can hit
 	// the "+" button repeatedly without piling drafts. The transient
-	// becomes a real session at first-message-send time.
+	// becomes a real session at first-message-send time. Only a transient
+	// from the active workspace family qualifies — reusing one left over
+	// from another family would hand the user a session still acting on
+	// that family. A cross-family leftover is dropped instead (it was
+	// never sent, so only the draft slot holds it).
 	const existingTransient = sessionState.sessions.find((s) => s.transient)
 	if (existingTransient) {
-		sessionState.currentSessionId = existingTransient.id
-		return existingTransient
+		if (sessionInCurrentFamily(existingTransient)) {
+			sessionState.currentSessionId = existingTransient.id
+			return existingTransient
+		}
+		sessionState.sessions = sessionState.sessions.filter((s) => s.id !== existingTransient.id)
+		clearTransientDraft()
 	}
 	const existingNumbers = sessionState.sessions
 		.map((s) => /^session-(\d+)$/.exec(s.name)?.[1])
 		.map((n) => (n ? parseInt(n, 10) : 0))
 	const next = (existingNumbers.length ? Math.max(...existingNumbers) : 0) + 1
-	// Default to the family root rather than wherever the user happens
-	// to be — sessions usually start from "the canonical workspace" and
-	// the picker lets them switch to a fork later.
+	// Start in the workspace you're in. The one exception: a root you can't
+	// deploy to (locked, no bypass) steers to its dev, since a session there
+	// couldn't edit anything. The picker lets you switch.
 	const currentWs = get(workspaceStore)
-	const root = familyRootId(currentWs ?? undefined, get(userWorkspaces))
-	const pending = root ?? currentWs
+	const devOfCurrent = currentWs
+		? findCanonicalDevWorkspace(currentWs, get(userWorkspaces))?.id
+		: undefined
+	// Only trust the deploy check once the active workspace's rules have actually loaded: until then
+	// `isRuleActive` reads an empty ruleset and fails open, which would default a new session onto a
+	// locked prod. Treat "not yet loaded for currentWs" as not-deployable so we steer to the dev (always
+	// editable) when one exists; the picker still lets the user switch back once rules resolve.
+	const rulesLoadedForCurrent =
+		protectionRulesState.rulesets !== undefined && protectionRulesState.workspace === currentWs
+	const canDeployHere =
+		rulesLoadedForCurrent &&
+		(!isRuleActive('DisableDirectDeployment') ||
+			canUserBypassRuleKind('DisableDirectDeployment', get(userStore)))
+	const pending = devOfCurrent && !canDeployHere ? devOfCurrent : currentWs
 	// Friendly default summary so the header reads like "Zippy session"
 	// rather than "Untitled session" — assigned at create time, the user
 	// can still rename it (or it gets overwritten by an editor target).
@@ -348,8 +685,9 @@ export function createSession(): Session {
 	}
 	sessionState.sessions = [session, ...sessionState.sessions]
 	sessionState.currentSessionId = session.id
-	// The new session is transient (in-memory only) until first send, so there
-	// is nothing to write to the DB yet.
+	// Transient until first send: no DB record yet, but the draft slot keeps it
+	// (name, workspace/fork choice, prompt) across reloads.
+	writeTransientDraft(session)
 	return session
 }
 
@@ -362,6 +700,8 @@ export function materializeTransient(id: string): void {
 	if (!s || !s.transient) return
 	delete s.transient
 	void putSession(s)
+	// Promoted to IndexedDB — the localStorage draft slot is now stale.
+	clearTransientDraft()
 }
 
 export function setSessionPendingWorkspace(id: string, workspace_id: string) {
@@ -424,11 +764,14 @@ export async function commitSessionWorkspace(
 			void putSession(s)
 			return undefined
 		}
-		if (get(workspaceStore) !== newId) switchWorkspace(newId)
 		s.workspace_id = newId
 		s.pending_fork = undefined
 		s.pending_workspace_id = undefined
-		void putSession(s)
+		s.workspace_root_id = workspaceRootId(newId, get(userWorkspaces)) ?? newId
+		await putSession(s)
+		// The global workspaceStore is intentionally left untouched: the session
+		// chat targets its own workspace via AIChatManager.operatingWorkspace, so
+		// committing must not yank the user's active (navigation-mode) workspace.
 		return newId
 	}
 
@@ -436,14 +779,11 @@ export async function commitSessionWorkspace(
 	if (!ws) return undefined
 	s.workspace_id = ws
 	s.pending_workspace_id = undefined
-	// `pending_workspace_id` defaults to the family root when created from
-	// inside a fork, so the committed workspace can differ from the active
-	// workspaceStore. Without this sync, the very first AI request's
-	// `logAiChat` and tool calls read the stale fork from workspaceStore
-	// while the session metadata says root. Mirrors the `switchWorkspace`
-	// in the pending_fork branch above.
-	if (get(workspaceStore) !== ws) syncWorkspaceTo(ws)
-	void putSession(s)
+	s.workspace_root_id = workspaceRootId(ws, get(userWorkspaces)) ?? ws
+	await putSession(s)
+	// The global workspaceStore is intentionally left untouched (see the fork
+	// branch above): the session chat reads its committed workspace through the
+	// manager's workspace resolver, not the active workspaceStore.
 	return ws
 }
 
@@ -454,17 +794,22 @@ export function getEffectiveWorkspaceId(session: Session): string | undefined {
 	return session.workspace_id ?? session.pending_workspace_id
 }
 
-// Canonical mutation for session.target. Persists, optionally seeds the
-// session summary, and centralises the path so callers don't reach into
-// session.target directly.
-export function setSessionTarget(id: string, target: SessionTarget, summary?: string): void {
+// Persist the session's preview tabs. Fire-and-forget write-behind (transient
+// sessions land in the localStorage draft slot).
+export function setSessionTabs(id: string, tabs: SessionPreviewTab[], activeTabId: string): void {
 	const s = sessionState.sessions.find((x) => x.id === id)
 	if (!s) return
-	s.target = target
-	if (!s.summary && summary) {
-		s.summary = summary
-		s.summarySource = 'generated'
-	}
+	s.previewTabs = tabs.map((t) => ({ ...t }))
+	s.activePreviewTabId = activeTabId
+	void putSession(s)
+}
+
+// Persist whether the preview panel is collapsed for this session. Fire-and-forget
+// write-behind (transient sessions land in the localStorage draft slot).
+export function setSessionPreviewCollapsed(id: string, collapsed: boolean): void {
+	const s = sessionState.sessions.find((x) => x.id === id)
+	if (!s || !!s.previewCollapsed === collapsed) return
+	s.previewCollapsed = collapsed
 	void putSession(s)
 }
 
@@ -544,14 +889,15 @@ export async function materializeFork(fork: PendingFork): Promise<string | undef
 // revoked — the chat history (stored in IndexedDB keyed by session id) is
 // preserved; only the workspace pointer changes. Drops pending fields
 // since the session is already past the draft stage by definition.
-export function moveSessionToWorkspace(id: string, newWorkspaceId: string) {
+export async function moveSessionToWorkspace(id: string, newWorkspaceId: string): Promise<void> {
 	const s = sessionState.sessions.find((x) => x.id === id)
 	if (!s) return
 	if (s.workspace_id === newWorkspaceId) return
 	s.workspace_id = newWorkspaceId
 	delete s.pending_workspace_id
 	delete s.pending_fork
-	void putSession(s)
+	s.workspace_root_id = workspaceRootId(newWorkspaceId, get(userWorkspaces)) ?? newWorkspaceId
+	await putSession(s)
 }
 
 // Create a brand-new fork and re-assign a committed session to it. Used
@@ -566,8 +912,10 @@ export async function moveSessionToNewFork(
 	if (!s) return undefined
 	const newId = await materializeFork(fork)
 	if (!newId) return undefined
+	// Persist the session before switching so the target workspace can show it
+	// immediately in the root-filtered sidebar.
+	await moveSessionToWorkspace(id, newId)
 	if (get(workspaceStore) !== newId) switchWorkspace(newId)
-	moveSessionToWorkspace(id, newId)
 	return newId
 }
 
@@ -575,20 +923,26 @@ export function setSessionArchived(id: string, archived: boolean) {
 	const s = sessionState.sessions.find((x) => x.id === id)
 	if (!s) return
 	const next = archived ? true : undefined
-	if (s.archived === next) return
+	if (s.archived === next && (archived || !s.archivedByWorkspace)) return
 	if (archived) s.archived = true
-	else delete s.archived
+	else {
+		delete s.archived
+		delete s.archivedByWorkspace
+	}
 	void putSession(s)
 }
 
 export function deleteSession(id: string) {
-	const idx = sessionState.sessions.findIndex((s) => s.id === id)
-	if (idx < 0) return
-	sessionState.sessions = sessionState.sessions.filter((s) => s.id !== id)
+	const s = sessionState.sessions.find((x) => x.id === id)
+	if (!s) return
+	if (s.transient) clearTransientDraft()
+	sessionState.sessions = sessionState.sessions.filter((x) => x.id !== id)
 	if (sessionState.currentSessionId === id) {
 		sessionState.currentSessionId = sessionState.sessions[0]?.id
 	}
 	void deleteSessionRecord(id)
+	// GC any linked files persisted for this session.
+	void deleteItemsForSession(id)
 }
 
 export function setSessionChatId(sessionId: string, chatId: string) {
diff --git a/frontend/src/lib/components/sessions/sessionState.test.ts b/frontend/src/lib/components/sessions/sessionState.test.ts
index 1af2055319..43694e9f3f 100644
--- a/frontend/src/lib/components/sessions/sessionState.test.ts
+++ b/frontend/src/lib/components/sessions/sessionState.test.ts
@@ -1,10 +1,12 @@
-import { describe, it, expect, vi } from 'vitest'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { get } from 'svelte/store'
 import {
 	commitSessionWorkspace,
-	deriveForkStatus,
+	createSession,
+	decideSessionLifecycle,
 	isForkSession,
 	renameSession,
+	sessionInCurrentFamily,
 	setGeneratedSessionSummary,
 	sessionState,
 	type Session
@@ -15,7 +17,7 @@ import {
 	workspaceStore,
 	type UserWorkspace
 } from '$lib/stores'
-import { WorkspaceService, type WorkspaceComparison } from '$lib/gen'
+import { WorkspaceService } from '$lib/gen'
 
 // Force createWorkspaceFork to fail so we can pin commitSessionWorkspace's
 // failure contract (the invariant the beforeSend abort fix relies on).
@@ -39,9 +41,6 @@ function session(over: Partial<Session> = {}): Session {
 function ws(id: string, parent?: string): UserWorkspace {
 	return { id, name: id, parent_workspace_id: parent } as unknown as UserWorkspace
 }
-function comparison(total_ahead: number, total_behind: number): WorkspaceComparison {
-	return { summary: { total_ahead, total_behind } } as unknown as WorkspaceComparison
-}
 
 describe('isForkSession', () => {
 	it('is false for a draft with no workspace at all', () => {
@@ -71,60 +70,6 @@ describe('isForkSession', () => {
 	})
 })
 
-describe('deriveForkStatus', () => {
-	it('is undefined for a draft with no workspace', () => {
-		expect(deriveForkStatus(session(), [], undefined)).toBeUndefined()
-	})
-
-	it('is unavailable when a committed workspace is no longer in the list', () => {
-		expect(deriveForkStatus(session({ workspace_id: 'gone' }), [], comparison(0, 0))).toBe(
-			'unavailable'
-		)
-	})
-
-	it('is undefined when a draft pending workspace is missing (not yet committed)', () => {
-		expect(
-			deriveForkStatus(session({ pending_workspace_id: 'gone' }), [], undefined)
-		).toBeUndefined()
-	})
-
-	it('is undefined for a non-fork (root) workspace', () => {
-		expect(
-			deriveForkStatus(session({ workspace_id: 'root' }), [ws('root')], comparison(3, 3))
-		).toBeUndefined()
-	})
-
-	it('is undefined for a fork before the comparison has loaded', () => {
-		expect(
-			deriveForkStatus(session({ workspace_id: 'fork' }), [ws('fork', 'root')], undefined)
-		).toBeUndefined()
-	})
-
-	it('is diverged when the fork is both ahead and behind', () => {
-		expect(
-			deriveForkStatus(session({ workspace_id: 'fork' }), [ws('fork', 'root')], comparison(2, 1))
-		).toBe('diverged')
-	})
-
-	it('is ahead when the fork has unmerged changes and the parent has not moved', () => {
-		expect(
-			deriveForkStatus(session({ workspace_id: 'fork' }), [ws('fork', 'root')], comparison(2, 0))
-		).toBe('ahead')
-	})
-
-	it('is in_sync when neither side is ahead', () => {
-		expect(
-			deriveForkStatus(session({ workspace_id: 'fork' }), [ws('fork', 'root')], comparison(0, 0))
-		).toBe('in_sync')
-	})
-
-	it('is in_sync when only the parent moved (behind-only, fork has no local changes)', () => {
-		expect(
-			deriveForkStatus(session({ workspace_id: 'fork' }), [ws('fork', 'root')], comparison(0, 2))
-		).toBe('in_sync')
-	})
-})
-
 describe('commitSessionWorkspace — fork-creation failure', () => {
 	it('returns undefined and drops pending_fork (so beforeSend aborts the send)', async () => {
 		const id = 'test-commit-fork-fail'
@@ -225,14 +170,12 @@ describe('commitSessionWorkspace — CE workspace-cap fork guard', () => {
 	})
 })
 
-describe('commitSessionWorkspace — workspaceStore sync (non-fork branch)', () => {
-	it('syncs workspaceStore to the committed workspace when they differ', async () => {
-		// Repro: user is sitting in a fork workspace (wm-fork-x) and creates a
-		// new session whose pending_workspace_id defaults to the family root.
-		// Without the syncWorkspaceTo call in commitSessionWorkspace's non-fork
-		// branch, the session metadata says root while the active workspace
-		// stays on the fork — so AIChatManager.chatRequest's logAiChat and tool
-		// calls would target the wrong workspace.
+describe('commitSessionWorkspace — leaves workspaceStore untouched', () => {
+	it('commits the session workspace without switching the active workspaceStore', async () => {
+		// A session chat targets its committed workspace through the manager's
+		// workspace resolver (AIChatManager.operatingWorkspace), so committing must
+		// NOT yank the user's active (navigation-mode) workspace — even when the
+		// committed workspace and the active one differ.
 		const id = 'test-commit-ws-sync'
 		const prev = get(workspaceStore)
 		workspaceStore.set('wm-fork-x')
@@ -247,29 +190,10 @@ describe('commitSessionWorkspace — workspaceStore sync (non-fork branch)', ()
 			expect(committed).toBe('root_ws')
 			const s = sessionState.sessions.find((x) => x.id === id)
 			expect(s?.workspace_id).toBe('root_ws')
+			expect(s?.workspace_root_id).toBe('root_ws')
 			expect(s?.pending_workspace_id).toBeUndefined()
-			expect(get(workspaceStore)).toBe('root_ws')
-		} finally {
-			const i = sessionState.sessions.findIndex((x) => x.id === id)
-			if (i >= 0) sessionState.sessions.splice(i, 1)
-			workspaceStore.set(prev)
-		}
-	})
-
-	it('is a no-op on workspaceStore when it already matches the committed workspace', async () => {
-		const id = 'test-commit-ws-match'
-		const prev = get(workspaceStore)
-		workspaceStore.set('root_ws')
-		sessionState.sessions.push({
-			id,
-			name: 'ws-match',
-			createdAt: 0,
-			pending_workspace_id: 'root_ws'
-		} as Session)
-		try {
-			const committed = await commitSessionWorkspace(id, undefined)
-			expect(committed).toBe('root_ws')
-			expect(get(workspaceStore)).toBe('root_ws')
+			// The active workspace is intentionally left where the user put it.
+			expect(get(workspaceStore)).toBe('wm-fork-x')
 		} finally {
 			const i = sessionState.sessions.findIndex((x) => x.id === id)
 			if (i >= 0) sessionState.sessions.splice(i, 1)
@@ -323,3 +247,142 @@ describe('session summary generation guards', () => {
 		}
 	})
 })
+
+describe('decideSessionLifecycle — the never-orphaned rule (pure)', () => {
+	const mk = (over: Partial<Session> = {}): Session => ({
+		id: 'x',
+		name: 'session-1',
+		workspace_id: 'ws',
+		createdAt: 0,
+		...over
+	})
+
+	it('deleted workspace → delete, regardless of archive state', () => {
+		expect(decideSessionLifecycle(mk(), 'deleted')).toEqual({ action: 'delete' })
+		expect(decideSessionLifecycle(mk({ archived: true }), 'deleted')).toEqual({ action: 'delete' })
+	})
+
+	it('archived workspace → archive (tagged) when not already archived; no-op otherwise', () => {
+		expect(decideSessionLifecycle(mk(), 'archived')).toEqual({
+			action: 'archive',
+			patch: { archived: true, archivedByWorkspace: true }
+		})
+		expect(decideSessionLifecycle(mk({ archived: true }), 'archived')).toEqual({ action: 'noop' })
+	})
+
+	it('active workspace → unarchive only the ones WE archived (archivedByWorkspace)', () => {
+		expect(
+			decideSessionLifecycle(mk({ archived: true, archivedByWorkspace: true }), 'active')
+		).toEqual({
+			action: 'unarchive',
+			patch: { archived: undefined, archivedByWorkspace: undefined }
+		})
+		// user-archived (no archivedByWorkspace flag) is left alone
+		expect(decideSessionLifecycle(mk({ archived: true }), 'active')).toEqual({ action: 'noop' })
+		expect(decideSessionLifecycle(mk(), 'active')).toEqual({ action: 'noop' })
+	})
+
+	it('unknown status (workspace absent from the queried set) → no-op, never a delete', () => {
+		expect(decideSessionLifecycle(mk(), undefined)).toEqual({ action: 'noop' })
+	})
+})
+
+// Two-family fixture: rootA (with forkA) and rootB. Returns a restore fn.
+function withTwoFamilies(activeWorkspace: string): () => void {
+	const prevUsers = get(usersWorkspaceStore)
+	const prevWs = get(workspaceStore)
+	usersWorkspaceStore.set({
+		email: 't@t',
+		workspaces: [ws('rootA'), ws('forkA', 'rootA'), ws('rootB')]
+	} as never)
+	workspaceStore.set(activeWorkspace)
+	return () => {
+		usersWorkspaceStore.set(prevUsers)
+		workspaceStore.set(prevWs)
+	}
+}
+
+describe('sessionInCurrentFamily', () => {
+	it('matches sessions bound anywhere in the active family, rejects other families', () => {
+		const restore = withTwoFamilies('forkA')
+		try {
+			expect(sessionInCurrentFamily(session({ workspace_id: 'rootA' }))).toBe(true)
+			expect(sessionInCurrentFamily(session({ pending_workspace_id: 'forkA' }))).toBe(true)
+			expect(sessionInCurrentFamily(session({ workspace_id: 'rootB' }))).toBe(false)
+		} finally {
+			restore()
+		}
+	})
+
+	it('fails open only for unbound transient drafts, closed for unbound persisted sessions', () => {
+		const restore = withTwoFamilies('rootA')
+		try {
+			// In-memory draft with no workspace picked yet — follows the user.
+			expect(sessionInCurrentFamily(session({ transient: true }))).toBe(true)
+			// Persisted session with no workspace binding (legacy data) must not
+			// surface in every family.
+			expect(sessionInCurrentFamily(session())).toBe(false)
+		} finally {
+			restore()
+		}
+	})
+
+	it('fails open when there is no active root', () => {
+		const restore = withTwoFamilies('rootA')
+		try {
+			workspaceStore.set(undefined)
+			expect(sessionInCurrentFamily(session({ workspace_id: 'rootB' }))).toBe(true)
+		} finally {
+			restore()
+		}
+	})
+})
+
+describe('createSession — transient reuse is family-scoped', () => {
+	it('reuses a transient from the active family', () => {
+		const restore = withTwoFamilies('rootA')
+		const prevCurrent = sessionState.currentSessionId
+		const transient = session({
+			id: 'transient-same-family',
+			name: 'session-901',
+			pending_workspace_id: 'forkA',
+			transient: true
+		})
+		sessionState.sessions.push(transient)
+		try {
+			const created = createSession()
+			expect(created.id).toBe('transient-same-family')
+			expect(sessionState.currentSessionId).toBe('transient-same-family')
+		} finally {
+			sessionState.sessions = sessionState.sessions.filter((s) => s.id !== 'transient-same-family')
+			sessionState.currentSessionId = prevCurrent
+			restore()
+		}
+	})
+
+	it('drops a transient left over from another family and starts in the active workspace', () => {
+		const restore = withTwoFamilies('rootB')
+		const prevCurrent = sessionState.currentSessionId
+		const stale = session({
+			id: 'transient-other-family',
+			name: 'session-902',
+			pending_workspace_id: 'forkA',
+			transient: true
+		})
+		sessionState.sessions.push(stale)
+		let createdId: string | undefined
+		try {
+			const created = createSession()
+			createdId = created.id
+			expect(created.id).not.toBe('transient-other-family')
+			expect(created.pending_workspace_id).toBe('rootB')
+			expect(sessionState.sessions.some((s) => s.id === 'transient-other-family')).toBe(false)
+		} finally {
+			sessionState.sessions = sessionState.sessions.filter(
+				(s) => s.id !== 'transient-other-family' && s.id !== createdId
+			)
+			sessionState.currentSessionId = prevCurrent
+			restore()
+		}
+	})
+})
diff --git a/frontend/src/lib/components/sessions/sessionStateIndexedDb.test.ts b/frontend/src/lib/components/sessions/sessionStateIndexedDb.test.ts
index 36a27095be..131a299082 100644
--- a/frontend/src/lib/components/sessions/sessionStateIndexedDb.test.ts
+++ b/frontend/src/lib/components/sessions/sessionStateIndexedDb.test.ts
@@ -8,6 +8,13 @@ vi.mock('esm-env', async (importOriginal) => ({
 	BROWSER: true
 }))
 
+// Spy on the attached-file GC so we can assert lifecycle deletes clean it up.
+const { deleteItemsForSessionMock } = vi.hoisted(() => ({ deleteItemsForSessionMock: vi.fn() }))
+vi.mock('../copilot/chat/files/attachedFilesDB', async (orig) => ({
+	...(await orig<typeof import('../copilot/chat/files/attachedFilesDB')>()),
+	deleteItemsForSession: deleteItemsForSessionMock
+}))
+
 // sessionState imports WorkspaceService; these tests don't touch the network.
 vi.mock('$lib/gen', async (orig) => {
 	const actual = await orig<typeof import('$lib/gen')>()
@@ -15,13 +22,28 @@ vi.mock('$lib/gen', async (orig) => {
 		...actual,
 		WorkspaceService: {
 			...actual.WorkspaceService,
-			listUserWorkspaces: vi.fn().mockResolvedValue([])
+			listUserWorkspaces: vi.fn().mockResolvedValue([]),
+			getSessionWorkspaceStatus: vi.fn().mockResolvedValue({})
 		}
 	}
 })
 
-import { userStore, type UserExt } from '$lib/stores'
-import { sessionState, putSession, deleteSessionRecord, type Session } from './sessionState.svelte'
+import { userStore, usersWorkspaceStore, type UserExt } from '$lib/stores'
+import { WorkspaceService } from '$lib/gen'
+import {
+	sessionState,
+	putSession,
+	deleteSession,
+	deleteSessionRecord,
+	archiveSessionsForWorkspace,
+	deleteSessionsForWorkspace,
+	materializeTransient,
+	peekTransientDraftPrompt,
+	queueTransientDraftPrompt,
+	reconcileSessionsLifecycle,
+	setSessionArchived,
+	type Session
+} from './sessionState.svelte'
 
 function asUser(email: string): UserExt {
 	return { email, username: email.split('@')[0] } as unknown as UserExt
@@ -52,6 +74,7 @@ beforeEach(async () => {
 	;(globalThis as any).indexedDB = new IDBFactory()
 	localStorage.clear()
 	userStore.set(undefined)
+	usersWorkspaceStore.set(undefined)
 	await flush()
 	sessionState.sessions = []
 	sessionState.currentSessionId = undefined
@@ -70,12 +93,96 @@ describe('sessionState IndexedDB persistence', () => {
 		await vi.waitFor(() => expect(sessionState.sessions.map((s) => s.id)).toEqual(['s2', 's1']))
 	})
 
-	it('does not persist transient sessions', async () => {
+	it('keeps a transient session as a user-scoped localStorage draft, not in IndexedDB', async () => {
 		const user = freshUser()
 		userStore.set(user)
 		await flush()
 
 		await putSession(session({ id: 't1', transient: true }))
+		// Same user reload: the draft is restored, still transient (i.e. it came
+		// from the localStorage slot — an IndexedDB record would have the flag
+		// stripped by materialisation).
+		await rehydrate(user)
+		await flush()
+		expect(sessionState.sessions.map((s) => ({ id: s.id, transient: s.transient }))).toEqual([
+			{ id: 't1', transient: true }
+		])
+
+		// The slot is user-scoped: another user sees nothing.
+		await rehydrate(freshUser())
+		await flush()
+		expect(sessionState.sessions).toEqual([])
+	})
+
+	it('round-trips a transient session preview state through the draft slot', async () => {
+		const user = freshUser()
+		userStore.set(user)
+		await flush()
+
+		await putSession(
+			session({
+				id: 't1b',
+				transient: true,
+				previewTabs: [{ id: 'session', url: '/x', loc: '/x' }],
+				activePreviewTabId: 'session',
+				previewCollapsed: false
+			})
+		)
+		await rehydrate(user)
+		await flush()
+		const restored = sessionState.sessions.find((s) => s.id === 't1b')
+		expect(restored?.previewTabs).toEqual([{ id: 'session', url: '/x', loc: '/x' }])
+		expect(restored?.activePreviewTabId).toBe('session')
+		expect(restored?.previewCollapsed).toBe(false)
+	})
+
+	it('materializeTransient promotes the draft to IndexedDB and clears the slot', async () => {
+		const user = freshUser()
+		userStore.set(user)
+		await flush()
+
+		const s = session({ id: 't2', transient: true })
+		sessionState.sessions = [s]
+		await putSession(s)
+		expect(localStorage.getItem(`wm_session_transient_draft::${user.email}`)).not.toBeNull()
+
+		materializeTransient('t2')
+		await flush()
+		expect(localStorage.getItem(`wm_session_transient_draft::${user.email}`)).toBeNull()
+
+		await rehydrate(user)
+		await vi.waitFor(() => expect(sessionState.sessions.map((x) => x.id)).toEqual(['t2']))
+		expect(sessionState.sessions[0].transient).toBeUndefined()
+	})
+
+	it('round-trips the unsent prompt through the draft slot', async () => {
+		const user = freshUser()
+		userStore.set(user)
+		await flush()
+
+		const s = session({ id: 't3', transient: true })
+		sessionState.sessions = [s]
+		await putSession(s)
+		queueTransientDraftPrompt('t3', 'draft prompt')
+		// The prompt write-behind debounces 400ms.
+		await new Promise((r) => setTimeout(r, 450))
+
+		await rehydrate(user)
+		await flush()
+		expect(sessionState.sessions.map((x) => x.id)).toEqual(['t3'])
+		expect(peekTransientDraftPrompt('t3')).toBe('draft prompt')
+	})
+
+	it('deleteSession discards the transient draft', async () => {
+		const user = freshUser()
+		userStore.set(user)
+		await flush()
+
+		const s = session({ id: 't4', transient: true })
+		sessionState.sessions = [s]
+		await putSession(s)
+		deleteSession('t4')
+
 		await rehydrate(user)
 		await flush()
 		expect(sessionState.sessions).toEqual([])
@@ -112,6 +219,23 @@ describe('sessionState IndexedDB persistence', () => {
 		await vi.waitFor(() => expect(sessionState.sessions.map((s) => s.id)).toEqual(['a1']))
 	})
 
+	it("drops the previous user's transient draft on a user change", async () => {
+		const a = freshUser()
+		const b = freshUser()
+
+		userStore.set(a)
+		await flush()
+		// A starts an unsent draft — transient, in-memory only, never persisted.
+		sessionState.sessions = [session({ id: 'a-draft', transient: true }), ...sessionState.sessions]
+
+		// Switch to B: A's transient must not bleed into B's list (it would
+		// otherwise be reused by createSession and inherit A's pending state).
+		userStore.set(b)
+		await vi.waitFor(() => {
+			expect(sessionState.sessions.some((s) => s.id === 'a-draft')).toBe(false)
+		})
+	})
+
 	it('resets the active session pointer on user switch', async () => {
 		const a = freshUser()
 		const b = freshUser()
@@ -123,6 +247,13 @@ describe('sessionState IndexedDB persistence', () => {
 	})
 
 	it('claims legacy localStorage sessions for the first connector, folding watermarks, then deletes the bare keys', async () => {
+		usersWorkspaceStore.set({
+			email: 'u@x.com',
+			workspaces: [
+				{ id: 'root', name: 'root', disabled: false },
+				{ id: 'fork', name: 'fork', parent_workspace_id: 'root', disabled: false }
+			] as never
+		})
 		localStorage.setItem(
 			'windmill_sessions',
 			JSON.stringify([
@@ -130,18 +261,22 @@ describe('sessionState IndexedDB persistence', () => {
 				// transient legacy entries are not persisted
 				{ id: 'leg2', name: 'L2', createdAt: 200, transient: true },
 				// legacy '' workspace marker is normalised away
-				{ id: 'leg3', name: 'L3', createdAt: 50, workspace_id: '' }
+				{ id: 'leg3', name: 'L3', createdAt: 50, workspace_id: '' },
+				{ id: 'leg4', name: 'L4', createdAt: 25, workspace_id: 'fork' }
 			])
 		)
 		localStorage.setItem('windmill_sessions_last_seen_counts', JSON.stringify({ leg1: 5 }))
 
 		const user = freshUser()
 		userStore.set(user)
-		await vi.waitFor(() => expect(sessionState.sessions.map((s) => s.id)).toEqual(['leg1', 'leg3']))
+		await vi.waitFor(() =>
+			expect(sessionState.sessions.map((s) => s.id)).toEqual(['leg1', 'leg3', 'leg4'])
+		)
 
 		const leg1 = sessionState.sessions.find((s) => s.id === 'leg1')!
 		expect(leg1.lastSeenCount).toBe(5)
 		expect(sessionState.sessions.find((s) => s.id === 'leg3')!.workspace_id).toBeUndefined()
+		expect(sessionState.sessions.find((s) => s.id === 'leg4')!.workspace_root_id).toBe('root')
 
 		// Bare keys are gone so a later different user does not re-inherit them.
 		expect(localStorage.getItem('windmill_sessions')).toBeNull()
@@ -174,6 +309,135 @@ describe('sessionState IndexedDB persistence', () => {
 		expect(localStorage.getItem('windmill_sessions_last_seen_counts')).toBeNull()
 	})
 
+	it('archiveSessionsForWorkspace tags only the sessions it archives, preserving user-archived ones', async () => {
+		const user = freshUser()
+		userStore.set(user)
+		await flush()
+
+		// One clean session and one the user already archived by hand, same workspace.
+		await putSession(session({ id: 'clean', createdAt: 100, workspace_id: 'wsA' }))
+		await putSession(
+			session({ id: 'userarch', createdAt: 50, workspace_id: 'wsA', archived: true })
+		)
+		await rehydrate(user)
+		await vi.waitFor(() => expect(sessionState.sessions.length).toBe(2))
+
+		await archiveSessionsForWorkspace('wsA')
+		await rehydrate(user)
+
+		// waitFor: rehydrate's re-population settles asynchronously, so re-find
+		// inside the retry rather than reading the list once immediately after.
+		await vi.waitFor(() => {
+			const clean = sessionState.sessions.find((s) => s.id === 'clean')!
+			const userarch = sessionState.sessions.find((s) => s.id === 'userarch')!
+			// Workspace-archived → tagged, so a later unarchive auto-restores it.
+			expect(clean.archived).toBe(true)
+			expect(clean.archivedByWorkspace).toBe(true)
+			// User-archived → left untouched (no tag), so unarchive won't resurrect it.
+			expect(userarch.archived).toBe(true)
+			expect(userarch.archivedByWorkspace).toBeUndefined()
+		})
+	})
+
+	it("GCs each session's attached files when its workspace is torn down", async () => {
+		const user = freshUser()
+		userStore.set(user)
+		await flush()
+		await putSession(session({ id: 'f1', createdAt: 1, workspace_id: 'wsX' }))
+		await putSession(session({ id: 'f2', createdAt: 2, workspace_id: 'wsX' }))
+		await rehydrate(user)
+		await vi.waitFor(() => expect(sessionState.sessions.length).toBe(2))
+
+		deleteItemsForSessionMock.mockClear()
+		await deleteSessionsForWorkspace('wsX')
+
+		// Both deleted sessions' linked files must be GC'd, not just their records.
+		const cleaned = deleteItemsForSessionMock.mock.calls.map((c) => c[0]).sort()
+		expect(cleaned).toEqual(['f1', 'f2'])
+	})
+
+	it('does not persist a per-session unarchive when the workspace is gone (resurrection guard)', async () => {
+		const user = freshUser()
+		// Seed the archived session while its workspace is still in the list so the
+		// write lands.
+		usersWorkspaceStore.set({
+			email: user.email,
+			workspaces: [{ id: 'gone-ws', name: 'gone', disabled: false }] as never
+		})
+		userStore.set(user)
+		await flush()
+		await putSession(session({ id: 'arch', createdAt: 1, workspace_id: 'gone-ws', archived: true }))
+		await rehydrate(user)
+		await vi.waitFor(() => expect(sessionState.sessions.map((s) => s.id)).toEqual(['arch']))
+
+		// The workspace disappears from the user's list (archived/deleted elsewhere).
+		// A non-empty list that omits it triggers the putSession resurrection guard.
+		usersWorkspaceStore.set({
+			email: user.email,
+			workspaces: [{ id: 'live-ws', name: 'live', disabled: false }] as never
+		})
+		await flush()
+
+		// Attempting to unarchive in place must NOT persist — this is exactly why the
+		// per-session Unarchive control is hidden when the workspace is unavailable.
+		setSessionArchived('arch', false)
+		await flush()
+
+		// Read straight from IndexedDB: the in-memory list is reassigned by the
+		// async reconcile that rehydrate kicks off, so asserting against it races;
+		// the DB is the source of truth for whether the unarchive persisted.
+		const db = await openDB(`windmill-sessions::${user.email}`, 1)
+		const rec = (await db.get('sessions' as never, 'arch')) as Session
+		db.close()
+		expect(rec.archived).toBe(true)
+	})
+
+	it('re-roots a sub-fork session on reconcile when an ancestor was deleted', async () => {
+		const user = freshUser()
+		// Family after a grandparent deletion: the FK's ON DELETE SET NULL nulled
+		// fork-1's parent, so fork-1 is now the topmost member; fork_of_fork still
+		// points at fork-1.
+		usersWorkspaceStore.set({
+			email: user.email,
+			workspaces: [
+				{ id: 'wm-fork-fork-1', name: 'fork-1', disabled: false },
+				{
+					id: 'wm-fork-fork_of_fork',
+					name: 'fork_of_fork',
+					parent_workspace_id: 'wm-fork-fork-1',
+					disabled: false
+				}
+			] as never
+		})
+		vi.mocked(WorkspaceService.getSessionWorkspaceStatus).mockResolvedValueOnce({
+			'wm-fork-fork_of_fork': 'active'
+		} as never)
+
+		userStore.set(user)
+		await flush()
+		// Seed with a STALE root pointing at the now-deleted grandparent.
+		await putSession(
+			session({
+				id: 'sub',
+				createdAt: 1,
+				workspace_id: 'wm-fork-fork_of_fork',
+				workspace_root_id: 'wm-grandparent-deleted'
+			})
+		)
+		await rehydrate(user)
+		await vi.waitFor(() => expect(sessionState.sessions.map((s) => s.id)).toEqual(['sub']))
+
+		await reconcileSessionsLifecycle()
+		await rehydrate(user)
+
+		// Re-rooted to the new family topmost member, not left on the dead ancestor.
+		// waitFor: rehydrate's re-population settles asynchronously.
+		await vi.waitFor(() => {
+			const sub = sessionState.sessions.find((s) => s.id === 'sub')!
+			expect(sub.workspace_root_id).toBe('wm-fork-fork-1')
+		})
+	})
+
 	it('clears the in-memory list on logout', async () => {
 		const user = freshUser()
 		userStore.set(user)
diff --git a/frontend/src/lib/components/sessions/sessionSwitch.svelte.ts b/frontend/src/lib/components/sessions/sessionSwitch.svelte.ts
new file mode 100644
index 0000000000..45d72ae3ae
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionSwitch.svelte.ts
@@ -0,0 +1,94 @@
+import { get } from 'svelte/store'
+import { goto } from '$lib/navigation'
+import { workspaceStore } from '$lib/stores'
+import {
+	createSession,
+	selectSession,
+	sessionInCurrentFamily,
+	sessionState,
+	setSessionPendingWorkspace,
+	type SessionTarget
+} from './sessionState.svelte'
+import { sessionTargetHref } from './sessionMode.svelte'
+
+// The session/navigation switch turns the global rail into either the workspace
+// navigation (navigation mode) or the sessions sidebar (session mode). Session
+// mode is route-derived — it is exactly "on the /sessions page" — so the switch
+// is just navigation in and out of that route.
+
+// The last non-session route the user was on, so exiting session mode returns
+// them where they were instead of dumping them on the home page. Stored as a
+// base-prefixed pathname (+ search); `goto` is base-idempotent so re-prefixing
+// is safe. Plain module state: it is read only inside click handlers, never
+// rendered, so it needs no reactivity.
+let lastNavRoute = '/'
+
+export function rememberNavRoute(pathnameWithSearch: string): void {
+	lastNavRoute = pathnameWithSearch
+}
+
+// Enter session mode: open the active session if one is selected, else the most
+// recent non-archived session, else spin up a fresh one — then route to it.
+// Restore candidates are scoped to the active workspace family: reviving a
+// session from another family would pull that family's scope (sidebar list,
+// "Acting on" workspace) into the one the user is actually in.
+// `replace` swaps the current history entry instead of pushing — for the
+// sessions page's family reconcile, where Back must not return to the
+// redirected-away URL just to bounce here again.
+export async function enterSessionMode(opts?: { replace?: boolean }): Promise<void> {
+	const current = sessionState.currentSessionId
+		? sessionState.sessions.find((s) => s.id === sessionState.currentSessionId)
+		: undefined
+	const target =
+		(current && sessionInCurrentFamily(current) ? current : undefined) ??
+		sessionState.sessions.find((s) => !s.archived && sessionInCurrentFamily(s)) ??
+		createSession()
+	selectSession(target.id)
+	await goto(`/sessions?session_name=${encodeURIComponent(target.name)}`, {
+		replaceState: opts?.replace ?? false
+	})
+}
+
+// Exit session mode: back to the last navigation route (home as a fallback).
+export async function exitSessionMode(): Promise<void> {
+	let target = lastNavRoute || '/'
+	// The remembered route can carry a stale `?workspace=` — the layout's
+	// onQueryChange re-applies that param, so restoring the route would
+	// silently check the app back out to a workspace the user has since
+	// left. The rest of the route is scoped to that stale workspace too,
+	// so fall back to home rather than rewriting the param.
+	const wsParam = /[?&]workspace=([^&]*)/.exec(target)?.[1]
+	const ws = get(workspaceStore)
+	if (ws && wsParam && decodeURIComponent(wsParam) !== ws) {
+		target = '/'
+	}
+	await goto(target)
+}
+
+// Open a fresh AI session showing an editor (flow/script/raw_app) in its preview,
+// then route into session mode. The preview loads the item from its live draft,
+// so the caller MUST persist any unsaved edits first (e.g. save a draft) for the
+// preview to reflect the live state. `workspaceId` scopes the session to the
+// editor's workspace (instead of createSession's root default) so it opens the
+// same flow/script the user was editing.
+export async function openEditorInSession(
+	target: SessionTarget,
+	workspaceId?: string
+): Promise<void> {
+	// createSession() reuses an existing transient draft, whose preview tabs
+	// (persisted with the draft and/or held by a live runtime) may still show a
+	// different item — so seed the preview with a single tab on `target`, resetting
+	// whatever it was showing.
+	const session = createSession()
+	if (workspaceId) setSessionPendingWorkspace(session.id, workspaceId)
+	const url = sessionTargetHref(target)
+	if (url) {
+		// Dynamic import: a static one would drag the runtime's heavy graph
+		// (chat manager → monaco) into this thin navigation seam, breaking its
+		// node-run unit tests.
+		const { resetSessionPreviewTabs } = await import('./sessionRuntime.svelte')
+		resetSessionPreviewTabs(session.id, url)
+	}
+	selectSession(session.id)
+	await goto(`/sessions?session_name=${encodeURIComponent(session.name)}`)
+}
diff --git a/frontend/src/lib/components/sessions/sessionSwitch.test.ts b/frontend/src/lib/components/sessions/sessionSwitch.test.ts
new file mode 100644
index 0000000000..7750663250
--- /dev/null
+++ b/frontend/src/lib/components/sessions/sessionSwitch.test.ts
@@ -0,0 +1,96 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { get } from 'svelte/store'
+import { enterSessionMode } from './sessionSwitch.svelte'
+import { sessionState, type Session } from './sessionState.svelte'
+import { usersWorkspaceStore, workspaceStore, type UserWorkspace } from '$lib/stores'
+
+vi.mock('$lib/navigation', () => ({ goto: vi.fn().mockResolvedValue(undefined) }))
+import { goto } from '$lib/navigation'
+
+function session(over: Partial<Session> = {}): Session {
+	return { id: 's1', name: 'sess', createdAt: 0, ...over }
+}
+function ws(id: string, parent?: string): UserWorkspace {
+	return { id, name: id, parent_workspace_id: parent } as unknown as UserWorkspace
+}
+
+// Two-family fixture: rootA (with forkA) and rootB. Returns a restore fn.
+function withTwoFamilies(activeWorkspace: string): () => void {
+	const prevUsers = get(usersWorkspaceStore)
+	const prevWs = get(workspaceStore)
+	usersWorkspaceStore.set({
+		email: 't@t',
+		workspaces: [ws('rootA'), ws('forkA', 'rootA'), ws('rootB')]
+	} as never)
+	workspaceStore.set(activeWorkspace)
+	return () => {
+		usersWorkspaceStore.set(prevUsers)
+		workspaceStore.set(prevWs)
+	}
+}
+
+describe('enterSessionMode — restore is scoped to the active family', () => {
+	beforeEach(() => {
+		vi.mocked(goto).mockClear()
+	})
+
+	it('keeps the current session when it belongs to the active family', async () => {
+		const restore = withTwoFamilies('forkA')
+		const prevCurrent = sessionState.currentSessionId
+		const inFamily = session({ id: 'sw-in-family', name: 'session-911', workspace_id: 'rootA' })
+		sessionState.sessions.push(inFamily)
+		sessionState.currentSessionId = 'sw-in-family'
+		try {
+			await enterSessionMode()
+			expect(sessionState.currentSessionId).toBe('sw-in-family')
+			expect(goto).toHaveBeenCalledWith('/sessions?session_name=session-911', { replaceState: false })
+		} finally {
+			sessionState.sessions = sessionState.sessions.filter((s) => s.id !== 'sw-in-family')
+			sessionState.currentSessionId = prevCurrent
+			restore()
+		}
+	})
+
+	it('skips a cross-family current session in favor of the most recent in-family one', async () => {
+		const restore = withTwoFamilies('rootB')
+		const prevCurrent = sessionState.currentSessionId
+		const foreign = session({ id: 'sw-foreign', name: 'session-912', workspace_id: 'rootA' })
+		const local = session({ id: 'sw-local', name: 'session-913', workspace_id: 'rootB' })
+		sessionState.sessions.push(foreign, local)
+		sessionState.currentSessionId = 'sw-foreign'
+		try {
+			await enterSessionMode()
+			expect(sessionState.currentSessionId).toBe('sw-local')
+			expect(goto).toHaveBeenCalledWith('/sessions?session_name=session-913', { replaceState: false })
+		} finally {
+			sessionState.sessions = sessionState.sessions.filter(
+				(s) => s.id !== 'sw-foreign' && s.id !== 'sw-local'
+			)
+			sessionState.currentSessionId = prevCurrent
+			restore()
+		}
+	})
+
+	it('creates a fresh session in the active workspace when no in-family session exists', async () => {
+		const restore = withTwoFamilies('rootB')
+		const prevCurrent = sessionState.currentSessionId
+		const foreign = session({ id: 'sw-only-foreign', name: 'session-914', workspace_id: 'rootA' })
+		sessionState.sessions.push(foreign)
+		sessionState.currentSessionId = 'sw-only-foreign'
+		let createdId: string | undefined
+		try {
+			await enterSessionMode()
+			createdId = sessionState.currentSessionId
+			expect(createdId).not.toBe('sw-only-foreign')
+			const created = sessionState.sessions.find((s) => s.id === createdId)
+			expect(created?.pending_workspace_id).toBe('rootB')
+			expect(created?.transient).toBe(true)
+		} finally {
+			sessionState.sessions = sessionState.sessions.filter(
+				(s) => s.id !== 'sw-only-foreign' && s.id !== createdId
+			)
+			sessionState.currentSessionId = prevCurrent
+			restore()
+		}
+	})
+})
diff --git a/frontend/src/lib/components/sessions/useUserDraftSync.svelte.ts b/frontend/src/lib/components/sessions/useUserDraftSync.svelte.ts
index e5af840242..7e89d3b945 100644
--- a/frontend/src/lib/components/sessions/useUserDraftSync.svelte.ts
+++ b/frontend/src/lib/components/sessions/useUserDraftSync.svelte.ts
@@ -37,7 +37,13 @@ export interface UserDraftSyncOptions<Draft> {
 	 * `loadedX !== path` guards.
 	 */
 	ready: () => boolean
-	codec: DraftSyncCodec<Draft>
+	/**
+	 * Reactive codec. Retargeting a mounted editor (breadcrumb / in-editor link)
+	 * changes `path` without remounting, and the codec closes over one
+	 * `(kind, path)` cell's store — so it must be re-read per path, not captured
+	 * once, or the sync would read/write the previously-targeted cell.
+	 */
+	codec: () => DraftSyncCodec<Draft>
 }
 
 /**
@@ -61,18 +67,19 @@ export interface UserDraftSyncOptions<Draft> {
  * Must be called once during component init (registers `useMany` + two `$effect`s).
  */
 export function useUserDraftSync<Draft>(opts: UserDraftSyncOptions<Draft>): void {
-	const { codec } = opts
 	const handles = UserDraft.useMany<Draft>(() => {
 		const p = opts.path()
 		const ws = opts.workspace()
-		return p && ws ? [{ itemKind: codec.itemKind, path: p, workspace: ws }] : []
+		return p && ws ? [{ itemKind: opts.codec().itemKind, path: p, workspace: ws }] : []
 	})
 	let lastInboundSig: string | undefined = $state(undefined)
 
 	// inbound: handle.draft → store. Re-runs when the handle's draft changes
-	// (chat write / another session's edit). The store read happens inside
-	// applyDraftToStore under untrack so the editor's own mutations don't refire.
+	// (chat write / another session's edit) or the target retargets (new codec).
+	// The store read happens inside applyDraftToStore under untrack so the
+	// editor's own mutations don't refire.
 	$effect(() => {
+		const codec = opts.codec()
 		const incoming = handles[0]?.draft
 		if (incoming == null) return
 		const sig = codec.sig(incoming)
@@ -101,6 +108,7 @@ export function useUserDraftSync<Draft>(opts: UserDraftSyncOptions<Draft>): void
 	let pendingFlush: (() => void) | undefined
 	$effect(() => {
 		if (!opts.ready()) return
+		const codec = opts.codec()
 		const draft = codec.storeToDraft(undefined)
 		if (draft == null) return
 		const sig = codec.sig(draft)
diff --git a/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte b/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte
index f0aaa942a0..a76e76e6b2 100644
--- a/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte
+++ b/frontend/src/lib/components/settings/ChangeWorkspaceColor.svelte
@@ -1,14 +1,22 @@
 <script lang="ts">
-	import { workspaceStore, usersWorkspaceStore, workspaceColor } from '$lib/stores'
+	import { workspaceStore, usersWorkspaceStore, userWorkspaces, workspaceColor } from '$lib/stores'
+	import { workspaceIsFork } from '$lib/utils/workspaceHierarchy'
 	import Button from '../common/button/Button.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import { WorkspaceService } from '$lib/gen'
 	import Modal from '../common/modal/Modal.svelte'
 	import { Pen } from 'lucide-svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
+	import WorkspaceScopeTrigger from '../WorkspaceScopeTrigger.svelte'
+	import DarkModeToggle from '../sidebar/DarkModeToggle.svelte'
 
 	let { open = false }: { open?: boolean } = $props()
 
+	// A fork's color themes the fork pickers, so the section takes the
+	// create-fork form's "Fork color" shape — live picker preview included.
+	const isFork = $derived(workspaceIsFork($workspaceStore, $userWorkspaces))
+	const colorLabel = $derived(isFork ? 'Fork color' : 'Workspace color')
+
 	let colorEnabled = $state(false)
 	let editingColor = $state<string | undefined>(undefined)
 	let lastWorkspace = $state<string | undefined>(undefined)
@@ -52,9 +60,11 @@
 </script>
 
 <div class="flex flex-col gap-1">
-	<p class="font-semibold text-xs text-emphasis">Workspace color</p>
+	<p class="font-semibold text-xs text-emphasis">{colorLabel}</p>
 	<p class="text-xs text-secondary font-normal">
-		Color to identify the current workspace in the list of workspaces
+		{isFork
+			? 'Color to identify this fork in the pickers'
+			: 'Color to identify the current workspace in the list of workspaces'}
 	</p>
 	<div class="flex flex-row gap-0.5 items-center">
 		{#if $workspaceColor}
@@ -79,10 +89,10 @@
 	</div>
 </div>
 
-<Modal bind:open title="Change workspace color">
+<Modal bind:open title="Change {colorLabel.toLowerCase()}">
 	<div class="flex flex-col gap-4">
 		<label class="block">
-			<span class="text-secondary text-sm">Workspace color</span>
+			<span class="text-secondary text-sm">{colorLabel}</span>
 			<div class="flex items-center gap-2">
 				<Toggle bind:checked={colorEnabled} options={{ right: 'Enable' }} />
 				{#if colorEnabled}
@@ -97,6 +107,23 @@
 				<Button on:click={generateRandomColor} size="xs" disabled={!colorEnabled}>Random</Button>
 			</div>
 		</label>
+		{#if isFork && colorEnabled}
+			<div class="flex flex-col gap-1">
+				<div class="flex flex-row items-center gap-1">
+					<span class="text-2xs text-secondary">Fork picker preview</span>
+					<DarkModeToggle forcedDarkMode={false} />
+				</div>
+				<div class="w-64">
+					<WorkspaceScopeTrigger
+						workspaceId={$workspaceStore}
+						color={editingColor}
+						showChevron={false}
+						wrap
+						class="w-full pointer-events-none"
+					/>
+				</div>
+			</div>
+		{/if}
 	</div>
 
 	{#snippet actions()}
diff --git a/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte b/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte
index 77eae741e9..5ace6e8106 100644
--- a/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte
+++ b/frontend/src/lib/components/settings/ChangeWorkspaceName.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
-	import { workspaceStore } from '$lib/stores'
+	import { workspaceStore, userWorkspaces } from '$lib/stores'
+	import { workspaceIsFork } from '$lib/utils/workspaceHierarchy'
 	import Button from '../common/button/Button.svelte'
+	import TextInput from '../text_input/TextInput.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import { WorkspaceService } from '$lib/gen'
-	import Modal from '../common/modal/Modal.svelte'
-	import { Pen } from 'lucide-svelte'
 	import { untrack } from 'svelte'
 
-	let { open = false }: { open?: boolean } = $props()
+	// Forks have no customizable display name — the unique id is the name
+	// (same convention as the create-fork form), so the editor is hidden.
+	const isFork = $derived(workspaceIsFork($workspaceStore, $userWorkspaces))
 
-	let newName = $state('')
 	let currentName = $state('')
+	let newName = $state('')
 
 	$effect(() => {
 		if ($workspaceStore) {
@@ -20,10 +22,13 @@
 
 	async function getWorkspaceName() {
 		currentName = await WorkspaceService.getWorkspaceName({ workspace: $workspaceStore! })
+		newName = currentName
 	}
 
 	async function renameWorkspace() {
-		open = false
+		if (!newName || newName === currentName) {
+			return
+		}
 		await WorkspaceService.changeWorkspaceName({
 			workspace: $workspaceStore!,
 			requestBody: {
@@ -32,53 +37,39 @@
 		})
 
 		sendUserToast(`Changed workspace name to ${newName}`)
-		newName = ''
 		getWorkspaceName()
 	}
 </script>
 
-<div class="flex flex-col gap-1">
-	<p class="font-semibold text-xs text-emphasis">Workspace name</p>
-	<p class="text-xs text-secondary font-normal">Displayable name</p>
-	<div class="flex flex-row gap-2 items-center">
-		<p class="text-primary text-xs">{currentName}</p>
-		<Button
-			on:click={() => {
-				open = true
-			}}
-			unifiedSize="sm"
-			iconOnly
-			variant="subtle"
-			startIcon={{
-				icon: Pen
-			}}
-		/>
-	</div>
-</div>
-
-<Modal bind:open title="Change workspace name">
-	<div class="flex flex-col gap-4 mt-4">
-		{#if currentName}
-			<p class="text-secondary text-xs"
-				>Current name <br /> <span class="text-emphasis">{currentName}</span></p
+{#if !isFork}
+	<div class="flex flex-col gap-1">
+		<p class="font-semibold text-xs text-emphasis">Workspace name</p>
+		<p class="text-xs text-secondary font-normal">Displayable name</p>
+		<div class="flex flex-row gap-2 items-center">
+			<TextInput
+				bind:value={newName}
+				size="sm"
+				class="max-w-xs"
+				inputProps={{
+					placeholder: 'Workspace name',
+					'aria-label': 'Workspace name',
+					onkeydown: (e) => {
+						if (e.key === 'Enter') {
+							renameWorkspace()
+						}
+					}
+				}}
+			/>
+			<Button
+				size="sm"
+				variant="accent"
+				disabled={!newName || newName === currentName}
+				on:click={() => {
+					renameWorkspace()
+				}}
 			>
-		{/if}
-		<label class="flex flex-col gap-1">
-			<span class="text-emphasis text-xs">New name</span>
-			<input type="text" bind:value={newName} />
-		</label>
+				Save
+			</Button>
+		</div>
 	</div>
-
-	{#snippet actions()}
-		<Button
-			size="sm"
-			variant="accent"
-			disabled={!newName}
-			on:click={() => {
-				renameWorkspace()
-			}}
-		>
-			Save
-		</Button>
-	{/snippet}
-</Modal>
+{/if}
diff --git a/frontend/src/lib/components/settings/CloudQuotas.svelte b/frontend/src/lib/components/settings/CloudQuotas.svelte
index 61158f13ec..ec597101ee 100644
--- a/frontend/src/lib/components/settings/CloudQuotas.svelte
+++ b/frontend/src/lib/components/settings/CloudQuotas.svelte
@@ -18,6 +18,7 @@
 				apps: QuotaInfo
 				variables: QuotaInfo
 				resources: QuotaInfo
+				forks: QuotaInfo
 		  }
 		| undefined = $state(undefined)
 
@@ -87,7 +88,8 @@
 		{ label: 'Flows', key: 'flows', prunable: true },
 		{ label: 'Apps', key: 'apps', prunable: true },
 		{ label: 'Variables', key: 'variables', prunable: false },
-		{ label: 'Resources', key: 'resources', prunable: false }
+		{ label: 'Resources', key: 'resources', prunable: false },
+		{ label: 'Forks', key: 'forks', prunable: false }
 	]
 </script>
 
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
index f8418b048a..4a41c65a31 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-	import { run } from 'svelte/legacy'
-
 	import { onMount, onDestroy } from 'svelte'
 	import CriticalAlertModalInner from './CriticalAlertModalInner.svelte'
 	import { SettingService, type CriticalAlert } from '$lib/gen'
@@ -35,26 +33,11 @@
 	let workspaceContext = $state(false)
 	let childRef: CriticalAlertModalInner | undefined = $state()
 
-	function setupApiFunctions(_ctx?) {
-		getCriticalAlerts = withSuperadminLogic(
-			SettingService.getCriticalAlerts,
-			SettingService.workspaceGetCriticalAlerts
-		)
-
-		acknowledgeCriticalAlert = withSuperadminLogic(
-			SettingService.acknowledgeCriticalAlert,
-			SettingService.workspaceAcknowledgeCriticalAlert
-		)
-
-		acknowledgeAllCriticalAlerts = withSuperadminLogic(
-			SettingService.acknowledgeAllCriticalAlerts,
-			SettingService.workspaceAcknowledgeAllCriticalAlerts
-		)
-	}
-
 	let checkForNewAlertsInterval: ReturnType<typeof setInterval>
 	let checkingForNewAlerts = false
 
+	// The returned closure reads workspaceContext / $workspaceStore / $devopsRole at
+	// call time, so the wrappers are stable and never need recreating.
 	const withSuperadminLogic = (superadminFunction, workspaceFunction) => {
 		return async (params = {}) => {
 			if (!$devopsRole || workspaceContext) {
@@ -68,12 +51,21 @@
 		}
 	}
 
-	type AckFn = (params?: {}) => Promise<any>
-	let getCriticalAlerts: AckFn | undefined = $state()
-	let acknowledgeCriticalAlert: AckFn | undefined = $state()
-	let acknowledgeAllCriticalAlerts: AckFn | undefined = $state()
-
-	setupApiFunctions()
+	let getCriticalAlerts = $derived(
+		withSuperadminLogic(SettingService.getCriticalAlerts, SettingService.workspaceGetCriticalAlerts)
+	)
+	let acknowledgeCriticalAlert = $derived(
+		withSuperadminLogic(
+			SettingService.acknowledgeCriticalAlert,
+			SettingService.workspaceAcknowledgeCriticalAlert
+		)
+	)
+	let acknowledgeAllCriticalAlerts = $derived(
+		withSuperadminLogic(
+			SettingService.acknowledgeAllCriticalAlerts,
+			SettingService.workspaceAcknowledgeAllCriticalAlerts
+		)
+	)
 
 	onMount(async () => {
 		await updateHasUnacknowledgedCriticalAlerts(false)
@@ -173,13 +165,10 @@
 		await acknowledgeCriticalAlert?.({ id })
 		updateHasUnacknowledgedCriticalAlerts()
 	}
-	run(() => {
-		setupApiFunctions(workspaceContext)
-	})
-	run(() => {
+	$effect(() => {
 		if ($isCriticalAlertsUIOpen) open = $isCriticalAlertsUIOpen
 	})
-	run(() => {
+	$effect(() => {
 		isCriticalAlertsUIOpen.set(open)
 	})
 </script>
@@ -197,10 +186,14 @@
 	{#snippet headerRight()}
 		<List horizontal>
 			{#if $superadmin || $userStore?.is_admin}
+				<!-- Portal to `body` (not the trigger) so toggle clicks don't bubble to the melt
+				     trigger and toggle the popover shut. `dropdown-portal` on the content root is a
+				     `portalDivs` marker, so the enclosing Modal2's clickOutside treats the whole
+				     popover surface — padding included — as inside a portal and stays open. -->
 				<Popover
 					floatingConfig={{ strategy: 'fixed', placement: 'bottom-end' }}
-					portal="#mute-settings-button"
-					contentClasses="p-4"
+					portal="body"
+					contentClasses="p-4 dropdown-portal"
 				>
 					{#snippet trigger()}
 						<div id="mute-settings-button">
@@ -246,8 +239,8 @@
 			{#if $superadmin}
 				<Popover
 					floatingConfig={{ strategy: 'fixed', placement: 'bottom-end' }}
-					portal="#settings-button"
-					contentClasses="p-4"
+					portal="body"
+					contentClasses="p-4 dropdown-portal"
 				>
 					{#snippet trigger()}
 						<div id="settings-button">
@@ -304,6 +297,7 @@
 
 	<CriticalAlertModalInner
 		bind:workspaceContext
+		{muteSettings}
 		{numUnacknowledgedCriticalAlerts}
 		{updateHasUnacknowledgedCriticalAlerts}
 		{getCriticalAlerts}
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
index d079ccac1c..d51e9f6b4e 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
@@ -11,7 +11,7 @@
 	import CriticalAlertTable from './CriticalAlertTable.svelte'
 	import Alert from '$lib/components/common/alert/Alert.svelte'
 	import { sendUserToast } from '$lib/toast'
-	import { untrack } from 'svelte'
+	import { onMount, untrack } from 'svelte'
 
 	let filteredAlerts: CriticalAlert[] = $state([])
 
@@ -30,6 +30,7 @@
 		acknowledgeCriticalAlert: any
 		acknowledgeAllCriticalAlerts: any
 		numUnacknowledgedCriticalAlerts: any
+		muteSettings?: { global?: boolean; workspace?: boolean }
 		workspaceContext?: boolean
 	}
 
@@ -39,9 +40,12 @@
 		acknowledgeCriticalAlert,
 		acknowledgeAllCriticalAlerts,
 		numUnacknowledgedCriticalAlerts,
+		muteSettings,
 		workspaceContext = $bindable(false)
 	}: Props = $props()
 
+	let isMuted = $derived(Boolean(muteSettings?.global || muteSettings?.workspace))
+
 	async function acknowledgeAll() {
 		await acknowledgeAllCriticalAlerts()
 		getAlerts(false)
@@ -82,6 +86,12 @@
 		hasCriticalAlertChannels = channels && channels.length > 0
 	}
 
+	// Load the channel state on mount so the "no channels" warning doesn't depend on
+	// there being unacknowledged alerts to trigger a refresh (muting auto-acks them).
+	onMount(() => {
+		if ($superadmin) checkCriticalAlertChannels()
+	})
+
 	async function acknowledgeAlert(id: number) {
 		await acknowledgeCriticalAlert({ id })
 		getAlerts(false)
@@ -133,7 +143,7 @@
 </script>
 
 <List gap="sm">
-	{#if !hasCriticalAlertChannels && $superadmin}
+	{#if $superadmin && isMuted && !hasCriticalAlertChannels}
 		<div class="w-full">
 			<Alert title="No critical alert channels are set up" type="warning" size="xs">
 				Go to the
diff --git a/frontend/src/lib/components/sidebar/DeleteForkedWorkspaceModal.svelte b/frontend/src/lib/components/sidebar/DeleteForkedWorkspaceModal.svelte
new file mode 100644
index 0000000000..49a0a49da2
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/DeleteForkedWorkspaceModal.svelte
@@ -0,0 +1,207 @@
+<script lang="ts">
+	import { WorkspaceService } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+	import { clearStores, switchWorkspace } from '$lib/storeUtils'
+	import { goto } from '$lib/navigation'
+	import { userWorkspaces, workspaceStore } from '$lib/stores'
+	import { findWorkspaceDescendants, workspaceIsFork } from '$lib/utils/workspaceHierarchy'
+	import {
+		deleteSessionsForWorkspace,
+		reconcileAfterWorkspaceChange
+	} from '$lib/components/sessions/sessionState.svelte'
+	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+
+	type ForkedDatatable = {
+		name: string
+		resourceType: string
+		resourcePath: string
+		dropOnDelete: boolean
+	}
+
+	let open = $state(false)
+	let forkedDatatables: ForkedDatatable[] = $state([])
+	let deleteForkedChildren = $state(false)
+
+	const forkedDescendants = $derived(
+		$workspaceStore ? findWorkspaceDescendants($workspaceStore, $userWorkspaces ?? []) : []
+	)
+	// Fork/dev workspaces are detected by their parent link, not the `wm-fork-` id prefix.
+	const currentWsIsFork = $derived(workspaceIsFork($workspaceStore, $userWorkspaces ?? []))
+
+	async function loadForkedDatatables() {
+		if (!$workspaceStore) return
+		try {
+			const settings = await WorkspaceService.getPublicSettings({ workspace: $workspaceStore })
+			const datatables = settings.datatable?.datatables ?? {}
+			forkedDatatables = Object.entries(datatables)
+				.filter(([_, dt]) => dt.forked_from != null)
+				.map(([name, dt]) => ({
+					name,
+					resourceType: dt.database.resource_type ?? 'instance',
+					resourcePath: dt.database.resource_path ?? '',
+					dropOnDelete: true
+				}))
+		} catch {
+			forkedDatatables = []
+		}
+	}
+
+	// Load the fork's datatables, then open the confirm modal. The caller only
+	// surfaces the affordance for forked workspaces; the modal also self-guards
+	// its markup on `currentWsIsFork` below.
+	export async function openModal() {
+		await loadForkedDatatables()
+		deleteForkedChildren = false
+		open = true
+	}
+
+	async function deleteFork() {
+		const workspace = $workspaceStore ?? ''
+		// Capture the parent before delete so we can land the user there
+		// instead of dropping them back on the workspace-picker menu.
+		// Only valid if the parent is still in the user's workspace list.
+		const parentId = $userWorkspaces.find((w) => w.id === workspace)?.parent_workspace_id
+		const parentStillAccessible = !!(parentId && $userWorkspaces.find((w) => w.id === parentId))
+		const dbsToDrop = forkedDatatables.filter((dt) => dt.dropOnDelete).map((dt) => dt.name)
+
+		if (dbsToDrop.length > 0) {
+			const errors = await WorkspaceService.dropForkedDatatableDatabases({
+				workspace,
+				requestBody: { datatable_names: dbsToDrop }
+			})
+			for (const err of errors) {
+				sendUserToast(err, true)
+			}
+		}
+
+		// Fork-scoped ducklake namespaces (metadata schemas + data files) — driven by the
+		// backend registry, so no per-lake selection is needed. Best-effort: a failure is
+		// surfaced but doesn't block the workspace delete (the registry rows survive a
+		// failed cleanup and re-creating the same fork id retries it — the toast tells the
+		// user something was left behind).
+		try {
+			const dlErrors = await WorkspaceService.dropForkedDucklakeNamespaces({ workspace })
+			for (const err of dlErrors) {
+				sendUserToast(err, true)
+			}
+		} catch (err) {
+			sendUserToast(`Failed to drop fork ducklake namespaces: ${err}`, true)
+		}
+
+		if (deleteForkedChildren && forkedDescendants.length > 0) {
+			for (const child of forkedDescendants) {
+				try {
+					await WorkspaceService.dropForkedDucklakeNamespaces({ workspace: child.id }).then(
+						(errs) => errs.forEach((e) => sendUserToast(e, true)),
+						(err) =>
+							sendUserToast(`Failed to drop fork ducklake namespaces of ${child.id}: ${err}`, true)
+					)
+					await WorkspaceService.deleteWorkspace({ workspace: child.id })
+				} catch (err) {
+					sendUserToast(`Failed to delete forked child ${child.id}: ${err}`, true)
+					return
+				}
+				// Backend delete is authoritative; session cleanup is best-effort so a
+				// local failure can't abort the remaining (parent) deletes.
+				await deleteSessionsForWorkspace(child.id).catch((e) =>
+					console.error(`Session cleanup for ${child.id} failed`, e)
+				)
+			}
+		}
+
+		await WorkspaceService.deleteWorkspace({ workspace })
+		await deleteSessionsForWorkspace(workspace).catch((e) =>
+			console.error('Session cleanup after workspace delete failed', e)
+		)
+		sendUserToast('You deleted the workspace')
+		if (parentStillAccessible && parentId) {
+			// Refresh the workspace list AND reconcile session lifecycle before
+			// landing on the parent. The refresh keeps the sidebar's
+			// `visibleSessions` filter from rendering every committed session as
+			// "Fork — no longer available" (it reads `$userWorkspaces`, which
+			// `clearStores()` would null). The reconcile re-roots surviving child
+			// forks: deleting this fork without "delete children" re-parents them
+			// via the backend's ON DELETE SET NULL, so their sessions' stored
+			// `workspace_root_id` must be recomputed off the now-deleted ancestor.
+			// A reconcile failure must NOT strand the user on the just-deleted
+			// workspace — always fall through to the parent switch + navigation.
+			try {
+				await reconcileAfterWorkspaceChange()
+			} catch (e) {
+				console.error('Failed to reconcile sessions after workspace delete', e)
+			}
+			switchWorkspace(parentId)
+			await goto('/')
+		} else {
+			clearStores()
+			await goto('/user/workspaces')
+		}
+	}
+</script>
+
+{#if currentWsIsFork}
+	<ConfirmationModal
+		{open}
+		title="Delete forked workspace"
+		confirmationText="Remove"
+		on:canceled={() => {
+			open = false
+		}}
+		on:confirmed={() => {
+			open = false
+			deleteFork()
+		}}
+	>
+		<div class="flex flex-col w-full space-y-4">
+			<span>Are you sure you want to delete this workspace fork? (deleting {$workspaceStore})</span>
+			{#if forkedDescendants.length > 0}
+				<div class="border rounded-md divide-y">
+					<div class="px-4 py-2 flex items-center justify-between gap-2">
+						<div class="flex flex-col min-w-0">
+							<span class="text-xs font-semibold text-secondary">Forked children</span>
+							<span class="text-3xs text-hint">
+								This fork has {forkedDescendants.length} forked
+								{forkedDescendants.length === 1 ? 'child' : 'children'} (transitively).
+							</span>
+						</div>
+						<Toggle
+							class="shrink-0"
+							size="xs"
+							bind:checked={deleteForkedChildren}
+							options={{ right: 'Also delete children' }}
+						/>
+					</div>
+					<ul class="px-4 py-2 text-3xs text-hint max-h-32 overflow-y-auto">
+						{#each forkedDescendants as child}
+							<li class="font-mono truncate" title={child.id}>{child.id}</li>
+						{/each}
+					</ul>
+				</div>
+			{/if}
+			{#if forkedDatatables.length > 0}
+				<div class="border rounded-md divide-y">
+					<div class="px-4 py-2 text-xs font-semibold text-secondary"> Forked databases </div>
+					{#each forkedDatatables as dt}
+						<div class="flex items-center justify-between px-4 py-2">
+							<div class="flex flex-col">
+								<span class="text-xs font-medium text-secondary">{dt.name}</span>
+								<span class="text-3xs text-hint">
+									{dt.resourceType === 'instance'
+										? dt.resourcePath
+										: `${$workspaceStore?.replace(/-/g, '_')}__${dt.name}`}
+								</span>
+							</div>
+							<Toggle
+								class="shrink-0"
+								size="xs"
+								bind:checked={dt.dropOnDelete}
+								options={{ right: 'Drop database' }}
+							/>
+						</div>
+					{/each}
+				</div>
+			{/if}
+		</div>
+	</ConfirmationModal>
+{/if}
diff --git a/frontend/src/lib/components/sidebar/FavoriteMenu.svelte b/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
index 056bca1489..1c3191f0cb 100644
--- a/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
+++ b/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
@@ -97,7 +97,7 @@
 	let { lightMode = false, isCollapsed = false, favoriteLinks = [], createMenu }: Props = $props()
 </script>
 
-<Menu {createMenu} usePointerDownOutside>
+<Menu {createMenu} usePointerDownOutside placement="bottom-start">
 	{#snippet triggr({ trigger })}
 		<MenuButton
 			class="!text-xs"
@@ -105,6 +105,7 @@
 			label={'Favorites'}
 			{isCollapsed}
 			{lightMode}
+			showChevron
 			{trigger}
 		/>
 	{/snippet}
@@ -132,15 +133,16 @@
 								{item}
 								class="w-full inline-flex flex-row px-4 py-2 pr-8 data-[highlighted]:bg-surface-hover"
 							>
+								<!-- Kind colors mirror the home-page row icons (RowIcon.svelte). -->
 								<span class="center-center">
 									{#if favorite.kind == 'script'}
-										<CodeXml size={16} />
+										<CodeXml size={16} class="text-blue-500" />
 									{:else if favorite.kind == 'flow'}
-										<BarsStaggered size={16} />
+										<BarsStaggered size={16} class="text-teal-500" />
 									{:else if favorite.kind == 'app' || favorite.kind == 'raw_app'}
-										<LayoutDashboard size={16} />
+										<LayoutDashboard size={16} class="text-orange-500" />
 									{:else if favorite.kind == 'asset'}
-										<Table2 size={16} />
+										<Table2 size={16} class="text-primary" />
 									{/if}
 								</span>
 								<span class="text-primary ml-2 grow min-w-0 text-xs truncate">
@@ -153,7 +155,7 @@
 								<DropdownV2
 									items={[
 										{
-											displayName: 'Delete',
+											displayName: 'Remove from favorites',
 											icon: Trash2,
 											action: () => favoriteManager.unstar(favorite.path, favorite.kind)
 										}
diff --git a/frontend/src/lib/components/sidebar/MenuButton.svelte b/frontend/src/lib/components/sidebar/MenuButton.svelte
index 3499f530a5..ef6a50b42f 100644
--- a/frontend/src/lib/components/sidebar/MenuButton.svelte
+++ b/frontend/src/lib/components/sidebar/MenuButton.svelte
@@ -17,6 +17,7 @@
 	import { conditionalMelt } from '$lib/utils'
 	import type { MenubarMenuElements } from '@melt-ui/svelte'
 	import { triggerableByAI } from '$lib/actions/triggerableByAI.svelte'
+	import { ChevronDown } from 'lucide-svelte'
 
 	interface Props {
 		aiId?: string | undefined
@@ -36,6 +37,13 @@
 		trigger?: MenubarMenuElements['trigger'] | undefined
 		href?: string | undefined
 		class?: string | undefined
+		// Show a trailing chevron to signal the button opens a dropdown.
+		showChevron?: boolean
+		// Render the label with stronger weight/size (e.g. the workspace name).
+		emphasizeLabel?: boolean
+		// Drop the native `title` attributes — for callers that wrap the button
+		// in their own hover tooltip.
+		disableTitle?: boolean
 	}
 
 	let {
@@ -55,7 +63,10 @@
 		color = null,
 		trigger = undefined,
 		href = undefined,
-		class: classNames = undefined
+		class: classNames = undefined,
+		showChevron = false,
+		emphasizeLabel = false,
+		disableTitle = false
 	}: Props = $props()
 
 	let buttonRef: HTMLButtonElement | HTMLAnchorElement | undefined = $state(undefined)
@@ -103,7 +114,7 @@
 			)}
 			use:conditionalMelt={trigger}
 			aria-label={label}
-			title={isCollapsed ? undefined : label}
+			title={isCollapsed || disableTitle ? undefined : label}
 			{...$trigger}
 		>
 			{#if icon}
@@ -138,11 +149,11 @@
 					<div
 						class={twMerge(
 							'whitespace-pre truncate w-full',
-							sidebarClasses.text,
+							emphasizeLabel ? 'text-primary text-sm font-semibold' : sidebarClasses.text,
 							'transition-all',
 							classNames
 						)}
-						title={label}
+						title={disableTitle ? undefined : label}
 					>
 						{label}
 						<span class="pl-2 text-xs text-secondary font-semibold">
@@ -164,6 +175,13 @@
 				{/if}
 			</div>
 
+			{#if showChevron && !isCollapsed}
+				<ChevronDown
+					size={14}
+					class="flex-shrink-0 text-tertiary transition-colors group-hover:text-secondary"
+				/>
+			{/if}
+
 			{#if isCollapsed && notificationsCount > 0}
 				<div class="absolute top-1 right-1 flex h-fit w-fit">
 					<SideBarNotification notificationCount={notificationsCount} small={true} />
diff --git a/frontend/src/lib/components/sidebar/MultiplayerMenu.svelte b/frontend/src/lib/components/sidebar/MultiplayerMenu.svelte
index 29fe62d2ff..ebbd0b24b1 100644
--- a/frontend/src/lib/components/sidebar/MultiplayerMenu.svelte
+++ b/frontend/src/lib/components/sidebar/MultiplayerMenu.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { run } from 'svelte/legacy'
+	import { onDestroy } from 'svelte'
 
 	import { enterpriseLicense, userStore, workspaceStore, awarenessStore } from '$lib/stores'
 
@@ -23,7 +24,17 @@
 			url: $page.url.pathname
 		})
 	}
+	function disconnectWorkspace() {
+		if (wsProvider) {
+			wsProvider.destroy()
+			wsProvider = undefined
+		}
+		connected = false
+		awareness = undefined
+	}
 	async function connectWorkspace(workspace: string) {
+		disconnectWorkspace()
+
 		let token: string | undefined
 		try {
 			token = await signMultiplayerRequest(workspace)
@@ -73,6 +84,10 @@
 		$enterpriseLicense && $workspaceStore && connectWorkspace($workspaceStore)
 	})
 
+	onDestroy(() => {
+		disconnectWorkspace()
+	})
+
 	let peers = $derived(
 		Object.entries($awarenessStore ?? {}).filter(
 			([user]) => user && user !== 'undefined' && user !== 'null'
diff --git a/frontend/src/lib/components/sidebar/SettingsMenu.svelte b/frontend/src/lib/components/sidebar/SettingsMenu.svelte
new file mode 100644
index 0000000000..421800cb60
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/SettingsMenu.svelte
@@ -0,0 +1,378 @@
+<script lang="ts">
+	import {
+		Settings,
+		User,
+		ServerCog,
+		Logs,
+		Eye,
+		AlertCircle,
+		HelpCircle,
+		LogOut,
+		ChevronDown,
+		Building,
+		Moon,
+		Sun,
+		GraduationCap,
+		BookOpen,
+		Github,
+		Newspaper,
+		Crown,
+		Gauge,
+		Trash2
+	} from 'lucide-svelte'
+	import { base } from '$app/paths'
+	import { goto } from '$lib/navigation'
+	import { type Item } from '$lib/utils'
+	import { logout } from '$lib/logoutKit'
+	import { leaveCurrentWorkspace } from './leaveWorkspace'
+	import { isCloudHosted } from '$lib/cloud'
+	import DropdownV2 from '$lib/components/DropdownV2.svelte'
+	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
+	import DeleteForkedWorkspaceModal from './DeleteForkedWorkspaceModal.svelte'
+	import { workspaceIsFork } from '$lib/utils/workspaceHierarchy'
+	import DarkModeObserver from '../DarkModeObserver.svelte'
+	import DiscordIcon from '../icons/brands/Discord.svelte'
+	import MenuLink from './MenuLink.svelte'
+	import SideBarNotification from './SideBarNotification.svelte'
+	import { markChangelogsOpened, readRecentChangelogs } from './changelogs'
+	import { USER_SETTINGS_HASH, SUPERADMIN_SETTINGS_HASH } from './settings'
+	import {
+		userWorkspaces,
+		workspaceStore,
+		userStore,
+		superadmin,
+		devopsRole,
+		enterpriseLicense,
+		isCriticalAlertsUIOpen,
+		usageStore,
+		isPremiumStore
+	} from '$lib/stores'
+
+	let {
+		isCollapsed = false,
+		// Session mode: workspace the workspace-settings entry should target —
+		// the session's own (possibly forked) workspace, which can differ from
+		// the rail's active workspace, so the entry's href carries it as the
+		// `workspace` query param. Also hides "Leave workspace" (leaving a
+		// workspace from the session rail makes no sense). Unset = navigation
+		// mode, entry targets the active workspace.
+		workspaceSettingsTarget = undefined,
+		numUnacknowledgedCriticalAlerts = 0,
+		// Overridable so the kitchen-sink page can preview the cloud variant
+		// (isCloudHosted reads window.location, which a dev page can't change).
+		cloudHosted = isCloudHosted()
+	}: {
+		isCollapsed?: boolean
+		workspaceSettingsTarget?: string
+		numUnacknowledgedCriticalAlerts?: number
+		cloudHosted?: boolean
+	} = $props()
+
+	const currentWs = $derived($userWorkspaces?.find((w) => w.id === $workspaceStore))
+	const canManageWorkspace = $derived($userStore?.is_admin || $superadmin)
+	// Fork/dev workspaces are detected by their parent link, not the `wm-fork-` id prefix.
+	const currentWsIsFork = $derived(workspaceIsFork($workspaceStore, $userWorkspaces ?? []))
+
+	const settingsTargetWs = $derived(
+		workspaceSettingsTarget
+			? $userWorkspaces?.find((w) => w.id === workspaceSettingsTarget)
+			: undefined
+	)
+
+	let leaveWorkspaceModal = $state(false)
+	let deleteForkModal = $state<DeleteForkedWorkspaceModal>()
+
+	const { recent: recentChangelogs, hasNew } = readRecentChangelogs()
+	let hasNewChangelogs = $state(hasNew)
+	function onChangelogsOpened() {
+		markChangelogsOpened()
+		hasNewChangelogs = false
+	}
+
+	let darkMode = $state(false)
+	function toggleDarkMode() {
+		if (!document.documentElement.classList.contains('dark')) {
+			document.documentElement.classList.add('dark')
+			window.localStorage.setItem('dark-mode', 'dark')
+		} else {
+			document.documentElement.classList.remove('dark')
+			window.localStorage.setItem('dark-mode', 'light')
+		}
+	}
+
+	const helpItems: Item[] = [
+		{ displayName: 'Tutorials', icon: GraduationCap, href: `${base}/tutorials` },
+		{
+			displayName: 'Docs',
+			icon: BookOpen,
+			href: 'https://www.windmill.dev/docs/intro/',
+			hrefTarget: '_blank'
+		},
+		{
+			displayName: 'Feedbacks',
+			icon: DiscordIcon,
+			href: 'https://discord.gg/V7PM2YHsPB',
+			hrefTarget: '_blank'
+		},
+		{
+			displayName: 'Issues',
+			icon: Github,
+			href: 'https://github.com/windmill-labs/windmill/issues/new',
+			hrefTarget: '_blank'
+		},
+		{
+			displayName: 'Changelog',
+			icon: Newspaper,
+			href: 'https://www.windmill.dev/changelog/',
+			hrefTarget: '_blank'
+		},
+		...recentChangelogs.map((changelog, i) => ({
+			displayName: changelog.label,
+			href: changelog.href,
+			hrefTarget: '_blank' as const,
+			separatorTop: i === 0
+		}))
+	]
+
+	// Account / instance actions gathered under one "Settings" dropdown, shared by
+	// the session rail and the global sidebar so both expose the same entry point.
+	// User sits just above Logout so the account-scoped entries read as one block.
+	const items = $derived<Item[]>([
+		...(canManageWorkspace
+			? [
+					workspaceSettingsTarget
+						? {
+								displayName: `${settingsTargetWs?.name ?? workspaceSettingsTarget} settings`,
+								icon: Building,
+								// The `workspace` query param switches the app to the target
+								// workspace on arrival (full loads and client-side navs alike).
+								href: `${base}/workspace_settings?workspace=${workspaceSettingsTarget}`
+							}
+						: {
+								displayName: `${currentWs?.name ?? $workspaceStore ?? 'Workspace'} settings`,
+								icon: Building,
+								href: `${base}/workspace_settings`
+							}
+				]
+			: []),
+		...($superadmin
+			? [
+					{
+						displayName: 'Instance settings',
+						icon: Settings,
+						action: () => goto(SUPERADMIN_SETTINGS_HASH)
+					}
+				]
+			: []),
+		...(!canManageWorkspace && !workspaceSettingsTarget
+			? [
+					{
+						displayName: 'Leave workspace',
+						icon: LogOut,
+						type: 'delete' as const,
+						action: () => (leaveWorkspaceModal = true)
+					}
+				]
+			: []),
+		// Fork deletion is a global-sidebar action on the active workspace, so keep it
+		// out of the session rail's per-target settings entry (`workspaceSettingsTarget`).
+		...(currentWsIsFork && !workspaceSettingsTarget
+			? [
+					{
+						displayName: 'Delete forked workspace',
+						icon: Trash2,
+						type: 'delete' as const,
+						action: () => deleteForkModal?.openModal()
+					}
+				]
+			: []),
+		{
+			displayName: 'Help',
+			icon: HelpCircle,
+			submenuItems: helpItems,
+			extra: helpPing,
+			separatorTop: true
+		},
+		{
+			displayName: 'Switch theme',
+			icon: darkMode ? Sun : Moon,
+			action: () => toggleDarkMode()
+		},
+		{
+			// The email is the label itself; the crown icon carries the admin role.
+			displayName: $userStore?.non_member
+				? `${$userStore?.email} (superadmin, not a member)`
+				: ($userStore?.email ?? 'User'),
+			icon: $userStore?.is_admin || $userStore?.non_member ? Crown : User,
+			submenuItems: [
+				{
+					displayName: 'Account settings',
+					icon: Settings,
+					action: () => goto(USER_SETTINGS_HASH)
+				},
+				...(cloudHosted && !$isPremiumStore
+					? [
+							{
+								displayName: `${$usageStore}/1000 user execs`,
+								icon: Gauge,
+								disabled: true
+							}
+						]
+					: [])
+			]
+		},
+		{ displayName: 'Logout', icon: LogOut, action: () => logout() }
+	])
+
+	const logsItems = $derived<Item[]>([
+		{ displayName: 'Audit logs', icon: Eye, href: `${base}/audit_logs` },
+		...($devopsRole
+			? [{ displayName: 'Service logs', icon: Logs, href: `${base}/service_logs` }]
+			: []),
+		...($enterpriseLicense
+			? [
+					{
+						displayName: 'Critical alerts',
+						icon: AlertCircle,
+						action: () => isCriticalAlertsUIOpen.set(true),
+						extra: criticalAlertsBadge
+					}
+				]
+			: [])
+	])
+</script>
+
+{#snippet criticalAlertsBadge()}
+	{#if numUnacknowledgedCriticalAlerts > 0}
+		<SideBarNotification notificationCount={numUnacknowledgedCriticalAlerts} />
+	{/if}
+{/snippet}
+
+{#snippet helpPing()}
+	{#if hasNewChangelogs}
+		<span class="relative flex h-2 w-2">
+			<span
+				class="animate-ping absolute inline-flex h-full w-full rounded-full bg-frost-400 opacity-75"
+			></span>
+			<span class="relative inline-flex rounded-full h-2 w-2 bg-frost-500"></span>
+		</span>
+	{/if}
+{/snippet}
+
+<!-- Workers and Logs are full pages (not account/instance actions), so they sit
+     as plain links above the Settings dropdown rather than inside it. -->
+<div class="flex flex-col gap-1 pb-1">
+	<MenuLink
+		class="!text-xs"
+		label="Workers"
+		href="{base}/workers"
+		icon={ServerCog}
+		{isCollapsed}
+		aiId="sidebar-menu-link-workers"
+		aiDescription="Button to navigate to workers"
+	/>
+	{#if $devopsRole || $userStore?.is_admin}
+		<DropdownV2
+			items={logsItems}
+			placement="top-start"
+			class="w-full"
+			enableFlyTransition
+			aiId="sidebar-menu-link-logs"
+			aiDescription="Button to open the logs menu (audit logs, service logs, critical alerts)"
+		>
+			{#snippet buttonReplacement()}
+				<span
+					class="relative flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-secondary text-xs hover:bg-surface-hover cursor-pointer {isCollapsed
+						? 'justify-center'
+						: ''}"
+				>
+					<Logs size={16} />
+					{#if !isCollapsed}
+						Logs
+						<span class="ml-auto flex items-center gap-2">
+							{#if numUnacknowledgedCriticalAlerts > 0}
+								<SideBarNotification notificationCount={numUnacknowledgedCriticalAlerts} />
+							{/if}
+							<ChevronDown size={14} class="flex-shrink-0 text-tertiary" />
+						</span>
+					{:else if numUnacknowledgedCriticalAlerts > 0}
+						<span class="absolute top-0.5 right-0.5">
+							<SideBarNotification
+								notificationCount={numUnacknowledgedCriticalAlerts}
+								small={true}
+							/>
+						</span>
+					{/if}
+				</span>
+			{/snippet}
+		</DropdownV2>
+	{:else}
+		<MenuLink
+			class="!text-xs"
+			label="Audit logs"
+			href="{base}/audit_logs"
+			icon={Eye}
+			disabled={$userStore?.operator}
+			{isCollapsed}
+			aiId="sidebar-menu-link-audit-logs"
+			aiDescription="Button to navigate to audit logs"
+		/>
+	{/if}
+</div>
+
+<!-- Changelogs count as seen once the menu closes (not on open), so the Help-row
+     dot stays visible while the user is looking at the open menu. -->
+<DropdownV2
+	{items}
+	placement="top-start"
+	class="w-full"
+	enableFlyTransition
+	on:close={onChangelogsOpened}
+>
+	{#snippet buttonReplacement()}
+		<span
+			class="relative flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-secondary text-xs hover:bg-surface-hover cursor-pointer {isCollapsed
+				? 'justify-center'
+				: ''}"
+		>
+			<Settings size={16} />
+			{#if !isCollapsed}
+				Settings
+				<ChevronDown size={14} class="ml-auto flex-shrink-0 text-tertiary" />
+			{/if}
+			{#if hasNewChangelogs}
+				<span
+					class="flex h-2 w-2 absolute {isCollapsed
+						? 'top-0.5 right-0.5'
+						: 'right-7 top-1/2 -translate-y-1/2'}"
+				>
+					<span
+						class="animate-ping absolute inline-flex h-full w-full rounded-full bg-frost-400 opacity-75"
+					></span>
+					<span class="relative inline-flex rounded-full h-2 w-2 bg-frost-500"></span>
+				</span>
+			{/if}
+		</span>
+	{/snippet}
+</DropdownV2>
+
+<ConfirmationModal
+	open={leaveWorkspaceModal}
+	title="Leave workspace"
+	confirmationText="Leave workspace"
+	on:canceled={() => {
+		leaveWorkspaceModal = false
+	}}
+	on:confirmed={() => {
+		leaveWorkspaceModal = false
+		void leaveCurrentWorkspace()
+	}}
+>
+	<div class="flex flex-col w-full space-y-4">
+		<span>Are you sure you want to leave this workspace?</span>
+	</div>
+</ConfirmationModal>
+
+<DeleteForkedWorkspaceModal bind:this={deleteForkModal} />
+
+<DarkModeObserver bind:darkMode />
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index 2e6c8d2448..abfd23f751 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -4,8 +4,6 @@
 		superadmin,
 		usedTriggerKinds,
 		userStore,
-		usersWorkspaceStore,
-		userWorkspaces,
 		workspaceStore,
 		isCriticalAlertsUIOpen,
 		enterpriseLicense,
@@ -13,7 +11,6 @@
 		tutorialsToDo,
 		skippedAll
 	} from '$lib/stores'
-	import { findWorkspaceDescendants } from '$lib/utils/workspaceHierarchy'
 	import { syncTutorialsTodos } from '$lib/tutorialUtils'
 	import { SIDEBAR_SHOW_SCHEDULES } from '$lib/consts'
 	import {
@@ -36,12 +33,12 @@
 		Route,
 		Settings,
 		UserCog,
+		Users,
 		Plus,
 		Unplug,
 		AlertCircle,
 		Database,
 		Pyramid,
-		Trash2,
 		MailIcon,
 		ChevronDown,
 		ChevronRight
@@ -50,16 +47,10 @@
 	import { slide } from 'svelte/transition'
 	import UserMenu from './UserMenu.svelte'
 	import DiscordIcon from '../icons/brands/Discord.svelte'
-	import { WorkspaceService } from '$lib/gen'
-	import { sendUserToast } from '$lib/toast'
-	import { clearStores, switchWorkspace } from '$lib/storeUtils'
-	import Toggle from '$lib/components/Toggle.svelte'
-	import { goto } from '$lib/navigation'
 	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import { onMount } from 'svelte'
 	import { base } from '$lib/base'
-	import { type Changelog, changelogs } from './changelogs'
 	import { page } from '$app/state'
 	import SideBarNotification from './SideBarNotification.svelte'
 	import KafkaIcon from '../icons/KafkaIcon.svelte'
@@ -82,103 +73,11 @@
 	import MenuButton from './MenuButton.svelte'
 	import GoogleCloudIcon from '../icons/GoogleCloudIcon.svelte'
 	import AzureIcon from '../icons/AzureIcon.svelte'
+	import { leaveCurrentWorkspace } from './leaveWorkspace'
+	import { markChangelogsOpened, readRecentChangelogs } from './changelogs'
 
-	async function leaveWorkspace() {
-		await WorkspaceService.leaveWorkspace({ workspace: $workspaceStore ?? '' })
-		sendUserToast('You left the workspace')
-		clearStores()
-		goto('/user/workspaces')
-	}
-
-	type ForkedDatatable = {
-		name: string
-		resourceType: string
-		resourcePath: string
-		dropOnDelete: boolean
-	}
-	let forkedDatatables: ForkedDatatable[] = $state([])
-
-	async function loadForkedDatatables() {
-		if (!$workspaceStore) return
-		try {
-			const settings = await WorkspaceService.getPublicSettings({ workspace: $workspaceStore })
-			const datatables = settings.datatable?.datatables ?? {}
-			forkedDatatables = Object.entries(datatables)
-				.filter(([_, dt]) => dt.forked_from != null)
-				.map(([name, dt]) => ({
-					name,
-					resourceType: dt.database.resource_type ?? 'instance',
-					resourcePath: dt.database.resource_path ?? '',
-					dropOnDelete: true
-				}))
-		} catch {
-			forkedDatatables = []
-		}
-	}
-
-	async function deleteFork() {
-		const workspace = $workspaceStore ?? ''
-		// Capture the parent before delete so we can land the user there
-		// instead of dropping them back on the workspace-picker menu.
-		// Only valid if the parent is still in the user's workspace list.
-		const parentId = $userWorkspaces.find((w) => w.id === workspace)?.parent_workspace_id
-		const parentStillAccessible = !!(parentId && $userWorkspaces.find((w) => w.id === parentId))
-		const dbsToDrop = forkedDatatables.filter((dt) => dt.dropOnDelete).map((dt) => dt.name)
-
-		if (dbsToDrop.length > 0) {
-			const errors = await WorkspaceService.dropForkedDatatableDatabases({
-				workspace,
-				requestBody: { datatable_names: dbsToDrop }
-			})
-			for (const err of errors) {
-				sendUserToast(err, true)
-			}
-		}
-
-		if (deleteForkedChildren && forkedDescendants.length > 0) {
-			for (const child of forkedDescendants) {
-				try {
-					await WorkspaceService.deleteWorkspace({ workspace: child.id })
-				} catch (err) {
-					sendUserToast(`Failed to delete forked child ${child.id}: ${err}`, true)
-					return
-				}
-			}
-		}
-
-		await WorkspaceService.deleteWorkspace({ workspace })
-		sendUserToast('You deleted the workspace')
-		if (parentStillAccessible && parentId) {
-			// Refresh the workspace list before landing on the parent.
-			// `clearStores()` would null `usersWorkspaceStore`, which the
-			// sidebar's `visibleSessions` filter reads via `$userWorkspaces`
-			// — with an empty list, every committed session falls into the
-			// "workspace_id set but not in user's list" branch and renders
-			// as "Fork — no longer available" until a hard reload.
-			try {
-				usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
-			} catch (e) {
-				// A transient list-refresh failure must not strand the user on the
-				// just-deleted workspace — still switch + navigate (the list reloads
-				// on the next page load).
-				console.error('Failed to refresh workspaces after delete', e)
-			}
-			switchWorkspace(parentId)
-			await goto('/')
-		} else {
-			clearStores()
-			await goto('/user/workspaces')
-		}
-	}
-
-	let deleteForkedChildren = $state(false)
-	const forkedDescendants = $derived(
-		$workspaceStore ? findWorkspaceDescendants($workspaceStore, $userWorkspaces ?? []) : []
-	)
-
-	let hasNewChangelogs = $state(false)
-	let recentChangelogs: Changelog[] = $state([])
-	let lastOpened = localStorage.getItem('changelogsLastOpened')
+	const { recent: recentChangelogs, hasNew } = readRecentChangelogs()
+	let hasNewChangelogs = $state(hasNew)
 	let availableNativeServices = $state<
 		Array<{ service: NativeServiceName; icon: any; config: any }>
 	>([])
@@ -209,21 +108,12 @@
 	)
 
 	onMount(async () => {
-		if (lastOpened) {
-			// @ts-ignore
-			recentChangelogs = changelogs.filter((changelog) => changelog.date > lastOpened)
-			hasNewChangelogs =
-				recentChangelogs.length > 0 && lastOpened !== new Date().toISOString().split('T')[0]
-		} else {
-			recentChangelogs = changelogs.slice(0, 3)
-		}
 		// Sync tutorial progress on mount
 		await syncTutorialsTodos()
 	})
 
 	function openChangelogs() {
-		const today = new Date().toISOString().split('T')[0]
-		localStorage.setItem('changelogsLastOpened', today)
+		markChangelogsOpened()
 		hasNewChangelogs = false
 	}
 
@@ -279,12 +169,25 @@
 	interface Props {
 		numUnacknowledgedCriticalAlerts?: number
 		isCollapsed?: boolean
+		// Render the workspace-content nav (Home/Runs/Variables/… + triggers).
+		showMain?: boolean
+		// Render the bottom account group (User, Settings, Workers, Folders, Logs, Help).
+		// Splitting these lets a host show content nav and account nav in separate rails.
+		showSecondary?: boolean
+		// Main-menu labels to omit here because the host renders them elsewhere
+		// (e.g. the session-mode rail lifts Home/Runs up next to Favorites/Search).
+		excludeMainLabels?: string[]
 	}
 
-	let { numUnacknowledgedCriticalAlerts = 0, isCollapsed = false }: Props = $props()
+	let {
+		numUnacknowledgedCriticalAlerts = 0,
+		isCollapsed = false,
+		showMain = true,
+		showSecondary = true,
+		excludeMainLabels = []
+	}: Props = $props()
 
 	let leaveWorkspaceModal = $state(false)
-	let deleteWorkspaceForkModal = $state(false)
 
 	function computeAllNotificationsCount(menuItems: any[]) {
 		let count = 0
@@ -297,63 +200,81 @@
 	const itemClass = twMerge(
 		'text-secondary font-normal w-full block px-4 py-2 text-2xs data-[highlighted]:bg-surface-hover data-[highlighted]:text-primary'
 	)
-	let mainMenuLinks = $derived([
-		{
-			label: 'Home',
-			href: `${base}/`,
-			icon: Home,
-			aiId: 'sidebar-menu-link-home',
-			aiDescription:
-				"Button to navigate to home which contains all the user's scripts, flows and apps"
-		},
-		{
-			label: 'Runs',
-			href: `${base}/runs`,
-			icon: Play,
-			aiId: 'sidebar-menu-link-runs',
-			aiDescription: 'Button to navigate to runs',
-			onclick: () => {
-				setTimeout(() => {
-					window.dispatchEvent(new Event('popstate'))
-				}, 100)
-			}
-		},
-		{
-			label: 'Variables',
-			href: `${base}/variables`,
-			icon: DollarSign,
-			disabled: $userStore?.operator,
-			aiId: 'sidebar-menu-link-variables',
-			aiDescription: 'Button to navigate to variables'
-		},
-		{
-			label: 'Resources',
-			href: `${base}/resources`,
-			icon: Boxes,
-			disabled: $userStore?.operator,
-			aiId: 'sidebar-menu-link-resources',
-			aiDescription: 'Button to navigate to resources'
-		},
-		{
-			label: 'Assets',
-			href: `${base}/assets`,
-			icon: Pyramid,
-			aiId: 'sidebar-menu-link-assets',
-			aiDescription: 'Button to navigate to assets'
-		},
-		// Add Tutorials to main menu only if not all completed and not skipped
-		...($tutorialsToDo.length > 0 && !$skippedAll
-			? [
-					{
-						label: 'Tutorials',
-						href: `${base}/tutorials`,
-						icon: GraduationCap,
-						aiId: 'sidebar-menu-link-tutorials-main',
-						aiDescription: 'Button to navigate to tutorials'
-					}
-				]
-			: [])
-	])
+	let mainMenuLinks = $derived(
+		[
+			{
+				label: 'Home',
+				href: `${base}/`,
+				icon: Home,
+				aiId: 'sidebar-menu-link-home',
+				aiDescription:
+					"Button to navigate to home which contains all the user's scripts, flows and apps"
+			},
+			{
+				label: 'Runs',
+				href: `${base}/runs`,
+				icon: Play,
+				aiId: 'sidebar-menu-link-runs',
+				aiDescription: 'Button to navigate to runs',
+				onclick: () => {
+					setTimeout(() => {
+						window.dispatchEvent(new Event('popstate'))
+					}, 100)
+				}
+			},
+			{
+				label: 'Variables',
+				href: `${base}/variables`,
+				icon: DollarSign,
+				disabled: $userStore?.operator,
+				aiId: 'sidebar-menu-link-variables',
+				aiDescription: 'Button to navigate to variables'
+			},
+			{
+				label: 'Resources',
+				href: `${base}/resources`,
+				icon: Boxes,
+				disabled: $userStore?.operator,
+				aiId: 'sidebar-menu-link-resources',
+				aiDescription: 'Button to navigate to resources'
+			},
+			{
+				label: 'Assets',
+				href: `${base}/assets`,
+				icon: Pyramid,
+				aiId: 'sidebar-menu-link-assets',
+				aiDescription: 'Button to navigate to assets'
+			},
+			{
+				label: 'Folders',
+				href: `${base}/folders`,
+				icon: FolderOpen,
+				disabled: $userStore?.operator,
+				aiId: 'sidebar-menu-link-folders',
+				aiDescription: 'Button to navigate to folders'
+			},
+			{
+				label: 'Groups',
+				href: `${base}/groups`,
+				icon: Users,
+				disabled: $userStore?.operator,
+				aiId: 'sidebar-menu-link-groups',
+				aiDescription: 'Button to navigate to groups'
+			},
+			// Add Tutorials to main menu only if not all completed and not skipped
+			...($tutorialsToDo.length > 0 && !$skippedAll
+				? [
+						{
+							label: 'Tutorials',
+							href: `${base}/tutorials`,
+							icon: GraduationCap,
+							aiId: 'sidebar-menu-link-tutorials-main',
+							aiDescription: 'Button to navigate to tutorials'
+						}
+					]
+				: [])
+		].filter((l) => !excludeMainLabels.includes(l.label))
+	)
 	let defaultExtraTriggerLinks = $derived([
 		{
 			label: 'HTTP',
@@ -537,20 +458,6 @@
 								faIcon: undefined
 							}
 						]
-					: []),
-				...($workspaceStore?.startsWith('wm-fork-')
-					? [
-							{
-								label: 'Delete Forked Workspace',
-								action: async () => {
-									await loadForkedDatatables()
-									deleteForkedChildren = false
-									deleteWorkspaceForkModal = true
-								},
-								icon: Trash2,
-								faIcon: undefined
-							}
-						]
 					: [])
 			],
 			disabled: $userStore?.operator
@@ -563,33 +470,6 @@
 			aiId: 'sidebar-menu-link-workers',
 			aiDescription: 'Button to navigate to workers'
 		},
-		{
-			label: 'Folders & Groups',
-			icon: FolderOpen,
-			aiId: 'sidebar-menu-link-folders-groups',
-			aiDescription: 'Button to navigate to folders and groups',
-			subItems: [
-				{
-					label: 'Folders',
-					href: `${base}/folders`,
-					icon: FolderOpen,
-					disabled: $userStore?.operator,
-					aiId: 'sidebar-menu-link-folders',
-					aiDescription: 'Button to navigate to folders',
-					faIcon: undefined
-				},
-				{
-					label: 'Groups',
-					href: `${base}/groups`,
-					icon: UserCog,
-					disabled: $userStore?.operator,
-					aiId: 'sidebar-menu-link-groups',
-					aiDescription: 'Button to navigate to groups',
-					faIcon: undefined
-				}
-			],
-			disabled: $userStore?.operator
-		},
 		$devopsRole || $userStore?.is_admin
 			? {
 					label: 'Logs',
@@ -642,217 +522,224 @@
 	])
 </script>
 
-<nav
-	class={twMerge(
-		'grow flex flex-col overflow-x-hidden scrollbar-hidden px-2 md:pb-2 justify-between gap-2'
-	)}
->
-	<div class={twMerge('pt-4 flex flex-col grow')}>
-		<div class="space-y-1">
-			{#each mainMenuLinks as menuLink (menuLink.href ?? menuLink.label)}
-				<MenuLink class="!text-xs" {...menuLink} {isCollapsed} />
-			{/each}
-		</div>
-		<div class="pt-4">
-			{#if isCollapsed}
-				<div class="text-secondary text-[0.5rem] uppercase transition-opacity opacity-0">
-					Triggers
-				</div>
-			{:else}
-				<button
-					type="button"
-					onclick={() => (triggersCollapsed.val = !triggersCollapsed.val)}
-					class="text-secondary text-[0.5rem] uppercase flex flex-row items-center gap-1 rounded px-1 -mx-1 py-0.5 hover:bg-surface-hover focus:outline-none"
-					aria-expanded={!triggersCollapsed.val}
-				>
-					Triggers
-					{#if triggersCollapsed.val}
-						<ChevronRight size={10} />
-					{:else}
-						<ChevronDown size={10} />
-					{/if}
-				</button>
-			{/if}
-			{#if isCollapsed || !triggersCollapsed.val}
-				<div transition:slide={{ duration: 180 }}>
-					<Menubar class="flex flex-col gap-1">
-						{#snippet children({ createMenu })}
-							{#each triggerMenuLinks as menuLink (menuLink.href ?? menuLink.label)}
-								<MenuLink class="!text-xs" {...menuLink} {isCollapsed} />
-							{/each}
-							{#if extraTriggerLinks.length > 0 && !$userStore?.operator}
-								<Menu {createMenu} usePointerDownOutside>
-									{#snippet triggr({ trigger })}
-										<MeltButton
-											aiId="sidebar-menu-link-add-trigger"
-											aiDescription="Button to add a new trigger. Can be HTTP, WebSocket, Postgres, Kafka, NATS, SQS, GCP Pub/Sub, or MQTT"
-											class={twMerge(
-												'w-full text-secondary text-2xs flex flex-row gap-1 py-1 items-center px-2 hover:bg-surface-hover rounded',
-												'data-[highlighted]:bg-surface-hover'
-											)}
-											meltElement={trigger}
-										>
-											<Plus size={14} />
-										</MeltButton>
-									{/snippet}
-									{#snippet children({ item })}
-										{#each extraTriggerLinks as subItem (subItem.href ?? subItem.label)}
-											<MenuItem
-												aiId={subItem.aiId}
-												aiDescription={subItem.aiDescription}
-												href={subItem.disabled ? '' : subItem.href}
-												class={twMerge(
-													itemClass,
-													subItem.disabled ? 'pointer-events-none opacity-50' : ''
-												)}
-												{item}
-												disabled={subItem.disabled}
-											>
-												<div class="flex flex-row items-center gap-2">
-													{#if subItem.icon}
-														<subItem.icon size={16} />
-													{/if}
-													{subItem.label}
-												</div>
-											</MenuItem>
-										{/each}
-									{/snippet}
-								</Menu>
-							{/if}
-						{/snippet}
-					</Menubar>
-				</div>
-			{/if}
-		</div>
-		<div class="flex flex-col gap-2 mt-auto pt-4">
-			<!-- Single Menubar so melt-ui's hover-to-switch spans the whole bottom
-			     group (Settings/Workers/Folders/Logs AND Help). With Help in its own
-			     Menubar the menus stack instead of switching (WIN-1993). Each group
-			     keeps its own flex container for spacing. -->
-			<Menubar class="flex flex-col gap-2">
-				{#snippet children({ createMenu })}
-					<div class="flex flex-col gap-1">
-						<UserMenu {isCollapsed} {createMenu} />
-
-						{#each secondaryMenuLinks as menuLink (menuLink.href ?? menuLink.label)}
-							{#if menuLink.subItems}
-								{@const notificationsCount = computeAllNotificationsCount(menuLink.subItems)}
-								<Menu {createMenu} usePointerDownOutside>
-									{#snippet triggr({ trigger })}
-										<MenuButton
-											class="!text-2xs"
-											{...menuLink}
-											{isCollapsed}
-											{notificationsCount}
-											{trigger}
-										/>
-									{/snippet}
-
-									{#snippet children({ item })}
-										{#each menuLink.subItems as subItem (subItem.href ?? subItem.label)}
-											<MenuItem
-												class={itemClass}
-												href={subItem.href}
-												{item}
-												onClick={() => {
-													subItem?.['action']?.()
-												}}
-												aiId={subItem.aiId}
-												aiDescription={subItem.aiDescription}
-											>
-												<div class="flex flex-row items-center gap-2">
-													{#if subItem.icon}
-														<subItem.icon size={16} />
-													{/if}
-													{subItem.label}
-													{#if subItem?.['notificationCount']}
-														<div class="ml-auto">
-															<SideBarNotification
-																notificationCount={subItem['notificationCount']}
-															/>
-														</div>
-													{/if}
-												</div>
-											</MenuItem>
-										{/each}
-									{/snippet}
-								</Menu>
-							{:else}
-								<MenuSingleItem>
-									{#snippet children({})}
-										<MenuLink class="!text-2xs" {...menuLink} {isCollapsed} />
-									{/snippet}
-								</MenuSingleItem>
-							{/if}
-						{/each}
+<nav class={twMerge('flex flex-col overflow-x-hidden scrollbar-hidden px-2 md:pb-2 gap-2')}>
+	<div class={twMerge('flex flex-col')}>
+		{#if showMain}
+			<div class="space-y-1">
+				{#each mainMenuLinks as menuLink (menuLink.href ?? menuLink.label)}
+					<MenuLink class="!text-xs" {...menuLink} {isCollapsed} />
+				{/each}
+			</div>
+			<div class="pt-4">
+				{#if isCollapsed}
+					<div class="text-secondary text-[0.5rem] uppercase transition-opacity opacity-0">
+						Triggers
 					</div>
-
-					<div class="flex flex-col gap-1">
-						{#each thirdMenuLinks as menuLink (menuLink)}
-							{#if menuLink.subItems}
-								<Menu {createMenu} usePointerDownOutside>
-									{#snippet triggr({ trigger })}
-										<button
-											class="relative w-full"
-											onclick={() => {
-												if (menuLink.label === 'Help') {
-													openChangelogs()
-												}
-											}}
-										>
-											<MenuButton class="!text-2xs" {...menuLink} {isCollapsed} {trigger} />
-											{#if menuLink.label === 'Help' && hasNewChangelogs}
-												<span
-													class={twMerge(
-														'flex h-2 w-2 absolute',
-														isCollapsed ? 'top-1 right-1' : 'right-2 top-1/2 -translate-y-1/2'
-													)}
-												>
-													<span
-														class="animate-ping absolute inline-flex h-full w-full rounded-full bg-frost-400 opacity-75"
-													></span>
-													<span class="relative inline-flex rounded-full h-2 w-2 bg-frost-500"
-													></span>
-												</span>
-											{/if}
-										</button>
-									{/snippet}
-									{#snippet children({ item })}
-										{#each menuLink.subItems as subItem (subItem.href ?? subItem.label)}
-											<MenuItem
-												href={subItem.href}
-												class={itemClass}
-												target={subItem.external !== false ? '_blank' : undefined}
-												{item}
+				{:else}
+					<button
+						type="button"
+						onclick={() => (triggersCollapsed.val = !triggersCollapsed.val)}
+						class="text-secondary text-[0.5rem] uppercase flex flex-row items-center gap-1 rounded px-1 -mx-1 py-0.5 hover:bg-surface-hover focus:outline-none"
+						aria-expanded={!triggersCollapsed.val}
+					>
+						Triggers
+						{#if triggersCollapsed.val}
+							<ChevronRight size={10} />
+						{:else}
+							<ChevronDown size={10} />
+						{/if}
+					</button>
+				{/if}
+				{#if isCollapsed || !triggersCollapsed.val}
+					<div transition:slide={{ duration: 180 }}>
+						<Menubar class="flex flex-col gap-1">
+							{#snippet children({ createMenu })}
+								{#each triggerMenuLinks as menuLink (menuLink.href ?? menuLink.label)}
+									<MenuLink class="!text-xs" {...menuLink} {isCollapsed} />
+								{/each}
+								{#if extraTriggerLinks.length > 0 && !$userStore?.operator}
+									<Menu {createMenu} usePointerDownOutside>
+										{#snippet triggr({ trigger })}
+											<MeltButton
+												aiId="sidebar-menu-link-add-trigger"
+												aiDescription="Button to add a new trigger. Can be HTTP, WebSocket, Postgres, Kafka, NATS, SQS, GCP Pub/Sub, or MQTT"
+												class={twMerge(
+													'w-full text-secondary text-2xs flex flex-row gap-1 py-1 items-center px-2 hover:bg-surface-hover rounded',
+													'data-[highlighted]:bg-surface-hover'
+												)}
+												meltElement={trigger}
 											>
-												<div class="flex flex-row items-center gap-2">
-													{#if subItem.icon}
-														<subItem.icon size={16} />
-													{/if}
-
-													{subItem.label}
-												</div>
-											</MenuItem>
-										{/each}
-										{#if recentChangelogs.length > 0}
-											<div class="w-full h-1 border-t"></div>
-											<span class="text-xs px-4 font-bold"> Latest changelogs </span>
-											{#each recentChangelogs as changelog}
-												<MenuItem href={changelog.href} class={itemClass} target="_blank" {item}>
+												<Plus size={14} />
+											</MeltButton>
+										{/snippet}
+										{#snippet children({ item })}
+											{#each extraTriggerLinks as subItem (subItem.href ?? subItem.label)}
+												<MenuItem
+													aiId={subItem.aiId}
+													aiDescription={subItem.aiDescription}
+													href={subItem.disabled ? '' : subItem.href}
+													class={twMerge(
+														itemClass,
+														subItem.disabled ? 'pointer-events-none opacity-50' : ''
+													)}
+													{item}
+													disabled={subItem.disabled}
+												>
 													<div class="flex flex-row items-center gap-2">
-														{changelog.label}
+														{#if subItem.icon}
+															<subItem.icon size={16} />
+														{/if}
+														{subItem.label}
 													</div>
 												</MenuItem>
 											{/each}
-										{/if}
-									{/snippet}
-								</Menu>
-							{/if}
-						{/each}
+										{/snippet}
+									</Menu>
+								{/if}
+							{/snippet}
+						</Menubar>
 					</div>
-				{/snippet}
-			</Menubar>
-		</div>
+				{/if}
+			</div>
+		{/if}
+		{#if showSecondary}
+			<div class="flex flex-col gap-2 mt-auto pt-4">
+				<!-- Single Menubar so melt-ui's hover-to-switch spans the whole bottom
+			     group (Settings/Workers/Folders/Logs AND Help). With Help in its own
+			     Menubar the menus stack instead of switching (WIN-1993). Each group
+			     keeps its own flex container for spacing. -->
+				<Menubar class="flex flex-col gap-2">
+					{#snippet children({ createMenu })}
+						<div class="flex flex-col gap-1">
+							<UserMenu {isCollapsed} {createMenu} />
+
+							{#each secondaryMenuLinks as menuLink (menuLink.href ?? menuLink.label)}
+								{#if menuLink.subItems}
+									{@const notificationsCount = computeAllNotificationsCount(menuLink.subItems)}
+									<Menu {createMenu} usePointerDownOutside>
+										{#snippet triggr({ trigger })}
+											<MenuButton
+												class="!text-2xs"
+												{...menuLink}
+												{isCollapsed}
+												{notificationsCount}
+												showChevron
+												{trigger}
+											/>
+										{/snippet}
+
+										{#snippet children({ item })}
+											{#each menuLink.subItems as subItem (subItem.href ?? subItem.label)}
+												<MenuItem
+													class={itemClass}
+													href={subItem.href}
+													{item}
+													onClick={() => {
+														subItem?.['action']?.()
+													}}
+													aiId={subItem.aiId}
+													aiDescription={subItem.aiDescription}
+												>
+													<div class="flex flex-row items-center gap-2">
+														{#if subItem.icon}
+															<subItem.icon size={16} />
+														{/if}
+														{subItem.label}
+														{#if subItem?.['notificationCount']}
+															<div class="ml-auto">
+																<SideBarNotification
+																	notificationCount={subItem['notificationCount']}
+																/>
+															</div>
+														{/if}
+													</div>
+												</MenuItem>
+											{/each}
+										{/snippet}
+									</Menu>
+								{:else}
+									<MenuSingleItem>
+										{#snippet children({})}
+											<MenuLink class="!text-2xs" {...menuLink} {isCollapsed} />
+										{/snippet}
+									</MenuSingleItem>
+								{/if}
+							{/each}
+						</div>
+
+						<div class="flex flex-col gap-1">
+							{#each thirdMenuLinks as menuLink (menuLink)}
+								{#if menuLink.subItems}
+									<Menu {createMenu} usePointerDownOutside>
+										{#snippet triggr({ trigger })}
+											<button
+												class="relative w-full"
+												onclick={() => {
+													if (menuLink.label === 'Help') {
+														openChangelogs()
+													}
+												}}
+											>
+												<MenuButton
+													class="!text-2xs"
+													{...menuLink}
+													{isCollapsed}
+													showChevron
+													{trigger}
+												/>
+												{#if menuLink.label === 'Help' && hasNewChangelogs}
+													<span
+														class={twMerge(
+															'flex h-2 w-2 absolute',
+															isCollapsed ? 'top-1 right-1' : 'right-2 top-1/2 -translate-y-1/2'
+														)}
+													>
+														<span
+															class="animate-ping absolute inline-flex h-full w-full rounded-full bg-frost-400 opacity-75"
+														></span>
+														<span class="relative inline-flex rounded-full h-2 w-2 bg-frost-500"
+														></span>
+													</span>
+												{/if}
+											</button>
+										{/snippet}
+										{#snippet children({ item })}
+											{#each menuLink.subItems as subItem (subItem.href ?? subItem.label)}
+												<MenuItem
+													href={subItem.href}
+													class={itemClass}
+													target={subItem.external !== false ? '_blank' : undefined}
+													{item}
+												>
+													<div class="flex flex-row items-center gap-2">
+														{#if subItem.icon}
+															<subItem.icon size={16} />
+														{/if}
+
+														{subItem.label}
+													</div>
+												</MenuItem>
+											{/each}
+											{#if recentChangelogs.length > 0}
+												<div class="w-full h-1 border-t"></div>
+												<span class="text-xs px-4 font-bold"> Latest changelogs </span>
+												{#each recentChangelogs as changelog}
+													<MenuItem href={changelog.href} class={itemClass} target="_blank" {item}>
+														<div class="flex flex-row items-center gap-2">
+															{changelog.label}
+														</div>
+													</MenuItem>
+												{/each}
+											{/if}
+										{/snippet}
+									</Menu>
+								{/if}
+							{/each}
+						</div>
+					{/snippet}
+				</Menubar>
+			</div>
+		{/if}
 	</div></nav
 >
 
@@ -864,76 +751,10 @@
 		leaveWorkspaceModal = false
 	}}
 	on:confirmed={() => {
-		leaveWorkspace()
+		void leaveCurrentWorkspace()
 	}}
 >
 	<div class="flex flex-col w-full space-y-4">
 		<span>Are you sure you want to leave this workspace?</span>
 	</div>
 </ConfirmationModal>
-
-{#if $workspaceStore?.startsWith('wm-fork-')}
-	<ConfirmationModal
-		open={deleteWorkspaceForkModal}
-		title="Delete forked workspace"
-		confirmationText="Remove"
-		on:canceled={() => {
-			deleteWorkspaceForkModal = false
-		}}
-		on:confirmed={() => {
-			deleteWorkspaceForkModal = false
-			deleteFork()
-		}}
-	>
-		<div class="flex flex-col w-full space-y-4">
-			<span>Are you sure you want to delete this workspace fork? (deleting {$workspaceStore})</span>
-			{#if forkedDescendants.length > 0}
-				<div class="border rounded-md divide-y">
-					<div class="px-4 py-2 flex items-center justify-between gap-2">
-						<div class="flex flex-col min-w-0">
-							<span class="text-xs font-semibold text-secondary">Forked children</span>
-							<span class="text-3xs text-hint">
-								This fork has {forkedDescendants.length} forked
-								{forkedDescendants.length === 1 ? 'child' : 'children'} (transitively).
-							</span>
-						</div>
-						<Toggle
-							class="shrink-0"
-							size="xs"
-							bind:checked={deleteForkedChildren}
-							options={{ right: 'Also delete children' }}
-						/>
-					</div>
-					<ul class="px-4 py-2 text-3xs text-hint max-h-32 overflow-y-auto">
-						{#each forkedDescendants as child}
-							<li class="font-mono truncate" title={child.id}>{child.id}</li>
-						{/each}
-					</ul>
-				</div>
-			{/if}
-			{#if forkedDatatables.length > 0}
-				<div class="border rounded-md divide-y">
-					<div class="px-4 py-2 text-xs font-semibold text-secondary"> Forked databases </div>
-					{#each forkedDatatables as dt}
-						<div class="flex items-center justify-between px-4 py-2">
-							<div class="flex flex-col">
-								<span class="text-xs font-medium text-secondary">{dt.name}</span>
-								<span class="text-3xs text-hint">
-									{dt.resourceType === 'instance'
-										? dt.resourcePath
-										: `${$workspaceStore?.replace(/-/g, '_')}__${dt.name}`}
-								</span>
-							</div>
-							<Toggle
-								class="shrink-0"
-								size="xs"
-								bind:checked={dt.dropOnDelete}
-								options={{ right: 'Drop database' }}
-							/>
-						</div>
-					{/each}
-				</div>
-			{/if}
-		</div>
-	</ConfirmationModal>
-{/if}
diff --git a/frontend/src/lib/components/sidebar/SidebarScrollArea.svelte b/frontend/src/lib/components/sidebar/SidebarScrollArea.svelte
new file mode 100644
index 0000000000..189cee37d1
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/SidebarScrollArea.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+	import type { Snippet } from 'svelte'
+
+	let {
+		color,
+		class: className = '',
+		children
+	}: {
+		// Rail background, so the overflow fades blend into it rather than sitting
+		// as visible bars.
+		color: string
+		class?: string
+		children: Snippet
+	} = $props()
+
+	let viewport = $state<HTMLElement | undefined>(undefined)
+	let overflowTop = $state(false)
+	let overflowBottom = $state(false)
+
+	function measure() {
+		const el = viewport
+		if (!el) return
+		overflowTop = el.scrollTop > 1
+		overflowBottom = Math.ceil(el.scrollTop + el.clientHeight) < el.scrollHeight - 1
+	}
+
+	$effect(() => {
+		const el = viewport
+		if (!el) return
+		measure()
+		// Re-measure when the viewport or its content changes height — menus
+		// expanding, sessions loading, the rail being resized — not just on scroll.
+		const ro = new ResizeObserver(measure)
+		ro.observe(el)
+		for (const child of Array.from(el.children)) ro.observe(child)
+		return () => ro.disconnect()
+	})
+</script>
+
+<div class={'relative flex-1 min-h-0 ' + className}>
+	<div
+		bind:this={viewport}
+		onscroll={measure}
+		class="sidebar-scroll h-full overflow-y-auto overflow-x-hidden scrollbar-hidden flex flex-col gap-3"
+	>
+		{@render children()}
+	</div>
+	<!-- Overflow hints: a short fade to the rail colour that only shows when there
+	     is content past that edge. pointer-events-none so it never eats clicks. -->
+	<div
+		class="pointer-events-none absolute inset-x-0 top-0 h-4 transition-opacity duration-150"
+		style:opacity={overflowTop ? 1 : 0}
+		style:background="linear-gradient(to bottom, {color}, transparent)"
+	></div>
+	<div
+		class="pointer-events-none absolute inset-x-0 bottom-0 h-6 transition-opacity duration-150"
+		style:opacity={overflowBottom ? 1 : 0}
+		style:background="linear-gradient(to top, {color}, transparent)"
+	></div>
+</div>
+
+<style>
+	/* Sections keep their natural height so the column scrolls as one block
+	   instead of flex-shrinking each section (which would overlap their rows). */
+	.sidebar-scroll > :global(*) {
+		flex-shrink: 0;
+	}
+</style>
diff --git a/frontend/src/lib/components/sidebar/UserMenu.svelte b/frontend/src/lib/components/sidebar/UserMenu.svelte
index b6e6d6a9cc..1ec649cf12 100644
--- a/frontend/src/lib/components/sidebar/UserMenu.svelte
+++ b/frontend/src/lib/components/sidebar/UserMenu.svelte
@@ -42,6 +42,7 @@
 			label={`User (${$userStore?.username ?? $userStore?.email})`}
 			{isCollapsed}
 			{lightMode}
+			showChevron
 			{trigger}
 		/>
 	{/snippet}
@@ -52,12 +53,22 @@
 				{$userStore?.email}
 			</p>
 			<span class="text-xs text-primary flex flex-row gap-2 items-center">
-				{#if $userStore?.is_admin}
+				{#if $userStore?.non_member}
+					Superadmin, not a member of this workspace <Crown size={14} />
+				{:else if $userStore?.is_admin}
 					Admin of this workspace <Crown size={14} />
 				{:else if $userStore?.operator}
 					Operator in this workspace <ServerCog size={14} />
 				{/if}
 			</span>
+			{#if $userStore?.non_member}
+				<span class="text-xs text-tertiary block mt-1">
+					You are not a member, but as a superadmin you can access this workspace. You act here
+					under the username
+					<span class="font-mono font-medium text-primary">{$userStore?.username}</span>
+					with admin permissions.
+				</span>
+			{/if}
 		</div>
 		<div class="py-1">
 			<MenuItem href={USER_SETTINGS_HASH} class={itemClass} {item}>
diff --git a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
index a834d00317..e84f62daef 100644
--- a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
+++ b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
@@ -9,13 +9,17 @@
 		workspaceUsageStore,
 		workspaceColor,
 		clearWorkspaceFromStorage,
-		globalForkModal
+		globalForkModal,
+		type UserWorkspace
 	} from '$lib/stores'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { Building, Plus, Settings, GitFork } from 'lucide-svelte'
+	import { Building, Check, ChevronDown, ChevronRight, Plus, Settings } from 'lucide-svelte'
+	import { forkAccentStyle } from '$lib/utils/forkColor'
+	import { SvelteSet } from 'svelte/reactivity'
+	import { Badge, CopyButton, NameIdTooltip } from '$lib/components/common'
 	import MenuButton from '$lib/components/sidebar/MenuButton.svelte'
 	import { Menu, MenuItem } from '$lib/components/meltComponents'
 	import WorkspaceIcon from '$lib/components/workspace/WorkspaceIcon.svelte'
+	import { fixupUrlAfterWorkspaceSwitch } from './workspaceSwitchUrl'
 	import { goto } from '$lib/navigation'
 	import { base } from '$lib/base'
 	import { page } from '$app/state'
@@ -27,7 +31,10 @@
 	import { twMerge } from 'tailwind-merge'
 	import type { MenubarBuilders } from '@melt-ui/svelte'
 	import { buildWorkspaceHierarchy } from '$lib/utils/workspaceHierarchy'
+	import { canCreateFork } from '$lib/utils/editInFork'
 	import { getContrastTextColor } from '$lib/utils'
+	import { workspaceRootId } from '$lib/components/sessions/sessionScope.svelte'
+	import { devBadgeText } from '$lib/utils/devWorkspaceLabel'
 
 	interface Props {
 		isCollapsed?: boolean
@@ -36,13 +43,6 @@
 		strictWorkspaceSelect?: boolean
 	}
 
-	function removePrefix(str: string, prefix: string): string {
-		if (str.startsWith(prefix)) {
-			return str.substring(prefix.length)
-		}
-		return str
-	}
-
 	let { isCollapsed = false, createMenu, strictWorkspaceSelect = false }: Props = $props()
 
 	async function toggleSwitchWorkspace(id: string) {
@@ -50,38 +50,24 @@
 			return
 		}
 		workspaceAIClients.init(id)
-		const editPages = [
-			'/scripts/edit/',
-			'/flows/edit/',
-			'/apps/edit/',
-			'/scripts/get/',
-			'/flows/get/',
-			'/apps/get/'
-		]
-		const isOnEditPage = editPages.some((editPage) => page.route.id?.includes(editPage) ?? false)
-		// An AI session is scoped to its (forked) workspace, so it makes no sense
-		// to keep showing it after the user switches workspace — go home instead.
-		const isOnSessionPage = page.route.id?.includes('/sessions') ?? false
-
 		switchWorkspace(id)
-		if (isOnEditPage || isOnSessionPage) {
-			await goto('/')
-		} else if (page.url.searchParams.get('workspace')) {
-			page.url.searchParams.set('workspace', id)
-		}
+		// The sessions page needs no navigation here: the item's link navigation
+		// (workspaceHref) keeps the route, and the page's family reconcile swaps
+		// out a chat that doesn't belong to the new workspace's family.
+		await fixupUrlAfterWorkspaceSwitch(id)
 	}
 
-	// An AI session is scoped to its (forked) workspace, so switching workspace
-	// should leave for home (the link's navigation wins over onClick's
-	// preventDefault; onClick still performs the switch). Pure logic +
-	// new-tab/workspace-param handling lives in workspaceMenuHref (unit-tested).
+	// Href for the item's navigation (including modifier/middle clicks opening a
+	// new tab): same page, `workspace` param swapped to the clicked id, the open
+	// session kept only within its family. Pure logic lives in workspaceMenuHref
+	// (unit-tested).
 	function workspaceHref(id: string): string {
+		const all = $userWorkspaces ?? []
 		return workspaceMenuHref({
-			routeId: page.route.id,
-			base,
 			pathname: page.url.pathname,
 			searchParams: page.url.searchParams,
-			id
+			id,
+			sameFamily: workspaceRootId(id, all) === workspaceRootId($workspaceStore ?? undefined, all)
 		})
 	}
 
@@ -98,121 +84,284 @@
 		toggleSwitchWorkspace(workspace.id)
 	}
 
-	function getForkedWorkspace(workspaceId: string) {
-		if (!$userWorkspaces) return undefined
-		return $userWorkspaces.find((w) => w.id === workspaceId && w.parent_workspace_id != null)
-	}
-
-	function getParentWorkspace(parentId: string) {
-		if (!$userWorkspaces) return undefined
-		return $userWorkspaces.find((w) => w.id === parentId)
-	}
-
-	// Group workspaces into parent-child hierarchy using Svelte 5 derived and the new utility
-	const groupedWorkspaces = $derived.by(() => {
-		if (!$userWorkspaces) return []
-		return buildWorkspaceHierarchy($userWorkspaces)
+	// Family-first picker: list the workspace families (roots) with their forks
+	// collapsed behind a per-family chevron, so direct fork navigation stays
+	// available without flattening fork-heavy instances into a long menu. The
+	// scope header's WorkspaceFamilyPicker remains the primary fork surface.
+	//
+	// strictWorkspaceSelect is used on standalone pages (e.g. svix webhook
+	// creation) that render this menu with no scope header, so there forks must
+	// stay directly selectable — list the full hierarchy unconditionally.
+	const hierarchy = $derived($userWorkspaces ? buildWorkspaceHierarchy($userWorkspaces) : [])
+	const expandedFamilies = new SvelteSet<string>()
+	// Root ids with at least one fork — only they get the expand chevron.
+	// hierarchy is a DFS (parent before child), so a depth>0 row belongs to the
+	// last depth-0 row seen.
+	const familiesWithForks = $derived.by(() => {
+		const withForks = new Set<string>()
+		let rootId: string | undefined
+		for (const h of hierarchy) {
+			if (h.depth === 0) rootId = h.workspace.id
+			else if (rootId) withForks.add(rootId)
+		}
+		return withForks
+	})
+	// Gate for the "Workspace fork" entry pinned below the list (the global fork
+	// modal carries its own base-workspace picker). Hidden on non-premium cloud,
+	// in the admins workspace, or when forking is disabled.
+	const canForkHere = $derived(
+		(!isCloudHosted() || $isPremiumStore) &&
+			$workspaceStore !== 'admins' &&
+			canCreateFork($userStore)
+	)
+	const familyWorkspaces = $derived.by(() => {
+		if (strictWorkspaceSelect) return hierarchy
+		let rootId: string | undefined
+		return hierarchy.filter((h) => {
+			if (h.depth === 0) {
+				rootId = h.workspace.id
+				return true
+			}
+			return !!rootId && expandedFamilies.has(rootId)
+		})
 	})
 
+	let menuOpen = $state(false)
+
+	// ArrowRight/ArrowLeft expand/collapse the keyboard-highlighted family (melt
+	// stamps data-highlighted on the item; the row wrapper carries the workspace
+	// id). Capture phase, so melt's menubar left/right (adjacent-menu switching)
+	// doesn't fire when the keypress means expansion here.
+	function onExpandKeydown(e: KeyboardEvent) {
+		if (!menuOpen || strictWorkspaceSelect) return
+		if (e.key !== 'ArrowRight' && e.key !== 'ArrowLeft') return
+		// Scoped inside a row wrapper: the menubar trigger also carries
+		// data-highlighted while its menu is open.
+		const id = document
+			.querySelector('[data-workspace-id] [data-highlighted]')
+			?.closest('[data-workspace-id]')
+			?.getAttribute('data-workspace-id')
+		if (!id || !familiesWithForks.has(id)) return
+		if (e.key === 'ArrowRight' && !expandedFamilies.has(id)) expandedFamilies.add(id)
+		else if (e.key === 'ArrowLeft' && expandedFamilies.has(id)) expandedFamilies.delete(id)
+		else return
+		e.preventDefault()
+		e.stopPropagation()
+	}
+
+	function findRoot(id: string | undefined): UserWorkspace | undefined {
+		if (!id || !$userWorkspaces) return undefined
+		let current = $userWorkspaces.find((w) => w.id === id)
+		while (current?.parent_workspace_id) {
+			const parent = $userWorkspaces.find((w) => w.id === current!.parent_workspace_id)
+			if (!parent) break
+			current = parent
+		}
+		return current
+	}
+
+	// The active workspace's family root — shown in the trigger so a forked
+	// active workspace still surfaces its family name here (the fork itself is
+	// shown in the breadcrumb).
+	const currentFamily = $derived(findRoot($workspaceStore ?? undefined))
+
+	// The active workspace itself (fork included) — names the settings entry.
+	const activeWorkspace = $derived($userWorkspaces?.find((w) => w.id === $workspaceStore))
+	const canManageWorkspace = $derived($userStore?.is_admin || $superadmin)
+
+	// font-normal is explicit: href-less MenuItems render as <button>, which the
+	// global stylesheet makes semibold, unlike the <a> the href entries get.
 	const itemClass =
-		'text-primary w-full flex flex-row gap-2 px-4 py-2 text-xs hover:bg-surface-hover hover:text-primary data-[highlighted]:bg-surface-hover data-[highlighted]:text-primary'
+		'text-primary font-normal w-full flex flex-row gap-2 px-4 py-2 text-xs hover:bg-surface-hover hover:text-primary data-[highlighted]:bg-surface-hover data-[highlighted]:text-primary'
 </script>
 
-<Menu {createMenu} usePointerDownOutside>
+<svelte:window onkeydowncapture={onExpandKeydown} />
+
+<!-- Expansion is per-open: every open starts with all families collapsed,
+     including the active fork's. -->
+<Menu
+	{createMenu}
+	usePointerDownOutside
+	placement="bottom-start"
+	bind:open={menuOpen}
+	on:close={() => expandedFamilies.clear()}
+>
 	{#snippet triggr({ trigger })}
-		{@const forkedWorkspace = getForkedWorkspace($workspaceStore ?? '')}
-		{@const parentWorkspace = forkedWorkspace
-			? getParentWorkspace(forkedWorkspace.parent_workspace_id!)
-			: null}
-		{@const iconColor = getContrastTextColor($workspaceColor)}
-		{#if forkedWorkspace && parentWorkspace}
+		<!-- Family header reflects the family (root) color, not the active
+		     workspace's — switching into a fork must not recolor it. -->
+		{@const familyColor = currentFamily?.color ?? $workspaceColor}
+		{@const iconColor = getContrastTextColor(familyColor)}
+		<!-- Collapsed mode already shows MenuButton's own right-side popover, so the
+		     rich tooltip only takes over when expanded. -->
+		<NameIdTooltip
+			name={currentFamily?.name ?? $workspaceStore ?? ''}
+			id={currentFamily?.id ?? $workspaceStore ?? ''}
+			disablePopup={isCollapsed}
+			class="block w-full"
+		>
 			<MenuButton
-				class="!text-xs"
-				icon={GitFork}
-				iconProps={iconColor ? { style: `color: ${iconColor}` } : undefined}
-				label={removePrefix($workspaceStore ?? '', 'wm-fork-')}
-				sublabel={parentWorkspace?.name ? `Fork of ${parentWorkspace.name}` : undefined}
-				{isCollapsed}
-				color={$workspaceColor}
-				{trigger}
-			/>
-		{:else}
-			<MenuButton
-				class="!text-xs"
 				icon={Building}
 				iconProps={iconColor ? { style: `color: ${iconColor}` } : undefined}
-				label={$workspaceStore ?? ''}
+				label={currentFamily?.name ?? $workspaceStore ?? ''}
 				{isCollapsed}
-				color={$workspaceColor}
+				color={familyColor}
+				showChevron
+				emphasizeLabel
+				disableTitle
 				{trigger}
 			/>
-		{/if}
+		</NameIdTooltip>
 	{/snippet}
 
 	{#snippet children({ item })}
 		<div class="divide-y" role="none">
-			<div class="py-1">
-				{#each groupedWorkspaces as { workspace, depth, isForked, parentName }}
-					{@const isSelected = $workspaceStore === workspace.id}
-					<MenuItem
+			<!-- The list scrolls internally so the sections below (+ Workspace,
+			     Workspace fork, All workspaces) stay visible however long it gets. -->
+			<div class="py-1 overflow-y-auto max-h-[min(50vh,26rem)]">
+				{#each familyWorkspaces as { workspace, depth, isForked, parentName }}
+					{@const isActive = $workspaceStore === workspace.id}
+					{@const forkAccent = isForked ? forkAccentStyle(workspace.color) : undefined}
+					<!-- Selection is a trailing tick (single-choice picker convention). A
+					     collapsed root carries the tick while one of its forks is active —
+					     the fork row is hidden and its family is the only trace of the
+					     selection; expanding moves the tick to the fork itself. -->
+					{@const isSelected =
+						isActive ||
+						(!strictWorkspaceSelect &&
+							depth === 0 &&
+							currentFamily?.id === workspace.id &&
+							!expandedFamilies.has(workspace.id))}
+					{@const expandable =
+						!strictWorkspaceSelect && depth === 0 && familiesWithForks.has(workspace.id)}
+					<!-- The expand chevron sits OUTSIDE the melt item: melt activates items
+					     via document-level handlers, so a nested button can't stop the row's
+					     navigate-and-close with stopPropagation. As a sibling it toggles the
+					     family without selecting the row or closing the menu. -->
+					<!-- Hover/keyboard-highlight backgrounds live on the wrapper (the
+					     highlight via :has(), since melt puts data-highlighted on the item) so
+					     they span the full row, chevron included; the chevron keeps only its
+					     own hover tint. The active workspace is marked by its row's check
+					     icon, not a background or text accent. -->
+					<div
+						data-workspace-id={workspace.id}
 						class={twMerge(
-							'text-xs min-w-0 w-full overflow-hidden flex flex-col py-2 px-3',
-							workspace.disabled && 'opacity-50 cursor-not-allowed',
-							isSelected
-								? 'cursor-default bg-surface-accent-selected'
-								: workspace.disabled
-									? ''
-									: 'cursor-pointer hover:bg-surface-hover data-[highlighted]:bg-surface-hover'
+							'group flex items-center min-w-0 w-full',
+							workspace.disabled
+								? ''
+								: 'hover:bg-surface-hover [&:has([data-highlighted])]:bg-surface-hover'
 						)}
-						href={workspace.disabled ? undefined : workspaceHref(workspace.id)}
-						onClick={(e) => onWorkspaceItemClick(e, workspace)}
-						{item}
 					>
-						<div class="flex items-center justify-between min-w-0 w-full">
-							<div class="flex items-center gap-2 min-w-0" style:padding-left={`${depth * 16}px`}>
-								<WorkspaceIcon workspaceColor={workspace.color} {isForked} {parentName} />
-								<div class="min-w-0 flex-1">
-									<div
-										class={twMerge(
-											'truncate text-left text-xs font-normal',
-											isSelected ? 'text-accent' : 'text-primary'
-										)}
-										title={workspace.name}
-									>
-										{workspace.name}{workspace.disabled ? ' (user disabled)' : ''}
-									</div>
-									<div
-										class={twMerge(
-											'font-mono text-2xs whitespace-nowrap truncate text-left font-normal',
-											isSelected ? 'text-accent/80' : 'text-secondary'
-										)}
-										title={workspace.id}
-									>
-										{workspace.id}
+						<MenuItem
+							class={twMerge(
+								'text-xs min-w-0 flex-1 overflow-hidden flex flex-col py-1.5 px-3',
+								workspace.disabled && 'opacity-50 cursor-not-allowed',
+								isActive ? 'cursor-default' : workspace.disabled ? '' : 'cursor-pointer'
+							)}
+							href={workspace.disabled ? undefined : workspaceHref(workspace.id)}
+							onClick={(e) => onWorkspaceItemClick(e, workspace)}
+							{item}
+						>
+							<div class="flex items-center justify-between gap-2 min-w-0 w-full">
+								<div class="flex items-center gap-2 min-w-0" style:padding-left={`${depth * 16}px`}>
+									<WorkspaceIcon
+										workspaceColor={workspace.color}
+										{isForked}
+										isDevWorkspace={workspace.is_dev_workspace}
+										devWorkspaceLabel={workspace.dev_workspace_label}
+										{parentName}
+										padding="p-1"
+									/>
+									<div class="min-w-0 flex-1">
+										<div class="flex items-center gap-1 min-w-0">
+											<div
+												class="truncate text-left text-xs font-normal {forkAccent
+													? 'text-[color:var(--fork-accent-text)] dark:text-[color:var(--fork-accent-text-dark)]'
+													: 'text-primary'}"
+												style={forkAccent}
+												title={workspace.name}
+											>
+												{workspace.name}{workspace.disabled ? ' (user disabled)' : ''}
+											</div>
+											{#if workspace.is_dev_workspace}
+												<Badge
+													color="dark-blue"
+													small
+													class="text-3xs px-1 py-0 dark:bg-surface-accent-primary text-white dark:text-white"
+													>{devBadgeText(workspace.dev_workspace_label)}</Badge
+												>
+											{/if}
+										</div>
 									</div>
 								</div>
+								{#if isSelected}
+									<Check size={14} class="shrink-0 ml-2 text-accent" />
+								{/if}
 							</div>
+						</MenuItem>
+						<!-- Hover-revealed like the fork picker's rows; a flex sibling of the melt
+						     item (nested buttons are invalid HTML) that always occupies its slot so
+						     nothing shifts on hover. -->
+						<div
+							class="shrink-0 opacity-0 group-hover:opacity-100 focus-within:opacity-100 transition-opacity"
+						>
+							<CopyButton value={workspace.id} title={`Copy id: ${workspace.id}`} />
 						</div>
-					</MenuItem>
+						{#if expandable}
+							{@const expanded = expandedFamilies.has(workspace.id)}
+							<button
+								type="button"
+								title={expanded ? 'Hide forks' : 'Show forks'}
+								aria-expanded={expanded}
+								class="shrink-0 mr-1 px-2 self-stretch flex items-center rounded text-tertiary hover:bg-surface-hover hover:text-primary"
+								onclick={() => {
+									if (expanded) expandedFamilies.delete(workspace.id)
+									else expandedFamilies.add(workspace.id)
+								}}
+							>
+								{#if expanded}
+									<ChevronDown size={14} />
+								{:else}
+									<ChevronRight size={14} />
+								{/if}
+							</button>
+						{:else}
+							<!-- Reserve the expand-chevron's slot on fork-less rows so the hover copy
+							     button lines up with the forked rows' and never sits flush against the
+							     menu's right edge. Matches the chevron's px-2 (30px) + mr-1. -->
+							<div class="shrink-0 mr-1 w-[30px]" aria-hidden="true"></div>
+						{/if}
+					</div>
 				{/each}
 			</div>
-			{#if (isCloudHosted() || $superadmin) && !strictWorkspaceSelect}
+			{#if (isCloudHosted() || $superadmin || canForkHere) && !strictWorkspaceSelect}
 				<div class="py-1" role="none">
-					<MenuItem href="{base}/user/create_workspace" class={itemClass} {item}>
-						<Plus size={16} />
-						Workspace
-					</MenuItem>
+					{#if isCloudHosted() || $superadmin}
+						<MenuItem href="{base}/user/create_workspace" class={itemClass} {item}>
+							<Plus size={16} />
+							Workspace
+						</MenuItem>
+					{/if}
+					{#if canForkHere}
+						<MenuItem
+							class={itemClass}
+							onClick={() => (globalForkModal.val = { opened: true })}
+							{item}
+						>
+							<Plus size={16} />
+							Workspace fork
+						</MenuItem>
+					{/if}
 				</div>
 			{/if}
-			{#if !strictWorkspaceSelect && !isCloudHosted() && !isRuleActive('DisableWorkspaceForking') && $workspaceStore !== 'admins'}
+			{#if canManageWorkspace && !strictWorkspaceSelect}
 				<div class="py-1" role="none">
 					<MenuItem
+						href="{base}/workspace_settings?workspace={$workspaceStore}"
 						class={itemClass}
 						{item}
-						onClick={() => (globalForkModal.val = { opened: true })}
 					>
-						<GitFork size={16} />
-						Fork current workspace
+						<Settings size={16} />
+						{activeWorkspace?.name ?? $workspaceStore} settings
 					</MenuItem>
 				</div>
 			{/if}
@@ -228,14 +377,6 @@
 					</MenuItem>
 				</div>
 			{/if}
-			{#if ($userStore?.is_admin || $superadmin) && !strictWorkspaceSelect}
-				<div class="py-1" role="none">
-					<MenuItem href="{base}/workspace_settings" class={itemClass} {item}>
-						<Settings size={16} />
-						Workspace settings
-					</MenuItem>
-				</div>
-			{/if}
 		</div>
 		{#if isCloudHosted() && !$isPremiumStore && !strictWorkspaceSelect}
 			<div class="py-1" role="none">
diff --git a/frontend/src/lib/components/sidebar/WorkspaceScopeHeader.svelte b/frontend/src/lib/components/sidebar/WorkspaceScopeHeader.svelte
new file mode 100644
index 0000000000..ba6ae625d9
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/WorkspaceScopeHeader.svelte
@@ -0,0 +1,69 @@
+<script lang="ts">
+	import {
+		userWorkspaces,
+		workspaceStore,
+		globalForkModal,
+		userStore,
+		superadmin
+	} from '$lib/stores'
+	import { switchWorkspace } from '$lib/storeUtils'
+	import { fixupUrlAfterWorkspaceSwitch } from './workspaceSwitchUrl'
+	import { base } from '$lib/base'
+	import { workspaceAIClients } from '$lib/components/copilot/lib'
+	import WorkspaceFamilyPicker from '$lib/components/sessions/WorkspaceFamilyPicker.svelte'
+	import WorkspaceScopeTrigger from '$lib/components/WorkspaceScopeTrigger.svelte'
+	import { findWorkspaceRoot, findWorkspaceDescendants } from '$lib/utils/workspaceHierarchy'
+
+	let { isCollapsed = false }: { isCollapsed?: boolean } = $props()
+
+	const effectiveId = $derived($workspaceStore ?? undefined)
+	const currentWs = $derived(
+		effectiveId ? $userWorkspaces.find((w) => w.id === effectiveId) : undefined
+	)
+
+	// Fork count surfaces the family's size right on the trigger, hinting that
+	// the muted "root" chip is also the entry point to its forks.
+	const forkCount = $derived.by(() => {
+		const root = findWorkspaceRoot(effectiveId, $userWorkspaces)
+		return root ? findWorkspaceDescendants(root.id, $userWorkspaces).length : 0
+	})
+	const rootLabel = $derived(`${forkCount} fork${forkCount === 1 ? '' : 's'}`)
+
+	// Settings link at the bottom of the picker — admin/superadmin only, scoped
+	// to the active workspace (fork or root).
+	const canManageWorkspace = $derived($userStore?.is_admin || $superadmin)
+	const settingsHref = $derived(canManageWorkspace ? `${base}/workspace_settings` : undefined)
+	const settingsLabel = $derived(`${currentWs?.name ?? effectiveId ?? 'Workspace'} settings`)
+
+	function switchWorkspaceDirect(id: string) {
+		if ($workspaceStore === id) return
+		workspaceAIClients.init(id)
+		switchWorkspace(id)
+		void fixupUrlAfterWorkspaceSwitch(id)
+	}
+
+	function openForkModal() {
+		globalForkModal.val = { opened: true }
+	}
+</script>
+
+<div class="flex items-center min-w-0 px-2 {isCollapsed ? 'justify-center' : ''} py-0.5 rounded-md">
+	<WorkspaceFamilyPicker
+		selectedId={effectiveId}
+		onPick={switchWorkspaceDirect}
+		onRequestCreateFork={openForkModal}
+		{settingsHref}
+		{settingsLabel}
+		class="min-w-0 w-full"
+	>
+		{#snippet trigger()}
+			<WorkspaceScopeTrigger
+				workspaceId={effectiveId}
+				{isCollapsed}
+				{rootLabel}
+				wrap
+				class="w-full"
+			/>
+		{/snippet}
+	</WorkspaceFamilyPicker>
+</div>
diff --git a/frontend/src/lib/components/sidebar/changelogs.ts b/frontend/src/lib/components/sidebar/changelogs.ts
index 80851e64ec..e57eb4bf5b 100644
--- a/frontend/src/lib/components/sidebar/changelogs.ts
+++ b/frontend/src/lib/components/sidebar/changelogs.ts
@@ -384,4 +384,22 @@ const changelogs: Changelog[] = [
 	}
 ]
 
-export { changelogs }
\ No newline at end of file
+export { changelogs }
+// Single owner of the "which changelogs are new" localStorage key — every
+// menu surfacing changelogs must read/stamp through these, or two surfaces
+// with independent state would fight over the same key.
+const LAST_OPENED_KEY = 'changelogsLastOpened'
+
+export function readRecentChangelogs(): { recent: Changelog[]; hasNew: boolean } {
+	const lastOpened = localStorage.getItem(LAST_OPENED_KEY)
+	const recent = lastOpened
+		? changelogs.filter((changelog) => changelog.date > lastOpened)
+		: changelogs.slice(0, 3)
+	const hasNew =
+		lastOpened != null && recent.length > 0 && lastOpened !== new Date().toISOString().split('T')[0]
+	return { recent, hasNew }
+}
+
+export function markChangelogsOpened(): void {
+	localStorage.setItem(LAST_OPENED_KEY, new Date().toISOString().split('T')[0])
+}
diff --git a/frontend/src/lib/components/sidebar/leaveWorkspace.ts b/frontend/src/lib/components/sidebar/leaveWorkspace.ts
new file mode 100644
index 0000000000..043748b0c4
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/leaveWorkspace.ts
@@ -0,0 +1,15 @@
+import { get } from 'svelte/store'
+import { goto } from '$lib/navigation'
+import { WorkspaceService } from '$lib/gen'
+import { sendUserToast } from '$lib/toast'
+import { clearStores } from '$lib/storeUtils'
+import { workspaceStore } from '$lib/stores'
+
+// Leave the active workspace and land on the workspace list. Shared by the
+// settings dropdown and the sidebar menu.
+export async function leaveCurrentWorkspace(): Promise<void> {
+	await WorkspaceService.leaveWorkspace({ workspace: get(workspaceStore) ?? '' })
+	sendUserToast('You left the workspace')
+	clearStores()
+	await goto('/user/workspaces')
+}
diff --git a/frontend/src/lib/components/sidebar/sidebarChrome.ts b/frontend/src/lib/components/sidebar/sidebarChrome.ts
new file mode 100644
index 0000000000..110435c058
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/sidebarChrome.ts
@@ -0,0 +1,5 @@
+// Sidebar rail background. Deliberately raw hex — no theme token exists for
+// the rail chrome — kept here as the single source for every host that renders
+// or mimics the sidebar (app layout, kitchen-sink harness).
+export const SIDEBAR_BG = '#F3F3F7'
+export const SIDEBAR_BG_DARK = '#1e232e'
diff --git a/frontend/src/lib/components/sidebar/workspaceMenuHref.test.ts b/frontend/src/lib/components/sidebar/workspaceMenuHref.test.ts
index 2291d2d125..7c165b6e80 100644
--- a/frontend/src/lib/components/sidebar/workspaceMenuHref.test.ts
+++ b/frontend/src/lib/components/sidebar/workspaceMenuHref.test.ts
@@ -2,38 +2,35 @@ import { describe, it, expect } from 'vitest'
 import { workspaceMenuHref } from './workspaceMenuHref'
 
 describe('workspaceMenuHref', () => {
-	it('on a session route, keeps the workspace id (so new-tab lands in the right workspace)', () => {
+	it('keeps the open session for a same-family target (new-tab stays on the chat)', () => {
 		expect(
 			workspaceMenuHref({
-				routeId: '/(root)/(logged)/sessions',
-				base: '',
 				pathname: '/sessions',
 				searchParams: new URLSearchParams('session_name=foo'),
-				id: 'wm-fork-bar'
+				id: 'wm-fork-bar',
+				sameFamily: true
 			})
-		).toBe('/?workspace=wm-fork-bar')
+		).toBe('/sessions?session_name=foo&workspace=wm-fork-bar')
 	})
 
-	it('respects the base prefix on a session route', () => {
+	it('drops the open session for a cross-family target', () => {
 		expect(
 			workspaceMenuHref({
-				routeId: '/(root)/(logged)/sessions',
-				base: '/wm',
-				pathname: '/wm/sessions',
-				searchParams: new URLSearchParams(),
-				id: 'ws2'
+				pathname: '/sessions',
+				searchParams: new URLSearchParams('session_name=foo'),
+				id: 'other-root',
+				sameFamily: false
 			})
-		).toBe('/wm/?workspace=ws2')
+		).toBe('/sessions?workspace=other-root')
 	})
 
-	it('off a session route, swaps the workspace param on the current path', () => {
+	it('swaps the workspace param on the current path', () => {
 		expect(
 			workspaceMenuHref({
-				routeId: '/(root)/(logged)/scripts/edit/[...path]',
-				base: '',
 				pathname: '/scripts/edit/u/me/x',
 				searchParams: new URLSearchParams('workspace=old&foo=1'),
-				id: 'new_ws'
+				id: 'new_ws',
+				sameFamily: false
 			})
 		).toBe('/scripts/edit/u/me/x?workspace=new_ws&foo=1')
 	})
@@ -41,11 +38,10 @@ describe('workspaceMenuHref', () => {
 	it('adds the workspace param when none was present', () => {
 		expect(
 			workspaceMenuHref({
-				routeId: '/(root)/(logged)/runs',
-				base: '',
 				pathname: '/runs',
 				searchParams: new URLSearchParams(),
-				id: 'w'
+				id: 'w',
+				sameFamily: true
 			})
 		).toBe('/runs?workspace=w')
 	})
diff --git a/frontend/src/lib/components/sidebar/workspaceMenuHref.ts b/frontend/src/lib/components/sidebar/workspaceMenuHref.ts
index 5e5ec11325..08f93d6384 100644
--- a/frontend/src/lib/components/sidebar/workspaceMenuHref.ts
+++ b/frontend/src/lib/components/sidebar/workspaceMenuHref.ts
@@ -1,21 +1,21 @@
-// Href for a workspace-switch link in the sidebar WorkspaceMenu.
-//
-// On an AI-session route, switching workspace leaves for home — but we keep the
-// `?workspace=<id>` param so a modifier/middle click (open in new tab, which
-// bypasses the onClick fast-path) still lands in the *clicked* workspace's home
-// rather than the default one. Everywhere else, stay on the current path and
-// just swap the `workspace` query param.
+// Href for a workspace-switch link in the sidebar WorkspaceMenu: stay on the
+// current path and just swap the `workspace` query param, so a modifier/middle
+// click (open in new tab, which bypasses the onClick fast-path) lands on the
+// same page — session mode included — in the *clicked* workspace. A session
+// named in the URL is kept only for same-family targets: a cross-family tab
+// must not open a foreign family's chat, so it lands on the sessions page with
+// nothing selected instead.
 export function workspaceMenuHref(args: {
-	routeId: string | null | undefined
-	base: string
 	pathname: string
 	searchParams: URLSearchParams
 	id: string
+	// Whether `id` belongs to the same workspace family as the active workspace.
+	sameFamily?: boolean
 }): string {
-	if (args.routeId?.includes('/sessions')) {
-		return `${args.base}/?workspace=${args.id}`
-	}
 	const params = new URLSearchParams(args.searchParams)
 	params.set('workspace', args.id)
+	if (!args.sameFamily) {
+		params.delete('session_name')
+	}
 	return `${args.pathname}?${params.toString()}`
 }
diff --git a/frontend/src/lib/components/sidebar/workspaceSwitchUrl.ts b/frontend/src/lib/components/sidebar/workspaceSwitchUrl.ts
new file mode 100644
index 0000000000..08bd5cb5d5
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/workspaceSwitchUrl.ts
@@ -0,0 +1,30 @@
+import { page } from '$app/state'
+import { replaceState } from '$app/navigation'
+import { goto } from '$lib/navigation'
+
+// Post-workspace-switch URL fixup shared by the sidebar workspace pickers.
+// Item-scoped pages would show a wrong-workspace (or missing) item after a
+// switch — go home instead. Otherwise, really rewrite a ?workspace= param in
+// the address bar (mutating page.url is a no-op there): left stale, it gets
+// re-applied on reload or when exiting session mode restores the route,
+// silently switching the workspace back.
+const EDIT_PAGES = [
+	'/scripts/edit/',
+	'/flows/edit/',
+	'/apps/edit/',
+	'/apps_raw/edit/',
+	'/scripts/get/',
+	'/flows/get/',
+	'/apps/get/',
+	'/apps_raw/get/'
+]
+
+export async function fixupUrlAfterWorkspaceSwitch(id: string): Promise<void> {
+	if (EDIT_PAGES.some((p) => page.route.id?.includes(p) ?? false)) {
+		await goto('/')
+	} else if (page.url.searchParams.get('workspace')) {
+		const url = new URL(window.location.href)
+		url.searchParams.set('workspace', id)
+		replaceState(url, page.state)
+	}
+}
diff --git a/frontend/src/lib/components/sqlDdl.ts b/frontend/src/lib/components/sqlDdl.ts
new file mode 100644
index 0000000000..5897c08859
--- /dev/null
+++ b/frontend/src/lib/components/sqlDdl.ts
@@ -0,0 +1,142 @@
+// Heuristics for splitting a SQL script into individual statements and
+// detecting Data Definition Language (DDL) statements. Shared by the datatable
+// SQL REPL and the postgres editor to steer schema changes into migrations.
+
+// A dollar-quote tag: `$$` or `$name$` (the optional tag follows unquoted
+// identifier rules, so it starts with a letter/underscore — `$1` is a
+// parameter placeholder, not a dollar quote).
+const DOLLAR_QUOTE_START = /^\$([A-Za-z_][A-Za-z0-9_]*)?\$/
+
+// code may be composed of many sql statements separated by ';'
+// this splits them while taking into account that ';' may appear inside a
+// string, quoted identifier, dollar-quoted body ($$ ... $$), or a comment
+// (-- ... or /* ... */) and is then not the end of a statement.
+export function splitSqlStatements(code: string): string[] {
+	const statements: string[] = []
+	let currentStatement = ''
+	let inSingleQuote = false
+	let inDoubleQuote = false
+	let inBacktick = false
+	let inLineComment = false
+	let inBlockComment = false
+	let dollarTag: string | null = null
+
+	for (let i = 0; i < code.length; i++) {
+		const char = code[i]
+		const prevChar = i > 0 ? code[i - 1] : null
+		const nextChar = i + 1 < code.length ? code[i + 1] : null
+
+		// Inside a protected region: append verbatim (';' is not a separator)
+		// and only watch for the region's end.
+		if (inLineComment) {
+			currentStatement += char
+			if (char === '\n') inLineComment = false
+			continue
+		}
+		if (inBlockComment) {
+			// Look ahead for the close so the '*' of the opening '/*' can't be
+			// reused (e.g. `/*/` stays open).
+			if (char === '*' && nextChar === '/') {
+				currentStatement += '*/'
+				i += 1
+				inBlockComment = false
+			} else {
+				currentStatement += char
+			}
+			continue
+		}
+		if (dollarTag !== null) {
+			if (char === '$' && code.startsWith(dollarTag, i)) {
+				currentStatement += dollarTag
+				i += dollarTag.length - 1
+				dollarTag = null
+			} else {
+				currentStatement += char
+			}
+			continue
+		}
+		if (inSingleQuote) {
+			currentStatement += char
+			if (char === "'" && prevChar !== '\\') inSingleQuote = false
+			continue
+		}
+		if (inDoubleQuote) {
+			currentStatement += char
+			if (char === '"' && prevChar !== '\\') inDoubleQuote = false
+			continue
+		}
+		if (inBacktick) {
+			currentStatement += char
+			if (char === '`' && prevChar !== '\\') inBacktick = false
+			continue
+		}
+
+		// Not in any protected region: detect the start of one.
+		if (char === '-' && nextChar === '-') {
+			inLineComment = true
+			currentStatement += char
+			continue
+		}
+		if (char === '/' && nextChar === '*') {
+			// Consume both chars so the '*' of '/*' can't double as a '*/' close.
+			inBlockComment = true
+			currentStatement += '/*'
+			i += 1
+			continue
+		}
+		if (char === '$') {
+			const m = DOLLAR_QUOTE_START.exec(code.slice(i))
+			if (m) {
+				dollarTag = m[0]
+				currentStatement += dollarTag
+				i += dollarTag.length - 1
+				continue
+			}
+		}
+		if (char === "'") {
+			inSingleQuote = true
+			currentStatement += char
+			continue
+		}
+		if (char === '"') {
+			inDoubleQuote = true
+			currentStatement += char
+			continue
+		}
+		if (char === '`') {
+			inBacktick = true
+			currentStatement += char
+			continue
+		}
+
+		if (char === ';') {
+			statements.push(currentStatement.trim())
+			currentStatement = ''
+		} else {
+			currentStatement += char
+		}
+	}
+
+	if (currentStatement.trim()) {
+		statements.push(currentStatement.trim())
+	}
+
+	return statements.filter((s) => s.length > 0)
+}
+
+export function pruneComments(code: string): string {
+	return code
+		.replace(/--.*?(\r?\n|$)/g, '')
+		.replace(/\/\*[\s\S]*?\*\//g, '')
+		.trim()
+}
+
+// Schema-changing keywords. GRANT/REVOKE are included since permission changes
+// also belong in migrations rather than ad-hoc execution.
+const DDL_KEYWORDS = ['CREATE', 'ALTER', 'DROP', 'TRUNCATE', 'RENAME', 'COMMENT', 'GRANT', 'REVOKE']
+
+/** Heuristic: a statement is DDL if its first keyword is schema-changing. */
+export function isDdlStatement(statement: string): boolean {
+	const firstWord = pruneComments(statement).trim().split(/\s+/)[0]?.toUpperCase()
+	return !!firstWord && DDL_KEYWORDS.includes(firstWord)
+}
diff --git a/frontend/src/lib/components/triggers/CaptureTable.svelte b/frontend/src/lib/components/triggers/CaptureTable.svelte
index f6bc1d209f..18ab7d7e91 100644
--- a/frontend/src/lib/components/triggers/CaptureTable.svelte
+++ b/frontend/src/lib/components/triggers/CaptureTable.svelte
@@ -33,6 +33,10 @@
 		limitPayloadSize?: boolean
 		noBorder?: boolean
 		captureActiveIndicator?: boolean | undefined
+		// Workspace to scope capture list/get/delete calls to. Defaults to the nav
+		// `$workspaceStore`; an AI-session live editor passes the session's acting
+		// workspace (a fork) so captures hit the right workspace.
+		workspace?: string
 	}
 
 	let {
@@ -47,9 +51,12 @@
 		fullHeight = true,
 		limitPayloadSize = false,
 		noBorder = false,
-		captureActiveIndicator = undefined
+		captureActiveIndicator = undefined,
+		workspace = undefined
 	}: Props = $props()
 
+	let ws = $derived(workspace ?? $workspaceStore)
+
 	let selected: number | undefined = $state(undefined)
 	let testKind: 'preprocessor' | 'main' = $state('main')
 	let isEmpty: boolean = $state(true)
@@ -94,7 +101,7 @@
 	function initLoadCaptures(kind: 'preprocessor' | 'main' = testKind) {
 		const loadInputsPageFn = async (page: number, perPage: number) => {
 			const captures = await CaptureService.listCaptures({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				runnableKind: isFlow ? 'flow' : 'script',
 				path: path ?? '',
 				triggerKind: captureType,
@@ -114,7 +121,7 @@
 						payloadData: 'Too big to display here, select to view',
 						getFullCapture: () =>
 							CaptureService.getCapture({
-								workspace: $workspaceStore!,
+								workspace: ws!,
 								id: capture.id
 							})
 					}
@@ -148,7 +155,7 @@
 
 		const deleteInputFn = async (id: any) => {
 			await CaptureService.deleteCapture({
-				workspace: $workspaceStore!,
+				workspace: ws!,
 				id
 			})
 		}
diff --git a/frontend/src/lib/components/triggers/azure/AzureTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/azure/AzureTriggerEditorInner.svelte
index e628c7cc99..44fc57d4ef 100644
--- a/frontend/src/lib/components/triggers/azure/AzureTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/azure/AzureTriggerEditorInner.svelte
@@ -350,6 +350,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit Azure trigger ${initialPath}`
@@ -364,6 +365,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/email/EmailTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/email/EmailTriggerEditorInner.svelte
index 34cf4e92c3..1af45e9f2f 100644
--- a/frontend/src/lib/components/triggers/email/EmailTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/email/EmailTriggerEditorInner.svelte
@@ -368,7 +368,7 @@
 			{#if mode === 'suspended'}
 				<TriggerSuspendedJobsAlert {suspendedJobsModal} />
 			{/if}
-			<Section label="Metadata">
+			<Section headless>
 				<div class="flex flex-col gap-2">
 					<Label label="Path">
 						<Path
@@ -475,6 +475,7 @@
 {#if useDrawer}
 	<Drawer size="700px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit email trigger ${initialPath}`
@@ -489,6 +490,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte
index f2a22c359c..be3947fca0 100644
--- a/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte
@@ -367,6 +367,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit GCP Pub/Sub trigger ${initialPath}`
@@ -381,6 +382,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
index d29a3d0cab..fa6225a8d7 100644
--- a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
@@ -535,7 +535,7 @@
 			{#if mode === 'suspended'}
 				<TriggerSuspendedJobsAlert {suspendedJobsModal} />
 			{/if}
-			<Section label="Metadata">
+			<Section headless>
 				<div class="flex flex-col gap-6">
 					<Label label="Summary" for="summary">
 						<!-- svelte-ignore a11y_autofocus -->
@@ -1005,6 +1005,7 @@
 {#if useDrawer}
 	<Drawer size="700px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit route ${initialPath}`
@@ -1019,6 +1020,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
index afdd9d7746..b9e6b6e05e 100644
--- a/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
@@ -416,6 +416,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit Kafka trigger ${initialPath}`
@@ -430,6 +431,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte
index 561608bd9f..7a6a561877 100644
--- a/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte
@@ -391,6 +391,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit MQTT trigger ${initialPath}`
@@ -405,6 +406,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/native/NativeTriggerEditor.svelte b/frontend/src/lib/components/triggers/native/NativeTriggerEditor.svelte
index 583b7b623e..7c14d1c099 100644
--- a/frontend/src/lib/components/triggers/native/NativeTriggerEditor.svelte
+++ b/frontend/src/lib/components/triggers/native/NativeTriggerEditor.svelte
@@ -395,7 +395,7 @@
 			{/if}
 		</div>
 		<div class="flex flex-col gap-12 mt-6">
-			<Section label="Metadata">
+			<Section headless>
 				<div class="flex flex-col gap-6">
 					<label class="flex flex-col gap-1">
 						<span class="text-xs font-semibold text-emphasis">Summary</span>
diff --git a/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
index 4450cd6891..f92f5537c2 100644
--- a/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
@@ -388,6 +388,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit NATS trigger ${initialPath}`
@@ -402,6 +403,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
index 6420d5f9b1..70494c30f5 100644
--- a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
@@ -566,6 +566,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit Postgres trigger ${initialPath}`
@@ -578,6 +579,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte b/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
index 0d7198bf86..7801889406 100644
--- a/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
@@ -781,7 +781,7 @@
 			}}
 		/>
 		<div class="flex flex-col gap-8">
-			<Section label="Metadata">
+			<Section headless>
 				<div class="flex flex-col gap-6">
 					<label class="flex flex-col gap-1">
 						<span class="text-xs font-semibold text-emphasis">Summary</span>
@@ -807,7 +807,7 @@
 							bind:value={summary}
 						/>
 					</label>
-					<LabelsInput bind:labels />
+					<LabelsInput bind:labels class="-mt-4" />
 
 					<div class="flex flex-col gap-1">
 						<label for="path" class="text-xs font-semibold text-emphasis">Path</label>
@@ -1380,6 +1380,7 @@
 {#if useDrawer}
 	<Drawer size="900px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit schedule ${initialPath}`
@@ -1396,6 +1397,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
index 6ca2d13ddd..01e4a28e29 100644
--- a/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
@@ -370,6 +370,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit SQS trigger ${initialPath}`
@@ -384,6 +385,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/triggers/useTriggerDraftSync.svelte.ts b/frontend/src/lib/components/triggers/useTriggerDraftSync.svelte.ts
index aba27de99f..ba09167d6d 100644
--- a/frontend/src/lib/components/triggers/useTriggerDraftSync.svelte.ts
+++ b/frontend/src/lib/components/triggers/useTriggerDraftSync.svelte.ts
@@ -48,6 +48,11 @@ export interface TriggerDraftSync {
 	 * loading and for brand-new triggers (no deployed baseline yet).
 	 */
 	readonly hasDraft: boolean
+	/**
+	 * Whether a deployed baseline exists (banner can appear). Reactive, unlike
+	 * reading `deployed` directly (a plain `let`), so callers can reserve its slot.
+	 */
+	readonly hasBaseline: boolean
 	/** The deployed baseline the dirty check compares against. */
 	readonly deployed: Cfg | undefined
 	/** The current form config (the live local draft). */
@@ -104,6 +109,10 @@ export function useTriggerDraftSync(opts: TriggerDraftSyncOptions): TriggerDraft
 			cfgDiffers(opts.getCfg() as Cfg, opts.deployed() as Cfg)
 	)
 
+	// Reactive "banner is possible" — depends on `drawerLoading()` so it
+	// re-evaluates (and re-reads the plain-`let` baseline) once the load settles.
+	const hasBaseline = $derived(!opts.drawerLoading() && opts.deployed() != null)
+
 	/** `auto: true` marks a discard from the reactive persist-effect (not an
 	 * explicit user action), so it respects the "Enable auto-save" toggle — else
 	 * with autosave off the editor would delete server drafts while writing none. */
@@ -189,6 +198,9 @@ export function useTriggerDraftSync(opts: TriggerDraftSyncOptions): TriggerDraft
 		get hasDraft() {
 			return hasDraft
 		},
+		get hasBaseline() {
+			return hasBaseline
+		},
 		get deployed() {
 			return opts.deployed()
 		},
diff --git a/frontend/src/lib/components/triggers/utils.ts b/frontend/src/lib/components/triggers/utils.ts
index 231de5cea4..3d17491791 100644
--- a/frontend/src/lib/components/triggers/utils.ts
+++ b/frontend/src/lib/components/triggers/utils.ts
@@ -1,4 +1,14 @@
-import { Webhook, Mail, Calendar, Route, Unplug, Database, Terminal } from 'lucide-svelte'
+import {
+	Webhook,
+	Mail,
+	Calendar,
+	Route,
+	Unplug,
+	Database,
+	Terminal,
+	Timer,
+	Zap
+} from 'lucide-svelte'
 import KafkaIcon from '$lib/components/icons/KafkaIcon.svelte'
 import NatsIcon from '$lib/components/icons/NatsIcon.svelte'
 import MqttIcon from '$lib/components/icons/MqttIcon.svelte'
@@ -82,7 +92,8 @@ export const jobTriggerKinds: JobTriggerKind[] = [
 	'azure',
 	'google',
 	'github',
-	'asset'
+	'asset',
+	'freshness'
 ]
 
 export type Trigger = {
@@ -118,7 +129,12 @@ export const triggerIconMap = {
 	cli: Terminal,
 	nextcloud: NextcloudIcon,
 	google: GoogleIcon,
-	github: GithubIcon
+	github: GithubIcon,
+	// Job-attribution-only kinds (no trigger CRUD page): the pipeline asset
+	// cascade and the freshness watchdog. Needed so the Runs filter and job
+	// detail render these trigger kinds instead of a blank label / no icon.
+	asset: Zap,
+	freshness: Timer
 }
 
 export const triggerDisplayNamesMap = {
@@ -139,8 +155,12 @@ export const triggerDisplayNamesMap = {
 	cli: 'CLI',
 	nextcloud: 'Nextcloud',
 	google: 'Google',
-	github: 'GitHub'
-} as const satisfies Record<TriggerType, string>
+	github: 'GitHub',
+	asset: 'Asset cascade',
+	freshness: 'Freshness'
+	// `asset` / `freshness` are job-attribution-only (JobTriggerKind, not
+	// TriggerType) — hence the union in the satisfies below.
+} as const satisfies Record<TriggerType | 'asset' | 'freshness', string>
 
 /**
  * Converts a TriggerType to a CaptureTriggerKind when a mapping exists
diff --git a/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
index 77b5149933..361d5b610b 100644
--- a/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
@@ -457,6 +457,7 @@
 {#if useDrawer}
 	<Drawer size="800px" bind:this={drawer}>
 		<DrawerContent
+			bannerReserved={draftSync.hasBaseline}
 			title={edit
 				? can_write
 					? `Edit WebSocket trigger ${initialPath}`
@@ -471,6 +472,7 @@
 				<LocalDraftBanner
 					show={draftSync.hasDraft}
 					getDeployed={() => draftSync.deployed}
+					reserveSpace={draftSync.hasBaseline}
 					getCurrent={() => draftSync.current}
 					onDiscard={() => draftSync.resetToDeployed(initialPath)}
 					disabled={!can_write}
diff --git a/frontend/src/lib/components/workspace/WorkspaceCard.svelte b/frontend/src/lib/components/workspace/WorkspaceCard.svelte
index c4ac967b50..0942311805 100644
--- a/frontend/src/lib/components/workspace/WorkspaceCard.svelte
+++ b/frontend/src/lib/components/workspace/WorkspaceCard.svelte
@@ -6,10 +6,13 @@
 	import type { UserWorkspace } from '$lib/stores'
 	import { superadmin } from '$lib/stores'
 	import { WorkspaceService } from '$lib/gen'
+	import { reconcileAfterWorkspaceChange } from '$lib/components/sessions/sessionState.svelte'
 	import { pluralize } from '$lib/utils'
+	import { forkAccentStyle } from '$lib/utils/forkColor'
 	import WorkspaceIcon from './WorkspaceIcon.svelte'
 	import WorkspaceCard from './WorkspaceCard.svelte'
 	import { twMerge } from 'tailwind-merge'
+	import { devBadgeText } from '$lib/utils/devWorkspaceLabel'
 
 	interface ExtendedWorkspace extends UserWorkspace {
 		_children?: ExtendedWorkspace[]
@@ -50,6 +53,17 @@
 
 	const paddingLeft = untrack(() => depth) * 24
 	const isSelected = $derived(selectedWorkspaceId === workspace.id)
+	// Colored forks render icon + name in the derived fork accent (the fork
+	// picker convention); the icon side is handled inside WorkspaceIcon.
+	const forkAccent = $derived(isForked ? forkAccentStyle(workspace.color) : undefined)
+
+	// The canonical dev workspace sorts before throwaway forks.
+	const sortedChildren = $derived(
+		[...children].sort((a, b) => {
+			if (!!a.is_dev_workspace !== !!b.is_dev_workspace) return a.is_dev_workspace ? -1 : 1
+			return a.name.localeCompare(b.name)
+		})
+	)
 
 	// Helper functions
 	function isWorkspaceArchived(workspace: UserWorkspace): boolean {
@@ -64,6 +78,8 @@
 		if (onUnarchive) {
 			await WorkspaceService.unarchiveWorkspace({ workspace: workspace.id })
 			await onUnarchive(workspace.id)
+			// Restore sessions auto-archived when this workspace was archived.
+			await reconcileAfterWorkspaceChange()
 		}
 	}
 </script>
@@ -108,6 +124,8 @@
 							<WorkspaceIcon
 								workspaceColor={workspace.color}
 								{isForked}
+								isDevWorkspace={workspace.is_dev_workspace}
+								devWorkspaceLabel={workspace.dev_workspace_label}
 								parentName={workspace.parent_workspace_id ?? undefined}
 								size={12}
 							/>
@@ -115,13 +133,26 @@
 
 						<div class="min-w-0 flex-1">
 							<div class="flex flex-row items-center gap-2 flex-wrap">
-								<span class="text-xs font-semibold text-primary truncate">
+								<span
+									class="text-xs font-semibold truncate {forkAccent
+										? 'text-[color:var(--fork-accent-text)] dark:text-[color:var(--fork-accent-text-dark)]'
+										: 'text-primary'}"
+									style={forkAccent}
+								>
 									{#if workspace.marked}
 										{@html workspace.marked}
 									{:else}
 										{workspace.name}
 									{/if}
 								</span>
+								{#if workspace.is_dev_workspace}
+									<Badge
+										color="dark-blue"
+										small
+										class="text-3xs px-1 py-0 dark:bg-surface-accent-primary text-white dark:text-white"
+										>{devBadgeText(workspace.dev_workspace_label)}</Badge
+									>
+								{/if}
 								<span class="text-secondary text-xs">-</span>
 								{#if workspace.id === 'admins'}
 									<Badge color="blue">{workspace.id}</Badge>
@@ -205,7 +236,7 @@
 	<!-- Expanded forks -->
 	{#if children.length > 0 && isExpanded}
 		<div class="mt-2 ml-6" transition:slide={{ duration: 150 }}>
-			{#each children as child (child.id)}
+			{#each sortedChildren as child (child.id)}
 				<WorkspaceCard
 					workspace={child}
 					isForked={true}
diff --git a/frontend/src/lib/components/workspace/WorkspaceIcon.svelte b/frontend/src/lib/components/workspace/WorkspaceIcon.svelte
index 07e0010c9b..a9f0e3879f 100644
--- a/frontend/src/lib/components/workspace/WorkspaceIcon.svelte
+++ b/frontend/src/lib/components/workspace/WorkspaceIcon.svelte
@@ -2,30 +2,65 @@
 	import { Building, GitFork } from 'lucide-svelte'
 	import { Tooltip } from '$lib/components/meltComponents'
 	import { getContrastTextColor } from '$lib/utils'
+	import { forkAccentStyle } from '$lib/utils/forkColor'
+	import { devLabelWord } from '$lib/utils/devWorkspaceLabel'
 
 	interface Props {
 		workspaceColor?: string
 		isForked?: boolean
+		isDevWorkspace?: boolean
+		devWorkspaceLabel?: string | null
 		parentName?: string
 		size?: number
+		// Tailwind padding class for the round badge — shrink it (e.g. 'p-0.5') for
+		// a more compact icon.
+		padding?: string
 	}
 
-	let { workspaceColor, isForked = false, parentName, size = 14 }: Props = $props()
+	let {
+		workspaceColor,
+		isForked = false,
+		isDevWorkspace = false,
+		devWorkspaceLabel,
+		parentName,
+		size = 14,
+		padding = 'p-1.5'
+	}: Props = $props()
 
-	const iconColor = $derived(getContrastTextColor(workspaceColor))
+	// A colored FORK tints the fork icon with the derived accent (the fork
+	// picker convention) instead of a raw-color disc; roots keep the filled
+	// disc with a contrast-picked icon color.
+	const accentStyle = $derived(isForked ? forkAccentStyle(workspaceColor) : undefined)
+	const iconColor = $derived(isForked ? undefined : getContrastTextColor(workspaceColor))
 </script>
 
-<div style="background-color: {workspaceColor}" class="rounded-full p-1.5 center-center">
+<div
+	style={accentStyle ??
+		(!isForked && workspaceColor ? `background-color: ${workspaceColor}` : undefined)}
+	class="rounded-full {padding} center-center"
+>
 	{#if isForked}
 		<Tooltip>
 			{#snippet text()}
 				{#if isForked && parentName}
-					Fork of {parentName}
+					{isDevWorkspace ? `${devLabelWord(devWorkspaceLabel)} workspace of` : 'Fork of'}
+					{parentName}
 				{/if}
 			{/snippet}
-			<GitFork {size} class="flex-shrink-0" style="color: {iconColor}" />
+			<!-- Explicit neutral fallback: rows are often <a> elements, and an
+			     icon left on currentColor would inherit the global link blue. -->
+			<GitFork
+				{size}
+				class="flex-shrink-0 {accentStyle
+					? 'text-[color:var(--fork-accent-text)] dark:text-[color:var(--fork-accent-text-dark)]'
+					: 'text-tertiary'}"
+			/>
 		</Tooltip>
 	{:else}
-		<Building {size} style="color: {iconColor}" />
+		<Building
+			{size}
+			class={iconColor ? '' : 'text-tertiary'}
+			style={iconColor ? `color: ${iconColor}` : undefined}
+		/>
 	{/if}
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/lib/components/workspace/WorkspaceTreeView.svelte b/frontend/src/lib/components/workspace/WorkspaceTreeView.svelte
index 87e94fed14..c3c3afa049 100644
--- a/frontend/src/lib/components/workspace/WorkspaceTreeView.svelte
+++ b/frontend/src/lib/components/workspace/WorkspaceTreeView.svelte
@@ -41,8 +41,15 @@
 
 	// Computed expansion states that include auto-expansion for search results
 	let expansionStates = $derived.by(() => {
+		// Prod nodes that have a canonical dev start expanded so the dev is visible without a click;
+		// manual toggles still win, so the user can collapse them.
+		const devExpanded: Record<string, boolean> = {}
+		workspaces?.forEach((w) => {
+			if (w.is_dev_workspace && w.parent_workspace_id) devExpanded[w.parent_workspace_id] = true
+		})
+
 		if (!searchFilter || !filteredWorkspaces || !workspaces) {
-			return manualExpansionStates
+			return { ...devExpanded, ...manualExpansionStates }
 		}
 
 		const matchedWorkspaceIds = new Set(filteredWorkspaces.map((w) => w.id))
@@ -75,8 +82,8 @@
 			}
 		})
 
-		// Combine manual and auto-expanded states
-		return { ...manualExpansionStates, ...autoExpanded }
+		// Combine dev-default, manual, and auto-expanded states
+		return { ...devExpanded, ...manualExpansionStates, ...autoExpanded }
 	})
 
 	// Build nested hierarchy correctly - always use full workspace list for hierarchy
diff --git a/frontend/src/lib/components/workspaceItemsLoader.svelte.ts b/frontend/src/lib/components/workspaceItemsLoader.svelte.ts
index 45d64bd01b..4ac65f805b 100644
--- a/frontend/src/lib/components/workspaceItemsLoader.svelte.ts
+++ b/frontend/src/lib/components/workspaceItemsLoader.svelte.ts
@@ -21,13 +21,23 @@ import {
  * Both getters are read inside the returned closures so changing
  * workspace or kinds after mount Just Works.
  */
+function itemsEqual(a: WorkspaceItem[] | undefined, b: WorkspaceItem[]): boolean {
+	if (!a || a.length !== b.length) return false
+	return a.every(
+		(item, i) =>
+			item.path === b[i].path &&
+			item.summary === b[i].summary &&
+			item.kind === b[i].kind &&
+			item.raw_app === b[i].raw_app
+	)
+}
+
 export function useWorkspaceItemsLoader(
 	workspace: () => string | undefined,
 	kinds: () => readonly WorkspaceItemKind[]
 ) {
 	// Seed from the module-level cache so kinds already fetched in this
-	// session render on the first frame. Re-fetching `ensureLoaded` later
-	// quietly swaps in fresh data (stale-while-revalidate).
+	// session render on the first frame.
 	let loaded = $state<Partial<Record<WorkspaceItemKind, WorkspaceItem[]>>>(
 		(() => {
 			const ws = untrack(workspace)
@@ -41,18 +51,38 @@ export function useWorkspaceItemsLoader(
 		})()
 	)
 	let loadingKind = $state<Partial<Record<WorkspaceItemKind, boolean>>>({})
+	// Workspace+kind pairs this loader instance has refreshed — at most one
+	// background re-fetch per kind per mount. Marked on success only, so a
+	// failed fetch is retried by the next call instead of stranding stale data.
+	const revalidated = new Set<string>()
 
 	async function ensureLoaded(kind: WorkspaceItemKind) {
 		const ws = workspace()
 		if (!ws) return
+		const revalidateKey = `${ws}:${kind}`
 		// `loaded[kind]` read inside `untrack` so callers wiring this into
 		// a reactive context (DrillPicker's onFilterChange effect) don't
 		// subscribe to a signal `ensureLoaded` itself writes — that would
 		// re-fire the effect on every assignment and busy-loop.
-		if (!untrack(() => loaded[kind])) loadingKind[kind] = true
+		const hasCached = !!untrack(() => loaded[kind])
+		if (hasCached && revalidated.has(revalidateKey)) return
+		if (!hasCached) loadingKind[kind] = true
 		try {
-			const items = await loadKind(ws, kind)
-			loaded[kind] = items
+			const items = await loadKind(ws, kind, { revalidate: true })
+			revalidated.add(revalidateKey)
+			// Keep the reference stable when nothing changed so an open picker's
+			// derived tree isn't rebuilt under the user on every revalidation.
+			if (
+				!itemsEqual(
+					untrack(() => loaded[kind]),
+					items
+				)
+			)
+				loaded[kind] = items
+		} catch (e) {
+			// Callers fire-and-forget; surface the failure without an
+			// unhandled rejection. Cached items (if any) keep rendering.
+			console.error(`Failed to load workspace ${kind}s`, e)
 		} finally {
 			loadingKind[kind] = false
 		}
diff --git a/frontend/src/lib/components/workspacePicker.ts b/frontend/src/lib/components/workspacePicker.ts
index ba2985ecbb..92ea48af20 100644
--- a/frontend/src/lib/components/workspacePicker.ts
+++ b/frontend/src/lib/components/workspacePicker.ts
@@ -44,9 +44,10 @@ type WorkspaceCache = {
 }
 
 /** Module-level session cache. Persists across picker mounts within a single
- * page session. NOT invalidated automatically — call `invalidate()` after
- * creating/deleting an item if the picker may be opened again before a full
- * reload. */
+ * page session so cached kinds render on the first frame. Pickers revalidate
+ * once per mount via `loadKind(..., { revalidate: true })`, so stale entries
+ * self-heal on the next open; call `invalidate()` after creating/deleting an
+ * item when even a brief flash of the stale list must be avoided. */
 const cache = new Map<string, WorkspaceCache>()
 const inflight = new Map<string, Promise<WorkspaceItem[]>>()
 /** Bumped by `invalidate()`. Each in-flight `loadKind` captures the version
@@ -87,11 +88,14 @@ export function invalidate(workspace: string, kind?: WorkspaceItemKind) {
 
 export async function loadKind(
 	workspace: string,
-	kind: WorkspaceItemKind
+	kind: WorkspaceItemKind,
+	opts?: { revalidate?: boolean }
 ): Promise<WorkspaceItem[]> {
 	const existing = cache.get(workspace)?.[kind]
-	if (existing) return existing
+	if (existing && !opts?.revalidate) return existing
 	const key = cacheKey(workspace, kind)
+	// An in-flight fetch is already hitting the network, so it satisfies a
+	// revalidate request too.
 	const flying = inflight.get(key)
 	if (flying) return flying
 
diff --git a/frontend/src/lib/components/workspaceSettings/AISettings.svelte b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
index 2080ecd332..f44059e395 100644
--- a/frontend/src/lib/components/workspaceSettings/AISettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/AISettings.svelte
@@ -13,6 +13,8 @@
 	import { supportsAutocomplete } from '../copilot/utils'
 	import TestAiKey from '../copilot/TestAIKey.svelte'
 	import Label from '../Label.svelte'
+	import AiSkillsSettings from './AiSkillsSettings.svelte'
+	import { isGlobalAiEnabled } from '../copilot/chat/global/gate'
 	import SettingsPageHeader from '../settings/SettingsPageHeader.svelte'
 	import ResourcePicker from '../ResourcePicker.svelte'
 	import Toggle from '../Toggle.svelte'
@@ -587,6 +589,10 @@
 			</div>
 		</SettingCard>
 	{/if}
+
+	{#if promptScope === 'workspace' && isGlobalAiEnabled()}
+		<AiSkillsSettings />
+	{/if}
 </div>
 
 <AIPromptsModal
diff --git a/frontend/src/lib/components/workspaceSettings/AiSkillsSettings.svelte b/frontend/src/lib/components/workspaceSettings/AiSkillsSettings.svelte
new file mode 100644
index 0000000000..199da77c4b
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/AiSkillsSettings.svelte
@@ -0,0 +1,664 @@
+<script lang="ts">
+	import { onMount } from 'svelte'
+	import { createDropdownMenu, melt } from '@melt-ui/svelte'
+	import Button from '../common/button/Button.svelte'
+	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
+	import Modal2 from '../common/modal/Modal2.svelte'
+	import Toggle from '../Toggle.svelte'
+	import DropdownV2 from '../DropdownV2.svelte'
+	import Checkbox from '../common/checkbox/Checkbox.svelte'
+	import Markdown from 'svelte-exmarkdown'
+	import { gfmPlugin } from 'svelte-exmarkdown/gfm'
+	import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte'
+	import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import SettingCard from '../instanceSettings/SettingCard.svelte'
+	import autosize from '$lib/autosize'
+	import { conditionalMelt } from '$lib/utils'
+	import { workspaceStore } from '$lib/stores'
+	import { sendUserToast } from '$lib/toast'
+	import { WorkspaceService } from '$lib/gen'
+	import { buildSkillMd, parseAndValidateSkill, parseSkillMd, type SkillUpload } from './aiSkills'
+	import {
+		ChevronDown,
+		ClipboardPaste,
+		Eye,
+		FolderUp,
+		ListChecks,
+		Pencil,
+		Plus,
+		Trash2
+	} from 'lucide-svelte'
+
+	type SkillListItem = { name: string; description: string }
+
+	// `<root>/<skill>/SKILL.md` is 3 path segments; SKILL.md files nested deeper
+	// are likely vendored/incidental and are skipped so importing a parent dir
+	// doesn't sweep in unrelated skills.
+	const MAX_SKILL_DEPTH = 3
+	const MAX_SKILLS_PER_IMPORT = 50
+	const MAX_SKILLS_PER_WORKSPACE = 100
+	const SAMPLE_SKILL_PLACEHOLDER =
+		'---\nname: my-skill\ndescription: what this skill helps with\n---\n\n# My skill\n\nInstructions for the assistant…'
+	const menuItemClass =
+		'w-full flex flex-row items-center gap-2.5 rounded-md px-2 py-1.5 text-left cursor-pointer transition-colors focus:outline-none data-[highlighted]:bg-surface-hover hover:bg-surface-hover'
+
+	let skills: SkillListItem[] = $state([])
+	let uploading: boolean = $state(false)
+	let pasteContent: string = $state('')
+	// The content the modal opened with, so Save can be gated on unsaved changes.
+	let originalContent: string = $state('')
+	let pasteModalOpen: boolean = $state(false)
+	// Set while the paste modal is editing an existing skill; holds the skill's
+	// name before edits so a rename can delete the old entry after save.
+	let editingOriginalName: string | undefined = $state(undefined)
+	let dirInput: HTMLInputElement | undefined = $state(undefined)
+	let toDelete: string | undefined = $state(undefined)
+	let pendingImport: SkillUpload[] | undefined = $state(undefined)
+	let pendingSkipped: string[] = $state([])
+	// Per-conflict overwrite choice for a folder import, keyed by skill name.
+	let overwriteChoices: Record<string, boolean> = $state({})
+	// The skill detail modal opens in read mode with rendered markdown; a header
+	// toggle flips it to raw SKILL.md editing.
+	let detailMode: 'view' | 'edit' = $state('view')
+	// Multi-select "manage" mode: rows gain a checkbox for batch deletion.
+	let manageMode: boolean = $state(false)
+	let selected: Record<string, boolean> = $state({})
+	let confirmBatchDelete: boolean = $state(false)
+	let listRequestId = 0
+
+	let existingNames = $derived(new Set(skills.map((s) => s.name)))
+	let selectedCount = $derived(skills.filter((s) => selected[s.name]).length)
+	let allSelected = $derived(skills.length > 0 && selectedCount === skills.length)
+
+	// Leave manage mode automatically once a batch delete empties it below the
+	// two-skill threshold that surfaces the "Manage skills" button.
+	$effect(() => {
+		if (manageMode && skills.length <= 1) exitManage()
+	})
+	let pendingConflicts = $derived(
+		(pendingImport ?? ([] as SkillUpload[])).filter((s) => existingNames.has(s.name))
+	)
+	let pendingNew = $derived(
+		(pendingImport ?? ([] as SkillUpload[])).filter((s) => !existingNames.has(s.name))
+	)
+	// Parsed view of the modal's raw content, for rendering the skill in read mode.
+	let viewParsed = $derived(parseSkillMd(pasteContent))
+	let isDirty = $derived(pasteContent !== originalContent)
+	// Validate through the shared schema; surfaced inline so Save can be gated
+	// without a toast.
+	let pasteResult = $derived(parseAndValidateSkill(pasteContent))
+	let pasteError = $derived('error' in pasteResult ? pasteResult.error : undefined)
+
+	// Reset edit mode whenever the paste modal closes so a later "Paste a skill"
+	// opens a blank creation form.
+	$effect(() => {
+		if (!pasteModalOpen) editingOriginalName = undefined
+	})
+
+	// melt dropdown for the "+ Add skills" button: arrow-key nav, outside/escape
+	// close and focus management come for free.
+	const {
+		elements: { trigger: addMenuTrigger, menu: addMenu, item: addMenuItem },
+		states: { open: addMenuOpen }
+	} = createDropdownMenu({
+		positioning: { placement: 'bottom-end', gutter: 4, fitViewport: true },
+		loop: true,
+		forceVisible: true
+	})
+
+	// attach the menu trigger to the design-system <Button>'s DOM node so it keeps
+	// its styling — melt element stores are callable on a node like `use:melt`.
+	let addTriggerEl: HTMLButtonElement | HTMLAnchorElement | undefined = $state(undefined)
+	$effect(() => {
+		const el = addTriggerEl
+		if (!el) return
+		const applied = conditionalMelt(el, addMenuTrigger as any) as { destroy?: () => void }
+		return applied?.destroy
+	})
+
+	async function loadList(workspace: string | undefined) {
+		const requestId = ++listRequestId
+		if (!workspace) {
+			skills = []
+			return
+		}
+		try {
+			const loaded = await WorkspaceService.listAiSkills({ workspace })
+			if (requestId === listRequestId && workspace === $workspaceStore) {
+				skills = loaded
+			}
+		} catch (e) {
+			if (requestId === listRequestId && workspace === $workspaceStore) {
+				sendUserToast(`Failed to load skills: ${e}`, true)
+			}
+		}
+	}
+
+	/**
+	 * Turn a map of `relativePath -> content` (from an imported folder) into skills.
+	 * A skill is any `SKILL.md`; its id is the name of the folder holding it.
+	 */
+	function collectSkills(files: Record<string, string>): {
+		skills: SkillUpload[]
+		skipped: string[]
+	} {
+		const collected: SkillUpload[] = []
+		const skipped: string[] = []
+		for (const [path, content] of Object.entries(files)) {
+			const segments = path.split('/')
+			if (segments[segments.length - 1]?.toLowerCase() !== 'skill.md') continue
+			const folderName = segments.length >= 2 ? segments[segments.length - 2] : ''
+			const result = parseAndValidateSkill(content, folderName)
+			if ('error' in result) {
+				skipped.push(`${folderName || path} (${result.error})`)
+			} else {
+				collected.push(result.skill)
+			}
+		}
+		return { skills: collected, skipped }
+	}
+
+	async function uploadSkills(parsed: SkillUpload[], skipped: string[] = []) {
+		const workspace = $workspaceStore
+		if (!workspace || parsed.length === 0) {
+			sendUserToast(
+				`No valid skill found.${skipped.length ? ` Skipped: ${skipped.join(', ')}` : ''}`,
+				true
+			)
+			return false
+		}
+		if (parsed.length > MAX_SKILLS_PER_IMPORT) {
+			sendUserToast(`Cannot add more than ${MAX_SKILLS_PER_IMPORT} skills at a time.`, true)
+			return false
+		}
+		// Uploads upsert, so only names not already stored count toward the cap.
+		const newCount = parsed.filter((s) => !existingNames.has(s.name)).length
+		if (skills.length + newCount > MAX_SKILLS_PER_WORKSPACE) {
+			sendUserToast(`This workspace can store at most ${MAX_SKILLS_PER_WORKSPACE} skills.`, true)
+			return false
+		}
+		uploading = true
+		try {
+			await WorkspaceService.uploadAiSkills({
+				workspace,
+				requestBody: { skills: parsed }
+			})
+			let message = `Added ${parsed.length} skill(s)`
+			if (skipped.length) message += `; skipped ${skipped.length}: ${skipped.join(', ')}`
+			sendUserToast(message)
+			await loadList(workspace)
+			return true
+		} catch (e) {
+			sendUserToast(`Failed to add skills: ${e}`, true)
+			return false
+		} finally {
+			uploading = false
+		}
+	}
+
+	function openPaste() {
+		editingOriginalName = undefined
+		pasteContent = ''
+		originalContent = ''
+		detailMode = 'edit'
+		pasteModalOpen = true
+	}
+
+	async function openSkill(name: string, mode: 'view' | 'edit') {
+		const workspace = $workspaceStore
+		if (!workspace) return
+		try {
+			const skill = await WorkspaceService.getAiSkill({ workspace, name })
+			pasteContent = buildSkillMd(skill)
+			originalContent = pasteContent
+			editingOriginalName = name
+			detailMode = mode
+			pasteModalOpen = true
+		} catch (e) {
+			sendUserToast(`Failed to load skill: ${e}`, true)
+		}
+	}
+
+	async function submitPastedSkill() {
+		// Guarded by `pasteError` disabling the button; bail defensively if reached.
+		if (!('skill' in pasteResult)) return
+		const parsed = pasteResult.skill
+		const renamedFrom = editingOriginalName
+		if (await uploadSkills([parsed])) {
+			// A rename saves under the new name; drop the old entry so it doesn't linger.
+			if (renamedFrom && renamedFrom !== parsed.name) {
+				await deleteSkill(renamedFrom, { silent: true })
+			}
+			pasteContent = ''
+			pasteModalOpen = false
+		}
+	}
+
+	/**
+	 * Filter a folder's files down to in-depth SKILL.md, read them, and stage the
+	 * result for confirmation.
+	 */
+	async function processFolderFiles(files: File[]) {
+		// Pick SKILL.md files within the depth limit BEFORE reading any content,
+		// so a huge tree never gets read in full.
+		const skipped: string[] = []
+		const eligible: File[] = []
+		for (const f of files) {
+			const path = f.webkitRelativePath || f.name
+			const segments = path.split('/')
+			if (segments[segments.length - 1]?.toLowerCase() !== 'skill.md') continue
+			if (segments.length > MAX_SKILL_DEPTH) {
+				skipped.push(`${path} (nested deeper than ${MAX_SKILL_DEPTH} folder levels)`)
+				continue
+			}
+			eligible.push(f)
+		}
+
+		if (eligible.length === 0) {
+			sendUserToast(
+				`No SKILL.md found within ${MAX_SKILL_DEPTH} folder levels.${
+					skipped.length ? ` Skipped ${skipped.length} deeper file(s).` : ''
+				}`,
+				true
+			)
+			return
+		}
+		if (eligible.length > MAX_SKILLS_PER_IMPORT) {
+			sendUserToast(
+				`Found ${eligible.length} skills in this folder; imports are limited to ${MAX_SKILLS_PER_IMPORT} at a time.`,
+				true
+			)
+			return
+		}
+
+		const map: Record<string, string> = {}
+		for (const f of eligible) {
+			map[f.webkitRelativePath || f.name] = await f.text()
+		}
+		const { skills: parsed, skipped: parseSkipped } = collectSkills(map)
+		const allSkipped = [...skipped, ...parseSkipped]
+		if (parsed.length === 0) {
+			sendUserToast(
+				`No valid skill found.${allSkipped.length ? ` Skipped: ${allSkipped.join(', ')}` : ''}`,
+				true
+			)
+			return
+		}
+		// Confirm before writing — the import can pull in several skills at once,
+		// and any that collide with existing skills default to overwrite.
+		pendingSkipped = allSkipped
+		overwriteChoices = Object.fromEntries(
+			parsed.filter((s) => existingNames.has(s.name)).map((s) => [s.name, true])
+		)
+		pendingImport = parsed
+	}
+
+	async function onDirSelected(event: Event) {
+		const target = event.target as HTMLInputElement
+		const files = Array.from(target.files ?? [])
+		// Reset early so re-selecting the same folder re-fires `change`.
+		if (dirInput) dirInput.value = ''
+		await processFolderFiles(files)
+	}
+
+	async function deleteSkill(name: string, opts: { silent?: boolean } = {}) {
+		const workspace = $workspaceStore
+		if (!workspace) return
+		try {
+			await WorkspaceService.deleteAiSkill({ workspace, name })
+			if (!opts.silent) sendUserToast(`Deleted skill ${name}`)
+			await loadList(workspace)
+		} catch (e) {
+			sendUserToast(`Failed to delete skill: ${e}`, true)
+		}
+	}
+
+	function exitManage() {
+		manageMode = false
+		selected = {}
+	}
+
+	// Escape leaves manage mode, mirroring the "Done" button — but only when no
+	// modal/menu is open, so it doesn't steal Escape from them.
+	function onWindowKeydown(e: KeyboardEvent) {
+		if (
+			e.key === 'Escape' &&
+			manageMode &&
+			!pasteModalOpen &&
+			!confirmBatchDelete &&
+			!$addMenuOpen &&
+			toDelete === undefined &&
+			pendingImport === undefined
+		) {
+			exitManage()
+		}
+	}
+
+	function toggleSelect(name: string) {
+		selected = { ...selected, [name]: !selected[name] }
+	}
+
+	function toggleSelectAll() {
+		selected = allSelected ? {} : Object.fromEntries(skills.map((s) => [s.name, true]))
+	}
+
+	async function deleteSelected() {
+		const workspace = $workspaceStore
+		const names = skills.filter((s) => selected[s.name]).map((s) => s.name)
+		if (!workspace || names.length === 0) return
+		uploading = true
+		try {
+			for (const name of names) {
+				await WorkspaceService.deleteAiSkill({ workspace, name })
+			}
+			sendUserToast(`Deleted ${names.length} skill(s)`)
+			exitManage()
+		} catch (e) {
+			sendUserToast(`Failed to delete skills: ${e}`, true)
+		} finally {
+			uploading = false
+			await loadList(workspace)
+		}
+	}
+
+	onMount(() => {
+		return workspaceStore.subscribe((workspace) => {
+			toDelete = undefined
+			pendingImport = undefined
+			pendingSkipped = []
+			overwriteChoices = {}
+			exitManage()
+			void loadList(workspace)
+		})
+	})
+</script>
+
+<svelte:window onkeydown={onWindowKeydown} />
+
+{#snippet pasteZone()}
+	<textarea
+		bind:value={pasteContent}
+		placeholder={SAMPLE_SKILL_PLACEHOLDER}
+		class="w-full min-h-24 p-2 border border-border-light rounded-md bg-surface text-primary font-mono text-xs resize-y"
+		rows="5"
+		use:autosize
+	></textarea>
+	{#if editingOriginalName || pasteContent.trim()}
+		<div class="flex items-center justify-between gap-2 mt-2">
+			<span class="text-2xs text-red-500 min-w-0">{isDirty && pasteError ? pasteError : ''}</span>
+			<Button
+				onclick={submitPastedSkill}
+				variant="accent"
+				unifiedSize="sm"
+				startIcon={{ icon: editingOriginalName ? Pencil : Plus }}
+				disabled={uploading || !isDirty || !!pasteError}
+			>
+				{editingOriginalName ? 'Save skill' : 'Add skill'}
+			</Button>
+		</div>
+	{/if}
+{/snippet}
+
+<SettingCard
+	label="Custom skills"
+	description="Add your own skills to the AI Chat. The expected format is the same as Claude or Codex."
+>
+	{#snippet headerAction()}
+		<div class="flex items-center gap-2">
+			{#if manageMode}
+				<Button
+					variant="accent"
+					destructive
+					unifiedSize="sm"
+					startIcon={{ icon: Trash2 }}
+					disabled={selectedCount === 0 || uploading}
+					onclick={() => (confirmBatchDelete = true)}
+				>
+					Delete{selectedCount ? ` (${selectedCount})` : ''}
+				</Button>
+				<Button variant="default" unifiedSize="sm" disabled={uploading} onclick={exitManage}>
+					Done
+				</Button>
+			{:else}
+				{#if skills.length > 1}
+					<Button
+						variant="subtle"
+						unifiedSize="sm"
+						startIcon={{ icon: ListChecks }}
+						disabled={uploading}
+						onclick={() => (manageMode = true)}
+					>
+						Manage skills
+					</Button>
+				{/if}
+				<Button
+					bind:element={addTriggerEl}
+					{...$addMenuTrigger}
+					variant="default"
+					unifiedSize="sm"
+					startIcon={{ icon: Plus }}
+					endIcon={{ icon: ChevronDown }}
+					disabled={uploading}
+				>
+					Add skills
+				</Button>
+			{/if}
+		</div>
+		{#if $addMenuOpen}
+			<div
+				use:melt={$addMenu}
+				class="z-[6000] flex flex-col gap-0.5 p-1 w-64 rounded-lg border border-border-light bg-surface shadow-xl focus:outline-none"
+			>
+				<button use:melt={$addMenuItem} class={menuItemClass} onclick={() => dirInput?.click()}>
+					<FolderUp size={16} class="shrink-0 text-tertiary" />
+					<span class="text-xs font-medium text-primary">Import a folder of skills</span>
+				</button>
+				<button use:melt={$addMenuItem} class={menuItemClass} onclick={openPaste}>
+					<ClipboardPaste size={16} class="shrink-0 text-tertiary" />
+					<span class="text-xs font-medium text-primary">Paste a skill</span>
+				</button>
+			</div>
+		{/if}
+	{/snippet}
+
+	<div class="flex flex-col gap-3 pt-1">
+		{#if skills.length === 0}
+			<div class="rounded-md border border-dashed px-3 py-6 text-center text-xs text-secondary">
+				No custom skills yet
+			</div>
+		{:else}
+			<div class="rounded-md border divide-y max-h-96 overflow-y-auto">
+				{#if manageMode}
+					<div class="sticky top-0 z-10 flex items-center gap-3 px-3 py-2 bg-surface-secondary">
+						<Checkbox
+							checked={allSelected}
+							indeterminate={selectedCount > 0 && !allSelected}
+							onChange={toggleSelectAll}
+						/>
+						<span class="text-2xs text-secondary">
+							{selectedCount ? `${selectedCount} selected` : 'Select all'}
+						</span>
+					</div>
+				{/if}
+				{#each skills as skill (skill.name)}
+					<div class="flex items-center justify-between gap-4 px-3 py-2">
+						{#if manageMode}
+							<label class="flex items-center gap-3 min-w-0 grow cursor-pointer">
+								<Checkbox
+									checked={!!selected[skill.name]}
+									onChange={() => toggleSelect(skill.name)}
+								/>
+								<div class="min-w-0">
+									<div class="text-xs font-mono truncate">{skill.name}</div>
+									<div class="text-2xs text-secondary truncate">{skill.description}</div>
+								</div>
+							</label>
+						{:else}
+							<div class="min-w-0">
+								<div class="text-xs font-mono truncate">{skill.name}</div>
+								<div class="text-2xs text-secondary truncate">{skill.description}</div>
+								<Button
+									onclick={() => openSkill(skill.name, 'view')}
+									variant="subtle"
+									unifiedSize="2xs"
+									wrapperClasses="w-fit mt-0.5"
+									btnClasses="!px-0 text-2xs font-normal text-secondary hover:text-primary hover:!bg-transparent"
+								>
+									Show more
+								</Button>
+							</div>
+							<DropdownV2
+								size="sm"
+								items={[
+									{
+										displayName: 'Edit',
+										icon: Pencil,
+										disabled: uploading,
+										action: () => openSkill(skill.name, 'edit')
+									},
+									{
+										displayName: 'Delete',
+										icon: Trash2,
+										type: 'delete',
+										action: () => (toDelete = skill.name)
+									}
+								]}
+							/>
+						{/if}
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</div>
+</SettingCard>
+
+<!-- Hidden folder picker fired by the dropdown's "Import a folder of skills". -->
+<input
+	bind:this={dirInput}
+	type="file"
+	style="display: none;"
+	onchange={onDirSelected}
+	{...{ webkitdirectory: true, directory: true }}
+/>
+
+<Modal2
+	title={editingOriginalName ?? 'Paste a skill'}
+	bind:isOpen={pasteModalOpen}
+	fixedWidth="md"
+	fixedHeight="adaptive"
+>
+	{#snippet headerRight()}
+		{#if editingOriginalName}
+			<ToggleButtonGroup bind:selected={detailMode}>
+				{#snippet children({ item })}
+					<ToggleButton value="view" label="View" icon={Eye} {item} small />
+					<ToggleButton value="edit" label="Edit" icon={Pencil} {item} small />
+				{/snippet}
+			</ToggleButtonGroup>
+		{/if}
+	{/snippet}
+	<div class="w-full flex flex-col">
+		{#if detailMode === 'view'}
+			<div class="w-full flex flex-col gap-3">
+				{#if viewParsed.description}
+					<p class="text-xs text-secondary">{viewParsed.description}</p>
+				{/if}
+				<div
+					class="border rounded-md p-3 overflow-auto max-h-[60vh] prose prose-sm dark:prose-invert max-w-full leading-snug space-y-2 prose-ul:!pl-6
+						prose-p:text-xs prose-li:text-xs prose-code:text-xs prose-pre:text-xs
+						prose-code:break-words prose-a:break-words
+						prose-headings:font-medium prose-headings:text-emphasis prose-headings:mt-3 prose-headings:mb-1
+						prose-h1:text-sm prose-h2:text-xs prose-h3:text-xs prose-h4:text-xs prose-h5:text-xs prose-h6:text-xs
+						prose-table:block prose-table:max-w-full prose-table:overflow-x-auto prose-table:text-xs"
+				>
+					<Markdown md={viewParsed.instructions} plugins={[gfmPlugin()]} />
+				</div>
+			</div>
+		{:else}
+			{@render pasteZone()}
+		{/if}
+	</div>
+</Modal2>
+
+<ConfirmationModal
+	open={pendingImport !== undefined}
+	title="Import skills"
+	type="info"
+	confirmationText="Import"
+	onConfirmed={async () => {
+		const toImport = [...pendingNew, ...pendingConflicts.filter((s) => overwriteChoices[s.name])]
+		const skipped = pendingSkipped
+		pendingImport = undefined
+		pendingSkipped = []
+		overwriteChoices = {}
+		if (toImport.length) await uploadSkills(toImport, skipped)
+		else sendUserToast('No skills imported.')
+	}}
+	onCanceled={() => {
+		pendingImport = undefined
+		pendingSkipped = []
+		overwriteChoices = {}
+	}}
+>
+	<div class="flex flex-col gap-3 text-xs">
+		{#if pendingNew.length}
+			<div>
+				<span class="font-medium text-primary">Add {pendingNew.length} new skill(s):</span>
+				<span class="font-mono text-secondary">{pendingNew.map((s) => s.name).join(', ')}</span>
+			</div>
+		{/if}
+		{#if pendingConflicts.length}
+			<div class="flex flex-col gap-1.5">
+				<span class="font-medium text-primary">
+					{pendingConflicts.length} skill(s) already exist — choose which to overwrite:
+				</span>
+				<div class="rounded-md border divide-y">
+					{#each pendingConflicts as conflict (conflict.name)}
+						<div class="flex items-center justify-between gap-4 px-3 py-2">
+							<span class="font-mono truncate">{conflict.name}</span>
+							<Toggle
+								bind:checked={overwriteChoices[conflict.name]}
+								size="xs"
+								options={{ right: 'Overwrite' }}
+							/>
+						</div>
+					{/each}
+				</div>
+			</div>
+		{/if}
+		{#if pendingSkipped.length}
+			<span class="text-secondary">{pendingSkipped.length} file(s) will be skipped.</span>
+		{/if}
+	</div>
+</ConfirmationModal>
+
+<ConfirmationModal
+	open={toDelete !== undefined}
+	title="Delete skill"
+	confirmationText="Delete"
+	onConfirmed={async () => {
+		const name = toDelete
+		toDelete = undefined
+		if (name) await deleteSkill(name)
+	}}
+	onCanceled={() => (toDelete = undefined)}
+>
+	<span>
+		Delete the skill <code>{toDelete}</code>? The AI chat will no longer be able to use it.
+	</span>
+</ConfirmationModal>
+
+<ConfirmationModal
+	open={confirmBatchDelete}
+	title="Delete skills"
+	confirmationText="Delete"
+	onConfirmed={async () => {
+		confirmBatchDelete = false
+		await deleteSelected()
+	}}
+	onCanceled={() => (confirmBatchDelete = false)}
+>
+	<span>
+		Delete {selectedCount} selected skill(s)? The AI chat will no longer be able to use them.
+	</span>
+</ConfirmationModal>
diff --git a/frontend/src/lib/components/workspaceSettings/CreateWorkspaceInner.svelte b/frontend/src/lib/components/workspaceSettings/CreateWorkspaceInner.svelte
index 024d94e8e6..5f74da4b80 100644
--- a/frontend/src/lib/components/workspaceSettings/CreateWorkspaceInner.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CreateWorkspaceInner.svelte
@@ -14,14 +14,22 @@
 	import { validateUsername } from '$lib/utils'
 	import { logoutWithRedirect } from '$lib/logoutKit'
 	import { page } from '$app/state'
-	import { usersWorkspaceStore, workspaceStore } from '$lib/stores'
-	import { Button } from '$lib/components/common'
+	import { usersWorkspaceStore, userWorkspaces, workspaceStore } from '$lib/stores'
+	import {
+		workspaceIsFork,
+		findWorkspaceRoot,
+		findWorkspaceDescendants
+	} from '$lib/utils/workspaceHierarchy'
+	import { resource } from 'runed'
+	import { Badge, Button } from '$lib/components/common'
+	import { devBadgeText } from '$lib/utils/devWorkspaceLabel'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import { onMount } from 'svelte'
 	import { sendUserToast } from '$lib/toast'
 	import TestAIKey from '$lib/components/copilot/TestAIKey.svelte'
 	import { switchWorkspace } from '$lib/storeUtils'
+	import { deleteSessionsForWorkspace } from '$lib/components/sessions/sessionState.svelte'
 	import { isCloudHosted } from '$lib/cloud'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
@@ -35,13 +43,95 @@
 	import { base } from '$lib/base'
 	import Label from '../Label.svelte'
 	import ForkDatatableSection from './ForkDatatableSection.svelte'
+	import Select from '../select/Select.svelte'
+	import WorkspaceScopeTrigger from '../WorkspaceScopeTrigger.svelte'
+	import DarkModeToggle from '../sidebar/DarkModeToggle.svelte'
+	import ForkDucklakeSection from './ForkDucklakeSection.svelte'
 
 	interface Props {
 		isFork?: boolean
+		// Rendered inside the global fork modal rather than the standalone
+		// /user/create_workspace page: content-driven height and no
+		// "Back to workspaces" navigation.
+		inModal?: boolean
 		onFinish?: () => void
 	}
 
-	let { isFork = false, onFinish }: Props = $props()
+	let { isFork = false, inModal = false, onFinish }: Props = $props()
+
+	// Dev-workspace mode: create the fork as a persistent, prefix-less dev workspace and (optionally)
+	// lock the parent ("prod") against direct edits.
+	let createAsDevWorkspace = $state(false)
+	let lockProdDeploy = $state(true)
+	let lockProdForking = $state(true)
+	// Bring the parent's members into the fork (a shared env). Defaults on for a
+	// dev workspace, off for a throwaway fork; flipping the dev toggle resets it.
+	let copyMembers = $state(false)
+	$effect(() => {
+		copyMembers = createAsDevWorkspace
+	})
+
+	// A dev workspace can only be created off a root base (backend rejects a dev of a fork). Clear a
+	// stale toggle when the base no longer qualifies so we never submit is_dev_workspace against a fork.
+	$effect(() => {
+		if (!canDesignateDevWorkspace && createAsDevWorkspace) {
+			createAsDevWorkspace = false
+		}
+	})
+
+	// The base workspace to fork from. A fork's git branch is based on its parent's branch, so picking
+	// a fork here (rather than the root) yields a fork of a fork.
+	let baseWorkspaceId = $state<string | undefined>(undefined)
+
+	// Base candidates are the current workspace's family: its root first, then every fork/dev under it.
+	let familyRoot = $derived(findWorkspaceRoot($workspaceStore, $userWorkspaces))
+	let baseCandidates = $derived(
+		familyRoot ? [familyRoot, ...findWorkspaceDescendants(familyRoot.id, $userWorkspaces)] : []
+	)
+	let baseItems = $derived(
+		baseCandidates.map((w) => ({
+			value: w.id,
+			label: w.id === familyRoot?.id ? `${w.name} (root)` : w.name,
+			subtitle: w.is_dev_workspace ? 'dev workspace' : w.id === familyRoot?.id ? undefined : 'fork'
+		}))
+	)
+	let defaultBaseWorkspaceId = $derived(familyRoot?.id)
+	// Seed the base once the family is known; keep an explicit user choice as long as it stays valid.
+	$effect(() => {
+		if (!isFork) return
+		if (baseWorkspaceId && baseCandidates.some((w) => w.id === baseWorkspaceId)) return
+		baseWorkspaceId = defaultBaseWorkspaceId
+	})
+
+	// Cosmetic display label for the new dev workspace: 'dev' | 'staging'. Purely visual (badge text +
+	// wording); reset when the dev toggle is turned off.
+	let devWorkspaceLabel = $state<'dev' | 'staging'>('dev')
+	$effect(() => {
+		if (!createAsDevWorkspace) devWorkspaceLabel = 'dev'
+	})
+
+	// The dev-workspace option is only offered when forking a root workspace that doesn't already
+	// have one: a workspace gets at most one dev, and dev workspaces don't nest (a dev of a dev).
+	let baseWorkspaceEntry = $derived($userWorkspaces.find((w) => w.id === baseWorkspaceId))
+	// Require the base workspace to be loaded before treating it as a root: a missing entry must
+	// not read as root (it would offer invalid dev creation while the workspace list is still loading).
+	// `workspaceIsFork` (prefix OR parent) also excludes an orphaned `wm-fork-` workspace, whose parent
+	// FK was set null — it has no parent but is still a fork, so it can't host a dev workspace.
+	let currentIsRoot = $derived(
+		!!baseWorkspaceEntry && !workspaceIsFork(baseWorkspaceId, $userWorkspaces)
+	)
+	// Ask the server whether a dev already exists: the caller may not be a member of this prod's dev,
+	// so the client workspace list can't see it and would offer an invalid "create dev" action.
+	const devWorkspaceResource = resource(
+		() => (currentIsRoot ? baseWorkspaceId : undefined),
+		async (ws) => (ws ? await WorkspaceService.getDevWorkspace({ workspace: ws }) : undefined)
+	)
+	// Offer dev designation only once the server confirms there's no dev yet (returns null); stay
+	// conservative (no offer) while the check is loading (current is undefined).
+	let canDesignateDevWorkspace = $derived(currentIsRoot && devWorkspaceResource.current === null)
+	let currentWorkspaceName = $derived(
+		baseWorkspaceEntry?.name ?? baseWorkspaceId ?? 'the root workspace'
+	)
 
 	let id = $state('')
 	let name = $state('')
@@ -54,6 +144,7 @@
 	let checking = $state(false)
 
 	let forkDatatableSection: ReturnType<typeof ForkDatatableSection> | undefined = $state(undefined)
+	let forkDucklakeSection: ReturnType<typeof ForkDucklakeSection> | undefined = $state(undefined)
 
 	let workspaceColor: string | undefined = $state(undefined)
 	let colorEnabled = $state(false)
@@ -72,16 +163,20 @@
 		// For forks the actual workspace id is prefixed: checking the bare id
 		// would report the name as free even when `wm-fork-<id>` is taken
 		// (e.g. by an archived fork, which keeps its id reserved).
-		const effectiveId = isFork ? `${WM_FORK_PREFIX}${id}` : id
+		const effectiveId = isFork && !createAsDevWorkspace ? `${WM_FORK_PREFIX}${id}` : id
 		let exists =
 			id != '' && (await WorkspaceService.existsWorkspace({ requestBody: { id: effectiveId } }))
-		forkIdTaken = isFork && exists
+		// The "delete existing fork to reclaim the id" affordance is only for prefixed forks.
+		forkIdTaken = isFork && !createAsDevWorkspace && exists
 		if (exists) {
-			errorId = isFork
+			errorId = forkIdTaken
 				? `A workspace with id '${effectiveId}' already exists. It may be an archived fork: archiving keeps the id reserved.`
 				: 'ID already exists'
 		} else if (id != '' && !/^\w+(-\w+)*$/.test(id)) {
 			errorId = 'ID can only contain letters, numbers and dashes and must not finish by a dash'
+		} else if (effectiveId.length > 50) {
+			// `wm-fork-` prefix included: matches the backend's 50-char (git-branch / DB) limit.
+			errorId = `ID '${effectiveId}' is too long (${effectiveId.length} chars). Maximum is 50.`
 		} else {
 			errorId = ''
 		}
@@ -90,6 +185,9 @@
 
 	const WM_FORK_PREFIX = 'wm-fork-'
 
+	// A dev workspace keeps its bare id; an ordinary fork is prefixed with `wm-fork-`.
+	const effectiveForkId = $derived(createAsDevWorkspace ? id : `${WM_FORK_PREFIX}${id}`)
+
 	let forkIdTaken = $state(false)
 	let deleteExistingForkOpen = $state(false)
 	let deletingExistingFork = $state(false)
@@ -100,6 +198,14 @@
 		deletingExistingFork = true
 		try {
 			await WorkspaceService.deleteWorkspace({ workspace: prefixedId })
+			// Drop local sessions bound to this id so they don't resurface (or
+			// auto-unarchive) against a new fork recreated under the same id.
+			// Fire-and-forget: neither a slow nor a failing IndexedDB op should
+			// block the delete/reuse flow (cleanup completes long before the UI
+			// could create a session in a recreated fork).
+			void deleteSessionsForWorkspace(prefixedId).catch((e) =>
+				console.error(`Session cleanup for reused fork id ${prefixedId} failed`, e)
+			)
 			sendUserToast(`Permanently deleted workspace ${prefixedId}`)
 			deleteExistingForkOpen = false
 			await validateName(id)
@@ -120,7 +226,7 @@
 		for (const job of jobs) {
 			let j = await JobService.getCompletedJob({
 				id: job,
-				workspace: $workspaceStore!
+				workspace: baseWorkspaceId!
 			})
 			ret.push(j)
 		}
@@ -148,16 +254,15 @@
 	}
 
 	async function createOrForkWorkspace() {
-		const prefixed_id = `${WM_FORK_PREFIX}${id}`
 		if (isFork) {
-			await forkWorkspace(prefixed_id)
+			await forkWorkspace(effectiveForkId)
 		} else {
 			await createWorkspace()
 		}
 	}
 
 	async function forkWorkspace(prefixed_id: string): Promise<void> {
-		if ($workspaceStore) {
+		if (baseWorkspaceId) {
 			forkCreationLoading = true
 			errorMsgs = []
 			failedSyncJobs = []
@@ -179,20 +284,38 @@
 	}
 
 	async function completeFork(prefixed_id: string): Promise<void> {
-		let gitSyncJobIds = await WorkspaceService.createWorkspaceForkGitBranch({
-			workspace: $workspaceStore!,
-			requestBody: {
-				id: prefixed_id,
-				name,
-				color: colorEnabled && workspaceColor ? workspaceColor : undefined
-			}
-		})
+		let gitSyncJobIds: string[]
+		try {
+			gitSyncJobIds = await WorkspaceService.createWorkspaceForkGitBranch({
+				workspace: baseWorkspaceId!,
+				requestBody: {
+					id: prefixed_id,
+					name,
+					color: colorEnabled && workspaceColor ? workspaceColor : undefined,
+					is_dev_workspace: createAsDevWorkspace,
+					dev_workspace_label: createAsDevWorkspace ? devWorkspaceLabel : undefined,
+					// Send the lock intent in this first phase too so the backend can reject a non-admin's
+					// locked-dev request before any branch is created (avoids dangling branches).
+					lock_prod_deploy: createAsDevWorkspace && lockProdDeploy,
+					lock_prod_forking: createAsDevWorkspace && lockProdForking,
+					copy_members: copyMembers
+				}
+			})
+		} catch (e) {
+			// The backend can reject here (fork cap, depth limit, premium, non-admin lock). Reset the
+			// loading state and surface the error rather than leaving the button spinning.
+			forkCreationError = `Failed to create fork '${prefixed_id}'`
+			errorMsgs.push(e?.body ?? e ?? 'Unknown error')
+			forkCreationLoading = false
+			sendUserToast(`Could not create fork '${prefixed_id}' ${e?.body ?? e}`, true)
+			return
+		}
 
 		try {
 			await Promise.all(
 				gitSyncJobIds.map((jobId) =>
 					jobManager.runWithProgress(() => Promise.resolve(jobId), {
-						workspace: $workspaceStore!,
+						workspace: baseWorkspaceId!,
 						timeout: 60000,
 						timeoutMessage: `Deploy fork job timed out after 60s`,
 						onProgress: (status) => {
@@ -207,7 +330,7 @@
 		} catch (error) {
 			forkCreationLoading = false
 			sendUserToast(
-				`Could not fork workspace ${$workspaceStore} because branch creation failed: ${errorMsgs} - ${error}`,
+				`Could not fork workspace ${baseWorkspaceId} because branch creation failed: ${errorMsgs} - ${error}`,
 				true
 			)
 			return
@@ -216,7 +339,7 @@
 			forkCreationError = 'Failed to create a branch for this fork on the git sync repo(s)'
 			forkCreationLoading = false
 			sendUserToast(
-				`Could not fork workspace ${$workspaceStore} because branch creation failed: ${errorMsgs}`,
+				`Could not fork workspace ${baseWorkspaceId} because branch creation failed: ${errorMsgs}`,
 				true
 			)
 			return
@@ -232,12 +355,18 @@
 
 		try {
 			await WorkspaceService.createWorkspaceFork({
-				workspace: $workspaceStore!,
+				workspace: baseWorkspaceId!,
 				requestBody: {
 					id: prefixed_id,
 					name,
 					color: colorEnabled && workspaceColor ? workspaceColor : undefined,
-					forked_datatables: forkedDatatables
+					forked_datatables: forkedDatatables,
+					shared_ducklakes: forkDucklakeSection?.getSharedDucklakes() ?? [],
+					is_dev_workspace: createAsDevWorkspace,
+					dev_workspace_label: createAsDevWorkspace ? devWorkspaceLabel : undefined,
+					lock_prod_deploy: createAsDevWorkspace && lockProdDeploy,
+					lock_prod_forking: createAsDevWorkspace && lockProdForking,
+					copy_members: copyMembers
 				}
 			})
 		} catch (e) {
@@ -249,7 +378,11 @@
 		}
 
 		forkCreationLoading = false
-		sendUserToast(`Successfully forked workspace ${$workspaceStore} as: wm-fork-${id}`)
+		sendUserToast(
+			createAsDevWorkspace
+				? `Created ${devWorkspaceLabel === 'staging' ? 'staging' : 'dev'} workspace ${effectiveForkId} for ${baseWorkspaceId}`
+				: `Successfully forked workspace ${baseWorkspaceId} as: wm-fork-${id}`
+		)
 
 		usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
 		switchWorkspace(prefixed_id)
@@ -388,7 +521,27 @@
 	let autoAdd = $state(true)
 	let selected: Exclude<AIProvider, 'customai'> = $state('openai')
 	run(() => {
-		id = name.toLowerCase().replace(/\s/gi, '-')
+		if (isFork) {
+			// Forks have no separate display name — the unique id is the name.
+			name = id
+		} else {
+			id = name.toLowerCase().replace(/\s/gi, '-')
+		}
+	})
+	// When creating a dev workspace, prefill the fork name with `<root>-dev` / `<root>-stg` (the effect
+	// above slugifies it into the id). Only fill an empty field or one still holding a prior suggestion,
+	// so a user-typed name is never overwritten; flipping Dev<->Staging updates the suffix, and turning
+	// the dev toggle back off clears the suggestion.
+	let lastAutoDevName = $state<string | undefined>(undefined)
+	$effect(() => {
+		const target =
+			createAsDevWorkspace && $workspaceStore
+				? `${$workspaceStore}-${devWorkspaceLabel === 'staging' ? 'stg' : 'dev'}`
+				: ''
+		if (name === '' || name === lastAutoDevName) {
+			name = target
+			lastAutoDevName = target === '' ? undefined : target
+		}
 	})
 	run(() => {
 		validateName(id)
@@ -402,9 +555,16 @@
 	let domain = $derived($usersWorkspaceStore?.email.split('@')[1])
 </script>
 
-<div class="flex flex-col flex-1">
-	<div class="flex-1 relative min-h-[32rem]">
-		<div class="flex flex-col gap-8 absolute inset-0 overflow-y-auto">
+<div class="flex flex-col flex-1 min-h-0">
+	<!-- Standalone page: fixed 32rem scroll area (absolute inset). In the modal the
+	     form flows naturally so the adaptive modal hugs the content, scrolling only
+	     when capped by the viewport. -->
+	<div class={inModal ? 'flex-1 min-h-0 overflow-y-auto' : 'flex-1 relative min-h-[32rem]'}>
+		<div
+			class={inModal
+				? 'flex flex-col gap-8'
+				: 'flex flex-col gap-8 absolute inset-0 overflow-y-auto'}
+		>
 			{#if errorMsgs.length != 0}
 				<Alert class="p-2" title={forkCreationError} type="error">
 					<ul class="pl-2 pr-4 break-words pb-5">
@@ -424,7 +584,7 @@
 										<a
 											target="_blank"
 											class="underline"
-											href={`/run/${job.id}?workspace=${$workspaceStore}`}
+											href={`/run/${job.id}?workspace=${baseWorkspaceId}`}
 										>
 											{job.id}
 										</a>
@@ -449,7 +609,7 @@
 										<a
 											target="_blank"
 											class="underline"
-											href={`/run/${jobId}?workspace=${$workspaceStore}`}
+											href={`/run/${jobId}?workspace=${baseWorkspaceId}`}
 										>
 											{jobId}
 										</a>
@@ -460,34 +620,32 @@
 					{/if}
 				</Alert>
 			{/if}
-			<label class="flex flex-col gap-1">
-				{#if isFork}
-					<span class="text-xs font-semibold text-emphasis">Fork name</span>
-					<span class="text-xs text-secondary">Displayable name of the forked workspace</span>
-				{:else}
+			{#if !isFork}
+				<label class="flex flex-col gap-1">
 					<span class="text-xs font-semibold text-emphasis">Workspace name</span>
 					<span class="text-xs text-secondary">Displayable name</span>
-				{/if}
-				<!-- svelte-ignore a11y_autofocus -->
-				<TextInput inputProps={{ autofocus: true }} bind:value={name} />
-			</label>
+					<!-- svelte-ignore a11y_autofocus -->
+					<TextInput inputProps={{ autofocus: true }} bind:value={name} />
+				</label>
+			{/if}
 			<label class="flex flex-col gap-1">
-				<span class="text-xs font-semibold text-emphasis">Workspace ID</span>
 				{#if isFork}
+					<span class="text-xs font-semibold text-emphasis">Fork ID</span>
 					<span class="text-xs text-secondary"
-						>Slug to uniquely identify your fork (this will also set the branch name)</span
+						>Unique name of your fork (this will also set the branch name)</span
 					>
 				{:else}
+					<span class="text-xs font-semibold text-emphasis">Workspace ID</span>
 					<span class="text-xs text-secondary">Slug to uniquely identify your workspace</span>
 				{/if}
 
-				{#if isFork}
+				{#if isFork && !createAsDevWorkspace}
 					<PrefixedInput
 						prefix={WM_FORK_PREFIX}
-						type="text"
 						bind:value={id}
-						placeholder="example.com"
-						class={errorId != '' ? 'input-error' : ''}
+						placeholder="my-fork"
+						autofocus
+						error={errorId != ''}
 					/>
 				{:else}
 					<TextInput bind:value={id} error={errorId} />
@@ -512,7 +670,10 @@
 					{/if}
 				{/if}
 			</label>
-			<Label label="Workspace color">
+			<Label label={isFork ? 'Fork color' : 'Workspace color'}>
+				{#snippet header()}
+					<span class="text-2xs text-secondary">(optional)</span>
+				{/snippet}
 				<span class="text-xs text-secondary">
 					Color to identify the current workspace in the list of workspaces
 				</span>
@@ -541,17 +702,118 @@
 						</div>
 					{/if}
 				</div>
+				{#if isFork && colorEnabled}
+					<div class="flex flex-col gap-1 pt-2">
+						<div class="flex flex-row items-center gap-1">
+							<span class="text-2xs text-secondary">Fork picker preview</span>
+							<!-- Toggles the real app theme: a preview-local .dark scope can't
+							     re-theme the modal (theme vars are bound to html.dark), and the
+							     actual theme is what the chip must be judged against anyway. -->
+							<DarkModeToggle forcedDarkMode={false} />
+						</div>
+						<div class="w-64">
+							<WorkspaceScopeTrigger
+								workspaceId={baseWorkspaceId}
+								pendingFork={{
+									id: effectiveForkId,
+									name: id || 'my-fork',
+									parent_workspace_id: baseWorkspaceId ?? ''
+								}}
+								color={workspaceColor}
+								showChevron={false}
+								wrap
+								class="w-full pointer-events-none"
+							/>
+						</div>
+					</div>
+				{/if}
 			</Label>
+			{#if isFork && canDesignateDevWorkspace}
+				<Label label="Persistent dev workspace">
+					<span class="text-xs text-secondary">
+						Create a standing dev workspace (no <code>wm-fork-</code> prefix) paired with this workspace,
+						instead of a throwaway fork.
+					</span>
+					<div class="flex flex-col gap-2 pt-1">
+						<Toggle bind:checked={createAsDevWorkspace} options={{ right: 'Dev workspace' }} />
+						{#if createAsDevWorkspace}
+							<div class="text-2xs text-secondary">
+								Cosmetic label: <Badge color="indigo" small>{devBadgeText(devWorkspaceLabel)}</Badge
+								>
+								<button
+									type="button"
+									class="text-secondary hover:text-primary hover:underline"
+									onclick={() =>
+										(devWorkspaceLabel = devWorkspaceLabel === 'staging' ? 'dev' : 'staging')}
+								>
+									Change to {devWorkspaceLabel === 'staging' ? 'dev' : 'staging'}
+								</button>
+							</div>
+							<div class="flex flex-col gap-2 rounded-md border bg-surface-secondary p-3">
+								<div class="flex flex-col gap-0.5">
+									<span class="text-xs font-semibold text-emphasis"
+										>Protect {currentWorkspaceName}</span
+									>
+									<span class="text-2xs text-secondary">
+										Adds protection rules to this (root) workspace so changes are made in the new
+										dev workspace and promoted here.
+									</span>
+								</div>
+								<Toggle
+									bind:checked={lockProdDeploy}
+									options={{ right: 'Block direct edits (deploy via the dev workspace)' }}
+								/>
+								<Toggle bind:checked={lockProdForking} options={{ right: 'Prevent forking' }} />
+							</div>
+						{/if}
+					</div>
+				</Label>
+			{/if}
+			{#if isFork && createAsDevWorkspace}
+				<Label label="Members">
+					<span class="text-xs text-secondary">
+						Copy this workspace's members (and their group memberships) into the dev workspace so
+						the team can work in it.
+					</span>
+					<div class="pt-1">
+						<Toggle bind:checked={copyMembers} options={{ right: 'Copy members' }} />
+					</div>
+				</Label>
+			{/if}
+			{#if isFork}
+				<label class="flex flex-col gap-1">
+					<div class="flex flex-row gap-2 items-baseline">
+						<span class="text-xs font-semibold text-emphasis">Base workspace</span>
+						<span class="text-2xs text-secondary">(optional)</span>
+					</div>
+					<span class="text-xs text-secondary">
+						{#if createAsDevWorkspace}
+							A dev workspace is always based on the root workspace.
+						{:else}
+							Workspace to fork from. Defaults to the root; pick an existing fork to create a fork
+							of a fork (the new branch is based on the selected workspace's branch).
+						{/if}
+					</span>
+					<Select
+						items={baseItems}
+						bind:value={baseWorkspaceId}
+						placeholder="Select a base workspace"
+						disabled={createAsDevWorkspace}
+					/>
+				</label>
+			{/if}
 			{#if isFork}
 				<ForkDatatableSection
 					bind:this={forkDatatableSection}
+					sourceWorkspace={baseWorkspaceId}
 					onAllDone={() => {
-						completeFork(`${WM_FORK_PREFIX}${id}`)
+						completeFork(effectiveForkId)
 					}}
 					onCanceled={() => {
 						forkCreationLoading = false
 					}}
 				/>
+				<ForkDucklakeSection bind:this={forkDucklakeSection} sourceWorkspace={baseWorkspaceId} />
 			{/if}
 			{#if !automateUsernameCreation}
 				<Label label="Your username in that workspace">
@@ -678,10 +940,15 @@
 			{/if}
 		</div>
 	</div>
-	<div class="flex flex-wrap flex-row justify-between gap-4 pt-4">
-		<Button disabled={forkCreationLoading} variant="default" size="sm" href="{base}/user/workspaces"
-			>&leftarrow; Back to workspaces</Button
-		>
+	<div class="flex flex-wrap flex-row {inModal ? 'justify-end' : 'justify-between'} gap-4 pt-4">
+		{#if !inModal}
+			<Button
+				disabled={forkCreationLoading}
+				variant="default"
+				size="sm"
+				href="{base}/user/workspaces">&leftarrow; Back to workspaces</Button
+			>
+		{/if}
 		{#if !forkCreationLoading}
 			<Button
 				variant="accent"
diff --git a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
index eab008fef6..156d11ce95 100644
--- a/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CustomInstanceDbWizardModal.svelte
@@ -146,7 +146,7 @@
 									title: 'Database name is valid',
 									status: status?.logs.valid_dbname,
 									description:
-										'The database name must be alphanumeric (underscores allowed) and cannot be named the same as the Windmill database (usually "windmill")'
+										'The database name must be alphanumeric (underscores and hyphens allowed) and cannot be named the same as the Windmill database (usually "windmill")'
 								},
 								{
 									title:
diff --git a/frontend/src/lib/components/workspaceSettings/DataTableMigrationsButton.svelte b/frontend/src/lib/components/workspaceSettings/DataTableMigrationsButton.svelte
new file mode 100644
index 0000000000..307c3eecd7
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/DataTableMigrationsButton.svelte
@@ -0,0 +1,596 @@
+<script lang="ts">
+	import { Button } from '../common'
+	import Modal2 from '../common/modal/Modal2.svelte'
+	import Tabs from '../common/tabs/Tabs.svelte'
+	import Tab from '../common/tabs/Tab.svelte'
+	import TabContent from '../common/tabs/TabContent.svelte'
+	import SimpleEditor from '../SimpleEditor.svelte'
+	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
+	import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte'
+	import {
+		ChevronDown,
+		Play,
+		Trash2,
+		Plus,
+		Undo2,
+		Loader2,
+		Camera,
+		Settings,
+		Power,
+		PowerOff
+	} from 'lucide-svelte'
+	import { WorkspaceService, type DatatableMigrationWithStatus } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+	import NewDataTableMigrationModal from './NewDataTableMigrationModal.svelte'
+	import Tooltip from '../Tooltip.svelte'
+	import Portal from '$lib/components/Portal.svelte'
+	import DropdownV2 from '../DropdownV2.svelte'
+	import { superadmin, userStore } from '$lib/stores'
+
+	let {
+		workspace,
+		datatable,
+		disabled = false,
+		hideTrigger = false,
+		onSchemaChanged
+	}: {
+		workspace: string
+		datatable: string
+		disabled?: boolean
+		/** Mount the modals without the "Migrations" trigger button, so a caller can
+		 * drive them programmatically via `openMigration` (e.g. the DDL guard). */
+		hideTrigger?: boolean
+		/** Called after a migration run/revert actually changes the data table
+		 * schema, so an open viewer (e.g. the database manager) can refresh. */
+		onSchemaChanged?: () => void
+	} = $props()
+
+	let listOpen = $state(false)
+	let migrations = $state<DatatableMigrationWithStatus[]>([])
+	let enabled = $state(true)
+	let loadError = $state<string | undefined>(undefined)
+	let loading = $state(false)
+	let busy = $state(false)
+
+	// Only workspace admins and super admins can opt a data table in or out.
+	const canManage = $derived(!!$userStore?.is_admin || !!$superadmin)
+
+	let newMigrationModal = $state<NewDataTableMigrationModal | undefined>(undefined)
+	let newMigrationOpen = $state(false)
+
+	let viewOpen = $state(false)
+	let viewMigration = $state<DatatableMigrationWithStatus | undefined>(undefined)
+	let viewTab = $state('up')
+	let settingsDropdownOpen = $state(false)
+
+	let deleteOpen = $state(false)
+	let deleteTarget = $state<DatatableMigrationWithStatus | undefined>(undefined)
+
+	function openView(m: DatatableMigrationWithStatus) {
+		viewMigration = m
+		viewTab = 'up'
+		viewOpen = true
+	}
+
+	const confirmationModal = createAsyncConfirmationModal()
+
+	const hasPending = $derived(migrations.some((m) => m.status !== 'ran'))
+
+	async function loadMigrations() {
+		// Only show the full-list spinner on the initial load. Refreshes after an
+		// action (run/revert/delete) update the keyed list in place to avoid a
+		// flicker, with the buttons already gated by `busy`.
+		if (migrations.length === 0) {
+			loading = true
+		}
+		try {
+			const res = await WorkspaceService.getDatatableMigrationsStatus({
+				workspace,
+				datatableName: datatable
+			})
+			enabled = res.enabled
+			migrations = res.migrations
+			loadError = res.error
+		} catch (e: any) {
+			sendUserToast(`Failed to load migrations: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			loading = false
+		}
+	}
+
+	function openList() {
+		listOpen = true
+		loadMigrations()
+	}
+
+	// Open the list modal and the detail view for a specific migration. Used to
+	// jump to a just-created migration from the "See migration" toast action.
+	export async function openMigration(timestamp: number) {
+		listOpen = true
+		await loadMigrations()
+		const m = migrations.find((x) => x.timestamp === timestamp)
+		if (m) openView(m)
+	}
+
+	async function runUpTo(upTo: number | undefined) {
+		busy = true
+		try {
+			const res = await WorkspaceService.runDatatableMigrations({
+				workspace,
+				datatableName: datatable,
+				upTo
+			})
+			sendUserToast(
+				res.applied.length > 0
+					? `Applied ${res.applied.length} migration(s)`
+					: 'No pending migrations to run'
+			)
+			await loadMigrations()
+			if (res.applied.length > 0) onSchemaChanged?.()
+		} catch (e: any) {
+			sendUserToast(`Failed to run migrations: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	async function runOnly(version: number) {
+		busy = true
+		try {
+			const res = await WorkspaceService.runDatatableMigrations({
+				workspace,
+				datatableName: datatable,
+				only: version
+			})
+			sendUserToast(
+				res.applied.length > 0 ? `Applied ${res.applied[0].name}` : 'Migration already applied'
+			)
+			await loadMigrations()
+			if (res.applied.length > 0) onSchemaChanged?.()
+		} catch (e: any) {
+			sendUserToast(`Failed to run migration: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	// Run a single migration. Warn first if earlier migrations haven't run, since
+	// this one might depend on them.
+	async function runMigration(m: DatatableMigrationWithStatus) {
+		const earlierPending = migrations.filter(
+			(x) => x.timestamp < m.timestamp && x.status !== 'ran'
+		).length
+		if (earlierPending > 0) {
+			const confirmed = await confirmationModal.ask({
+				title: 'Run migration out of order',
+				confirmationText: 'Run anyway',
+				children: `${earlierPending} earlier migration(s) have not been run yet. "${m.name}" might depend on them. Run it anyway?`
+			})
+			if (!confirmed) return
+		}
+		await runOnly(m.timestamp)
+	}
+
+	async function revertOnly(version: number) {
+		busy = true
+		try {
+			const res = await WorkspaceService.rollbackDatatableMigrations({
+				workspace,
+				datatableName: datatable,
+				only: version
+			})
+			sendUserToast(
+				res.rolled_back.length > 0
+					? `Reverted ${res.rolled_back[0].name}`
+					: 'Migration was not applied'
+			)
+			await loadMigrations()
+			if (res.rolled_back.length > 0) onSchemaChanged?.()
+		} catch (e: any) {
+			sendUserToast(`Failed to revert migration: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	// Revert a single migration. Warn first if later migrations have run, since
+	// they might depend on this one.
+	async function revertMigration(m: DatatableMigrationWithStatus) {
+		const laterApplied = migrations.filter(
+			(x) => x.timestamp > m.timestamp && x.status === 'ran'
+		).length
+		if (laterApplied > 0) {
+			const confirmed = await confirmationModal.ask({
+				title: 'Revert migration out of order',
+				confirmationText: 'Revert anyway',
+				children: `${laterApplied} later migration(s) have already been run and might depend on "${m.name}". Reverting it may break them. Revert anyway?`
+			})
+			if (!confirmed) return
+		}
+		await revertOnly(m.timestamp)
+	}
+
+	async function generateInitial() {
+		const confirmed = await confirmationModal.ask({
+			title: 'Generate initial migration',
+			confirmationText: 'Generate',
+			children: `This snapshots the current schema of "${datatable}" with pg_dump as an "initial" migration and marks it as already applied, so it is never re-run on this data table. It has no down migration. Use this to start tracking migrations on an existing data table.`
+		})
+		if (!confirmed) return
+		busy = true
+		try {
+			await WorkspaceService.generateInitialDatatableMigration({
+				workspace,
+				datatableName: datatable
+			})
+			sendUserToast('Initial migration generated')
+			await loadMigrations()
+		} catch (e: any) {
+			sendUserToast(`Failed to generate initial migration: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	async function enableMigrations() {
+		busy = true
+		try {
+			await WorkspaceService.enableDatatableMigrations({ workspace, datatableName: datatable })
+			sendUserToast('Migrations enabled')
+			await loadMigrations()
+		} catch (e: any) {
+			sendUserToast(`Failed to enable migrations: ${e?.body ?? e?.message ?? e}`, true)
+			return
+		} finally {
+			busy = false
+		}
+		// Right after enabling, offer to snapshot the current schema as the initial migration.
+		await generateInitial()
+	}
+
+	async function disableMigrations() {
+		const confirmed = await confirmationModal.ask({
+			title: 'Disable migrations',
+			confirmationText: 'Disable and delete',
+			children: `Disabling migrations for "${datatable}" will delete ALL of its migrations. This cannot be undone. The data table's data and schema are not affected. Continue?`
+		})
+		if (!confirmed) return
+		busy = true
+		try {
+			await WorkspaceService.disableDatatableMigrations({ workspace, datatableName: datatable })
+			sendUserToast('Migrations disabled')
+			await loadMigrations()
+		} catch (e: any) {
+			sendUserToast(`Failed to disable migrations: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	// Delete a migration's definition. Does not touch the data table's schema or
+	// its `_wm_migrations` bookkeeping.
+	async function performDelete(m: DatatableMigrationWithStatus) {
+		busy = true
+		try {
+			await WorkspaceService.deleteDatatableMigration({
+				workspace,
+				datatableName: datatable,
+				timestamp: m.timestamp
+			})
+			await loadMigrations()
+		} catch (e: any) {
+			sendUserToast(`Failed to delete migration: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			busy = false
+		}
+	}
+
+	// Revert an installed migration (run its down) then delete its definition.
+	// The delete is skipped if the revert fails, so we never drop the definition
+	// of a migration that is still installed on the data table.
+	async function revertAndDelete(m: DatatableMigrationWithStatus) {
+		busy = true
+		try {
+			await WorkspaceService.rollbackDatatableMigrations({
+				workspace,
+				datatableName: datatable,
+				only: m.timestamp
+			})
+			await WorkspaceService.deleteDatatableMigration({
+				workspace,
+				datatableName: datatable,
+				timestamp: m.timestamp
+			})
+			await loadMigrations()
+			onSchemaChanged?.()
+			sendUserToast(`Reverted and deleted "${m.name}"`)
+		} catch (e: any) {
+			sendUserToast(`Failed to revert and delete migration: ${e?.body ?? e?.message ?? e}`, true)
+			await loadMigrations()
+		} finally {
+			busy = false
+		}
+	}
+
+	async function deleteMigration(m: DatatableMigrationWithStatus) {
+		// An installed migration can be reverted first, so offer that as a third
+		// choice instead of a plain confirm.
+		if (m.status === 'ran') {
+			deleteTarget = m
+			deleteOpen = true
+			return
+		}
+		const body =
+			m.status === 'unknown'
+				? `The applied status of "${m.name}" is unknown. If it is installed on the data table, deleting it may leave the data table in a broken state. Delete anyway?`
+				: `Delete the definition of "${m.name}"? It has not been run, so this only removes the migration definition.`
+		const confirmed = await confirmationModal.ask({
+			title: 'Delete migration',
+			confirmationText: 'Delete',
+			children: body
+		})
+		if (!confirmed) return
+		await performDelete(m)
+	}
+
+	const statusColor = {
+		ran: 'bg-green-500',
+		not_run: 'bg-orange-500',
+		unknown: 'bg-gray-400'
+	}
+	const statusTitle = {
+		ran: 'Already ran',
+		not_run: 'Not run',
+		unknown: 'Status unknown'
+	}
+</script>
+
+{#if !hideTrigger}
+	<Button
+		variant="default"
+		size="sm"
+		{disabled}
+		endIcon={{ icon: ChevronDown }}
+		on:click={openList}
+	>
+		Migrations
+	</Button>
+{/if}
+
+<Modal2
+	bind:isOpen={listOpen}
+	title="Migrations — {datatable}"
+	fixedWidth="md"
+	fixedHeight="lg"
+	closeOnOutsideClick={!newMigrationOpen &&
+		!viewOpen &&
+		!deleteOpen &&
+		!confirmationModal.props.open &&
+		!settingsDropdownOpen}
+>
+	{#snippet headerLeft()}
+		<Tooltip>
+			Each schema edit made in the database manager is captured here as a migration. Tracking schema
+			changes as migrations makes it easy to export data tables to other workspaces, and to
+			reproduce their schema when forking a workspace.
+		</Tooltip>
+	{/snippet}
+	{#snippet headerRight()}
+		{#if enabled && canManage}
+			<DropdownV2
+				bind:open={settingsDropdownOpen}
+				items={[
+					{
+						displayName: 'Disable migrations',
+						icon: PowerOff,
+						type: 'delete',
+						action: () => disableMigrations()
+					}
+				]}
+			>
+				{#snippet buttonReplacement()}
+					<Button
+						variant="subtle"
+						size="xs"
+						iconOnly
+						startIcon={{ icon: Settings }}
+						title="Migration settings"
+						disabled={busy}
+					/>
+				{/snippet}
+			</DropdownV2>
+		{/if}
+	{/snippet}
+	<div class="flex flex-col gap-2 w-full grow min-h-0">
+		{#if loading}
+			<div class="flex items-center justify-center grow text-tertiary">
+				<Loader2 size={18} class="animate-spin" />
+			</div>
+		{:else if !enabled}
+			<div class="flex flex-col items-center justify-center gap-3 grow text-sm text-tertiary">
+				<span>Migrations are disabled for this data table.</span>
+				{#if canManage}
+					<Button
+						variant="subtle"
+						size="sm"
+						startIcon={{ icon: Power }}
+						disabled={busy}
+						on:click={enableMigrations}
+					>
+						Enable migrations
+					</Button>
+				{/if}
+			</div>
+		{:else}
+			{#if loadError}
+				<div class="text-xs text-red-500">
+					Could not read applied status from the data table: {loadError}
+				</div>
+			{/if}
+			<div class="flex flex-col grow min-h-0 overflow-auto border rounded-md divide-y">
+				{#if migrations.length === 0}
+					<div class="flex flex-col items-center gap-3 p-6 text-sm text-tertiary">
+						<span>No migrations yet</span>
+						<Button
+							variant="subtle"
+							size="xs"
+							startIcon={{ icon: Camera }}
+							disabled={busy}
+							on:click={generateInitial}
+						>
+							Generate initial migration
+						</Button>
+					</div>
+				{:else}
+					{#each migrations as m (m.timestamp)}
+						<div class="flex items-center gap-3 px-3 py-2">
+							<div
+								class="shrink-0 w-2.5 h-2.5 rounded-full {statusColor[m.status]}"
+								title={statusTitle[m.status]}
+							></div>
+							<button
+								type="button"
+								class="flex flex-col min-w-0 grow text-left rounded -mx-1 px-1 py-0.5 hover:bg-surface-hover"
+								title="View migration"
+								onclick={() => openView(m)}
+							>
+								<span class="text-sm text-primary truncate">{m.name}</span>
+								<span class="text-xs text-hint">{m.timestamp}</span>
+							</button>
+							<Button
+								variant="subtle"
+								size="xs"
+								iconOnly
+								startIcon={{ icon: Play }}
+								title="Run this migration"
+								disabled={busy || m.status === 'ran'}
+								on:click={() => runMigration(m)}
+							/>
+							<Button
+								variant="subtle"
+								size="xs"
+								iconOnly
+								startIcon={{ icon: Undo2 }}
+								title="Revert this migration"
+								disabled={busy || m.status !== 'ran'}
+								on:click={() => revertMigration(m)}
+							/>
+							<Button
+								variant="subtle"
+								size="xs"
+								iconOnly
+								color="red"
+								startIcon={{ icon: Trash2 }}
+								title="Delete migration"
+								disabled={busy}
+								on:click={() => deleteMigration(m)}
+							/>
+						</div>
+					{/each}
+				{/if}
+			</div>
+			<div class="flex justify-between gap-2 pt-2">
+				<Button
+					variant="default"
+					size="sm"
+					startIcon={{ icon: Plus }}
+					on:click={() => {
+						newMigrationOpen = true
+						newMigrationModal?.open()
+					}}>New</Button
+				>
+				<Button
+					variant="accent"
+					size="sm"
+					startIcon={{ icon: Play }}
+					disabled={busy || !hasPending}
+					on:click={() => runUpTo(undefined)}
+				>
+					Run all
+				</Button>
+			</div>
+		{/if}
+	</div>
+</Modal2>
+
+<NewDataTableMigrationModal
+	bind:this={newMigrationModal}
+	{workspace}
+	{datatable}
+	onCreated={loadMigrations}
+	onClose={() => (newMigrationOpen = false)}
+	onSeeMigration={(m) => openMigration(m.timestamp)}
+/>
+
+<Modal2
+	bind:isOpen={viewOpen}
+	title="Migration — {viewMigration?.name ?? ''}"
+	fixedWidth="md"
+	fixedHeight="lg"
+>
+	{#if viewMigration}
+		<div class="flex flex-col gap-3 w-full grow min-h-0">
+			<span class="text-xs text-hint">{viewMigration.timestamp}</span>
+			<Tabs bind:selected={viewTab} class="grow min-h-0">
+				<Tab value="up" label="Up" />
+				<Tab value="down" label="Down" />
+				{#snippet content()}
+					<TabContent value="up" class="h-80 border rounded-md overflow-hidden">
+						<SimpleEditor class="h-full" lang="sql" code={viewMigration?.code_up ?? ''} readOnly />
+					</TabContent>
+					<TabContent value="down" class="h-80 border rounded-md overflow-hidden">
+						{#if viewMigration?.code_down}
+							<SimpleEditor class="h-full" lang="sql" code={viewMigration.code_down} readOnly />
+						{:else}
+							<div class="p-6 text-center text-sm text-tertiary">No down migration</div>
+						{/if}
+					</TabContent>
+				{/snippet}
+			</Tabs>
+		</div>
+	{/if}
+</Modal2>
+
+<Modal2 bind:isOpen={deleteOpen} title="Delete migration" fixedWidth="sm" fixedHeight="adaptive">
+	<div class="flex flex-col gap-3 w-full">
+		<p class="text-sm text-secondary">
+			"{deleteTarget?.name}" is installed on the data table. Revert it first to undo its schema
+			change, or delete only the definition and leave the schema as-is — deleting without reverting
+			means it can no longer be reverted.
+		</p>
+		<div class="flex justify-end gap-2 pt-2">
+			<Button variant="default" size="sm" disabled={busy} on:click={() => (deleteOpen = false)}>
+				Cancel
+			</Button>
+			<Button
+				variant="default"
+				color="red"
+				size="sm"
+				disabled={busy}
+				on:click={() => {
+					const m = deleteTarget
+					deleteOpen = false
+					if (m) performDelete(m)
+				}}
+			>
+				Delete
+			</Button>
+			<Button
+				variant="accent"
+				size="sm"
+				disabled={busy}
+				on:click={() => {
+					const m = deleteTarget
+					deleteOpen = false
+					if (m) revertAndDelete(m)
+				}}
+			>
+				Revert and delete
+			</Button>
+		</div>
+	</div>
+</Modal2>
+
+<Portal>
+	<ConfirmationModal {...confirmationModal.props} />
+</Portal>
diff --git a/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte b/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
index 60794c6923..f652ed8704 100644
--- a/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/DataTableSettings.svelte
@@ -1,6 +1,12 @@
 <script lang="ts" module>
+	import { randomUUID } from '$lib/utils/uuid'
+
 	export type DataTableSettingsType = {
 		dataTables: {
+			// Stable client-side id so the UI can track renames (A -> B) across a
+			// save rather than seeing them as a delete + add. Never sent to the
+			// backend config.
+			id: string
 			name: string
 			database: {
 				resource_type: 'postgresql' | 'instance'
@@ -16,6 +22,7 @@
 		if (settings?.datatables) {
 			for (const [name, rest] of Object.entries(settings.datatables)) {
 				s.dataTables.push({
+					id: randomUUID(),
 					name,
 					...rest
 				})
@@ -41,8 +48,6 @@
 		}
 		return s
 	}
-
-	let DEFAULT_DATATABLE_DB_NAME = 'datatable_db'
 </script>
 
 <script lang="ts">
@@ -61,7 +66,7 @@
 	import Row from '../table/Row.svelte'
 	import TextInput from '../text_input/TextInput.svelte'
 	import Tooltip from '../Tooltip.svelte'
-	import { isCustomInstanceDbEnabled } from './utils.svelte'
+	import { isCustomInstanceDbEnabled, getUnusedInstanceDbName } from './utils.svelte'
 	import { random_adj } from '../random_positive_adjetive'
 	import { sendUserToast } from '$lib/toast'
 	import { SettingService, WorkspaceService, type GetSettingsResponse } from '$lib/gen'
@@ -72,9 +77,12 @@
 	import CustomInstanceDbSelect from './CustomInstanceDbSelect.svelte'
 	import { Popover } from '../meltComponents'
 	import ExploreAssetButton from '../ExploreAssetButton.svelte'
+	import DataTableMigrationsButton from './DataTableMigrationsButton.svelte'
 	import { deepEqual } from 'fast-equals'
 	import { clone } from '$lib/utils'
 	import SettingsFooter from './SettingsFooter.svelte'
+	import Alert from '../common/alert/Alert.svelte'
+	import { isCloudHosted } from '$lib/cloud'
 
 	type Props = {
 		dataTableSettings: DataTableSettingsType
@@ -97,21 +105,32 @@
 		tempSettings.dataTables.splice(index, 1)
 	}
 
+	const customInstanceDbs = resource([() => $workspaceStore], SettingService.listCustomInstanceDbs)
+
+	function defaultInstanceDbName(): string {
+		const usedNames = [
+			...Object.keys(customInstanceDbs.current ?? {}),
+			...tempSettings.dataTables
+				.filter((d) => d.database.resource_type === 'instance' && d.database.resource_path)
+				.map((d) => d.database.resource_path!)
+		]
+		return getUnusedInstanceDbName('dt', $workspaceStore ?? '', usedNames)
+	}
+
 	function onNewDataTable() {
 		const name = tempSettings.dataTables.some((d) => d.name === 'main')
 			? `${random_adj()}_datatable`
 			: 'main'
 		tempSettings.dataTables.push({
+			id: randomUUID(),
 			name,
 			database: {
 				resource_type: $isCustomInstanceDbEnabled ? 'instance' : 'postgresql',
-				resource_path: $isCustomInstanceDbEnabled ? DEFAULT_DATATABLE_DB_NAME : undefined
+				resource_path: $isCustomInstanceDbEnabled ? defaultInstanceDbName() : undefined
 			}
 		})
 	}
 
-	const customInstanceDbs = resource([() => $workspaceStore], SettingService.listCustomInstanceDbs)
-
 	async function onSave() {
 		try {
 			if (
@@ -130,9 +149,19 @@
 				if (!confirm) return
 			}
 			const settings = convertDataTableSettingsToBackend(tempSettings)
+			// Track renames/deletions by stable id (against the saved baseline) so
+			// the backend can cascade or delete each data table's migrations.
+			const savedById = new Map(dataTableSettings.dataTables.map((d) => [d.id, d.name]))
+			const tempIds = new Set(tempSettings.dataTables.map((d) => d.id))
+			const renames = tempSettings.dataTables
+				.filter((d) => savedById.has(d.id) && savedById.get(d.id) !== d.name)
+				.map((d) => ({ from: savedById.get(d.id)!, to: d.name }))
+			const deleted_datatables = dataTableSettings.dataTables
+				.filter((d) => !tempIds.has(d.id))
+				.map((d) => d.name)
 			await WorkspaceService.editDataTableConfig({
 				workspace: $workspaceStore!,
-				requestBody: { settings }
+				requestBody: { settings, renames, deleted_datatables }
 			})
 			dataTableSettings = clone(tempSettings)
 			sendUserToast('Data table settings saved successfully')
@@ -148,7 +177,7 @@
 		const map: Record<string, boolean> = {}
 		for (let i = 0; i < tempSettings.dataTables.length; i++) {
 			let temp = tempSettings.dataTables[i]
-			let dt = dataTableSettings.dataTables.find((d) => d.name === temp.name)
+			let dt = dataTableSettings.dataTables.find((d) => d.id === temp.id)
 			map[temp.name] = !deepEqual(dt, temp)
 		}
 		return map
@@ -177,6 +206,14 @@
 	link="https://www.windmill.dev/docs/core_concepts/persistent_storage/data_tables"
 />
 
+{#if isCloudHosted()}
+	<Alert type="info" title="Instance database not available on cloud" class="mb-4" size="xs">
+		On Windmill Cloud, data tables cannot use the Windmill instance database. Select
+		<span class="font-semibold">PostgreSQL</span> and provide an external PostgreSQL resource (e.g. Supabase
+		or Neon) instead.
+	</Alert>
+{/if}
+
 <DataTable>
 	<Head>
 		<tr>
@@ -200,7 +237,7 @@
 				</Cell>
 			</Row>
 		{/if}
-		{#each tempSettings.dataTables as dataTable, dataTableIndex}
+		{#each tempSettings.dataTables as dataTable, dataTableIndex (dataTable.id)}
 			<Row>
 				<Cell first class="w-48 relative">
 					<TextInput bind:value={dataTable.name} inputProps={{ placeholder: 'Name', id: 'name' }} />
@@ -219,7 +256,12 @@
 									{
 										value: 'instance',
 										label: 'Instance',
-										subtitle: $isCustomInstanceDbEnabled ? undefined : 'Superadmin only'
+										disabled: isCloudHosted(),
+										subtitle: $isCustomInstanceDbEnabled
+											? undefined
+											: isCloudHosted()
+												? 'Not available on cloud'
+												: 'Superadmin only'
 									}
 								]}
 								bind:value={
@@ -228,7 +270,7 @@
 										dataTable.database = {
 											resource_type,
 											resource_path:
-												resource_type === 'instance' ? DEFAULT_DATATABLE_DB_NAME : undefined
+												resource_type === 'instance' ? defaultInstanceDbName() : undefined
 										}
 									}
 								}
@@ -256,8 +298,13 @@
 					</div>
 				</Cell>
 
-				<Cell class="w-12">
+				<Cell class="whitespace-nowrap">
 					<div class="flex gap-2">
+						<DataTableMigrationsButton
+							workspace={$workspaceStore ?? ''}
+							datatable={dataTable.name}
+							disabled={!!dirtyMap[dataTable.name]}
+						/>
 						{#if dirtyMap[dataTable.name]}
 							<Popover
 								openOnHover
diff --git a/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte b/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte
index 0f02b1667f..a0d29af434 100644
--- a/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/DucklakeSettings.svelte
@@ -1,6 +1,14 @@
 <script module lang="ts">
 	import { _ } from 'ag-grid-community'
 
+	export type DucklakeMaintenanceType = {
+		enabled: boolean
+		schedule?: string
+		retention_days?: number
+		compaction?: boolean
+		orphan_cleanup?: boolean
+	}
+
 	export type DucklakeSettingsType = {
 		ducklakes: {
 			name: string
@@ -13,6 +21,11 @@
 				path: string
 			}
 			extra_args?: string
+			// Fork workspaces only — stamped at fork creation, absent = isolated.
+			// Not editable here, but it MUST round-trip through save or a settings
+			// save in a shared fork would silently flip the lake to isolated.
+			fork_behavior?: 'isolated' | 'shared'
+			maintenance?: DucklakeMaintenanceType
 		}[]
 	}
 
@@ -44,7 +57,9 @@
 			s.ducklakes[ducklake.name] = {
 				catalog: ducklake.catalog,
 				storage: ducklake.storage,
-				extra_args: ducklake.extra_args || undefined
+				extra_args: ducklake.extra_args || undefined,
+				fork_behavior: ducklake.fork_behavior,
+				maintenance: ducklake.maintenance
 			}
 		}
 		return s
@@ -52,7 +67,15 @@
 </script>
 
 <script lang="ts">
-	import { Plus, SettingsIcon } from 'lucide-svelte'
+	import {
+		AlertTriangle,
+		ArrowUpRight,
+		ExternalLink,
+		GitFork,
+		Plus,
+		SettingsIcon,
+		Wrench
+	} from 'lucide-svelte'
 
 	import Button from '../common/button/Button.svelte'
 	import SettingsFooter from './SettingsFooter.svelte'
@@ -65,10 +88,12 @@
 	import Select from '../select/Select.svelte'
 	import ResourcePicker from '../ResourcePicker.svelte'
 	import { usePromise } from '$lib/svelte5Utils.svelte'
-	import { SettingService, WorkspaceService } from '$lib/gen'
+	import { ScheduleService, SettingService, WorkspaceService } from '$lib/gen'
 	import type { GetSettingsResponse } from '$lib/gen'
 
-	import { workspaceStore } from '$lib/stores'
+	import { enterpriseLicense, userWorkspaces, workspaceStore } from '$lib/stores'
+	import { base } from '$app/paths'
+	import Toggle from '../Toggle.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import ExploreAssetButton from '../ExploreAssetButton.svelte'
 	import Tooltip from '../Tooltip.svelte'
@@ -80,13 +105,11 @@
 	import Popover from '../meltComponents/Popover.svelte'
 	import TextInput from '../text_input/TextInput.svelte'
 	import { slide } from 'svelte/transition'
-	import { isCustomInstanceDbEnabled } from './utils.svelte'
+	import { isCustomInstanceDbEnabled, getUnusedInstanceDbName } from './utils.svelte'
 	import { resource } from 'runed'
 	import CustomInstanceDbSelect from './CustomInstanceDbSelect.svelte'
 	import Label from '../Label.svelte'
 
-	const DEFAULT_DUCKLAKE_CATALOG_NAME = 'ducklake_catalog'
-
 	type Props = {
 		ducklakeSettings: DucklakeSettingsType
 		ducklakeSavedSettings: DucklakeSettingsType
@@ -100,6 +123,16 @@
 		onDiscard = undefined
 	}: Props = $props()
 
+	function defaultInstanceDbName(): string {
+		const usedNames = [
+			...Object.keys(customInstanceDbs.current ?? {}),
+			...ducklakeSettings.ducklakes
+				.filter((d) => d.catalog.resource_type === 'instance' && d.catalog.resource_path)
+				.map((d) => d.catalog.resource_path!)
+		]
+		return getUnusedInstanceDbName('dl', $workspaceStore ?? '', usedNames)
+	}
+
 	function onNewDucklake() {
 		const name = ducklakeSettings.ducklakes.some((d) => d.name === 'main')
 			? `${random_adj()}_ducklake`
@@ -108,7 +141,7 @@
 			name,
 			catalog: {
 				resource_type: $isCustomInstanceDbEnabled ? 'instance' : 'postgresql',
-				resource_path: $isCustomInstanceDbEnabled ? DEFAULT_DUCKLAKE_CATALOG_NAME : undefined
+				resource_path: $isCustomInstanceDbEnabled ? defaultInstanceDbName() : undefined
 			},
 			storage: {
 				storage: undefined,
@@ -169,6 +202,40 @@
 		}
 	}
 
+	function editableMaintenance(
+		ducklake: DucklakeSettingsType['ducklakes'][number]
+	): DucklakeMaintenanceType {
+		if (!ducklake.maintenance) ducklake.maintenance = { enabled: false }
+		return ducklake.maintenance
+	}
+
+	// Health of the managed maintenance schedules (push failures auto-disable
+	// them with an error; the schedules UI hides the reserved prefix, so this
+	// is the only surface where that state is visible).
+	const maintenanceHealth = resource(
+		[() => $workspaceStore, () => ducklakeSavedSettings],
+		async ([workspace, saved]) => {
+			const out: Record<string, { enabled: boolean; error?: string }> = {}
+			if (!workspace) return out
+			await Promise.all(
+				(saved?.ducklakes ?? [])
+					.filter((d) => d.maintenance?.enabled)
+					.map(async (d) => {
+						try {
+							const s = await ScheduleService.getSchedule({
+								workspace,
+								path: `f/ducklake_maintenance/${d.name}`
+							})
+							out[d.name] = { enabled: s.enabled ?? false, error: s.error ?? undefined }
+						} catch {
+							// no schedule row (e.g. save predates the feature): nothing to report
+						}
+					})
+			)
+			return out
+		}
+	)
+
 	let secondaryStorageNames = usePromise(
 		() => SettingService.getSecondaryStorageNames({ workspace: $workspaceStore! }),
 		{ loadInit: false }
@@ -178,16 +245,26 @@
 		secondaryStorageNames.refresh()
 	})
 
-	let tableHeadNames = ['Name', 'Catalog', 'Workspace storage', '', ''] as const
+	let tableHeadNames = ['Name', 'Catalog', 'Workspace storage', 'Maintenance', '', ''] as const
 
 	let tableHeadTooltips: Partial<Record<(typeof tableHeadNames)[number], string | undefined>> = {
 		Name: "Ducklakes are referenced in DuckDB scripts with the <code class='px-1 py-0.5 border rounded-md'>ATTACH 'ducklake://name' AS dl;</code> syntax",
 		Catalog: 'Ducklake needs an SQL database to store metadata about the data',
 		'Workspace storage':
-			'Where the data is actually stored, in parquet format. You need to configure a workspace storage first'
+			'Where the data is actually stored, in parquet format. You need to configure a workspace storage first',
+		Maintenance:
+			'Scheduled snapshot expiry, small-file compaction and orphaned-file cleanup, run as jobs on a managed per-lake schedule (EE)'
 	}
 
 	let confirmationModal = createAsyncConfirmationModal()
+
+	// Same fork detection as the backend's isolation gate: parent link (dev workspaces are
+	// prefix-less) or the wm-fork- prefix (an orphaned fork keeps isolation after its parent
+	// is deleted).
+	let isFork = $derived(
+		$userWorkspaces.find((w) => w.id === $workspaceStore)?.parent_workspace_id != null ||
+			($workspaceStore?.startsWith('wm-fork-') ?? false)
+	)
 </script>
 
 <div class="flex flex-col gap-4 mb-8">
@@ -200,6 +277,20 @@
 	</div>
 </div>
 
+{#if isFork && ducklakeSettings.ducklakes.length > 0}
+	<div class="mb-4">
+		<Alert title="Fork data environments" type="info">
+			This workspace is a fork, and these settings are its own copy. Lakes marked
+			<span class="font-semibold">isolated</span> read the parent's tables through defer views and
+			write to a fork-scoped namespace that is cleaned up when the fork is deleted. Lakes marked
+			<span class="font-semibold">shared with parent</span> read and write the parent's physical
+			lake directly — editing their catalog or storage here repoints the shared lake for this
+			fork's jobs. The choice is made per lake when the fork is created and cannot be changed
+			here.
+		</Alert>
+	</div>
+{/if}
+
 {#if ducklakeSettings.ducklakes.some((d) => d.catalog.resource_type === 'instance')}
 	<div transition:slide={{ duration: 200 }} class="mb-4">
 		<Alert title="Instance databases use the Windmill database" type="info">
@@ -247,6 +338,33 @@
 						inputProps={{ placeholder: 'Name' }}
 						class="ducklake-name"
 					/>
+					{#if isFork}
+						<div class="mt-1">
+							{#if ducklake.fork_behavior === 'shared'}
+								<span
+									class="inline-flex items-center gap-1 text-2xs px-1.5 py-0.5 rounded border border-amber-500/40 bg-amber-100 dark:bg-amber-900/30 text-amber-700 dark:text-amber-300"
+								>
+									<ArrowUpRight size={10} />
+									shared with parent
+								</span>
+								<Tooltip>
+									This fork reads and writes the parent's physical lake directly. Edits to this
+									lake's catalog or storage repoint the shared lake for this fork's jobs.
+								</Tooltip>
+							{:else}
+								<span
+									class="inline-flex items-center gap-1 text-2xs px-1.5 py-0.5 rounded border border-emerald-500/40 bg-emerald-100 dark:bg-emerald-900/30 text-emerald-700 dark:text-emerald-300"
+								>
+									<GitFork size={10} />
+									isolated
+								</span>
+								<Tooltip>
+									Writes go to a fork-scoped namespace; reads of tables not yet materialized in
+									this fork defer to the parent. Deleting the fork cleans the namespace up.
+								</Tooltip>
+							{/if}
+						</div>
+					{/if}
 				</Cell>
 				<Cell>
 					<div class="flex gap-1">
@@ -272,7 +390,7 @@
 										ducklake.catalog = {
 											resource_type,
 											resource_path:
-												resource_type === 'instance' ? DEFAULT_DUCKLAKE_CATALOG_NAME : undefined
+												resource_type === 'instance' ? defaultInstanceDbName() : undefined
 										}
 									}
 								}
@@ -329,6 +447,133 @@
 						/>
 					</div>
 				</Cell>
+				<Cell class="w-32">
+					<Popover contentClasses="p-4" enableFlyTransition closeOnOtherPopoverOpen>
+						{#snippet trigger()}
+							<div class="relative">
+								<Button
+									variant="default"
+									size="sm"
+									startIcon={{ icon: Wrench }}
+									btnClasses="whitespace-nowrap ducklake-maintenance-btn"
+								>
+									{ducklake.maintenance?.enabled
+										? `${ducklake.maintenance?.retention_days ?? 7}d retention`
+										: 'Off'}
+								</Button>
+								{#if maintenanceHealth.current?.[ducklake.name] && (maintenanceHealth.current[ducklake.name].error || !maintenanceHealth.current[ducklake.name].enabled)}
+									<AlertTriangle
+										size={14}
+										class="absolute -top-1.5 -right-1.5 text-yellow-500 bg-surface rounded-full"
+									/>
+								{/if}
+							</div>
+						{/snippet}
+						{#snippet content()}
+							<div class="flex flex-col gap-3 w-96">
+								<Toggle
+									size="sm"
+									disabled={!$enterpriseLicense && !ducklake.maintenance?.enabled}
+									eeOnly
+									options={{
+										right: 'Scheduled maintenance',
+										rightTooltip:
+											'Expire old snapshots, merge adjacent small parquet files and delete orphaned files on a schedule. Runs appear as jobs — run history is the audit trail.'
+									}}
+									bind:checked={
+										() => ducklake.maintenance?.enabled ?? false,
+										(v) => (editableMaintenance(ducklake).enabled = v)
+									}
+								/>
+								{#if ducklake.maintenance?.enabled}
+									<Label
+										label="Snapshot retention (days)"
+										tooltip="Snapshots older than this window are expired on each maintenance run. 0 keeps only the current snapshot."
+									>
+										<TextInput
+											inputProps={{ type: 'number', min: 0, step: 1 }}
+											bind:value={
+												() => ducklake.maintenance?.retention_days ?? 7,
+												(v) => {
+													const n = typeof v === 'number' ? v : parseInt(v ?? '')
+													editableMaintenance(ducklake).retention_days = isNaN(n)
+														? undefined
+														: Math.max(0, n)
+												}
+											}
+										/>
+									</Label>
+									{#if (ducklake.maintenance?.retention_days ?? 7) === 0}
+										<p class="text-2xs text-yellow-600 dark:text-yellow-500">
+											Retention 0 expires every snapshot but the current one on each run —
+											time-travel is effectively disabled for this lake.
+										</p>
+									{/if}
+									<Label
+										label="Cadence (cron, UTC)"
+										tooltip="v2 cron expression evaluated in UTC. Leave empty for the default: daily at 03h with a per-lake minute offset."
+									>
+										<TextInput
+											inputProps={{ placeholder: 'daily at 03h (default)' }}
+											bind:value={
+												() => ducklake.maintenance?.schedule ?? '',
+												(v) => (editableMaintenance(ducklake).schedule = v ? String(v) : undefined)
+											}
+										/>
+									</Label>
+									<Toggle
+										size="xs"
+										options={{
+											right: 'Compaction',
+											rightTooltip:
+												'Merge adjacent small parquet files (ducklake_merge_adjacent_files)'
+										}}
+										bind:checked={
+											() => ducklake.maintenance?.compaction ?? true,
+											(v) => (editableMaintenance(ducklake).compaction = v)
+										}
+									/>
+									<Toggle
+										size="xs"
+										options={{
+											right: 'Orphaned file cleanup',
+											rightTooltip:
+												'Delete files present in storage but unknown to the catalog, older than max(retention, 1 day)'
+										}}
+										bind:checked={
+											() => ducklake.maintenance?.orphan_cleanup ?? true,
+											(v) => (editableMaintenance(ducklake).orphan_cleanup = v)
+										}
+									/>
+									<p class="text-2xs text-secondary">
+										Expired snapshots are gone for good: time-travel reads (<code
+											>AT (VERSION => n)</code
+										>) and recorded snapshot references older than the retention window become
+										non-queryable. Freed files are physically deleted with a ~1 day lag.
+									</p>
+									{#if maintenanceHealth.current?.[ducklake.name]?.error || maintenanceHealth.current?.[ducklake.name]?.enabled === false}
+										<Alert title="Maintenance schedule needs attention" type="warning" size="xs">
+											{maintenanceHealth.current?.[ducklake.name]?.error ??
+												'The managed schedule is disabled.'}
+											Re-save the ducklake settings to retry.
+										</Alert>
+									{/if}
+									{#if ducklakeSavedSettings.ducklakes.find((d) => d.name === ducklake.name)?.maintenance?.enabled}
+										<a
+											href={`${base}/runs/?schedule_path=${encodeURIComponent(
+												`f/ducklake_maintenance/${ducklake.name}`
+											)}&job_kinds=previews`}
+											target="_blank"
+											class="text-2xs inline-flex items-center gap-1"
+										>
+											View maintenance runs <ExternalLink size={12} />
+										</a>
+									{/if}
+								{/if}
+							</div>
+						{/snippet}
+					</Popover>
+				</Cell>
 				<Cell class="w-12">
 					<div class="flex gap-1">
 						<Popover contentClasses="p-4" enableFlyTransition closeOnOtherPopoverOpen>
diff --git a/frontend/src/lib/components/workspaceSettings/ForkDatatableSection.svelte b/frontend/src/lib/components/workspaceSettings/ForkDatatableSection.svelte
index 87bcce5fbf..c060c1d1ed 100644
--- a/frontend/src/lib/components/workspaceSettings/ForkDatatableSection.svelte
+++ b/frontend/src/lib/components/workspaceSettings/ForkDatatableSection.svelte
@@ -30,16 +30,20 @@
 	import { Check, X, Loader2 } from 'lucide-svelte'
 
 	interface Props {
+		// Workspace whose datatables are cloned into the fork (the fork's base). Falls back to the
+		// current workspace so existing callers keep working.
+		sourceWorkspace?: string
 		onAllDone?: () => void
 		onCanceled?: () => void
 	}
 
-	let { onAllDone, onCanceled }: Props = $props()
+	let { sourceWorkspace, onAllDone, onCanceled }: Props = $props()
 
-	let allDatatables = resource([], async () =>
-		$workspaceStore
-			? WorkspaceService.listDataTables({ workspace: $workspaceStore ?? '' })
-			: undefined
+	let effectiveSource = $derived(sourceWorkspace ?? $workspaceStore ?? undefined)
+
+	let allDatatables = resource(
+		() => effectiveSource,
+		async (ws) => (ws ? WorkspaceService.listDataTables({ workspace: ws }) : undefined)
 	)
 
 	let datatableBehaviors: Record<string, 'schema_only' | 'schema_and_data' | 'keep_original'> =
@@ -83,7 +87,7 @@
 					steps,
 					_newDbName: newDbName,
 					_isInstance: isInstance,
-					_sourceWorkspace: $workspaceStore!,
+					_sourceWorkspace: effectiveSource!,
 					_targetWorkspace: targetWorkspaceId,
 					_resourcePath: dt.resource_path
 				}
diff --git a/frontend/src/lib/components/workspaceSettings/ForkDucklakeSection.svelte b/frontend/src/lib/components/workspaceSettings/ForkDucklakeSection.svelte
new file mode 100644
index 0000000000..24d3da404c
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/ForkDucklakeSection.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+	import { WorkspaceService } from '$lib/gen'
+	import { workspaceStore } from '$lib/stores'
+	import { resource } from 'runed'
+	import Select from '../select/Select.svelte'
+	import Label from '../Label.svelte'
+	import { TriangleAlert } from 'lucide-svelte'
+
+	// The workspace the fork is created from (matches ForkDatatableSection): a
+	// fork-of-fork bases off the selected base, not the navigation workspace, so
+	// the lakes listed here must match the ones the create-fork call submits to.
+	let { sourceWorkspace }: { sourceWorkspace?: string } = $props()
+	let effectiveSource = $derived(sourceWorkspace ?? $workspaceStore ?? undefined)
+
+	// Keyed on the source so a direct page load (store hydrates after mount) still fetches.
+	let allDucklakes = resource(
+		() => effectiveSource,
+		async (ws) => (ws ? WorkspaceService.listDucklakes({ workspace: ws }) : undefined)
+	)
+
+	let lakeBehaviors: Record<string, 'isolated' | 'shared'> = $state({})
+
+	// Lakes the user explicitly opted out of isolation for — sent as
+	// `shared_ducklakes` on the create-fork request. Unlisted lakes default to the
+	// isolated fork namespace with read-defer, so nothing needs sending for them.
+	export function getSharedDucklakes(): string[] {
+		return (allDucklakes.current ?? []).filter((name) => lakeBehaviors[name] === 'shared')
+	}
+
+	let anyShared = $derived((allDucklakes.current ?? []).some((n) => lakeBehaviors[n] === 'shared'))
+</script>
+
+<!-- Self-hides when the workspace has no ducklake configured, like the datatable section. -->
+{#if allDucklakes.current && allDucklakes.current.length > 0}
+	<Label label="Ducklake data environment">
+		<span class="text-xs text-secondary">
+			By default each lake is isolated in the fork: materializations write a fork-scoped namespace
+			and reads of not-yet-materialized tables defer to this workspace's current data.
+		</span>
+		<div class="border rounded-md divide-y">
+			{#each allDucklakes.current as name (name)}
+				<div class="flex items-center gap-2 justify-between px-4 py-1.5">
+					<span class="text-xs font-medium">{name}</span>
+					<Select
+						dropdownClass="max-w-96"
+						bind:value={() => lakeBehaviors[name] ?? 'isolated', (v) => (lakeBehaviors[name] = v)}
+						items={[
+							{ value: 'isolated', label: 'Isolated (defer reads to parent)' },
+							{ value: 'shared', label: 'Shared with parent' }
+						]}
+					/>
+				</div>
+			{/each}
+		</div>
+		{#if anyShared}
+			<div
+				class="flex items-start gap-2 px-3 py-2 text-xs rounded-md border border-amber-200 dark:border-amber-900/60 bg-amber-50 dark:bg-amber-950/40 text-amber-700 dark:text-amber-300"
+			>
+				<TriangleAlert size={14} class="shrink-0 mt-0.5" />
+				<span>
+					A shared lake is NOT isolated: pipeline runs in the fork read and write this workspace's
+					tables directly.
+				</span>
+			</div>
+		{/if}
+	</Label>
+{/if}
diff --git a/frontend/src/lib/components/workspaceSettings/NewDataTableMigrationModal.svelte b/frontend/src/lib/components/workspaceSettings/NewDataTableMigrationModal.svelte
new file mode 100644
index 0000000000..d4dad04ac1
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/NewDataTableMigrationModal.svelte
@@ -0,0 +1,230 @@
+<script lang="ts">
+	import { Button } from '../common'
+	import Modal2 from '../common/modal/Modal2.svelte'
+	import Tabs from '../common/tabs/Tabs.svelte'
+	import Tab from '../common/tabs/Tab.svelte'
+	import TabContent from '../common/tabs/TabContent.svelte'
+	import Toggle from '../Toggle.svelte'
+	import TextInput from '../text_input/TextInput.svelte'
+	import SimpleEditor from '../SimpleEditor.svelte'
+	import { WorkspaceService, type DatatableMigration } from '$lib/gen'
+	import { sendUserToast } from '$lib/toast'
+	import { tick } from 'svelte'
+	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
+	import { createAsyncConfirmationModal } from '../common/confirmationModal/asyncConfirmationModal.svelte'
+	import Portal from '$lib/components/Portal.svelte'
+	import { fetchPendingMigrations, outOfOrderRunMessage } from './datatableMigrationUtils'
+
+	let {
+		workspace,
+		datatable,
+		onCreated,
+		onClose,
+		onSeeMigration
+	}: {
+		workspace: string
+		datatable: string
+		/** Called after a successful create; `ran` is true when it was also run. */
+		onCreated?: (ran: boolean) => void
+		/** Called whenever the modal closes. `result` reports whether the close
+		 * was due to a create (and whether that create was also run) vs a cancel —
+		 * computed synchronously so callers don't depend on onCreated/onClose order. */
+		onClose?: (result: { created: boolean; ran: boolean }) => void
+		/** When set, the success toast gets a "See migration" action that calls this
+		 * with the created migration so the caller can open it in the Migrations modal. */
+		onSeeMigration?: (migration: DatatableMigration) => void
+	} = $props()
+
+	let isOpen = $state(false)
+	// The reason the modal is about to close, set synchronously before `isOpen`
+	// flips so the onClose effect reports it reliably regardless of effect timing.
+	let closeResult = { created: false, ran: false }
+	let prevOpen = false
+	$effect(() => {
+		if (prevOpen && !isOpen) {
+			onClose?.(closeResult)
+			closeResult = { created: false, ran: false }
+		}
+		prevOpen = isOpen
+	})
+	let tab = $state('up')
+	let name = $state('')
+	let nameInput = $state<TextInput>()
+	// A valid migration name is non-empty and limited to letters, digits, '_' and '-'.
+	const MIGRATION_NAME_RE = /^[a-zA-Z0-9_-]+$/
+	let nameInvalid = $derived(!MIGRATION_NAME_RE.test(name.trim()))
+	let codeUp = $state('')
+	let enableDown = $state(false)
+	let codeDown = $state('')
+	let creating = $state(false)
+
+	const confirmationModal = createAsyncConfirmationModal()
+
+	// Frame the migration body in an explicit transaction so it applies atomically.
+	function wrapInTransaction(body: string): string {
+		return `BEGIN;\n\n${body}\n\nEND;`
+	}
+	// A statement inside BEGIN; ... END; must be `;`-terminated. The SQL splitter
+	// strips the trailing `;` when extracting a detected DDL statement, so re-add
+	// it when missing.
+	function ensureTrailingSemicolon(body: string): string {
+		const trimmed = body.trimEnd()
+		return trimmed.endsWith(';') ? trimmed : `${trimmed};`
+	}
+	const PLACEHOLDER = wrapInTransaction('-- Add your migration here')
+
+	export function open(prefill?: { name?: string; codeUp?: string; codeDown?: string }) {
+		name = prefill?.name ?? ''
+		// Start from the transaction template; when prefilled from detected DDL,
+		// wrap that DDL in the same BEGIN; ... END; frame.
+		codeUp = prefill?.codeUp
+			? wrapInTransaction(ensureTrailingSemicolon(prefill.codeUp))
+			: PLACEHOLDER
+		codeDown = prefill?.codeDown ?? PLACEHOLDER
+		enableDown = (prefill?.codeDown ?? '') !== ''
+		tab = 'up'
+		isOpen = true
+		// Focus the name field once the modal content has rendered.
+		tick().then(() => nameInput?.focus())
+	}
+
+	async function create(run: boolean) {
+		if (name.trim() === '') {
+			sendUserToast('Migration name is required', true)
+			return
+		}
+		if (!MIGRATION_NAME_RE.test(name.trim())) {
+			sendUserToast("Invalid migration name: use only letters, digits, '_' and '-'", true)
+			return
+		}
+		if (run) {
+			// A new migration gets the highest timestamp, so any still-pending
+			// migration is earlier: running only this one applies it out of order.
+			// Warn just like the row-level Run action does. Best-effort: if the
+			// status can't be fetched, fall through and let the run/rollback handle it.
+			let pending: Awaited<ReturnType<typeof fetchPendingMigrations>> = []
+			try {
+				pending = await fetchPendingMigrations(workspace, datatable)
+			} catch {}
+			if (pending.length > 0) {
+				const confirmed = await confirmationModal.ask({
+					title: 'Run migration out of order',
+					confirmationText: 'Run anyway',
+					children: outOfOrderRunMessage(pending.length)
+				})
+				if (!confirmed) return
+			}
+		}
+		creating = true
+		try {
+			const created = await WorkspaceService.createDatatableMigration({
+				workspace,
+				datatableName: datatable,
+				requestBody: {
+					name: name.trim(),
+					code_up: codeUp,
+					code_down: enableDown ? codeDown : undefined
+				}
+			})
+			if (run) {
+				try {
+					await WorkspaceService.runDatatableMigrations({
+						workspace,
+						datatableName: datatable,
+						only: created.timestamp
+					})
+				} catch (runErr: any) {
+					// The migration was created but failed to run; undo the insertion so
+					// the user can fix the SQL and retry from a clean state.
+					await WorkspaceService.deleteDatatableMigration({
+						workspace,
+						datatableName: datatable,
+						timestamp: created.timestamp
+					}).catch(() => {})
+					sendUserToast(
+						`Migration failed to run and was reverted: ${runErr?.body ?? runErr?.message ?? runErr}`,
+						true
+					)
+					return
+				}
+			}
+			closeResult = { created: true, ran: run }
+			onCreated?.(run)
+			sendUserToast(
+				run ? 'Migration created and run' : 'Migration created',
+				'success',
+				onSeeMigration
+					? [{ label: 'See migration', callback: () => onSeeMigration?.(created) }]
+					: []
+			)
+			isOpen = false
+		} catch (e: any) {
+			sendUserToast(`Failed to create migration: ${e?.body ?? e?.message ?? e}`, true)
+		} finally {
+			creating = false
+		}
+	}
+</script>
+
+<!-- closeOnOutsideClick is off: the "Create and run" split-button menu renders in a
+	portal outside the modal, so an outside-click close would fire on its items and be
+	mistaken for a cancel. Close via the header X or Escape instead. -->
+<Modal2
+	bind:isOpen
+	title="New migration — {datatable}"
+	fixedWidth="md"
+	fixedHeight="adaptive"
+	closeOnOutsideClick={false}
+>
+	<div class="flex flex-col gap-3 w-full grow min-h-0">
+		<TextInput
+			bind:this={nameInput}
+			bind:value={name}
+			error={nameInvalid}
+			inputProps={{ placeholder: 'Migration name (e.g. add_index_to_customers)' }}
+		/>
+		<Tabs bind:selected={tab} class="grow min-h-0">
+			<Tab value="up" label="Up" />
+			<Tab value="down" label="Down" />
+			{#snippet content()}
+				<TabContent value="up" class="h-80 border rounded-md overflow-hidden">
+					<SimpleEditor class="h-full" lang="sql" bind:code={codeUp} />
+				</TabContent>
+				<TabContent value="down" class="h-80">
+					<div class="flex flex-col gap-2 h-full">
+						<Toggle
+							bind:checked={enableDown}
+							options={{ right: 'Enable down migration' }}
+							size="sm"
+						/>
+						{#if enableDown}
+							<div class="grow min-h-0 border rounded-md overflow-hidden">
+								<SimpleEditor class="h-full" lang="sql" bind:code={codeDown} />
+							</div>
+						{/if}
+					</div>
+				</TabContent>
+			{/snippet}
+		</Tabs>
+		<div class="flex justify-end pt-2">
+			<Button
+				variant="accent"
+				size="sm"
+				disabled={creating}
+				on:click={() => create(true)}
+				dropdownItems={[
+					{
+						label: 'Create without running',
+						onClick: () => create(false)
+					}
+				]}
+			>
+				Create and run
+			</Button>
+		</div>
+	</div>
+</Modal2>
+
+<Portal>
+	<ConfirmationModal {...confirmationModal.props} />
+</Portal>
diff --git a/frontend/src/lib/components/workspaceSettings/StorageSettings.svelte b/frontend/src/lib/components/workspaceSettings/StorageSettings.svelte
index ef46189444..1e6c990819 100644
--- a/frontend/src/lib/components/workspaceSettings/StorageSettings.svelte
+++ b/frontend/src/lib/components/workspaceSettings/StorageSettings.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { enterpriseLicense, workspaceStore } from '$lib/stores'
-	import { emptyString, pick, sendUserToast } from '$lib/utils'
-	import { ChevronDown, Plus, Shield } from 'lucide-svelte'
+	import { displaySize, emptyString, pick, sendUserToast } from '$lib/utils'
+	import { ChevronDown, Plus, RefreshCw, Shield } from 'lucide-svelte'
 	import Alert from '../common/alert/Alert.svelte'
 	import Button from '../common/button/Button.svelte'
 	import SettingsPageHeader from '../settings/SettingsPageHeader.svelte'
@@ -15,7 +15,7 @@
 		type S3ResourceSettings,
 		type S3ResourceSettingsItem
 	} from '$lib/workspace_settings'
-	import { WorkspaceService } from '$lib/gen'
+	import { HelpersService, WorkspaceService, type GetStorageUsageResponse } from '$lib/gen'
 	import S3FilePicker from '../S3FilePicker.svelte'
 	import Portal from '../Portal.svelte'
 	import Popover from '../meltComponents/Popover.svelte'
@@ -61,15 +61,86 @@
 		console.log('Large file storage settings changed', large_file_storage)
 		sendUserToast(`Large file storage settings changed`)
 		onSave?.()
+		loadStorageUsage(true)
 	}
+
+	let storageUsage: GetStorageUsageResponse | undefined = $state()
+	let storageUsageLoading = $state(false)
+	// Set on failure so the auto-load $effect below doesn't hammer a persistently
+	// failing endpoint; cleared only by an explicit user-triggered refresh.
+	let storageUsageErrored = $state(false)
+
+	async function loadStorageUsage(refresh: boolean = false): Promise<void> {
+		storageUsageLoading = true
+		if (refresh) storageUsageErrored = false
+		try {
+			storageUsage = await HelpersService.getStorageUsage({
+				workspace: $workspaceStore!,
+				refresh
+			})
+		} catch (e) {
+			storageUsageErrored = true
+			console.error('Failed to load storage usage', e)
+		} finally {
+			storageUsageLoading = false
+		}
+	}
+
+	$effect(() => {
+		if (
+			primaryStorageSaved &&
+			storageUsage === undefined &&
+			!storageUsageLoading &&
+			!storageUsageErrored
+		) {
+			loadStorageUsage()
+		}
+	})
+
+	let usedFraction: number | undefined = $derived(
+		storageUsage?.quota_bytes
+			? Math.min(storageUsage.total_bytes / storageUsage.quota_bytes, 1)
+			: undefined
+	)
+	let overQuota: boolean = $derived(
+		storageUsage?.quota_bytes !== undefined && storageUsage.total_bytes >= storageUsage.quota_bytes
+	)
+	let quotaDisplay: string = $derived(displaySize(storageUsage?.quota_bytes) ?? '10 GiB')
 	let tableHeadNames = ['Name', 'Storage resource', '', ''] as const
 	let tableHeadTooltips: Partial<Record<(typeof tableHeadNames)[number], string | undefined>> = {
 		'Storage resource':
 			'Which resource the workspace storage will point to. Note that all users of the workspace will be able to access the workspace storage regardless of the resource visibility.'
 	}
 
+	// Primary storage exists once it has been saved with a resource. Until then the row is
+	// hidden and the user is offered an "Add primary storage" button instead. Visibility is an
+	// explicit toggle (driven by Add/Delete) so editing or clearing the resource picker doesn't
+	// make the row vanish.
+	let primaryStorageSaved: boolean = $derived(!emptyString(s3ResourceSavedSettings.resourcePath))
+	let showPrimaryRow: boolean = $state(primaryStorageSaved)
+
+	// The parent reassigns the whole settings object on load and on every discard (footer or the
+	// page-level "discard all changes"). Re-sync the row to the saved state when that happens.
+	let prevSettings = s3ResourceSettings
+	$effect(() => {
+		if (s3ResourceSettings !== prevSettings) {
+			prevSettings = s3ResourceSettings
+			showPrimaryRow = primaryStorageSaved
+		}
+	})
+
+	function clearPrimaryStorage() {
+		s3ResourceSettings.resourceType = 's3'
+		s3ResourceSettings.resourcePath = undefined
+		s3ResourceSettings.publicResource = undefined
+		s3ResourceSettings.advancedPermissions = defaultS3AdvancedPermissions(!!$enterpriseLicense)
+		showPrimaryRow = false
+	}
+
 	let tableRows: [string | null, S3ResourceSettingsItem][] = $derived([
-		[null, s3ResourceSettings],
+		...(showPrimaryRow
+			? ([[null, s3ResourceSettings]] as [string | null, S3ResourceSettingsItem][])
+			: []),
 		...(s3ResourceSettings.secondaryStorage ?? [])
 	])
 	let secondaryStorageIsDirty: Record<string, boolean> = $derived(
@@ -102,6 +173,9 @@
 	let hasUnsavedChanges = $derived.by(() => {
 		return !deepEqual(s3ResourceSettings, s3ResourceSavedSettings)
 	})
+
+	// A visible storage row without a selected resource can't be saved.
+	let hasMissingResource = $derived(tableRows.some(([, item]) => emptyString(item.resourcePath)))
 </script>
 
 <Portal name="workspace-settings">
@@ -114,10 +188,9 @@
 	link="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#workspace-object-storage"
 />
 {#if !$enterpriseLicense}
-	<Alert type="info" title="S3 storage is limited to 20 files in Windmill CE">
-		Windmill S3 bucket browser will not work for buckets containing more than 20 files and uploads
-		are limited to files {'<'} 50MB. Consider upgrading to Windmill EE to use this feature with large
-		buckets.
+	<Alert type="info" title="Workspace storage is limited to {quotaDisplay} in Windmill CE">
+		Total workspace storage is capped at {quotaDisplay} in the Community Edition: writes that would exceed
+		the quota are rejected. Consider upgrading to Windmill EE for unlimited workspace storage.
 	</Alert>
 {:else}
 	<Alert type="info" title="Logs storage is set at the instance level">
@@ -129,6 +202,67 @@
 		>, set by the superadmins in the instance settings UI.
 	</Alert>
 {/if}
+{#if primaryStorageSaved}
+	<div class="mt-4 flex flex-col gap-1.5 max-w-xl storage-usage-section">
+		<div class="flex items-center gap-2">
+			<span class="text-sm font-semibold">Storage usage</span>
+			<Button
+				variant="default"
+				size="xs2"
+				iconOnly
+				startIcon={{ icon: RefreshCw }}
+				loading={storageUsageLoading}
+				onclick={() => loadStorageUsage(true)}
+				title="Recount usage by listing the storage"
+			/>
+		</div>
+		{#if storageUsage}
+			{#if storageUsage.quota_bytes !== undefined && usedFraction !== undefined}
+				<div class="h-2 w-full rounded-full bg-surface-secondary overflow-hidden border">
+					<div
+						class="h-full rounded-full transition-all {overQuota
+							? 'bg-red-500'
+							: usedFraction >= 0.8
+								? 'bg-yellow-500'
+								: 'bg-accent'}"
+						style="width: {Math.max(usedFraction * 100, 1)}%"
+					></div>
+				</div>
+				<span class="text-xs text-secondary">
+					{displaySize(storageUsage.total_bytes)} of {quotaDisplay} used
+					{#if storageUsage.storages.length > 1}
+						({storageUsage.storages
+							.map(
+								(s) =>
+									`${s.storage === '_default_' ? 'primary' : s.storage}: ${displaySize(s.bytes)}`
+							)
+							.join(', ')})
+					{/if}
+				</span>
+				{#if overQuota}
+					<Alert type="error" title="Workspace storage quota exceeded">
+						Writes to workspace storage are rejected until usage drops below {quotaDisplay}. Delete
+						files from workspace storage or upgrade to Windmill EE for unlimited storage.
+					</Alert>
+				{/if}
+			{:else}
+				<span class="text-xs text-secondary">
+					{displaySize(storageUsage.total_bytes)} used
+					{#if storageUsage.storages.length > 1}
+						({storageUsage.storages
+							.map(
+								(s) =>
+									`${s.storage === '_default_' ? 'primary' : s.storage}: ${displaySize(s.bytes)}`
+							)
+							.join(', ')})
+					{/if}
+				</span>
+			{/if}
+		{:else if storageUsageLoading}
+			<span class="text-xs text-tertiary">Computing storage usage...</span>
+		{/if}
+	</div>
+{/if}
 {#if s3ResourceSettings}
 	<DataTable containerClass="storage-settings-table mt-4">
 		<Head>
@@ -144,7 +278,7 @@
 			</tr>
 		</Head>
 		<tbody class="divide-y bg-surface-tertiary">
-			{#each tableRows as tableRow, idx}
+			{#each tableRows as tableRow}
 				<Row>
 					<Cell first class="w-48 relative">
 						{#if tableRow[0] === null}
@@ -161,27 +295,30 @@
 						<div class="flex gap-2">
 							<div class="relative">
 								{#if tableRow[1].resourceType === 'filesystem'}
-								<Select
-									items={[{ value: 'filesystem', label: 'Filesystem' }]}
-									value={'filesystem'}
-									disabled
-									id="storage-resource-type-select"
-									class="w-40"
-								/>
-							{:else}
-								<Select
-									items={[
-										{ value: 's3', label: 'S3' },
-										{ value: 'azure_blob', label: 'Azure Blob' },
-										{ value: 's3_aws_oidc', label: 'AWS OIDC' },
-										{ value: 'azure_workload_identity', label: 'Azure Workload Identity' },
-										{ value: 'gcloud_storage', label: 'Google Cloud Storage' }
-									]}
-									bind:value={tableRow[1].resourceType}
-									id="storage-resource-type-select"
-									class="w-40"
-								/>
-							{/if}
+									<!-- Filesystem storage is deliberately absent from the creatable
+									     types below: it is dev-only (set via the API), so the UI only
+									     renders it read-only when already configured. -->
+									<Select
+										items={[{ value: 'filesystem', label: 'Filesystem' }]}
+										value={'filesystem'}
+										disabled
+										id="storage-resource-type-select"
+										class="w-40"
+									/>
+								{:else}
+									<Select
+										items={[
+											{ value: 's3', label: 'S3' },
+											{ value: 'azure_blob', label: 'Azure Blob' },
+											{ value: 's3_aws_oidc', label: 'AWS OIDC' },
+											{ value: 'azure_workload_identity', label: 'Azure Workload Identity' },
+											{ value: 'gcloud_storage', label: 'Google Cloud Storage' }
+										]}
+										bind:value={tableRow[1].resourceType}
+										id="storage-resource-type-select"
+										class="w-40"
+									/>
+								{/if}
 							</div>
 							<div class="flex flex-1">
 								{#if tableRow[1].resourceType === 'filesystem'}
@@ -195,6 +332,7 @@
 										class="flex-1"
 										bind:value={tableRow[1].resourcePath}
 										resourceType={tableRow[1].resourceType}
+										error={emptyString(tableRow[1].resourcePath)}
 									/>
 								{/if}
 							</div>
@@ -223,19 +361,15 @@
 									class="cursor-not-allowed"
 								>
 									{#snippet trigger()}
-
-											<ExploreAssetButton asset={{ kind: 's3object', path: '' }} disabled />
-
-																	{/snippet}
+										<ExploreAssetButton asset={{ kind: 's3object', path: '' }} disabled />
+									{/snippet}
 									{#snippet content()}
-
-											{#if emptyString(tableRow[1].resourcePath)}
-												Please select a storage resource
-											{:else if isDirty(tableRow[0])}
-												Please save your changes
-											{/if}
-
-																	{/snippet}
+										{#if emptyString(tableRow[1].resourcePath)}
+											Please select a storage resource
+										{:else if isDirty(tableRow[0])}
+											Please save your changes
+										{/if}
+									{/snippet}
 								</Popover>
 							{:else}
 								<ExploreAssetButton
@@ -251,11 +385,18 @@
 								small
 								on:close={() => {
 									if (s3ResourceSettings.secondaryStorage) {
-										s3ResourceSettings.secondaryStorage.splice(idx - 1, 1)
-										s3ResourceSettings.secondaryStorage = [...s3ResourceSettings.secondaryStorage]
+										const realIdx = s3ResourceSettings.secondaryStorage.findIndex(
+											(s) => s === tableRow
+										)
+										if (realIdx !== -1) {
+											s3ResourceSettings.secondaryStorage.splice(realIdx, 1)
+											s3ResourceSettings.secondaryStorage = [...s3ResourceSettings.secondaryStorage]
+										}
 									}
 								}}
 							/>
+						{:else if (s3ResourceSettings.secondaryStorage?.length ?? 0) === 0}
+							<CloseButton small on:close={clearPrimaryStorage} />
 						{/if}
 					</Cell>
 				</Row>
@@ -295,7 +436,16 @@
 						</Button>
 					{/snippet}
 					<div class="flex justify-center w-full">
-						{#if !s3ResourceSettings.resourcePath}
+						{#if !showPrimaryRow}
+							<Button
+								size="sm"
+								btnClasses="max-w-fit mt-2"
+								variant="default"
+								on:click={() => (showPrimaryRow = true)}
+							>
+								<Plus /> Add primary storage
+							</Button>
+						{:else if !s3ResourceSettings.resourcePath}
 							<Popover
 								class="cursor-not-allowed"
 								openOnHover
@@ -321,6 +471,7 @@
 		class="mt-5 mb-5"
 		inline
 		{hasUnsavedChanges}
+		disabled={hasMissingResource}
 		onSave={editWindmillLFSSettings}
 		onDiscard={() => onDiscard?.()}
 		saveLabel="Save storage settings"
diff --git a/frontend/src/lib/components/workspaceSettings/aiSkills.test.ts b/frontend/src/lib/components/workspaceSettings/aiSkills.test.ts
new file mode 100644
index 0000000000..87f84d865a
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/aiSkills.test.ts
@@ -0,0 +1,197 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+	MAX_SKILL_DESCRIPTION_LENGTH,
+	MAX_SKILL_INSTRUCTIONS_LENGTH,
+	MAX_SKILL_NAME_LENGTH,
+	buildSkillMd,
+	parseAndValidateSkill,
+	parseSkillMd,
+	validateSkill
+} from './aiSkills'
+
+describe('parseSkillMd', () => {
+	it('splits frontmatter name/description from the body', () => {
+		const md = '---\nname: my-skill\ndescription: does a thing\n---\n\n# Title\n\nBody text.'
+		expect(parseSkillMd(md)).toEqual({
+			name: 'my-skill',
+			description: 'does a thing',
+			instructions: '# Title\n\nBody text.'
+		})
+	})
+
+	it('trims frontmatter values and the body', () => {
+		const md = '---\nname:   spaced  \ndescription:  padded \n---\n\n  body  '
+		const parsed = parseSkillMd(md)
+		expect(parsed.name).toBe('spaced')
+		expect(parsed.description).toBe('padded')
+		expect(parsed.instructions).toBe('body')
+	})
+
+	it('returns undefined name/description when there is no frontmatter', () => {
+		expect(parseSkillMd('just a body')).toEqual({
+			name: undefined,
+			description: undefined,
+			instructions: 'just a body'
+		})
+	})
+
+	it('strips a leading UTF-8 BOM before matching frontmatter', () => {
+		const md = '---\nname: bom-skill\ndescription: d\n---\n\nbody'
+		const parsed = parseSkillMd(md)
+		expect(parsed.name).toBe('bom-skill')
+		expect(parsed.description).toBe('d')
+		expect(parsed.instructions).toBe('body')
+	})
+
+	it('handles CRLF line endings in the frontmatter fence', () => {
+		const md = '---\r\nname: crlf\r\ndescription: d\r\n---\r\n\r\nbody'
+		const parsed = parseSkillMd(md)
+		expect(parsed.name).toBe('crlf')
+		expect(parsed.description).toBe('d')
+	})
+
+	it('leaves name/description undefined for missing frontmatter keys', () => {
+		const parsed = parseSkillMd('---\nname: only-name\n---\n\nbody')
+		expect(parsed.name).toBe('only-name')
+		expect(parsed.description).toBeUndefined()
+		expect(parsed.instructions).toBe('body')
+	})
+
+	it('ignores non-string frontmatter values', () => {
+		const parsed = parseSkillMd('---\nname: 123\ndescription: [a, b]\n---\n\nbody')
+		expect(parsed.name).toBeUndefined()
+		expect(parsed.description).toBeUndefined()
+	})
+
+	it('does not throw on malformed YAML frontmatter', () => {
+		const parsed = parseSkillMd('---\nname: "unterminated\n---\n\nbody')
+		expect(parsed.instructions).toBe('body')
+		expect(parsed.name).toBeUndefined()
+	})
+})
+
+describe('validateSkill', () => {
+	const valid = { name: 'a-skill', description: 'a description', instructions: 'body' }
+
+	it('returns undefined for a valid skill', () => {
+		expect(validateSkill(valid)).toBeUndefined()
+	})
+
+	it('flags a missing name', () => {
+		expect(validateSkill({ ...valid, name: '' })).toBe('name is required')
+	})
+
+	it('flags a missing description', () => {
+		expect(validateSkill({ ...valid, description: '' })).toBe('description is required')
+	})
+
+	it('flags a missing body', () => {
+		expect(validateSkill({ ...valid, instructions: '' })).toBe('body is required')
+	})
+
+	it('rejects names with disallowed characters and echoes the value', () => {
+		expect(validateSkill({ ...valid, name: 'Bad Name!' })).toBe(
+			`name "Bad Name!" must only contain lowercase letters, digits or '-'`
+		)
+	})
+
+	it('accepts names of lowercase letters, digits and hyphens', () => {
+		expect(validateSkill({ ...valid, name: 'skill-123' })).toBeUndefined()
+	})
+
+	it('accepts a name exactly at the length limit but rejects one over', () => {
+		expect(validateSkill({ ...valid, name: 'a'.repeat(MAX_SKILL_NAME_LENGTH) })).toBeUndefined()
+		expect(validateSkill({ ...valid, name: 'a'.repeat(MAX_SKILL_NAME_LENGTH + 1) })).toBe(
+			`name is longer than ${MAX_SKILL_NAME_LENGTH} characters`
+		)
+	})
+
+	it('counts the description limit in code points, not UTF-16 units', () => {
+		// Astral emoji are 2 UTF-16 units but 1 code point each.
+		const desc = '😀'.repeat(MAX_SKILL_DESCRIPTION_LENGTH)
+		expect(validateSkill({ ...valid, description: desc })).toBeUndefined()
+		expect(validateSkill({ ...valid, description: desc + '😀' })).toBe(
+			`description is longer than ${MAX_SKILL_DESCRIPTION_LENGTH} characters`
+		)
+	})
+
+	it('counts the body limit in bytes', () => {
+		// A 4-byte emoji fills the byte budget four times faster than its char count.
+		const bodyAtLimit = 'a'.repeat(MAX_SKILL_INSTRUCTIONS_LENGTH)
+		expect(validateSkill({ ...valid, instructions: bodyAtLimit })).toBeUndefined()
+		expect(validateSkill({ ...valid, instructions: bodyAtLimit + 'a' })).toBe(
+			`body is longer than ${MAX_SKILL_INSTRUCTIONS_LENGTH} bytes`
+		)
+		const multibyte = '😀'.repeat(MAX_SKILL_INSTRUCTIONS_LENGTH / 4 + 1)
+		expect(validateSkill({ ...valid, instructions: multibyte })).toBe(
+			`body is longer than ${MAX_SKILL_INSTRUCTIONS_LENGTH} bytes`
+		)
+	})
+
+	it('reports the name issue first when several fields are invalid', () => {
+		expect(validateSkill({ name: '', description: '', instructions: '' })).toBe('name is required')
+	})
+})
+
+describe('parseAndValidateSkill', () => {
+	it('parses and validates a well-formed SKILL.md', () => {
+		const md = '---\nname: good-skill\ndescription: a good one\n---\n\nbody'
+		expect(parseAndValidateSkill(md)).toEqual({
+			skill: { name: 'good-skill', description: 'a good one', instructions: 'body' }
+		})
+	})
+
+	it('uses nameOverride instead of the frontmatter name', () => {
+		const md = '---\nname: frontmatter-name\ndescription: d\n---\n\nbody'
+		const result = parseAndValidateSkill(md, 'folder-name')
+		expect(result).toEqual({
+			skill: { name: 'folder-name', description: 'd', instructions: 'body' }
+		})
+	})
+
+	it('validates the nameOverride, not the frontmatter name', () => {
+		const md = '---\nname: valid-frontmatter\ndescription: d\n---\n\nbody'
+		expect(parseAndValidateSkill(md, 'Bad Folder!')).toEqual({
+			error: `name "Bad Folder!" must only contain lowercase letters, digits or '-'`
+		})
+	})
+
+	it('does not fall back to the frontmatter name for an empty override', () => {
+		const md = '---\nname: has-name\ndescription: d\n---\n\nbody'
+		expect(parseAndValidateSkill(md, '')).toEqual({ error: 'name is required' })
+	})
+
+	it('returns an error for a missing description', () => {
+		expect(parseAndValidateSkill('---\nname: s\n---\n\nbody')).toEqual({
+			error: 'description is required'
+		})
+	})
+
+	it('returns an error for an empty body', () => {
+		expect(parseAndValidateSkill('---\nname: s\ndescription: d\n---\n\n')).toEqual({
+			error: 'body is required'
+		})
+	})
+})
+
+describe('buildSkillMd', () => {
+	it('round-trips a skill through parseSkillMd', () => {
+		const skill = { name: 'round-trip', description: 'desc', instructions: '# Body\n\ntext' }
+		const parsed = parseSkillMd(buildSkillMd(skill))
+		expect(parsed.name).toBe(skill.name)
+		expect(parsed.description).toBe(skill.description)
+		expect(parsed.instructions).toBe(skill.instructions)
+	})
+
+	it('quotes descriptions with YAML-special characters so they round-trip', () => {
+		const skill = {
+			name: 'colon-desc',
+			description: 'value: with colon, #hash and : more',
+			instructions: 'body'
+		}
+		const parsed = parseSkillMd(buildSkillMd(skill))
+		expect(parsed.description).toBe(skill.description)
+		expect(validateSkill(skill)).toBeUndefined()
+	})
+})
diff --git a/frontend/src/lib/components/workspaceSettings/aiSkills.ts b/frontend/src/lib/components/workspaceSettings/aiSkills.ts
new file mode 100644
index 0000000000..aeb148f7c1
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/aiSkills.ts
@@ -0,0 +1,101 @@
+import YAML from 'yaml'
+import { z } from 'zod'
+
+export type SkillUpload = { name: string; description: string; instructions: string }
+
+// `name` + `description` mirror the Claude SKILL.md spec (counted in characters);
+// the body is a byte-bounded payload. Keep these in sync with backend `validate_skill`.
+export const MAX_SKILL_NAME_LENGTH = 64
+export const MAX_SKILL_DESCRIPTION_LENGTH = 1_024
+export const MAX_SKILL_INSTRUCTIONS_LENGTH = 64 * 1024
+
+const textEncoder = new TextEncoder()
+
+// Single source of truth for skill field validation, shared by the paste/edit
+// modal and the folder importer. Lengths are code-point / byte bounded to match
+// the backend, so `.refine` (not `.max`, which counts UTF-16 units) is used.
+export const skillSchema = z.object({
+	name: z
+		.string()
+		.min(1, 'name is required')
+		.refine(
+			(v) => [...v].length <= MAX_SKILL_NAME_LENGTH,
+			`name is longer than ${MAX_SKILL_NAME_LENGTH} characters`
+		)
+		.refine((v) => /^[a-z0-9-]+$/.test(v), {
+			error: (iss) =>
+				`name ${JSON.stringify(iss.input)} must only contain lowercase letters, digits or '-'`
+		}),
+	description: z
+		.string()
+		.min(1, 'description is required')
+		.refine(
+			(v) => [...v].length <= MAX_SKILL_DESCRIPTION_LENGTH,
+			`description is longer than ${MAX_SKILL_DESCRIPTION_LENGTH} characters`
+		),
+	instructions: z
+		.string()
+		.min(1, 'body is required')
+		.refine(
+			(v) => textEncoder.encode(v).byteLength <= MAX_SKILL_INSTRUCTIONS_LENGTH,
+			`body is longer than ${MAX_SKILL_INSTRUCTIONS_LENGTH} bytes`
+		)
+})
+
+/** First validation error for a skill, or `undefined` if it is valid. */
+export function validateSkill(skill: SkillUpload): string | undefined {
+	const result = skillSchema.safeParse(skill)
+	return result.success ? undefined : result.error.issues[0]?.message
+}
+
+/** Split a SKILL.md into its frontmatter `name`/`description` and the markdown body. */
+export function parseSkillMd(raw: string): {
+	name: string | undefined
+	description: string | undefined
+	instructions: string
+} {
+	const text = raw.replace(/^/, '')
+	const fm = /^---\s*\r?\n([\s\S]*?)\r?\n---\s*\r?\n?/.exec(text)
+	if (!fm) {
+		return { name: undefined, description: undefined, instructions: text.trim() }
+	}
+	let name: string | undefined
+	let description: string | undefined
+	try {
+		const data = YAML.parse(fm[1]) ?? {}
+		if (typeof data?.name === 'string') name = data.name.trim()
+		if (typeof data?.description === 'string') description = data.description.trim()
+	} catch {
+		// Malformed frontmatter — fall through so the skill is reported as invalid
+		// rather than silently dropped.
+	}
+	return { name, description, instructions: text.slice(fm[0].length).trim() }
+}
+
+/**
+ * Parse a SKILL.md and validate it in one step. `nameOverride` lets the folder
+ * importer supply the skill name from its containing folder instead of the
+ * frontmatter. Returns the validated skill or the first error message.
+ */
+export function parseAndValidateSkill(
+	raw: string,
+	nameOverride?: string
+): { skill: SkillUpload } | { error: string } {
+	const parsed = parseSkillMd(raw)
+	const candidate: SkillUpload = {
+		name: nameOverride ?? parsed.name ?? '',
+		description: parsed.description ?? '',
+		instructions: parsed.instructions
+	}
+	const error = validateSkill(candidate)
+	return error ? { error } : { skill: candidate }
+}
+
+/** Reconstruct a SKILL.md from its stored parts for editing/rendering. */
+export function buildSkillMd(skill: SkillUpload): string {
+	const frontmatter = YAML.stringify({
+		name: skill.name,
+		description: skill.description
+	}).trimEnd()
+	return `---\n${frontmatter}\n---\n\n${skill.instructions}\n`
+}
diff --git a/frontend/src/lib/components/workspaceSettings/datatableMigrationUtils.ts b/frontend/src/lib/components/workspaceSettings/datatableMigrationUtils.ts
new file mode 100644
index 0000000000..ed046418f2
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/datatableMigrationUtils.ts
@@ -0,0 +1,30 @@
+import { WorkspaceService, type DatatableMigrationWithStatus } from '$lib/gen'
+
+/**
+ * Migrations that are defined but not yet applied. A newly-created migration
+ * always gets the highest timestamp, so every pending migration is "earlier":
+ * running the new one on its own would apply it ahead of them (out of order).
+ */
+export function pendingMigrations(
+	migrations: DatatableMigrationWithStatus[]
+): DatatableMigrationWithStatus[] {
+	return migrations.filter((m) => m.status !== 'ran')
+}
+
+/** Fetch the data table's migration status and return the pending ones. */
+export async function fetchPendingMigrations(
+	workspace: string,
+	datatableName: string
+): Promise<DatatableMigrationWithStatus[]> {
+	const { migrations } = await WorkspaceService.getDatatableMigrationsStatus({
+		workspace,
+		datatableName
+	})
+	return pendingMigrations(migrations)
+}
+
+/** Confirmation copy shown before running a just-created migration ahead of
+ * `count` still-pending earlier ones (mirrors the row-level Run warning). */
+export function outOfOrderRunMessage(count: number): string {
+	return `${count} earlier migration(s) have not been run yet. This migration might depend on them. Run it anyway?`
+}
diff --git a/frontend/src/lib/components/workspaceSettings/utils.svelte.ts b/frontend/src/lib/components/workspaceSettings/utils.svelte.ts
index 3d5d70afec..6925be9c04 100644
--- a/frontend/src/lib/components/workspaceSettings/utils.svelte.ts
+++ b/frontend/src/lib/components/workspaceSettings/utils.svelte.ts
@@ -7,3 +7,31 @@ export let isCustomInstanceDbEnabled = derived(
 	[superadmin],
 	([superadmin_]) => superadmin_ && !isCloudHosted()
 )
+
+// Postgres caps identifiers at 63 bytes; the backend rejects longer db names.
+const MAX_INSTANCE_DB_NAME_LEN = 63
+
+// Builds a default instance database name scoped to the workspace (e.g. `dt_myworkspace`),
+// appending `_1`, `_2`... until an unused name is found. Workspace ids may contain hyphens,
+// which are not valid in unquoted postgres identifiers, so they are replaced with underscores.
+// The result is truncated to keep it within the postgres identifier length limit.
+export function getUnusedInstanceDbName(
+	prefix: string,
+	workspaceId: string,
+	usedNames: Iterable<string>
+): string {
+	const used = new Set(usedNames)
+	const base = `${prefix}_${workspaceId.toLowerCase().replace(/-/g, '_')}`.slice(
+		0,
+		MAX_INSTANCE_DB_NAME_LEN
+	)
+	if (!used.has(base)) return base
+	let i = 1
+	let candidate: string
+	do {
+		const suffix = `_${i}`
+		candidate = base.slice(0, MAX_INSTANCE_DB_NAME_LEN - suffix.length) + suffix
+		i++
+	} while (used.has(candidate))
+	return candidate
+}
diff --git a/frontend/src/lib/components/workspaceSettings/utils.test.ts b/frontend/src/lib/components/workspaceSettings/utils.test.ts
new file mode 100644
index 0000000000..68115e6a62
--- /dev/null
+++ b/frontend/src/lib/components/workspaceSettings/utils.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from 'vitest'
+
+import { getUnusedInstanceDbName } from './utils.svelte'
+
+describe('getUnusedInstanceDbName', () => {
+	it('scopes the name to the workspace with the given prefix', () => {
+		expect(getUnusedInstanceDbName('dt', 'myworkspace', [])).toBe('dt_myworkspace')
+		expect(getUnusedInstanceDbName('dl', 'myworkspace', [])).toBe('dl_myworkspace')
+	})
+
+	it('lowercases and replaces hyphens with underscores', () => {
+		expect(getUnusedInstanceDbName('dt', 'My-Team', [])).toBe('dt_my_team')
+	})
+
+	it('appends an incrementing suffix when the name is already used', () => {
+		expect(getUnusedInstanceDbName('dt', 'abc', ['dt_abc'])).toBe('dt_abc_1')
+		expect(getUnusedInstanceDbName('dt', 'abc', ['dt_abc', 'dt_abc_1'])).toBe('dt_abc_2')
+	})
+
+	it('skips over already-used suffixed names', () => {
+		expect(getUnusedInstanceDbName('dt', 'abc', ['dt_abc', 'dt_abc_2'])).toBe('dt_abc_1')
+		expect(getUnusedInstanceDbName('dt', 'abc', ['dt_abc', 'dt_abc_1', 'dt_abc_2'])).toBe(
+			'dt_abc_3'
+		)
+	})
+
+	it('accepts any iterable of used names', () => {
+		expect(getUnusedInstanceDbName('dt', 'abc', new Set(['dt_abc']))).toBe('dt_abc_1')
+	})
+
+	it('truncates the base name to the postgres 63-char identifier limit', () => {
+		const longId = 'w'.repeat(100)
+		const name = getUnusedInstanceDbName('dt', longId, [])
+		expect(name.length).toBe(63)
+		expect(name.startsWith('dt_')).toBe(true)
+	})
+
+	it('keeps the result within 63 chars even when appending a suffix', () => {
+		const longId = 'w'.repeat(100)
+		const base = getUnusedInstanceDbName('dt', longId, []) // length 63
+		const name = getUnusedInstanceDbName('dt', longId, [base])
+		expect(name.length).toBeLessThanOrEqual(63)
+		expect(name.endsWith('_1')).toBe(true)
+	})
+})
diff --git a/frontend/src/lib/editorLangUtils.ts b/frontend/src/lib/editorLangUtils.ts
index 3152eff946..5706ad8bcb 100644
--- a/frontend/src/lib/editorLangUtils.ts
+++ b/frontend/src/lib/editorLangUtils.ts
@@ -85,6 +85,22 @@ export function extToLang(ext: string) {
 			return 'graphql'
 		case 'css':
 			return 'css'
+		case 'scss':
+			return 'scss'
+		case 'less':
+			return 'less'
+		case 'html':
+		case 'htm':
+			return 'html'
+		case 'md':
+		case 'markdown':
+			return 'markdown'
+		case 'xml':
+			return 'xml'
+		case 'svg':
+			return 'xml'
+		case 'txt':
+			return 'plaintext'
 		case 'yml':
 			return 'ansible'
 		case 'cs':
diff --git a/frontend/src/lib/infer.ts b/frontend/src/lib/infer.ts
index 7c8b83a64f..a70dd7c745 100644
--- a/frontend/src/lib/infer.ts
+++ b/frontend/src/lib/infer.ts
@@ -68,6 +68,7 @@ import wasmUrlWac from 'windmill-parser-wasm-wac/windmill_parser_wasm_bg.wasm?ur
 import { workspaceStore } from './stores.js'
 import { argSigToJsonSchemaType } from 'windmill-utils-internal'
 import { type AssetWithAccessType } from './components/assets/lib.js'
+import { type ColumnLineage } from './components/assets/AssetGraph/parsePipelineAnnotations'
 
 const loadSchemaLastRun = writable<
 	| [
@@ -169,6 +170,10 @@ type InferAssetsResult =
 			assets: AssetWithAccessType[]
 			sql_queries?: InferAssetsSqlQueryDetails[]
 			columns?: Record<string, AssetUsageAccessType>
+			// Body-inferred column lineage (DuckDB SQL AST). Present once the
+			// `windmill-parser-wasm-asset` package is rebuilt with the inference;
+			// the spread below already forwards it from the parser output.
+			column_lineage?: ColumnLineage[]
 	  }
 	| {
 			status: 'error'
diff --git a/frontend/src/lib/mcpEndpointTools.ts b/frontend/src/lib/mcpEndpointTools.ts
index c5bc08d606..8a46163009 100644
--- a/frontend/src/lib/mcpEndpointTools.ts
+++ b/frontend/src/lib/mcpEndpointTools.ts
@@ -17,25 +17,53 @@ export interface EndpointTool {
 
 export const mcpEndpointTools: EndpointTool[] = [
     {
-        name: "queryDocumentation",
-        description: "query Windmill AI documentation assistant (EE only)",
+        name: "searchDocs",
+        description: "Full-text search across the entire Windmill documentation. Provide one or more keywords; returns the most relevant docs pages, each with its Source URL and short matching snippets. Use this FIRST to find relevant pages by their content (a flag, function, error message, config key or concept). If the snippets answer the question, answer directly; otherwise call readDocsPage with a returned Source URL to read more.",
         instructions: "",
-        path: "/inkeep",
-        method: "POST",
+        path: "/docs/search",
+        method: "GET",
         pathParamsSchema: undefined,
-        queryParamsSchema: undefined,
-        bodySchema: {
+        queryParamsSchema: {
         "type": "object",
         "properties": {
                 "query": {
                         "type": "string",
-                        "description": "The documentation query to send to the AI assistant"
+                        "description": "Keywords to search for in the documentation body, e.g. \"chromium worker tag\" or \"retry exponential backoff\". Fewer, more distinctive words match better."
                 }
         },
         "required": [
                 "query"
         ]
 },
+        bodySchema: undefined,
+        pathFieldRenames: undefined,
+        queryFieldRenames: undefined,
+        bodyFieldRenames: undefined
+    },
+    {
+        name: "readDocsPage",
+        description: "Fetch the markdown of a single Windmill documentation page. Provide the `url` of a page found via searchDocs (its Source URL). If the page is large, this returns its list of section headings instead of the full content; call again with the `section` argument set to one of those headings to read that section.",
+        instructions: "",
+        path: "/docs/page",
+        method: "GET",
+        pathParamsSchema: undefined,
+        queryParamsSchema: {
+        "type": "object",
+        "properties": {
+                "url": {
+                        "type": "string",
+                        "description": "The docs page to read, as a Source URL returned by searchDocs (e.g. https://www.windmill.dev/docs/core_concepts/jobs). A bare path (e.g. /docs/core_concepts/jobs) is also accepted."
+                },
+                "section": {
+                        "type": "string",
+                        "description": "Optional. A heading title from the page outline to read just that section instead of the full page."
+                }
+        },
+        "required": [
+                "url"
+        ]
+},
+        bodySchema: undefined,
         pathFieldRenames: undefined,
         queryFieldRenames: undefined,
         bodyFieldRenames: undefined
@@ -94,6 +122,9 @@ export const mcpEndpointTools: EndpointTool[] = [
                         "items": {
                                 "type": "string"
                         }
+                },
+                "ws_specific": {
+                        "type": "boolean"
                 }
         },
         "required": [
@@ -179,6 +210,9 @@ export const mcpEndpointTools: EndpointTool[] = [
                                 "type": "string"
                         }
                 },
+                "ws_specific": {
+                        "type": "boolean"
+                },
                 "path__body": {
                         "type": "string",
                         "description": "The path to the variable (body parameter)"
@@ -220,6 +254,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                 "include_encrypted": {
                         "type": "boolean",
                         "description": "ask to include the encrypted value if secret and decrypt secret is not true (default: false)\n"
+                },
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
                 }
         },
         "required": []
@@ -270,6 +308,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                 "label": {
                         "type": "string",
                         "description": "Filter by label"
+                },
+                "include_draft_only": {
+                        "type": "boolean",
+                        "description": "When true, append per-user draft variables whose path has no\ndeployed variable. Synthesized rows carry `draft_only: true`\nso the home page can render a \"Draft\" badge.\n"
                 }
         },
         "required": []
@@ -319,6 +361,9 @@ export const mcpEndpointTools: EndpointTool[] = [
                         "items": {
                                 "type": "string"
                         }
+                },
+                "ws_specific": {
+                        "type": "boolean"
                 }
         },
         "required": [
@@ -393,6 +438,9 @@ export const mcpEndpointTools: EndpointTool[] = [
                                 "type": "string"
                         }
                 },
+                "ws_specific": {
+                        "type": "boolean"
+                },
                 "path__body": {
                         "type": "string",
                         "description": "The path to the resource (body parameter)"
@@ -424,7 +472,16 @@ export const mcpEndpointTools: EndpointTool[] = [
                 "path"
         ]
 },
-        queryParamsSchema: undefined,
+        queryParamsSchema: {
+        "type": "object",
+        "properties": {
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
+                }
+        },
+        "required": []
+},
         bodySchema: undefined,
         pathFieldRenames: undefined,
         queryFieldRenames: undefined,
@@ -479,6 +536,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                 "label": {
                         "type": "string",
                         "description": "Filter by label"
+                },
+                "include_draft_only": {
+                        "type": "boolean",
+                        "description": "When true, append per-user draft resources whose path has\nno deployed resource. Synthesized rows carry\n`draft_only: true`.\n"
                 }
         },
         "required": []
@@ -728,6 +789,10 @@ export const mcpEndpointTools: EndpointTool[] = [
         "properties": {
                 "with_starred_info": {
                         "type": "boolean"
+                },
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
                 }
         },
         "required": []
@@ -856,6 +921,10 @@ export const mcpEndpointTools: EndpointTool[] = [
         "properties": {
                 "with_starred_info": {
                         "type": "boolean"
+                },
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
                 }
         },
         "required": []
@@ -1193,6 +1262,14 @@ export const mcpEndpointTools: EndpointTool[] = [
                                         "language"
                                 ]
                         }
+                },
+                "temp_script_refs": {
+                        "type": "object",
+                        "nullable": true,
+                        "description": "Map of relative-import script path -> temp storage hash so the preview job resolves those imports from not-yet-deployed local content instead of the deployed script",
+                        "additionalProperties": {
+                                "type": "string"
+                        }
                 }
         },
         "required": [
@@ -1465,6 +1542,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                         "type": "boolean",
                         "description": "filter on successful jobs"
                 },
+                "status": {
+                        "type": "string",
+                        "description": "filter on the exact completed job status. Unlike `success=true` (which also matches `skipped`), `status=success` matches only `success`.. Possible values: success, failure, canceled, skipped"
+                },
                 "all_workspaces": {
                         "type": "boolean",
                         "description": "get jobs from all workspaces (only valid if request come from the `admins` workspace)"
@@ -1473,6 +1554,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                         "type": "boolean",
                         "description": "is not a scheduled job"
                 },
+                "excludes_entrypoint_override": {
+                        "type": "boolean",
+                        "description": "exclude jobs that were started with a `_ENTRYPOINT_OVERRIDE` arg (e.g. dynamic-select helper runs and preprocessor previews)"
+                },
                 "broad_filter": {
                         "type": "string",
                         "description": "broad search across multiple fields (case-insensitive substring match on path, tag, schedule path, trigger kind, label)"
@@ -1511,6 +1596,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                 },
                 "no_code": {
                         "type": "boolean"
+                },
+                "approval_token": {
+                        "type": "string",
+                        "description": "Approval token granting read access to the job when not logged in. The token must be the one issued for this job's flow (i.e. the flow id used when generating the approval URL)."
                 }
         },
         "required": []
@@ -1565,7 +1654,7 @@ export const mcpEndpointTools: EndpointTool[] = [
         "properties": {
                 "path": {
                         "type": "string",
-                        "description": "The unique path identifier for this schedule"
+                        "description": "The unique Windmill path for this schedule. Must be of the form `u/<user>/<path>` or `f/<folder>/<path>`."
                 },
                 "schedule": {
                         "type": "string",
@@ -2005,7 +2094,16 @@ export const mcpEndpointTools: EndpointTool[] = [
                 "path"
         ]
 },
-        queryParamsSchema: undefined,
+        queryParamsSchema: {
+        "type": "object",
+        "properties": {
+                "get_draft": {
+                        "type": "boolean",
+                        "description": "When true, overlay the authed user's draft (if any) onto the deployed payload."
+                }
+        },
+        "required": []
+},
         bodySchema: undefined,
         pathFieldRenames: undefined,
         queryFieldRenames: undefined,
@@ -2064,6 +2162,10 @@ export const mcpEndpointTools: EndpointTool[] = [
                 "label": {
                         "type": "string",
                         "description": "Filter by label"
+                },
+                "include_draft_only": {
+                        "type": "boolean",
+                        "description": "When true, append per-user draft schedules whose path has\nno deployed schedule. Synthesized rows carry\n`draft_only: true`.\n"
                 }
         },
         "required": []
diff --git a/frontend/src/lib/navigation.test.ts b/frontend/src/lib/navigation.test.ts
new file mode 100644
index 0000000000..b6233d44f8
--- /dev/null
+++ b/frontend/src/lib/navigation.test.ts
@@ -0,0 +1,52 @@
+import { describe, it, expect } from 'vitest'
+import { buildFilterUrl } from './navigation'
+
+// Parse the (un-based) app path the builder returns against a dummy origin so we can
+// assert on pathname / searchParams / hash without caring about ordering.
+function parse(appPath: string): URL {
+	return new URL(appPath, 'http://x')
+}
+
+describe('buildFilterUrl', () => {
+	it('drops keys not in validKeys, and nullish/empty values', () => {
+		const u = parse(
+			buildFilterUrl(
+				'/runs',
+				{
+					status: 'failure',
+					path: 'f/foo/bar',
+					bogus: 'x',
+					user: '',
+					tag: null,
+					worker: undefined
+				},
+				{ validKeys: ['status', 'path', 'user', 'tag', 'worker'] }
+			)
+		)
+		expect(u.pathname).toBe('/runs')
+		expect(u.searchParams.get('status')).toBe('failure')
+		expect(u.searchParams.get('path')).toBe('f/foo/bar')
+		expect(u.searchParams.has('bogus')).toBe(false) // not in validKeys
+		expect(u.searchParams.has('user')).toBe(false) // empty string dropped
+		expect(u.searchParams.has('tag')).toBe(false) // null dropped
+		expect(u.searchParams.has('worker')).toBe(false) // undefined dropped
+	})
+
+	it('keeps every key when no validKeys are given', () => {
+		const u = parse(buildFilterUrl('/runs', { anything: 'yes' }))
+		expect(u.searchParams.get('anything')).toBe('yes')
+	})
+
+	it('appends a hash and no query when there are no params', () => {
+		const u = parse(buildFilterUrl('/schedules', {}, { hash: 'f/a/b' }))
+		expect(u.pathname).toBe('/schedules')
+		expect(u.search).toBe('')
+		expect(u.hash).toBe('#f/a/b')
+	})
+
+	it('combines params and hash', () => {
+		const u = parse(buildFilterUrl('/schedules', { path: 'f/x' }, { hash: 'f/a/b' }))
+		expect(u.searchParams.get('path')).toBe('f/x')
+		expect(u.hash).toBe('#f/a/b')
+	})
+})
diff --git a/frontend/src/lib/navigation.ts b/frontend/src/lib/navigation.ts
index 96545718b2..fd3a35800e 100644
--- a/frontend/src/lib/navigation.ts
+++ b/frontend/src/lib/navigation.ts
@@ -1,5 +1,6 @@
 import { goto as svelteGoto } from '$app/navigation'
 import { base as svelteBase } from '$app/paths'
+import { serializeParam } from '$lib/svelte5UtilsKit.svelte'
 
 export function goto(path: string, options = {}) {
 	if (svelteBase == '' || path.startsWith('?')) {
@@ -10,6 +11,31 @@ export function goto(path: string, options = {}) {
 	}
 }
 
+/**
+ * Build an in-app deep-link to `pathname` with query-param filters, encoded exactly
+ * as the pages write them (via `serializeParam`) so `useUrlSyncedFilterInstance`
+ * round-trips them back into filter state. Nullish/empty values are dropped; when
+ * `validKeys` is provided, unknown keys are dropped too (structured output guarantees
+ * shape, not truth). Returns an un-prefixed app path — pass it to `goto`, which adds
+ * the SvelteKit base.
+ */
+export function buildFilterUrl(
+	pathname: string,
+	values: Record<string, unknown>,
+	opts?: { validKeys?: Iterable<string>; hash?: string }
+): string {
+	const allow = opts?.validKeys ? new Set(opts.validKeys) : undefined
+	const sp = new URLSearchParams()
+	for (const [key, value] of Object.entries(values)) {
+		if (value === undefined || value === null || value === '') continue
+		if (allow && !allow.has(key)) continue
+		sp.set(key, serializeParam(value))
+	}
+	const qs = sp.toString()
+	const hash = opts?.hash ? `#${opts.hash}` : ''
+	return qs ? `${pathname}?${qs}${hash}` : `${pathname}${hash}`
+}
+
 export async function setQuery(
 	url: URL,
 	key: string,
diff --git a/frontend/src/lib/path.ts b/frontend/src/lib/path.ts
index 98840803fe..8b07a10a13 100644
--- a/frontend/src/lib/path.ts
+++ b/frontend/src/lib/path.ts
@@ -2,10 +2,10 @@ import { get } from 'svelte/store'
 import { ScriptService } from './gen'
 import { workspaceStore } from './stores'
 
-export async function findNextAvailablePath(path: string): Promise<string> {
+export async function findNextAvailablePath(path: string, workspace?: string): Promise<string> {
 	try {
 		await ScriptService.getScriptByPath({
-			workspace: get(workspaceStore)!,
+			workspace: workspace ?? get(workspaceStore)!,
 			path
 		})
 
@@ -17,7 +17,7 @@ export async function findNextAvailablePath(path: string): Promise<string> {
 
 		path = `${path}_${Number(version) + 1}`
 
-		return findNextAvailablePath(path)
+		return findNextAvailablePath(path, workspace)
 	} catch (e) {
 		// Catching an error means the path is available
 		return path
diff --git a/frontend/src/lib/rawAppDeploy.ts b/frontend/src/lib/rawAppDeploy.ts
index 3439cb6b6d..b13951c5f8 100644
--- a/frontend/src/lib/rawAppDeploy.ts
+++ b/frontend/src/lib/rawAppDeploy.ts
@@ -75,7 +75,11 @@ export async function deployRawAppDraft(
 					summary,
 					policy,
 					deployment_message: deploymentMessage,
-					custom_path: isAdmin ? (value.custom_path ?? '') : undefined
+					custom_path: isAdmin ? (value.custom_path ?? '') : undefined,
+					// Preserve the policy's on_behalf_of: this draft-deploy path has no
+					// on-behalf-of selector, so without the flag the backend resets it to
+					// the deploying user (gated server-side by can_preserve_on_behalf_of).
+					preserve_on_behalf_of: policy.on_behalf_of ? true : undefined
 				},
 				js: bundle.js,
 				css: bundle.css
@@ -91,7 +95,9 @@ export async function deployRawAppDraft(
 					summary,
 					policy,
 					deployment_message: deploymentMessage,
-					custom_path: value.custom_path
+					custom_path: value.custom_path,
+					// Preserve the policy's on_behalf_of (see update branch above).
+					preserve_on_behalf_of: policy.on_behalf_of ? true : undefined
 				},
 				js: bundle.js,
 				css: bundle.css
diff --git a/frontend/src/lib/scripts.ts b/frontend/src/lib/scripts.ts
index f1518f4368..bf88dafb9b 100644
--- a/frontend/src/lib/scripts.ts
+++ b/frontend/src/lib/scripts.ts
@@ -189,7 +189,12 @@ export function processLangs(selected: string | undefined, langs: string[]): str
 
 export const defaultScriptLanguages = Object.fromEntries(scriptLanguagesArray)
 
-export async function getScriptByPath(path: string): Promise<{
+export async function getScriptByPath(
+	path: string,
+	// The acting workspace when called from a session live editor; defaults to
+	// the navigation workspace for full-page callers.
+	workspace?: string
+): Promise<{
 	content: string
 	language: SupportedLanguage
 	schema: any
@@ -216,7 +221,7 @@ export async function getScriptByPath(path: string): Promise<{
 		}
 	} else {
 		const script = await ScriptService.getScriptByPath({
-			workspace: get(workspaceStore)!,
+			workspace: workspace ?? get(workspaceStore)!,
 			path: path ?? ''
 		})
 		return {
@@ -234,9 +239,9 @@ export async function getScriptByPath(path: string): Promise<{
 	}
 }
 
-export async function getLatestHashForScript(path: string): Promise<string> {
+export async function getLatestHashForScript(path: string, workspace?: string): Promise<string> {
 	const script = await ScriptService.getScriptByPath({
-		workspace: get(workspaceStore)!,
+		workspace: workspace ?? get(workspaceStore)!,
 		path: path ?? ''
 	})
 	return script.hash
diff --git a/frontend/src/lib/stores.ts b/frontend/src/lib/stores.ts
index 92c8f18946..0449796d21 100644
--- a/frontend/src/lib/stores.ts
+++ b/frontend/src/lib/stores.ts
@@ -27,9 +27,12 @@ export interface UserExt {
 	groups: string[]
 	pgroups: string[]
 	folders: string[]
+	folders_read: string[]
 	folders_owners: string[]
 	is_service_account?: boolean
 	impersonating_email?: string
+	// true when the user is a superadmin viewing a workspace they are not a member of
+	non_member?: boolean
 }
 
 export interface UserWorkspace {
@@ -39,6 +42,8 @@ export interface UserWorkspace {
 	color?: string
 	operator_settings?: OperatorSettings
 	parent_workspace_id?: string | null
+	is_dev_workspace?: boolean
+	dev_workspace_label?: string | null
 	disabled: boolean
 }
 
@@ -185,6 +190,10 @@ export interface SQLSchema {
 	schema: SQLBaseSchema
 	publicOnly: boolean | undefined
 	stringified: string
+	/** MySQL only: the connection's default database (`DATABASE()`), surfaced by the
+	 * introspection script. Lets the table picker render the default db's tables
+	 * unprefixed even when the connection can also see other (non-system) schemas. */
+	defaultDb?: string
 }
 
 export interface GraphqlSchema {
diff --git a/frontend/src/lib/svelte5UtilsKit.svelte.ts b/frontend/src/lib/svelte5UtilsKit.svelte.ts
index 921d41614e..139d6985df 100644
--- a/frontend/src/lib/svelte5UtilsKit.svelte.ts
+++ b/frontend/src/lib/svelte5UtilsKit.svelte.ts
@@ -9,7 +9,7 @@ export type SearchParamsResult<S extends z.ZodType> =
 		: z.infer<S> & Record<string, unknown>
 
 /** Serialize a value to a URL search param string. Primitives are written as-is; anything else is JSON. */
-function serializeParam(value: unknown): string {
+export function serializeParam(value: unknown): string {
 	if (typeof value === 'string') return value
 	if (typeof value === 'number') return String(value)
 	if (typeof value === 'boolean') return String(value)
diff --git a/frontend/src/lib/userDraft.svelte.ts b/frontend/src/lib/userDraft.svelte.ts
index 8f7942b9e4..8437a1b87c 100644
--- a/frontend/src/lib/userDraft.svelte.ts
+++ b/frontend/src/lib/userDraft.svelte.ts
@@ -204,6 +204,7 @@ const DRAFT_COMPARE_IGNORED_FIELDS = [
 	'edited_by',
 	'workspace_id',
 	'version_id',
+	'parent_version',
 	'is_draft'
 ] as const
 
diff --git a/frontend/src/lib/userDraftDbMigration.ts b/frontend/src/lib/userDraftDbMigration.ts
index 824cd1c952..4c3079ea94 100644
--- a/frontend/src/lib/userDraftDbMigration.ts
+++ b/frontend/src/lib/userDraftDbMigration.ts
@@ -1,11 +1,12 @@
 /**
  * One-off migration from the localStorage UserDraft autosave to the
- * DB-backed `draft` table. Runs after `migrateLegacyUserDrafts` (which
- * produces the `userdraft/w/{workspace}/{kind}/{path}` keys this reads),
- * POSTing each to `/drafts/update` and clearing the source key only on
- * success — so it's idempotent without a sentinel; failed entries retry next
- * mount. Not workspace-gated: keys embed their own workspace and the token
- * covers all of them, so gating would orphan other-workspace entries.
+ * DB-backed `draft` table. Reads the workspace-scoped
+ * `userdraft/w/{workspace}/{kind}/{path}` keys (written by the editor during
+ * the interim LS-backed phase, so the embedded workspace is correct), POSTing
+ * each to `/drafts/update` and clearing the source key only on success — so
+ * it's idempotent without a sentinel; failed entries retry next mount. Not
+ * workspace-gated: keys embed their own workspace and the token covers all of
+ * them, so gating would orphan other-workspace entries.
  *
  * Before uploading, each draft is compared against its deployed version
  * (script / flow / app); a draft that's deep-equal to what's deployed carries
diff --git a/frontend/src/lib/userDraftLegacyMigration.test.ts b/frontend/src/lib/userDraftLegacyMigration.test.ts
index 7069929897..f7963e55a0 100644
--- a/frontend/src/lib/userDraftLegacyMigration.test.ts
+++ b/frontend/src/lib/userDraftLegacyMigration.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach } from 'vitest'
 import {
-	migrateLegacyUserDrafts,
+	purgeLegacyUserDrafts,
 	__resetUserDraftLegacyMigrationForTesting
 } from './userDraftLegacyMigration'
 
@@ -8,18 +8,12 @@ function encodeLegacy(value: unknown): string {
 	return btoa(encodeURIComponent(JSON.stringify(value)))
 }
 
-function wrapped<V>(value: V): string {
-	return JSON.stringify({ value })
-}
-
-// Read a migrated entry, strip the GC `lastWrittenAt` stamp so assertions
-// can match the `{ value }` shape regardless of when the migration ran.
-function storedShape(key: string): string | null {
-	const raw = localStorage.getItem(key)
-	if (raw == null) return null
-	const parsed = JSON.parse(raw)
-	delete parsed.lastWrittenAt
-	return JSON.stringify(parsed)
+const legacyApp = {
+	grid: [],
+	fullscreen: false,
+	theme: undefined,
+	unusedInlineScripts: [],
+	hiddenInlineScripts: []
 }
 
 beforeEach(() => {
@@ -27,197 +21,110 @@ beforeEach(() => {
 	__resetUserDraftLegacyMigrationForTesting()
 })
 
-describe('migrateLegacyUserDrafts', () => {
-	it('migrates a legacy app draft to the workspace-scoped key with a { value } wrapper', () => {
-		// Shape mirrors what the legacy AppEditor wrote: `encodeState($appStore)`,
-		// i.e. the inner App value, not the wrapping AppWithLastVersion.
-		const legacyApp = {
-			grid: [],
-			fullscreen: false,
-			theme: undefined,
-			unusedInlineScripts: [],
-			hiddenInlineScripts: []
-		}
+describe('purgeLegacyUserDrafts', () => {
+	it('drops a recognised legacy app draft without re-creating it under any key', () => {
 		localStorage.setItem('app-u/me/dashboard', encodeLegacy(legacyApp))
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
 		expect(localStorage.getItem('app-u/me/dashboard')).toBeNull()
-		expect(storedShape('userdraft/w/main/app/u/me/dashboard')).toBe(wrapped(legacyApp))
+		// The workspace-blind key is gone, NOT promoted to a guessed workspace.
+		expect(localStorage.getItem('userdraft/w/main/app/u/me/dashboard')).toBeNull()
 	})
 
-	it('migrates a legacy empty-path app draft (the `app` literal key)', () => {
-		const legacyApp = {
-			grid: [],
-			fullscreen: false,
-			unusedInlineScripts: [],
-			hiddenInlineScripts: []
-		}
+	it('drops the empty-path legacy keys (`app` / `flow` / `rawapp` literals)', () => {
 		localStorage.setItem('app', encodeLegacy(legacyApp))
+		localStorage.setItem('flow', encodeLegacy({ flow: { summary: '', value: { modules: [] } } }))
+		localStorage.setItem('rawapp', encodeLegacy({ files: {}, runnables: {}, data: {} }))
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
 		expect(localStorage.getItem('app')).toBeNull()
-		expect(storedShape('userdraft/w/main/app/')).toBe(wrapped(legacyApp))
+		expect(localStorage.getItem('flow')).toBeNull()
+		expect(localStorage.getItem('rawapp')).toBeNull()
 	})
 
-	it('migrates a legacy flow draft and strips the view-state envelope', () => {
-		const flow = { summary: 'f', value: { modules: [] }, path: 'u/me/myflow' }
-		const legacyBundle = {
-			flow,
-			path: 'u/me/myflow',
-			selectedId: 'settings',
-			draft_triggers: [{ id: 't1' }],
-			selected_trigger: null,
-			loadedFromHistory: undefined
-		}
-		localStorage.setItem('flow-u/me/myflow', encodeLegacy(legacyBundle))
+	it('drops recognised legacy flow and raw-app drafts', () => {
+		localStorage.setItem(
+			'flow-u/me/myflow',
+			encodeLegacy({ flow: { summary: 'f', value: { modules: [] } }, selectedId: 'settings' })
+		)
+		localStorage.setItem(
+			'rawapp-u/me/site',
+			encodeLegacy({ files: { 'index.tsx': 'x' }, runnables: {}, data: {} })
+		)
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
 		expect(localStorage.getItem('flow-u/me/myflow')).toBeNull()
-		// Only the inner Flow survives; the view-state envelope is dropped.
-		expect(storedShape('userdraft/w/main/flow/u/me/myflow')).toBe(wrapped(flow))
-	})
-
-	it('migrates a legacy raw-app draft, defaulting the new `summary` field', () => {
-		const legacy = {
-			files: { 'index.tsx': 'export default () => null' },
-			runnables: {},
-			data: { tables: [] }
-		}
-		localStorage.setItem('rawapp-u/me/site', encodeLegacy(legacy))
-
-		migrateLegacyUserDrafts('main')
-
 		expect(localStorage.getItem('rawapp-u/me/site')).toBeNull()
-		expect(storedShape('userdraft/w/main/raw_app/u/me/site')).toBe(
-			wrapped({ ...legacy, summary: '' })
-		)
 	})
 
-	it('preserves an existing new-format entry instead of overwriting it', () => {
-		// Old and new both exist for the same item — the new one is presumed
-		// fresher.
-		localStorage.setItem(
-			'app-u/me/dash',
-			encodeLegacy({
-				grid: [],
-				fullscreen: false,
-				unusedInlineScripts: [],
-				hiddenInlineScripts: []
-			})
-		)
-		const existingNew = wrapped({ value: 'new' })
-		localStorage.setItem('userdraft/w/main/app/u/me/dash', existingNew)
+	it('leaves the workspace-scoped interim keys untouched (migrateUserDraftsToDb owns those)', () => {
+		const interim = JSON.stringify({ value: { modules: [] } })
+		localStorage.setItem('userdraft/w/main/flow/u/me/keep', interim)
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
-		expect(localStorage.getItem('app-u/me/dash')).toBeNull()
-		expect(localStorage.getItem('userdraft/w/main/app/u/me/dash')).toBe(existingNew)
-	})
-
-	it('is idempotent — the second invocation is a no-op', () => {
-		localStorage.setItem(
-			'app-u/me/dash',
-			encodeLegacy({
-				grid: [],
-				fullscreen: false,
-				unusedInlineScripts: [],
-				hiddenInlineScripts: []
-			})
-		)
-		migrateLegacyUserDrafts('main')
-		expect(localStorage.getItem('userdraft/w/main/app/u/me/dash')).not.toBeNull()
-
-		// Drop the migrated entry to detect any re-migration attempt.
-		localStorage.removeItem('userdraft/w/main/app/u/me/dash')
-		// Drop the source too, so re-running couldn't even find a source.
-		// (The sentinel alone should be enough; this just clarifies the intent.)
-		migrateLegacyUserDrafts('main')
-		expect(localStorage.getItem('userdraft/w/main/app/u/me/dash')).toBeNull()
-	})
-
-	it('skips entirely when no workspace is available', () => {
-		localStorage.setItem(
-			'app-u/me/dash',
-			encodeLegacy({
-				grid: [],
-				fullscreen: false,
-				unusedInlineScripts: [],
-				hiddenInlineScripts: []
-			})
-		)
-		migrateLegacyUserDrafts('')
-
-		expect(localStorage.getItem('app-u/me/dash')).not.toBeNull()
-	})
-
-	it('handles malformed legacy payloads without throwing', () => {
-		localStorage.setItem('app-u/me/garbled', 'not-base64!!!')
-		expect(() => migrateLegacyUserDrafts('main')).not.toThrow()
-		// Migration didn't migrate, didn't crash — leaves the entry alone.
-		expect(localStorage.getItem('app-u/me/garbled')).toBe('not-base64!!!')
+		expect(localStorage.getItem('userdraft/w/main/flow/u/me/keep')).toBe(interim)
 	})
 
 	it('leaves keys whose path does not match the legacy `u|f/owner/name` shape alone', () => {
-		// A future feature or neighbouring code might pick a key like
-		// `app-recent` for its own purposes. The path doesn't look like a
-		// Windmill item path, so the migration must skip it.
+		// `app-recent` / `app-some_other_app` look like the legacy prefix but the
+		// suffix isn't a Windmill item path — a future feature might own them.
 		localStorage.setItem('app-recent', 'whatever')
 		localStorage.setItem('app-some_other_app', 'whatever')
-		// `flow-u/me/foo` matches the shape and would be migrated, but the
-		// payload also needs to look like a Windmill draft (asserted below).
-		localStorage.setItem('flow-u/me/foo', encodeLegacy({ flow: { value: { modules: [] } } }))
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
 		expect(localStorage.getItem('app-recent')).toBe('whatever')
 		expect(localStorage.getItem('app-some_other_app')).toBe('whatever')
-		expect(localStorage.getItem('userdraft/w/main/flow/u/me/foo')).not.toBeNull()
 	})
 
-	it('skips legacy-shaped keys whose payload does not look like a Windmill draft', () => {
-		// `app-u/me/dash` matches LEGACY_PATH_SHAPE and decodes to valid JSON,
-		// but none of the App-shape fields (grid/fullscreen/theme/
-		// unusedInlineScripts/hiddenInlineScripts) are present. Treat it as
-		// unrelated and leave it untouched.
-		const unrelated = encodeLegacy({ random: 'data', count: 7 })
-		localStorage.setItem('app-u/me/dash', unrelated)
+	it('leaves legacy-shaped keys whose payload does not look like a Windmill draft', () => {
+		// Matches LEGACY_PATH_SHAPE and decodes to valid JSON, but carries none of
+		// the App/flow draft fields — treat as unrelated, do not delete.
+		const unrelatedApp = encodeLegacy({ random: 'data', count: 7 })
+		localStorage.setItem('app-u/me/dash', unrelatedApp)
 		const unrelatedFlow = encodeLegacy({ stepsState: {} })
 		localStorage.setItem('flow-u/me/bar', unrelatedFlow)
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
-		expect(localStorage.getItem('app-u/me/dash')).toBe(unrelated)
-		expect(localStorage.getItem('userdraft/w/main/app/u/me/dash')).toBeNull()
+		expect(localStorage.getItem('app-u/me/dash')).toBe(unrelatedApp)
 		expect(localStorage.getItem('flow-u/me/bar')).toBe(unrelatedFlow)
-		expect(localStorage.getItem('userdraft/w/main/flow/u/me/bar')).toBeNull()
 	})
 
-	it('migrates multiple legacy entries in a single invocation', () => {
-		localStorage.setItem(
-			'app-u/me/a',
-			encodeLegacy({
-				grid: [],
-				fullscreen: false,
-				unusedInlineScripts: [],
-				hiddenInlineScripts: []
-			})
-		)
+	it('leaves a malformed (non-base64) legacy payload alone and does not throw', () => {
+		localStorage.setItem('app-u/me/garbled', 'not-base64!!!')
+
+		expect(() => purgeLegacyUserDrafts()).not.toThrow()
+		expect(localStorage.getItem('app-u/me/garbled')).toBe('not-base64!!!')
+	})
+
+	it('is idempotent — once the sentinel is set, a later legacy key survives', () => {
+		localStorage.setItem('app-u/me/a', encodeLegacy(legacyApp))
+		purgeLegacyUserDrafts()
+		expect(localStorage.getItem('app-u/me/a')).toBeNull()
+
+		// A key written after the first run is NOT swept (the sentinel short-circuits).
+		localStorage.setItem('app-u/me/b', encodeLegacy(legacyApp))
+		purgeLegacyUserDrafts()
+		expect(localStorage.getItem('app-u/me/b')).not.toBeNull()
+	})
+
+	it('purges multiple legacy entries in a single invocation', () => {
+		localStorage.setItem('app-u/me/a', encodeLegacy(legacyApp))
 		localStorage.setItem(
 			'flow-u/me/b',
-			encodeLegacy({ flow: { summary: '', value: { modules: [] }, path: 'u/me/b' } })
-		)
-		localStorage.setItem(
-			'rawapp-u/me/c',
-			encodeLegacy({ files: {}, runnables: {}, data: { tables: [] } })
+			encodeLegacy({ flow: { summary: '', value: { modules: [] } } })
 		)
+		localStorage.setItem('rawapp-u/me/c', encodeLegacy({ files: {}, runnables: {}, data: {} }))
 
-		migrateLegacyUserDrafts('main')
+		purgeLegacyUserDrafts()
 
-		expect(localStorage.getItem('userdraft/w/main/app/u/me/a')).not.toBeNull()
-		expect(localStorage.getItem('userdraft/w/main/flow/u/me/b')).not.toBeNull()
-		expect(localStorage.getItem('userdraft/w/main/raw_app/u/me/c')).not.toBeNull()
+		expect(localStorage.getItem('app-u/me/a')).toBeNull()
+		expect(localStorage.getItem('flow-u/me/b')).toBeNull()
+		expect(localStorage.getItem('rawapp-u/me/c')).toBeNull()
 	})
 })
diff --git a/frontend/src/lib/userDraftLegacyMigration.ts b/frontend/src/lib/userDraftLegacyMigration.ts
index d4ee04ee61..4239bc0e8a 100644
--- a/frontend/src/lib/userDraftLegacyMigration.ts
+++ b/frontend/src/lib/userDraftLegacyMigration.ts
@@ -1,22 +1,29 @@
 /**
- * One-off migration from the pre-UserDraft localStorage autosave entries to
- * the workspace-scoped `userdraft/w/{ws}/{kind}/{path}` format.
+ * One-shot purge of the pre-UserDraft browser-local autosave keys.
  *
- * Legacy keys (global, not workspace-scoped — assumed to belong to the user's
- * current workspace at migration time):
+ * The original autosave (pre-#9121) wrote workspace-BLIND keys:
  *
- *   `flow`            / `flow-{path}`    base64 of `encodeState({ flow, path, selectedId, draft_triggers, ... })`
- *   `app`             / `app-{path}`     base64 of `encodeState(App)`
- *   `rawapp`          / `rawapp-{path}`  base64 of `encodeState({ files, runnables, data })`
+ *   `flow`   / `flow-{path}`    base64 of `encodeState({ flow, path, selectedId, draft_triggers, ... })`
+ *   `app`    / `app-{path}`     base64 of `encodeState(App)`
+ *   `rawapp` / `rawapp-{path}`  base64 of `encodeState({ files, runnables, data })`
  *
- * Target keys: `userdraft/w/{workspace}/{flow|app|raw_app}/{path}` storing
- * `JSON.stringify({ value: <transformed legacy value> })`.
+ * Neither the key nor the decoded value records a workspace (the value carries
+ * only workspace-agnostic item paths like `u/me/x`), so these drafts cannot be
+ * attributed to the workspace they were edited in. The current editors are
+ * DB-backed and never read these keys, so they are dead data with one dangerous
+ * property: promoting them to the DB would force a GUESS of the workspace, which
+ * mis-files drafts into whatever workspace happened to be active when the
+ * migration first ran (a single global sentinel gates it). We therefore drop
+ * them instead of migrating them.
+ *
+ * Only keys that BOTH match the legacy path shape AND decode to a plausible
+ * legacy draft are removed; unrelated look-alikes (`app-recent`, garbage,
+ * non-Windmill payloads) are left untouched. The workspace-scoped interim keys
+ * (`userdraft/w/{ws}/...`, written by the editor with the correct workspace)
+ * are NOT touched here — `migrateUserDraftsToDb` still pushes those to the DB.
  *
  * Idempotent: writes a sentinel under `MIGRATION_FLAG` after the first run so
- * subsequent invocations are no-ops. Existing new-format entries are never
- * overwritten — when both an old and a new entry exist for the same item, the
- * old one is simply dropped on the assumption that the new entry is the more
- * recent edit.
+ * subsequent invocations are no-ops.
  *
  * This file is intentionally standalone — it does not import from
  * `userDraft.svelte.ts` so the new code stays uncluttered by the legacy
@@ -71,10 +78,9 @@ function decodeLegacyState(raw: string): unknown {
  * Per-kind shape gate. The legacy keys (`app-foo`, `flow-foo`, ...) are
  * unusual enough that nothing else in the codebase has used them, but
  * matching `LEGACY_PATH_SHAPE` doesn't prove the payload is actually a
- * Windmill draft (any base64-of-JSON could pass). Promoting a stray payload
- * would silently surface as a phantom "Restored from local storage" toast
- * on the next edit, so we reject anything that doesn't carry the fields the
- * legacy writers actually produced.
+ * Windmill draft (any base64-of-JSON could pass). We only delete keys we can
+ * positively recognise as legacy drafts, so a stray look-alike that happens to
+ * use this key shape is left untouched rather than silently dropped.
  */
 function isPlausibleLegacyValue(kind: LegacyKind, decoded: unknown): boolean {
 	if (decoded == null || typeof decoded !== 'object') return false
@@ -103,32 +109,6 @@ function isPlausibleLegacyValue(kind: LegacyKind, decoded: unknown): boolean {
 	}
 }
 
-function transformLegacyValue(kind: LegacyKind, decoded: unknown): unknown {
-	const obj = decoded as Record<string, unknown>
-	switch (kind) {
-		case 'flow':
-			// The legacy bundle wrapped the Flow alongside view-state fields
-			// (selectedId, draft_triggers, ...). The new entry stores only the
-			// Flow — the view-state lives elsewhere or is re-derived.
-			return obj.flow
-		case 'app':
-			// Legacy stored the App directly.
-			return obj
-		case 'raw_app':
-			// Legacy bundle missed the `summary` field that the new editor adds.
-			return {
-				files: obj.files ?? {},
-				runnables: obj.runnables ?? {},
-				data: obj.data ?? {},
-				summary: typeof obj.summary === 'string' ? obj.summary : ''
-			}
-	}
-}
-
-function newKey(workspace: string, kind: LegacyKind, path: string): string {
-	return `userdraft/w/${workspace}/${kind}/${path}`
-}
-
 function listLocalStorageKeys(): string[] {
 	const out: string[] = []
 	for (let i = 0; i < localStorage.length; i++) {
@@ -139,16 +119,11 @@ function listLocalStorageKeys(): string[] {
 }
 
 /**
- * Run the legacy → new-format migration. Idempotent: returns immediately if a
- * previous run completed (signalled by `MIGRATION_FLAG`).
- *
- * The migration is workspace-scoped because the legacy keys had no notion of
- * workspace — we treat the caller's current workspace as the owner of any
- * surviving legacy entries.
+ * Remove the workspace-blind legacy autosave keys (see file header). Idempotent:
+ * returns immediately if a previous run completed (signalled by `MIGRATION_FLAG`).
  */
-export function migrateLegacyUserDrafts(workspace: string): void {
+export function purgeLegacyUserDrafts(): void {
 	if (typeof localStorage === 'undefined') return
-	if (!workspace) return
 	if (localStorage.getItem(MIGRATION_FLAG) !== null) return
 
 	try {
@@ -157,32 +132,18 @@ export function migrateLegacyUserDrafts(workspace: string): void {
 			if (!match) continue
 			const raw = localStorage.getItem(key)
 			if (raw == null) continue
-
-			try {
-				const decoded = decodeLegacyState(raw)
-				if (!isPlausibleLegacyValue(match.newKind, decoded)) continue
-				const value = transformLegacyValue(match.newKind, decoded)
-				const target = newKey(workspace, match.newKind, match.path)
-				if (value !== undefined && localStorage.getItem(target) == null) {
-					// `lastWrittenAt` makes the migrated entry visible to
-					// `gcUserDrafts`. We stamp it as "now" so a freshly-migrated
-					// autosave gets the full retention window — sweeping it
-					// immediately on the first GC pass would lose work the
-					// legacy migration just rescued.
-					localStorage.setItem(target, JSON.stringify({ value, lastWrittenAt: Date.now() }))
-				}
-				localStorage.removeItem(key)
-			} catch (e) {
-				console.error('UserDraft legacy migration: failed to migrate', key, e)
-			}
+			// Only drop keys we can positively recognise as legacy Windmill
+			// drafts; leave unrelated or unparseable look-alikes in place.
+			if (!isPlausibleLegacyValue(match.newKind, decodeLegacyState(raw))) continue
+			localStorage.removeItem(key)
 		}
 		localStorage.setItem(MIGRATION_FLAG, new Date().toISOString())
 	} catch (e) {
-		console.error('UserDraft legacy migration: aborted', e)
+		console.error('UserDraft legacy purge: aborted', e)
 	}
 }
 
-/** Test-only: clear the sentinel so the migration can re-run. */
+/** Test-only: clear the sentinel so the purge can re-run. */
 export function __resetUserDraftLegacyMigrationForTesting(): void {
 	try {
 		localStorage.removeItem(MIGRATION_FLAG)
diff --git a/frontend/src/lib/utils.test.ts b/frontend/src/lib/utils.test.ts
index 1b2b72a306..accdf73b15 100644
--- a/frontend/src/lib/utils.test.ts
+++ b/frontend/src/lib/utils.test.ts
@@ -1,5 +1,42 @@
 import { describe, it, expect } from 'vitest'
-import { cleanValueProperties, getQueryStmtCountHeuristic } from './utils'
+import {
+	cleanValueProperties,
+	computeSharableHash,
+	extractTagFromSharableHash,
+	isDynamicTag,
+	getQueryStmtCountHeuristic,
+	parseDbInputFromAssetSyntax
+} from './utils'
+
+describe('parseDbInputFromAssetSyntax', () => {
+	it('parses a table path', () => {
+		expect(parseDbInputFromAssetSyntax('ducklake://main/orders')).toEqual({
+			type: 'ducklake',
+			ducklake: 'main',
+			specificTable: 'orders',
+			specificSchema: undefined
+		})
+	})
+
+	it('parses a schema-qualified table path', () => {
+		expect(parseDbInputFromAssetSyntax('ducklake://main/analytics.orders')).toEqual({
+			type: 'ducklake',
+			ducklake: 'main',
+			specificTable: 'orders',
+			specificSchema: 'analytics'
+		})
+	})
+
+	it('handles a catalog-only path without throwing (no table segment)', () => {
+		// e.g. `// materialize ducklake` → `ducklake://main` — must not throw.
+		expect(parseDbInputFromAssetSyntax('ducklake://main')).toEqual({
+			type: 'ducklake',
+			ducklake: 'main',
+			specificTable: undefined,
+			specificSchema: undefined
+		})
+	})
+})
 
 describe('getQueryStmtCountHeuristic', () => {
 	describe('basic statements', () => {
@@ -356,3 +393,61 @@ describe('cleanValueProperties', () => {
 		expect(input).toHaveProperty('created_at')
 	})
 })
+
+describe('computeSharableHash / extractTagFromSharableHash', () => {
+	function roundTrip(hash: string) {
+		const params = new URLSearchParams(hash)
+		const tag = extractTagFromSharableHash(params)
+		const args = Object.fromEntries([...params.entries()].map(([k, v]) => [k, JSON.parse(v)]))
+		return { tag, args }
+	}
+
+	it('carries the tag under the reserved __tag key alongside JSON-encoded args', () => {
+		const hash = computeSharableHash({ name: 'world' }, 'my-custom-tag')
+		expect(roundTrip(hash)).toEqual({ tag: 'my-custom-tag', args: { name: 'world' } })
+	})
+
+	it('omits __tag when no tag is given', () => {
+		const hash = computeSharableHash({ name: 'world' })
+		expect(roundTrip(hash)).toEqual({ tag: undefined, args: { name: 'world' } })
+	})
+
+	it('preserves an arg named __tag instead of misreading it as a tag', () => {
+		const hash = computeSharableHash({ __tag: 'value', name: 'world' })
+		expect(roundTrip(hash)).toEqual({ tag: undefined, args: { __tag: 'value', name: 'world' } })
+	})
+
+	it('carries a tag alongside an arg named __tag, preserving both', () => {
+		const hash = computeSharableHash({ __tag: 'value', name: 'world' }, 'my-custom-tag')
+		expect(roundTrip(hash)).toEqual({
+			tag: 'my-custom-tag',
+			args: { __tag: 'value', name: 'world' }
+		})
+	})
+
+	it('carries JSON-parseable tags like 123 or true without corrupting args', () => {
+		expect(roundTrip(computeSharableHash({ name: 'world' }, '123'))).toEqual({
+			tag: '123',
+			args: { name: 'world' }
+		})
+		expect(roundTrip(computeSharableHash({}, 'true'))).toEqual({ tag: 'true', args: {} })
+	})
+
+	it('carries a tag that itself starts with the value prefix', () => {
+		expect(roundTrip(computeSharableHash({}, 't:odd'))).toEqual({ tag: 't:odd', args: {} })
+	})
+})
+
+describe('isDynamicTag', () => {
+	it('detects args interpolation placeholders', () => {
+		expect(isDynamicTag('worker-$args[env]')).toBe(true)
+	})
+
+	it('is false for plain tags, $workspace-only tags, and undefined', () => {
+		expect(isDynamicTag('gpu-heavy')).toBe(false)
+		// $workspace resolves identically on a re-run, so pinning the resolved value is fine
+		expect(isDynamicTag('$workspace-gpu')).toBe(false)
+		expect(isDynamicTag('')).toBe(false)
+		expect(isDynamicTag(undefined)).toBe(false)
+	})
+})
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index 9e14e7ab9a..b2f8e0d346 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -1137,8 +1137,19 @@ export function extractCustomProperties(styleStr: string): string {
 	return customStyleStr
 }
 
-export function computeSharableHash(args: any) {
-	let nargs = {}
+// Value prefix marking the reserved `__tag` key as a carried tag: no JSON-encoded
+// arg value can start with `t:` (JSON strings start with `"`, numbers with a digit
+// or `-`, etc.), so it cannot be confused with a genuine arg named `__tag`
+const SHARABLE_HASH_TAG_PREFIX = 't:'
+
+// `tag` is carried as the reserved key `__tag` with a SHARABLE_HASH_TAG_PREFIX value;
+// entry pairs allow a duplicate `__tag` key so an arg with that name can coexist with
+// the carried tag (they are told apart by the value prefix)
+export function computeSharableHash(args: any, tag?: string) {
+	let entries: [string, string][] = []
+	if (tag) {
+		entries.push(['__tag', SHARABLE_HASH_TAG_PREFIX + tag])
+	}
 	for (let k in args) {
 		let v = args[k]
 		if (v !== undefined) {
@@ -1148,11 +1159,11 @@ export function computeSharableHash(args: any) {
 				console.error(`Value at key ${k} too big (${size}) to be shared`)
 				return ''
 			}
-			nargs[k] = JSON.stringify(v)
+			entries.push([k, JSON.stringify(v)])
 		}
 	}
 	try {
-		let r = new URLSearchParams(nargs).toString()
+		let r = new URLSearchParams(entries).toString()
 		return r.length > 1000000 ? '' : r
 	} catch (e) {
 		console.error('Error computing sharable hash', e)
@@ -1160,6 +1171,32 @@ export function computeSharableHash(args: any) {
 	}
 }
 
+// `$args[...]` tags are resolved by the backend at push time from the run's args; a
+// job's stored tag is the resolved value, so re-running with it would pin a value
+// that no longer matches edited args. `$workspace` is also interpolated but resolves
+// identically on a re-run (same workspace), so it does not make a tag dynamic here.
+export function isDynamicTag(tag: string | undefined): boolean {
+	return !!tag && tag.includes('$args[')
+}
+
+// Counterpart of computeSharableHash's `tag`: extracts and removes the carried tag.
+// Only SHARABLE_HASH_TAG_PREFIX-prefixed `__tag` values are carried tags; any other
+// `__tag` value is a genuine arg with that name and is left in `params` for arg parsing.
+export function extractTagFromSharableHash(params: URLSearchParams): string | undefined {
+	const values = params.getAll('__tag')
+	const carried = values.find((v) => v.startsWith(SHARABLE_HASH_TAG_PREFIX))
+	if (carried == undefined) {
+		return undefined
+	}
+	params.delete('__tag')
+	for (const v of values) {
+		if (!v.startsWith(SHARABLE_HASH_TAG_PREFIX)) {
+			params.append('__tag', v)
+		}
+	}
+	return carried.slice(SHARABLE_HASH_TAG_PREFIX.length)
+}
+
 export function toCamel(s: string) {
 	return s.replace(/([-_][a-z])/gi, ($1) => {
 		return $1.toUpperCase().replace('-', '').replace('_', '')
@@ -1190,8 +1227,10 @@ export function isCodeInjection(expr: string | undefined): boolean {
 // app logic via the `query` context. Only params we actually own are listed
 // here — the `wm_` prefix is a naming convention, not a reserved namespace, so
 // we don't strip it wholesale (that would break apps reading their own `wm_*`
-// params). `wm_coep` is a transport flag for cross-origin isolation headers.
-export const WINDMILL_RESERVED_QUERY_PARAMS = new Set(['wm_coep'])
+// params). `wm_coep` is a transport flag for cross-origin isolation headers;
+// `wm_embed`/`wm_embedder_origin` are the opaque app viewer transport params
+// (see PublicAppFrame).
+export const WINDMILL_RESERVED_QUERY_PARAMS = new Set(['wm_coep', 'wm_embed', 'wm_embedder_origin'])
 
 export function urlParamsToObject(
 	params: URLSearchParams,
@@ -2118,22 +2157,27 @@ export function pick<T extends object, K extends keyof T>(obj: T, keys: readonly
 
 export function parseDbInputFromAssetSyntax(path: string): DbInput | null {
 	const [p1, _p2] = path.split('://')
-	const [p2, _p3] = _p2.split('/')
-	const [p3, p4] = _p3.split('.')
+	const [p2, _p3] = (_p2 ?? '').split('/')
+	// `_p3` is undefined for a catalog-only path (e.g. `ducklake://main`, no
+	// table segment) — guard the split so the helper returns a table-less input
+	// instead of throwing.
+	const [p3, p4] = (_p3 ?? '').split('.')
+	const specificTable = p4 || p3 || undefined
+	const specificSchema = p4 ? p3 : undefined
 	return p1 === 'ducklake'
 		? {
 				type: 'ducklake',
 				ducklake: p2 || 'main',
-				specificTable: p4 ?? p3,
-				specificSchema: p4 ? p3 : undefined
+				specificTable,
+				specificSchema
 			}
 		: p1 === 'datatable'
 			? {
 					type: 'database',
 					resourcePath: `datatable://${p2 || 'main'}`,
 					resourceType: 'postgresql',
-					specificTable: p4 ?? p3,
-					specificSchema: p4 ? p3 : undefined
+					specificTable,
+					specificSchema
 				}
 			: null
 }
diff --git a/frontend/src/lib/utils/devWorkspaceLabel.ts b/frontend/src/lib/utils/devWorkspaceLabel.ts
new file mode 100644
index 0000000000..026ec9a746
--- /dev/null
+++ b/frontend/src/lib/utils/devWorkspaceLabel.ts
@@ -0,0 +1,25 @@
+// Cosmetic display label for a dev workspace. The paired-fork machinery is unchanged; this only
+// swaps the badge text and identity wording so a team can present the environment as "staging"
+// instead of "dev". A null/unknown stored value renders as "dev" (the default).
+
+export type DevWorkspaceLabelKey = 'dev' | 'staging'
+
+/** Resolve the stored `dev_workspace_label` to a known key; anything unset/unknown is 'dev'. */
+export function devLabelKey(label: string | null | undefined): DevWorkspaceLabelKey {
+	return label === 'staging' ? 'staging' : 'dev'
+}
+
+/** Short badge text: 'dev' or 'stg'. */
+export function devBadgeText(label: string | null | undefined): string {
+	return devLabelKey(label) === 'staging' ? 'stg' : 'dev'
+}
+
+/** Capitalized word for identity wording, e.g. `${devLabelWord(l)} workspace of X`. */
+export function devLabelWord(label: string | null | undefined): string {
+	return devLabelKey(label) === 'staging' ? 'Staging' : 'Dev'
+}
+
+/** Lowercase noun phrase for prose, e.g. "made in its ${devLabelNoun(l)}". */
+export function devLabelNoun(label: string | null | undefined): string {
+	return devLabelKey(label) === 'staging' ? 'staging workspace' : 'dev workspace'
+}
diff --git a/frontend/src/lib/utils/editInFork.ts b/frontend/src/lib/utils/editInFork.ts
index aa6d653961..c446732b7d 100644
--- a/frontend/src/lib/utils/editInFork.ts
+++ b/frontend/src/lib/utils/editInFork.ts
@@ -1,22 +1,89 @@
 import { base } from '$lib/base'
+import { get } from 'svelte/store'
+import {
+	userStore,
+	userWorkspaces,
+	workspaceStore,
+	type UserWorkspace,
+	type UserExt
+} from '$lib/stores'
+import { findCanonicalDevWorkspace } from '$lib/utils/workspaceHierarchy'
+import { isRuleActive, canUserBypassRuleKind } from '$lib/workspaceProtectionRules.svelte'
 
 type ItemType = 'script' | 'flow' | 'app' | 'raw_app'
 
-export function buildForkEditUrl(itemType: ItemType, itemPath: string): string {
-	let editPath: string
+/**
+ * Whether to show the "edit in fork / dev workspace" affordance. Allowed when forking isn't disabled,
+ * when the user can bypass the forking rule (workspace admins, mirroring `canCreateFork`), OR when the
+ * current workspace has a canonical dev to route to — routing into an existing dev workspace creates
+ * no fork, so it survives a locked prod that has `DisableWorkspaceForking` set. User identity is read
+ * non-reactively (it's stable within a session); reactivity comes from the workspace args.
+ */
+export function editInForkAllowed(
+	currentWorkspaceId: string | undefined,
+	allWorkspaces: UserWorkspace[]
+): boolean {
+	return (
+		!isRuleActive('DisableWorkspaceForking') ||
+		canUserBypassRuleKind('DisableWorkspaceForking', get(userStore)) ||
+		!!findCanonicalDevWorkspace(currentWorkspaceId, allWorkspaces)
+	)
+}
+
+/** Label for the affordance: "Edit in <dev name>" when routed to a canonical dev, else "Edit in fork". */
+export function editInForkLabel(
+	currentWorkspaceId: string | undefined,
+	allWorkspaces: UserWorkspace[]
+): string {
+	const dev = findCanonicalDevWorkspace(currentWorkspaceId, allWorkspaces)
+	return dev ? `Edit in ${dev.name}` : 'Edit in fork'
+}
+
+/**
+ * Whether the user may CREATE a new fork of the current workspace: forking not disabled, or the user
+ * can bypass the rule (workspace admins). Keeps the "Fork workspace" entry available to admins as the
+ * last-resort escape hatch on a locked prod.
+ */
+export function canCreateFork(user: UserExt | undefined): boolean {
+	return (
+		!isRuleActive('DisableWorkspaceForking') ||
+		canUserBypassRuleKind('DisableWorkspaceForking', user)
+	)
+}
+
+function editPathFor(itemType: ItemType, itemPath: string): string {
 	switch (itemType) {
 		case 'script':
-			editPath = `${base}/scripts/edit/${itemPath}`
-			break
+			return `${base}/scripts/edit/${itemPath}`
 		case 'flow':
-			editPath = `${base}/flows/edit/${itemPath}`
-			break
+			return `${base}/flows/edit/${itemPath}`
 		case 'app':
-			editPath = `${base}/apps/edit/${itemPath}`
-			break
+			return `${base}/apps/edit/${itemPath}`
 		case 'raw_app':
-			editPath = `${base}/apps_raw/edit/${itemPath}`
-			break
+			return `${base}/apps_raw/edit/${itemPath}`
 	}
-	return `${base}/user/fork_workspace?rd=${encodeURIComponent(editPath)}`
+}
+
+function viewPathFor(itemType: ItemType, itemPath: string): string {
+	switch (itemType) {
+		case 'script':
+			return `${base}/scripts/get/${itemPath}`
+		case 'flow':
+			return `${base}/flows/get/${itemPath}`
+		case 'app':
+			return `${base}/apps/get/${itemPath}`
+		case 'raw_app':
+			return `${base}/apps_raw/get/${itemPath}`
+	}
+}
+
+export function buildForkEditUrl(itemType: ItemType, itemPath: string): string {
+	// When the current ("prod") workspace has a canonical dev workspace, edits are funneled there:
+	// land on the item's page in the dev workspace (not straight in the editor) so the workspace
+	// switch is legible and the user opens the editor deliberately from there.
+	const dev = findCanonicalDevWorkspace(get(workspaceStore), get(userWorkspaces))
+	if (dev) {
+		return `${viewPathFor(itemType, itemPath)}?workspace=${encodeURIComponent(dev.id)}`
+	}
+	return `${base}/user/fork_workspace?rd=${encodeURIComponent(editPathFor(itemType, itemPath))}`
 }
diff --git a/frontend/src/lib/utils/forkColor.ts b/frontend/src/lib/utils/forkColor.ts
new file mode 100644
index 0000000000..232acbbe90
--- /dev/null
+++ b/frontend/src/lib/utils/forkColor.ts
@@ -0,0 +1,50 @@
+// Derives the fork-chip accent palette from a workspace color: the default
+// blue's light/dark bg+text profile, re-hued. Lightness is fixed per role so
+// any picked hue stays readable; saturation follows the user color within a
+// safe band so grayish picks yield grayish chips.
+
+function hexToHsl(hex: string): { h: number; s: number; l: number } | undefined {
+	const m = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(hex.trim())
+	if (!m) return undefined
+	let c = m[1]
+	if (c.length === 3) c = [...c].map((x) => x + x).join('')
+	const r = parseInt(c.slice(0, 2), 16) / 255
+	const g = parseInt(c.slice(2, 4), 16) / 255
+	const b = parseInt(c.slice(4, 6), 16) / 255
+	const max = Math.max(r, g, b)
+	const min = Math.min(r, g, b)
+	const l = (max + min) / 2
+	const d = max - min
+	if (d === 0) return { h: 0, s: 0, l }
+	const s = d / (1 - Math.abs(2 * l - 1))
+	let h: number
+	if (max === r) h = ((g - b) / d + (g < b ? 6 : 0)) * 60
+	else if (max === g) h = ((b - r) / d + 2) * 60
+	else h = ((r - g) / d + 4) * 60
+	return { h, s, l }
+}
+
+function clamp(x: number, lo: number, hi: number): number {
+	return Math.min(hi, Math.max(lo, x))
+}
+
+function hsl(h: number, s: number, l: number): string {
+	return `hsl(${Math.round(h)}, ${Math.round(s * 100)}%, ${Math.round(l * 100)}%)`
+}
+
+/**
+ * Inline-style string setting the four `--fork-accent-*` custom properties a
+ * colored fork chip consumes (see WorkspaceScopeTrigger). Returns undefined
+ * for an unparsable color, letting the chip fall back to the default accent.
+ */
+export function forkAccentStyle(color: string | undefined): string | undefined {
+	if (!color) return undefined
+	const parsed = hexToHsl(color)
+	if (!parsed) return undefined
+	const { h, s } = parsed
+	const lightBg = hsl(h, clamp(s, 0.3, 1), 0.955)
+	const lightText = hsl(h, clamp(s, 0.3, 0.8), 0.42)
+	const darkBg = hsl(h, clamp(s * 0.35, 0.08, 0.25), 0.26)
+	const darkText = hsl(h, clamp(s, 0.3, 0.9), 0.86)
+	return `--fork-accent-bg: ${lightBg}; --fork-accent-text: ${lightText}; --fork-accent-bg-dark: ${darkBg}; --fork-accent-text-dark: ${darkText};`
+}
diff --git a/frontend/src/lib/utils/placementFly.ts b/frontend/src/lib/utils/placementFly.ts
new file mode 100644
index 0000000000..397f9787fb
--- /dev/null
+++ b/frontend/src/lib/utils/placementFly.ts
@@ -0,0 +1,26 @@
+import { fly, type TransitionConfig } from 'svelte/transition'
+
+/**
+ * Fly a melt-positioned floating element in from its anchor. Melt stamps the
+ * resolved side (after flip/fitViewport) on `data-side`, but only once its
+ * async computePosition settles — after the intro's config is read. So the
+ * caller passes its requested `placement` as the intro fallback, and
+ * `data-side` (read via a deferred config) takes over when present, i.e. on
+ * the outro and whenever positioning already settled. Missing both falls back
+ * to the common case (opens below → slides down from the trigger).
+ */
+export function placementFly(
+	node: Element,
+	{
+		duration = 100,
+		distance = 16,
+		placement
+	}: { duration?: number; distance?: number; placement?: string } = {}
+): () => TransitionConfig {
+	return () => {
+		const side = node.getAttribute('data-side') ?? placement?.split('-')[0] ?? 'bottom'
+		const x = side === 'left' ? distance : side === 'right' ? -distance : 0
+		const y = side === 'top' ? distance : side === 'left' || side === 'right' ? 0 : -distance
+		return fly(node, { duration, x, y })
+	}
+}
diff --git a/frontend/src/lib/utils/splitterPointerCapture.ts b/frontend/src/lib/utils/splitterPointerCapture.ts
new file mode 100644
index 0000000000..2737375445
--- /dev/null
+++ b/frontend/src/lib/utils/splitterPointerCapture.ts
@@ -0,0 +1,24 @@
+/**
+ * svelte-splitpanes tracks drags with document-level mousemove/mouseup only.
+ * A button release outside the browser window never reaches the document, so
+ * the drag state sticks: global col-resize cursor and pointer-events:none on
+ * every pane until the next click. Capturing the pointer on the splitter at
+ * pointerdown makes the browser deliver the release (and its compatibility
+ * mouseup, which bubbles to the library's document listener) even when it
+ * happens outside the window. Attach to any ancestor of the Splitpanes.
+ */
+export function splitterPointerCapture(node: HTMLElement) {
+	function onPointerDown(e: PointerEvent) {
+		const splitter = (e.target as Element | null)?.closest?.('.splitpanes__splitter')
+		if (splitter instanceof HTMLElement) {
+			try {
+				splitter.setPointerCapture(e.pointerId)
+			} catch {
+				// Non-capturable pointer (already released) — the plain document
+				// listeners still handle the in-window case.
+			}
+		}
+	}
+	node.addEventListener('pointerdown', onPointerDown, true)
+	return { destroy: () => node.removeEventListener('pointerdown', onPointerDown, true) }
+}
diff --git a/frontend/src/lib/utils/workspaceHierarchy.ts b/frontend/src/lib/utils/workspaceHierarchy.ts
index fb1114362e..e1ff76f934 100644
--- a/frontend/src/lib/utils/workspaceHierarchy.ts
+++ b/frontend/src/lib/utils/workspaceHierarchy.ts
@@ -19,7 +19,7 @@ export function buildWorkspaceHierarchy(workspaces: UserWorkspace[]): WorkspaceH
 	}
 
 	// Create maps for quick lookups
-	const workspaceMap = new Map(workspaces.map(w => [w.id, w]))
+	const workspaceMap = new Map(workspaces.map((w) => [w.id, w]))
 	const childrenMap = new Map<string, UserWorkspace[]>()
 	const hasChildrenSet = new Set<string>()
 
@@ -35,7 +35,7 @@ export function buildWorkspaceHierarchy(workspaces: UserWorkspace[]): WorkspaceH
 	}
 
 	// Find root workspaces (those without a parent or whose parent is not in the current list)
-	const rootWorkspaces = workspaces.filter(w => {
+	const rootWorkspaces = workspaces.filter((w) => {
 		if (!w.parent_workspace_id) {
 			return true // Definitely a root
 		}
@@ -46,7 +46,12 @@ export function buildWorkspaceHierarchy(workspaces: UserWorkspace[]): WorkspaceH
 	const result: WorkspaceHierarchyItem[] = []
 
 	// Recursively build the hierarchy
-	function addWorkspaceAndChildren(workspace: UserWorkspace, depth: number, isForked: boolean, parentName?: string) {
+	function addWorkspaceAndChildren(
+		workspace: UserWorkspace,
+		depth: number,
+		isForked: boolean,
+		parentName?: string
+	) {
 		// Add the current workspace
 		result.push({
 			workspace,
@@ -56,11 +61,14 @@ export function buildWorkspaceHierarchy(workspaces: UserWorkspace[]): WorkspaceH
 			hasChildren: hasChildrenSet.has(workspace.id)
 		})
 
-		// Add its children (sorted by name for consistency)
+		// Add its children: the canonical dev workspace first, then throwaway forks by name.
 		const children = childrenMap.get(workspace.id) || []
 		children
-			.sort((a, b) => a.name.localeCompare(b.name))
-			.forEach(child => {
+			.sort((a, b) => {
+				if (!!a.is_dev_workspace !== !!b.is_dev_workspace) return a.is_dev_workspace ? -1 : 1
+				return a.name.localeCompare(b.name)
+			})
+			.forEach((child) => {
 				addWorkspaceAndChildren(child, depth + 1, true, workspace.name)
 			})
 	}
@@ -68,12 +76,13 @@ export function buildWorkspaceHierarchy(workspaces: UserWorkspace[]): WorkspaceH
 	// Process root workspaces (sorted by name for consistency)
 	rootWorkspaces
 		.sort((a, b) => a.name.localeCompare(b.name))
-		.forEach(workspace => {
+		.forEach((workspace) => {
 			const isRootForked = workspace.parent_workspace_id != null
-			const parentName = isRootForked && workspace.parent_workspace_id 
-				? workspace.parent_workspace_id // Use parent ID as fallback if parent not in list
-				: undefined
-			
+			const parentName =
+				isRootForked && workspace.parent_workspace_id
+					? workspace.parent_workspace_id // Use parent ID as fallback if parent not in list
+					: undefined
+
 			addWorkspaceAndChildren(workspace, 0, isRootForked, parentName)
 		})
 
@@ -95,11 +104,60 @@ export function isRootWorkspace(workspace: UserWorkspace): boolean {
 	return workspace.parent_workspace_id == null
 }
 
+/**
+ * Walk up `parent_workspace_id` to the top of a workspace's family. Stops at the first ancestor not
+ * present in `allWorkspaces` (e.g. a parent the user can't see) and returns it, so the result is
+ * always the highest reachable ancestor. Returns undefined when the id itself isn't in the list.
+ */
+export function findWorkspaceRoot(
+	workspaceId: string | undefined,
+	allWorkspaces: UserWorkspace[]
+): UserWorkspace | undefined {
+	if (!workspaceId) return undefined
+	let current = allWorkspaces.find((w) => w.id === workspaceId)
+	while (current?.parent_workspace_id) {
+		const parent = allWorkspaces.find((w) => w.id === current!.parent_workspace_id)
+		if (!parent) break
+		current = parent
+	}
+	return current
+}
+
+/**
+ * Whether a workspace (by id) is a fork or dev workspace. Forks and dev workspaces both set
+ * `parent_workspace_id` (a dev workspace has no `wm-fork-` id prefix), but a `wm-fork-` workspace can
+ * outlive its parent (the parent FK is `ON DELETE SET NULL`), so treat the prefix as fork-ness too —
+ * otherwise an orphaned fork would lose its fork-only affordances (e.g. owner self-delete).
+ */
+export function workspaceIsFork(
+	workspaceId: string | undefined,
+	allWorkspaces: UserWorkspace[]
+): boolean {
+	if (!workspaceId) return false
+	if (workspaceId.startsWith('wm-fork-')) return true
+	return allWorkspaces.find((w) => w.id === workspaceId)?.parent_workspace_id != null
+}
+
+/**
+ * The canonical dev workspace of a prod workspace, if any (at most one per prod). Used to redirect
+ * edits from a locked prod workspace into its dev workspace. Disabled dev workspaces are excluded:
+ * redirecting edits to one the user can't select would be a dead end.
+ */
+export function findCanonicalDevWorkspace(
+	prodWorkspaceId: string | undefined,
+	allWorkspaces: UserWorkspace[]
+): UserWorkspace | undefined {
+	if (!prodWorkspaceId) return undefined
+	return allWorkspaces.find(
+		(w) => w.parent_workspace_id === prodWorkspaceId && w.is_dev_workspace && !w.disabled
+	)
+}
+
 /**
  * Helper function to find all descendants of a workspace
  */
 export function findWorkspaceDescendants(
-	workspaceId: string, 
+	workspaceId: string,
 	allWorkspaces: UserWorkspace[]
 ): UserWorkspace[] {
 	const descendants: UserWorkspace[] = []
@@ -126,4 +184,4 @@ export function findWorkspaceDescendants(
 
 	collectDescendants(workspaceId)
 	return descendants
-}
\ No newline at end of file
+}
diff --git a/frontend/src/lib/utils_deployable.ts b/frontend/src/lib/utils_deployable.ts
index 5f49eb5c49..556ac0a3c7 100644
--- a/frontend/src/lib/utils_deployable.ts
+++ b/frontend/src/lib/utils_deployable.ts
@@ -40,6 +40,8 @@ export type Kind =
 	| 'gcp_trigger'
 	| 'azure_trigger'
 	| 'email_trigger'
+	// Data table migration, diffed per `<datatable>/<timestamp>_<name>` path.
+	| 'datatable_migration'
 	// Legacy generic kind used by the cross-workspace `DeployWorkspace` UI,
 	// which carries the trigger sub-kind in `additionalInformation`.
 	| 'trigger'
diff --git a/frontend/src/lib/utils_draft_deploy.test.ts b/frontend/src/lib/utils_draft_deploy.test.ts
new file mode 100644
index 0000000000..bae50691cc
--- /dev/null
+++ b/frontend/src/lib/utils_draft_deploy.test.ts
@@ -0,0 +1,40 @@
+import { describe, it, expect } from 'vitest'
+import { draftBaseIsStale } from './utils_draft_deploy'
+
+// draftBaseIsStale compares a draft's base pointer against the deployed head
+// of the item it was fetched with (`get_draft=true`). Shared by CompareDrafts
+// and the session Edits drawer — a regression here silently hides (or
+// fabricates) the "started from an older deployed version" warning.
+
+describe('draftBaseIsStale', () => {
+	it('script: stale iff the draft parent_hash differs from the deployed hash', () => {
+		expect(draftBaseIsStale('script', { hash: 'v2', draft: { parent_hash: 'v1' } })).toBe(true)
+		expect(draftBaseIsStale('script', { hash: 'v2', draft: { parent_hash: 'v2' } })).toBe(false)
+	})
+
+	it('script: no base pointer or no head → not stale (nothing to compare)', () => {
+		expect(draftBaseIsStale('script', { hash: 'v2', draft: {} })).toBe(false)
+		expect(draftBaseIsStale('script', { draft: { parent_hash: 'v1' } })).toBe(false)
+	})
+
+	it('flow: compares the pinned version_id against the deployed head', () => {
+		expect(draftBaseIsStale('flow', { version_id: 7, draft: { version_id: 5 } })).toBe(true)
+		expect(draftBaseIsStale('flow', { version_id: 7, draft: { version_id: 7 } })).toBe(false)
+		expect(draftBaseIsStale('flow', { version_id: 7, draft: {} })).toBe(false)
+	})
+
+	it('app/raw_app: compares parent_version against the last of versions', () => {
+		expect(draftBaseIsStale('app', { versions: [1, 2, 3], draft: { parent_version: 2 } })).toBe(
+			true
+		)
+		expect(draftBaseIsStale('raw_app', { versions: [1, 2, 3], draft: { parent_version: 3 } })).toBe(
+			false
+		)
+		expect(draftBaseIsStale('app', { versions: [], draft: { parent_version: 2 } })).toBe(false)
+	})
+
+	it('no draft on the response → not stale', () => {
+		expect(draftBaseIsStale('script', { hash: 'v2' })).toBe(false)
+		expect(draftBaseIsStale('script', undefined)).toBe(false)
+	})
+})
diff --git a/frontend/src/lib/utils_draft_deploy.ts b/frontend/src/lib/utils_draft_deploy.ts
index 6781818bb5..ee8538e4db 100644
--- a/frontend/src/lib/utils_draft_deploy.ts
+++ b/frontend/src/lib/utils_draft_deploy.ts
@@ -37,6 +37,7 @@ import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
 import type { DeployResult } from '$lib/utils_workspace_deploy'
 import { TRIGGER_RUNTIME_IGNORE } from '$lib/utils_deployable'
 import { deployRawAppDraft } from '$lib/rawAppDeploy'
+import { canonicalRawAppDiffValue } from '$lib/components/raw_apps/utils'
 import { invalidateWorkspaceDrafts } from '$lib/workspaceDrafts.svelte'
 import { setLocalDraftHint } from '$lib/localDraftHints.svelte'
 import { userStore } from '$lib/stores'
@@ -206,9 +207,12 @@ export async function getDraftDiffValues(
 			draft_saved_at: _c,
 			no_deployed: _n,
 			other_drafts_users: _o,
+			version_id: _v,
 			...deployed
 		} = r
-		const draftValue = draft ?? deployed
+		// Strip the draft's pinned base `version_id` (which differs from the deployed
+		// head for a stale draft) so it never renders as a spurious diff line.
+		const { version_id: _dv, ...draftValue } = (draft ?? deployed) as any
 		return { deployed: draftOnly ? EMPTY_DEPLOYED.flow!(draftValue) : deployed, draft: draftValue }
 	} else if (kind === 'app' || kind === 'raw_app') {
 		// A never-deployed raw app has no `app` row; the backend resolves the
@@ -219,6 +223,16 @@ export async function getDraftDiffValues(
 			getDraft: true,
 			rawApp: kind === 'raw_app'
 		})) as any
+		if (kind === 'raw_app' || r.raw_app === true) {
+			// Raw-app drafts are stored flat (files/runnables/data top-level) while the
+			// deployed row nests them under `value`, and deployed inline scripts carry
+			// server-recomputed locks. Canonicalize both onto the same shape with the
+			// post-deploy noise stripped — the same module the editor's Diff button uses.
+			return {
+				deployed: draftOnly ? canonicalRawAppDiffValue({}) : canonicalRawAppDiffValue(r),
+				draft: canonicalRawAppDiffValue(r.draft ?? r)
+			}
+		}
 		const deployed = {
 			summary: r.summary,
 			value: r.value,
@@ -226,7 +240,9 @@ export async function getDraftDiffValues(
 			path: r.path,
 			custom_path: r.custom_path
 		}
-		const draftValue = r.draft ?? deployed
+		// Strip the draft's pinned fork-base `parent_version` (the deployed allowlist
+		// above already omits it) so it never renders as a spurious diff line.
+		const { parent_version: _pv, ...draftValue } = (r.draft ?? deployed) as any
 		return { deployed: draftOnly ? EMPTY_DEPLOYED.app!(draftValue) : deployed, draft: draftValue }
 	} else {
 		// Variables / resources / schedules / triggers: one overlay GET yields
@@ -246,6 +262,56 @@ export async function getDraftDiffValues(
 	}
 }
 
+/**
+ * Whether a draft's base is stale: the deployed version the draft forked from
+ * no longer matches the current deployed head — a newer version was deployed
+ * after the draft began, so deploying the draft would silently revert it.
+ * Scripts compare the draft's `parent_hash` vs the deployed `hash`; flows the
+ * pinned `version_id` vs the deployed head `version_id`; apps (incl. raw) the
+ * pinned `parent_version` vs the head of `versions`. `r` is the item fetched
+ * with `get_draft=true`; only script/flow/app kinds carry a base pointer.
+ */
+export function draftBaseIsStale(draftKind: UserDraftItemKind, r: any): boolean {
+	const draft = r?.draft
+	if (!draft) return false
+	if (draftKind === 'script') {
+		return !!r.hash && !!draft.parent_hash && draft.parent_hash !== r.hash
+	}
+	if (draftKind === 'flow') {
+		return r.version_id != null && draft.version_id != null && draft.version_id !== r.version_id
+	}
+	const head = Array.isArray(r.versions) ? r.versions[r.versions.length - 1] : undefined
+	return head != null && draft.parent_version != null && draft.parent_version !== head
+}
+
+/** Fetch-and-test wrapper over `draftBaseIsStale` for one draft item. Returns
+ *  false for kinds without a base pointer and on fetch errors (warn, not block). */
+export async function fetchDraftBaseStale(
+	draftKind: UserDraftItemKind,
+	path: string,
+	workspace: string
+): Promise<boolean> {
+	try {
+		if (draftKind === 'script') {
+			const r = await ScriptService.getScriptByPath({ workspace, path, getDraft: true })
+			return draftBaseIsStale(draftKind, r)
+		}
+		if (draftKind === 'flow') {
+			const r = await FlowService.getFlowByPath({ workspace, path, getDraft: true })
+			return draftBaseIsStale(draftKind, r)
+		}
+		if (draftKind === 'app' || draftKind === 'raw_app') {
+			// The apps endpoint auto-detects a raw app and overlays its draft.
+			const r = await AppService.getAppByPath({ workspace, path, getDraft: true })
+			return draftBaseIsStale(draftKind, r)
+		}
+		return false
+	} catch (e) {
+		console.error(`Stale-draft check failed for ${draftKind}:${path}`, e)
+		return false
+	}
+}
+
 /**
  * Deploy a script/flow draft's trigger changes the same way the editors do.
  * Scripts and flows can carry `draft_triggers`; the create/update call below
@@ -276,9 +342,9 @@ export async function deployDraft(
 	kind: DraftKind,
 	path: string,
 	workspace: string,
-	draftOnly = false,
-	rawApp = false
+	opts: { draftOnly?: boolean; rawApp?: boolean; deploymentMessage?: string } = {}
 ): Promise<DeployResult> {
+	const { draftOnly = false, rawApp = false, deploymentMessage } = opts
 	try {
 		if (kind === 'raw_app' || (kind === 'app' && rawApp)) {
 			// Raw apps bundle their source files and deploy via the raw-app
@@ -286,7 +352,7 @@ export async function deployDraft(
 			// `kind === 'app'` + `rawApp` (editor). Must route here: the
 			// visual-app branch would `updateApp` with no `value` (RawAppDraft
 			// has none) and silently drop the draft's files.
-			await deployRawAppDraft(workspace, path)
+			await deployRawAppDraft(workspace, path, deploymentMessage)
 		} else if (kind === 'script') {
 			const r = (await ScriptService.getScriptByPath({ workspace, path, getDraft: true })) as any
 			const d = r.draft ?? r
@@ -297,7 +363,12 @@ export async function deployDraft(
 			// the editor: createScript at the new path with parent_hash links lineage).
 			await ScriptService.createScript({
 				workspace,
-				requestBody: { ...rest, path: scriptPath, parent_hash: r.hash }
+				requestBody: {
+					...rest,
+					path: scriptPath,
+					parent_hash: r.hash,
+					deployment_message: deploymentMessage
+				}
 			})
 			// Then deploy any draft trigger edits, so they aren't dropped with the draft.
 			await deployDraftTriggers(draftTriggers, workspace, scriptPath, true)
@@ -319,7 +390,8 @@ export async function deployDraft(
 				ws_error_handler_muted: d.ws_error_handler_muted,
 				visible_to_runner_only: d.visible_to_runner_only,
 				on_behalf_of_email: d.on_behalf_of_email,
-				labels: d.labels
+				labels: d.labels,
+				deployment_message: deploymentMessage
 			}
 			// Draft-only flows have NO flow row (they live solely in the
 			// draft table), so they deploy via createFlow; a draft on a
@@ -353,14 +425,20 @@ export async function deployDraft(
 			// undefined so the backend preserves the existing route. The draft has no
 			// custom_path, so admins fall back to the deployed route (`''` when none).
 			const isAdmin = !!(get(userStore)?.is_admin || get(userStore)?.is_super_admin)
+			const policy = r.policy ?? { execution_mode: 'publisher' }
 			const requestBody = {
 				value: appValue,
 				summary: draftSummary ?? r.summary ?? '',
-				policy: r.policy ?? { execution_mode: 'publisher' },
+				policy,
 				// Honor the draft's intended path; `draft_path` holds the user-typed path
 				// for a never-deployed app parked at a `u/{user}/draft_{uuid}` storage key.
 				path: draftPath ?? r.path ?? path,
-				custom_path: isAdmin ? (r.custom_path ?? '') : undefined
+				custom_path: isAdmin ? (r.custom_path ?? '') : undefined,
+				deployment_message: deploymentMessage,
+				// The draft carries no on-behalf-of selector — the policy comes straight
+				// from the deployed app. Preserve its on_behalf_of (the backend resets it
+				// to the deploying user without this flag, gated by can_preserve_on_behalf_of).
+				preserve_on_behalf_of: policy?.on_behalf_of ? true : undefined
 			}
 			// Same as flows: draft-only apps have no app row → create;
 			// drafts on a deployed app update it.
diff --git a/frontend/src/lib/utils_workspace_deploy.ts b/frontend/src/lib/utils_workspace_deploy.ts
index bde0003882..72400bb962 100644
--- a/frontend/src/lib/utils_workspace_deploy.ts
+++ b/frontend/src/lib/utils_workspace_deploy.ts
@@ -14,9 +14,15 @@ import {
 	ScheduleService,
 	ScriptService,
 	SqsTriggerService,
+	UserService,
 	VariableService,
-	WebsocketTriggerService
+	WebsocketTriggerService,
+	WorkspaceService
 } from '$lib/gen'
+import {
+	fetchProtectionRulesForWorkspace,
+	canUserBypassRuleKindInRulesets
+} from '$lib/workspaceProtectionRules.svelte'
 import {
 	existsTrigger,
 	getTriggersDeployData,
@@ -229,7 +235,11 @@ function makeProvider(): DeployProvider {
 		getSchedule: (p) => ScheduleService.getSchedule(p),
 		createSchedule: (p) => ScheduleService.createSchedule(p),
 		updateSchedule: (p) => ScheduleService.updateSchedule(p),
-		deleteSchedule: (p) => ScheduleService.deleteSchedule(p)
+		deleteSchedule: (p) => ScheduleService.deleteSchedule(p),
+		// Datatable migrations
+		listDatatableMigrations: (p) => WorkspaceService.listDatatableMigrations(p),
+		upsertDatatableMigration: (p) => WorkspaceService.upsertDatatableMigration(p),
+		deleteDatatableMigration: (p) => WorkspaceService.deleteDatatableMigration(p)
 	}
 }
 
@@ -382,3 +392,42 @@ export async function getOnBehalfOf(
 	}
 	return sharedGetOnBehalfOf(makeProvider(), kind as DeployKind, path, workspace)
 }
+
+export type DeployPermission = { ok: boolean; reason?: string }
+
+/**
+ * Whether the current user may deploy into `workspace`. Mirrors the server-side
+ * deploy authorization (`check_user_against_rule` in windmill-common) so the UI
+ * can disable the action with a reason instead of letting the click 403:
+ *  - operators can never deploy;
+ *  - when the `RestrictDeployToDeployers` protection rule is active, only
+ *    admins, `wm_deployers` members (implicitly), and per-ruleset bypass
+ *    users/groups may deploy.
+ * Fails open on any error — the server still enforces on the actual deploy.
+ * Shared by the session dock and the compare page so both gate identically.
+ */
+export async function checkDeployPermission(workspace: string): Promise<DeployPermission> {
+	try {
+		const me = await UserService.whoami({ workspace })
+		if (me.operator) {
+			return { ok: false, reason: "You're an operator in this workspace — operators can't deploy" }
+		}
+		// Admins and wm_deployers members always satisfy RestrictDeployToDeployers
+		// (the backend allows wm_deployers implicitly, so check it before the
+		// per-ruleset bypass_users/bypass_groups fallback).
+		const isDeployer = me.is_admin || (me.groups ?? []).includes('wm_deployers')
+		if (!isDeployer) {
+			const rulesets = await fetchProtectionRulesForWorkspace(workspace)
+			const userInfo = { is_admin: !!me.is_admin, username: me.username, groups: me.groups ?? [] }
+			if (!canUserBypassRuleKindInRulesets(rulesets, 'RestrictDeployToDeployers', userInfo)) {
+				return {
+					ok: false,
+					reason: 'Only workspace admins and members of wm_deployers can deploy here'
+				}
+			}
+		}
+		return { ok: true }
+	} catch {
+		return { ok: true }
+	}
+}
diff --git a/frontend/src/lib/workspaceProtectionRules.svelte.ts b/frontend/src/lib/workspaceProtectionRules.svelte.ts
index fa9627ba02..1774ed60e2 100644
--- a/frontend/src/lib/workspaceProtectionRules.svelte.ts
+++ b/frontend/src/lib/workspaceProtectionRules.svelte.ts
@@ -1,6 +1,11 @@
 import { WorkspaceService, type ProtectionRuleset, type ProtectionRuleKind } from './gen'
 import type { UserExt } from './stores'
 
+// The slice of the user identity the bypass checks read — structural, so
+// callers can pass a whoami response (normalised groups) as well as the
+// UserExt store value.
+export type RuleBypassUser = Pick<UserExt, 'is_admin' | 'username' | 'groups'>
+
 /**
  * Internal reactive state using Svelte 5 $state rune
  */
@@ -94,7 +99,7 @@ export async function fetchProtectionRulesForWorkspace(
  * @param userInfo The user information
  * @returns true if user can bypass (is admin, in bypass_users, or has group in bypass_groups)
  */
-export function canUserBypassRule(ruleset: ProtectionRuleset, userInfo: UserExt): boolean {
+export function canUserBypassRule(ruleset: ProtectionRuleset, userInfo: RuleBypassUser): boolean {
 	// Admin always bypasses
 	if (userInfo.is_admin) {
 		return true
@@ -134,7 +139,7 @@ export function isRuleActive(ruleKind: ProtectionRuleKind): boolean {
  */
 export function canUserBypassRuleKind(
 	ruleKind: ProtectionRuleKind,
-	userInfo: UserExt | undefined
+	userInfo: RuleBypassUser | undefined
 ): boolean {
 	// If no user info, default to permissive
 	if (!userInfo) {
@@ -187,7 +192,7 @@ export function isRuleActiveInRulesets(
 export function canUserBypassRuleKindInRulesets(
 	rulesets: ProtectionRuleset[],
 	ruleKind: ProtectionRuleKind,
-	userInfo: UserExt | undefined
+	userInfo: RuleBypassUser | undefined
 ): boolean {
 	// If no user info, default to not allowing bypass
 	if (!userInfo) {
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index fa9bf2122d..8bd5119945 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -12,8 +12,12 @@
 		WorkspaceService
 	} from '$lib/gen'
 	import { capitalize, classNames, getModifierKey, sendUserToast } from '$lib/utils'
+	import { useLocalStorageValue } from '$lib/svelte5Utils.svelte'
 	import WorkspaceMenu from '$lib/components/sidebar/WorkspaceMenu.svelte'
 	import SidebarContent from '$lib/components/sidebar/SidebarContent.svelte'
+	import SettingsMenu from '$lib/components/sidebar/SettingsMenu.svelte'
+	import SidebarScrollArea from '$lib/components/sidebar/SidebarScrollArea.svelte'
+	import { SIDEBAR_BG, SIDEBAR_BG_DARK } from '$lib/components/sidebar/sidebarChrome'
 	import CriticalAlertModal from '$lib/components/sidebar/CriticalAlertModal.svelte'
 	import ForkConflictModal from '$lib/components/ForkConflictModal.svelte'
 	import {
@@ -38,6 +42,7 @@
 	import CenteredModal from '$lib/components/CenteredModal.svelte'
 	import { afterNavigate, beforeNavigate } from '$app/navigation'
 	import { goto } from '$lib/navigation'
+	import { registerToolDisplayActionHandler } from '$lib/components/copilot/chat/createdResourceActions.svelte'
 	import UserSettings from '$lib/components/UserSettings.svelte'
 	import SuperadminSettings from '$lib/components/SuperadminSettings.svelte'
 	import WindmillIcon from '$lib/components/icons/WindmillIcon.svelte'
@@ -50,23 +55,31 @@
 	import { SUPERADMIN_SETTINGS_HASH, USER_SETTINGS_HASH } from '$lib/components/sidebar/settings'
 	import { isCloudHosted } from '$lib/cloud'
 	import { syncTutorialsTodos } from '$lib/tutorialUtils'
-	import { ArrowLeft, Search, WandSparkles } from 'lucide-svelte'
+	import { PanelLeftClose, PanelLeftOpen, Home, Play, Search, WandSparkles } from 'lucide-svelte'
 	import { getUserExt } from '$lib/user'
 	import { deepEqual } from 'fast-equals'
 	import { twMerge } from 'tailwind-merge'
 	import OperatorMenu from '$lib/components/sidebar/OperatorMenu.svelte'
 	import GlobalSearchModal from '$lib/components/search/GlobalSearchModal.svelte'
 	import MenuButton from '$lib/components/sidebar/MenuButton.svelte'
+	import MenuLink from '$lib/components/sidebar/MenuLink.svelte'
 	import { loadProtectionRules } from '$lib/workspaceProtectionRules.svelte'
-	import { migrateLegacyUserDrafts } from '$lib/userDraftLegacyMigration'
+	import { purgeLegacyUserDrafts } from '$lib/userDraftLegacyMigration'
 	import { migrateUserDraftsToDb } from '$lib/userDraftDbMigration'
 	import DraftMigrationErrorModal from '$lib/components/DraftMigrationErrorModal.svelte'
-	import { setContext, untrack } from 'svelte'
+	import { onDestroy, setContext, untrack } from 'svelte'
 	import { base } from '$app/paths'
 	import { Menubar } from '$lib/components/meltComponents'
 	import { aiChatManager } from '$lib/components/copilot/chat/AIChatManager.svelte'
 	import AiChatLayout from '$lib/components/copilot/chat/AiChatLayout.svelte'
 	import SessionPicker from '$lib/components/sessions/SessionPicker.svelte'
+	import SessionModeSwitch from '$lib/components/sessions/SessionModeSwitch.svelte'
+	import { isGlobalAiEnabled } from '$lib/components/copilot/chat/global/gate'
+	import { parsePreviewItemRoute } from '$lib/components/sessions/previewRouter'
+	import { rememberNavRoute } from '$lib/components/sessions/sessionSwitch.svelte'
+	import { sessionState } from '$lib/components/sessions/sessionState.svelte'
+	import { currentWorkspaceRootId } from '$lib/components/sessions/sessionScope.svelte'
+	import WorkspaceScopeHeader from '$lib/components/sidebar/WorkspaceScopeHeader.svelte'
 	import { DEFAULT_HUB_BASE_URL } from '$lib/hub'
 	import DBManagerDrawer from '$lib/components/DBManagerDrawer.svelte'
 	import { useIsDarkMode } from '$lib/components/DarkModeObserver.svelte'
@@ -86,16 +99,138 @@
 	let { children }: Props = $props()
 	OpenAPI.WITH_CREDENTIALS = true
 	let menuOpen = $state(false)
+	// Set by the workspace⇄session switch before it navigates, so the mobile menu
+	// drawer stays open across a mode toggle (unlike a normal link navigation,
+	// which dismisses it). Consumed once in beforeNavigate.
+	let preserveMenuOnNextNav = false
 	let globalSearchModal: GlobalSearchModal | undefined = $state(undefined)
-	let isCollapsed = $state(false)
+	// Persisted nav-rail collapse preference. A deliberate collapse writes to it —
+	// the manual toggle and a drag past the collapse threshold. The contextual
+	// auto-collapse (app-mode routes, narrow widths) mutates the in-memory
+	// `isCollapsed` without persisting, so it stays transient and never gets
+	// "stuck" collapsed across reloads.
+	const collapsePref = useLocalStorageValue<boolean>('nav_menu_collapsed', false, 'boolean')
+	let isCollapsed = $state(collapsePref.val)
+
+	// Resizable desktop rail, sized in REM so it scales with the root font-size the
+	// same way the old `w-52`/`w-12` classes did — `:root` jumps to 18px past 1760px
+	// wide (app.css), which grows the rem-based button content; a fixed-px rail would
+	// not grow with it and the content would overflow. SIDEBAR_MIN_REM is the default
+	// expanded width (the old w-52); the handle only resizes when expanded and only
+	// widens from there — collapsing is the toggle button's job, not the drag's.
+	const SIDEBAR_MIN_REM = 13
+	const SIDEBAR_COLLAPSED_REM = 3
+	// Root font-size in px, used to convert the pointer's clientX (px) into rem.
+	function rootFontPx(): number {
+		if (!BROWSER) return 16
+		const px = parseFloat(getComputedStyle(document.documentElement).fontSize)
+		return Number.isFinite(px) && px > 0 ? px : 16
+	}
+	const widthPref = useLocalStorageValue<number>('nav_menu_width_rem', SIDEBAR_MIN_REM, 'number')
+	// A non-finite stored width (e.g. NaN from a corrupt entry) must never reach the
+	// `style:width` binding: `Math.max(13, NaN)` is NaN, which renders as the invalid
+	// `width: NaNrem` and collapses the fixed rail to content width, mangling every
+	// menu button. Clamp defensively.
+	function clampSidebarWidth(v: number): number {
+		return Number.isFinite(v) ? Math.max(SIDEBAR_MIN_REM, v) : SIDEBAR_MIN_REM
+	}
+	const initialSidebarWidth = clampSidebarWidth(widthPref.val)
+	let sidebarWidth = $state(initialSidebarWidth)
+	// Heal a corrupt stored value so it stops breaking the rail on every reload.
+	if (widthPref.val !== initialSidebarWidth) widthPref.val = initialSidebarWidth
+	let resizingSidebar = $state(false)
+	// Width (in rem) the content offset must track: the icon strip when collapsed,
+	// the user-chosen width otherwise.
+	let railWidth = $derived(isCollapsed ? SIDEBAR_COLLAPSED_REM : sidebarWidth)
+	// Width transition shared by the rail and the content offset: none for the whole
+	// drag (the rail tracks the pointer 1:1 and hits the min as a hard wall, no
+	// friction), a plain ease only for the collapse/expand toggle.
+	let sidebarTransitionClass = $derived(
+		resizingSidebar ? '' : 'transition-all duration-200 ease-in-out'
+	)
+	// Set while a drag is live so it can be torn down if the layout unmounts
+	// mid-drag (otherwise the window listeners would leak).
+	let stopSidebarResize: (() => void) | null = null
+
+	function startSidebarResize(e: PointerEvent) {
+		// One drag at a time: ignore a second concurrent pointer (multi-touch on the
+		// handle) so its window listeners can't outlive the first pointer's stop().
+		if (resizingSidebar) return
+		e.preventDefault()
+		const handle = e.currentTarget as HTMLElement
+		// Capture the pointer so events keep flowing to us even when the cursor
+		// crosses an iframe in the content area (app/session previews) — without
+		// this the drag silently stalls the moment it enters the iframe.
+		try {
+			handle.setPointerCapture(e.pointerId)
+		} catch {}
+		resizingSidebar = true
+		// The rail is fixed at left:0, so the pointer's clientX is the width — in px.
+		// Convert to rem (the unit the rail is sized in) via the root font-size. Pure
+		// resize: clamp at the min so the rail stops there like a wall (dragging left
+		// never collapses — that's the toggle button's job).
+		const onMove = (ev: PointerEvent) => {
+			sidebarWidth = Math.max(SIDEBAR_MIN_REM, ev.clientX / rootFontPx())
+		}
+		// pointercancel (and unmount, via onDestroy) must clear the state too, or
+		// `resizingSidebar` sticks true — the overlay and handle highlight stay up
+		// and the window listeners leak.
+		const stop = () => {
+			if (!resizingSidebar) return
+			resizingSidebar = false
+			widthPref.val = sidebarWidth
+			window.removeEventListener('pointermove', onMove)
+			window.removeEventListener('pointerup', stop)
+			window.removeEventListener('pointercancel', stop)
+			try {
+				handle.releasePointerCapture(e.pointerId)
+			} catch {}
+			stopSidebarResize = null
+		}
+		stopSidebarResize = stop
+		window.addEventListener('pointermove', onMove)
+		window.addEventListener('pointerup', stop)
+		window.addEventListener('pointercancel', stop)
+	}
+
+	onDestroy(() => stopSidebarResize?.())
+
+	// Let AI chat's 'navigate' link chips route through the app router without the
+	// tool layer importing $app/navigation.
+	$effect(() => {
+		const unregisterNavigate = registerToolDisplayActionHandler('navigate', (action) => {
+			if (action.type === 'navigate') goto(action.url)
+		})
+		return unregisterNavigate
+	})
 	let userSettings: UserSettings | undefined = $state()
 	let superadminSettings: SuperadminSettings | undefined = $state()
 	let menuHidden = $state(false)
 	let isDarkMode = useIsDarkMode()
 	let darkMode = $derived(isDarkMode.val)
 
-	const SIDEBAR_BG = '#F3F3F7'
-	const SIDEBAR_BG_DARK = '#1e232e'
+	// Session mode is route-derived: the rail shows the sessions sidebar on the
+	// /sessions page and the workspace navigation everywhere else. The switch
+	// (SessionModeSwitch) just navigates in and out of that route.
+	let sessionMode = $derived(page.url.pathname.startsWith(base + '/sessions'))
+	// Session mode points the bottom settings entry at the open session's own
+	// workspace. An unsent draft hasn't committed one yet, so it falls back to
+	// the family root.
+	let sessionSettingsWorkspace = $derived.by(() => {
+		if (!sessionMode) return undefined
+		const current = sessionState.sessions.find((s) => s.id === sessionState.currentSessionId)
+		return current?.workspace_id ?? $currentWorkspaceRootId ?? $workspaceStore ?? undefined
+	})
+	// Inside a preview iframe the rail still renders (navigation mode), but the
+	// switch must not — entering session mode from within the preview would
+	// nest the whole experience. Hide it when embedded.
+	const embedded = BROWSER && window.self !== window.top
+
+	// AI sessions are still dev-gated (localStorage wm_dev_global_ai=1), same as
+	// the global chat. The Workspace ⇄ Sessions switch is the only entry point, so
+	// gate it on the flag too — otherwise it would ship the unfinished experience
+	// to prod. The /sessions page has its own gate for direct navigation.
+	const globalAiEnabled = isGlobalAiEnabled()
 
 	if (page.status == 404) {
 		goto('/user/login')
@@ -120,18 +255,46 @@
 			$workspaceStore = queryWorkspace
 		}
 
-		menuHidden =
-			page.url.searchParams.get('nomenubar') === 'true' ||
-			page.url.pathname.startsWith('/oauth/callback/')
+		// When this window is an iframe (e.g. the sessions preview), keep the menu
+		// hidden once `nomenubar` has been requested: navigating inside the preview
+		// drops the query param (both client-side routing and full-document loads),
+		// and we don't want the global nav to pop back in. Stickiness is stored in
+		// sessionStorage so it survives full reloads within the iframe's browsing
+		// context. The top window is unaffected (embedded is false there), so the
+		// oauth-callback case and ordinary navigation still toggle normally.
+		const embedded = typeof window !== 'undefined' && window.self !== window.top
+		const requested = page.url.searchParams.get('nomenubar') === 'true'
+		if (embedded && requested) {
+			try {
+				sessionStorage.setItem('nomenubar_embedded', 'true')
+			} catch {}
+		}
+		let stickyEmbedded = false
+		if (embedded) {
+			try {
+				stickyEmbedded = sessionStorage.getItem('nomenubar_embedded') === 'true'
+			} catch {}
+		}
+		menuHidden = requested || page.url.pathname.startsWith('/oauth/callback/') || stickyEmbedded
 	}
 
 	async function updateUserStore(workspace: string | undefined) {
 		if (workspace) {
-			try {
-				sessionStorage.setItem('workspace', String(workspace))
-				localStorage.setItem('workspace', String(workspace))
-			} catch (e) {
-				console.error('Could not persist workspace to local storage', e)
+			// A preview iframe shares BOTH localStorage and sessionStorage with the
+			// top-level app (same-origin nested browsing contexts share the top-level
+			// session storage). Persisting its session-scoped workspace to either would
+			// clobber the workspace the user is actually navigating. Keep it in-memory
+			// only ($workspaceStore is still set from the ?workspace= param for the
+			// iframe's own API calls); the fork survives iframe reloads because the
+			// preview always reloads a URL that carries ?workspace= (see
+			// PreviewTabHost.reload). Only the top window owns the persisted keys.
+			if (!embedded) {
+				try {
+					sessionStorage.setItem('workspace', String(workspace))
+					localStorage.setItem('workspace', String(workspace))
+				} catch (e) {
+					console.error('Could not persist workspace to local storage', e)
+				}
 			}
 			const user = await getUserExt(workspace)
 			if (!deepEqual(user, $userStore)) {
@@ -147,16 +310,102 @@
 			} catch (e) {
 				console.error('Could not persist username to local storage', e)
 			}
-			if (isCloudHosted() && user?.is_admin) {
-				isPremiumStore.set(await WorkspaceService.getIsPremium({ workspace }))
+			// Populate for all members (not just admins) so non-admin developers also get premium-gated
+			// affordances like the fork entry points on cloud. The `is_premium` endpoint is a boolean
+			// and no longer admin-gated. Best-effort: a failure here must not block user-store init.
+			if (isCloudHosted()) {
+				try {
+					isPremiumStore.set(await WorkspaceService.getIsPremium({ workspace }))
+				} catch (e) {
+					console.error('Could not fetch premium status', e)
+				}
 			}
 		} else {
 			userStore.set(undefined)
 		}
 	}
 
+	// True when this window is a sessions-preview iframe (embedded + nomenubar,
+	// which the preview always sets and stickies — see the menu-hide block above).
+	function isSessionPreviewEmbed(): boolean {
+		if (!embedded) return false
+		try {
+			return sessionStorage.getItem('nomenubar_embedded') === 'true'
+		} catch {
+			return false
+		}
+	}
+
+	// A job-detail navigation (/run/<id>) inside a preview tab should open the job in
+	// a NEW tab rather than navigate the current tab away from its page (e.g. clicking
+	// a job in the Runs tab keeps Runs put and opens the run beside it). Returns the
+	// href to open (nomenubar dropped — the preview host re-adds it) and a short label.
+	function previewRunTarget(url: URL | undefined): { href: string; label: string } | undefined {
+		if (!url) return undefined
+		const m = url.pathname.match(/\/run\/([^/?#]+)/)
+		if (!m) return undefined
+		const u = new URL(url.href)
+		u.searchParams.delete('nomenubar')
+		const id = decodeURIComponent(m[1])
+		return { href: u.pathname + u.search, label: `Run ${id.slice(0, 8)}` }
+	}
+
+	// Map a navigation target to the session editor it should open as a component,
+	// or undefined for anything without a live-editor wrapper (regular apps, pages,
+	// /get viewers). Only /edit routes — the wrappers are editors.
+	function previewEditorTarget(
+		url: URL | undefined
+	): { kind: 'script' | 'flow' | 'raw_app'; path: string } | undefined {
+		if (!url || !/\/(scripts|flows|apps_raw)\/edit\//.test(url.pathname)) return undefined
+		const route = parsePreviewItemRoute(url.pathname)
+		if (!route) return undefined
+		const kind =
+			route.kind === 'script'
+				? 'script'
+				: route.kind === 'flow'
+					? 'flow'
+					: route.raw_app
+						? 'raw_app'
+						: undefined
+		return kind ? { kind, path: route.itemPath } : undefined
+	}
+
 	beforeNavigate((navigation) => {
-		menuOpen = false
+		if (preserveMenuOnNextNav) {
+			preserveMenuOnNextNav = false
+		} else {
+			menuOpen = false
+		}
+
+		// Inside a sessions-preview iframe, hand an editor-route navigation up to the
+		// parent so it mounts the in-process editor (sharing the session runtime)
+		// instead of booting a second, disconnected editor in this frame. Cancel so
+		// the heavy editor never mounts here at all. Runs before the apps_raw reload
+		// below so a raw-app editor promotes rather than full-reloading the iframe.
+		if (isSessionPreviewEmbed()) {
+			const target = previewEditorTarget(navigation.to?.url)
+			if (target) {
+				navigation.cancel()
+				try {
+					window.parent.postMessage(
+						{ type: 'wm.session.openEditor', kind: target.kind, path: target.path },
+						window.location.origin
+					)
+				} catch {}
+				return
+			}
+			const runTarget = previewRunTarget(navigation.to?.url)
+			if (runTarget) {
+				navigation.cancel()
+				try {
+					window.parent.postMessage(
+						{ type: 'wm.session.openRun', href: runTarget.href, label: runTarget.label },
+						window.location.origin
+					)
+				} catch {}
+				return
+			}
+		}
 
 		// Force page reload when navigating to /apps_raw/add or /apps_raw/edit
 		// This ensures the cross-origin isolation headers are fetched from the server
@@ -164,8 +413,9 @@
 		const toPath = navigation.to?.url.pathname
 		if (toPath && (toPath.startsWith('/apps_raw/add') || toPath.startsWith('/apps_raw/edit'))) {
 			const currentPath = navigation.from?.url.pathname
-			// Reload if we're not on an apps_raw path, or if we're on /apps/get_raw/ (viewing a raw app)
-			// The /apps/get_raw/ path doesn't have cross-origin isolation headers, so we need to reload
+			// Reload if we're not on an apps_raw path, or if we're on the raw app viewer
+			// (/apps_raw/get/): the viewer doesn't have cross-origin isolation headers, so
+			// we need a full reload to fetch them for the editor.
 			if (!currentPath?.startsWith('/apps_raw/') || currentPath?.startsWith('/apps_raw/get/')) {
 				navigation.cancel()
 				window.location.href = navigation.to!.url.href
@@ -319,19 +569,12 @@
 		$usedTriggerKinds = usedKinds
 	}
 
-	function pathInAppMode(pathname: string | undefined): boolean {
-		if (!pathname) return false
-		return (
-			pathname.startsWith(base + '/apps') ||
-			pathname.startsWith(base + '/flows/add') ||
-			pathname.startsWith(base + '/flows/edit') ||
-			pathname.startsWith(base + '/scripts/add') ||
-			pathname.startsWith(base + '/scripts/edit')
-		)
-	}
 	afterNavigate((n) => {
-		if (pathInAppMode(n.to?.url.pathname) && innerWidth >= 768) {
-			isCollapsed = true
+		// Remember the last navigation-mode route so exiting session mode returns
+		// the user where they were rather than to the home page.
+		const to = n.to?.url
+		if (to && !to.pathname.startsWith(base + '/sessions')) {
+			rememberNavRoute(to.pathname + to.search)
 		}
 	})
 
@@ -342,9 +585,6 @@
 	}
 
 	let devOnly = $derived(page.url.pathname.startsWith(base + '/scripts/dev'))
-	// Sessions own their own chat pane; suppress the global Ask-AI chat on the /sessions route
-	// so it doesn't render a second chat overlay on top of the session.
-	let inSessionRoute = $derived(page.url.pathname.startsWith(base + '/sessions'))
 
 	async function loadDefaultScripts(workspace: string, user: UserExt | undefined) {
 		if (!user?.operator) {
@@ -435,16 +675,17 @@
 	$effect(() => {
 		$workspaceStore && untrack(() => onLoad())
 	})
-	// One-shot UserDraft migration chain. `migrateLegacyUserDrafts` folds
-	// the legacy `flow` / `app-…` / `rawapp-…` LS keys into the
-	// `userdraft/w/{ws}/{kind}/{path}` format; `migrateUserDraftsToDb`
-	// then pushes those onto the server-side draft table and clears LS
-	// on success. The order matters — the second step only sees what
-	// the first one normalized.
+	// One-shot UserDraft migration. `purgeLegacyUserDrafts` drops the oldest
+	// workspace-blind `flow` / `app-…` / `rawapp-…` LS autosave keys (they
+	// can't be attributed to a workspace, so promoting them would mis-file
+	// drafts). `migrateUserDraftsToDb` then pushes the workspace-scoped
+	// `userdraft/w/{ws}/{kind}/{path}` keys — written by the editor with the
+	// correct workspace — onto the server-side draft table, clearing LS on
+	// success.
 	$effect(() => {
 		if ($workspaceStore && $userStore) {
 			untrack(() => {
-				migrateLegacyUserDrafts($workspaceStore!)
+				purgeLegacyUserDrafts()
 				void migrateUserDraftsToDb()
 			})
 		}
@@ -501,6 +742,61 @@
 
 <svelte:window bind:innerWidth />
 
+<!-- Home + Runs lifted to the top of the workspace nav, sitting with Favorites
+     and Search as the primary quick-access cluster. Excluded from SidebarContent
+     (via excludeMainLabels) so they aren't rendered twice. -->
+{#snippet quickLinks(collapsed: boolean)}
+	<MenuLink
+		class="!text-xs"
+		label="Home"
+		href={`${base}/`}
+		icon={Home}
+		isCollapsed={collapsed}
+		aiId="sidebar-menu-link-home"
+		aiDescription="Button to navigate to home which contains all the user's scripts, flows and apps"
+	/>
+	<MenuLink
+		class="!text-xs"
+		label="Runs"
+		href={`${base}/runs`}
+		icon={Play}
+		isCollapsed={collapsed}
+		aiId="sidebar-menu-link-runs"
+		aiDescription="Button to navigate to runs"
+		onclick={() => {
+			setTimeout(() => {
+				window.dispatchEvent(new Event('popstate'))
+			}, 100)
+		}}
+	/>
+{/snippet}
+
+<!-- Windmill brand mark anchoring the sidebar bottom (the header slot is taken
+     by the workspace picker). -->
+{#snippet brandMark(collapsed: boolean)}
+	<div class="flex items-center gap-x-1.5 text-xs font-semibold text-emphasis">
+		<WindmillIcon white={darkMode} height="16px" width="16px" />
+		{#if !collapsed}
+			{$whitelabelNameStore ? capitalize($whitelabelNameStore) : 'Windmill'}
+		{/if}
+	</div>
+{/snippet}
+
+<!-- Settings / instance section. Shared by both sidebar surfaces and both modes
+     (in nav mode it's the last section inside the unified scroll area; in session
+     mode it stays pinned under the session list). -->
+{#snippet settingsMenu(collapsed: boolean)}
+	<div class="px-2 pb-1">
+		<SettingsMenu
+			isCollapsed={collapsed}
+			workspaceSettingsTarget={sessionSettingsWorkspace}
+			numUnacknowledgedCriticalAlerts={isCriticalAlertsUiMuted
+				? 0
+				: numUnacknowledgedCriticalAlerts}
+		/>
+	</div>
+{/snippet}
+
 <UserSettings bind:this={userSettings} showMcpMode={true} />
 <DraftMigrationErrorModal />
 {#if page.status == 404}
@@ -514,6 +810,11 @@
 		<CriticalAlertModal bind:muteSettings bind:numUnacknowledgedCriticalAlerts />
 	{/if}
 	<div class="h-screen flex flex-col">
+		{#if resizingSidebar}
+			<!-- While dragging, this overlay gives the whole viewport the resize cursor
+			     and stops the pointer from selecting text or hovering content/iframes. -->
+			<div class="fixed inset-0 z-50 cursor-col-resize select-none"></div>
+		{/if}
 		{#if !menuHidden}
 			{#if !$userStore?.operator}
 				{#if innerWidth < 768}
@@ -576,58 +877,101 @@
 									class="h-full flex flex-col"
 									style:background-color={darkMode ? SIDEBAR_BG_DARK : SIDEBAR_BG}
 								>
-									<div class="flex gap-x-2 flex-shrink-0 p-4 font-semibold text-emphasis w-40">
-										<WindmillIcon white={darkMode} height="20px" width="20px" />
-										{#if $whitelabelNameStore}
-											{$whitelabelNameStore}
-										{:else}
-											Windmill
-										{/if}
-									</div>
-									<div class="px-2 py-4 border-y border-light dark:border-gray-700">
-										<Menubar>
+									<!-- Workspace picker as the drawer header (replaces the Windmill logo). -->
+									<div class="flex-shrink-0 px-2 h-12 w-52 flex items-center">
+										<Menubar class="w-full">
 											{#snippet children({ createMenu })}
 												<WorkspaceMenu {createMenu} />
-												<FavoriteMenu {createMenu} favoriteLinks={favoriteManager.current} />
 											{/snippet}
 										</Menubar>
-										<MenuButton
-											stopPropagationOnClick={true}
-											on:click={() => openSearchModal()}
-											isCollapsed={false}
-											icon={Search}
-											label="Search"
-											class="!text-xs"
-											shortcut={`${getModifierKey()}k`}
-										/>
-										<MenuButton
-											stopPropagationOnClick={true}
-											on:click={() => aiChatManager.toggleOpen()}
-											isCollapsed={false}
-											icon={WandSparkles}
-											iconProps={{
-												forceDarkMode: true
-											}}
-											label="Ask AI"
-											class="!text-xs"
-											iconClasses="!text-ai"
-											shortcut={`${getModifierKey()}L`}
-										/>
 									</div>
 
-									<!-- w-40 cap: the drawer is max-w-min, and long session titles
-									     (nowrap before truncation) would otherwise inflate its
-									     min-content width to the full text width. -->
-									<div class="w-40">
-										<SessionPicker isCollapsed={false} />
-									</div>
+									{#if !embedded && globalAiEnabled}
+										<!-- The switch: workspace navigation ⇄ sessions sidebar. -->
+										<div class="px-2 pb-1 w-52">
+											<SessionModeSwitch
+												mode={sessionMode ? 'session' : 'nav'}
+												onToggle={() => (preserveMenuOnNextNav = true)}
+											/>
+										</div>
+									{/if}
 
-									<SidebarContent
-										isCollapsed={false}
-										numUnacknowledgedCriticalAlerts={isCriticalAlertsUiMuted
-											? 0
-											: numUnacknowledgedCriticalAlerts}
-									/>
+									{#if !sessionMode}
+										<!-- Workspace scope (fork picker): part of the top workspace group. -->
+										<div class="pb-1 w-52 {globalAiEnabled ? '' : '-mt-1'}">
+											<WorkspaceScopeHeader isCollapsed={false} />
+										</div>
+									{/if}
+
+									{#if sessionMode}
+										<!-- Session mode: the session list owns the rail.
+										     w-52 cap (matches the desktop sidebar width): the drawer is
+										     max-w-min, and long session titles (nowrap before truncation)
+										     would otherwise inflate its min-content width to the full
+										     text width. -->
+										<div class="px-2 py-2 w-52">
+											<SessionPicker isCollapsed={false} embedded collapsible={false} />
+										</div>
+										{@render settingsMenu(false)}
+									{:else}
+										<!-- Navigation mode: Home → Settings scroll as ONE block with an
+										     overflow fade hint (same treatment as the desktop rail). -->
+										<SidebarScrollArea color={darkMode ? SIDEBAR_BG_DARK : SIDEBAR_BG}>
+											<!-- Section 1: Home/Runs + Favorites + Search -->
+											<div class="px-2 pt-1 w-52 flex flex-col gap-1">
+												{@render quickLinks(false)}
+												<Menubar>
+													{#snippet children({ createMenu })}
+														<FavoriteMenu {createMenu} favoriteLinks={favoriteManager.current} />
+													{/snippet}
+												</Menubar>
+												<MenuButton
+													stopPropagationOnClick={true}
+													on:click={() => openSearchModal()}
+													isCollapsed={false}
+													icon={Search}
+													label="Search"
+													class="!text-xs"
+													shortcut={`${getModifierKey()}k`}
+												/>
+												{#if !globalAiEnabled}
+													<!-- Global Ask-AI pane. When the sessions dev flag is on it is
+													     replaced by SessionModeSwitch, so it only shows in prod. -->
+													<MenuButton
+														stopPropagationOnClick={true}
+														on:click={() => aiChatManager.toggleOpen()}
+														isCollapsed={false}
+														icon={WandSparkles}
+														iconProps={{ forceDarkMode: true }}
+														label="Ask AI"
+														class="!text-xs"
+														iconClasses="!text-ai"
+														shortcut={`${getModifierKey()}L`}
+													/>
+												{/if}
+											</div>
+
+											<!-- Section 2: workspace items -->
+											<SidebarContent
+												isCollapsed={false}
+												showSecondary={false}
+												excludeMainLabels={['Home', 'Runs']}
+												numUnacknowledgedCriticalAlerts={isCriticalAlertsUiMuted
+													? 0
+													: numUnacknowledgedCriticalAlerts}
+											/>
+
+											<!-- Section 3: instance settings — mt-auto drops it to the bottom
+											     when there is spare room (see the desktop rail for the rationale). -->
+											<div class="mt-auto">
+												{@render settingsMenu(false)}
+											</div>
+										</SidebarScrollArea>
+									{/if}
+
+									<div class="px-4 pt-3 pb-3.5 w-52">
+										{@render brandMark(false)}
+									</div>
 								</div>
 							</div>
 						</div>
@@ -636,93 +980,150 @@
 					<div
 						id="sidebar"
 						class={classNames(
-							'flex flex-col fixed inset-y-0 transition-all ease-in-out duration-200 z-40 ',
-							isCollapsed ? 'w-12' : 'w-40',
+							'flex flex-col fixed inset-y-0 z-40 ',
+							sidebarTransitionClass,
 							devOnly ? '!hidden' : ''
 						)}
+						style:width="{railWidth}rem"
 					>
 						<div
-							class="flex-1 flex flex-col min-h-0 h-screen border-r border-light dark:border-gray-700"
+							class="flex-1 flex flex-col min-h-0 h-screen shadow-[inset_-1px_0_0_0_rgb(var(--color-border-light))] dark:shadow-[inset_-1px_0_0_0_#374151]"
 							style:background-color={darkMode ? SIDEBAR_BG_DARK : SIDEBAR_BG}
 						>
-							<button
-								onclick={() => {
-									goto('/')
-								}}
-							>
+							{#if !isCollapsed}
+								<!-- Resize handle straddling the right edge, only while expanded:
+								     drag to widen (clamped at the min). Collapsing is the toggle
+								     button's job. -->
 								<div
-									class="flex-row flex-shrink-0 px-3.5 py-3.5 text-opacity-70 h-12 flex items-center gap-1.5"
-									class:w-40={!isCollapsed}
-								>
-									<div class:mr-1={!isCollapsed}>
-										<WindmillIcon white={darkMode} height="20px" width="20px" />
-									</div>
-									{#if !isCollapsed}
-										<div class="text-sm mt-0.5 text-emphasis">
-											{#if $whitelabelNameStore}{capitalize(
-													$whitelabelNameStore
-												)}{:else}Windmill{/if}
-										</div>
-									{/if}
-								</div>
-							</button>
-							<div class="px-2 py-4 border-y border-light dark:border-gray-700 flex flex-col gap-1">
-								<Menubar class="flex flex-col gap-1">
+									role="separator"
+									aria-orientation="vertical"
+									aria-label="Resize sidebar"
+									title="Drag to resize"
+									class={classNames(
+										'absolute inset-y-0 -right-0.5 w-1.5 cursor-col-resize z-50 transition-colors',
+										resizingSidebar ? '' : 'hover:bg-surface-hover'
+									)}
+									onpointerdown={startSidebarResize}
+								></div>
+							{/if}
+							<!-- Workspace picker as the sidebar header (replaces the Windmill logo).
+							     Kept in both modes: it scopes which workspace family's sessions
+							     the sessions sidebar shows. -->
+							<div class="flex-shrink-0 px-2 h-12 flex items-center">
+								<Menubar class="w-full">
 									{#snippet children({ createMenu })}
 										<WorkspaceMenu {createMenu} {isCollapsed} />
-										<FavoriteMenu
-											{createMenu}
-											favoriteLinks={favoriteManager.current}
-											{isCollapsed}
-										/>
 									{/snippet}
 								</Menubar>
-								<MenuButton
-									stopPropagationOnClick={true}
-									on:click={() => openSearchModal()}
-									{isCollapsed}
-									icon={Search}
-									label="Search"
-									class="!text-xs"
-									shortcut={`${getModifierKey()}k`}
-								/>
-								<MenuButton
-									stopPropagationOnClick={true}
-									on:click={() => aiChatManager.toggleOpen()}
-									{isCollapsed}
-									icon={WandSparkles}
-									iconProps={{
-										forceDarkMode: true
-									}}
-									label="Ask AI"
-									class="!text-xs"
-									iconClasses="!text-ai"
-									shortcut={`${getModifierKey()}L`}
-								/>
 							</div>
 
-							<SessionPicker {isCollapsed} />
+							{#if !embedded && globalAiEnabled}
+								<!-- The switch: workspace navigation ⇄ sessions sidebar. -->
+								<div class="px-2 pb-1 {isCollapsed ? 'flex justify-center' : ''}">
+									<SessionModeSwitch mode={sessionMode ? 'session' : 'nav'} {isCollapsed} />
+								</div>
+							{/if}
 
-							<SidebarContent
-								{isCollapsed}
-								numUnacknowledgedCriticalAlerts={isCriticalAlertsUiMuted
-									? 0
-									: numUnacknowledgedCriticalAlerts}
-							/>
+							{#if !sessionMode}
+								<!-- Workspace scope (fork picker): part of the top workspace group,
+								     together with the family menu and the mode switch above. Without
+								     the switch, pull it up so the group still reads as one block. -->
+								<div class="pb-1 {globalAiEnabled ? '' : '-mt-1'}">
+									<WorkspaceScopeHeader {isCollapsed} />
+								</div>
+							{/if}
 
-							<div class="flex-shrink-0 flex px-4 pb-3.5">
+							{#if sessionMode}
+								<!-- Session mode: the session list owns the rail. Workspace nav moves
+								     into the preview side panel (the iframe renders its own nav). -->
+								<div class="px-2 py-2 flex flex-col gap-1 flex-1 min-h-0 overflow-y-auto">
+									<SessionPicker {isCollapsed} embedded collapsible={false} />
+								</div>
+								{@render settingsMenu(isCollapsed)}
+							{:else}
+								<!-- Navigation mode: Home → Settings scroll as ONE block with an
+								     overflow fade hint. The three sections (Home/Runs + Favorites +
+								     Search / workspace items / instance settings) are spaced by the
+								     scroll area's gap rather than each scrolling on its own. -->
+								<SidebarScrollArea color={darkMode ? SIDEBAR_BG_DARK : SIDEBAR_BG}>
+									<!-- Section 1: Home/Runs + Favorites + Search -->
+									<div class="px-2 pt-1 flex flex-col gap-1">
+										{@render quickLinks(isCollapsed)}
+										<Menubar class="flex flex-col gap-1">
+											{#snippet children({ createMenu })}
+												<FavoriteMenu
+													{createMenu}
+													favoriteLinks={favoriteManager.current}
+													{isCollapsed}
+												/>
+											{/snippet}
+										</Menubar>
+										<MenuButton
+											stopPropagationOnClick={true}
+											on:click={() => openSearchModal()}
+											{isCollapsed}
+											icon={Search}
+											label="Search"
+											class="!text-xs"
+											shortcut={`${getModifierKey()}k`}
+										/>
+										{#if !globalAiEnabled}
+											<!-- Global Ask-AI pane. When the sessions dev flag is on it is
+											     replaced by SessionModeSwitch, so it only shows in prod. -->
+											<MenuButton
+												stopPropagationOnClick={true}
+												on:click={() => aiChatManager.toggleOpen()}
+												{isCollapsed}
+												icon={WandSparkles}
+												iconProps={{ forceDarkMode: true }}
+												label="Ask AI"
+												class="!text-xs"
+												iconClasses="!text-ai"
+												shortcut={`${getModifierKey()}L`}
+											/>
+										{/if}
+									</div>
+
+									<!-- Section 2: workspace items -->
+									<SidebarContent
+										{isCollapsed}
+										showSecondary={false}
+										excludeMainLabels={['Home', 'Runs']}
+										numUnacknowledgedCriticalAlerts={isCriticalAlertsUiMuted
+											? 0
+											: numUnacknowledgedCriticalAlerts}
+									/>
+
+									<!-- Section 3: instance settings — mt-auto drops it to the bottom
+									     when the column has spare room, and collapses back to the normal
+									     inter-section gap once the content overflows and scrolls. -->
+									<div class="mt-auto">
+										{@render settingsMenu(isCollapsed)}
+									</div>
+								</SidebarScrollArea>
+							{/if}
+
+							<div
+								class="flex-shrink-0 flex pt-3 pb-3.5 {isCollapsed
+									? 'flex-col items-center gap-3'
+									: 'items-center justify-between px-4'}"
+							>
+								{@render brandMark(isCollapsed)}
+								<!-- p-2/-m-2 widens the hit area to ~32px without moving the icon. -->
 								<button
+									class="p-2 -m-2 rounded hover:bg-surface-hover"
+									title={isCollapsed ? 'Expand sidebar' : 'Collapse sidebar'}
 									onclick={() => {
 										isCollapsed = !isCollapsed
+										// Manual toggle is the persisted preference (auto-collapse isn't).
+										collapsePref.val = isCollapsed
 									}}
 								>
-									<ArrowLeft
-										size={16}
-										class={classNames(
-											'flex-shrink-0 h-4 w-4 transition-all ease-in-out duration-200 text-secondary',
-											isCollapsed ? 'rotate-180' : 'rotate-0'
-										)}
-									/>
+									{#if isCollapsed}
+										<PanelLeftOpen size={14} class="flex-shrink-0 h-3.5 w-3.5 text-hint" />
+									{:else}
+										<PanelLeftClose size={14} class="flex-shrink-0 h-3.5 w-3.5 text-hint" />
+									{/if}
 								</button>
 							</div>
 						</div>
@@ -863,9 +1264,10 @@
 			{/if}
 			<AiChatLayout
 				{children}
-				noPadding={devOnly}
-				disableAi={inSessionRoute}
-				{isCollapsed}
+				noPadding={devOnly || menuHidden}
+				disableAi={globalAiEnabled ? true : sessionMode}
+				sidebarWidth={railWidth}
+				transitionClass={sidebarTransitionClass}
 				isMobile={innerWidth < 768}
 				onMenuOpen={() => {
 					menuOpen = true
@@ -886,12 +1288,12 @@
 <Modal2
 	title="Forking {$workspaceStore}"
 	target="#content"
-	fixedHeight="lg"
+	fixedHeight="adaptive"
 	fixedWidth="sm"
 	contentClasses="flex-col"
 	bind:isOpen={() => !!globalForkModal.val?.opened, (v) => !v && (globalForkModal.val = undefined)}
 >
 	{#if globalForkModal.val}
-		<CreateWorkspaceInner isFork onFinish={() => (globalForkModal.val = undefined)} />
+		<CreateWorkspaceInner isFork inModal onFinish={() => (globalForkModal.val = undefined)} />
 	{/if}
 </Modal2>
diff --git a/frontend/src/routes/(root)/(logged)/+page.svelte b/frontend/src/routes/(root)/(logged)/+page.svelte
index b070bd5fef..e326bc87f7 100644
--- a/frontend/src/routes/(root)/(logged)/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/+page.svelte
@@ -1,13 +1,11 @@
 <script lang="ts">
 	import { AppService, FlowService, type OpenFlow, type Script } from '$lib/gen'
 	import { userStore, workspaceStore } from '$lib/stores'
-	import { Alert, Button, Drawer, DrawerContent, Tab, Tabs } from '$lib/components/common'
+	import { Alert, Button, Drawer, DrawerContent } from '$lib/components/common'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import FlowIcon from '$lib/components/home/FlowIcon.svelte'
-	import PageHeader from '$lib/components/PageHeader.svelte'
-	import CreateActionsFlow from '$lib/components/flows/CreateActionsFlow.svelte'
-	import CreateActionsScript from '$lib/components/scripts/CreateActionsScript.svelte'
+	import CreateActionsMenu from '$lib/components/home/CreateActionsMenu.svelte'
 	import { getScriptByPath } from '$lib/scripts'
 	import type { HubItem } from '$lib/components/flows/pickers/model'
 	import PickHubScript from '$lib/components/flows/pickers/PickHubScript.svelte'
@@ -15,7 +13,6 @@
 	import HighlightCode from '$lib/components/HighlightCode.svelte'
 	import HomeConnectDrawer from '$lib/components/home/HomeConnectDrawer.svelte'
 	import {
-		Building,
 		ExternalLink,
 		GitFork,
 		Globe2,
@@ -28,11 +25,10 @@
 	import { base } from '$lib/base'
 
 	import ItemsList from '$lib/components/home/ItemsList.svelte'
-	import CreateActionsApp from '$lib/components/flows/CreateActionsApp.svelte'
 	import PickHubApp from '$lib/components/flows/pickers/PickHubApp.svelte'
 	import { writable } from 'svelte/store'
 	import type { EditorBreakpoint } from '$lib/components/apps/types'
-	import { HOME_SHOW_HUB, HOME_SHOW_CREATE_FLOW, HOME_SHOW_CREATE_APP } from '$lib/consts'
+	import { HOME_SHOW_HUB } from '$lib/consts'
 	import { setQuery } from '$lib/navigation'
 	import { page } from '$app/state'
 	import { goto, replaceState } from '$app/navigation'
@@ -49,11 +45,7 @@
 
 	type Tab = 'hub' | 'workspace'
 
-	let tab: Tab = $state(
-		window.location.hash == '#workspace' || window.location.hash == '#hub'
-			? (window.location.hash?.replace('#', '') as Tab)
-			: 'workspace'
-	)
+	let tab = $state<Tab>('workspace')
 
 	let subtab: 'flow' | 'script' | 'app' = $state('script')
 
@@ -289,54 +281,45 @@
 				Windmill instance, such as keeping resource types up to date.
 			</Alert>
 		{/if}
-		<PageHeader
-			title="Home"
-			childrenWrapperDivClasses="flex-1 flex flex-row gap-4 flex-wrap justify-end items-center"
-		>
-			{#if $userStore?.operator}
+		<div class="flex flex-row flex-wrap justify-between items-center gap-3 pb-2 my-4 mr-2 min-h-16">
+			<h1 class="text-2xl font-semibold text-emphasis whitespace-nowrap leading-6 tracking-tight">
+				Home
+			</h1>
+			<div class="ml-auto flex flex-row gap-2 items-center">
+				{#if !$userStore?.operator && HOME_SHOW_HUB}
+					<Button
+						variant="default"
+						unifiedSize="md"
+						startIcon={{ icon: Globe2 }}
+						endIcon={{ icon: ExternalLink }}
+						href={$hubBaseUrlStore}
+						target="_blank"
+						btnClasses="whitespace-nowrap"
+					>
+						Hub
+					</Button>
+				{/if}
 				<Button
 					variant="default"
-					unifiedSize="sm"
+					unifiedSize="md"
 					startIcon={{ icon: PlugZap }}
 					btnClasses="whitespace-nowrap"
 					onClick={() => homeConnectDrawer?.openDrawer?.()}
 				>
 					CLI / MCP
 				</Button>
-			{/if}
-			{#if !$userStore?.operator && showCreateButtons}
-				<CreateActionsScript aiId="create-script-button" aiDescription="Creates a new script" />
-				{#if HOME_SHOW_CREATE_FLOW}<CreateActionsFlow />{/if}
-				{#if HOME_SHOW_CREATE_APP}<CreateActionsApp />{/if}
-			{/if}
-		</PageHeader>
+				{#if !$userStore?.operator && showCreateButtons}
+					<div class="ml-2">
+						<CreateActionsMenu />
+					</div>
+				{/if}
+			</div>
+		</div>
 
 		<TutorialBanner />
 
 		<NoDirectDeployAlert onUpdateCanEditStatus={(v) => (showCreateButtons = v)} />
 
-		{#if !$userStore?.operator}
-			<div class="flex w-full items-center gap-3 pb-2">
-				<div class="min-w-0 flex-1 overflow-auto scrollbar-hidden">
-					<Tabs values={['hub', 'workspace']} hashNavigation bind:selected={tab}>
-						<Tab value="workspace" label="Workspace" icon={Building} />
-						{#if HOME_SHOW_HUB}
-							<Tab value="hub" label="Hub" icon={Globe2} />
-						{/if}
-					</Tabs>
-				</div>
-
-				<Button
-					variant="default"
-					unifiedSize="sm"
-					startIcon={{ icon: PlugZap }}
-					btnClasses="whitespace-nowrap shrink-0"
-					onClick={() => homeConnectDrawer?.openDrawer?.()}
-				>
-					CLI / MCP
-				</Button>
-			</div>
-		{/if}
 		{#if tab == 'hub'}
 			<div class="flex flex-col gap-y-16">
 				<div class="flex flex-col pb-8">
diff --git a/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
index 9d38e46257..7eb5d30106 100644
--- a/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
@@ -33,6 +33,7 @@
 				summary: string
 				policy: any
 				custom_path?: string
+				labels?: string[]
 		  }
 		| undefined = $state(undefined)
 	let redraw = $state(0)
@@ -49,6 +50,10 @@
 	let othersModalOpen = $state(false)
 	let draftSavedAt = $state<string | undefined>(undefined)
 	let deployedAt = $state<string | undefined>(undefined)
+	// The app_version the draft was forked from (pinned), + the deployed head, for
+	// the precise staleness check in DraftEditorModals (vs the drifting timestamp).
+	let draftBaseVersion = $state<number | undefined>(undefined)
+	let deployedHeadVersion = $state<number | undefined>(undefined)
 
 	/** Increments per `loadApp` call. Stale loads (e.g. when picker
 	 * navigation races a draft-discard reload) bail at the next checkpoint
@@ -78,6 +83,11 @@
 			loadedFromDraft = false
 			draftSavedAt = undefined
 			deployedAt = undefined
+			// New-draft returns before the version assignment below, so clear the
+			// previous app's version-staleness inputs, else they bleed across the
+			// reused route and falsely trip the stale-draft modal.
+			draftBaseVersion = undefined
+			deployedHeadVersion = undefined
 			// Brand-new app: no deployed baseline, so never discard-on-equal.
 			deployedBaseline = undefined
 			const templatePath = page.url.searchParams.get('template')
@@ -275,13 +285,21 @@
 		// `no_deployed` — no baseline to be older than.
 		draftSavedAt = backendApp.draft_saved_at as string | undefined
 		deployedAt = backendApp.no_deployed ? undefined : (backendApp.created_at as string | undefined)
+		// `parent_version` rides on the persisted draft (pinned at fork); undefined
+		// for a pre-feature draft. Head = the last entry of the deployed `versions`.
+		draftBaseVersion = savedDraftApp?.parent_version
+		deployedHeadVersion =
+			backendApp.no_deployed || !backendApp.versions
+				? undefined
+				: backendApp.versions[backendApp.versions.length - 1]
 		const backendApp_ = structuredClone(stateSnapshot(backendApp))
 		savedApp = {
 			summary: backendApp_.summary,
 			value: backendApp_.value as App,
 			path: backendApp_.path,
 			policy: backendApp_.policy,
-			custom_path: backendApp_.custom_path
+			custom_path: backendApp_.custom_path,
+			labels: backendApp_.labels
 		}
 		// "Load another user's draft" handoff: render their value. Overlay mode (we
 		// have our own draft) hard-locks saves until the user confirms overwriting
@@ -318,6 +336,16 @@
 				})
 			}
 		}
+		// Pin the fork base for the stale-draft check: when seeding a draft from the
+		// deployed app (no own draft yet), stamp the deployed head version onto the
+		// draft value. An existing own draft already carries it (preserved by the
+		// value swap above). `parent_version` is in DRAFT_COMPARE_IGNORED_FIELDS, so it
+		// never trips the autosave no-op / "unsaved changes" comparison.
+		if (!hasOwnDraft && !backendApp.no_deployed && backendApp.value) {
+			const versions = (backendApp as { versions?: number[] }).versions
+			const head = Array.isArray(versions) ? versions[versions.length - 1] : undefined
+			if (head != null) (backendApp.value as App).parent_version = head
+		}
 		// Assign the fresh response onto `app`. The path-change $effect sets
 		// `app = undefined` first, unmounting AppEditor and releasing the UserDraft
 		// entry, so the remount starts fresh — no local discard is needed here
@@ -362,16 +390,29 @@
 
 	let diffDrawer: DiffDrawer | undefined = $state()
 
-	function onRestore(ev: any) {
+	function onRestore(restoredApp: any) {
 		sendUserToast('App restored from previous deployment')
-		app = ev.detail
+		// Drop the stale pre-restore autosave. The remounted AppEditor seeds its
+		// state from `appDraftHandle.draft ?? app`, so without this it keeps showing
+		// the old draft instead of the restored version. Same reason `reloadDeployed`
+		// removes the draft before remounting.
+		UserDraft.remove('app', path)
+		app = restoredApp
+		// Re-pin the stale-draft fork base to the current head. A restored value
+		// carries the `parent_version` baked in when that older version was deployed,
+		// which would make the deploy guard (`compareVersions`) falsely report "not on
+		// latest". Restore targets the live app, so `versions` holds the current head.
+		const versions = (app as { versions?: number[] } | undefined)?.versions
+		const head = Array.isArray(versions) ? versions[versions.length - 1] : undefined
+		if (head != null && app?.value) (app.value as App).parent_version = head
 		const app_ = structuredClone(stateSnapshot(app!))
 		savedApp = {
 			summary: app_.summary,
 			value: app_.value as App,
 			path: app_.path,
 			policy: app_.policy,
-			custom_path: app_.custom_path
+			custom_path: app_.custom_path,
+			labels: app_.labels
 		}
 		redraw++
 	}
@@ -412,6 +453,8 @@
 	bind:othersModalOpen
 	{draftSavedAt}
 	{deployedAt}
+	{draftBaseVersion}
+	{deployedHeadVersion}
 	onLoadLatestDeploy={async () => {
 		if (!$workspaceStore) return
 		await runResetToDeployed({
@@ -435,9 +478,10 @@
 						app.path = url
 					}
 				}}
-				on:restore={onRestore}
+				{onRestore}
 				summary={app.summary}
 				app={app.value}
+				labels={app.labels}
 				{deployedBaseline}
 				newPath={app.value?.draft_path ?? app.path}
 				path={page.params.path ?? ''}
diff --git a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
index 460b2957e0..0af3cdeded 100644
--- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
@@ -1,91 +1,30 @@
 <script lang="ts">
-	import { goto } from '$app/navigation'
+	/*
+	 * WIN-2006: in-workspace low-code app viewer. Thin wrapper over the shared
+	 * InWorkspaceAppViewer, which renders the app sandboxed (opaque iframe / scoped
+	 * token) through the same machinery as the public viewer. Raw apps use the
+	 * sibling /apps_raw/get route, which wraps the same component.
+	 */
 	import { base } from '$lib/base'
-	import AppPreview from '$lib/components/apps/editor/AppPreview.svelte'
-	import type { EditorBreakpoint } from '$lib/components/apps/types'
-
-	import { Button, Skeleton } from '$lib/components/common'
-	import { AppService, type AppWithLastVersion } from '$lib/gen'
-	import { userStore, workspaceStore } from '$lib/stores'
-	import { canWrite, urlParamsToObject } from '$lib/utils'
-	import { Pen } from 'lucide-svelte'
-	import { writable } from 'svelte/store'
-	import { twMerge } from 'tailwind-merge'
+	import InWorkspaceAppViewer from '$lib/components/apps/editor/InWorkspaceAppViewer.svelte'
+	import { Skeleton } from '$lib/components/common'
+	import { workspaceStore } from '$lib/stores'
 	import { page } from '$app/state'
 
-	let app: (AppWithLastVersion & { value: any }) | undefined = $state(undefined)
-	let can_write = $state(false)
-
-	async function loadApp() {
-		app = await AppService.getAppLiteByPath({
-			workspace: $workspaceStore!,
-			path: page.params.path ?? ''
-		})
-		can_write = canWrite(app?.path, app?.extra_perms!, $userStore)
-	}
-
-	$effect(() => {
-		if ($workspaceStore && page.params.path) {
-			if (app && page.params.path === app.path) {
-				console.log('App already loaded')
-			} else {
-				loadApp()
-			}
-		}
-	})
-
-	const breakpoint = writable<EditorBreakpoint>('lg')
-
-	const hideRefreshBar = page.url.searchParams.get('hideRefreshBar') === 'true'
-	const hideEditBtn = page.url.searchParams.get('hideEditBtn') === 'true'
+	let workspace = $derived($workspaceStore ?? '')
+	let path = $derived(page.params.path ?? '')
 </script>
 
-{#if app}
-	{#key app}
-		<div
-			class={twMerge(
-				'min-h-screen h-full w-full flex flex-col',
-				app?.value.css?.['app']?.['viewer']?.class,
-				'wm-app-viewer'
-			)}
-			style={app?.value.css?.['app']?.['viewer']?.style}
-		>
-			<AppPreview
-				context={{
-					email: $userStore?.email,
-					name: $userStore?.name,
-					username: $userStore?.username,
-					groups: $userStore?.groups,
-					query: urlParamsToObject(page.url.searchParams, { stripReserved: true }),
-					hash: page.url.hash.substring(1)
-				}}
-				workspace={$workspaceStore ?? ''}
-				summary={app.summary}
-				app={app.value}
-				appPath={page.params.path}
-				{breakpoint}
-				policy={app.policy}
-				isEditor={false}
-				noBackend={false}
-				{hideRefreshBar}
-				replaceStateFn={(path) => {
-					goto(path)
-				}}
-				gotoFn={(path, opt) => {
-					goto(path, opt)
-				}}
-			/>
-			{#if can_write && !hideEditBtn}
-				<div id="app-edit-btn" class="absolute bottom-4 z-50 right-4">
-					<Button
-						size="sm"
-						startIcon={{ icon: Pen }}
-						variant="subtle"
-						href="{base}/apps/edit/{app.path}">Edit</Button
-					>
-				</div>
-			{/if}
-		</div>
+<!-- Wait for the active workspace before mounting the embedder: it's needed to
+     mint the token and to build the viewer iframe URL, and the store is set
+     asynchronously by the (logged) layout. -->
+{#if workspace && path}
+	<!-- Key by target: SvelteKit reuses this page component on in-route
+	     navigation (e.g. a navbar item linking to another app), so the viewer
+	     must fully remount — otherwise the previous app (and in sandbox mode its
+	     path-scoped token) sticks around. -->
+	{#key `${workspace}/${path}`}
+		<InWorkspaceAppViewer {workspace} {path} editHref="{base}/apps/edit/{path}?nodraft=true" />
 	{/key}
 {:else}
 	<Skeleton layout={[10]} />
diff --git a/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.js b/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.js
deleted file mode 100644
index 5b680f2fd0..0000000000
--- a/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function load({ params }) {
-	return {
-		stuff: { title: `App ${params.path}` }
-	}
-}
diff --git a/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.svelte
index db7b7da001..dbba9ce790 100644
--- a/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/get_raw/[version]/[...path]/+page.svelte
@@ -1,41 +1,17 @@
 <script lang="ts">
-	import { Skeleton } from '$lib/components/common'
-	import { userStore, workspaceStore } from '$lib/stores'
-	import { sendUserToast } from '$lib/toast'
-	import { onDestroy, onMount } from 'svelte'
+	import { goto } from '$app/navigation'
+	import { base } from '$app/paths'
 	import { page } from '$app/state'
-	let loaded = $state(false)
+	import { onMount } from 'svelte'
 
-	onMount(async () => {
-		globalThis.windmill = {
-			username: $userStore?.username,
-			email: $userStore?.email,
-			workspace: $workspaceStore
-		}
-
-		// //@ts-ignore
-		// await import('http://localhost:3000/app.iife.js')
-		/* @vite-ignore */
-		await import(
-			/* webpackIgnore: true */
-			`/api/w/${$workspaceStore}/raw_apps/get_data/${page.params.version}/${page.params.path}`
-		)
-		try {
-			globalThis.render()
-		} catch (e) {
-			sendUserToast('App seem to be ill-defined', true)
-			console.error(e)
-		}
-		loaded = true
-	})
-
-	onDestroy(() => {
-		globalThis.windmill = undefined
+	// WIN-2006: the old same-origin raw-app viewer (`/apps/get_raw/{version}/{path}`,
+	// which imported the bundle into the page with no isolation) was removed in favor
+	// of the sandboxed unified viewer. Redirect stale bookmarks to the new route,
+	// preserving query + hash. The pinned `version` is dropped — the unified viewer
+	// always shows the latest, like every other in-workspace app link. Done in the
+	// component (not a load redirect) because `url.hash` is unavailable in `load`.
+	onMount(() => {
+		const path = page.params.path ?? ''
+		goto(`${base}/apps_raw/get/${path}${page.url.search}${page.url.hash}`, { replaceState: true })
 	})
 </script>
-
-<div id="root"></div>
-
-{#if !loaded}
-	<Skeleton layout={[10]} />
-{/if}
diff --git a/frontend/src/routes/(root)/(logged)/apps_raw/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps_raw/edit/[...path]/+page.svelte
index 94c6d72e71..6227776ec4 100644
--- a/frontend/src/routes/(root)/(logged)/apps_raw/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps_raw/edit/[...path]/+page.svelte
@@ -57,6 +57,7 @@
 	// let lastVersion = 0
 	let policy: any = $state({})
 	let summary = $state('')
+	let labels = $state<string[] | undefined>(undefined)
 	/** User-typed path from `RawAppEditorHeader` when it differs from
 	 *  `savedApp.path`; mirrored into the draft below as `draft_path` for the
 	 *  home list's friendly name. */
@@ -72,6 +73,7 @@
 				summary: string
 				policy: any
 				custom_path?: string
+				labels?: string[]
 				no_deployed?: boolean
 		  }
 		| undefined = $state(undefined)
@@ -140,6 +142,7 @@
 		if (extractedData) data = extractedData
 		files = app.value.files
 		summary = app.summary
+		labels = app.labels
 		// lastVersion = app.version
 		policy = app.policy
 		// Prefer the saved `draft_path` so the topbar shows the pending name, not
@@ -179,6 +182,10 @@
 			loadedFromDraft = false
 			draftSavedAt = undefined
 			deployedAt = undefined
+			// `labels` is route-level state; reset it too so a fresh draft doesn't
+			// inherit (and then deploy) the previously-opened app's labels. The
+			// import branch re-seeds it via extractRawApp below.
+			labels = undefined
 			// Brand-new raw app: no deployed baseline, so never discard-on-equal.
 			deployedBaseline = undefined
 			// Suspend autosave across the bootstrap: the seed template and the
@@ -355,6 +362,7 @@
 			path: backendApp_.path,
 			policy: backendApp_.policy,
 			custom_path: backendApp_.custom_path,
+			labels: backendApp_.labels,
 			no_deployed: backendApp_.no_deployed
 		}
 		// Extract the effective raw app into the editor's local pieces. The bundle
@@ -449,16 +457,17 @@
 
 	let diffDrawer: DiffDrawer | undefined = $state(undefined)
 
-	function onRestore(ev: any) {
+	function onRestore(restoredApp: any) {
 		sendUserToast('App restored from previous deployment')
-		let prev = ev.detail
+		let prev = restoredApp
 		extractRawApp(prev)
 		savedApp = {
 			summary: prev.summary,
 			value: structuredClone(stateSnapshot(prev.value)),
 			path: prev.path,
 			policy: structuredClone(stateSnapshot(policy)),
-			custom_path: prev.custom_path
+			custom_path: prev.custom_path,
+			labels: prev.labels
 		}
 		redraw++
 	}
@@ -536,18 +545,19 @@
 	{#key redraw}
 		<div class="h-screen">
 			<RawAppEditor
-				on:savedNewAppPath={(event) => {
+				onSavedNewAppPath={(savedPath) => {
 					draftSync.remove()
-					goto(`/apps_raw/edit/${event.detail}`)
-					newPath = event.detail
+					goto(`/apps_raw/edit/${savedPath}`)
+					newPath = savedPath
 				}}
-				on:restore={onRestore}
+				{onRestore}
 				bind:files
 				bind:runnables
 				bind:data
 				bind:summary
 				bind:pendingDraftPath
 				{newPath}
+				{labels}
 				path={page.params.path ?? ''}
 				liveEditorDraftStoragePath={path}
 				{policy}
diff --git a/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte
index 9fdf4c5c7d..990e74ed8c 100644
--- a/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte
@@ -1,65 +1,26 @@
 <script lang="ts">
-	import { base } from '$app/paths'
-	import { Button, Skeleton } from '$lib/components/common'
-	import { AppService, type AppWithLastVersion } from '$lib/gen'
-	import { userStore, workspaceStore } from '$lib/stores'
-	import { canWrite } from '$lib/utils'
-	import { Pen } from 'lucide-svelte'
-	import RawAppPreview from '$lib/components/raw_apps/RawAppPreview.svelte'
+	/*
+	 * WIN-2006: in-workspace raw app viewer. Thin wrapper over the shared
+	 * InWorkspaceAppViewer (same component as the low-code /apps/get route) so raw
+	 * apps get the identical sandbox behavior. PublicAppFrame renders raw apps
+	 * inline with the bundle isolated in RawAppPreview's own opaque iframe.
+	 */
+	import { base } from '$lib/base'
+	import InWorkspaceAppViewer from '$lib/components/apps/editor/InWorkspaceAppViewer.svelte'
+	import { Skeleton } from '$lib/components/common'
+	import { workspaceStore } from '$lib/stores'
 	import { page } from '$app/state'
-	import type { Runnable } from '$lib/components/raw_apps/rawAppPolicy'
 
-	const hideEditBtn = page.url.searchParams.get('hideEditBtn') === 'true'
-
-	let app = $state(undefined) as AppWithLastVersion | undefined
-
-	let secret = $state(undefined) as string | undefined
-	async function loadApp() {
-		console.log('Loading app')
-		app = await AppService.getAppLiteByPath({
-			workspace: $workspaceStore!,
-			path: page.params.path ?? ''
-		})
-	}
-
-	async function loadSecret() {
-		secret = await AppService.getPublicSecretOfLatestVersionOfApp({
-			workspace: $workspaceStore!,
-			path: page.params.path ?? ''
-		})
-	}
-
-	$effect(() => {
-		$workspaceStore && loadApp()
-		$workspaceStore && loadSecret()
-	})
-
-	let can_write = $derived(canWrite(page.params.path ?? '', app?.extra_perms ?? {}, $userStore))
-	function getRunnables(app: AppWithLastVersion) {
-		return ((app?.value as any)?.runnables ?? {}) as Record<string, Runnable>
-	}
+	let workspace = $derived($workspaceStore ?? '')
+	let path = $derived(page.params.path ?? '')
 </script>
 
-<div class="h-full min-h-[600px] w-full relative p-2bg-white">
-	{#if !$workspaceStore || !$userStore || !app}
-		<Skeleton layout={[10]} />
-	{:else}
-		<RawAppPreview
-			path={page.params.path ?? ''}
-			workspace={$workspaceStore}
-			user={$userStore}
-			runnables={getRunnables(app)}
-			{secret}
-		/>
-	{/if}
-	{#if can_write && !hideEditBtn}
-		<div id="app-edit-btn" class="absolute bottom-4 z-50 right-4">
-			<Button
-				size="sm"
-				startIcon={{ icon: Pen }}
-				variant="subtle"
-				href="{base}/apps_raw/edit/{page.params.path}">Edit</Button
-			>
-		</div>
-	{/if}
-</div>
+{#if workspace && path}
+	<!-- Key by target: SvelteKit reuses this page component on in-route
+	     navigation, so the viewer must fully remount (see /apps/get). -->
+	{#key `${workspace}/${path}`}
+		<InWorkspaceAppViewer {workspace} {path} editHref="{base}/apps_raw/edit/{path}?nodraft=true" />
+	{/key}
+{:else}
+	<Skeleton layout={[10]} />
+{/if}
diff --git a/frontend/src/routes/(root)/(logged)/assets/+page.svelte b/frontend/src/routes/(root)/(logged)/assets/+page.svelte
index 5c6948994a..6967ff3d19 100644
--- a/frontend/src/routes/(root)/(logged)/assets/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/assets/+page.svelte
@@ -40,8 +40,7 @@
 	import { untrack } from 'svelte'
 	import { VolumeService } from '$lib/gen'
 	import VolumesDrawer from '$lib/components/assets/VolumesDrawer.svelte'
-	import { HardDriveIcon, NetworkIcon } from 'lucide-svelte'
-	import { base } from '$lib/base'
+	import { HardDriveIcon } from 'lucide-svelte'
 
 	interface AssetCursor {
 		created_at?: string
@@ -162,21 +161,10 @@
 			title="Assets"
 			tooltip="Assets show up here whenever you use them in Windmill."
 			documentationLink="https://www.windmill.dev/docs/core_concepts/assets"
-		>
-			<div class="flex justify-end">
-				<Button
-					variant="accent-secondary"
-					unifiedSize="sm"
-					href="{base}/pipeline"
-					startIcon={{ icon: NetworkIcon }}
-				>
-					Pipelines
-				</Button>
-			</div>
-		</PageHeader>
+		/>
 
 		<Section label="All workspace assets" class="mb-20">
-			<div class="flex gap-4">
+			<div class="flex flex-wrap gap-4">
 				{#snippet card(props: {
 					title: string
 					assetKind: AssetKind
@@ -186,10 +174,12 @@
 					favorites?: { table: string; schema?: string; assetName: string; path: string }[]
 					itemExtra?: import('svelte').Snippet<[{ label: string; value: string }]>
 				})}
-					<div class="flex flex-col bg-surface-tertiary drop-shadow-base rounded-md flex-1">
-						<div class="flex justify-between border-b">
-							<h3 class="text-sm font-bold mb-4 pt-5 pl-6">{props.title}</h3>
-							<div class="flex items-center h-fit gap-2 mt-4 mr-4">
+					<div
+						class="flex flex-col bg-surface-tertiary drop-shadow-base rounded-md grow basis-[340px] min-w-0"
+					>
+						<div class="flex flex-wrap justify-between items-center gap-2 border-b pt-5 px-6 pb-4">
+							<h3 class="text-sm font-bold min-w-0 truncate" title={props.title}>{props.title}</h3>
+							<div class="flex items-center h-fit gap-2 shrink-0">
 								<Button
 									wrapperClasses="h-fit"
 									btnClasses="text-accent"
@@ -216,9 +206,11 @@
 						{#if props.data.current?.length}
 							<div class="max-h-96 overflow-y-auto pb-1">
 								{#each props.data.current ?? [] as item}
-									<div class="text-xs py-2 text-primary flex justify-between items-center px-6">
-										{item.label}
-										<div class="flex items-center gap-2">
+									<div
+										class="text-xs py-2 text-primary flex justify-between items-center gap-2 px-6"
+									>
+										<span class="min-w-0 truncate" title={item.label}>{item.label}</span>
+										<div class="flex items-center gap-2 shrink-0">
 											{#if props.itemExtra}
 												{@render props.itemExtra(item)}
 											{/if}
@@ -316,16 +308,16 @@
 				})}
 			</div>
 		</Section>
-		<Section label="Latest assets used">
+		<Section label="Latest assets used" headerClass="whitespace-nowrap shrink-0">
 			{#snippet action()}
-				<div class="flex gap-2 grow justify-end">
+				<div class="flex gap-2 grow justify-end min-w-0 ml-4">
 					<RefreshButton
 						variant="default"
 						onClick={() => assetsQuery.reset()}
 						loading={assetsQuery.isLoading}
 					/>
 					<FilterSearchbar
-						class="grow max-w-[26rem]"
+						class="grow max-w-[26rem] min-w-0"
 						schema={assetsFilterSchema}
 						bind:value={filterValues.val}
 						placeholder="Filter assets..."
diff --git a/frontend/src/routes/(root)/(logged)/dev/session-tree/+page.svelte b/frontend/src/routes/(root)/(logged)/dev/session-tree/+page.svelte
new file mode 100644
index 0000000000..eb69dc1969
--- /dev/null
+++ b/frontend/src/routes/(root)/(logged)/dev/session-tree/+page.svelte
@@ -0,0 +1,361 @@
+<script lang="ts">
+	// DEV-ONLY design exploration: how to visually distinguish a *workspace* from a
+	// *session* in the rail tree, and make the hierarchy (forks) clear. Not linked
+	// anywhere; open at /dev/session-tree. Pure mock data, no real session state.
+	// Gated behind the same dev flag as the sessions UI it explores.
+	import { isGlobalAiEnabled } from '$lib/components/copilot/chat/global/gate'
+	import WorkspaceIcon from '$lib/components/workspace/WorkspaceIcon.svelte'
+	import {
+		MessageSquare,
+		PencilLine,
+		ChevronRight,
+		CornerDownRight,
+		Folder,
+		FileText,
+		Building,
+		GitFork
+	} from 'lucide-svelte'
+
+	type Sess = {
+		id: string
+		name: string
+		unread?: number
+		draft?: boolean
+		archived?: boolean
+	}
+	type Node = {
+		id: string
+		name: string
+		color: string
+		depth: number
+		isFork?: boolean
+		parentName?: string
+		sessions: Sess[]
+	}
+
+	// One rich dataset covering: empty workspace, selected session, unread, draft,
+	// archived, and fork depth 1 + 2.
+	const data: Node[] = [
+		{ id: 'admins', name: 'Admins', color: '#6b7280', depth: 0, sessions: [] },
+		{
+			id: 'ai-meta',
+			name: 'AI Meta E2E',
+			color: '#3b82f6',
+			depth: 0,
+			sessions: [
+				{ id: 's-refactor', name: 'Refactor the parser' },
+				{ id: 's-flaky', name: 'Fix flaky test', unread: 3 },
+				{ id: 's-draft', name: 'New idea', draft: true }
+			]
+		},
+		{
+			id: 'rawapp',
+			name: 'raw-app-parser',
+			color: '#10b981',
+			depth: 0,
+			sessions: [{ id: 's-crud', name: 'Build CRUD app' }]
+		},
+		{
+			id: 'rawapp-fork',
+			name: 'organized-fork',
+			color: '#f59e0b',
+			depth: 1,
+			isFork: true,
+			parentName: 'raw-app-parser',
+			sessions: [{ id: 's-org', name: 'Organize files', archived: true }]
+		},
+		{
+			id: 'rawapp-fork2',
+			name: 'deep-fork',
+			color: '#ec4899',
+			depth: 2,
+			isFork: true,
+			parentName: 'organized-fork',
+			sessions: [{ id: 's-deep', name: 'Deep work', unread: 1 }]
+		}
+	]
+
+	const states = [
+		{ label: 'A session selected', sel: 's-refactor', browsed: '' },
+		{ label: 'Browsing a workspace (no chat)', sel: '', browsed: 'rawapp' }
+	]
+
+	const solutions = [
+		{ key: 'A', title: 'A · Avatar vs dot + indent', render: solutionA },
+		{ key: 'B', title: 'B · Folders & files + workspace-tree lines', render: solutionB },
+		{ key: 'B2', title: 'B2 · Workspace avatars (smaller) · no session icon', render: solutionB2 },
+		{ key: 'C', title: 'C · Workspace as muted header', render: solutionC },
+		{ key: 'D', title: 'D · Workspace cards', render: solutionD }
+	]
+</script>
+
+{#snippet unread(n: number)}
+	<span
+		class="ml-auto shrink-0 inline-flex items-center justify-center rounded-full bg-surface-accent-primary text-white font-medium leading-none min-w-4 h-4 px-1 text-[10px]"
+	>
+		{n > 9 ? '9+' : n}
+	</span>
+{/snippet}
+
+<!-- ───────────────── Solution A: avatar (workspace) vs dot (session) + indent ──── -->
+{#snippet solutionA(sel: string, browsed: string)}
+	<div class="flex flex-col gap-0.5 p-2">
+		{#each data as ws (ws.id)}
+			<button
+				type="button"
+				style:padding-left={`${8 + ws.depth * 14}px`}
+				class="flex items-center gap-2 w-full text-left pr-2 py-1 rounded {browsed === ws.id
+					? 'bg-surface-hover'
+					: 'hover:bg-surface-hover'}"
+			>
+				<WorkspaceIcon workspaceColor={ws.color} isForked={ws.isFork} size={12} />
+				<span
+					class="text-xs font-medium truncate {browsed === ws.id
+						? 'text-emphasis'
+						: 'text-primary'}">{ws.name}</span
+				>
+			</button>
+			{#each ws.sessions as s (s.id)}
+				<button
+					type="button"
+					style:padding-left={`${8 + ws.depth * 14 + 18}px`}
+					class="flex items-center gap-2 w-full text-left pr-2 py-1 rounded {sel === s.id
+						? 'bg-surface-hover'
+						: 'hover:bg-surface-hover'} {s.archived ? 'opacity-50' : ''}"
+				>
+					<MessageSquare size={12} class="shrink-0 text-tertiary" />
+					<span
+						class="text-xs truncate {sel === s.id
+							? 'text-emphasis font-semibold'
+							: 'text-secondary'}">{s.name}</span
+					>
+					{#if s.draft}<PencilLine size={11} class="ml-auto shrink-0 text-tertiary" />{/if}
+					{#if s.unread}{@render unread(s.unread)}{/if}
+				</button>
+			{/each}
+		{/each}
+	</div>
+{/snippet}
+
+<!-- ───────────────── Solution B: folders (workspaces) & files (sessions) ──────────
+     Workspaces are folders, sessions are files. The connecting lines render the
+     workspace tree (fork nesting / containment) — not the session elements. Small
+     folder/file icons. -->
+{#snippet vline()}
+	<span class="relative w-3.5 shrink-0 self-stretch">
+		<span class="absolute inset-y-0 left-1/2 w-px bg-gray-200 dark:bg-gray-700"></span>
+	</span>
+{/snippet}
+{#snippet solutionB(sel: string, browsed: string)}
+	<div class="flex flex-col py-1">
+		{#each data as ws (ws.id)}
+			<button
+				type="button"
+				class="flex items-stretch w-full text-left pr-2 {browsed === ws.id
+					? 'bg-surface-hover'
+					: 'hover:bg-surface-hover'}"
+			>
+				{#each Array(ws.depth) as _}{@render vline()}{/each}
+				<span class="flex items-center gap-1.5 py-1 pl-1 min-w-0">
+					<Folder size={13} class="shrink-0" style="color: {ws.color}" />
+					<span
+						class="text-xs truncate {browsed === ws.id
+							? 'text-emphasis font-semibold'
+							: 'text-primary font-medium'}">{ws.name}</span
+					>
+				</span>
+			</button>
+			{#each ws.sessions as s (s.id)}
+				<button
+					type="button"
+					class="flex items-stretch w-full text-left pr-2 {sel === s.id
+						? 'bg-surface-hover'
+						: 'hover:bg-surface-hover'} {s.archived ? 'opacity-50' : ''}"
+				>
+					{#each Array(ws.depth + 1) as _}{@render vline()}{/each}
+					<span class="flex items-center gap-1.5 py-1 pl-1 min-w-0 flex-1">
+						<FileText size={12} class="shrink-0 text-tertiary" />
+						<span
+							class="text-xs truncate {sel === s.id
+								? 'text-emphasis font-semibold'
+								: 'text-secondary'}">{s.name}</span
+						>
+						{#if s.draft}<PencilLine size={11} class="ml-auto shrink-0 text-tertiary" />{/if}
+						{#if s.unread}{@render unread(s.unread)}{/if}
+					</span>
+				</button>
+			{/each}
+		{/each}
+	</div>
+{/snippet}
+
+<!-- ───────────────── Solution B2: classic workspace/fork avatars (smaller),
+     no icon on sessions, same workspace-tree guide lines ──────────────────────── -->
+{#snippet solutionB2(sel: string, browsed: string)}
+	<div class="flex flex-col py-1">
+		{#each data as ws (ws.id)}
+			<button
+				type="button"
+				class="flex items-stretch w-full text-left pr-2 {browsed === ws.id
+					? 'bg-surface-hover'
+					: 'hover:bg-surface-hover'}"
+			>
+				{#each Array(ws.depth) as _}{@render vline()}{/each}
+				<span class="flex items-center gap-1.5 py-1 pl-1 min-w-0">
+					{#if ws.isFork}
+						<GitFork size={14} class="shrink-0" style="color: {ws.color}" />
+					{:else}
+						<Building size={14} class="shrink-0" style="color: {ws.color}" />
+					{/if}
+					<span
+						class="text-xs truncate {browsed === ws.id
+							? 'text-emphasis font-medium'
+							: 'text-primary'}">{ws.name}</span
+					>
+				</span>
+			</button>
+			{#each ws.sessions as s (s.id)}
+				<button
+					type="button"
+					class="flex items-stretch w-full text-left pr-2 {sel === s.id
+						? 'bg-surface-hover'
+						: 'hover:bg-surface-hover'} {s.archived ? 'opacity-50' : ''}"
+				>
+					{#each Array(ws.depth + 1) as _}{@render vline()}{/each}
+					<span class="flex items-center gap-2 py-1 pl-1 min-w-0 flex-1">
+						<span
+							class="text-xs truncate {sel === s.id
+								? 'text-emphasis font-medium'
+								: 'text-secondary'}">{s.name}</span
+						>
+						{#if s.draft}<PencilLine size={11} class="ml-auto shrink-0 text-tertiary" />{/if}
+						{#if s.unread}{@render unread(s.unread)}{/if}
+					</span>
+				</button>
+			{/each}
+		{/each}
+	</div>
+{/snippet}
+
+<!-- ───────────────── Solution C: workspace as muted uppercase header ──────────── -->
+{#snippet solutionC(sel: string, browsed: string)}
+	<div class="flex flex-col p-2">
+		{#each data as ws, wi (ws.id)}
+			<button
+				type="button"
+				style:padding-left={`${8 + ws.depth * 14}px`}
+				class="flex items-center gap-1.5 w-full text-left pr-2 py-1 rounded {wi > 0
+					? 'mt-2'
+					: ''} {browsed === ws.id ? 'bg-surface-hover' : 'hover:bg-surface-hover'}"
+			>
+				<WorkspaceIcon workspaceColor={ws.color} isForked={ws.isFork} size={10} />
+				<span
+					class="text-[0.6rem] uppercase tracking-wide font-semibold truncate {browsed === ws.id
+						? 'text-emphasis'
+						: 'text-tertiary'}">{ws.name}</span
+				>
+				{#if ws.isFork}<span class="text-[0.55rem] text-tertiary">· fork</span>{/if}
+			</button>
+			{#each ws.sessions as s (s.id)}
+				<button
+					type="button"
+					style:padding-left={`${8 + ws.depth * 14 + 6}px`}
+					class="flex items-center gap-2 w-full text-left pr-2 py-1 rounded {sel === s.id
+						? 'bg-surface-hover'
+						: 'hover:bg-surface-hover'} {s.archived ? 'opacity-50' : ''}"
+				>
+					<MessageSquare size={13} class="shrink-0 text-blue-500" />
+					<span
+						class="text-xs truncate {sel === s.id ? 'text-emphasis font-semibold' : 'text-primary'}"
+						>{s.name}</span
+					>
+					{#if s.draft}<PencilLine size={11} class="ml-auto shrink-0 text-tertiary" />{/if}
+					{#if s.unread}{@render unread(s.unread)}{/if}
+				</button>
+			{/each}
+		{/each}
+	</div>
+{/snippet}
+
+<!-- ───────────────── Solution D: workspace cards ──────────────────────────────── -->
+{#snippet solutionD(sel: string, browsed: string)}
+	<div class="flex flex-col gap-1.5 p-2">
+		{#each data as ws (ws.id)}
+			<div style:margin-left={`${ws.depth * 12}px`}>
+				<button
+					type="button"
+					class="flex items-center gap-2 w-full text-left px-2 py-1.5 rounded-t-md {browsed ===
+					ws.id
+						? 'bg-surface-accent-selected'
+						: 'bg-surface-secondary hover:bg-surface-hover'} {ws.sessions.length
+						? ''
+						: 'rounded-b-md'}"
+				>
+					<WorkspaceIcon workspaceColor={ws.color} isForked={ws.isFork} size={12} />
+					<span class="text-xs font-semibold truncate text-primary">{ws.name}</span>
+					{#if ws.isFork}<CornerDownRight size={11} class="ml-auto shrink-0 text-tertiary" />{/if}
+				</button>
+				{#if ws.sessions.length}
+					<div
+						class="border border-t-0 border-light rounded-b-md divide-y divide-light overflow-hidden"
+					>
+						{#each ws.sessions as s (s.id)}
+							<button
+								type="button"
+								class="flex items-center gap-2 w-full text-left px-2 py-1 {sel === s.id
+									? 'bg-surface-hover'
+									: 'hover:bg-surface-hover'} {s.archived ? 'opacity-50' : ''}"
+							>
+								<MessageSquare size={12} class="shrink-0 text-tertiary" />
+								<span
+									class="text-xs truncate {sel === s.id
+										? 'text-emphasis font-semibold'
+										: 'text-secondary'}">{s.name}</span
+								>
+								{#if s.draft}<PencilLine size={11} class="ml-auto shrink-0 text-tertiary" />{/if}
+								{#if s.unread}{@render unread(s.unread)}{/if}
+							</button>
+						{/each}
+					</div>
+				{/if}
+			</div>
+		{/each}
+	</div>
+{/snippet}
+
+{#if isGlobalAiEnabled()}
+	<div class="h-full overflow-auto p-6 bg-surface">
+		<div class="max-w-[1400px] mx-auto flex flex-col gap-2">
+			<h1 class="text-xl font-semibold text-primary flex items-center gap-2">
+				<Folder size={18} /> Session vs Workspace tree — design exploration
+			</h1>
+			<p class="text-sm text-secondary">
+				Dev-only mock. Each solution distinguishes <strong>workspaces</strong> (clickable, open a
+				preview) from <strong>sessions</strong> (open the chat), and shows the fork hierarchy. Two states
+				per solution: a session selected, and a workspace being browsed.
+			</p>
+
+			<div class="mt-4 flex flex-col gap-8">
+				{#each solutions as sol (sol.key)}
+					<section class="flex flex-col gap-2">
+						<h2 class="text-sm font-semibold text-emphasis">{sol.title}</h2>
+						<div class="flex flex-row flex-wrap gap-4">
+							{#each states as st (st.label)}
+								<div class="flex flex-col gap-1">
+									<span class="text-xs text-tertiary flex items-center gap-1">
+										<ChevronRight size={12} />{st.label}
+									</span>
+									<div
+										class="w-64 rounded-md border border-light bg-surface-secondary overflow-hidden"
+									>
+										{@render sol.render(st.sel, st.browsed)}
+									</div>
+								</div>
+							{/each}
+						</div>
+					</section>
+				{/each}
+			</div>
+		</div>
+	</div>
+{/if}
diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
index f06fa7265b..e73af57ee2 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -56,6 +56,9 @@
 	let othersModalOpen = $state(false)
 	let draftSavedAt = $state<string | undefined>(undefined)
 	let deployedAt = $state<string | undefined>(undefined)
+	// The flow_version the draft was forked from (pinned, doesn't drift), for the
+	// precise staleness check in DraftEditorModals + FlowBuilder's deploy guard.
+	let draftBaseVersion = $state<number | undefined>(undefined)
 	// Editor-displayed path; defaults to the URL path. Cleared to '' in the
 	// `new_draft` branch so the Path widget's `initPath` seeds the friendly name.
 	let flowInitialPath = $state(page.params.path ?? '')
@@ -152,6 +155,11 @@
 			loadedFromDraft = false
 			draftSavedAt = undefined
 			deployedAt = undefined
+			// New-draft skips the deployed/draft fetches, so the version-staleness
+			// inputs are never reassigned — clear the previous flow's values, else they
+			// bleed across the reused route and falsely trip the stale-draft modal.
+			version = undefined
+			draftBaseVersion = undefined
 			// Brand-new flow: no deployed baseline, so never discard-on-equal.
 			deployedBaseline = undefined
 			// Suspend autosave around the bootstrap cascade: the Path widget's
@@ -357,6 +365,9 @@
 		// Layer the draft (`.draft`, if any) over the deployed payload at the field
 		// level. See /scripts/edit's loader for the rationale.
 		const { draft: draftFromBackend, ...deployedFlow } = backendFlow as any
+		// `version_id` rides on the persisted draft (pinned at fork); undefined for a
+		// pre-feature draft or when editing the deployed flow directly (no draft).
+		draftBaseVersion = draftFromBackend?.version_id as number | undefined
 		const effectiveFlow: Flow = draftFromBackend
 			? ({ ...deployedFlow, ...draftFromBackend } as Flow)
 			: (deployedFlow as Flow)
@@ -501,6 +512,8 @@
 	bind:othersModalOpen
 	{draftSavedAt}
 	{deployedAt}
+	{draftBaseVersion}
+	deployedHeadVersion={version}
 	onLoadLatestDeploy={async () => {
 		// stopSync-bracketed; see /scripts/edit's restoreDeployed for the race.
 		if (!$workspaceStore) return
@@ -563,6 +576,7 @@
 		{draftTriggersFromUrl}
 		{selectedTriggerIndexFromUrl}
 		{version}
+		{draftBaseVersion}
 		{loadedFromHistoryFromUrl}
 	/>
 {/if}
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 8741a8b93b..b50bd4e1da 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -8,7 +8,14 @@
 		type TriggersCount,
 		type WorkspaceDeployUISettings
 	} from '$lib/gen'
-	import { canWrite, defaultIfEmptyString, emptyString, urlParamsToObject } from '$lib/utils'
+	import {
+		canWrite,
+		defaultIfEmptyString,
+		emptyString,
+		urlParamsToObject,
+		extractTagFromSharableHash,
+		isDynamicTag
+	} from '$lib/utils'
 	import { isDeployable, ALL_DEPLOYABLE } from '$lib/utils_deployable'
 
 	import DetailPageLayout from '$lib/components/details/DetailPageLayout.svelte'
@@ -18,7 +25,7 @@
 	import MoveDrawer from '$lib/components/MoveDrawer.svelte'
 	import RunForm from '$lib/components/RunForm.svelte'
 	import ShareModal from '$lib/components/ShareModal.svelte'
-	import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
+	import { enterpriseLicense, userStore, userWorkspaces, workspaceStore } from '$lib/stores'
 	import { sendUserToast } from '$lib/toast'
 	import DeployWorkspaceDrawer from '$lib/components/DeployWorkspaceDrawer.svelte'
 	import SavedInputsV2 from '$lib/components/SavedInputsV2.svelte'
@@ -68,8 +75,7 @@
 	import { twMerge } from 'tailwind-merge'
 	import CiTestResults from '$lib/components/CiTestResults.svelte'
 	import NoDirectDeployAlert from '$lib/components/NoDirectDeployAlert.svelte'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 
 	let flow: Flow | undefined = $state()
@@ -79,6 +85,9 @@
 	let scheduledForStr: string | undefined = $state(undefined)
 	let invisible_to_owner: boolean | undefined = $state(undefined)
 	let overrideTag: string | undefined = $state(undefined)
+	let overrideTagNote: string | undefined = $state(undefined)
+	// Tag carried over from 'Run again', pending the dynamic-tag check in loadFlow
+	let carriedTag: string | undefined = undefined
 	let inputSelected: 'saved' | 'history' | undefined = $state(undefined)
 	let jsonView = $state(false)
 	let deploymentInProgress = $state(false)
@@ -169,6 +178,15 @@
 			})
 			pinnedVersion = undefined
 		}
+		// A carried tag is the previous run's resolved value; when the flow's tag is
+		// dynamic, drop it so the backend re-resolves from the (possibly edited) args
+		if (carriedTag && isDynamicTag(flow.tag)) {
+			if (overrideTag === carriedTag) {
+				overrideTag = undefined
+				overrideTagNote = `tag ${flow.tag} is resolved at run time, so the previous run's tag ${carriedTag} was not applied`
+			}
+			carriedTag = undefined
+		}
 		if (!flow.path.startsWith(`u/${$userStore?.username}`) && flow.path.split('/').length > 2) {
 			invisible_to_owner = flow.visible_to_runner_only
 		}
@@ -247,6 +265,8 @@
 	if (hash.length > 1) {
 		try {
 			let searchParams = new URLSearchParams(hash.slice(1))
+			carriedTag = extractTagFromSharableHash(searchParams)
+			overrideTag = carriedTag
 			let params = [...Object.entries(urlParamsToObject(searchParams))].map(([k, v]) => [
 				k,
 				JSON.parse(v)
@@ -281,10 +301,10 @@
 			flow &&
 			!$userStore?.operator &&
 			!isCloudHosted() &&
-			!isRuleActive('DisableWorkspaceForking')
+			editInForkAllowed($workspaceStore, $userWorkspaces)
 		) {
 			buttons.push({
-				label: 'Edit in fork',
+				label: editInForkLabel($workspaceStore, $userWorkspaces),
 				buttonProps: {
 					href: buildForkEditUrl('flow', flow.path),
 					unifiedSize: 'md',
@@ -711,6 +731,7 @@
 									bind:scheduledForStr
 									bind:invisible_to_owner
 									bind:overrideTag
+									{overrideTagNote}
 									viewKeybinding
 									{loading}
 									autofocus
diff --git a/frontend/src/routes/(root)/(logged)/forks/compare/+page.svelte b/frontend/src/routes/(root)/(logged)/forks/compare/+page.svelte
index 2710167325..6670be1225 100644
--- a/frontend/src/routes/(root)/(logged)/forks/compare/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/forks/compare/+page.svelte
@@ -2,9 +2,14 @@
 	import CompareWorkspaces from '$lib/components/CompareWorkspaces.svelte'
 	import CompareDrafts from '$lib/components/CompareDrafts.svelte'
 	import { WorkspaceService, type WorkspaceComparison } from '$lib/gen'
+	import {
+		archiveSessionsForWorkspace,
+		deleteSessionsForWorkspace,
+		reconcileAfterWorkspaceChange
+	} from '$lib/components/sessions/sessionState.svelte'
 	import { useWorkspaceDrafts } from '$lib/workspaceDrafts.svelte'
 	import { page } from '$app/state'
-	import { userWorkspaces, usersWorkspaceStore, workspaceStore } from '$lib/stores'
+	import { userWorkspaces, workspaceStore } from '$lib/stores'
 	import { onDestroy, untrack } from 'svelte'
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
 	import PageHeader from '$lib/components/PageHeader.svelte'
@@ -14,6 +19,7 @@
 	import { sendUserToast } from '$lib/toast'
 	import { switchWorkspace } from '$lib/storeUtils'
 	import { goto } from '$lib/navigation'
+	import { readChatModifiedItems } from '$lib/components/copilot/chat/HistoryManager.svelte'
 
 	type CompareMode = 'fork' | 'draft'
 
@@ -25,7 +31,8 @@
 
 	let currentWorkspaceData = $derived($userWorkspaces.find((w) => w.id === currentWorkspaceId))
 	let parentWorkspaceId = $derived(currentWorkspaceData?.parent_workspace_id)
-	const isFork = $derived(!!parentWorkspaceId && currentWorkspaceId?.startsWith('wm-fork-'))
+	// Fork/dev workspaces are identified by their parent link, not the `wm-fork-` id prefix.
+	const isFork = $derived(!!parentWorkspaceId)
 
 	// Mode is seeded from the URL (?mode=draft|fork). `draft` is valid for any
 	// workspace, so it resolves immediately. `fork` is only valid for an actual
@@ -42,6 +49,37 @@
 	// selection here; the page only swaps which comparison component is shown.
 	let forkDirection = $state<'deploy_to' | 'update'>('deploy_to')
 
+	// When reached via a session's Review button (`from_session=<chatId>`), preselect
+	// only the items that chat modified. The mask is the chat's stored
+	// `${UserDraftItemKind}:${storagePath}` set; undefined for a legacy chat (no
+	// stored mask) → the children fall back to selecting all deployable items.
+	// Derived from the live URL: an in-app navigation to this route with a
+	// different from_session must reload the mask, not keep the first one.
+	const fromChatId = $derived(page.url.searchParams.get('from_session'))
+	let chatMask = $state<Set<string> | undefined>(undefined)
+	// The mask loads asynchronously, while the resolved value can legitimately be
+	// undefined (legacy chat). The children must not run their select-all default
+	// until the mask is known, else they'd race it and select everything. Ready
+	// immediately when there's no session to read from.
+	let chatMaskReady = $state(!page.url.searchParams.get('from_session'))
+	$effect(() => {
+		const id = fromChatId
+		chatMask = undefined
+		chatMaskReady = !id
+		if (!id) return
+		untrack(() => {
+			void readChatModifiedItems(id)
+				.then((arr) => {
+					// A slower read for a superseded chat id must not win.
+					if (id !== untrack(() => fromChatId)) return
+					chatMask = arr ? new Set(arr) : undefined
+				})
+				.finally(() => {
+					if (id === untrack(() => fromChatId)) chatMaskReady = true
+				})
+		})
+	})
+
 	function selectMode(v: 'deploy_to' | 'update' | 'draft') {
 		if (v === 'draft') {
 			mode = 'draft'
@@ -143,14 +181,9 @@
 	let acting = $state(false)
 
 	async function afterForkGone() {
-		// Mirror SidebarContent.deleteFork (B1): refresh the workspace list
-		// rather than letting `clearStores()` null it, then land the user on
-		// the parent if still accessible.
-		try {
-			usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
-		} catch (e) {
-			console.error('Failed to refresh workspaces', e)
-		}
+		// The workspace list was already refreshed by reconcileAfterWorkspaceChange
+		// (so the just-removed fork is gone from it); land the user on the parent if
+		// it's still accessible.
 		if (parentWorkspaceId && $userWorkspaces.find((w) => w.id === parentWorkspaceId)) {
 			switchWorkspace(parentWorkspaceId)
 			await goto('/')
@@ -166,6 +199,15 @@
 		try {
 			await WorkspaceService.archiveWorkspace({ workspace: currentWorkspaceId })
 			sendUserToast(`Archived fork ${currentWorkspaceId}`)
+			// Client session cleanup is best-effort: a local IndexedDB failure must
+			// not falsely report the (already successful) archive as failed, nor
+			// block navigation away from the now-archived fork.
+			try {
+				await archiveSessionsForWorkspace(currentWorkspaceId)
+				await reconcileAfterWorkspaceChange()
+			} catch (e) {
+				console.error('Session cleanup after fork archive failed', e)
+			}
 			await afterForkGone()
 		} catch (e: any) {
 			sendUserToast(`Failed to archive fork: ${e?.body ?? e}`, true)
@@ -181,6 +223,15 @@
 		try {
 			await WorkspaceService.deleteWorkspace({ workspace: currentWorkspaceId })
 			sendUserToast(`Deleted fork ${currentWorkspaceId}`)
+			// Client session cleanup is best-effort: a local IndexedDB failure must
+			// not abort the redirect after a successful delete, leaving the user on
+			// the now-deleted workspace path.
+			try {
+				await deleteSessionsForWorkspace(currentWorkspaceId)
+				await reconcileAfterWorkspaceChange()
+			} catch (e) {
+				console.error('Session cleanup after fork delete failed', e)
+			}
 			await afterForkGone()
 		} catch (e: any) {
 			sendUserToast(`Failed to delete fork: ${e?.body ?? e}`, true)
@@ -233,6 +284,8 @@
 			{deployCount}
 			{updateCount}
 			{draftCount}
+			{chatMask}
+			{chatMaskReady}
 			onModeSelected={selectMode}
 		/>
 	{:else if parentWorkspaceId}
@@ -245,6 +298,8 @@
 			{updateCount}
 			{draftCount}
 			{draftKeys}
+			{chatMask}
+			{chatMaskReady}
 			onChanged={refreshCounts}
 			onModeSelected={selectMode}
 		/>
diff --git a/frontend/src/routes/(root)/(logged)/pipeline/+page.svelte b/frontend/src/routes/(root)/(logged)/pipeline/+page.svelte
index 98f598165e..e15c3abdf7 100644
--- a/frontend/src/routes/(root)/(logged)/pipeline/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/pipeline/+page.svelte
@@ -1,24 +1,21 @@
 <script lang="ts">
-	import { userStore } from '$lib/stores'
-	import Button from '$lib/components/common/button/Button.svelte'
-	import PipelinePickerModal from '$lib/components/assets/AssetGraph/PipelinePickerModal.svelte'
+	import { userStore, workspaceStore } from '$lib/stores'
+	import PipelineFolderList from '$lib/components/assets/AssetGraph/PipelineFolderList.svelte'
+	import PipelineSetupSignpost from '$lib/components/assets/AssetGraph/PipelineSetupSignpost.svelte'
 	import PipelineAlphaAckModal from '$lib/components/assets/AssetGraph/PipelineAlphaAckModal.svelte'
-	import { ArrowRight, NetworkIcon } from 'lucide-svelte'
+	import { BookOpen, NetworkIcon } from 'lucide-svelte'
 	import { onMount } from 'svelte'
 
 	const ACK_STORAGE_KEY = 'pipeline-alpha-ack'
 
-	// Gate the picker behind a one-time alpha acknowledgement. We read
+	// Gate the index behind a one-time alpha acknowledgement. We read
 	// localStorage in onMount (not at module scope) so SSR doesn't blow up.
 	let ackOpen = $state(false)
-	let pickerOpen = $state(false)
 
 	onMount(() => {
 		const acked =
 			typeof localStorage !== 'undefined' && localStorage.getItem(ACK_STORAGE_KEY) === 'true'
-		if (acked) {
-			pickerOpen = true
-		} else {
+		if (!acked) {
 			ackOpen = true
 		}
 	})
@@ -31,12 +28,11 @@
 			// flows through for this visit, the user just sees the modal again next time.
 		}
 		ackOpen = false
-		pickerOpen = true
 	}
 </script>
 
 <svelte:head>
-	<title>Pipeline editor — Windmill</title>
+	<title>Pipelines — Windmill</title>
 </svelte:head>
 
 <div class="flex flex-col h-full">
@@ -45,28 +41,46 @@
 	>
 		<div class="flex flex-row items-center gap-2">
 			<NetworkIcon size={16} class="text-tertiary shrink-0" />
-			<h1 class="text-sm font-semibold">
-				{$userStore?.operator ? 'Pipelines' : 'Pipeline editor'}
-			</h1>
-			<span class="text-xs text-tertiary">· no folder selected</span>
+			<h1 class="text-sm font-semibold">Pipelines</h1>
+			<span
+				class="text-2xs px-1.5 py-0.5 rounded font-semibold bg-emerald-100 text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-300"
+			>
+				Alpha
+			</span>
 		</div>
 	</div>
 
-	<div class="flex-1 min-h-0 relative bg-surface-secondary">
-		<div class="absolute inset-0 flex flex-col items-center justify-center gap-3 text-tertiary">
-			<NetworkIcon size={32} class="opacity-50" />
-			<span class="text-sm">Pick a folder to open its pipeline.</span>
-			<Button
-				variant="accent"
-				unifiedSize="sm"
-				onclick={() => (pickerOpen = true)}
-				startIcon={{ icon: ArrowRight }}
-			>
-				Choose a folder
-			</Button>
+	<div class="flex-1 min-h-0 overflow-y-auto bg-surface-secondary">
+		<div class="max-w-2xl mx-auto flex flex-col gap-6 px-4 py-8">
+			<div class="flex flex-col gap-2">
+				<h2 class="text-lg font-semibold">Data pipelines</h2>
+				<p class="text-sm text-tertiary">
+					Chain ingestion, transformation and materialization steps into an asset-aware graph.
+					{#if !$userStore?.operator}
+						Each pipeline lives in a folder: open one below, or pick a folder to start a new
+						pipeline.
+					{:else}
+						Open a pipeline below to view its graph and runs.
+					{/if}
+				</p>
+				<a
+					href="https://www.windmill.dev/docs/pipelines"
+					target="_blank"
+					rel="noreferrer"
+					class="text-xs text-blue-500 hover:underline inline-flex items-center gap-1"
+				>
+					<BookOpen size={12} />
+					Pipelines documentation
+				</a>
+			</div>
+
+			{#if !$userStore?.operator && $workspaceStore}
+				<PipelineSetupSignpost workspace={$workspaceStore} />
+			{/if}
+
+			<PipelineFolderList />
 		</div>
 	</div>
 </div>
 
 <PipelineAlphaAckModal bind:open={ackOpen} onAck={handleAck} />
-<PipelinePickerModal bind:open={pickerOpen} />
diff --git a/frontend/src/routes/(root)/(logged)/pipeline/[folder]/+page.svelte b/frontend/src/routes/(root)/(logged)/pipeline/[folder]/+page.svelte
index c98b11139f..0c1a6eeb8c 100644
--- a/frontend/src/routes/(root)/(logged)/pipeline/[folder]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/pipeline/[folder]/+page.svelte
@@ -4,7 +4,7 @@
 	import { page } from '$app/state'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import DropdownV2 from '$lib/components/DropdownV2.svelte'
-	import AssetGraphCanvas from '$lib/components/assets/AssetGraph/AssetGraphCanvas.svelte'
+	import PipelineGraphEditor from '$lib/components/assets/AssetGraph/PipelineGraphEditor.svelte'
 	import {
 		useActiveRunnableIds,
 		isActiveEvent
@@ -15,9 +15,7 @@
 		RunStatus
 	} from '$lib/components/assets/AssetGraph/activeRunnables.svelte'
 	import { usePipelineHistory } from '$lib/components/assets/AssetGraph/pipelineHistory.svelte'
-	import PipelineEventLog from '$lib/components/assets/AssetGraph/PipelineEventLog.svelte'
 	import PipelineActivityPanel from '$lib/components/assets/AssetGraph/PipelineActivityPanel.svelte'
-	import AssetGraphDetailsPane from '$lib/components/assets/AssetGraph/AssetGraphDetailsPane.svelte'
 	import PipelinePickerModal from '$lib/components/assets/AssetGraph/PipelinePickerModal.svelte'
 	import {
 		extractWrites,
@@ -31,13 +29,32 @@
 		PipelineMode
 	} from '$lib/components/assets/AssetGraph/types'
 	import PipelineModeToggle from '$lib/components/assets/AssetGraph/PipelineModeToggle.svelte'
+	import MacroExplorerDrawer from '$lib/components/assets/AssetGraph/MacroExplorerDrawer.svelte'
+	import { parsePipelineAnnotations } from '$lib/components/assets/AssetGraph/parsePipelineAnnotations'
 	import {
-		parsePipelineAnnotations,
-		type PipelineAnnotations
-	} from '$lib/components/assets/AssetGraph/parsePipelineAnnotations'
+		buildColumnGraph,
+		type ColumnLineageGraph
+	} from '$lib/components/assets/AssetGraph/columnLineageGraph'
 	import { resolveGraph } from '$lib/components/assets/AssetGraph/resolveGraph'
-	import { computeDownstreamClosure } from '$lib/components/assets/AssetGraph/graphTraversal'
-	import { runCascade } from '$lib/components/assets/AssetGraph/cascadeOrchestrator'
+	import { buildSchemaContractContext } from '$lib/components/assets/AssetGraph/schemaContracts'
+	import {
+		computeDownstreamClosure,
+		computeInducedSchedule,
+		assetProducers
+	} from '$lib/components/assets/AssetGraph/graphTraversal'
+	import { runCascade, runSelection } from '$lib/components/assets/AssetGraph/cascadeOrchestrator'
+	import {
+		boundedSet,
+		buildLineageDag,
+		buildLineageDownstreamMap,
+		isScriptNode,
+		nonAutorunTriggerScripts,
+		reachableCutting,
+		scriptNodeId,
+		scriptsOf,
+		validFromStarts,
+		validStarts
+	} from '$lib/components/assets/AssetGraph/boundedCascade'
 	import {
 		diffDeployedGraph,
 		extractCascadeFacts,
@@ -50,9 +67,11 @@
 		type PipelineOutputKind,
 		type DraftTriggerSource
 	} from '$lib/components/assets/AssetGraph/pipelineTemplates'
-	import { decodeState, encodeState } from '$lib/utils'
-	import { DraftService } from '$lib/gen'
-	import { UserDraftDbSyncer } from '$lib/userDraftDbSyncer.svelte'
+	import {
+		createPipelineAiHelpers,
+		type PipelineDraft
+	} from '$lib/components/assets/AssetGraph/pipelineAiHelpers'
+	import { PipelineEditorState } from '$lib/components/assets/AssetGraph/pipelineEditorState.svelte'
 	import AutosaveIndicator from '$lib/components/AutosaveIndicator.svelte'
 	import { onMount, tick, untrack } from 'svelte'
 	import { aiChatManager } from '$lib/components/copilot/chat/AIChatManager.svelte'
@@ -65,27 +84,29 @@
 		History,
 		Loader2,
 		NetworkIcon,
+		Play,
 		RefreshCw,
 		Save,
+		SquareFunction,
+		Target,
 		Telescope
 	} from 'lucide-svelte'
 	import {
 		JobService,
 		OpenAPI,
+		ScheduleService,
 		ScriptService,
 		type AssetKind,
 		type Script,
 		type ScriptLang
 	} from '$lib/gen'
 	import { resource } from 'runed'
-	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import { emptySchema, sendUserToast } from '$lib/utils'
 	import type { Schema } from '$lib/common'
 	import { beforeNavigate, goto } from '$app/navigation'
 	import { fade } from 'svelte/transition'
 	import { twMerge } from 'tailwind-merge'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
-	import HideButton from '$lib/components/apps/editor/settingsPanel/HideButton.svelte'
 	import { inferArgs, inferAssets } from '$lib/infer'
 	import PipelineTriggerEditors from '$lib/components/assets/AssetGraph/PipelineTriggerEditors.svelte'
 
@@ -95,7 +116,33 @@
 	const DATA_KINDS = ['s3object', 'ducklake', 'datatable', 'volume']
 
 	let folder = $derived(page.params.folder as string)
-	let selection = $state<AssetGraphSelection | undefined>(undefined)
+
+	// Externalized editor state (drafts, live overlays, selection), shared with
+	// the in-session pipeline preview via PipelineEditorState. Referenced as
+	// `pe.*` throughout; the persistence / graph / run logic below stays here.
+	const pe = new PipelineEditorState()
+
+	// The in-app folder switcher navigates same-route (`/pipeline/<other>`), which
+	// reuses this page component — nothing remounts. Mirror the session preview's
+	// retarget guard: reset the editor state on a folder change so folder A's drafts
+	// don't display under B (and aren't autosaved into B's bundle), and so
+	// hydratedFromDb flips back to false and B's draft bundle re-hydrates.
+	$effect(() => {
+		const f = folder
+		untrack(() => {
+			if (pe.folder !== f) {
+				if (pe.folder !== undefined) {
+					pe.reset()
+					// Re-scope the Global chat's pipeline prompt to the new folder. The
+					// helper methods already read the reactive folder, but the system
+					// message string was built for the old one and is only rebuilt when
+					// Global mode is reconfigured — so rebuild it here.
+					aiChatManager.rebuildGlobalSystemMessage()
+				}
+				pe.folder = f
+			}
+		})
+	})
 
 	// Page mode, URL-addressable via `?mode=`. No param = view (the
 	// default): deployed-only graph focused on past/live executions.
@@ -109,10 +156,10 @@
 		// selection / open draft / hidden-pane state so view opens on Activity
 		// rather than a stale details pane (mirrors toggleActivity's show path).
 		if (m === 'view' && mode === 'edit') {
-			selection = undefined
-			activeDraftPath = undefined
+			pe.selection = undefined
+			pe.activeDraftPath = undefined
 			panelHidden = false
-			liveAnnotations = EMPTY_LIVE_ANNOTATIONS
+			pe.liveAnnotations = EMPTY_LIVE_ANNOTATIONS
 		}
 		const url = new URL(page.url)
 		if (m === 'view') url.searchParams.delete('mode')
@@ -146,357 +193,76 @@
 	// output asset, and they all render on the graph simultaneously.
 	// Saving removes a draft from the map; closing the pane keeps it so the
 	// user can come back to it.
-	// Counter-based id source — sufficient for "stable across renames in
-	// this session"; doesn't need to survive a reload. (We have crypto.
-	// randomUUID() too but a short numeric id keeps localStorage tidy.)
-	let nextDraftLocalIdCounter = 0
-	function newDraftLocalId(): string {
-		nextDraftLocalIdCounter += 1
-		return `d${nextDraftLocalIdCounter}-${Date.now()}`
-	}
+	// The draft shape + draft Map + activeDraftPath now live in the shared
+	// PipelineEditorState (`pe`). `Draft` aliases the store's type so existing
+	// annotations keep working.
+	type Draft = PipelineDraft
 
-	type Draft = {
-		// Stable per-draft identifier, generated on first create and
-		// preserved across renames. Used to track concurrent deploys (a
-		// fast double-rename otherwise fires two saves that each leave a
-		// persisted script behind — the latest deploy archives the prior
-		// one keyed on this id).
-		localId: string
-		script: Script
-		// Undefined when the user picked `outputKind === 'none'` — the draft
-		// has no auto-generated output asset, so the graph overlay skips
-		// synthesizing a write edge for it.
-		outputAsset?: { kind: AssetKind; path: string }
-		// Inferred body writes from the last time this draft was open in
-		// the details pane. Captured on transition (selection change /
-		// pane close) so the canvas keeps showing the user's renamed
-		// outputs after they've clicked away. Falls back to outputAsset
-		// when undefined (initial state or parser miss).
-		outputAssets?: Array<{ kind: AssetKind; path: string }>
-	}
-	let drafts = $state<Map<string, Draft>>(new Map())
-
-	// Which draft (if any) is currently open in the details pane. When
-	// undefined and `selection` is set, the pane shows the persisted
-	// selection's script. Never both at once.
-	let activeDraftPath = $state<string | undefined>(undefined)
-
-	// Splitpanes sizes: bound so user-resized widths persist when the
-	// details pane is hidden + re-shown, or when switching between draft
-	// and persisted selections (previously the panes were sized inline,
-	// which made the right pane jump width when activeDraft was set
-	// since the left was hardcoded to 100%). When the right pane
-	// unmounts, svelte-splitpanes does NOT auto-stretch the remaining
-	// pane — the bound `leftPaneSize` stays at its last value and the
-	// other 40% renders as blank space. We explicitly set leftPaneSize
-	// to 100 in that state via a $derived effect below, and restore the
-	// stored split when the pane comes back.
-	let leftPaneSize = $state(60)
-	let rightPaneSize = $state(40)
-	let storedRightPaneSize = $state(40)
+	// Splitpane sizing + details-pane-open derivation live inside PipelineGraphEditor.
 	// Explicit hide flag — keeps `selection` / `activeDraftPath` intact
 	// so re-opening the pane re-uses them. Mirrors AppEditor's
 	// hideRightPanel/showRightPanel pattern.
 	let panelHidden = $state(false)
-	// Edit mode opens the pane only for a selection/draft; view mode
-	// keeps it open permanently — it shows the activity panel when nothing
-	// is selected and swaps to the details pane on node select.
-	let detailsPaneOpen = $derived(
-		mode === 'edit'
-			? (selection != undefined || activeDraftPath != undefined) && !panelHidden
-			: !panelHidden
-	)
 	// View mode's idle pane is the activity feed; once a node is selected
 	// (or the pane hidden) the only ways back were the pane's X and the
 	// floating hide toggle — neither is named. The top-bar Activity toggle
 	// is the explicit affordance: shows the feed from any state, hides the
 	// pane when the feed is already showing.
 	let activityShowing = $derived(
-		mode === 'view' && !panelHidden && selection == undefined && activeDraftPath == undefined
+		mode === 'view' && !panelHidden && pe.selection == undefined && pe.activeDraftPath == undefined
 	)
 	function toggleActivity() {
 		if (activityShowing) {
 			panelHidden = true
 		} else {
-			selection = undefined
-			activeDraftPath = undefined
+			pe.selection = undefined
+			pe.activeDraftPath = undefined
 			panelHidden = false
 			// Same reset as the pane's close button — clears the live
 			// annotation overlay of whichever script was open.
-			liveAnnotations = EMPTY_LIVE_ANNOTATIONS
+			pe.liveAnnotations = EMPTY_LIVE_ANNOTATIONS
 		}
 	}
 
-	$effect(() => {
-		if (detailsPaneOpen) {
-			// Pane visible: reapply the stored split. We don't depend on
-			// rightPaneSize here (only stored) so user resizes via the
-			// splitter handle aren't immediately overridden.
-			const restore = storedRightPaneSize
-			untrack(() => {
-				rightPaneSize = restore
-				leftPaneSize = 100 - restore
-			})
+	// Workspace-macro explorer drawer (all `// macros` libraries + their
+	// signatures/bodies). "Open" on a group selects the lib node when it's on
+	// this canvas; a lib living in another folder opens its script page.
+	let macroDrawer: MacroExplorerDrawer | undefined = $state()
+	function openMacroLib(path: string) {
+		const onCanvas = displayGraph?.runnables?.some(
+			(r) => r.usage_kind === 'script' && r.path === path
+		)
+		if (onCanvas) {
+			pe.selection = { kind: 'runnable', runnable_kind: 'script', path }
+			pe.activeDraftPath = undefined
+			panelHidden = false
+			focusPipelineNode(`script:${path}`)
 		} else {
-			// About to hide. Stash the current right size so the next show
-			// restores it, then expand the left pane to fill — splitpanes
-			// won't do this automatically when a Pane unmounts.
-			untrack(() => {
-				if (rightPaneSize > 0) storedRightPaneSize = rightPaneSize
-				leftPaneSize = 100
-			})
+			window.open(`${base}/scripts/get/${path}`, '_blank')
 		}
-	})
+	}
 
-	// All of this folder's in-flight drafts live in ONE per-user DB draft
-	// (typ `data_pipeline`) keyed at the folder, so they sync across devices
-	// and surface in the global drafts list — replacing the prior
-	// browser-only blob. The `f/<folder>/...` path drives the backend's
-	// folder-write access check. localStorage is kept as a synchronous crash
-	// mirror (no size cap, survives a hard close inside the debounce window)
-	// but is only ever READ for the one-time import below; the DB is the
-	// source of truth on load.
-	const PIPELINE_DRAFT_KIND = 'data_pipeline' as const
+	// Draft autosave (the data_pipeline DraftService bundle) lives inside
+	// PipelineGraphEditor now; the route just supplies its path to the indicator.
 	let pipelineDraftPath = $derived(`f/${folder}/data_pipeline`)
-	let storageKey = $derived(`pipeline-${folder}`)
-	type PipelineDraftBundle = { drafts: Array<[string, Draft]>; activeDraftPath?: string }
 
-	// Gate the persist effect until the initial DB load resolves so empty
-	// pre-hydration state can't clobber the server copy. `lastPersistedBundle`
-	// holds the last value we pushed so an unchanged re-render (and the
-	// just-loaded value itself) isn't re-POSTed.
-	let draftsHydrated = $state(false)
-	let lastPersistedBundle: string | undefined = undefined
-	// True once a bundle was restored from the DB on load — drives the
-	// AutosaveIndicator's one-shot "Loaded from draft" hint.
-	let loadedFromDbDraft = $state(false)
-
-	function restoreBundle(bundle: PipelineDraftBundle) {
-		if (Array.isArray(bundle.drafts)) {
-			const loaded = new Map<string, Draft>()
-			for (const entry of bundle.drafts) {
-				if (entry && typeof entry[0] === 'string' && entry[1]?.script) {
-					const d = entry[1] as Draft
-					// Backfill localId for state persisted by older builds.
-					if (typeof d.localId !== 'string' || d.localId === '') {
-						d.localId = newDraftLocalId()
-					}
-					loaded.set(entry[0], d)
-				}
-			}
-			if (loaded.size > 0) drafts = loaded
-		}
-		if (typeof bundle.activeDraftPath === 'string') {
-			activeDraftPath = bundle.activeDraftPath
-		}
-	}
-
-	// The pre-DB localStorage blob, for the one-time migration when the user
-	// has no DB draft yet.
-	function readLocalBundle(): PipelineDraftBundle | undefined {
-		if (typeof localStorage === 'undefined') return undefined
-		const raw = localStorage.getItem(`pipeline-${folder}`)
-		if (!raw) return undefined
-		try {
-			const state = decodeState(raw)
-			if (state && (Array.isArray(state.drafts) || typeof state.activeDraftPath === 'string')) {
-				return {
-					drafts: Array.isArray(state.drafts) ? state.drafts : [],
-					activeDraftPath:
-						typeof state.activeDraftPath === 'string' ? state.activeDraftPath : undefined
-				}
-			}
-		} catch (e) {
-			console.warn('failed to read local pipeline state', e)
-		}
-		return undefined
-	}
-
-	onMount(() => {
-		void hydrateDrafts()
-	})
-
-	async function hydrateDrafts() {
-		const ws = $workspaceStore
-		const path = pipelineDraftPath
-		try {
-			let bundle: PipelineDraftBundle | undefined
-			let serverSavedAt: string | undefined
-			if (ws) {
-				const row = await DraftService.getOwnDraft({
-					workspace: ws,
-					kind: PIPELINE_DRAFT_KIND,
-					path
-				})
-				if (row?.value) {
-					bundle = row.value as PipelineDraftBundle
-					serverSavedAt = row.created_at
-					loadedFromDbDraft = true
-				}
-			}
-			// One-time migration: no DB draft yet, but an older build left a
-			// localStorage blob — adopt it and let the persist effect push it up.
-			let migratedFromLocal = false
-			if (!bundle) {
-				const local = readLocalBundle()
-				if (local) {
-					bundle = local
-					migratedFromLocal = true
-				}
-			}
-			if (bundle) restoreBundle(bundle)
-			// Seed the conflict baseline: server timestamp when loaded from the
-			// DB, none otherwise (first save omits last_sync → backend first-push
-			// branch). A local migration counts as "nothing server-side yet".
-			UserDraftDbSyncer.recordRemoteSync(
-				{ workspace: ws ?? '', itemKind: PIPELINE_DRAFT_KIND, path },
-				migratedFromLocal ? undefined : serverSavedAt
-			)
-			// Record what we loaded so the first persist run is a no-op — UNLESS
-			// we migrated from localStorage, which must push to the DB once.
-			if (!migratedFromLocal) {
-				lastPersistedBundle = bundle ? JSON.stringify(bundle) : undefined
-			}
-		} catch (e) {
-			console.warn('failed to load pipeline drafts', e)
-		} finally {
-			draftsHydrated = true
-		}
-	}
-
-	// Persist on change: debounced DB sync (UserDraftDbSyncer handles the
-	// debounce + optimistic-concurrency) plus a synchronous localStorage
-	// mirror for crash recovery before the first DB confirm.
-	$effect(() => {
-		// Track deps explicitly so Svelte 5 re-runs on mutation.
-		// For the active draft, also snapshot the latest live body writes
-		// at serialize time. Without this, edits made since the last
-		// pane-transition (the cleanup that calls onDraftPersist) are
-		// lost on reload — the draft restores with stale `outputAssets`
-		// and the graph drops the corresponding edges until the user
-		// re-opens the draft and types something new.
-		const liveWritesSnapshot =
-			liveBodyAssets.scriptPath != undefined && drafts.has(liveBodyAssets.scriptPath)
-				? extractWrites(liveBodyAssets.assets)
-				: undefined
-		const liveWritesPath = liveBodyAssets.scriptPath
-		// Live editor buffer for the open draft. `onDraftPersist` only commits
-		// content into the Map on pane teardown, so without this overlay the
-		// autosave (and a crash reload) would lag a whole editing session behind.
-		const liveContentPath =
-			liveContent.scriptPath != undefined && drafts.has(liveContent.scriptPath)
-				? liveContent.scriptPath
-				: undefined
-		const liveContentValue = liveContent.content
-		const serialized = Array.from(drafts.entries()).map(([p, d]) => {
-			const outputAssets =
-				liveWritesSnapshot != undefined && liveWritesPath === p
-					? liveWritesSnapshot.length > 0
-						? liveWritesSnapshot
-						: undefined
-					: d.outputAssets
-			const script =
-				liveContentPath === p && d.script.content !== liveContentValue
-					? { ...d.script, content: liveContentValue }
-					: d.script
-			if (script === d.script && outputAssets === d.outputAssets) {
-				return [p, d] as [string, Draft]
-			}
-			return [p, { ...d, script, outputAssets }] as [string, Draft]
-		})
-		const activePath = activeDraftPath
-		const key = storageKey
-		const ws = $workspaceStore
-		const path = pipelineDraftPath
-		const hydrated = draftsHydrated
-		untrack(() => {
-			// Don't touch storage until the initial load settled.
-			if (!hydrated) return
-			const isEmpty = serialized.length === 0 && !activePath
-			const bundle: PipelineDraftBundle | undefined = isEmpty
-				? undefined
-				: { drafts: serialized, activeDraftPath: activePath }
-			// localStorage crash mirror — synchronous, no debounce, no size cap.
-			try {
-				if (typeof localStorage !== 'undefined') {
-					if (isEmpty) localStorage.removeItem(key)
-					else
-						localStorage.setItem(
-							key,
-							encodeState({ drafts: serialized, activeDraftPath: activePath })
-						)
-				}
-			} catch (e) {
-				console.warn('failed to mirror pipeline state', e)
-			}
-			const serializedBundle = bundle ? JSON.stringify(bundle) : undefined
-			if (serializedBundle === lastPersistedBundle) return
-			lastPersistedBundle = serializedBundle
-			if (!ws) return
-			void UserDraftDbSyncer.save({
-				workspace: ws,
-				itemKind: PIPELINE_DRAFT_KIND,
-				path,
-				// `null` deletes the bundle once the last draft is gone.
-				value: bundle ?? null,
-				auto: true
-			})
-		})
-	})
-
-	// Live-parsed annotations from whatever script is currently open in the
-	// details pane (draft or existing). Refreshed on every keystroke via
-	// `onAnnotationsChange`. Used to overlay unsaved schedule / trigger-asset
-	// edges onto the graph so the editor buffer and the graph stay in sync.
-	let liveAnnotations = $state<{
-		scriptPath: string | undefined
-		annotations: PipelineAnnotations
-	}>({
+	// The live editor overlays (annotations / body assets / content for the open
+	// script) now live in `pe`. The canonical "empty" literals stay here — they
+	// also seed the no-overlay inputs to the deployed graph below.
+	const EMPTY_LIVE_ASSETS = { scriptPath: undefined, assets: [] }
+	const EMPTY_LIVE_ANNOTATIONS = {
 		scriptPath: undefined,
 		annotations: {
 			inPipeline: false,
 			triggerAssets: [],
-			nativeTriggers: []
+			nativeTriggers: [],
+			dataTests: [],
+			columnLineage: [],
+			macros: false,
+			useLibs: [],
+			muteAssets: [],
+			muteAll: false
 		}
-	})
-
-	// Live-inferred body assets (read/write usages parsed by inferAssets
-	// — e.g. CREATE TABLE in SQL, loadS3File / writeS3File in TS/Python).
-	// Refreshed via onAssetsChange. We use the write subset as the
-	// authoritative output node set for drafts whose body has been edited
-	// past the seeded template; without this, renaming a CREATE TABLE
-	// target leaves the stale auto-output node on the graph.
-	let liveBodyAssets = $state<{
-		scriptPath: string | undefined
-		assets: AssetWithAltAccessType[]
-	}>({ scriptPath: undefined, assets: [] })
-
-	// The open draft's live editor buffer, emitted by the pane on every
-	// keystroke (`onContentChange`). The persist effect overlays it onto the
-	// Map's copy so autosave reflects in-progress edits — `onDraftPersist`
-	// only commits content into the Map on pane teardown, which would leave
-	// autosave a full editing session behind.
-	let liveContent = $state<{ scriptPath: string | undefined; content: string }>({
-		scriptPath: undefined,
-		content: ''
-	})
-
-	// Canonical "empty" overlay literals, reused both as reset values for the
-	// live-* state above and as the no-overlay inputs to the deployed graph.
-	const EMPTY_LIVE_ASSETS = { scriptPath: undefined, assets: [] }
-	const EMPTY_LIVE_ANNOTATIONS = {
-		scriptPath: undefined,
-		annotations: { inPipeline: false, triggerAssets: [], nativeTriggers: [] }
-	}
-
-	// Reset every live editor overlay (annotations / body assets / content)
-	// back to empty, unconditionally. Used by the leave-edit path so a stale
-	// buffer for the previously-open script can't leak into the view graphs.
-	// (forgetPath resets these per-path instead — see there.)
-	function clearLiveOverlays() {
-		liveAnnotations = EMPTY_LIVE_ANNOTATIONS
-		liveBodyAssets = EMPTY_LIVE_ASSETS
-		liveContent = { scriptPath: undefined, content: '' }
 	}
 
 	// Only-add cache of (script_path → body content) populated lazily by
@@ -530,7 +296,9 @@
 		const g = graphRes.current
 		if (!g) return { writes, reads }
 		const liveAssetsForPath = (path: string) =>
-			liveBodyAssets.scriptPath === path ? liveBodyAssets.assets : inferredAssetsByPath.get(path)
+			pe.liveBodyAssets.scriptPath === path
+				? pe.liveBodyAssets.assets
+				: inferredAssetsByPath.get(path)
 		for (const r of g.runnables) {
 			if (r.usage_kind !== 'script') continue
 			const assets = liveAssetsForPath(r.path)
@@ -551,12 +319,12 @@
 		const out = new Map<string, Set<NativeTriggerKind>>()
 		const g = graphRes.current
 		if (!g) return out
-		const livePath = liveAnnotations.scriptPath
+		const livePath = pe.liveAnnotations.scriptPath
 		for (const r of g.runnables) {
 			if (r.usage_kind !== 'script') continue
 			let kinds: Set<NativeTriggerKind>
 			if (r.path === livePath) {
-				kinds = new Set(liveAnnotations.annotations.nativeTriggers.map((n) => n.kind))
+				kinds = new Set(pe.liveAnnotations.annotations.nativeTriggers.map((n) => n.kind))
 			} else {
 				const body = bodiesByPath.get(r.path)
 				if (!body) continue
@@ -634,13 +402,17 @@
 		const script = buildDraft(language, scriptPath, triggers, outputKind, out, input)
 		// Write the new draft into the map (structural update so Svelte
 		// re-derives graphWithDraft) and focus it in the details pane. When
-		// the user picked `none`, `outputAsset` is undefined and the graph
-		// overlay skips synthesizing a write edge.
-		const next = new Map(drafts)
-		next.set(scriptPath, { localId: newDraftLocalId(), script, outputAsset: out })
-		drafts = next
-		activeDraftPath = scriptPath
-		selection = undefined
+		// the user picked `none`, `out` is undefined and the graph overlay
+		// skips synthesizing a write edge.
+		const next = new Map(pe.drafts)
+		next.set(scriptPath, {
+			localId: pe.newDraftLocalId(),
+			script,
+			outputAssets: out ? [out] : undefined
+		})
+		pe.drafts = next
+		pe.activeDraftPath = scriptPath
+		pe.selection = undefined
 
 		// Follow the new node with a smooth pan. The id matches the runnable
 		// node the canvas builds for a draft script (`script:<path>`).
@@ -684,6 +456,43 @@
 		aiChatManager.sendRequest({ instructions })
 	}
 
+	// ===================== AI chat pipeline integration =====================
+	// The global AI chat (dev-gated) gains pipeline-building tools while this
+	// editor is mounted, via the helpers registered below. AI mutations don't
+	// deploy — they apply directly as unsaved drafts on the canvas (the same way
+	// the flow/script editor applies AI edits), which the user then deploys. The
+	// build/edit logic is shared verbatim with the in-session preview
+	// (PipelineEditorView) via createPipelineAiHelpers.
+
+	const pipelineAiHelpers = createPipelineAiHelpers({
+		getFolder: () => folder,
+		getWorkspace: () => $workspaceStore,
+		getResolvedGraph: () => graphWithDraft,
+		getDrafts: () => pe.drafts,
+		setDrafts: (next) => (pe.drafts = next),
+		newDraftLocalId: pe.newDraftLocalId,
+		onForgetPath: (path) => forgetPath(path),
+		onShowDrafts: () => (includeDrafts = true),
+		onProposeNode: (path) => focusPipelineNode(`script:${path}`),
+		ensureEditable: () => {
+			// Auto-enter edit so AI changes are visible/actionable, unless the user
+			// is an operator (no edit permission) — then refuse with a clear error.
+			if (isOperator) {
+				throw new Error('This pipeline is read-only for your role; AI edits are disabled.')
+			}
+			if (mode !== 'edit') setMode('edit')
+		},
+		onRunStarted: (jobId, path) => {
+			activeRunnables.arm(`script:${path}`)
+			runsPendingJobId = jobId
+			runsRefreshKey++
+			activeRunnable = { kind: 'script', path }
+			activeRunnableJobId = jobId
+		}
+	})
+
+	onMount(() => aiChatManager.setPipelineHelpers(pipelineAiHelpers))
+
 	// Navigation guard state. `pendingNavigationUrl` holds the URL the user
 	// tried to leave to so we can complete the navigation after they pick
 	// "Save all" or "Discard all"; `bypassNavigationGuard` is the standard
@@ -699,7 +508,7 @@
 			bypassNavigationGuard = false
 			return
 		}
-		if (drafts.size === 0) return
+		if (pe.drafts.size === 0) return
 		// `leave` covers tab close / hard reload / cross-origin nav. SvelteKit
 		// turns a cancelled leave into a browser-native "Leave site?" prompt,
 		// which we explicitly don't want — match the rest of the editors and
@@ -733,8 +542,8 @@
 		// Wipe every draft and the active selection so saved drafts and
 		// stale active path don't bleed into the next page. localStorage
 		// is overwritten by the persist effect on the next tick.
-		drafts = new Map()
-		activeDraftPath = undefined
+		pe.drafts = new Map()
+		pe.activeDraftPath = undefined
 		saveErrors = new Map()
 		const target = pendingNavigationUrl
 		leaveModalOpen = false
@@ -753,7 +562,7 @@
 		// page so they can deal with the failures via the bar's error
 		// popover. Otherwise resume the navigation that triggered the
 		// guard.
-		if (drafts.size === 0) {
+		if (pe.drafts.size === 0) {
 			const target = pendingNavigationUrl
 			leaveModalOpen = false
 			pendingNavigationUrl = undefined
@@ -842,10 +651,25 @@
 	}
 
 	async function saveAllDrafts() {
-		if (!$workspaceStore || drafts.size === 0 || savingAll) return
+		if (!$workspaceStore || pe.drafts.size === 0 || savingAll) return
 		savingAll = true
 		const ws = $workspaceStore
-		const entries = [...drafts.entries()]
+		// The open pane's keystrokes live in `pe.liveContent` until the pane is
+		// torn down — the drafts Map still holds the pre-edit snapshot. Deploy
+		// what the user sees: fold the live buffer into its draft (same merge
+		// the autosave bundle applies before persisting).
+		const liveContentPath =
+			pe.liveContent.scriptPath != undefined && pe.drafts.has(pe.liveContent.scriptPath)
+				? pe.liveContent.scriptPath
+				: undefined
+		const entries = [...pe.drafts.entries()].map(([path, d]) => {
+			if (path !== liveContentPath || d.script.content === pe.liveContent.content)
+				return [path, d] as [string, Draft]
+			return [path, { ...d, script: { ...d.script, content: pe.liveContent.content } }] as [
+				string,
+				Draft
+			]
+		})
 		// Snapshot what the preview promises for every draft before anything
 		// deploys — used to verify the persisted graph below.
 		const predicted = predictCascadeFacts(entries.map(([p]) => p))
@@ -876,22 +700,22 @@
 		// entries to keep insertion order stable.
 		if (savedPaths.length > 0) {
 			const next = new Map<string, Draft>()
-			for (const [k, v] of drafts) {
+			for (const [k, v] of pe.drafts) {
 				if (!savedPaths.includes(k)) next.set(k, v)
 			}
-			drafts = next
+			pe.drafts = next
 			// If the open draft just got deployed, transfer the focus to
 			// its now-persisted runnable so the pane stays on the same
 			// script the user was editing — otherwise the pane closes,
 			// the canvas re-fits, and the user has to re-find their
 			// script after every save.
-			if (activeDraftPath && savedPaths.includes(activeDraftPath)) {
-				selection = {
+			if (pe.activeDraftPath && savedPaths.includes(pe.activeDraftPath)) {
+				pe.selection = {
 					kind: 'runnable',
 					runnable_kind: 'script',
-					path: activeDraftPath
+					path: pe.activeDraftPath
 				}
-				activeDraftPath = undefined
+				pe.activeDraftPath = undefined
 			}
 			await graphRes.refetch()
 			// Verify only what actually deployed — failed drafts would
@@ -910,10 +734,10 @@
 	}
 
 	function discardDraft(path: string) {
-		if (!drafts.has(path)) return
-		const next = new Map(drafts)
+		if (!pe.drafts.has(path)) return
+		const next = new Map(pe.drafts)
 		next.delete(path)
-		drafts = next
+		pe.drafts = next
 		forgetPath(path)
 	}
 
@@ -932,18 +756,18 @@
 	// selection + per-path save errors. `bodiesByPath` keeps its entry
 	// (only-add cache, harmless if stale).
 	function forgetPath(path: string) {
-		if (activeDraftPath === path) activeDraftPath = undefined
-		if (selection?.kind === 'runnable' && selection.path === path) {
-			selection = undefined
+		if (pe.activeDraftPath === path) pe.activeDraftPath = undefined
+		if (pe.selection?.kind === 'runnable' && pe.selection.path === path) {
+			pe.selection = undefined
 		}
-		if (liveAnnotations.scriptPath === path) {
-			liveAnnotations = EMPTY_LIVE_ANNOTATIONS
+		if (pe.liveAnnotations.scriptPath === path) {
+			pe.liveAnnotations = EMPTY_LIVE_ANNOTATIONS
 		}
-		if (liveBodyAssets.scriptPath === path) {
-			liveBodyAssets = EMPTY_LIVE_ASSETS
+		if (pe.liveBodyAssets.scriptPath === path) {
+			pe.liveBodyAssets = EMPTY_LIVE_ASSETS
 		}
-		if (liveContent.scriptPath === path) {
-			liveContent = { scriptPath: undefined, content: '' }
+		if (pe.liveContent.scriptPath === path) {
+			pe.liveContent = { scriptPath: undefined, content: '' }
 		}
 		clearSaveError(path)
 	}
@@ -954,22 +778,28 @@
 	// open and surface the conflict inline.
 	function renameDraft(oldPath: string, newPath: string): boolean | string {
 		if (oldPath === newPath) return true
-		const draft = drafts.get(oldPath)
+		const draft = pe.drafts.get(oldPath)
 		if (!draft) return 'Draft not found'
-		if (drafts.has(newPath)) return 'Another draft already uses this path'
+		if (pe.drafts.has(newPath)) return 'Another draft already uses this path'
 		const next = new Map<string, Draft>()
 		// Preserve insertion order: replace the entry at its original
 		// position so the canvas / lists don't reshuffle on rename.
-		for (const [k, v] of drafts) {
+		for (const [k, v] of pe.drafts) {
 			if (k === oldPath) {
-				const updatedScript = { ...v.script, path: newPath }
+				// Fold the open pane's live buffer in: the drafts Map only syncs
+				// on pane teardown, and the rename both re-clones the pane from
+				// this entry AND auto-deploys it — a stale snapshot here wipes
+				// the user's unsaved keystrokes and ships pre-edit content.
+				const content =
+					pe.liveContent.scriptPath === oldPath ? pe.liveContent.content : v.script.content
+				const updatedScript = { ...v.script, path: newPath, content }
 				next.set(newPath, { ...v, script: updatedScript })
 			} else {
 				next.set(k, v)
 			}
 		}
-		drafts = next
-		if (activeDraftPath === oldPath) activeDraftPath = newPath
+		pe.drafts = next
+		if (pe.activeDraftPath === oldPath) pe.activeDraftPath = newPath
 		// Path-keyed live overlays: re-key for the renamed draft so the
 		// graph stays consistent between the moment we mutate `drafts`
 		// here and the next editor event that re-emits annotations /
@@ -978,14 +808,14 @@
 		// re-applying live overlays against the same OLD path — leaving
 		// phantom edges that displace the + node off the top of the
 		// graph and shuffle the layout.
-		if (liveAnnotations.scriptPath === oldPath) {
-			liveAnnotations = { ...liveAnnotations, scriptPath: newPath }
+		if (pe.liveAnnotations.scriptPath === oldPath) {
+			pe.liveAnnotations = { ...pe.liveAnnotations, scriptPath: newPath }
 		}
-		if (liveBodyAssets.scriptPath === oldPath) {
-			liveBodyAssets = { ...liveBodyAssets, scriptPath: newPath }
+		if (pe.liveBodyAssets.scriptPath === oldPath) {
+			pe.liveBodyAssets = { ...pe.liveBodyAssets, scriptPath: newPath }
 		}
-		if (liveContent.scriptPath === oldPath) {
-			liveContent = { ...liveContent, scriptPath: newPath }
+		if (pe.liveContent.scriptPath === oldPath) {
+			pe.liveContent = { ...pe.liveContent, scriptPath: newPath }
 		}
 		// `inferredWritesByPath` / `inferredReadsByPath` /
 		// `annotatedNativeKindsByPath` are derived from `g.runnables` ×
@@ -1026,7 +856,7 @@
 	>()
 
 	function deployRenamedDraft(path: string) {
-		const draft = drafts.get(path)
+		const draft = pe.drafts.get(path)
 		if (!draft) return
 		const localId = draft.localId
 		let state = deployQueue.get(localId)
@@ -1049,7 +879,7 @@
 		try {
 			while (true) {
 				if (!$workspaceStore) break
-				const draft = drafts.get(path)
+				const draft = pe.drafts.get(path)
 				if (!draft) break
 				try {
 					await saveDraft(path, draft, $workspaceStore)
@@ -1082,12 +912,12 @@
 					// queued path is waiting, the next loop iteration will
 					// pick it up and we keep the draft live.
 					if (!state.queuedPath) {
-						const nextDrafts = new Map(drafts)
+						const nextDrafts = new Map(pe.drafts)
 						nextDrafts.delete(path)
-						drafts = nextDrafts
-						if (activeDraftPath === path) {
-							selection = { kind: 'runnable', runnable_kind: 'script', path }
-							activeDraftPath = undefined
+						pe.drafts = nextDrafts
+						if (pe.activeDraftPath === path) {
+							pe.selection = { kind: 'runnable', runnable_kind: 'script', path }
+							pe.activeDraftPath = undefined
 						}
 						if (saveErrors.has(path)) {
 							const nextErrors = new Map(saveErrors)
@@ -1113,22 +943,22 @@
 			state.inflight = false
 			// On the rare path where the draft is also gone (deployed +
 			// no queued path), drop the slot to keep the map bounded.
-			if (!drafts.has(path) && !state.queuedPath) {
+			if (!pe.drafts.has(path) && !state.queuedPath) {
 				deployQueue.delete(localId)
 			}
 		}
 	}
 
 	// Currently-open draft shape (if any) — fed into the details pane.
-	let activeDraft = $derived(activeDraftPath ? drafts.get(activeDraftPath) : undefined)
+	let activeDraft = $derived(pe.activeDraftPath ? pe.drafts.get(pe.activeDraftPath) : undefined)
 
 	// Path of the script currently open in the details pane (draft or
 	// persisted selection), used wherever run-routing / overlay logic needs
 	// "the one script the user is editing right now".
 	let openScriptPath = $derived(
-		activeDraftPath ??
-			(selection?.kind === 'runnable' && selection.runnable_kind === 'script'
-				? selection.path
+		pe.activeDraftPath ??
+			(pe.selection?.kind === 'runnable' && pe.selection.runnable_kind === 'script'
+				? pe.selection.path
 				: undefined)
 	)
 
@@ -1139,12 +969,12 @@
 	$effect(() => {
 		if (mode !== 'edit') return
 		if (
-			selection?.kind === 'runnable' &&
-			selection.runnable_kind === 'script' &&
-			drafts.has(selection.path)
+			pe.selection?.kind === 'runnable' &&
+			pe.selection.runnable_kind === 'script' &&
+			pe.drafts.has(pe.selection.path)
 		) {
-			activeDraftPath = selection.path
-			selection = undefined
+			pe.activeDraftPath = pe.selection.path
+			pe.selection = undefined
 		}
 	})
 	// Symmetric demotion: view mode shows the deployed truth, so an open
@@ -1156,91 +986,13 @@
 		if (mode !== 'view') return
 		const d = activeDraft
 		if (d && d.script.hash) {
-			selection = { kind: 'runnable', runnable_kind: 'script', path: d.script.path }
-			activeDraftPath = undefined
+			pe.selection = { kind: 'runnable', runnable_kind: 'script', path: d.script.path }
+			pe.activeDraftPath = undefined
 		}
 	})
 
-	// Named handlers for the details pane's live callbacks. Inline arrows
-	// would be rebuilt on every parent re-render, and the pane's $effects
-	// track those refs as deps — combined with the drafts mutation in
-	// `handleDraftContentChange`, that creates a parent ↔ child feedback
-	// loop ("effect_update_depth_exceeded"). Named functions keep the
-	// prop reference stable so the $effects only re-fire on real
-	// content changes (e.g. handleContentChange below mutating drafts).
-	function handleAnnotationsChange(
-		scriptPath: string | undefined,
-		annotations: PipelineAnnotations
-	) {
-		liveAnnotations = { scriptPath, annotations }
-	}
-	function handleAssetsChange(scriptPath: string | undefined, assets: AssetWithAltAccessType[]) {
-		// Single update site for the live overlay. `inferredWritesByPath`
-		// / `inferredReadsByPath` are now derived from `liveBodyAssets`
-		// (for the open script) + `inferredAssetsByPath` (prefetched
-		// snapshot for every other script), so we don't have to write
-		// into those caches here — the derive picks up our update on the
-		// next reactive tick.
-		liveBodyAssets = { scriptPath, assets }
-	}
-	function handleContentChange(scriptPath: string | undefined, content: string) {
-		liveContent = { scriptPath, content }
-	}
-	function handleDraftPersist(
-		p: string,
-		snapshot: {
-			content: string
-			writes: { kind: AssetKind; path: string }[]
-			script?: Script
-		}
-	) {
-		// Persist body edits + inferred outputs back into the drafts Map so
-		// they survive switching to another node and back (the details pane
-		// clones draftScript locally on every prop change, and `outputAsset`
-		// would otherwise stay frozen at the value seeded when the draft
-		// was opened — leaving a stale write edge on the canvas after the
-		// user has renamed a CREATE TABLE / writeS3File target).
-		//
-		// Deferred a microtask: this is called from the pane's $effect
-		// teardown, which observes the *previous* batch values — after a
-		// discard, `drafts` still appears to contain the discarded entry,
-		// and writing a map cloned from that stale read would resurrect it
-		// (the "discard needs two clicks" bug). One microtask later the
-		// batch has committed and the reads are fresh.
-		queueMicrotask(() => {
-			const d = drafts.get(p)
-			if (!d) {
-				// Unsaved edits to a *deployed* script (the pane only emits
-				// these when the buffer differs from the deployed content):
-				// promote to a draft so the work survives mode switches /
-				// selection changes, shows in the drafts chip, and deploys
-				// via Save all. The script snapshot carries the deployed
-				// hash, so saving chains a new version off it.
-				if (!snapshot.script) return
-				const next = new Map(drafts)
-				next.set(p, {
-					localId: newDraftLocalId(),
-					script: snapshot.script,
-					outputAssets: snapshot.writes.length > 0 ? snapshot.writes : undefined
-				})
-				drafts = next
-				return
-			}
-			const writesEqual =
-				d.outputAssets?.length === snapshot.writes.length &&
-				(d.outputAssets ?? []).every(
-					(a, i) => a.kind === snapshot.writes[i]?.kind && a.path === snapshot.writes[i]?.path
-				)
-			if (d.script.content === snapshot.content && writesEqual) return
-			const next = new Map(drafts)
-			next.set(p, {
-				...d,
-				script: { ...d.script, content: snapshot.content },
-				outputAssets: snapshot.writes.length > 0 ? snapshot.writes : undefined
-			})
-			drafts = next
-		})
-	}
+	// The details pane's live callbacks (annotations / assets / content / persist)
+	// now live on `pe` as stable arrow fields — pass `pe.handleX` straight through.
 
 	// Canvas callbacks, named so the prop refs stay stable across re-renders
 	// (same rationale as the live-callback handlers above) and so the
@@ -1264,13 +1016,13 @@
 			s &&
 			s.kind === 'runnable' &&
 			s.runnable_kind === 'script' &&
-			drafts.has(s.path)
+			pe.drafts.has(s.path)
 		) {
-			activeDraftPath = s.path
-			selection = undefined
+			pe.activeDraftPath = s.path
+			pe.selection = undefined
 		} else {
-			activeDraftPath = undefined
-			selection = s
+			pe.activeDraftPath = undefined
+			pe.selection = s
 		}
 	}
 	function handleAddScriptForAsset(
@@ -1316,8 +1068,8 @@
 			return
 		}
 		if (info.runnable_kind !== 'script') return
-		activeDraftPath = undefined
-		selection = { kind: 'runnable', runnable_kind: 'script', path: info.path }
+		pe.activeDraftPath = undefined
+		pe.selection = { kind: 'runnable', runnable_kind: 'script', path: info.path }
 		requestRemoveSignal++
 	}
 	async function handleRunProducer(producer: {
@@ -1353,7 +1105,7 @@
 		if (cascade) {
 			const hasDraftInChain =
 				producer.unsaved === true ||
-				computeDownstreamClosure(graphWithDraft, producer.path).nodes.some((p) => drafts.has(p))
+				computeDownstreamClosure(graphWithDraft, producer.path).nodes.some((p) => pe.drafts.has(p))
 			if (hasDraftInChain) {
 				return await runDraftAwareCascade(producer.path)
 			}
@@ -1370,7 +1122,7 @@
 		const skipArg = cascade ? {} : { _wmill_skip_asset_dispatch: true }
 		let jobId: string | undefined
 		if (producer.unsaved) {
-			const draft = drafts.get(producer.path)
+			const draft = pe.drafts.get(producer.path)
 			if (!draft?.script.content || !draft.script.language) return undefined
 			jobId = await JobService.runScriptPreview({
 				workspace: $workspaceStore,
@@ -1450,9 +1202,9 @@
 	let graphWithDraft = $derived.by<AssetGraphResponse>(() =>
 		resolveGraph({
 			base: graphRes.current ?? EMPTY_GRAPH,
-			drafts,
-			liveBodyAssets,
-			liveAnnotations,
+			drafts: pe.drafts,
+			liveBodyAssets: pe.liveBodyAssets,
+			liveAnnotations: pe.liveAnnotations,
 			inferredWritesByPath,
 			inferredReadsByPath,
 			annotatedNativeKindsByPath
@@ -1490,11 +1242,11 @@
 			// Guard before reassigning so an already-empty overlay doesn't
 			// needlessly invalidate the graph derives every mode toggle.
 			if (
-				liveAnnotations.scriptPath != undefined ||
-				liveBodyAssets.scriptPath != undefined ||
-				liveContent.scriptPath != undefined
+				pe.liveAnnotations.scriptPath != undefined ||
+				pe.liveBodyAssets.scriptPath != undefined ||
+				pe.liveContent.scriptPath != undefined
 			) {
-				clearLiveOverlays()
+				pe.clearLiveOverlays()
 			}
 		})
 	})
@@ -1503,20 +1255,11 @@
 	// preserved, so toggling back to edit keeps them). Tracks activeDraftPath
 	// too, covering the onMount localStorage restore landing after a view load.
 	$effect(() => {
-		if (mode === 'view' && !includeDrafts && activeDraftPath != undefined) {
-			activeDraftPath = undefined
+		if (mode === 'view' && !includeDrafts && pe.activeDraftPath != undefined) {
+			pe.activeDraftPath = undefined
 		}
 	})
 
-	// Selection highlights the active draft (if any) or the user's picked
-	// node. Non-active drafts render without selection highlight but are
-	// still clickable to re-enter their edit pane.
-	let effectiveSelection = $derived<AssetGraphSelection | undefined>(
-		activeDraftPath
-			? { kind: 'runnable', runnable_kind: 'script', path: activeDraftPath }
-			: selection
-	)
-
 	// Bumped after every successful run dispatch so AssetRunsPanel re-fetches
 	// the listing immediately — the new (preview or script) job appears in
 	// the history popover without waiting on its 3 s poll tick.
@@ -1621,8 +1364,17 @@
 						? 'failure'
 						: 'success'
 			const cur = m.get(id)
-			if (cur) cur.runs += 1
-			else m.set(id, { status, runs: 1 })
+			// Freshness compares against completion; `at` (start) is the
+			// fallback lower bound for rows without a duration.
+			const successAt = e.status === 'success' ? (e.completedAt ?? e.at) : undefined
+			if (cur) {
+				cur.runs += 1
+				// Newest-first, so the first success per id is the latest one —
+				// it feeds the freshness chip between graph refetches.
+				if (successAt && !cur.lastSuccessAt) cur.lastSuccessAt = successAt
+			} else {
+				m.set(id, { status, runs: 1, lastSuccessAt: successAt })
+			}
 		}
 		return m
 	})
@@ -1651,6 +1403,43 @@
 	// Run+downstream affordance against overlapping chains stomping each
 	// other's storage writes.
 	let cascadeRunningRoot = $state<string | undefined>(undefined)
+
+	// Script path → its schedule's configured args, so a manual "Run pipeline"
+	// launches a schedule-triggered script with the same payload a real tick
+	// would (rather than empty args). Schedule is the only trigger that stores a
+	// static args payload; every other trigger (webhook / http / event kinds /
+	// data_upload) receives its input from the live event or request at dispatch
+	// time — a message, an HTTP body, an uploaded file — which doesn't exist
+	// during a manual run, so there's nothing to default and those scripts run
+	// empty (data_upload being fed its staged file instead, see dataUploadArgs).
+	// Resolved on demand right before a run (schedule args aren't in the graph
+	// response); fail-safe — a schedule we can't fetch just contributes nothing.
+	let scheduleArgsByPath: Record<string, Record<string, any>> = {}
+	async function resolveScheduleArgs(scripts: string[]): Promise<void> {
+		scheduleArgsByPath = {}
+		const ws = $workspaceStore
+		if (!ws) return
+		const runSet = new Set(scripts)
+		// First schedule (with args) per in-run script; dedupe schedule fetches.
+		const wanted = new Map<string, string>() // script path → schedule path
+		for (const t of displayGraph.triggers) {
+			if (t.trigger_kind !== 'schedule' || t.runnable_kind !== 'script') continue
+			if (!runSet.has(t.runnable_path) || wanted.has(t.runnable_path)) continue
+			if ((t as any).path) wanted.set(t.runnable_path, (t as any).path)
+		}
+		await Promise.all(
+			[...wanted].map(async ([scriptPath, schedulePath]) => {
+				try {
+					const sched = await ScheduleService.getSchedule({ workspace: ws, path: schedulePath })
+					if (sched?.args && Object.keys(sched.args).length > 0) {
+						scheduleArgsByPath[scriptPath] = sched.args as Record<string, any>
+					}
+				} catch {
+					// schedule unreadable / deleted — leave its script on empty args
+				}
+			})
+		)
+	}
 	// Launch one pipeline script for the dev-run cascade. Always passes
 	// _wmill_skip_asset_dispatch — the orchestrator owns the whole closure,
 	// so the backend dispatcher must not double-fire the deployed part of a
@@ -1659,7 +1448,17 @@
 	// edits is not picked up — same as production dispatch).
 	async function launchCascadeScript(path: string): Promise<string> {
 		if (!$workspaceStore) throw new Error('no workspace')
-		const draft = drafts.get(path)
+		// Only run draft content when the displayed graph actually includes
+		// drafts (same condition as `displayGraph`). Otherwise — View mode with
+		// drafts hidden — a bounded run must execute the *deployed* scripts the
+		// user is looking at, not preview jobs from hidden local drafts.
+		// Default a script's run args to its schedule's stored payload (the only
+		// trigger with static args — see resolveScheduleArgs), then let a
+		// data-upload entry's staged file override. runWholePipeline already
+		// refused to start unless every data-upload entry is staged, so this is
+		// always the intended input.
+		const staged = { ...(scheduleArgsByPath[path] ?? {}), ...(dataUploadArgs[path]?.args ?? {}) }
+		const draft = mode === 'edit' || includeDrafts ? pe.drafts.get(path) : undefined
 		if (draft) {
 			if (!draft.script.content || !draft.script.language) {
 				throw new Error(`draft ${path} has no content/language`)
@@ -1670,14 +1469,14 @@
 					content: draft.script.content,
 					language: draft.script.language,
 					path,
-					args: { _wmill_skip_asset_dispatch: true }
+					args: { ...staged, _wmill_skip_asset_dispatch: true }
 				}
 			})
 		}
 		return await JobService.runScriptByPath({
 			workspace: $workspaceStore,
 			path,
-			requestBody: { _wmill_skip_asset_dispatch: true }
+			requestBody: { ...staged, _wmill_skip_asset_dispatch: true }
 		})
 	}
 	// Poll a launched cascade job to a terminal state. Modest fixed cadence —
@@ -1724,9 +1523,13 @@
 				true
 			)
 		}
+		// Claim the running-guard BEFORE the first await so a rapid second click
+		// (which reads `cascadeRunningRoot`) can't slip through and double-launch.
 		cascadeRunningRoot = rootPath
 		let rootJobId: string | undefined
 		try {
+			// Seed schedule-triggered members with their configured payload.
+			await resolveScheduleArgs([rootPath, ...closure.nodes])
 			const res = await runCascade({
 				closure,
 				root: rootPath,
@@ -1750,6 +1553,14 @@
 			} else {
 				const failed = [...res.statuses.entries()].filter(([, s]) => s.status === 'failure')
 				const skipped = [...res.statuses.values()].filter((s) => s.status === 'skipped').length
+				// Surface the failed node's error in the details pane. Clear the
+				// active draft too — it has pane priority over `selection`
+				// (openScriptPath), so a bare selection would stay masked while a
+				// draft is open.
+				if (failed.length > 0) {
+					pe.activeDraftPath = undefined
+					pe.selection = { kind: 'runnable', runnable_kind: 'script', path: failed[0][0] }
+				}
 				sendUserToast(
 					`Chain run failed at ${failed.map(([p]) => p).join(', ')}` +
 						(skipped > 0 ? ` — ${skipped} downstream skipped` : ''),
@@ -1761,6 +1572,287 @@
 		}
 		return rootJobId
 	}
+
+	// ── Bounded-cascade selective execution ──────────────────────────────
+	// "Run downstream up to…" lets the user run a *prefix* of a cascade: start
+	// at a schedule/manual root, fan downstream, but stop at chosen end node(s).
+	// The matched set is the path-between of start and ends over the lineage DAG.
+	// Pick state is in engine node-id space (`script:path`, `${kind}:${path}`);
+	// it is converted to canvas ids only at the canvas boundary.
+	let boundPickStart = $state<string | undefined>(undefined)
+	let boundPickEnds = $state<Set<string>>(new Set())
+
+	// Script paths eligible to start a bounded run, for the canvas menu gate.
+	// Any node with downstream — roots AND mid-DAG models — can be a "Run +
+	// downstream" start (dbt `model+`); only event-triggered scripts are excluded
+	// (see boundedCascade.validFromStarts). The canvas additionally requires the
+	// node to have lineage downstream before offering the entry.
+	let validStartPaths = $derived(new Set(scriptsOf(validFromStarts(displayGraph))))
+	// Scripts with read-aware downstream — the same gate the canvas applies
+	// (AssetGraphCanvas `hasLineageDownstream`). A valid start with no downstream
+	// has no end to pick, so the bounded-run entry is suppressed everywhere,
+	// including the details-pane (ScriptEditor) Test caret.
+	let lineageDownstreamPaths = $derived(new Set(buildLineageDownstreamMap(displayGraph).keys()))
+
+	// Rebuilt only while a pick is active (cheap to skip otherwise).
+	let boundDag = $derived(boundPickStart ? buildLineageDag(displayGraph) : undefined)
+	let boundResult = $derived(
+		boundDag && boundPickStart
+			? boundedSet(boundDag, boundPickStart, [...boundPickEnds])
+			: undefined
+	)
+	// Event handlers (kafka/mqtt/…) can't run with empty args, so they're cut from
+	// any cascade run — as is a consumer reachable only through one. But a
+	// scheduled/manual root is NEVER a barrier even if it also carries an event
+	// trigger: it runs on its own schedule/manual identity (schedule wins in
+	// validStarts), so it — and its downstream — stay reachable when running from
+	// an upstream start. The explicit start is likewise protected. Parity with the
+	// CLI `barriers` set (`nonAutorunTriggerScripts` minus `starts` minus start).
+	let boundReachable = $derived.by(() => {
+		if (!boundDag || !boundPickStart) return new Set<string>()
+		const roots = validStarts(displayGraph)
+		const barriers = new Set(
+			[...nonAutorunTriggerScripts(displayGraph)].filter(
+				(id) => !roots.has(id) && id !== boundPickStart
+			)
+		)
+		return reachableCutting(boundDag, [boundPickStart], barriers)
+	})
+	// Nodes pickable as end bounds: the barrier-cut downstream (excluding the
+	// start), NOT raw descendants — else an event handler or a node only reachable
+	// through one could be clicked as an end yet get silently dropped from the run.
+	let boundEligible = $derived(new Set([...boundReachable].filter((id) => id !== boundPickStart)))
+	// The actual run set (nodes, scripts + assets). No end picked → "Run +
+	// downstream" (dbt `model+`): the start plus its full transitive downstream.
+	// Picking end(s) narrows it to the path-between set. Either way, intersect with
+	// the barrier-cut closure so an event descendant is never launched empty. The
+	// canvas highlights exactly this set, so the ring matches what will run.
+	let boundRunNodes = $derived(
+		boundPickStart
+			? boundPickEnds.size === 0
+				? boundReachable
+				: new Set([...(boundResult?.nodes ?? [])].filter((n) => boundReachable.has(n)))
+			: new Set<string>()
+	)
+	let boundScripts = $derived(scriptsOf(boundRunNodes))
+
+	// Engine id → canvas id: scripts keep `script:path`; assets gain the
+	// canvas's `asset:` prefix (AssetGraphCanvas node ids).
+	const toCanvasId = (eid: string): string => (isScriptNode(eid) ? eid : `asset:${eid}`)
+	const fromCanvasId = (cid: string): string =>
+		cid.startsWith('asset:') ? cid.slice('asset:'.length) : cid
+	// Short label for a `script:f/folder/name` start id (last path segment).
+	const shortPath = (scriptId: string): string => {
+		const p = isScriptNode(scriptId) ? scriptId.slice('script:'.length) : scriptId
+		return p.split('/').pop() ?? p
+	}
+	let boundPick = $derived(
+		boundPickStart && boundDag
+			? {
+					start: boundPickStart,
+					eligible: new Set([...boundEligible].map(toCanvasId)),
+					ends: new Set([...boundPickEnds].map(toCanvasId)),
+					bounded: new Set([...boundRunNodes].map(toCanvasId))
+				}
+			: undefined
+	)
+
+	function startBoundedRun(path: string) {
+		boundPickStart = scriptNodeId(path)
+		boundPickEnds = new Set()
+	}
+	function pickBoundEnd(canvasNodeId: string) {
+		const eid = fromCanvasId(canvasNodeId)
+		if (eid === boundPickStart) return
+		const next = new Set(boundPickEnds)
+		if (next.has(eid)) next.delete(eid)
+		else next.add(eid)
+		boundPickEnds = next
+	}
+	function cancelBoundedRun() {
+		boundPickStart = undefined
+		boundPickEnds = new Set()
+	}
+	async function confirmBoundedRun() {
+		const scripts = boundScripts
+		cancelBoundedRun()
+		await runBoundedCascade(scripts)
+	}
+	// Run an arbitrary selected set of scripts in topological order. Same
+	// per-hop launch + poll as the draft-aware cascade (it skips the backend
+	// dispatcher so the page owns the whole closure), but multi-root: every
+	// selected script with no in-set upstream is seeded at once.
+	async function runBoundedCascade(scripts: string[]): Promise<void> {
+		if (scripts.length === 0) {
+			sendUserToast('No scripts to run in this selection', true)
+			return
+		}
+		if (cascadeRunningRoot) {
+			sendUserToast(`A chain run from ${cascadeRunningRoot} is still in progress`, true)
+			return
+		}
+		// Read-aware adjacency so a pure-reader member runs after its producer
+		// (parity with the CLI `topoOrder`); see buildLineageDownstreamMap.
+		const schedule = computeInducedSchedule(
+			displayGraph,
+			new Set(scripts),
+			buildLineageDownstreamMap(displayGraph)
+		)
+		if (schedule.cyclic.length > 0) {
+			sendUserToast(
+				`Not running ${schedule.cyclic.length} script(s) on a dependency cycle: ${schedule.cyclic.join(', ')}`,
+				true
+			)
+		}
+		if (schedule.nodes.length === 0) {
+			sendUserToast('No runnable scripts in this selection', true)
+			return
+		}
+		// Claim the running-guard BEFORE the first await so a rapid second click
+		// (which reads `cascadeRunningRoot`) can't slip through and double-launch.
+		cascadeRunningRoot = schedule.roots[0] ?? scripts[0]
+		let firstJobId: string | undefined
+		try {
+			// Seed schedule-triggered roots with their configured payload.
+			await resolveScheduleArgs(schedule.nodes)
+			const res = await runSelection({
+				schedule,
+				launch: async (path) => {
+					const jobId = await launchCascadeScript(path)
+					activeRunnables.arm(`script:${path}`)
+					if (firstJobId === undefined) {
+						firstJobId = jobId
+						runsPendingJobId = jobId
+						runsRefreshKey++
+					}
+					return jobId
+				},
+				waitTerminal: waitJobTerminal
+			})
+			const n = res.statuses.size
+			if (res.ok) {
+				sendUserToast(`Bounded run complete — ${n} script${n === 1 ? '' : 's'} succeeded`)
+			} else {
+				const failed = [...res.statuses.entries()].filter(([, s]) => s.status === 'failure')
+				const skipped = [...res.statuses.values()].filter((s) => s.status === 'skipped').length
+				// Surface the failed node's error in the details pane. Clear the
+				// active draft too — it has pane priority over `selection`
+				// (openScriptPath), so a bare selection would stay masked while a
+				// draft is open.
+				if (failed.length > 0) {
+					pe.activeDraftPath = undefined
+					pe.selection = { kind: 'runnable', runnable_kind: 'script', path: failed[0][0] }
+				}
+				sendUserToast(
+					`Bounded run failed at ${failed.map(([p]) => p).join(', ')}` +
+						(skipped > 0 ? ` — ${skipped} downstream skipped` : ''),
+					true
+				)
+			}
+		} finally {
+			cascadeRunningRoot = undefined
+		}
+	}
+
+	// Staged run-form input for data-upload entry scripts, keyed by path. Lifted
+	// out of the (transient, per-selection) run form so the uploaded/entered data
+	// persists across selection changes — it drives each entry node's green
+	// "ready" state and seeds the whole-pipeline run with that input. `valid` is
+	// the run form's full-schema validity (all required fields satisfied).
+	let dataUploadArgs = $state<Record<string, { args: Record<string, any>; valid: boolean }>>({})
+
+	// An S3Object-shaped value (the file picker writes `{ s3: '<path>' }`).
+	function isS3Object(v: any): boolean {
+		return !!v && typeof v === 'object' && !Array.isArray(v) && 's3' in v
+	}
+	// Whether a staged value carries actual data. Covers the two shapes a
+	// data-upload entry takes: an S3Object (file picker → `{ s3: '<path>' }`) and
+	// a plain required input (e.g. a JSON array pasted into the run form).
+	function hasMeaningfulValue(v: any): boolean {
+		if (v == null) return false
+		if (typeof v === 'string') return v.length > 0
+		if (Array.isArray(v)) return v.length > 0
+		if (typeof v === 'object')
+			return isS3Object(v) ? typeof v.s3 === 'string' && v.s3.length > 0 : Object.keys(v).length > 0
+		return true // numbers / booleans count as provided
+	}
+	// A data-upload entry is ready once the user actually provided its data, not
+	// just opened the form. Two guards: the form's own full-schema `valid` (every
+	// required field — including non-file ones — is satisfied), AND that any
+	// declared S3Object file field actually carries a file (the picker can leave
+	// an empty `{ s3: '' }` on a non-required file field, which `valid` alone
+	// wouldn't catch).
+	function dataUploadReady(path: string): boolean {
+		const staged = dataUploadArgs[path]
+		if (!staged || !staged.valid) return false
+		const values = Object.values(staged.args)
+		const s3s = values.filter(isS3Object)
+		if (s3s.length > 0) return s3s.every(hasMeaningfulValue)
+		return values.some(hasMeaningfulValue)
+	}
+	// Persist the run form's args + validity, but only for data-upload entries —
+	// other run forms (partitioned producers) run their own way and must not be
+	// mistaken for a staged upload. Idempotent: the run form re-emits on every
+	// keystroke/validation pass, so bail when the value is unchanged — otherwise
+	// each emit would reassign `dataUploadArgs`, giving `readyDataUploadPaths` a
+	// fresh Set identity that re-syncs the canvas and re-fires the form's emit
+	// effect (effect_update_depth_exceeded).
+	function stageRunFormArgs(path: string, args: Record<string, any>, valid: boolean) {
+		if (!dataUploadEntryPaths.has(path)) return
+		const prev = dataUploadArgs[path]
+		if (prev && prev.valid === valid && JSON.stringify(prev.args) === JSON.stringify(args)) return
+		dataUploadArgs = { ...dataUploadArgs, [path]: { args, valid } }
+	}
+	// Pipeline scripts that are data-upload entry points (a `data_upload` trigger
+	// in the displayed graph). They can't auto-run — they need an uploaded file
+	// before the pipeline can go (see runWholePipeline's gate + the node's green
+	// state).
+	let dataUploadEntryPaths = $derived(
+		new Set(
+			displayGraph.triggers
+				.filter((t) => t.trigger_kind === 'data_upload' && t.runnable_kind === 'script')
+				.map((t) => t.runnable_path)
+		)
+	)
+	// Of those, the ones with a staged file — drives the green node treatment.
+	let readyDataUploadPaths = $derived(
+		new Set([...dataUploadEntryPaths].filter((p) => dataUploadReady(p)))
+	)
+
+	// Every pipeline-member script, for the always-visible header "Run pipeline"
+	// control. Per-node runs are hover/select-gated on the canvas; this
+	// pipeline-level affordance runs the whole graph without hunting for a root
+	// node to hover. Gated on `in_pipeline` so it never launches dependency-only
+	// endpoints the graph surfaces for context (macro libraries, custom
+	// data-test scripts, out-of-folder producers) — only actual pipeline steps.
+	let allPipelineScripts = $derived(
+		displayGraph.runnables
+			.filter((r) => r.usage_kind === 'script' && r.in_pipeline)
+			.map((r) => r.path)
+	)
+	// Run the whole pipeline: hand every script to the bounded-cascade engine,
+	// which topo-orders them (roots first) and fans downstream — i.e. run + all
+	// downstream from every source at once. Reuses the same per-hop launch/poll
+	// and one-cascade-at-a-time guard as the node-level chain runs.
+	async function runWholePipeline() {
+		// Data-upload entries can't auto-run with empty args (they'd run against a
+		// missing S3Object). Require every one to be staged (green) first, and
+		// point the user at the first unready node instead of launching a doomed
+		// run.
+		const unready = allPipelineScripts.filter(
+			(p) => dataUploadEntryPaths.has(p) && !dataUploadReady(p)
+		)
+		if (unready.length > 0) {
+			sendUserToast(
+				`Upload data to ${unready.length} data-upload node${unready.length === 1 ? '' : 's'} first — they must be green before the pipeline can run`,
+				true
+			)
+			openDataUploadRun(unready[0])
+			return
+		}
+		await runBoundedCascade(allPipelineScripts)
+	}
+
 	// Counter bumped when the canvas Run button targets the currently-open
 	// script — the pane intercepts and routes through ScriptEditor.runTest
 	// so logs/result/cancel land in the test panel instead of going off
@@ -1787,19 +1879,64 @@
 	// runs panel can list jobs for the right scripts. We include drafts —
 	// running a draft via runScriptPreview creates a `preview`-kind job at
 	// the same path, which the panel's listing query picks up.
-	let selectionProducers = $derived.by(() => {
-		const sel = selection
-		if (!sel || sel.kind !== 'asset') return []
-		return graphWithDraft.edges
-			.filter((e) => {
-				const access = e.access_type ?? 'r'
-				return (
-					(access === 'w' || access === 'rw') &&
-					e.asset_kind === sel.asset_kind &&
-					e.asset_path === sel.path
-				)
-			})
-			.map((e) => ({ kind: e.runnable_kind, path: e.runnable_path, unsaved: e.unsaved }))
+	let selectionProducers = $derived(assetProducers(graphWithDraft, pe.selection))
+
+	// Empty graph reused when the trace isn't shown (no ducklake-asset selection,
+	// or a draft is actively edited) so the pane blanks out like the other
+	// selection overlays and `buildColumnGraph` doesn't run.
+	const EMPTY_COLUMN_GRAPH: ColumnLineageGraph = {
+		nodes: new Map(),
+		up: new Map(),
+		down: new Map()
+	}
+	// Pipeline-wide column-lineage graph, stitched across every producer's
+	// (inferred + annotated) `column_lineage` and the asset write-edges. Drives
+	// the transitive column trace in the details pane. Built from `displayGraph`
+	// — the exact graph the canvas renders — so the trace matches it: draft
+	// overlays in edit / show-drafts, deployed-only in plain View. Gated to a
+	// ducklake-asset selection so it isn't rebuilt on every editor keystroke when
+	// the trace UI isn't even shown.
+	let columnGraph = $derived(
+		pe.selection?.kind === 'asset' && pe.selection.asset_kind === 'ducklake'
+			? buildColumnGraph(displayGraph)
+			: EMPTY_COLUMN_GRAPH
+	)
+
+	// Producer-side facts for the editor's live schema-contract diagnostics:
+	// which assets are muted (`on_schema_change=ignore`) and which `_current`
+	// views map to an scd2 base table. Derived from the same resolved graph the
+	// canvas renders so the mirror suppresses exactly what the server check does.
+	let schemaContractContext = $derived(buildSchemaContractContext(graphWithDraft.runnables))
+
+	// Whether the selected ducklake asset's captured schema can *evolve* (drives
+	// the asset panel's Schema tab: version history vs. a single fixed schema).
+	// Only a whole-table `replace` producer (CREATE OR REPLACE) can change
+	// columns run-to-run; `append`/`merge`/partitioned writes INSERT into a
+	// fixed-schema table, so their schema is pinned at first materialize.
+	//
+	// Fail open: show the fixed view only when we're *sure* — every producer is a
+	// known insert-style write. A producer with no `materialize_strategy`
+	// metadata (e.g. a draft-overlay runnable, which the graph synthesizes
+	// without it) is treated as unknown → evolvable, so captured history is never
+	// hidden behind a stale "fixed" verdict.
+	let schemaCanEvolve = $derived.by(() => {
+		const sel = pe.selection
+		if (!sel || sel.kind !== 'asset' || sel.asset_kind !== 'ducklake') return true
+		const producerPaths = new Set(selectionProducers.map((p) => p.path))
+		const producers = graphWithDraft.runnables.filter((r) => producerPaths.has(r.path))
+		const knownFixed = (r: (typeof producers)[number]) =>
+			!!r.materialize_strategy && !(r.materialize_strategy === 'replace' && !r.partition_kind)
+		return producers.length === 0 || !producers.every(knownFixed)
+	})
+
+	// Fork data-environment state of the selected ducklake asset (fork workspaces
+	// only): read off the graph node so the details pane can show the
+	// deferred-to-parent / fork-materialized banner matching the canvas chip.
+	let selectionForkMaterialization = $derived.by(() => {
+		const sel = pe.selection
+		if (!sel || sel.kind !== 'asset' || sel.asset_kind !== 'ducklake') return undefined
+		return displayGraph.assets.find((a) => a.kind === 'ducklake' && a.path === sel.path)
+			?.fork_materialization
 	})
 
 	// Downstream subscriber count for the currently-edited script. Drives
@@ -1853,7 +1990,7 @@
 	// flow. Drafts have no deployed endpoint yet, so nudge the user to save
 	// first (mirrors openMissingTriggerDrawer).
 	function openWebhookDrawer(scriptPath: string) {
-		if (drafts.has(scriptPath)) {
+		if (pe.drafts.has(scriptPath)) {
 			sendUserToast(
 				`Save the script "${scriptPath}" first — webhooks only trigger the deployed version.`,
 				true
@@ -1875,12 +2012,12 @@
 		// Same mode gate as handleCanvasSelect: view mode targets the
 		// deployed script (its run form runs the deployed version), even
 		// when unsaved edits were promoted to a draft.
-		if (mode === 'edit' && drafts.has(scriptPath)) {
-			activeDraftPath = scriptPath
-			selection = undefined
+		if (mode === 'edit' && pe.drafts.has(scriptPath)) {
+			pe.activeDraftPath = scriptPath
+			pe.selection = undefined
 		} else {
-			activeDraftPath = undefined
-			selection = { kind: 'runnable', runnable_kind: 'script', path: scriptPath }
+			pe.activeDraftPath = undefined
+			pe.selection = { kind: 'runnable', runnable_kind: 'script', path: scriptPath }
 		}
 		// Bump after a tick so the pane has reacted to the new selection/draft
 		// and begun mounting the run form before it hunts for the S3 input.
@@ -1895,7 +2032,7 @@
 		// time or silently bind to nothing. Surface that as a toast and
 		// keep the drawer closed; the user needs to save the script first
 		// (which also creates it under the new path if they renamed it).
-		if (drafts.has(scriptPath)) {
+		if (pe.drafts.has(scriptPath)) {
 			sendUserToast(
 				`Save the script "${scriptPath}" first — triggers can only be attached to deployed scripts.`,
 				true
@@ -2004,6 +2141,16 @@
 		}
 	)
 
+	// Folder whose graph is actually rendered. `graphRes.current` is stale-
+	// while-revalidate on an in-place folder switch, so keying the canvas's
+	// one-shot initial fit on the route param would fire the new folder's fit
+	// on the old graph and leave the fresh one unfitted. `folder` is read
+	// untracked: the key must move only when a graph lands.
+	let viewportFitFolder = $state('')
+	$effect(() => {
+		if (graphRes.current) untrack(() => (viewportFitFolder = folder))
+	})
+
 	// Body / inferred-assets prefetch sweep. Watches `g.runnables`; for any
 	// non-draft path we haven't fetched yet, fetches `getScriptByPath` and
 	// `inferAssets`, and stores both in their respective only-add caches.
@@ -2024,7 +2171,7 @@
 			g.runnables
 				.filter((r) => r.usage_kind === 'script')
 				.map((r) => r.path)
-				.filter((p) => !drafts.has(p) && !bodiesByPath.has(p))
+				.filter((p) => !pe.drafts.has(p) && !bodiesByPath.has(p))
 		)
 		if (targets.length === 0) return
 		let i = 0
@@ -2067,6 +2214,18 @@
 		return `${n} ${singular}${n === 1 ? '' : 's'}`
 	}
 
+	// Human noun per asset kind for the header summary. The raw `ducklake` kind
+	// counts materialized tables/views (including `_current` history views), so
+	// "N ducklakes" mis-reads as a count of lakes — surface "table" instead. Other
+	// kinds keep their own noun; unmapped kinds fall back to the raw kind.
+	const ASSET_KIND_NOUN: Record<string, string> = {
+		ducklake: 'table',
+		datatable: 'table',
+		s3object: 'file',
+		volume: 'volume',
+		resource: 'resource'
+	}
+
 	let summary = $derived.by<string[]>(() => {
 		const g = graphRes.current
 		if (!g) return []
@@ -2075,9 +2234,14 @@
 		const flows = g.runnables.filter((r) => r.usage_kind === 'flow').length
 		if (scripts) parts.push(pluralize(scripts, 'script'))
 		if (flows) parts.push(pluralize(flows, 'flow'))
-		const byKind = new Map<string, number>()
-		for (const a of g.assets) byKind.set(a.kind, (byKind.get(a.kind) ?? 0) + 1)
-		for (const [kind, n] of byKind) parts.push(pluralize(n, kind))
+		// Collapse kinds that share a noun (ducklake + datatable → "table") into a
+		// single tally so the summary reads "5 tables", not "3 tables · 2 tables".
+		const byNoun = new Map<string, number>()
+		for (const a of g.assets) {
+			const noun = ASSET_KIND_NOUN[a.kind] ?? a.kind
+			byNoun.set(noun, (byNoun.get(noun) ?? 0) + 1)
+		}
+		for (const [noun, n] of byNoun) parts.push(pluralize(n, noun))
 		return parts
 	})
 </script>
@@ -2136,8 +2300,8 @@
 			     anchored between the two flex-1 side groups so it stays
 			     centered, with breathing room on both sides. -->
 			<div class="flex flex-row items-center gap-2 shrink-0 px-6">
-				<PipelineModeToggle {mode} draftCount={drafts.size} onModeChange={(m) => setMode(m)} />
-				{#if mode === 'view' && drafts.size > 0}
+				<PipelineModeToggle {mode} draftCount={pe.drafts.size} onModeChange={(m) => setMode(m)} />
+				{#if mode === 'view' && pe.drafts.size > 0}
 					<!-- View variant: overlay the unsaved drafts onto the deployed
 					     graph — "what View will show once they're deployed". -->
 					<button
@@ -2155,12 +2319,36 @@
 					>
 						<Telescope size={14} />
 						{includeDrafts ? 'Showing' : 'Show'}
-						{drafts.size} draft{drafts.size === 1 ? '' : 's'}
+						{pe.drafts.size} draft{pe.drafts.size === 1 ? '' : 's'}
 					</button>
 				{/if}
 			</div>
 		{/if}
 		<div class="flex flex-row items-center gap-2 flex-1 justify-end">
+			{#if !isOperator && allPipelineScripts.length > 0}
+				<!-- Pipeline-level run: always visible in both View and Edit so a
+				     run never requires hunting for a specific node's play button
+				     (dbt `build` / Dagster "Materialize all"). Runs every script in
+				     dependency order (roots first, cascading downstream) over the
+				     displayed graph — deployed in View, draft-overlaid in Edit. -->
+				<Button
+					variant="accent-secondary"
+					unifiedSize="sm"
+					startIcon={{
+						icon: cascadeRunningRoot ? Loader2 : Play,
+						classes: cascadeRunningRoot ? 'animate-spin' : undefined
+					}}
+					onclick={runWholePipeline}
+					disabled={!!cascadeRunningRoot}
+					title={cascadeRunningRoot
+						? 'A pipeline run is already in progress'
+						: `Run all ${allPipelineScripts.length} script${
+								allPipelineScripts.length === 1 ? '' : 's'
+							} in dependency order (roots first, cascading downstream)`}
+				>
+					{cascadeRunningRoot ? 'Running…' : 'Run pipeline'}
+				</Button>
+			{/if}
 			{#if mode === 'edit' && saveErrors.size > 0}
 				<!-- Compact errors popover anchored next to Save all so users
 				     can see exactly which drafts failed and why without losing
@@ -2195,7 +2383,7 @@
 					{/snippet}
 				</Popover>
 			{/if}
-			{#if mode === 'edit' && drafts.size > 0}
+			{#if mode === 'edit' && pe.drafts.size > 0}
 				<!-- Draft autosave status for the whole pipeline bundle. Distinct
 				     from "Save all", which DEPLOYS the drafts — this only reflects
 				     that in-flight edits are persisted to the per-user server draft. -->
@@ -2205,7 +2393,7 @@
 						itemKind="data_pipeline"
 						path={pipelineDraftPath}
 						draftOnly
-						loadedFromDraft={loadedFromDbDraft}
+						loadedFromDraft={pe.loadedFromDbDraft}
 					/>
 				{/if}
 				<Button
@@ -2214,9 +2402,9 @@
 					startIcon={{ icon: savingAll ? Loader2 : Save }}
 					onclick={saveAllDrafts}
 					disabled={savingAll}
-					title={savingAll ? 'Saving drafts…' : `Deploy all ${drafts.size} drafts`}
+					title={savingAll ? 'Saving drafts…' : `Deploy all ${pe.drafts.size} drafts`}
 				>
-					{savingAll ? 'Saving…' : `Save all (${drafts.size})`}
+					{savingAll ? 'Saving…' : `Save all (${pe.drafts.size})`}
 				</Button>
 			{/if}
 			{#if mode === 'view'}
@@ -2232,6 +2420,15 @@
 					Activity
 				</Button>
 			{/if}
+			<Button
+				variant="subtle"
+				unifiedSize="sm"
+				startIcon={{ icon: SquareFunction }}
+				onclick={() => macroDrawer?.openDrawer()}
+				title="Browse the workspace's DuckDB macros (deployed // macros libraries)"
+			>
+				Macros
+			</Button>
 			<Button
 				variant="subtle"
 				unifiedSize="sm"
@@ -2255,216 +2452,158 @@
 				Failed to load pipeline: {graphRes.error.message}
 			</div>
 		{:else}
-			<Splitpanes class="!h-full">
-				<Pane bind:size={leftPaneSize}>
-					<div class="relative h-full">
-						<AssetGraphCanvas
-							graph={displayGraph}
-							selection={effectiveSelection}
-							hoveredPaths={activityHoverPaths}
-							selectedRunPaths={activitySelectPaths}
-							{activeRunnable}
-							activeRunnableIds={activeRunnables.ids}
-							runStates={mergedRunStates}
-							{pathPrefix}
-							defaultPathSuffix={DEFAULT_PATH_SUFFIX}
-							onCreateMissingTrigger={mode === 'edit' ? openMissingTriggerDrawer : undefined}
-							onEditTrigger={mode === 'edit' ? openEditTriggerDrawer : undefined}
-							onDeleteTrigger={mode === 'edit' ? deleteAttachedTrigger : undefined}
-							onOpenWebhook={openWebhookDrawer}
-							onOpenDataUpload={openDataUploadRun}
-							onselect={handleCanvasSelect}
-							onAddScriptForAsset={mode === 'edit' ? handleAddScriptForAsset : undefined}
-							onAddPipelineScript={mode === 'edit' ? handleAddPipelineScript : undefined}
-							onRunnableMenuRemove={mode === 'edit' ? handleRunnableMenuRemove : undefined}
-							onRunProducer={mode === 'edit' ? handleRunProducer : undefined}
-							{panToNodeId}
-						/>
-						{#if mode === 'edit'}
-							<!-- View mode surfaces activity as a full right pane
-							     instead — the overlay would double up. -->
-							<PipelineEventLog events={activeRunnables.events} />
-						{/if}
-						{#if prefetchingAssets}
-							<div
-								class="absolute top-2 left-1/2 -translate-x-1/2 z-20 flex items-center gap-1.5 px-2 py-1 rounded-md bg-surface/95 backdrop-blur-sm border border-gray-200 dark:border-gray-700 text-2xs text-secondary shadow-sm"
-								title="Inferring assets for every script in this folder so the graph is complete"
-							>
-								<Loader2 size={11} class="animate-spin" />
-								Parsing assets…
+			<PipelineGraphEditor
+				editor={pe}
+				{folder}
+				viewportFitKey={viewportFitFolder}
+				persistDrafts={true}
+				{displayGraph}
+				{mode}
+				workspace={$workspaceStore}
+				{pathPrefix}
+				defaultPathSuffix={DEFAULT_PATH_SUFFIX}
+				{panelHidden}
+				onTogglePanelHidden={() => (panelHidden = !panelHidden)}
+				{prefetchingAssets}
+				hoveredPaths={activityHoverPaths}
+				selectedRunPaths={activitySelectPaths}
+				{activeRunnable}
+				activeRunnableIds={activeRunnables.ids}
+				runStates={mergedRunStates}
+				eventLogEvents={activeRunnables.events}
+				{runsRefreshKey}
+				{runsPendingJobId}
+				{boundPick}
+				validStartPaths={isOperator ? undefined : validStartPaths}
+				onStartBoundedRun={isOperator ? undefined : startBoundedRun}
+				onPickEnd={pickBoundEnd}
+				{panToNodeId}
+				onCreateMissingTrigger={mode === 'edit' ? openMissingTriggerDrawer : undefined}
+				onEditTrigger={mode === 'edit' ? openEditTriggerDrawer : undefined}
+				onDeleteTrigger={mode === 'edit' ? deleteAttachedTrigger : undefined}
+				onOpenWebhook={openWebhookDrawer}
+				onOpenDataUpload={openDataUploadRun}
+				{readyDataUploadPaths}
+				runFormInitialArgs={openScriptPath ? dataUploadArgs[openScriptPath]?.args : undefined}
+				onRunFormArgsChange={stageRunFormArgs}
+				onSelect={handleCanvasSelect}
+				onAddScriptForAsset={mode === 'edit' ? handleAddScriptForAsset : undefined}
+				onAddPipelineScript={mode === 'edit' ? handleAddPipelineScript : undefined}
+				onRunnableMenuRemove={mode === 'edit' ? handleRunnableMenuRemove : undefined}
+				onRunProducer={mode === 'edit' ? handleRunProducer : undefined}
+				onRequestEdit={isOperator ? undefined : () => setMode('edit')}
+				canRunByPath={openScriptHasDataUpload}
+				onRunByPath={runByPathLegit}
+				{selectionProducers}
+				selectionColumnGraph={pe.activeDraft ? EMPTY_COLUMN_GRAPH : columnGraph}
+				{schemaCanEvolve}
+				{selectionForkMaterialization}
+				{schemaContractContext}
+				downstreamSubscribers={editedScriptDownstreamCount}
+				onStartBoundedRunForOpen={startBoundedRun}
+				canBoundedRunOpenScript={!!openScriptPath &&
+					validStartPaths.has(openScriptPath) &&
+					lineageDownstreamPaths.has(openScriptPath)}
+				onRunCompleted={() => {
+					activeRunnable = undefined
+					activeRunnableJobId = undefined
+				}}
+				onTestStateChange={(running) => {
+					const openPath = openScriptPath
+					if (running && openPath) {
+						activeRunnable = { kind: 'script', path: openPath }
+						activeRunnables.arm(`script:${openPath}`)
+						activeRunnableJobId = undefined
+					} else if (!running && activeRunnable?.path === openPath) {
+						activeRunnable = undefined
+						activeRunnableJobId = undefined
+					}
+				}}
+				{requestRemoveSignal}
+				{requestRunSignal}
+				{requestRunCascadeSignal}
+				focusUploadSignal={focusDataUploadSignal}
+				onDraftPathChange={renameDraft}
+				onClose={() => {
+					pe.selection = undefined
+					pe.activeDraftPath = undefined
+					pe.liveAnnotations = EMPTY_LIVE_ANNOTATIONS
+				}}
+				onDiscard={() => {
+					if (pe.activeDraftPath) discardDraft(pe.activeDraftPath)
+				}}
+				onDraftSaved={async (savedPath) => {
+					const predicted = predictCascadeFacts([savedPath])
+					const nextDrafts = new Map(pe.drafts)
+					nextDrafts.delete(savedPath)
+					pe.drafts = nextDrafts
+					if (pe.activeDraftPath === savedPath) {
+						pe.selection = { kind: 'runnable', runnable_kind: 'script', path: savedPath }
+						pe.activeDraftPath = undefined
+					}
+					clearSaveError(savedPath)
+					await graphRes.refetch()
+					reportDeployDrift(predicted)
+				}}
+				onPersistedSaved={async (savedPath) => {
+					const predicted = predictCascadeFacts([savedPath])
+					await graphRes.refetch()
+					reportDeployDrift(predicted)
+				}}
+				onScriptRenamed={async (oldPath, newPath) => {
+					if (pe.selection?.kind === 'runnable' && pe.selection.path === oldPath) {
+						pe.selection = { ...pe.selection, path: newPath }
+					}
+					await graphRes.refetch()
+				}}
+				onScriptRemoved={async (removedPath) => {
+					forgetPath(removedPath)
+					await graphRes.refetch()
+				}}
+			>
+				{#snippet boundBar()}
+					{#if boundPick}
+						<div
+							class="absolute bottom-4 left-1/2 -translate-x-1/2 z-50 flex items-center gap-3 px-3 py-2 rounded-lg bg-surface shadow-lg border border-gray-200 dark:border-gray-700"
+						>
+							<Target size={15} class="text-blue-500 shrink-0" />
+							<div class="flex flex-col leading-tight">
+								<span class="text-xs font-semibold text-emphasis">
+									{boundPickEnds.size === 0
+										? `Run + all downstream · ${boundScripts.length} script${boundScripts.length === 1 ? '' : 's'} (click node(s) to bound)`
+										: `${boundScripts.length} script${boundScripts.length === 1 ? '' : 's'} up to ${boundPickEnds.size} end${boundPickEnds.size === 1 ? '' : 's'}`}
+								</span>
+								<span class="text-2xs text-tertiary">
+									from {boundPickStart ? shortPath(boundPickStart) : ''}
+								</span>
 							</div>
-						{/if}
-						{#if mode !== 'edit' || selection != undefined || activeDraftPath != undefined}
-							<!-- Floating panel toggle, mirrors the app builder's
-							     hide-bar pattern. Anchored to the canvas (not the
-							     toolbar) so it stays adjacent to the splitter
-							     handle. z-50 + bg-surface keep it visible above
-							     the SvelteFlow internals (panels, edges, controls
-							     all render at z>10) and against the canvas
-							     background — the bare HideButton uses
-							     bg-transparent which disappears on light themes. -->
-							<div
-								class="absolute top-2 right-2 z-50 rounded-md bg-surface shadow-sm border border-gray-200 dark:border-gray-700"
+							<Button variant="subtle" unifiedSize="sm" onclick={cancelBoundedRun}>Cancel</Button>
+							<Button
+								variant="accent"
+								unifiedSize="sm"
+								startIcon={{ icon: Play }}
+								disabled={boundScripts.length === 0}
+								onclick={confirmBoundedRun}
 							>
-								<HideButton
-									hidden={panelHidden}
-									direction="right"
-									on:click={() => (panelHidden = !panelHidden)}
-								/>
-							</div>
-						{/if}
-					</div></Pane
-				>
-				{#if detailsPaneOpen && $workspaceStore}
-					<Pane bind:size={rightPaneSize} minSize={25}>
-						{#if mode !== 'edit' && selection == undefined && activeDraftPath == undefined}
-							<!-- Idle view mode: the pane is the pipeline's activity
-							     feed (preloaded history + live runs). Selecting a node
-							     swaps in the details pane below; closing it lands back
-							     here. -->
-							<PipelineActivityPanel
-								events={activityEvents}
-								edges={pipelineHistory.edges}
-								loading={pipelineHistory.loading}
-								truncated={pipelineHistory.truncated}
-								error={pipelineHistory.error}
-								days={activityDays}
-								onDaysChange={setActivityDays}
-								onHoverRun={(p) => (activityHoverPaths = p ?? [])}
-								onSelectRun={(p) => (activitySelectPaths = p ?? [])}
-							/>
-						{:else}
-							<AssetGraphDetailsPane
-								{mode}
-								onRequestEdit={isOperator ? undefined : () => setMode('edit')}
-								canRunByPath={openScriptHasDataUpload}
-								onRunByPath={runByPathLegit}
-								selection={activeDraft ? undefined : selection}
-								selectionProducers={activeDraft ? [] : selectionProducers}
-								{runsRefreshKey}
-								{runsPendingJobId}
-								{activeRunnable}
-								downstreamSubscribers={editedScriptDownstreamCount}
-								onRunCompleted={() => {
-									activeRunnable = undefined
-									activeRunnableJobId = undefined
-								}}
-								onTestStateChange={(running) => {
-									// Bridge: ScriptEditor's Test button triggers the
-									// same canvas-level "is running" hint as the
-									// per-node Run button. The currently-edited script
-									// is whichever path is open in the pane (active
-									// draft, or the persisted-script selection).
-									const openPath = openScriptPath
-									if (running && openPath) {
-										activeRunnable = { kind: 'script', path: openPath }
-										// Mark the tested runnable as launched-from-here so the
-										// folder poll's catch-up pulse won't re-flash its edge a
-										// poll-interval after a fast job already finished (the
-										// edge is animated zero-latency by `activeRunnable`, and
-										// the test loader clears that the instant it completes).
-										// Also upgrades to the fast poll so the badge lands sooner.
-										activeRunnables.arm(`script:${openPath}`)
-										// Editor Test path clears via its own callbacks, not
-										// the job-id effect — drop any stale tracked id so a
-										// prior canvas run's completion can't clear this hint.
-										activeRunnableJobId = undefined
-									} else if (!running && activeRunnable?.path === openPath) {
-										activeRunnable = undefined
-										activeRunnableJobId = undefined
-									}
-								}}
-								{requestRemoveSignal}
-								{requestRunSignal}
-								{requestRunCascadeSignal}
-								focusUploadSignal={focusDataUploadSignal}
-								draftScript={activeDraft?.script}
-								{pathPrefix}
-								onDraftPathChange={renameDraft}
-								workspace={$workspaceStore}
-								onAnnotationsChange={handleAnnotationsChange}
-								onAssetsChange={handleAssetsChange}
-								onContentChange={handleContentChange}
-								onDraftPersist={handleDraftPersist}
-								onclose={() => {
-									// Close dismisses the pane but preserves drafts so
-									// the user can come back to them. Discarding is
-									// via the explicit "Discard" button in the pane.
-									selection = undefined
-									activeDraftPath = undefined
-									liveAnnotations = EMPTY_LIVE_ANNOTATIONS
-								}}
-								onHide={() => (panelHidden = true)}
-								onDiscard={() => {
-									if (activeDraftPath) discardDraft(activeDraftPath)
-								}}
-								onDraftSaved={async (savedPath) => {
-									// Snapshot the preview's promise while the draft
-									// overlay still exists (dropped from `drafts` below).
-									const predicted = predictCascadeFacts([savedPath])
-									// Drop the now-deployed draft and hand focus to its
-									// persisted runnable so the pane stays open on the
-									// same script. `discardDraft` would clear
-									// activeDraftPath without setting selection — the
-									// canvas would deselect and the view reset on the
-									// next refetch.
-									const nextDrafts = new Map(drafts)
-									nextDrafts.delete(savedPath)
-									drafts = nextDrafts
-									if (activeDraftPath === savedPath) {
-										selection = {
-											kind: 'runnable',
-											runnable_kind: 'script',
-											path: savedPath
-										}
-										activeDraftPath = undefined
-									}
-									clearSaveError(savedPath)
-									await graphRes.refetch()
-									reportDeployDrift(predicted)
-								}}
-								onPersistedSaved={async (savedPath) => {
-									// Snapshot before the refetch replaces the base graph
-									// — the live editor overlay is the prediction here.
-									const predicted = predictCascadeFacts([savedPath])
-									// Refresh the asset graph so the rows the deploy
-									// just inserted (from the body-asset write list we
-									// pass at save time) make it into base.edges. The
-									// in-memory `inferredWritesByPath` overlay
-									// dedupes against base, so the edge stays put
-									// instead of flickering when the ScriptEditor
-									// remounts on the new hash.
-									await graphRes.refetch()
-									reportDeployDrift(predicted)
-								}}
-								onScriptRenamed={async (oldPath, newPath) => {
-									// Repoint the selection at the new path before the
-									// graph refetches so the pane stays focused on the
-									// same script. Order matters: update selection
-									// first, then refetch — otherwise the resource
-									// driving the pane would briefly resolve to nothing.
-									if (selection?.kind === 'runnable' && selection.path === oldPath) {
-										selection = { ...selection, path: newPath }
-									}
-									await graphRes.refetch()
-								}}
-								onScriptRemoved={async (removedPath) => {
-									// Drop every path-keyed overlay / cache entry
-									// pointing at the now-archived runnable so
-									// resolveGraph doesn't keep emitting lineage
-									// edges or missing-trigger placeholders against
-									// a script that no longer exists. Without this
-									// the inferred writes / annotation maps would
-									// keep dragging phantom nodes onto the canvas
-									// until the next folder change.
-									forgetPath(removedPath)
-									await graphRes.refetch()
-								}}
-							/>
-						{/if}
-					</Pane>
-				{/if}
-			</Splitpanes>
+								{boundPickEnds.size === 0 ? 'Run + downstream' : 'Run selection'}
+							</Button>
+						</div>
+					{/if}
+				{/snippet}
+				{#snippet idlePane()}
+					<PipelineActivityPanel
+						events={activityEvents}
+						edges={pipelineHistory.edges}
+						loading={pipelineHistory.loading}
+						truncated={pipelineHistory.truncated}
+						error={pipelineHistory.error}
+						days={activityDays}
+						onDaysChange={setActivityDays}
+						onHoverRun={(p) => (activityHoverPaths = p ?? [])}
+						onSelectRun={(p) => (activitySelectPaths = p ?? [])}
+					/>
+				{/snippet}
+			</PipelineGraphEditor>
 		{/if}
 	</div>
 </div>
@@ -2505,18 +2644,18 @@
 						</div>
 						<div class="ml-4 flex-1">
 							<h3 class="text-lg font-medium text-primary">
-								{drafts.size === 1 ? 'Unsaved draft' : `${drafts.size} unsaved drafts`}
+								{pe.drafts.size === 1 ? 'Unsaved draft' : `${pe.drafts.size} unsaved drafts`}
 							</h3>
 							<div class="mt-2 text-sm text-secondary flex flex-col gap-2">
 								<p>
-									You have {drafts.size === 1
+									You have {pe.drafts.size === 1
 										? 'a draft pipeline script'
-										: `${drafts.size} draft pipeline scripts`} that {drafts.size === 1
+										: `${pe.drafts.size} draft pipeline scripts`} that {pe.drafts.size === 1
 										? 'has'
 										: 'have'} not been deployed yet. What would you like to do?
 								</p>
 								<ul class="text-2xs font-mono pl-4 max-h-40 overflow-y-auto flex flex-col gap-0.5">
-									{#each [...drafts.keys()] as p}
+									{#each [...pe.drafts.keys()] as p}
 										<li class="truncate text-tertiary">{p}</li>
 									{/each}
 								</ul>
@@ -2531,7 +2670,9 @@
 							unifiedSize="sm"
 							startIcon={{ icon: leaveSaving ? Loader2 : Save }}
 						>
-							<span class="min-w-20">{leaveSaving ? 'Saving…' : `Save all (${drafts.size})`}</span>
+							<span class="min-w-20"
+								>{leaveSaving ? 'Saving…' : `Save all (${pe.drafts.size})`}</span
+							>
 						</Button>
 						<Button
 							disabled={leaveSaving}
@@ -2557,3 +2698,5 @@
 		</div>
 	</div>
 {/if}
+
+<MacroExplorerDrawer bind:this={macroDrawer} onOpenLib={openMacroLib} />
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 7913d48180..31327573fb 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -42,6 +42,7 @@
 
 	import DisplayResult from '$lib/components/DisplayResult.svelte'
 	import DispatchEventsPanel from '$lib/components/runs/DispatchEventsPanel.svelte'
+	import UpstreamSnapshotsPanel from '$lib/components/runs/UpstreamSnapshotsPanel.svelte'
 	import {
 		enterpriseLicense,
 		initialArgsStore,
@@ -56,6 +57,7 @@
 	import LogViewer from '$lib/components/LogViewer.svelte'
 	import { ActionRow, Button, Skeleton, Tab, Alert, DrawerContent } from '$lib/components/common'
 	import JobDetailHeader from '$lib/components/runs/JobDetailHeader.svelte'
+	import ScriptRetryChain from '$lib/components/runs/ScriptRetryChain.svelte'
 	import FlowExecutionStatus from '$lib/components/runs/FlowExecutionStatus.svelte'
 	import JobArgs from '$lib/components/JobArgs.svelte'
 	import FlowProgressBar from '$lib/components/flows/FlowProgressBar.svelte'
@@ -93,7 +95,7 @@
 	import { useNestedRestartState } from '$lib/components/useNestedRestartState.svelte'
 	import JobOtelTraces from '$lib/components/JobOtelTraces.svelte'
 	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 	let job: (Job & { result?: any; result_stream?: string }) | undefined = $state()
 	let jobUpdateLastFetch: Date | undefined = $state()
@@ -376,7 +378,8 @@
 
 			const commonArgs = {
 				workspace: $workspaceStore!,
-				requestBody: args
+				requestBody: args,
+				tag: job?.tag
 			}
 			if (job?.job_kind == 'script' || job?.job_kind == 'script_hub' || job?.job_kind == 'flow') {
 				let id
@@ -721,7 +724,7 @@
 			{#if job?.job_kind === 'script' || job?.job_kind === 'script_hub' || job?.job_kind === 'flow'}
 				<Button
 					on:click|once={() => {
-						goto(viewHref + `#${computeSharableHash(job?.args)}`)
+						goto(viewHref + `#${computeSharableHash(job?.args, job?.tag)}`)
 					}}
 					unifiedSize="md"
 					variant="default"
@@ -752,13 +755,14 @@
 							startIcon={{ icon: Pen }}>Edit</Button
 						>
 					{/if}
-					{#if !showEditButton && !isCloudHosted() && !isRuleActive('DisableWorkspaceForking')}
+					{#if !showEditButton && !isCloudHosted() && editInForkAllowed($workspaceStore, $userWorkspaces)}
 						<Button
 							href={buildForkEditUrl(isScript ? 'script' : 'flow', job?.script_path ?? '')}
 							unifiedSize="md"
 							variant="default"
 							size="sm"
-							startIcon={{ icon: GitFork }}>Edit in fork</Button
+							startIcon={{ icon: GitFork }}
+							>{editInForkLabel($workspaceStore, $userWorkspaces)}</Button
 						>
 					{/if}
 				{/if}
@@ -868,6 +872,10 @@
 			</div>
 		</div>
 
+		{#if job}
+			<ScriptRetryChain {job} />
+		{/if}
+
 		{#if isNotFlow(job?.job_kind)}
 			{#if ['python3', 'bun', 'deno'].includes(job?.language ?? '') && (job?.job_kind == 'script' || isScriptPreview(job?.job_kind))}
 				<ExecutionDuration {job} bind:longRunning={currentJobIsLongRunning} />
@@ -912,6 +920,7 @@
 						</div>
 					</div>
 					{#if job.id && job.workspace_id}
+						<UpstreamSnapshotsPanel args={job.args} />
 						<DispatchEventsPanel workspace={job.workspace_id} jobId={job.id} />
 					{/if}
 				{/if}
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index 24bf997c50..9f7c718975 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -14,11 +14,19 @@
 		canWrite,
 		truncateHash,
 		copyToClipboard,
-		urlParamsToObject
+		urlParamsToObject,
+		extractTagFromSharableHash,
+		isDynamicTag
 	} from '$lib/utils'
 	import Tooltip from '$lib/components/Tooltip.svelte'
 	import ShareModal from '$lib/components/ShareModal.svelte'
-	import { enterpriseLicense, hubBaseUrlStore, userStore, workspaceStore } from '$lib/stores'
+	import {
+		enterpriseLicense,
+		hubBaseUrlStore,
+		userStore,
+		userWorkspaces,
+		workspaceStore
+	} from '$lib/stores'
 	import { isDeployable, ALL_DEPLOYABLE } from '$lib/utils_deployable'
 	import AIFormAssistant from '$lib/components/copilot/AIFormAssistant.svelte'
 
@@ -89,8 +97,7 @@
 	import TriggersEditor from '$lib/components/triggers/TriggersEditor.svelte'
 	import { Triggers } from '$lib/components/triggers/triggers.svelte'
 	import { page } from '$app/state'
-	import { isRuleActive } from '$lib/workspaceProtectionRules.svelte'
-	import { buildForkEditUrl } from '$lib/utils/editInFork'
+	import { buildForkEditUrl, editInForkAllowed, editInForkLabel } from '$lib/utils/editInFork'
 	import { isCloudHosted } from '$lib/cloud'
 	import { isWorkflowAsCode } from '$lib/components/graph/wacToFlow'
 	import WacDiagram from '$lib/components/graph/WacDiagram.svelte'
@@ -112,6 +119,9 @@
 	let scheduledForStr: string | undefined = $state(undefined)
 	let invisible_to_owner: boolean | undefined = $state(undefined)
 	let overrideTag: string | undefined = $state(undefined)
+	let overrideTagNote: string | undefined = $state(undefined)
+	// Tag carried over from 'Run again', pending the dynamic-tag check in loadScript
+	let carriedTag: string | undefined = undefined
 	let inputSelected: 'saved' | 'history' | undefined = $state(undefined)
 	let jsonView = $state(false)
 
@@ -253,6 +263,15 @@
 				return
 			}
 		}
+		// A carried tag is the previous run's resolved value; when the script's tag is
+		// dynamic, drop it so the backend re-resolves from the (possibly edited) args
+		if (carriedTag && isDynamicTag(script.tag)) {
+			if (overrideTag === carriedTag) {
+				overrideTag = undefined
+				overrideTagNote = `tag ${script.tag} is resolved at run time, so the previous run's tag ${carriedTag} was not applied`
+			}
+			carriedTag = undefined
+		}
 		can_write =
 			script.workspace_id == $workspaceStore &&
 			canWrite(script.path, script.extra_perms!, $userStore)
@@ -329,6 +348,8 @@
 	if (hash.length > 1) {
 		try {
 			let searchParams = new URLSearchParams(hash.slice(1))
+			carriedTag = extractTagFromSharableHash(searchParams)
+			overrideTag = carriedTag
 			let params = [...Object.entries(urlParamsToObject(searchParams))].map(([k, v]) => [
 				k,
 				JSON.parse(v)
@@ -369,10 +390,10 @@
 			script &&
 			!$userStore?.operator &&
 			!isCloudHosted() &&
-			!isRuleActive('DisableWorkspaceForking')
+			editInForkAllowed($workspaceStore, $userWorkspaces)
 		) {
 			buttons.push({
-				label: 'Edit in fork',
+				label: editInForkLabel($workspaceStore, $userWorkspaces),
 				buttonProps: {
 					href: buildForkEditUrl('script', script.path),
 					unifiedSize: 'md',
@@ -872,6 +893,7 @@
 								bind:scheduledForStr
 								bind:invisible_to_owner
 								bind:overrideTag
+								{overrideTagNote}
 								viewKeybinding
 								loading={runLoading}
 								autofocus
diff --git a/frontend/src/routes/(root)/(logged)/sessions/+page.svelte b/frontend/src/routes/(root)/(logged)/sessions/+page.svelte
index a733c325d6..70e82b2792 100644
--- a/frontend/src/routes/(root)/(logged)/sessions/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/sessions/+page.svelte
@@ -1,80 +1,111 @@
 <script lang="ts">
 	import { untrack } from 'svelte'
+	import { SvelteSet } from 'svelte/reactivity'
 	import { page } from '$app/state'
-	import { Plus } from 'lucide-svelte'
+	import {
+		Plus,
+		Maximize2,
+		Minimize2,
+		ExternalLink,
+		PanelRightClose,
+		PanelRightOpen,
+		ChevronDown,
+		MonitorPlay,
+		Loader2
+	} from 'lucide-svelte'
+	import { Pane, Splitpanes } from 'svelte-splitpanes'
 	import { Button } from '$lib/components/common'
+	import DraggableTabs, { type TabItem } from '$lib/components/common/tabs/DraggableTabs.svelte'
+	import Popover from '$lib/components/meltComponents/Popover.svelte'
+	import PreviewRouterPicker, {
+		type Scope
+	} from '$lib/components/sessions/PreviewRouterPicker.svelte'
 	import { goto } from '$lib/navigation'
 	import SessionWrapper from '$lib/components/sessions/SessionWrapper.svelte'
+	import PreviewTabHost from '$lib/components/sessions/PreviewTabHost.svelte'
 	import {
 		createSession,
 		getEffectiveWorkspaceId,
 		selectSession,
+		sessionInCurrentFamily,
 		sessionState,
-		syncWorkspaceTo
+		type SessionPreviewTab
 	} from '$lib/components/sessions/sessionState.svelte'
+	import { withWorkspaceParam } from '$lib/components/sessions/sessionMode.svelte'
+	import { enterSessionMode } from '$lib/components/sessions/sessionSwitch.svelte'
+	import type { SessionPreviewTabs } from '$lib/components/sessions/sessionPreviewTabs.svelte'
+	import { userWorkspaces, workspaceStore } from '$lib/stores'
 	import {
 		getOrCreateRuntime,
 		getRuntime,
 		listRuntimes,
-		promoteEditorWarm
+		type SessionRuntime
 	} from '$lib/components/sessions/sessionRuntime.svelte'
 	import { markSessionSeen } from '$lib/components/sessions/sessionUnread.svelte'
-	import { visibleWorkspaceIds } from '$lib/components/sessions/sessionScope.svelte'
 	import { isGlobalAiEnabled } from '$lib/components/copilot/chat/global/gate'
-	import { userWorkspaces } from '$lib/stores'
+	import { setToolCompletionListener } from '$lib/components/copilot/chat/shared'
+	import { base } from '$lib/base'
+	import {
+		matchPreviewPage,
+		pageKey,
+		parsePreviewItemRoute,
+		previewTabLabel,
+		type PreviewTarget
+	} from '$lib/components/sessions/previewRouter'
+	import { toolReloadEffect, tabsToReload } from '$lib/components/sessions/previewReload'
+	import { leafKeyFor, type WorkspaceItem } from '$lib/components/workspacePicker'
+	import { splitterPointerCapture } from '$lib/utils/splitterPointerCapture'
 
 	const globalEnabled = isGlobalAiEnabled()
 
+	// The sessions page hosts preview iframes that load Windmill pages. If one of
+	// those iframes navigates back to /sessions, mounting the full UI again would
+	// nest another sessions page (with its own iframes) endlessly. Detect the
+	// iframe context and refuse to mount when embedded.
+	const embedded = typeof window !== 'undefined' && window.self !== window.top
+
 	const sessionName = $derived(page.url.searchParams.get('session_name') ?? '')
 
-	// Unfiltered resolution by name — used to drive workspace switching
-	// when a deep-linked session lives outside the current workspace.
+	// Unfiltered resolution by name — drives the "session not found" fallback and
+	// the active-session lookup below.
 	const sessionByName = $derived(
 		sessionName ? sessionState.sessions.find((s) => s.name === sessionName) : undefined
 	)
 
-	// If the deep-linked session committed to a workspace different from
-	// the active one, switch globally so visibility resolves and the
-	// editor loads against the right workspace. Skip the switch when the
-	// target workspace is no longer in the user's list — pointing the
-	// global workspace at a deleted id would break sidebar scope and the
-	// editor; SessionWrapper handles the unavailable state separately.
-	$effect(() => {
-		const ws = sessionByName?.workspace_id
-		if (!ws) return
-		if (!$userWorkspaces.find((w) => w.id === ws)) return
-		untrack(() => syncWorkspaceTo(ws))
-	})
+	// Opening a session deliberately does NOT switch the global workspace: the
+	// chat targets the session's own workspace via the manager's workspace
+	// resolver, so the user's active (navigation-mode) workspace is left alone.
 
-	// Resolve the active session if its effective workspace is in scope
-	// (active workspace + its forks). Unavailable sessions — committed to
-	// a workspace that no longer exists — also resolve so the user can
-	// land on the move/discard banner instead of hitting "Session not
-	// found".
-	const activeSession = $derived(
-		sessionState.sessions.find((s) => {
-			if (s.name !== sessionName) return false
-			const ws = getEffectiveWorkspaceId(s)
-			if (!ws) return false
-			if ($visibleWorkspaceIds.has(ws)) return true
-			if (s.workspace_id && !$userWorkspaces.find((w) => w.id === s.workspace_id)) return true
-			return false
-		})
-	)
+	// Resolve by name without applying the sidebar scope filter so an open
+	// chat survives within-family workspace switches.
+	const activeSession = $derived(sessionState.sessions.find((s) => s.name === sessionName))
+
+	// Family reconcile: a workspace switch can land this page with no session
+	// selected or with another family's session in the URL (the sidebar picker's
+	// link navigation keeps the route), and a chat must not bleed across
+	// families. Re-enter session mode scoped to the active family: keep the open
+	// chat when it belongs there, else its most recent active session, else a
+	// fresh one. The `session_name`-without-a-session case is left to the
+	// not-found UI below.
+	$effect(() => {
+		if (embedded || !sessionState.hydrated) return
+		// sessionInCurrentFamily reads these via get(), so track them explicitly.
+		$workspaceStore
+		$userWorkspaces
+		const current = activeSession
+		const shouldReenter = current ? !sessionInCurrentFamily(current) : !sessionName
+		if (!shouldReenter) return
+		untrack(() => void enterSessionMode({ replace: true }))
+	})
 
 	// Touch the runtime for the active session so it gets created on first visit
 	// and the pane shows up. Subsequent renders find it via listRuntimes().
-	// Also refresh the fork diff count: deep-link / back-button navigation
-	// changes the URL but doesn't fire the picker.activate path nor the
-	// visibility-change signal, so this is the only hook that catches a
-	// user returning from another route in the same tab.
 	//
 	// Gate on session identity (id) rather than the full activeSession
 	// derived — sessionState.sessions mutates on every persisted change
 	// (including token-by-token last_message updates during AI streaming),
-	// so a value-trigger would re-fetch compareWorkspaces dozens of times
-	// per turn. We only want to refresh when the user actually arrives at
-	// a new session.
+	// so a value-trigger would re-run dozens of times per turn. We only
+	// want to react when the user actually arrives at a new session.
 	let lastArrivedSessionId: string | undefined
 	$effect(() => {
 		const session = activeSession
@@ -85,46 +116,27 @@
 		if (lastArrivedSessionId === session.id) return
 		lastArrivedSessionId = session.id
 		untrack(() => {
-			// Keep currentSessionId in sync with the URL so consumers
-			// (refresh hooks, picker selection) react to deep links the
-			// same way they react to picker clicks.
+			// Keep currentSessionId in sync with the URL so consumers react to
+			// deep links the same way they react to picker clicks.
 			selectSession(session.id)
-			const rt = getOrCreateRuntime(session)
-			void rt.refreshForkComparison()
+			getOrCreateRuntime(session)
 		})
 	})
 
-	// Warm = has a live runtime (module-scoped) AND its workspace is in
-	// scope (or its workspace is unavailable — those sessions still need
-	// to render the move/discard banner instead of vanishing on us).
+	// Warm = sessions with a live runtime. The picker eagerly creates runtimes
+	// for its visible sessions, so this tracks whatever it shows. Keeping warm
+	// chats mounted (stacked, visibility-toggled) preserves their scroll/draft
+	// state across switches.
 	const warmSessions = $derived(
 		listRuntimes()
 			.map((r) => sessionState.sessions.find((s) => s.id === r.sessionId))
 			.filter((s): s is NonNullable<typeof s> => s != null)
-			.filter((s) => {
-				const ws = getEffectiveWorkspaceId(s)
-				if (!ws) return false
-				if ($visibleWorkspaceIds.has(ws)) return true
-				if (s.workspace_id && !$userWorkspaces.find((w) => w.id === s.workspace_id)) return true
-				return false
-			})
 	)
 
-	// Promote the active session in the LRU. Mutations untracked so the effect
-	// only re-runs when activeSession changes, not on its own writes.
-	$effect(() => {
-		const id = activeSession?.id
-		if (!id) return
-		untrack(() => promoteEditorWarm(id))
-	})
-
-	// Mark the active session "seen" up to its current displayMessages
-	// length. Watching messages.length here means: arrive at the page →
-	// clear unread; AI streams a new message while you're on the page →
-	// clear unread again so the badge never lights up for a session
-	// you're actively looking at. The effect only depends on the
-	// length, not the array contents, so token-by-token streams within
-	// a single message don't fire it on every chunk.
+	// Mark the active session "seen" up to its current message count: arrive →
+	// clear unread; AI streams a new message while we're here → clear again. The
+	// effect depends only on the length, not the array contents, so token-by-token
+	// streams within a single message don't fire it on every chunk.
 	$effect(() => {
 		const id = activeSession?.id
 		if (!id) return
@@ -138,39 +150,666 @@
 		const fresh = createSession()
 		await goto(`/sessions?session_name=${encodeURIComponent(fresh.name)}`)
 	}
+
+	// Preview panel: a tiny tabbed browser over Windmill. Every tab stays mounted
+	// (stacked, visibility-toggled, like the warm chat sessions) so switching
+	// preserves each previewed page's scroll/edit state. The tab model lives on
+	// the active session's runtime (previewTabs) — one live copy that both this
+	// page (renderer) and the chat's open_preview tool drive — so there's no
+	// page-local tab state to seed from IndexedDB or reconcile against the tool.
+	//
+	// Pure read (not getOrCreateRuntime): creating a runtime mutates the global
+	// `runtimes` map, which is forbidden inside a $derived. The arrival effect
+	// creates it in effect context; getRuntime reads the SvelteMap reactively so
+	// this re-derives the moment it lands.
+	const activeRuntime = $derived(activeSession ? getRuntime(activeSession.id) : undefined)
+	const owner = $derived(activeRuntime?.previewTabs)
+
+	// The workspace the active session acts on. Preview pickers load their items
+	// from it and "Open in workspace" targets it, so a fork-scoped session never
+	// lists or opens against the navigation workspace ($workspaceStore).
+	const previewWorkspace = $derived(
+		(activeSession ? getEffectiveWorkspaceId(activeSession) : undefined) ?? $workspaceStore
+	)
+
+	// Lazy-mount gate: a tab's content only renders once its key lands here (on
+	// first activation) — so restoring a session with N saved tabs boots just
+	// the active one instead of N full Windmill apps at once. Pure "has this
+	// content been created yet" DOM bookkeeping, so it stays page-local while
+	// the owner holds the tab identity. Keys are session-scoped (tab ids alone
+	// collide across sessions — every session seeds a 'session' tab id) and the
+	// set survives session switches: a warm session's mounted tabs stay alive
+	// while another session is shown, same as its stacked chat column.
+	//
+	// MRU-capped at MAX_MOUNTED_TABS, shared across sessions: each mounted tab
+	// is a full Windmill app (iframe) or live editor — without a cap warm
+	// sessions accumulate one per tab ever activated. An evicted tab stays in
+	// the strip and simply remounts on its next activation, same as the
+	// lazy-mount path.
+	const MAX_MOUNTED_TABS = 5
+	const mountedTabKeys = new SvelteSet<string>()
+	const tabKey = (sessionId: string, tabId: string) => `${sessionId}:${tabId}`
+	const sessionOfKey = (key: string) => key.slice(0, key.indexOf(':'))
+	function mountTab(key: string) {
+		// Delete-then-add moves the key to the MRU end; evict from the LRU front,
+		// never the tab just activated.
+		mountedTabKeys.delete(key)
+		mountedTabKeys.add(key)
+		while (mountedTabKeys.size > MAX_MOUNTED_TABS) {
+			const oldest = mountedTabKeys.values().next().value
+			if (oldest === undefined || oldest === key) break
+			mountedTabKeys.delete(oldest)
+		}
+	}
+	// Mount the active session's active tab whenever either changes. Background
+	// sessions' activeId changes (a chat tool opening a tab) don't mount — their
+	// tabs boot lazily on first visible activation. A collapsed preview mounts
+	// nothing: the pane is zero-width, so booting a full Windmill app the user
+	// can't see is wasted — it mounts on expand, when previewCollapsed flips.
+	$effect(() => {
+		const sid = activeRuntime?.sessionId
+		const activeId = owner?.activeId
+		if (!sid || !activeId || previewCollapsed) return
+		untrack(() => mountTab(tabKey(sid, activeId)))
+	})
+	// A disposed runtime unmounts its hosts; drop its keys too, else a later
+	// re-open would boot every previously-mounted tab at once instead of
+	// lazily, and stale keys would squat the shared MRU budget.
+	$effect(() => {
+		const warm = new Set(listRuntimes().map((r) => r.sessionId))
+		untrack(() => {
+			for (const key of [...mountedTabKeys]) {
+				if (!warm.has(sessionOfKey(key))) mountedTabKeys.delete(key)
+			}
+		})
+	})
+
+	function selectTab(id: string) {
+		owner?.select(id)
+		const sid = activeRuntime?.sessionId
+		if (sid) mountTab(tabKey(sid, id))
+		activeTabPickerOpen = false
+	}
+	function openInNewTab(target: PreviewTarget) {
+		owner?.open(target)
+	}
+	function closeTab(id: string) {
+		owner?.close(id)
+		const sid = activeRuntime?.sessionId
+		if (sid) mountedTabKeys.delete(tabKey(sid, id))
+	}
+	function reorderTabs(next: TabItem[]) {
+		owner?.reorder(next.map((t) => t.id))
+	}
+	// Adapt the session tab model to DraggableTabs items (labels derived from the
+	// observed location; every tab closable, none pinned).
+	const previewTabItems = $derived<TabItem[]>(
+		(owner?.tabs ?? []).map((t) => ({ id: t.id, label: tabLabelFor(activeRuntime, t.loc) }))
+	)
+	let newTabOpen = $state(false)
+	// Separate open flag for the empty-state launcher: it can be mounted at the
+	// same time as the tab-strip "+" popover, so sharing one flag would open both
+	// pickers at once.
+	let emptyStateNewTabOpen = $state(false)
+
+	let fullscreen = $state(false)
+	// Collapse the preview panel to give the chat the full width. Per-session and
+	// owned by the runtime's previewTabs (restored on switch, written back on
+	// toggle) so it survives session switches with the rest of the tab model.
+	const previewCollapsed = $derived(owner?.collapsed ?? false)
+
+	// Collapse works by resizing the preview pane to zero, never unmounting it:
+	// the pane hosts every warm session's preview tabs, and unmounting would
+	// destroy them all whenever the active session's preview is collapsed (the
+	// default for a session with no tabs). Both panes are driven together — a
+	// given size on one pane against a stale size on the other makes Splitpanes
+	// normalize (e.g. 50 vs 100 lands at 33%), drifting on every toggle.
+	// null = let Splitpanes auto-distribute (initial even split).
+	let previewPaneSize = $state<number | null>(null)
+	let chatPaneSize = $state<number | null>(null)
+	let lastExpandedPreviewSize = 50
+	$effect(() => {
+		const collapsed = previewCollapsed
+		const full = fullscreen
+		untrack(() => {
+			if (full) {
+				// Chat pane is unmounted: the preview is the only pane and must own
+				// the full width, not its remembered split share.
+				previewPaneSize = 100
+			} else if (collapsed) {
+				if (previewPaneSize && previewPaneSize > 0 && previewPaneSize < 100) {
+					lastExpandedPreviewSize = previewPaneSize
+				}
+				previewPaneSize = 0
+				chatPaneSize = 100
+			} else {
+				if (previewPaneSize === 0 || previewPaneSize === 100 || previewPaneSize === null) {
+					previewPaneSize = lastExpandedPreviewSize
+				}
+				chatPaneSize = 100 - previewPaneSize
+			}
+		})
+	})
+
+	// Page path shown after the workspace breadcrumb — the active tab's observed
+	// location, so the breadcrumb tracks where the user browses inside the tab.
+	const displayPath = $derived(owner?.activeTab?.loc ?? owner?.activeTab?.url ?? `${base}/`)
+	// Writes to the tab's own session model: a hidden warm session's iframe can
+	// finish loading while another session is shown, and its location must not
+	// land on the visible session's tabs.
+	function onTabLoad(tabs: SessionPreviewTabs, tab: SessionPreviewTab, frame: HTMLIFrameElement) {
+		try {
+			const loc = frame.contentWindow?.location
+			if (!loc) return
+			// observeLocation canonicalizes away the injected nomenubar/workspace
+			// params so the tab's `loc` stays symmetric with `url` for dedupe/display.
+			tabs.observeLocation(tab.id, loc.pathname + loc.search)
+		} catch {
+			// Best-effort: the preview is same-origin, but reading location could
+			// still throw mid-navigation — keep the seeded path in that case.
+		}
+	}
+
+	// Reload mounted preview tabs affected by a mutating chat tool. Item and pipeline
+	// tabs are live editors that self-sync from the store the chat mutates, so nothing
+	// reloads them. Only list-page tabs (schedules, resources, …) are iframes, and each
+	// reloads only when a tool actually changed *its* page (toolReloadEffect) — so a
+	// schedule write leaves the Resources tab alone, and a purely local tool (saving
+	// user instructions) reloads nothing.
+	const tabHosts: Record<string, PreviewTabHost | undefined> = {}
+
+	let reloadHandle: ReturnType<typeof setTimeout> | undefined
+	// Base-stripped list-page paths (e.g. `/schedules`) a chat round touched since
+	// the last flush — see toolReloadEffect for how tools map to pages.
+	let pendingPages = new Set<string>()
+
+	// Reload the mounted list-page tabs a chat round changed, across all warm
+	// sessions (a hidden preview would otherwise show pre-mutation content on
+	// return). tabsToReload picks only the tabs whose page is in `pages`.
+	function reloadTabs(pages: Set<string>) {
+		for (const s of warmSessions) {
+			const owner = getRuntime(s.id)?.previewTabs
+			if (!owner) continue
+			for (const tab of tabsToReload(owner.tabs, pages)) {
+				const key = tabKey(s.id, tab.id)
+				if (mountedTabKeys.has(key)) tabHosts[key]?.reload()
+			}
+		}
+	}
+	function flushReload() {
+		const pages = pendingPages
+		pendingPages = new Set()
+		reloadTabs(pages)
+	}
+	$effect(() => {
+		// Debounced so a burst of writes (the AI editing several files) reloads once.
+		setToolCompletionListener((name, args) => {
+			const { pages } = toolReloadEffect(name, args)
+			if (pages.length === 0) return
+			for (const p of pages) pendingPages.add(p)
+			clearTimeout(reloadHandle)
+			reloadHandle = setTimeout(flushReload, 500)
+		})
+		return () => {
+			clearTimeout(reloadHandle)
+			pendingPages = new Set()
+			setToolCompletionListener(undefined)
+		}
+	})
+
+	// Editor-style breadcrumb over the previewed page. We only render clickable
+	// segments when the preview is sitting on a script/flow/app route — for any
+	// other page (home, runs, …) there's no item to drill into, so we fall back
+	// to the plain path.
+	const parsedRoute = $derived(parsePreviewItemRoute(displayPath))
+
+	// Split the item path into breadcrumb dirs + leaf, mirroring EditorHeader:
+	// scope (`f/<folder>` | `u/<user>`) → subfolders → item name.
+	const segments = $derived.by(() => {
+		const itemPath = parsedRoute?.itemPath
+		if (!itemPath) return null
+		const parts = itemPath.split('/')
+		if (parts.length < 3) return null
+		const scope = parts.slice(0, 2).join('/')
+		const slug = parts.slice(2)
+		const dirs: { name: string; fullPath: string }[] = [{ name: scope, fullPath: scope }]
+		let acc = scope
+		for (let i = 0; i < slug.length - 1; i++) {
+			acc = `${acc}/${slug[i]}`
+			dirs.push({ name: slug[i], fullPath: acc })
+		}
+		const leaf = { name: slug[slug.length - 1], fullPath: itemPath }
+		return { dirs, leaf }
+	})
+
+	const currentItem = $derived<WorkspaceItem & { savedPath?: string }>({
+		path: parsedRoute?.itemPath ?? '',
+		summary: '',
+		kind: parsedRoute?.kind ?? 'script',
+		raw_app: parsedRoute?.raw_app ?? false
+	})
+
+	// On a non-item page, identify the known workspace page so the tab shows its
+	// name (e.g. "Workspace settings") and the picker highlights it.
+	const currentPage = $derived(parsedRoute ? undefined : matchPreviewPage(displayPath))
+
+	// The active tab's picker lands on its current location: an item is scoped
+	// into its folder and highlighted; a known page is highlighted at root.
+	const activePickerScope = $derived<Scope>(
+		parsedRoute
+			? segments && segments.dirs.length > 0
+				? { kind: 'all', dir: segments.dirs[segments.dirs.length - 1].fullPath }
+				: { kind: 'all' }
+			: undefined
+	)
+	const activePickerHighlight = $derived(
+		parsedRoute
+			? leafKeyFor(parsedRoute.kind, parsedRoute.itemPath)
+			: currentPage
+				? pageKey(currentPage.path)
+				: undefined
+	)
+	let activeTabPickerOpen = $state(false)
+
+	// Breadcrumb picks steer the *active* tab; the "+" picker opens new ones. An
+	// editable item also becomes the session's live editor (owner.navigate).
+	function navigatePreviewTo(target: PreviewTarget) {
+		owner?.navigate(target)
+	}
+
+	// Short tab label. For a raw-app tab, feed its own per-path cell so the tab is
+	// labelled by that app's pending draft path (a rename parked at `draft_<uuid>`),
+	// scoped to the tab's own runtime rather than another session's.
+	function tabLabelFor(rt: SessionRuntime | undefined, url: string): string {
+		const route = parsePreviewItemRoute(url)
+		const rawAppDraft = rt && route?.raw_app ? rt.rawAppCell(route.itemPath).store.val : undefined
+		return previewTabLabel(url, rawAppDraft)
+	}
+
+	// A link click inside a live editor (e.g. a subflow reference) re-points the
+	// active tab, which — for an editable item — makes it the session's live
+	// editor via owner.navigate. Legacy drag-and-drop apps have no preview
+	// wrapper, so they open in the standalone editor instead.
+	function navigateEditorTo(item: WorkspaceItem) {
+		if (item.kind === 'app' && !item.raw_app) {
+			// Leaving the preview for the standalone editor — carry the session
+			// workspace so the app opens in the fork the session acts on, not the
+			// navigation workspace.
+			goto(withWorkspaceParam(`${base}/apps/edit/${item.path}`, previewWorkspace))
+			return
+		}
+		owner?.navigate({ type: 'item', item })
+	}
+
+	// A preview iframe that navigates to an editor route posts up to us instead of
+	// booting the editor inside the frame (see the logged layout's beforeNavigate).
+	// Retarget the active tab — the navigating frame is the visible one the user
+	// just clicked in — which flips its seam from iframe → live editor.
+	$effect(() => {
+		function onMessage(e: MessageEvent) {
+			if (e.origin !== window.location.origin) return
+			const d = e.data
+			if (!d) return
+			// A preview frame navigating to an editor route: re-point the active tab to
+			// the live in-process editor instead of booting a second one in the frame.
+			if (d.type === 'wm.session.openEditor') {
+				if (d.kind !== 'script' && d.kind !== 'flow' && d.kind !== 'raw_app') return
+				if (typeof d.path !== 'string') return
+				const item: WorkspaceItem =
+					d.kind === 'raw_app'
+						? { kind: 'app', raw_app: true, path: d.path, summary: '' }
+						: { kind: d.kind, path: d.path, summary: '' }
+				owner?.navigate({ type: 'item', item })
+				return
+			}
+			// A job clicked inside a preview tab: open the run detail in a NEW tab so the
+			// originating page (e.g. Runs) stays put. open() focuses an existing tab for
+			// the same run rather than duplicating it.
+			if (d.type === 'wm.session.openRun') {
+				if (typeof d.href !== 'string') return
+				owner?.open({
+					type: 'page',
+					href: d.href,
+					label: typeof d.label === 'string' ? d.label : 'Run'
+				})
+				return
+			}
+		}
+		window.addEventListener('message', onMessage)
+		return () => window.removeEventListener('message', onMessage)
+	})
 </script>
 
-{#if !globalEnabled}
-	<div class="p-8 text-secondary text-sm">
-		Sessions are gated on the global-AI dev flag. Enable with
-		<code class="text-2xs font-mono">localStorage.setItem('wm_dev_global_ai', '1')</code> and reload.
-	</div>
-{:else if !sessionName}
-	<div class="p-8 text-secondary">No session selected — pick one in the sidebar.</div>
-{:else if !sessionByName}
-	<!-- A session_name is in the URL but no session by that name exists — e.g. a
-	     deleted session or a link opened in a different browser. -->
-	<div class="p-8 flex flex-col items-start gap-3 text-secondary text-sm">
-		<div class="flex flex-col gap-1">
-			<p class="text-primary font-medium">Session not found</p>
-			<p>
-				No session named <code class="font-mono text-2xs">{sessionName}</code> exists. It may have been
-				deleted, or this link was created in a different browser.
-			</p>
-		</div>
-		<Button size="xs" startIcon={{ icon: Plus }} onclick={startNewSession}>New session</Button>
-	</div>
-{:else}
-	<div class="relative flex-1 min-h-0">
-		{#each warmSessions as s (s.id)}
-			<div
-				class="absolute inset-0 flex flex-col {s.id === activeSession?.id
-					? 'z-10 opacity-100 pointer-events-auto'
-					: 'z-0 opacity-0 pointer-events-none'}"
-				aria-hidden={s.id !== activeSession?.id}
+<!-- A tab mutation inside the owner's debounce window would be lost to a
+     reload/navigation; hidden fires before pagehide, so flush there. -->
+<svelte:document
+	onvisibilitychange={() => {
+		if (document.visibilityState === 'hidden') owner?.flushNow()
+	}}
+/>
+
+<div class="h-full flex flex-col min-h-0">
+	{#if embedded}
+		<!-- Rendered inside a preview iframe — opening the sessions UI here would
+		     recurse. Offer to break out to the top-level window instead. -->
+		<div class="p-8 flex flex-col items-start gap-3 text-secondary text-sm">
+			<p class="text-primary font-medium">Sessions can't open inside a preview</p>
+			<p>This page is being previewed in a session panel. Open it at the top level instead.</p>
+			<Button
+				size="xs"
+				startIcon={{ icon: ExternalLink }}
+				onclick={() => {
+					const u = new URL(window.location.href)
+					u.searchParams.delete('nomenubar')
+					window.top?.location.assign(u.pathname + u.search)
+				}}>Open sessions</Button
 			>
-				<SessionWrapper sessionId={s.id} />
+		</div>
+	{:else if !globalEnabled}
+		<div class="p-8 text-secondary text-sm">
+			Sessions are gated on the global-AI dev flag. Enable with
+			<code class="text-2xs font-mono">localStorage.setItem('wm_dev_global_ai', '1')</code> and reload.
+		</div>
+	{:else if !sessionState.hydrated}
+		<!-- Sessions hydrate from IndexedDB after the user resolves; until then an
+		     empty list means "loading", so the not-found branch below must not fire. -->
+		<div class="flex-1 flex items-center justify-center">
+			<Loader2 class="animate-spin" />
+		</div>
+	{:else if !sessionName}
+		<div class="p-8 text-secondary">No session selected — pick one in the sidebar.</div>
+	{:else if !sessionByName}
+		<!-- A session_name is in the URL but no session by that name exists — e.g. a
+		     deleted session or a link opened in a different browser. -->
+		<div class="p-8 flex flex-col items-start gap-3 text-secondary text-sm">
+			<div class="flex flex-col gap-1">
+				<p class="text-primary font-medium">Session not found</p>
+				<p>
+					No session named <code class="font-mono text-2xs">{sessionName}</code> exists. It may have
+					been deleted, or this link was created in a different browser.
+				</p>
 			</div>
-		{/each}
-	</div>
-{/if}
+			<Button size="xs" startIcon={{ icon: Plus }} onclick={startNewSession}>New session</Button>
+		</div>
+	{:else}
+		<div class="flex-1 min-h-0 flex flex-row relative" use:splitterPointerCapture>
+			<Splitpanes
+				horizontal={false}
+				class="flex-1 min-h-0 session-splitter {previewCollapsed ? 'splitter-off' : ''}"
+			>
+				{#if !fullscreen}
+					<!-- Chat column. Warm sessions stay mounted (stacked, visibility-toggled)
+					     so switching between them preserves chat scroll/draft state. -->
+					<Pane bind:size={chatPaneSize} minSize={25} class="flex flex-col min-h-0">
+						<div class="relative flex-1 min-h-0">
+							{#each warmSessions as s (s.id)}
+								<div
+									class="absolute inset-0 flex flex-col {s.id === activeSession?.id
+										? 'z-10 opacity-100 pointer-events-auto'
+										: 'z-0 opacity-0 pointer-events-none'}"
+									aria-hidden={s.id !== activeSession?.id}
+								>
+									<SessionWrapper sessionId={s.id} />
+								</div>
+							{/each}
+						</div>
+					</Pane>
+				{/if}
+
+				<!-- Preview panel: the live Windmill page, framed like the editor pane.
+				     Always mounted (collapse resizes it to 0 — see previewPaneSize) so
+				     warm sessions' preview hosts survive a collapsed active session. -->
+				<Pane
+					bind:size={previewPaneSize}
+					minSize={previewCollapsed ? 0 : 30}
+					maxSize={previewCollapsed ? 0 : 100}
+					class="flex flex-col min-h-0"
+				>
+					<div class="flex-1 min-h-0 flex flex-col {fullscreen ? 'p-0' : 'p-2 pl-0'}">
+						<div
+							class="flex flex-col flex-1 min-h-0 overflow-hidden relative bg-surface {fullscreen
+								? ''
+								: 'rounded-md border border-light'}"
+						>
+							{#if !fullscreen}
+								<!-- Collapse the preview panel — floats over the top-left corner so
+									     the tab strip keeps the full width. -->
+								<button
+									type="button"
+									onclick={() => owner?.setCollapsed(true)}
+									title="Collapse preview"
+									aria-label="Collapse preview"
+									class="absolute top-1 left-1 z-30 inline-flex items-center justify-center w-6 h-6 rounded text-tertiary hover:text-primary hover:bg-surface-hover"
+								>
+									<PanelRightClose size={14} />
+								</button>
+							{/if}
+
+							<!-- Open-in-full-page + full-screen toggle, floating over the top-right
+								     corner to mirror the collapse control. -->
+							<div class="absolute top-1 right-1 z-30 flex items-center gap-0.5">
+								<a
+									href={withWorkspaceParam(
+										owner?.activeTab?.loc || owner?.activeTab?.url || `${base}/`,
+										previewWorkspace
+									)}
+									title="Open in workspace"
+									aria-label="Open in workspace"
+									class="inline-flex items-center justify-center w-6 h-6 rounded text-tertiary hover:text-primary hover:bg-surface-hover"
+								>
+									<ExternalLink size={14} />
+								</a>
+								<button
+									type="button"
+									onclick={() => (fullscreen = !fullscreen)}
+									title={fullscreen ? 'Exit full screen' : 'Full screen'}
+									aria-label={fullscreen ? 'Exit full screen' : 'Full screen'}
+									class="inline-flex items-center justify-center w-6 h-6 rounded text-tertiary hover:text-primary hover:bg-surface-hover"
+								>
+									{#if fullscreen}
+										<Minimize2 size={14} />
+									{:else}
+										<Maximize2 size={14} />
+									{/if}
+								</button>
+							</div>
+
+							<!-- Tab strip: open preview pages, shared with the raw-app editor
+								     (DraggableTabs). The active tab hosts its own breadcrumb picker via
+								     the accessory chevron; the "+" trailing opens the router picker.
+								     Left/right padding clears the floating collapse/fullscreen buttons. -->
+							<DraggableTabs
+								tabs={previewTabItems}
+								activeId={owner?.activeId ?? ''}
+								onSelect={selectTab}
+								onClose={closeTab}
+								onReorder={reorderTabs}
+								class="h-8 border-b border-light bg-surface-secondary/50 {fullscreen
+									? 'pl-1.5'
+									: 'pl-9'} pr-16"
+							>
+								{#snippet tabAccessory(_tab, isActive)}
+									{#if isActive}
+										<Popover
+											placement="bottom-start"
+											usePointerDownOutside
+											excludeSelectors=".drawer"
+											disableFocusTrap
+											closeOnOtherPopoverOpen
+											enableFlyTransition
+											bind:isOpen={activeTabPickerOpen}
+											openFocus="[data-workspace-picker-search]"
+											contentClasses="flex flex-col overflow-hidden"
+											class="flex items-center shrink-0 cursor-pointer text-tertiary hover:text-primary"
+										>
+											{#snippet trigger()}
+												<ChevronDown size={12} />
+											{/snippet}
+											{#snippet content()}
+												<PreviewRouterPicker
+													initialScope={activePickerScope}
+													initialHighlight={activePickerHighlight}
+													{currentItem}
+													workspaceId={previewWorkspace}
+													onPick={(t) => {
+														activeTabPickerOpen = false
+														navigatePreviewTo(t)
+													}}
+												/>
+											{/snippet}
+										</Popover>
+									{/if}
+								{/snippet}
+								{#snippet afterTabs()}
+									<Popover
+										placement="bottom-start"
+										usePointerDownOutside
+										excludeSelectors=".drawer"
+										disableFocusTrap
+										closeOnOtherPopoverOpen
+										bind:isOpen={newTabOpen}
+										enableFlyTransition
+										openFocus="[data-workspace-picker-search]"
+										contentClasses="flex flex-col overflow-hidden"
+										class="shrink-0 inline-flex items-center justify-center w-6 h-6 rounded text-tertiary hover:text-primary hover:bg-surface-hover cursor-pointer"
+									>
+										{#snippet trigger()}
+											<Plus size={14} />
+										{/snippet}
+										{#snippet content()}
+											<PreviewRouterPicker
+												workspaceId={previewWorkspace}
+												onPick={(t) => {
+													newTabOpen = false
+													openInNewTab(t)
+												}}
+											/>
+										{/snippet}
+									</Popover>
+								{/snippet}
+							</DraggableTabs>
+
+							<!-- One host per tab of every warm session, stacked and
+								     visibility-toggled so switching tabs or sessions never reloads
+								     a mounted tab — hosts live as long as the session's runtime,
+								     content-gated by the shared mount MRU. Each host renders a
+								     live editor (script/flow/raw_app target) or an iframe fallback. -->
+							<div class="relative flex-1 min-h-0">
+								{#each warmSessions as s (s.id)}
+									{@const rt = getRuntime(s.id)}
+									{@const tabs = rt?.previewTabs}
+									{#each tabs?.tabs ?? [] as tab (tab.id)}
+										<!-- tabHosts is an imperative ref-bag (only tabHosts[key]?.reload() in
+										     reloadTabs); it is intentionally a plain object so component
+										     instances aren't proxied. Nothing reads it reactively, so the
+										     non-reactive binding is fine. -->
+										<!-- svelte-ignore binding_property_non_reactive -->
+										<PreviewTabHost
+											bind:this={tabHosts[tabKey(s.id, tab.id)]}
+											{tab}
+											session={s}
+											runtime={rt}
+											active={s.id === activeSession?.id && tab.id === tabs?.activeId}
+											mounted={mountedTabKeys.has(tabKey(s.id, tab.id))}
+											label={tabLabelFor(rt, tab.loc)}
+											onNavigate={navigateEditorTo}
+											onLoad={(frame) => tabs && onTabLoad(tabs, tab, frame)}
+										/>
+									{/each}
+								{/each}
+								{#if (owner?.tabs.length ?? 0) === 0}
+									<!-- New session with nothing to preview: an empty state with a
+										     picker to open one, instead of defaulting to the home page. -->
+									<div
+										class="absolute inset-0 flex flex-col items-center justify-center gap-3 text-center px-6 bg-surface"
+									>
+										<MonitorPlay size={28} class="text-tertiary" />
+										<div class="flex flex-col gap-1">
+											<span class="text-sm font-medium text-secondary">No preview open</span>
+											<span class="text-xs text-tertiary max-w-xs"
+												>Open a page, flow, script or app to preview it alongside the chat.</span
+											>
+										</div>
+										<Popover
+											placement="bottom"
+											usePointerDownOutside
+											excludeSelectors=".drawer"
+											disableFocusTrap
+											closeOnOtherPopoverOpen
+											bind:isOpen={emptyStateNewTabOpen}
+											enableFlyTransition
+											openFocus="[data-workspace-picker-search]"
+											contentClasses="flex flex-col overflow-hidden"
+										>
+											{#snippet trigger()}
+												<span
+													class="inline-flex items-center gap-1.5 px-2.5 py-1.5 rounded-md text-xs border border-light text-secondary hover:bg-surface-hover cursor-pointer"
+												>
+													<Plus size={14} /> Open a preview
+												</span>
+											{/snippet}
+											{#snippet content()}
+												<PreviewRouterPicker
+													workspaceId={previewWorkspace}
+													onPick={(t) => {
+														emptyStateNewTabOpen = false
+														openInNewTab(t)
+													}}
+												/>
+											{/snippet}
+										</Popover>
+									</div>
+								{/if}
+							</div>
+						</div>
+					</div>
+				</Pane>
+			</Splitpanes>
+			{#if previewCollapsed && !fullscreen}
+				<!-- Collapsed preview: no rail — a floating launcher in the top-right to
+				     reopen the side panel. -->
+				<div class="absolute top-2 right-3 z-50">
+					<Button
+						variant="subtle"
+						unifiedSize="sm"
+						startIcon={{ icon: PanelRightOpen }}
+						title="Open side panel"
+						onclick={() => owner?.setCollapsed(false)}
+					>
+						Open side panel
+					</Button>
+				</div>
+			{/if}
+		</div>
+	{/if}
+</div>
+
+<style>
+	/* Draggable gutter between the chat and the preview: a real (layout-occupying)
+	   10px-wide grab zone, no overlap tricks that could cover the chat's scrollbar
+	   or the preview's edge. Transparent at rest; on hover the app-global
+	   `.splitpanes__splitter::after` grabber fades in. Uses a dedicated class, not
+	   the shared `.splitter-hidden`, which force-zeroes splitter opacity and would
+	   hide that grabber. */
+	:global(.splitpanes--vertical.session-splitter) > :global(.splitpanes__splitter) {
+		background-color: transparent !important;
+		border: none !important;
+		width: 10px !important;
+	}
+	/* Inset the global hover grabber from the pane's top/bottom edges so the line
+	   doesn't run the full height, and round its ends into a pill — a lighter,
+	   more contained hint. */
+	:global(.splitpanes--vertical.session-splitter) > :global(.splitpanes__splitter)::after {
+		top: 8px !important;
+		bottom: 8px !important;
+		height: auto !important;
+		border-radius: 9999px !important;
+	}
+
+	/* Collapsed preview: the pane is resized to 0 but stays mounted, so remove
+	   the gutter entirely — it would otherwise leave a dead 10px drag zone on the
+	   chat's right edge. */
+	:global(.splitpanes--vertical.splitter-off) > :global(.splitpanes__splitter) {
+		display: none !important;
+	}
+</style>
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index e71f0bb71e..19fa4f2553 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -3,11 +3,12 @@
 	import { page } from '$app/stores'
 	import { isCloudHosted } from '$lib/cloud'
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
-	import { Alert, Button, Section, Skeleton, Tab, Tabs } from '$lib/components/common'
+	import { Alert, Button, CopyButton, Section, Skeleton, Tab, Tabs } from '$lib/components/common'
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 
 	import DeployToSetting from '$lib/components/DeployToSetting.svelte'
+	import DevWorkspaceSetting from '$lib/components/DevWorkspaceSetting.svelte'
 	import ErrorOrRecoveryHandler from '$lib/components/ErrorOrRecoveryHandler.svelte'
 	import PageHeader from '$lib/components/PageHeader.svelte'
 	import ScriptPicker from '$lib/components/ScriptPicker.svelte'
@@ -68,6 +69,13 @@
 		type DucklakeSettingsType
 	} from '$lib/components/workspaceSettings/DucklakeSettings.svelte'
 	import UnsavedConfirmationModal from '$lib/components/common/confirmationModal/UnsavedConfirmationModal.svelte'
+	import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
+	import {
+		archiveSessionsForWorkspace,
+		countSessionsForWorkspace,
+		deleteSessionsForWorkspace,
+		reconcileAfterWorkspaceChange
+	} from '$lib/components/sessions/sessionState.svelte'
 	import TextInput from '$lib/components/text_input/TextInput.svelte'
 	import CollapseLink from '$lib/components/CollapseLink.svelte'
 	import { validateWebhookUrl, validateEncryptionKey } from '$lib/validators/workspaceSettings'
@@ -87,6 +95,65 @@
 	let slack_team_name: string | undefined = $state()
 	let teams_team_id: string | undefined = $state()
 	let teams_team_name: string | undefined = $state()
+
+	// Workspace archive/delete cascade to the workspace's client-side AI sessions
+	// (archive → archive, delete → delete) via reconcileSessionsLifecycle. The
+	// confirmation modals warn how many sessions are affected first.
+	let archiveConfirmOpen = $state(false)
+	let deleteConfirmOpen = $state(false)
+	let affectedSessionCount = $state(0)
+
+	async function openArchiveConfirm() {
+		affectedSessionCount = await countSessionsForWorkspace($workspaceStore ?? '')
+		archiveConfirmOpen = true
+	}
+	async function openDeleteConfirm() {
+		affectedSessionCount = await countSessionsForWorkspace($workspaceStore ?? '')
+		deleteConfirmOpen = true
+	}
+	async function doArchiveWorkspace() {
+		const ws = $workspaceStore ?? ''
+		// Land on the parent workspace if this is a fork and the parent is still
+		// accessible — otherwise fall back to the workspace picker.
+		const parentId = $userWorkspaces.find((w) => w.id === ws)?.parent_workspace_id
+		const parentStillAccessible = !!(parentId && $userWorkspaces.find((w) => w.id === parentId))
+		await WorkspaceService.archiveWorkspace({ workspace: ws })
+		sendUserToast(`Archived workspace ${ws}`)
+		// Best-effort client cleanup: a local IndexedDB failure must not strand the
+		// user on the just-archived workspace. The reconcile also refreshes the
+		// workspace list (dropping the archived one) so the parent-accessible check
+		// below — captured before the archive — still routes correctly.
+		try {
+			await archiveSessionsForWorkspace(ws)
+			await reconcileAfterWorkspaceChange()
+		} catch (e) {
+			console.error('Session cleanup after workspace archive failed', e)
+		}
+		if (parentStillAccessible && parentId) {
+			switchWorkspace(parentId)
+			await goto('/')
+		} else {
+			workspaceStore.set(undefined)
+			usersWorkspaceStore.set(undefined)
+			await goto('/user/workspaces')
+		}
+	}
+	async function doDeleteWorkspace() {
+		const ws = $workspaceStore ?? ''
+		await WorkspaceService.deleteWorkspace({ workspace: ws })
+		sendUserToast(`Deleted workspace ${ws}`)
+		// Best-effort client cleanup — must not block navigation off the deleted
+		// workspace if a local IndexedDB op throws.
+		try {
+			await deleteSessionsForWorkspace(ws)
+			await reconcileAfterWorkspaceChange()
+		} catch (e) {
+			console.error('Session cleanup after workspace delete failed', e)
+		}
+		workspaceStore.set(undefined)
+		usersWorkspaceStore.set(undefined)
+		await goto('/user/workspaces')
+	}
 	let useCustomSlackApp: boolean = $state(false)
 	let slackAppType: 'instance' | 'workspace' = $state('instance')
 
@@ -282,6 +349,7 @@
 			| 'general'
 			| 'webhook'
 			| 'deploy_to'
+			| 'dev_workspace'
 			| 'error_handler'
 			| 'success_handler'
 			| 'critical_alerts'
@@ -1046,6 +1114,14 @@
 		}
 	}
 
+	// The Dev workspace tab is only meaningful on a root workspace (to pair/manage a dev) or on a
+	// dev workspace itself (to see its prod / detach). Hide it for ordinary forks — pairing isn't
+	// available there and the backend would reject it.
+	const currentWsForDevTab = $derived($userWorkspaces.find((w) => w.id === $workspaceStore))
+	const showDevWorkspaceTab = $derived(
+		!currentWsForDevTab?.parent_workspace_id || (currentWsForDevTab?.is_dev_workspace ?? false)
+	)
+
 	// Navigation groups for sidebar
 	const navigationGroups = $derived([
 		{
@@ -1094,6 +1170,17 @@
 					aiDescription: 'Deployment UI workspace settings',
 					isEE: true
 				},
+				...(showDevWorkspaceTab
+					? [
+							{
+								id: 'dev_workspace',
+								label: 'Dev workspace',
+								aiId: 'workspace-settings-dev-workspace',
+								aiDescription:
+									'Pair this workspace with a dev workspace (same code, different environment)'
+							}
+						]
+					: []),
 				{
 					id: 'rulesets',
 					label: 'Rulesets',
@@ -1217,8 +1304,13 @@
 
 <CenteredPage wrapperClasses="pb-0 h-screen" handleOverflow={false} class="flex flex-col h-full">
 	{#if $userStore?.is_admin || $superadmin}
-		<PageHeader title="Workspace settings: {$workspaceStore}"
-			>{#if $superadmin}
+		<PageHeader title="Workspace settings: {$workspaceStore}">
+			{#snippet titleActions()}
+				{#if $workspaceStore}
+					<CopyButton value={$workspaceStore} title={`Copy id: ${$workspaceStore}`} />
+				{/if}
+			{/snippet}
+			{#if $superadmin}
 				<Button variant="default" size="sm" on:click={() => goto('#superadmin-settings')}>
 					Instance settings
 				</Button>
@@ -1277,6 +1369,12 @@
 									></div
 								>
 							{/if}
+						{:else if tab == 'dev_workspace'}
+							<SettingsPageHeader
+								title="Dev workspace"
+								description="Pair this workspace with a dev workspace: the same code with a different environment. Edits are made in the dev workspace and promoted to prod."
+							/>
+							<DevWorkspaceSetting />
 						{:else if tab == 'rulesets'}
 							<SettingsPageHeader
 								title="Workspace Protection Rulesets"
@@ -1284,7 +1382,16 @@
 							/>
 							<WorkspaceRulesets />
 						{:else if tab == 'premium'}
-							<PremiumInfo {customer_id} {plan} />
+							{#if currentWsForDevTab?.parent_workspace_id}
+								<Alert type="info" title="Billing is managed on the parent workspace">
+									This workspace is a fork of <b>{currentWsForDevTab.parent_workspace_id}</b>. It
+									runs on the parent's plan and its executions count toward the parent's usage and
+									bill, so there is no separate subscription here. Manage billing, seats, and quotas
+									from the parent workspace's settings.
+								</Alert>
+							{:else}
+								<PremiumInfo {customer_id} {plan} />
+							{/if}
 						{:else if tab == 'slack'}
 							<SettingsPageHeader
 								title="Workspace connections to Slack and Teams"
@@ -1543,34 +1650,7 @@
 									disabled={$workspaceStore === 'admins' || $workspaceStore === 'starter'}
 									unifiedSize="md"
 									btnClasses="mt-2"
-									on:click={async () => {
-										const ws = $workspaceStore ?? ''
-										// Land on the parent workspace if this is a fork and the
-										// parent is still accessible — otherwise fall back to the
-										// workspace picker.
-										const parentId = $userWorkspaces.find((w) => w.id === ws)?.parent_workspace_id
-										const parentStillAccessible = !!(
-											parentId && $userWorkspaces.find((w) => w.id === parentId)
-										)
-										await WorkspaceService.archiveWorkspace({ workspace: ws })
-										sendUserToast(`Archived workspace ${ws}`)
-										if (parentStillAccessible && parentId) {
-											// Refresh the list so the just-archived workspace drops out before
-											// we land on the parent. Guarded: a refresh failure must not block
-											// the switch (the list reloads on next page load).
-											try {
-												usersWorkspaceStore.set(await WorkspaceService.listUserWorkspaces())
-											} catch (e) {
-												console.error('Failed to refresh workspaces after archive', e)
-											}
-											switchWorkspace(parentId)
-											await goto('/')
-										} else {
-											workspaceStore.set(undefined)
-											usersWorkspaceStore.set(undefined)
-											await goto('/user/workspaces')
-										}
-									}}
+									on:click={openArchiveConfirm}
 								>
 									Archive workspace
 								</Button>
@@ -1581,18 +1661,51 @@
 										disabled={$workspaceStore === 'admins' || $workspaceStore === 'starter'}
 										size="sm"
 										btnClasses="mt-2"
-										on:click={async () => {
-											await WorkspaceService.deleteWorkspace({ workspace: $workspaceStore ?? '' })
-											sendUserToast(`Deleted workspace ${$workspaceStore}`)
-											workspaceStore.set(undefined)
-											usersWorkspaceStore.set(undefined)
-											goto('/user/workspaces')
-										}}
+										on:click={openDeleteConfirm}
 									>
 										Delete workspace (superadmin)
 									</Button>
 								{/if}
 							</div>
+
+							<ConfirmationModal
+								open={archiveConfirmOpen}
+								title="Archive workspace"
+								confirmationText="Archive"
+								onConfirmed={async () => {
+									archiveConfirmOpen = false
+									await doArchiveWorkspace()
+								}}
+								onCanceled={() => (archiveConfirmOpen = false)}
+							>
+								<div class="flex flex-col gap-2">
+									<span>
+										Archiving this workspace also archives its AI sessions{affectedSessionCount > 0
+											? ` (${affectedSessionCount})`
+											: ''}. Unarchiving the workspace restores them.
+									</span>
+								</div>
+							</ConfirmationModal>
+
+							<ConfirmationModal
+								open={deleteConfirmOpen}
+								title="Delete workspace"
+								confirmationText="Delete"
+								onConfirmed={async () => {
+									deleteConfirmOpen = false
+									await doDeleteWorkspace()
+								}}
+								onCanceled={() => (deleteConfirmOpen = false)}
+							>
+								<div class="flex flex-col gap-2">
+									<span>
+										Permanently deleting this workspace also permanently deletes its AI sessions{affectedSessionCount >
+										0
+											? ` (${affectedSessionCount})`
+											: ''}. This cannot be undone.
+									</span>
+								</div>
+							</ConfirmationModal>
 						{:else if tab == 'webhook'}
 							<SettingsPageHeader
 								title="Workspace webhook"
diff --git a/frontend/src/routes/a/[...path]/+page.svelte b/frontend/src/routes/a/[...path]/+page.svelte
index 062f7ae8de..3456c6e4f8 100644
--- a/frontend/src/routes/a/[...path]/+page.svelte
+++ b/frontend/src/routes/a/[...path]/+page.svelte
@@ -3,14 +3,15 @@
 
 	import { AppService, OpenAPI, type AppWithLastVersion } from '$lib/gen'
 	import { userStore, workspaceStore } from '$lib/stores'
+	import { sendUserToast } from '$lib/toast'
 
-	import { setContext } from 'svelte'
 	import { setLicense } from '$lib/enterpriseUtils'
 
 	import { getUserExt } from '$lib/user'
-	import { sendUserToast } from '$lib/toast'
 	import { page } from '$app/state'
+	import { base } from '$lib/base'
 	import PublicApp from '$lib/components/apps/editor/PublicApp.svelte'
+	import PublicAppFrame from '$lib/components/apps/editor/PublicAppFrame.svelte'
 
 	let app: (AppWithLastVersion & { value: any }) | undefined = $state(undefined)
 	let notExists = $state(false)
@@ -44,16 +45,44 @@
 		}
 	}
 
-	let workspace: string | undefined = $state(undefined)
-	async function loadApp() {
-		const parsedCustomPath = parseCustomPath(page.params.path ?? '')
+	const parsedCustomPath = parseCustomPath(page.params.path ?? '')
 
+	// URL for the opaque viewer iframe: the custom-path URL WITHOUT the trailing
+	// JWT segment. The JWT is a viewer credential (broader and longer-lived than
+	// the scoped embed token) consumed here on the embedder side only — it must
+	// never appear in the iframe's own location, where app-authored code could
+	// read it. Captured once (not reactively): the embedder mirrors the app's
+	// hash/query back onto this page's URL, and re-deriving the src from it would
+	// reload the app on its every navigation.
+	const viewerUrl = `${base}/a/${parsedCustomPath.path}${page.url.search}${page.url.hash}`
+
+	let workspace: string | undefined = $state(undefined)
+	let refresh: (() => void) | undefined
+
+	// Embedder side: validate access (main session cookie or shared JWT) and mint
+	// a scoped embed token for the opaque iframe (WIN-2006).
+	async function fetchEmbedToken(): Promise<{ token?: string }> {
 		if (parsedCustomPath.jwt) {
-			const token = 'jwt_ext_' + parsedCustomPath.jwt
-			OpenAPI.TOKEN = token
-			setContext<{ token?: string }>('AuthToken', { token })
-			jwtError = false
+			OpenAPI.TOKEN = 'jwt_ext_' + parsedCustomPath.jwt
 		}
+		const headers: Record<string, string> = {}
+		if (typeof OpenAPI.TOKEN === 'string' && OpenAPI.TOKEN) {
+			headers['Authorization'] = `Bearer ${OpenAPI.TOKEN}`
+		}
+		const res = await fetch(
+			`${OpenAPI.BASE}/apps_u/embed_token_by_custom_path/${parsedCustomPath.path}`,
+			{ headers }
+		)
+		if (!res.ok) {
+			const err: any = new Error('Failed to fetch embed token')
+			err.status = res.status
+			throw err
+		}
+		return await res.json()
+	}
+
+	// Viewer side: load the app + user using the embed token handed to the iframe.
+	async function loadApp() {
 		try {
 			app = await AppService.getPublicAppByCustomPath({
 				customPath: parsedCustomPath.path
@@ -62,9 +91,13 @@
 			workspaceStore.set(app.workspace_id)
 			noPermission = false
 			notExists = false
+			jwtError = false
 
 			try {
 				userStore.set(await getUserExt(app.workspace_id))
+				// A JWT in the custom path that fails to resolve a user is surfaced as a
+				// toast (matches the pre-sandbox custom-path viewer) rather than silently
+				// falling through to anonymous.
 				if (!$userStore && parsedCustomPath.jwt) {
 					jwtError = true
 					sendUserToast('Could not authentify user with jwt token', true)
@@ -74,7 +107,8 @@
 			}
 		} catch (e) {
 			if (e.status == 401) {
-				noPermission = true
+				// Embed token missing/expired — ask the embedder for a fresh one.
+				refresh?.()
 			} else {
 				notExists = true
 			}
@@ -83,17 +117,25 @@
 
 	if (BROWSER) {
 		setLicense()
-		loadApp()
 	}
 </script>
 
-<PublicApp
-	{workspace}
-	{notExists}
-	{noPermission}
-	{jwtError}
-	{app}
-	onLoginSuccess={() => {
+<PublicAppFrame
+	{fetchEmbedToken}
+	{viewerUrl}
+	onViewerReady={(_token, requestTokenRefresh) => {
+		refresh = requestTokenRefresh
 		loadApp()
 	}}
-></PublicApp>
+>
+	{#snippet viewer()}
+		<PublicApp
+			{workspace}
+			{notExists}
+			{noPermission}
+			{jwtError}
+			{app}
+			onLoginSuccess={() => loadApp()}
+		></PublicApp>
+	{/snippet}
+</PublicAppFrame>
diff --git a/frontend/src/routes/app_embed/[workspace]/[...path]/+page.svelte b/frontend/src/routes/app_embed/[workspace]/[...path]/+page.svelte
new file mode 100644
index 0000000000..d0af10b433
--- /dev/null
+++ b/frontend/src/routes/app_embed/[workspace]/[...path]/+page.svelte
@@ -0,0 +1,99 @@
+<script lang="ts">
+	/*
+	 * WIN-2006: in-workspace app viewer, sandboxed. This is the private analog of
+	 * the public `/public/[workspace]/[...secret]` route — same `PublicAppFrame`
+	 * embedder/viewer + scoped-token machinery, but the app is addressed by path and
+	 * the token is minted from the logged-in member's session (cookie) via the
+	 * authenticated `apps/embed_token/p/{path}` endpoint. It lives outside `(logged)`
+	 * so the opaque (cookieless) viewer iframe can load it without the auth redirect
+	 * or the workspace chrome. `/apps/get` embeds this route in an opaque iframe.
+	 */
+	import { BROWSER } from 'esm-env'
+	import { AppService, OpenAPI } from '$lib/gen'
+	import { userStore, workspaceStore } from '$lib/stores'
+	import { setLicense } from '$lib/enterpriseUtils'
+	import { getUserExt } from '$lib/user'
+	import { page } from '$app/state'
+	import PublicApp from '$lib/components/apps/editor/PublicApp.svelte'
+	import PublicAppFrame from '$lib/components/apps/editor/PublicAppFrame.svelte'
+
+	let app: any = $state(undefined)
+	let notExists = $state(false)
+	let noPermission = $state(false)
+
+	const workspace = page.params.workspace ?? ''
+	const path = page.params.path ?? ''
+	// Forwarded by InWorkspaceAppViewer from the member-facing page's query.
+	const hideRefreshBar = page.url.searchParams.get('hideRefreshBar') === 'true'
+	let refresh: (() => void) | undefined
+
+	// Embedder side: the logged-in member's session mints a scoped embed token for
+	// the opaque iframe, isolating the in-workspace app from their full session.
+	async function fetchEmbedToken(): Promise<{ token?: string }> {
+		const headers: Record<string, string> = {}
+		if (typeof OpenAPI.TOKEN === 'string' && OpenAPI.TOKEN) {
+			headers['Authorization'] = `Bearer ${OpenAPI.TOKEN}`
+		}
+		const res = await fetch(`${OpenAPI.BASE}/w/${workspace}/apps/embed_token/p/${path}`, {
+			headers
+		})
+		if (!res.ok) {
+			const err: any = new Error('Failed to fetch embed token')
+			err.status = res.status
+			throw err
+		}
+		return await res.json()
+	}
+
+	// Viewer side: load the app + user using the embed token handed to the iframe.
+	async function loadApp() {
+		// Set the workspace store so app job operations (notably JobLoader.cancelJob,
+		// which reads $workspaceStore) target this workspace instead of an empty/stale
+		// one in the cookieless iframe.
+		workspaceStore.set(workspace)
+		try {
+			userStore.set(await getUserExt(workspace))
+		} catch (e) {
+			console.warn('Anonymous user')
+		}
+		try {
+			app = await AppService.getAppByPath({ workspace, path })
+			noPermission = false
+			notExists = false
+		} catch (e: any) {
+			if (e.status == 401) {
+				// Embed token missing/expired — ask the embedder for a fresh one.
+				refresh?.()
+			} else if (e.status == 403) {
+				noPermission = true
+			} else {
+				notExists = true
+			}
+		}
+	}
+
+	if (BROWSER) {
+		setLicense()
+	}
+</script>
+
+<PublicAppFrame
+	{fetchEmbedToken}
+	onViewerReady={(_token, requestTokenRefresh) => {
+		refresh = requestTokenRefresh
+		loadApp()
+	}}
+>
+	{#snippet viewer()}
+		<PublicApp
+			{app}
+			{workspace}
+			{notExists}
+			{noPermission}
+			jwtError={false}
+			inWorkspace
+			{hideRefreshBar}
+			onLoginSuccess={() => loadApp()}
+		></PublicApp>
+	{/snippet}
+</PublicAppFrame>
diff --git a/frontend/src/routes/apps_raw/[workspace]/[...version]/+page.js b/frontend/src/routes/apps_raw/[workspace]/[...version]/+page.js
deleted file mode 100644
index 42a8b51427..0000000000
--- a/frontend/src/routes/apps_raw/[workspace]/[...version]/+page.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function load({ params }) {
-	return {
-		stuff: { title: `Public App` }
-	}
-}
diff --git a/frontend/src/routes/apps_raw/[workspace]/[...version]/+page.svelte b/frontend/src/routes/apps_raw/[workspace]/[...version]/+page.svelte
deleted file mode 100644
index 38563cfbd9..0000000000
--- a/frontend/src/routes/apps_raw/[workspace]/[...version]/+page.svelte
+++ /dev/null
@@ -1,11 +0,0 @@
-<script lang="ts">
-	// import { page } from '$app/state'
-	// import RawAppPreview from '$lib/components/raw_apps/RawAppPreview.svelte'
-	// import { userStore } from '$lib/stores'
-</script>
-
-<!-- <RawAppPreview
-	workspace={page.params.workspace}
-	user={$userStore}
-	version={Number(page.params.version)}
-/> -->
diff --git a/frontend/src/routes/kitchen_sink/+page.svelte b/frontend/src/routes/kitchen_sink/+page.svelte
index 0e07158244..4285ee0921 100644
--- a/frontend/src/routes/kitchen_sink/+page.svelte
+++ b/frontend/src/routes/kitchen_sink/+page.svelte
@@ -4,21 +4,135 @@
 	import TabContent from '$lib/components/common/tabs/TabContent.svelte'
 	import Tabs from '$lib/components/common/tabs/Tabs.svelte'
 	import DarkModeToggle from '$lib/components/sidebar/DarkModeToggle.svelte'
+	import GfmMarkdown from '$lib/components/GfmMarkdown.svelte'
+	import AssistantMessage from '$lib/components/copilot/chat/AssistantMessage.svelte'
+	import type { DisplayMessage } from '$lib/components/copilot/chat/shared'
+	import DraggableTabs, { type TabItem } from '$lib/components/common/tabs/DraggableTabs.svelte'
 	import { Globe } from 'lucide-svelte'
 
 	let tab = $state('button')
+
+	// Enough tabs to overflow a narrow strip so the shared ScrollableX hover
+	// scrollbar is exercised: drag to reorder, hover to reveal the 4px thumb.
+	let draggableTabs = $state<TabItem[]>(
+		Array.from({ length: 14 }, (_, i) => ({ id: `t${i}`, label: `Preview tab ${i + 1}` }))
+	)
+	let activeDraggableTab = $state('t0')
+
+	const sampleMarkdown = `# Heading 1
+
+## Heading 2
+
+Body text with **bold**, *italic*, a [link](https://windmill.dev), and \`inline code\` that must stay readable in both themes.
+
+> A block quote should be legible too.
+
+- First bullet
+- Second bullet with \`code\`
+
+1. Ordered one
+2. Ordered two
+
+\`\`\`ts
+const block = 'code block'
+console.log(block)
+\`\`\`
+
+An unlabeled fence should render plain (no forced syntax colors):
+
+\`\`\`
+just some plain text
+no language, no coloring
+\`\`\`
+
+Raw sanitized HTML (via rehypeRaw) must keep its content, not render empty:
+
+<pre>raw pre content stays visible</pre>
+
+| Column A | Column B |
+| -------- | -------- |
+| one      | two      |
+| three    | four     |
+
+---
+`
 	let dropdownItems = [
 		{
 			label: 'Lorem ipsum',
 			onClick: () => {}
 		}
 	]
+
+	// Mirrors how the AI chat renders assistant answers: markdown flows through
+	// AssistantMessage, and fenced code blocks go through CodeDisplay →
+	// HighlightCode. Exercise several languages + prose so the code-block styling
+	// can be tuned against the real render path, not an approximation.
+	const chatSampleContent = `Here's how you'd wire up the trigger. First, some prose with \`inline code\`, a [link](https://windmill.dev), and **bold** text so we can see how code sits next to surrounding content.
+
+\`\`\`python
+def main(name: str = "world"):
+    # a short python snippet
+    greeting = f"hello, {name}!"
+    print(greeting)
+    return {"greeting": greeting}
+\`\`\`
+
+A one-liner in the middle of a sentence like \`SELECT * FROM users\` should stay inline. Now a TypeScript block:
+
+\`\`\`ts
+export async function main(count: number) {
+  const rows = await Promise.all(
+    Array.from({ length: count }, (_, i) => fetchRow(i))
+  )
+  return rows.filter((r) => r.active).map((r) => r.id)
+}
+\`\`\`
+
+A block with a very long line to check horizontal overflow behaviour:
+
+\`\`\`bash
+curl -sSL "https://app.windmill.dev/api/w/demo/jobs/run_wait_result/p/u/admin/very_long_script_path?token=abcdef0123456789&include_header=Authorization" | jq '.result.value'
+\`\`\`
+
+Some SQL:
+
+\`\`\`sql
+select id, name, created_at
+from users
+where active = true
+order by created_at desc
+limit 10;
+\`\`\`
+
+And a bulleted list where an item carries \`code\`:
+
+- First item with \`some_var\`
+- Second item
+- Third item
+
+\`\`\`rust
+fn main() {
+    let items = vec![1, 2, 3];
+    let sum: i32 = items.iter().sum();
+    println!("sum = {sum}");
+}
+\`\`\`
+
+That's the full round-trip.`
+
+	const chatMessage: DisplayMessage = {
+		role: 'assistant',
+		content: chatSampleContent
+	}
 </script>
 
 <DarkModeToggle forcedDarkMode={false} />
 
 <Tabs bind:selected={tab}>
 	<Tab value="button" label="Buttons" />
+	<Tab value="markdown" label="Markdown" />
+	<Tab value="chat" label="AI Chat" />
+	<Tab value="scrollbar" label="Scrollbar" />
 
 	{#snippet content()}
 		<TabContent value="button" class="p-4 flex gap-4 flex-col ">
@@ -72,5 +186,31 @@
 				<Button variant="default" {dropdownItems}>Lorem</Button>
 			</div>
 		</TabContent>
+		<TabContent value="markdown" class="p-4">
+			<GfmMarkdown md={sampleMarkdown} />
+		</TabContent>
+		<TabContent value="chat" class="p-4">
+			<div class="text-xs text-tertiary mb-3">
+				Rendered through the real chat path (<code>AssistantMessage</code> →
+				<code>CodeDisplay</code> → <code>HighlightCode</code>), constrained to the chat panel width.
+			</div>
+			<div class="border border-border-light rounded-lg p-3 bg-surface" style="max-width: 420px;">
+				<AssistantMessage message={chatMessage} />
+			</div>
+		</TabContent>
+		<TabContent value="scrollbar" class="p-4">
+			<div class="text-xs text-tertiary mb-3">
+				DraggableTabs (uses the shared <code>ScrollableX</code>, 4px bar): hover to reveal the
+				thumb, drag to reorder.
+			</div>
+			<div class="border border-border-light rounded-md" style="max-width: 420px;">
+				<DraggableTabs
+					tabs={draggableTabs}
+					activeId={activeDraggableTab}
+					onSelect={(id) => (activeDraggableTab = id)}
+					onReorder={(next) => (draggableTabs = next)}
+				/>
+			</div>
+		</TabContent>
 	{/snippet}
 </Tabs>
diff --git a/frontend/src/routes/kitchen_sink/deploy_animation/+page.svelte b/frontend/src/routes/kitchen_sink/deploy_animation/+page.svelte
new file mode 100644
index 0000000000..6cd7e7197f
--- /dev/null
+++ b/frontend/src/routes/kitchen_sink/deploy_animation/+page.svelte
@@ -0,0 +1,194 @@
+<script lang="ts">
+	import WorkspaceDiffDrawer from '$lib/components/sessions/WorkspaceDiffDrawer.svelte'
+	import { Button } from '$lib/components/common'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import DarkModeToggle from '$lib/components/sidebar/DarkModeToggle.svelte'
+	import type { DeployItem } from '$lib/components/sessions/sessionDeployModel'
+	import type {
+		DeploymentStatus,
+		SessionDeployModel
+	} from '$lib/components/sessions/sessionDeployModel.svelte'
+
+	// Playground for the session Edits drawer deploy animation: the REAL
+	// WorkspaceDiffDrawer driven by a mock model with adjustable latency,
+	// outcome, data-flip lag, and content size — no backend involved.
+
+	let deployMs = $state(800)
+	let flipDelayMs = $state(300)
+	let holdMs = $state(1200)
+	let diffLines = $state(25)
+	let itemCount = $state(3)
+	let failDeploys = $state(false)
+	let permOk = $state(true)
+	let staleDrafts = $state(false)
+
+	function makeItem(i: number, done = false): DeployItem {
+		return {
+			key: `script:u/dev/demo_${i}`,
+			deployKind: 'script',
+			draftKind: 'script',
+			path: `u/dev/demo_${i}`,
+			displayPath: `u/dev/demo_${i}`,
+			summary: `Demo script ${i}`,
+			done,
+			hasDraft: !done,
+			draftOnly: i % 2 === 0,
+			draftUsers: undefined,
+			mine: true,
+			canWrite: true,
+			legacy: false,
+			rawApp: false
+		}
+	}
+
+	let items = $state<DeployItem[]>([])
+	let statuses = $state<Record<string, DeploymentStatus>>({})
+	let deploying = $state(false)
+
+	function reset() {
+		statuses = {}
+		items = [...Array.from({ length: itemCount }, (_, i) => makeItem(i)), makeItem(99, true)]
+	}
+	reset()
+
+	const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms))
+
+	function genContent(seed: string, lines: number, mutated: boolean): string {
+		const out = [`// ${seed}`, 'export async function main() {']
+		for (let i = 0; i < lines; i++) {
+			out.push(
+				mutated && i % 4 === 0
+					? `\tconst v${i} = ${i} * 2 // changed by the chat`
+					: `\tconst v${i} = ${i}`
+			)
+		}
+		if (mutated) out.push('\tconst added = "new trailing logic"')
+		out.push(`\treturn v0`, '}')
+		return out.join('\n')
+	}
+
+	function fakeScript(content: string) {
+		return { summary: 'Demo', description: '', content, language: 'bun', schema: {} }
+	}
+
+	function setStatus(key: string, s: DeploymentStatus | undefined) {
+		const next = { ...statuses }
+		if (s) next[key] = s
+		else delete next[key]
+		statuses = next
+	}
+
+	const model: SessionDeployModel = {
+		get items() {
+			return items
+		},
+		get loading() {
+			return false
+		},
+		get error() {
+			return undefined
+		},
+		load() {},
+		async loadDiffValues(item: DeployItem) {
+			await sleep(250)
+			const after = fakeScript(genContent(item.key, diffLines, true))
+			if (item.done) return { before: after, after }
+			return {
+				before: item.draftOnly ? undefined : fakeScript(genContent(item.key, diffLines, false)),
+				after
+			}
+		},
+		get deploying() {
+			return deploying
+		},
+		statusOf(key: string) {
+			return statuses[key]
+		},
+		staleOf(key: string) {
+			// Only non-draft_only rows carry a base pointer in production.
+			return staleDrafts && !items.find((it) => it.key === key)?.draftOnly
+		},
+		get deployPermission() {
+			return permOk
+				? { ok: true as const }
+				: { ok: false as const, reason: 'Deploy disabled by the playground toggle' }
+		},
+		async deployRow(item: DeployItem) {
+			setStatus(item.key, { status: 'loading' })
+			deploying = true
+			await sleep(deployMs)
+			deploying = false
+			if (failDeploys) {
+				setStatus(item.key, { status: 'failed', error: 'Simulated failure from the playground' })
+				return false
+			}
+			setStatus(item.key, undefined)
+			// Mimic the production lag between deploy success and the draft
+			// refetch flipping the item to done.
+			setTimeout(() => {
+				items = items.map((it) =>
+					it.key === item.key ? { ...it, done: true, hasDraft: false, draftOnly: false } : it
+				)
+			}, flipDelayMs)
+			return true
+		},
+		async discardRow(item: DeployItem) {
+			await sleep(deployMs)
+			items = items.filter((it) => it.key !== item.key)
+		}
+	}
+
+	let drawer: WorkspaceDiffDrawer | undefined = $state(undefined)
+</script>
+
+<div class="p-8 flex flex-col gap-6 max-w-2xl">
+	<div class="flex items-center justify-between">
+		<h1 class="text-lg font-semibold text-primary">Deploy animation playground</h1>
+		<DarkModeToggle forcedDarkMode={false} />
+	</div>
+	<p class="text-xs text-secondary">
+		Drives the real <code>WorkspaceDiffDrawer</code> with a mock deploy model. Tune the knobs, open the
+		drawer, hit Deploy, feel the transition. Reset re-arms the drafts.
+	</p>
+
+	<div class="grid grid-cols-2 gap-x-8 gap-y-4 text-xs text-primary">
+		<label class="flex flex-col gap-1">
+			<span>Deploy latency: <b>{deployMs}ms</b> (spinner phase)</span>
+			<input type="range" min="0" max="5000" step="100" bind:value={deployMs} />
+		</label>
+		<label class="flex flex-col gap-1">
+			<span>Success hold: <b>{holdMs}ms</b> (green check beat)</span>
+			<input type="range" min="0" max="4000" step="100" bind:value={holdMs} />
+		</label>
+		<label class="flex flex-col gap-1">
+			<span>Data flip lag: <b>{flipDelayMs}ms</b> (mock draft refetch)</span>
+			<input type="range" min="0" max="3000" step="100" bind:value={flipDelayMs} />
+		</label>
+		<label class="flex flex-col gap-1">
+			<span>Diff size: <b>{diffLines}</b> lines</span>
+			<input type="range" min="3" max="200" step="1" bind:value={diffLines} />
+		</label>
+		<label class="flex flex-col gap-1">
+			<span>Items: <b>{itemCount}</b> drafts (+1 deployed)</span>
+			<input type="range" min="1" max="10" step="1" bind:value={itemCount} onchange={reset} />
+		</label>
+		<div class="flex flex-col gap-2 justify-center">
+			<Toggle bind:checked={failDeploys} options={{ right: 'Fail deploys' }} size="xs" />
+			<Toggle bind:checked={permOk} options={{ right: 'Deploy permission' }} size="xs" />
+			<Toggle bind:checked={staleDrafts} options={{ right: 'Stale drafts' }} size="xs" />
+		</div>
+	</div>
+
+	<div class="flex items-center gap-2">
+		<Button variant="accent" unifiedSize="sm" onclick={() => drawer?.open()}>Open drawer</Button>
+		<Button variant="default" unifiedSize="sm" onclick={reset}>Reset items</Button>
+	</div>
+</div>
+
+<WorkspaceDiffDrawer
+	bind:this={drawer}
+	{model}
+	title="Deploy animation playground"
+	workspaceLabel="playground-workspace"
+	successHoldMs={holdMs}
+/>
diff --git a/frontend/src/routes/pipeline_dev/+page.svelte b/frontend/src/routes/pipeline_dev/+page.svelte
new file mode 100644
index 0000000000..0f2e3d0607
--- /dev/null
+++ b/frontend/src/routes/pipeline_dev/+page.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+	import PipelineDevView from '$lib/components/assets/AssetGraph/PipelineDevView.svelte'
+</script>
+
+<div class="h-screen w-screen">
+	<PipelineDevView />
+</div>
diff --git a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
index c661aa48c6..089b95c97d 100644
--- a/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
+++ b/frontend/src/routes/public/[workspace]/[...secret]/+page.svelte
@@ -4,21 +4,20 @@
 	import { AppService, OpenAPI, type AppWithLastVersion } from '$lib/gen'
 	import { userStore } from '$lib/stores'
 
-	import { setContext } from 'svelte'
 	import { setLicense } from '$lib/enterpriseUtils'
 
 	import { getUserExt } from '$lib/user'
-	import { sendUserToast } from '$lib/toast'
 	import { page } from '$app/state'
+	import { base } from '$lib/base'
 	import PublicApp from '$lib/components/apps/editor/PublicApp.svelte'
+	import PublicAppFrame from '$lib/components/apps/editor/PublicAppFrame.svelte'
 
 	let app: (AppWithLastVersion & { value: any }) | undefined = $state(undefined)
 	let notExists = $state(false)
 	let noPermission = $state(false)
-
 	let jwtError = $state(false)
 
-	function parseSecret(secret: string): { secret: string; jwt: string } {
+	function parseSecret(secret: string): { secret: string; jwt: string | undefined } {
 		const parts = secret.split('/')
 		return {
 			secret: parts[0],
@@ -27,18 +26,59 @@
 	}
 
 	const parsedSecret = parseSecret(page.params.secret ?? '')
+	const workspace = page.params.workspace ?? ''
 
+	// URL for the opaque viewer iframe: the share URL WITHOUT the trailing JWT
+	// segment. The JWT is a viewer credential (broader and longer-lived than the
+	// scoped embed token) consumed here on the embedder side only — it must never
+	// appear in the iframe's own location, where app-authored code could read it.
+	// Captured once (not reactively): the embedder mirrors the app's hash/query
+	// back onto this page's URL, and re-deriving the src from it would reload the
+	// app on its every navigation.
+	const viewerUrl = `${base}/public/${workspace}/${parsedSecret.secret}${page.url.search}${page.url.hash}`
+
+	let refresh: (() => void) | undefined
+
+	// Embedder side: validate access (using the main session cookie or the shared
+	// JWT) and mint a scoped embed token for the opaque iframe (WIN-2006).
+	async function fetchEmbedToken(): Promise<{ token?: string }> {
+		if (parsedSecret.jwt) {
+			OpenAPI.TOKEN = 'jwt_ext_' + parsedSecret.jwt
+		}
+		const headers: Record<string, string> = {}
+		if (typeof OpenAPI.TOKEN === 'string' && OpenAPI.TOKEN) {
+			headers['Authorization'] = `Bearer ${OpenAPI.TOKEN}`
+		}
+		const res = await fetch(
+			`${OpenAPI.BASE}/w/${workspace}/apps_u/embed_token/${parsedSecret.secret}`,
+			{ headers }
+		)
+		if (!res.ok) {
+			const err: any = new Error('Failed to fetch embed token')
+			err.status = res.status
+			throw err
+		}
+		return await res.json()
+	}
+
+	// Viewer side: load the app + user using the embed token handed to the iframe.
 	async function loadApp() {
+		try {
+			userStore.set(await getUserExt(workspace))
+		} catch (e) {
+			console.warn('Anonymous user')
+		}
 		try {
 			app = await AppService.getPublicAppBySecret({
-				workspace: page.params.workspace ?? '',
+				workspace,
 				path: parsedSecret.secret
 			})
 			noPermission = false
 			notExists = false
 		} catch (e) {
 			if (e.status == 401) {
-				noPermission = true
+				// Embed token missing/expired — ask the embedder for a fresh one.
+				refresh?.()
 			} else {
 				notExists = true
 			}
@@ -47,42 +87,25 @@
 
 	if (BROWSER) {
 		setLicense()
-		loadAll()
-	}
-
-	function loadAll() {
-		console.log('loadAll')
-		loadUser().then(() => {
-			loadApp()
-		})
-	}
-
-	async function loadUser() {
-		if (parsedSecret.jwt) {
-			const token = 'jwt_ext_' + parsedSecret.jwt
-			OpenAPI.TOKEN = token
-			setContext<{ token?: string }>('AuthToken', { token })
-			jwtError = false
-		}
-		try {
-			userStore.set(await getUserExt(page.params.workspace ?? ''))
-			if (!$userStore && parsedSecret.jwt) {
-				jwtError = true
-				sendUserToast('Could not authentify user with jwt token', true)
-			}
-		} catch (e) {
-			console.warn('Anonymous user')
-		}
 	}
 </script>
 
-<PublicApp
-	{app}
-	workspace={page.params.workspace}
-	{notExists}
-	{noPermission}
-	{jwtError}
-	onLoginSuccess={() => {
-		loadAll()
+<PublicAppFrame
+	{fetchEmbedToken}
+	{viewerUrl}
+	onViewerReady={(_token, requestTokenRefresh) => {
+		refresh = requestTokenRefresh
+		loadApp()
 	}}
-></PublicApp>
+>
+	{#snippet viewer()}
+		<PublicApp
+			{app}
+			{workspace}
+			{notExists}
+			{noPermission}
+			{jwtError}
+			onLoginSuccess={() => loadApp()}
+		></PublicApp>
+	{/snippet}
+</PublicAppFrame>
diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs
index bae0531c17..9bed325d03 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.cjs
@@ -295,7 +295,8 @@ const config = {
 				600: '#d97706',
 				700: '#b45309',
 				800: '#92400e',
-				900: '#78350f'
+				900: '#78350f',
+				950: '#451a03'
 			},
 			emerald: {
 				50: '#ecfdf5',
@@ -455,6 +456,49 @@ const config = {
 			]
 		},
 		extend: {
+			// Tailwind Typography hardcodes every `prose` color (body, headings,
+			// borders, code, ...) to fixed gray shades. Our `.prose` usages mostly
+			// render without `dark:prose-invert`, so in dark mode those light-mode
+			// grays stay put and text/borders/code render near-black on a dark
+			// surface. Point the whole palette at our theme tokens — which already
+			// flip with the active theme — for BOTH the default and inverted sets, so
+			// bare `.prose` and `dark:prose-invert` usages both track the theme.
+			typography: {
+				DEFAULT: {
+					css: {
+						'--tw-prose-body': 'rgb(var(--color-text-secondary))',
+						'--tw-prose-headings': 'rgb(var(--color-text-primary))',
+						'--tw-prose-lead': 'rgb(var(--color-text-secondary))',
+						'--tw-prose-bold': 'rgb(var(--color-text-primary))',
+						'--tw-prose-counters': 'rgb(var(--color-text-tertiary))',
+						'--tw-prose-bullets': 'rgb(var(--color-text-tertiary))',
+						'--tw-prose-hr': 'rgb(var(--color-border-light))',
+						'--tw-prose-quotes': 'rgb(var(--color-text-secondary))',
+						'--tw-prose-quote-borders': 'rgb(var(--color-border-light))',
+						'--tw-prose-captions': 'rgb(var(--color-text-tertiary))',
+						'--tw-prose-code': 'rgb(var(--color-text-primary))',
+						'--tw-prose-pre-code': 'rgb(var(--color-text-primary))',
+						'--tw-prose-pre-bg': 'rgb(var(--color-surface-secondary))',
+						'--tw-prose-th-borders': 'rgb(var(--color-border-light))',
+						'--tw-prose-td-borders': 'rgb(var(--color-border-light))',
+						'--tw-prose-invert-body': 'rgb(var(--color-text-secondary))',
+						'--tw-prose-invert-headings': 'rgb(var(--color-text-primary))',
+						'--tw-prose-invert-lead': 'rgb(var(--color-text-secondary))',
+						'--tw-prose-invert-bold': 'rgb(var(--color-text-primary))',
+						'--tw-prose-invert-counters': 'rgb(var(--color-text-tertiary))',
+						'--tw-prose-invert-bullets': 'rgb(var(--color-text-tertiary))',
+						'--tw-prose-invert-hr': 'rgb(var(--color-border-light))',
+						'--tw-prose-invert-quotes': 'rgb(var(--color-text-secondary))',
+						'--tw-prose-invert-quote-borders': 'rgb(var(--color-border-light))',
+						'--tw-prose-invert-captions': 'rgb(var(--color-text-tertiary))',
+						'--tw-prose-invert-code': 'rgb(var(--color-text-primary))',
+						'--tw-prose-invert-pre-code': 'rgb(var(--color-text-primary))',
+						'--tw-prose-invert-pre-bg': 'rgb(var(--color-surface-secondary))',
+						'--tw-prose-invert-th-borders': 'rgb(var(--color-border-light))',
+						'--tw-prose-invert-td-borders': 'rgb(var(--color-border-light))'
+					}
+				}
+			},
 			border: {
 				color: 'red'
 			},
@@ -641,6 +685,16 @@ const config = {
 				".dark [type='checkbox']:checked": {
 					backgroundImage: `url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")`
 				},
+				// @tailwindcss/forms draws the indeterminate dash white-on-currentColor,
+				// but the checkbox theme above keeps a white/dark background — so restyle
+				// the dash to match the checkmark's fill in each mode.
+				"[type='checkbox']:indeterminate": {
+					backgroundColor: 'transparent',
+					backgroundImage: `url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='black' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M4 8a1 1 0 011-1h6a1 1 0 110 2H5a1 1 0 01-1-1z'/%3e%3c/svg%3e")`
+				},
+				".dark [type='checkbox']:indeterminate": {
+					backgroundImage: `url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M4 8a1 1 0 011-1h6a1 1 0 110 2H5a1 1 0 01-1-1z'/%3e%3c/svg%3e")`
+				},
 				'input:not(.windmillapp):not(.no-default-style),input[type="text"]:not(.windmillapp):not(.no-default-style),input[type="email"]:not(.windmillapp):not(.no-default-style),input[type="url"]:not(.windmillapp):not(.no-default-style),input[type="password"]:not(.windmillapp):not(.no-default-style),input[type="number"]:not(.windmillapp):not(.no-default-style),input[type="date"]:not(.windmillapp):not(.no-default-style),input[type="datetime-local"]:not(.windmillapp):not(.no-default-style),input[type="month"]:not(.windmillapp):not(.no-default-style),input[type="search"]:not(.windmillapp):not(.no-default-style),input[type="tel"]:not(.windmillapp):not(.no-default-style),input[type="time"]:not(.windmillapp):not(.no-default-style),input[type="week"]:not(.windmillapp):not(.no-default-style),textarea:not(.windmillapp):not(.no-default-style):not(.monaco-mouse-cursor-text),select:not(.windmillapp):not(.no-default-style)':
 					{
 						display: 'block',
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 989fc5cbe2..ac927801dc 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -1,5 +1,5 @@
 import { sveltekit } from '@sveltejs/kit/vite'
-import { readFileSync } from 'fs'
+import { existsSync, readFileSync } from 'fs'
 import { fileURLToPath } from 'url'
 import mkcert from 'vite-plugin-mkcert'
 
@@ -7,6 +7,15 @@ const file = fileURLToPath(new URL('package.json', import.meta.url))
 const json = readFileSync(file, 'utf8')
 const version = JSON.parse(json)
 
+// The postinstall downloads the pinned UI Builder artifact into static/ui_builder,
+// which SvelteKit serves at /ui_builder. Serve that directly; only proxy to a
+// live UI Builder dev server on :4000 when the bundle is absent (mirrors the
+// backend's static-vs-:4000 fallback). Delete static/ui_builder to develop the
+// builder against :4000.
+const uiBuilderStaticPresent = existsSync(
+	fileURLToPath(new URL('static/ui_builder/app-preview.html', import.meta.url))
+)
+
 const remoteUrl =
 	process.env.REMOTE ??
 	(process.env.BACKEND_PORT
@@ -84,15 +93,19 @@ const config = {
 				changeOrigin: true,
 				ws: true
 			},
-			'^/ui_builder/.*': {
-				target: 'http://localhost:4000',
-				changeOrigin: true,
-				headers: {
-					'Cross-Origin-Opener-Policy': 'same-origin',
-					'Cross-Origin-Embedder-Policy': 'require-corp',
-					'Cross-Origin-Resource-Policy': 'cross-origin'
-				}
-			}
+			...(uiBuilderStaticPresent
+				? {}
+				: {
+						'^/ui_builder/.*': {
+							target: 'http://localhost:4000',
+							changeOrigin: true,
+							headers: {
+								'Cross-Origin-Opener-Policy': 'same-origin',
+								'Cross-Origin-Embedder-Policy': 'require-corp',
+								'Cross-Origin-Resource-Policy': 'cross-origin'
+							}
+						}
+					})
 		}
 	},
 	preview: { port: 3001 },
diff --git a/integration_tests/ai_agent_tests/conftest.py b/integration_tests/ai_agent_tests/conftest.py
index 681304e614..5e1e2cbf9f 100644
--- a/integration_tests/ai_agent_tests/conftest.py
+++ b/integration_tests/ai_agent_tests/conftest.py
@@ -18,6 +18,80 @@ load_dotenv(Path(__file__).parent / ".env")
 TEST_IMAGE_PATH = Path(__file__).parent / "test_image.webp"
 TEST_IMAGE_S3_KEY = "test_images/test_image.webp"
 
+# Env vars each provider needs before its cases can run. Cases for a provider
+# whose keys are absent are skipped instead of failed, so a CI run (or a local
+# dev) can exercise only the providers it has credentials for.
+PROVIDER_ENV_REQUIREMENTS: dict[str, list[str]] = {
+    "openai": ["OPENAI_API_KEY"],
+    "azure_openai": ["AZURE_OPENAI_API_KEY", "AZURE_OPENAI_BASE_URL"],
+    "anthropic": ["ANTHROPIC_API_KEY"],
+    "google_ai": ["GOOGLE_AI_API_KEY"],
+    "openrouter": ["OPENROUTER_API_KEY"],
+    "bedrock": ["BEDROCK_API_KEY"],
+    "bedrock_api_key": ["BEDROCK_API_KEY"],
+    "bedrock_iam": ["BEDROCK_IAM_ACCESS_KEY_ID", "BEDROCK_IAM_SECRET_ACCESS_KEY"],
+    "bedrock_iam_session": [
+        "BEDROCK_SESSION_ACCESS_KEY_ID",
+        "BEDROCK_SESSION_SECRET_ACCESS_KEY",
+        "BEDROCK_SESSION_TOKEN",
+    ],
+    "bedrock_env": ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY"],
+}
+
+
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "requires_provider(provider): skip test when the provider's credentials are absent",
+    )
+
+
+def _provider_name_from_item(item) -> str | None:
+    callspec = getattr(item, "callspec", None)
+    if callspec is None:
+        marker = item.get_closest_marker("requires_provider")
+        if marker is None:
+            return None
+        provider = marker.args[0] if marker.args else marker.kwargs.get("provider")
+    else:
+        provider = callspec.params.get("provider_config")
+
+    if isinstance(provider, str):
+        return provider
+    if isinstance(provider, dict) and isinstance(provider.get("name"), str):
+        return provider["name"]
+    return None
+
+
+def _provider_skip_reason(provider_name: str) -> str | None:
+    required = PROVIDER_ENV_REQUIREMENTS.get(provider_name, [])
+    missing = [name for name in required if not os.environ.get(name)]
+    if missing:
+        return f"{provider_name}: missing {', '.join(missing)}"
+    return None
+
+
+def pytest_collection_modifyitems(config, items):
+    for item in items:
+        provider_name = _provider_name_from_item(item)
+        if provider_name is None:
+            continue
+
+        reason = _provider_skip_reason(provider_name)
+        if reason is not None:
+            item.add_marker(pytest.mark.skip(reason=reason))
+
+
+@pytest.fixture(autouse=True)
+def skip_provider_without_credentials(request):
+    """Skip dynamic provider cases when that provider's keys are not set."""
+    provider_name = _provider_name_from_item(request.node)
+    if provider_name is None:
+        return
+    reason = _provider_skip_reason(provider_name)
+    if reason is not None:
+        pytest.skip(reason)
+
 
 class AIAgentTestClient:
     """HTTP client for testing AI agents via the preview_flow endpoint."""
diff --git a/integration_tests/ai_agent_tests/test_completion_params.py b/integration_tests/ai_agent_tests/test_completion_params.py
index c937c540a6..af53ce4ce0 100644
--- a/integration_tests/ai_agent_tests/test_completion_params.py
+++ b/integration_tests/ai_agent_tests/test_completion_params.py
@@ -5,7 +5,7 @@ Tests that AI agents correctly handle temperature and max_completion_tokens:
 - Default parameters (undefined)
 - Low temperature (0.0 - deterministic)
 - High temperature (0.9 - more random)
-- Low max_completion_tokens (10 - short response)
+- Low max_completion_tokens (16 - short response; OpenAI's minimum)
 - High max_completion_tokens (4096 - longer response allowed)
 - Combined parameters
 """
@@ -132,14 +132,15 @@ class TestCompletionParams:
         provider_config,
     ):
         """
-        Test with max_completion_tokens=10 (short response).
-        The response should be truncated or very short.
+        Test with a low max_completion_tokens (16 — short response).
+        The response should be truncated or very short. 16 is OpenAI's minimum
+        for max_output_tokens; lower values (e.g. 10) are rejected with a 400.
         """
         flow_value = create_ai_agent_flow(
             provider_input_transform=provider_config["input_transform"],
             system_prompt="You are a helpful assistant.",
             output_type="text",
-            max_completion_tokens=10,
+            max_completion_tokens=16,
         )
 
         result = client.run_preview_flow(
@@ -153,7 +154,7 @@ class TestCompletionParams:
         result_str = str(result)
         assert len(result_str) > 0, f"Expected non-empty result: {result}"
 
-        print(f"Low max_tokens (10) result from {provider_config['name']}: {result}")
+        print(f"Low max_tokens (16) result from {provider_config['name']}: {result}")
 
     @pytest.mark.parametrize(
         "provider_config",
diff --git a/integration_tests/ai_agent_tests/test_tool_calling.py b/integration_tests/ai_agent_tests/test_tool_calling.py
index 7ac559250a..c80158fd3a 100644
--- a/integration_tests/ai_agent_tests/test_tool_calling.py
+++ b/integration_tests/ai_agent_tests/test_tool_calling.py
@@ -119,6 +119,7 @@ class TestToolCalling:
         assert "23" in result_str, f"Expected '23' in result: {result}"
         print(f"Workspace script tool result from {provider_config['name']}: {result}")
 
+    @pytest.mark.requires_provider("google_ai")
     def test_nested_ai_agent_tool_with_gemini_3(
         self,
         client: AIAgentTestClient,
diff --git a/lsp/Pipfile b/lsp/Pipfile
index e3c213dd00..62b4fb3a18 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.733.1"
+wmill = ">=1.753.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index bd3250d838..25019ca61f 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: '3.0.3'
 
 info:
-  version: 1.733.1
+  version: 1.753.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
@@ -452,6 +452,7 @@ components:
       enum:
         - openai
         - azure_openai
+        - azure_foundry
         - anthropic
         - mistral
         - deepseek
@@ -474,6 +475,9 @@ components:
         model:
           type: string
           description: Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')
+        reasoning_effort:
+          type: string
+          description: Provider-native reasoning effort token (e.g. 'low', 'high', 'none') for models that support extended thinking. Optional; unset leaves the provider default.
       required:
         - kind
         - resource
@@ -1027,7 +1031,7 @@ components:
                 - $ref: '#/components/schemas/InputTransform'
               description: |
                 Boolean. If true, stream the AI response incrementally.
-                Streaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result
+                Streaming events include: token_delta, reasoning_token_delta, tool_call, tool_call_arguments, tool_execution, tool_result
             memory:
               $ref: '#/components/schemas/MemoryTransform'
             output_schema:
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 39e214fca6..e76ad1a97f 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.733.1'
+    ModuleVersion     = '1.753.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/powershell-client/WindmillClient/WindmillClient.psm1 b/powershell-client/WindmillClient/WindmillClient.psm1
index 9f0aca4b1a..f2d241ddc7 100644
--- a/powershell-client/WindmillClient/WindmillClient.psm1
+++ b/powershell-client/WindmillClient/WindmillClient.psm1
@@ -258,14 +258,15 @@ function Invoke-WindmillScript {
         [string] $Hash = $null,
         [Hashtable] $Arguments = @{},
         [boolean] $AssertResultIsNotNull = $true,
-        [int] $Timeout = $null
+        [int] $Timeout = $null,
+        [string] $Tag = $null
     )
 
     if (-not $script:WindmillConnection) {
         throw "Windmill connection not established. Run Connect-Windmill first."
     }
 
-    $jobId = Start-WindmillScript -Path $Path -Hash $Hash -Arguments $Arguments
+    $jobId = Start-WindmillScript -Path $Path -Hash $Hash -Arguments $Arguments -Tag $Tag
     $until = if ($Timeout) { (Get-Date).AddSeconds($Timeout) } else { [DateTime]::MaxValue }
     return $script:WindmillConnection.WaitJob($jobId, $until, $AssertResultIsNotNull)
 }
@@ -279,14 +280,15 @@ function Start-WindmillScript {
         [string] $Path = $null,
         [string] $Hash = $null,
         [Hashtable] $Arguments = @{},
-        [int] $ScheduledInSecs = $null
+        [int] $ScheduledInSecs = $null,
+        [string] $Tag = $null
     )
 
     if (-not $script:WindmillConnection) {
         throw "Windmill connection not established. Run Connect-Windmill first."
     }
 
-    return $script:WindmillConnection.RunScriptAsync($Path, $Hash, $Arguments, $ScheduledInSecs)
+    return $script:WindmillConnection.RunScriptAsync($Path, $Hash, $Arguments, $ScheduledInSecs, $Tag)
 }
 
 <#
@@ -297,14 +299,15 @@ function Start-WindmillFlow {
     param(
         [string] $Path = $null,
         [Hashtable] $Arguments = @{},
-        [int] $ScheduledInSecs = $null
+        [int] $ScheduledInSecs = $null,
+        [string] $Tag = $null
     )
 
     if (-not $script:WindmillConnection) {
         throw "Windmill connection not established. Run Connect-Windmill first."
     }
 
-    return $script:WindmillConnection.RunFlowAsync($Path, $Arguments, $ScheduledInSecs)
+    return $script:WindmillConnection.RunFlowAsync($Path, $Arguments, $ScheduledInSecs, $Tag)
 }
 
 <#
@@ -596,7 +599,13 @@ class Windmill {
         return $result
     }
 
+    # Preserve the original 4-arg arity (PowerShell class dispatch is by exact
+    # argument count, so existing direct callers would otherwise break).
     [PSCustomObject] RunScriptAsync([string] $Path, [string] $Hash, [Hashtable] $Arguments, [int] $ScheduledInSecs) {
+        return $this.RunScriptAsync($Path, $Hash, $Arguments, $ScheduledInSecs, $null)
+    }
+
+    [PSCustomObject] RunScriptAsync([string] $Path, [string] $Hash, [Hashtable] $Arguments, [int] $ScheduledInSecs, [string] $Tag) {
         $params = @{}
 
         if ($Path -and $Hash) {
@@ -607,6 +616,10 @@ class Windmill {
             $params["scheduled_in_secs"] = $ScheduledInSecs
         }
 
+        if ($Tag) {
+            $params["tag"] = $Tag
+        }
+
         if ($env:WM_JOB_ID) {
             $params["parent_job"] = $env:WM_JOB_ID
         }
@@ -631,13 +644,23 @@ class Windmill {
         return $this.Post($endpoint, $Arguments, $true).Content
     }
 
+    # Preserve the original 3-arg arity (PowerShell class dispatch is by exact
+    # argument count, so existing direct callers would otherwise break).
     [string] RunFlowAsync([string] $Path, [Hashtable] $Arguments, [int] $ScheduledInSecs) {
+        return $this.RunFlowAsync($Path, $Arguments, $ScheduledInSecs, $null)
+    }
+
+    [string] RunFlowAsync([string] $Path, [Hashtable] $Arguments, [int] $ScheduledInSecs, [string] $Tag) {
         $params = @{}
 
         if ($ScheduledInSecs -ne $null) {
             $params["scheduled_in_secs"] = $ScheduledInSecs
         }
 
+        if ($Tag) {
+            $params["tag"] = $Tag
+        }
+
         # TODO: Figure out why this fails when we set parent_job (at least for HN Discord Feed)
         if ($env:WM_JOB_ID) {
             $params["parent_job"] = $env:WM_JOB_ID
diff --git a/python-client/tests/wmill_client_test.py b/python-client/tests/wmill_client_test.py
index 3309e1ab5f..6df80919cf 100644
--- a/python-client/tests/wmill_client_test.py
+++ b/python-client/tests/wmill_client_test.py
@@ -124,5 +124,49 @@ SET s3_secret_access_key='80yMndIMcyXwEujxVNINQbf0tBlIzRaLPyM2m1n4';
             wmill.load_s3_file(s3_obj)
 
 
+class TestParseS3Object(unittest.TestCase):
+    """Pure-unit tests for parse_s3_object — no network/env needed."""
+
+    def test_bare_string_raises_with_uri_hint(self):
+        # A bare key is rejected rather than silently uploading under an
+        # auto-generated name; the error points at the s3:/// spelling.
+        with self.assertRaisesRegex(ValueError, "s3:///dir/file.json"):
+            wmill.parse_s3_object("dir/file.json")
+
+    def test_triple_slash_uri_is_default_storage(self):
+        self.assertEqual(
+            wmill.parse_s3_object("s3:///dir/file.json"),
+            S3Object(s3="dir/file.json", storage=None),
+        )
+
+    def test_full_uri_splits_storage_and_key(self):
+        self.assertEqual(
+            wmill.parse_s3_object("s3://bucket/dir/f"),
+            S3Object(s3="dir/f", storage="bucket"),
+        )
+
+    def test_malformed_uri_raises(self):
+        # `s3://x` has no key part — fail loudly instead of silently
+        # misplacing the object.
+        with self.assertRaises(ValueError):
+            wmill.parse_s3_object("s3://broken")
+
+    def test_empty_key_uri_raises(self):
+        # An empty key is never a valid target: it would fall back to an
+        # auto-generated key, which is requested by omitting the object.
+        with self.assertRaises(ValueError):
+            wmill.parse_s3_object("s3:///")
+        with self.assertRaises(ValueError):
+            wmill.parse_s3_object("s3://bucket/")
+
+    def test_empty_string_raises(self):
+        # Auto-generated keys are requested by omitting the object (None),
+        # not by an empty string.
+        with self.assertRaises(ValueError):
+            wmill.parse_s3_object("")
+
+    def test_s3object_passes_through(self):
+        self.assertEqual(wmill.parse_s3_object(S3Object(s3="x")), S3Object(s3="x"))
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 5dc2fd6c77..d756855c9f 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.733.1"
+version = "1.753.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill/wmill/client.py b/python-client/wmill/wmill/client.py
index 18573e297d..fc4c34737d 100644
--- a/python-client/wmill/wmill/client.py
+++ b/python-client/wmill/wmill/client.py
@@ -168,16 +168,17 @@ class Windmill:
         hash_: str = None,
         args: dict = None,
         scheduled_in_secs: int = None,
+        tag: str = None,
     ) -> str:
         """Create a script job and return its job id.
-        
+
         .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.
         """
         logging.warning(
             "run_script_async is deprecated. Use run_script_by_path_async or run_script_by_hash_async instead.",
         )
         assert not (path and hash_), "path and hash_ are mutually exclusive"
-        return self._run_script_async_internal(path=path, hash_=hash_, args=args, scheduled_in_secs=scheduled_in_secs)
+        return self._run_script_async_internal(path=path, hash_=hash_, args=args, scheduled_in_secs=scheduled_in_secs, tag=tag)
 
     def _run_script_async_internal(
         self,
@@ -185,10 +186,13 @@ class Windmill:
         hash_: str = None,
         args: dict = None,
         scheduled_in_secs: int = None,
+        tag: str = None,
     ) -> str:
         """Internal helper for running scripts asynchronously."""
         args = args or {}
         params = {"scheduled_in_secs": scheduled_in_secs} if scheduled_in_secs else {}
+        if tag:
+            params["tag"] = tag
         if os.environ.get("WM_JOB_ID"):
             params["parent_job"] = os.environ.get("WM_JOB_ID")
         if os.environ.get("WM_ROOT_FLOW_JOB_ID"):
@@ -208,18 +212,20 @@ class Windmill:
         path: str,
         args: dict = None,
         scheduled_in_secs: int = None,
+        tag: str = None,
     ) -> str:
         """Create a script job by path and return its job id."""
-        return self._run_script_async_internal(path=path, args=args, scheduled_in_secs=scheduled_in_secs)
+        return self._run_script_async_internal(path=path, args=args, scheduled_in_secs=scheduled_in_secs, tag=tag)
 
     def run_script_by_hash_async(
         self,
         hash_: str,
         args: dict = None,
         scheduled_in_secs: int = None,
+        tag: str = None,
     ) -> str:
         """Create a script job by hash and return its job id."""
-        return self._run_script_async_internal(hash_=hash_, args=args, scheduled_in_secs=scheduled_in_secs)
+        return self._run_script_async_internal(hash_=hash_, args=args, scheduled_in_secs=scheduled_in_secs, tag=tag)
 
     def run_flow_async(
         self,
@@ -230,10 +236,13 @@ class Windmill:
         # as otherwise the child flow and its own child will store their state in the parent job which will
         # lead to incorrectness and failures
         do_not_track_in_parent: bool = True,
+        tag: str = None,
     ) -> str:
         """Create a flow job and return its job id."""
         args = args or {}
         params = {"scheduled_in_secs": scheduled_in_secs} if scheduled_in_secs else {}
+        if tag:
+            params["tag"] = tag
         if not do_not_track_in_parent:
             if os.environ.get("WM_JOB_ID"):
                 params["parent_job"] = os.environ.get("WM_JOB_ID")
@@ -254,9 +263,10 @@ class Windmill:
         verbose: bool = False,
         cleanup: bool = True,
         assert_result_is_not_none: bool = False,
+        tag: str = None,
     ) -> Any:
         """Run script synchronously and return its result.
-        
+
         .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
         """
         logging.warning(
@@ -265,7 +275,7 @@ class Windmill:
         assert not (path and hash_), "path and hash_ are mutually exclusive"
         return self._run_script_internal(
             path=path, hash_=hash_, args=args, timeout=timeout, verbose=verbose,
-            cleanup=cleanup, assert_result_is_not_none=assert_result_is_not_none
+            cleanup=cleanup, assert_result_is_not_none=assert_result_is_not_none, tag=tag
         )
 
     def _run_script_internal(
@@ -277,6 +287,7 @@ class Windmill:
         verbose: bool = False,
         cleanup: bool = True,
         assert_result_is_not_none: bool = False,
+        tag: str = None,
     ) -> Any:
         """Internal helper for running scripts synchronously."""
         args = args or {}
@@ -290,7 +301,7 @@ class Windmill:
         if isinstance(timeout, dt.timedelta):
             timeout = timeout.total_seconds()
 
-        job_id = self._run_script_async_internal(path=path, hash_=hash_, args=args)
+        job_id = self._run_script_async_internal(path=path, hash_=hash_, args=args, tag=tag)
         return self.wait_job(
             job_id, timeout, verbose, cleanup, assert_result_is_not_none
         )
@@ -303,11 +314,12 @@ class Windmill:
         verbose: bool = False,
         cleanup: bool = True,
         assert_result_is_not_none: bool = False,
+        tag: str = None,
     ) -> Any:
         """Run script by path synchronously and return its result."""
         return self._run_script_internal(
             path=path, args=args, timeout=timeout, verbose=verbose,
-            cleanup=cleanup, assert_result_is_not_none=assert_result_is_not_none
+            cleanup=cleanup, assert_result_is_not_none=assert_result_is_not_none, tag=tag
         )
 
     def run_script_by_hash(
@@ -318,11 +330,12 @@ class Windmill:
         verbose: bool = False,
         cleanup: bool = True,
         assert_result_is_not_none: bool = False,
+        tag: str = None,
     ) -> Any:
         """Run script by hash synchronously and return its result."""
         return self._run_script_internal(
             hash_=hash_, args=args, timeout=timeout, verbose=verbose,
-            cleanup=cleanup, assert_result_is_not_none=assert_result_is_not_none
+            cleanup=cleanup, assert_result_is_not_none=assert_result_is_not_none, tag=tag
         )
 
     def run_inline_script_preview(
@@ -1453,6 +1466,7 @@ def run_script_async(
     hash_or_path: str,
     args: Dict[str, Any] = None,
     scheduled_in_secs: int = None,
+    tag: str = None,
 ) -> str:
     """Create a script job and return its job ID.
 
@@ -1460,6 +1474,7 @@ def run_script_async(
         hash_or_path: Script hash or path (determined by presence of '/')
         args: Script arguments
         scheduled_in_secs: Delay before execution in seconds
+        tag: Override the worker tag the job runs on
 
     Returns:
         Job ID string
@@ -1472,6 +1487,7 @@ def run_script_async(
         path=path,
         args=args,
         scheduled_in_secs=scheduled_in_secs,
+        tag=tag,
     )
 
 
@@ -1484,6 +1500,7 @@ def run_flow_async(
     # as otherwise the child flow and its own child will store their state in the parent job which will
     # lead to incorrectness and failures
     do_not_track_in_parent: bool = True,
+    tag: str = None,
 ) -> str:
     """Create a flow job and return its job ID.
 
@@ -1492,6 +1509,7 @@ def run_flow_async(
         args: Flow arguments
         scheduled_in_secs: Delay before execution in seconds
         do_not_track_in_parent: Whether to track in parent job (default: True)
+        tag: Override the worker tag the job runs on
 
     Returns:
         Job ID string
@@ -1501,6 +1519,7 @@ def run_flow_async(
         args=args,
         scheduled_in_secs=scheduled_in_secs,
         do_not_track_in_parent=do_not_track_in_parent,
+        tag=tag,
     )
 
 
@@ -1512,6 +1531,7 @@ def run_script_sync(
     assert_result_is_not_none: bool = True,
     cleanup: bool = True,
     timeout: dt.timedelta = None,
+    tag: str = None,
 ) -> Any:
     """Run a script synchronously by hash and return its result.
 
@@ -1522,6 +1542,7 @@ def run_script_sync(
         assert_result_is_not_none: Raise exception if result is None
         cleanup: Register cleanup handler to cancel job on exit
         timeout: Maximum time to wait
+        tag: Override the worker tag the job runs on
 
     Returns:
         Script result
@@ -1533,6 +1554,7 @@ def run_script_sync(
         assert_result_is_not_none=assert_result_is_not_none,
         cleanup=cleanup,
         timeout=timeout,
+        tag=tag,
     )
 
 
@@ -1541,6 +1563,7 @@ def run_script_by_path_async(
     path: str,
     args: Dict[str, Any] = None,
     scheduled_in_secs: Union[None, int] = None,
+    tag: str = None,
 ) -> str:
     """Create a script job by path and return its job ID.
 
@@ -1548,6 +1571,7 @@ def run_script_by_path_async(
         path: Script path
         args: Script arguments
         scheduled_in_secs: Delay before execution in seconds
+        tag: Override the worker tag the job runs on
 
     Returns:
         Job ID string
@@ -1556,6 +1580,7 @@ def run_script_by_path_async(
         path=path,
         args=args,
         scheduled_in_secs=scheduled_in_secs,
+        tag=tag,
     )
 
 
@@ -1564,6 +1589,7 @@ def run_script_by_hash_async(
     hash_: str,
     args: Dict[str, Any] = None,
     scheduled_in_secs: Union[None, int] = None,
+    tag: str = None,
 ) -> str:
     """Create a script job by hash and return its job ID.
 
@@ -1571,6 +1597,7 @@ def run_script_by_hash_async(
         hash_: Script hash
         args: Script arguments
         scheduled_in_secs: Delay before execution in seconds
+        tag: Override the worker tag the job runs on
 
     Returns:
         Job ID string
@@ -1579,6 +1606,7 @@ def run_script_by_hash_async(
         hash_=hash_,
         args=args,
         scheduled_in_secs=scheduled_in_secs,
+        tag=tag,
     )
 
 
@@ -1590,6 +1618,7 @@ def run_script_by_path_sync(
     assert_result_is_not_none: bool = True,
     cleanup: bool = True,
     timeout: dt.timedelta = None,
+    tag: str = None,
 ) -> Any:
     """Run a script synchronously by path and return its result.
 
@@ -1600,6 +1629,7 @@ def run_script_by_path_sync(
         assert_result_is_not_none: Raise exception if result is None
         cleanup: Register cleanup handler to cancel job on exit
         timeout: Maximum time to wait
+        tag: Override the worker tag the job runs on
 
     Returns:
         Script result
@@ -1611,6 +1641,7 @@ def run_script_by_path_sync(
         assert_result_is_not_none=assert_result_is_not_none,
         cleanup=cleanup,
         timeout=timeout,
+        tag=tag,
     )
 
 
@@ -2062,9 +2093,10 @@ def run_script(
     verbose: bool = False,
     cleanup: bool = True,
     assert_result_is_not_none: bool = True,
+    tag: str = None,
 ) -> Any:
     """Run script synchronously and return its result.
-    
+
     .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
     """
     return _client.run_script(
@@ -2075,6 +2107,7 @@ def run_script(
         assert_result_is_not_none=assert_result_is_not_none,
         cleanup=cleanup,
         timeout=timeout,
+        tag=tag,
     )
 
 
@@ -2086,6 +2119,7 @@ def run_script_by_path(
     verbose: bool = False,
     cleanup: bool = True,
     assert_result_is_not_none: bool = True,
+    tag: str = None,
 ) -> Any:
     """Run script by path synchronously and return its result."""
     return _client.run_script_by_path(
@@ -2095,6 +2129,7 @@ def run_script_by_path(
         assert_result_is_not_none=assert_result_is_not_none,
         cleanup=cleanup,
         timeout=timeout,
+        tag=tag,
     )
 
 
@@ -2106,6 +2141,7 @@ def run_script_by_hash(
     verbose: bool = False,
     cleanup: bool = True,
     assert_result_is_not_none: bool = True,
+    tag: str = None,
 ) -> Any:
     """Run script by hash synchronously and return its result."""
     return _client.run_script_by_hash(
@@ -2115,6 +2151,7 @@ def run_script_by_hash(
         assert_result_is_not_none=assert_result_is_not_none,
         cleanup=cleanup,
         timeout=timeout,
+        tag=tag,
     )
 
 @init_global_client
@@ -2175,12 +2212,27 @@ def parse_resource_syntax(s: str) -> Optional[str]:
     return None
 
 def parse_s3_object(s3_object: S3Object | str) -> S3Object:
-    """Parse S3 object from string or S3Object format."""
+    """Parse S3 object from a `s3://<storage>/<key>` URI string (`s3:///<key>`
+    for the default storage) or S3Object format. Any other string raises
+    rather than falling back to an auto-generated key: an auto key is
+    requested by omitting the object, and a fallback would silently misplace
+    the upload on any typo.
+    """
     if isinstance(s3_object, str):
-        match = re.match(r'^s3://([^/]*)/(.*)$', s3_object)
+        match = re.match(r'^s3://([^/]*)/(.+)$', s3_object)
         if match:
-            return S3Object(s3=match.group(2) or "", storage=match.group(1) or None)
-        return S3Object(s3="")
+            return S3Object(s3=match.group(2), storage=match.group(1) or None)
+        if s3_object.startswith("s3://"):
+            raise ValueError(
+                f"Invalid s3 object URI {s3_object!r}: expected "
+                "s3://<storage>/<key> with a non-empty key "
+                "(s3:///<key> for the default storage)"
+            )
+        raise ValueError(
+            f"Invalid s3 object {s3_object!r}: expected an s3://<storage>/<key> "
+            f"URI (e.g. 's3:///{s3_object}' for key {s3_object!r} in the default "
+            "storage) or S3Object(s3=<key>)"
+        )
     else:
         return s3_object
 
@@ -2289,6 +2341,131 @@ class DucklakeClient:
             )
         )
 
+    def _qualified(self, table: str, schema: str = None) -> str:
+        return f'dl."{schema}"."{table}"' if schema else f"dl.{table}"
+
+    def _materialize_finish(self, sql, table, schema, partition, partition_col):
+        """Return the materialize query; in a pipeline (WM_PIPELINE) append a
+        summary read and record materialized_partition state after a successful
+        run so SDK-materialized slices appear in the grid like `// materialize`
+        ones. Outside a pipeline it stays a plain query (no recording)."""
+        bind = {} if partition is None else {"_wm_partition": partition}
+        if os.environ.get("WM_PIPELINE") != "true":
+            return self.query(sql, **bind)
+        t = self._qualified(table, schema)
+        where = f" WHERE {partition_col} = $_wm_partition" if partition is not None else ""
+        summary = (
+            f"\nSELECT (SELECT count(*) FROM {t}{where}) AS rows, "
+            f"(SELECT max(snapshot_id) FROM ducklake_snapshots('dl')) AS snapshot_id;"
+        )
+        q = self.query(sql + summary, **bind)
+        # Asset path mirrors the `// materialize` engine: <lake>/<schema>.<table>
+        # for an explicit schema, else <lake>/<table>. Dropping the schema would
+        # hide the row from the grid and collide distinct schemas under one key.
+        asset_path = f"{self.name}/{schema}.{table}" if schema else f"{self.name}/{table}"
+        return _RecordingSqlQuery(q, self.client, asset_path, partition or "")
+
+    def upsert_partition(
+        self,
+        table: str,
+        select_sql: str,
+        partition: str = None,
+        unique_key: str = None,
+        partition_col: str = "_wm_partition",
+        schema: str = None,
+    ):
+        """Idempotently materialize the rows of `select_sql` into ducklake
+        `table` for one `partition` (or the whole table when `partition` is
+        None). Client-side equivalent of the `// materialize` engine: with
+        `unique_key` it upserts within the slice (delete-by-key + insert);
+        without it, it replaces (whole table → CREATE OR REPLACE; partition →
+        delete the partition + insert). Re-running the same slice is safe — the
+        backfill / failure-recovery contract.
+
+        The partition value is bound as a DuckDB arg (never string-interpolated)
+        so it cannot inject SQL. `select_sql` is trusted (your own query).
+        """
+        t = self._qualified(table, schema)
+        # Whole-table (no partition): no partition column; replace rebuilds the
+        # table with CREATE OR REPLACE, merge upserts the whole table by key.
+        if partition is None:
+            if unique_key:
+                sql = (
+                    f"CREATE TABLE IF NOT EXISTS {t} AS SELECT * FROM ({select_sql}) WHERE false;\n"
+                    f"BEGIN TRANSACTION;\n"
+                    f"DELETE FROM {t} WHERE {unique_key} IN (SELECT {unique_key} FROM ({select_sql}));\n"
+                    f"INSERT INTO {t} SELECT * FROM ({select_sql});\n"
+                    f"COMMIT;"
+                )
+            else:
+                sql = f"CREATE OR REPLACE TABLE {t} AS SELECT * FROM ({select_sql});"
+            return self._materialize_finish(sql, table, schema, partition, partition_col)
+        src = f"SELECT *, $_wm_partition AS {partition_col} FROM ({select_sql})"
+        if unique_key:
+            # Upsert via delete-by-key + insert (not MERGE — DuckLake's MERGE
+            # fails writing the first rows of a fresh partition).
+            body = (
+                f"DELETE FROM {t} WHERE {partition_col} = $_wm_partition "
+                f"AND {unique_key} IN (SELECT {unique_key} FROM ({select_sql}));\n"
+                f"INSERT INTO {t} {src};"
+            )
+        else:
+            body = (
+                f"DELETE FROM {t} WHERE {partition_col} = $_wm_partition;\n"
+                f"INSERT INTO {t} {src};"
+            )
+        sql = (
+            f"CREATE TABLE IF NOT EXISTS {t} AS "
+            f"SELECT *, CAST(NULL AS VARCHAR) AS {partition_col} FROM ({select_sql}) WHERE false;\n"
+            f"ALTER TABLE {t} SET PARTITIONED BY ({partition_col});\n"
+            f"BEGIN TRANSACTION;\n{body}\nCOMMIT;"
+        )
+        return self._materialize_finish(sql, table, schema, partition, partition_col)
+
+    def append_partition(
+        self,
+        table: str,
+        select_sql: str,
+        partition: str = None,
+        partition_col: str = "_wm_partition",
+        schema: str = None,
+    ):
+        """INSERT-only materialization (no dedup / no replace) for an immutable
+        event-log table — for one `partition`, or the whole table when
+        `partition` is None. NOTE: unlike `upsert_partition`, re-running the same
+        slice duplicates rows — use only for append-only sources."""
+        t = self._qualified(table, schema)
+        # Whole-table (no partition): insert into the bare table, no partition col.
+        if partition is None:
+            sql = (
+                f"CREATE TABLE IF NOT EXISTS {t} AS SELECT * FROM ({select_sql}) WHERE false;\n"
+                f"INSERT INTO {t} SELECT * FROM ({select_sql});"
+            )
+            return self._materialize_finish(sql, table, schema, partition, partition_col)
+        sql = (
+            f"CREATE TABLE IF NOT EXISTS {t} AS "
+            f"SELECT *, CAST(NULL AS VARCHAR) AS {partition_col} FROM ({select_sql}) WHERE false;\n"
+            f"ALTER TABLE {t} SET PARTITIONED BY ({partition_col});\n"
+            f"INSERT INTO {t} SELECT *, $_wm_partition AS {partition_col} FROM ({select_sql});"
+        )
+        return self._materialize_finish(sql, table, schema, partition, partition_col)
+
+    def read(
+        self,
+        table: str,
+        partition: str = None,
+        partition_col: str = "_wm_partition",
+        schema: str = None,
+    ):
+        """Read a materialized ducklake table, optionally a single partition."""
+        t = self._qualified(table, schema)
+        if partition is not None:
+            return self.query(
+                f"SELECT * FROM {t} WHERE {partition_col} = $_wm_partition",
+                _wm_partition=partition,
+            )
+        return self.query(f"SELECT * FROM {t}")
+
 class SqlQuery:
     """Query result handler for DataTable and DuckLake queries."""
 
@@ -2337,6 +2514,60 @@ class SqlQuery:
         """
         self.fetch_one()
 
+
+class _RecordingSqlQuery:
+    """Wraps a ducklake materialize query so that, on a successful run, the
+    trailing summary (row count + snapshot id) is captured and the
+    materialized_partition state is recorded (best-effort). Only used in pipeline
+    context — outside it the helpers return a plain SqlQuery. Mirrors SqlQuery's
+    terminal methods so `.execute()` / `.fetch_one()` behave the same."""
+
+    def __init__(self, inner, client, asset_path, partition):
+        self._inner = inner
+        self._client = client
+        self._asset_path = asset_path
+        self._partition = partition
+        self.sql = inner.sql
+
+    def execute(self):
+        self._run()
+
+    def fetch_one(self):
+        return self._run()
+
+    def fetch(self, result_collection=None):
+        return self._run()
+
+    def _run(self):
+        try:
+            row = self._inner.fetch_one()
+        except Exception as e:
+            self._record("failed", None, None, str(e))
+            raise
+        snap = row.get("snapshot_id") if isinstance(row, dict) else None
+        rows = row.get("rows") if isinstance(row, dict) else None
+        self._record("materialized", snap, rows, None)
+        return row
+
+    def _record(self, status, snapshot_id, row_count, error):
+        try:
+            self._client.post(
+                f"/w/{self._client.workspace}/assets/record_materialization",
+                json={
+                    "asset_kind": "ducklake",
+                    "asset_path": self._asset_path,
+                    "partition": self._partition,
+                    "status": status,
+                    "snapshot_id": snapshot_id,
+                    "row_count": row_count,
+                    "job_id": os.environ.get("WM_JOB_ID"),
+                    "error": error,
+                },
+            )
+        except Exception:
+            pass  # best-effort; never fail the user's materialization
+
+
 def infer_sql_type(value) -> str:
     """
     DuckDB executor requires explicit argument types at declaration
diff --git a/rust-client/src/client.rs b/rust-client/src/client.rs
index 4fc9eca192..451dc58d85 100644
--- a/rust-client/src/client.rs
+++ b/rust-client/src/client.rs
@@ -629,7 +629,43 @@ impl Windmill {
 
         ret!(async move {
             let job_id = self
-                .run_script_async_inner(ident, ident_is_hash, args, scheduled_in_secs)
+                .run_script_async_inner(ident, ident_is_hash, args, scheduled_in_secs, None)
+                .await?;
+            self.wait_job_inner(
+                &job_id.to_string(),
+                timeout_secs,
+                verbose,
+                assert_result_is_not_none,
+            )
+            .await
+        });
+    }
+
+    /// Same as [`Windmill::run_script_sync`] but allows overriding the worker `tag`
+    /// the job runs on.
+    ///
+    /// # Parameters
+    /// In addition to the parameters of [`Windmill::run_script_sync`]:
+    /// - `tag`: Optional worker tag override (the job is dispatched to workers
+    ///   listening on this tag instead of the script's default tag)
+    pub fn run_script_sync_with_tag<'a>(
+        &'a self,
+        ident: &'a str,
+        ident_is_hash: bool,
+        args: Value,
+        scheduled_in_secs: Option<u32>,
+        timeout_secs: Option<u64>,
+        verbose: bool,
+        assert_result_is_not_none: bool,
+        tag: Option<&'a str>,
+    ) -> MaybeFuture<'a, Result<Value, SdkError>> {
+        if verbose {
+            println!("running `{ident}` synchronously with {:?}", &args);
+        }
+
+        ret!(async move {
+            let job_id = self
+                .run_script_async_inner(ident, ident_is_hash, args, scheduled_in_secs, tag)
                 .await?;
             self.wait_job_inner(
                 &job_id.to_string(),
@@ -690,7 +726,25 @@ impl Windmill {
         args: Value,
         scheduled_in_secs: Option<u32>,
     ) -> MaybeFuture<'a, Result<uuid::Uuid, SdkError>> {
-        ret!(self.run_script_async_inner(ident, ident_is_hash, args, scheduled_in_secs));
+        ret!(self.run_script_async_inner(ident, ident_is_hash, args, scheduled_in_secs, None));
+    }
+
+    /// Same as [`Windmill::run_script_async`] but allows overriding the worker `tag`
+    /// the job runs on.
+    ///
+    /// # Arguments
+    /// In addition to the arguments of [`Windmill::run_script_async`]:
+    /// * `tag` - Optional worker tag override (the job is dispatched to workers
+    ///   listening on this tag instead of the script's default tag)
+    pub fn run_script_async_with_tag<'a>(
+        &'a self,
+        ident: &'a str,
+        ident_is_hash: bool,
+        args: Value,
+        scheduled_in_secs: Option<u32>,
+        tag: Option<&'a str>,
+    ) -> MaybeFuture<'a, Result<uuid::Uuid, SdkError>> {
+        ret!(self.run_script_async_inner(ident, ident_is_hash, args, scheduled_in_secs, tag));
     }
 
     async fn run_script_async_inner<'a>(
@@ -699,6 +753,7 @@ impl Windmill {
         ident_is_hash: bool,
         mut args: Value,
         scheduled_in_secs: Option<u32>,
+        tag: Option<&'a str>,
     ) -> Result<uuid::Uuid, SdkError> {
         if let Ok(parent_job) = var("WM_JOB_ID") {
             args["parent_job"] = json!(parent_job);
@@ -712,6 +767,9 @@ impl Windmill {
             args["scheduled_in_secs"] = json!(scheduled_in_secs);
         }
 
+        // The `None`s below map positionally to the query params of the generated
+        // job API. The 5th one is the worker `tag` override (after scheduled_for,
+        // scheduled_in_secs, skip_preprocessor and parent_job).
         let uuid = if ident_is_hash {
             job_api::run_script_by_hash(
                 &self.client_config,
@@ -722,7 +780,7 @@ impl Windmill {
                 None,
                 None,
                 None,
-                None,
+                tag,
                 None,
                 None,
                 None,
@@ -746,7 +804,7 @@ impl Windmill {
                 None,
                 None,
                 None,
-                None,
+                tag,
                 None,
                 None,
                 None,
diff --git a/sandbox-image/Dockerfile.sandbox b/sandbox-image/Dockerfile.sandbox
index 7c9ca181a4..7666366720 100644
--- a/sandbox-image/Dockerfile.sandbox
+++ b/sandbox-image/Dockerfile.sandbox
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 # ── Minimal system deps ──────────────────────────────────────────────────────
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/system_prompts/auto-generated/cli/cli-commands.md b/system_prompts/auto-generated/cli/cli-commands.md
index 2e54a87395..3d5d6429d4 100644
--- a/system_prompts/auto-generated/cli/cli-commands.md
+++ b/system_prompts/auto-generated/cli/cli-commands.md
@@ -77,6 +77,13 @@ datatable related commands
 - `datatable run <sql:string>` - run a SQL query on a datatable
   - `-n --name <name:string>` - Datatable name (default: main)
   - `-s --silent` - Output only the final result as JSON. Useful for scripting.
+- `datatable migrate` - manage datatable migrations
+  - `datatable migrate new <name:string>` - scaffold a new migration (.up.sql / .down.sql files)
+    - `-d --datatable <datatable:string>` - Target datatable (default: main)
+  - `datatable migrate up` - apply all pending migrations to the main datatable (or one via --datatable)
+    - `-d --datatable <datatable:string>` - Target datatable (default: main)
+  - `datatable migrate down` - roll back the most recent migration on the main datatable (or one via --datatable)
+    - `-d --datatable <datatable:string>` - Target datatable (default: main)
 - `datatable create [name:string]` - register a datatable database in the workspace (default: instance-backed 'main') so scripts can use datatable://<name>
   - `--resource <resource:string>` - Back the datatable with an existing postgresql resource path instead of the instance database
   - `--force` - Allow adding to a workspace that already has datatables (fork metadata on existing ones is not preserved)
@@ -345,19 +352,18 @@ Manage jobs (list, inspect, cancel)
 
 ### jobs
 
-Pull completed and queued jobs from workspace
-
-**Arguments:** `[workspace:string]`
-
-**Options:**
-- `-c, --completed-output <file:string>` - Completed jobs output file (default: completed_jobs.json)
-- `-q, --queued-output <file:string>` - Queued jobs output file (default: queued_jobs.json)
-- `--skip-worker-check` - Skip checking for active workers before export
+Manage jobs (import/export)
 
 **Subcommands:**
 
-- `jobs pull`
-- `jobs push`
+- `jobs pull [workspace:string]` - Pull completed and queued jobs from workspace
+  - `-c, --completed-output <file:string>` - Completed jobs output file (default: completed_jobs.json)
+  - `-q, --queued-output <file:string>` - Queued jobs output file (default: queued_jobs.json)
+  - `--skip-worker-check` - Skip checking for active workers before export
+- `jobs push [workspace:string]` - Push completed and queued jobs to workspace
+  - `-c, --completed-file <file:string>` - Completed jobs input file (default: completed_jobs.json)
+  - `-q, --queued-file <file:string>` - Queued jobs input file (default: queued_jobs.json)
+  - `--skip-worker-check` - Skip checking for active workers before import
 
 ### lint
 
@@ -419,6 +425,22 @@ inspect asset-driven pipelines (scripts marked `// pipeline`, wired by `// on <s
   - `--json` - Output as JSON (for piping to jq)
 - `pipeline show <folder:string>` - render a pipeline folder's DAG (sources, lineage, subscriptions) in the terminal
   - `--json` - Output the raw asset graph as JSON
+  - `--local` - Build the graph from local working-tree files (// pipeline scripts) instead of the deployed workspace — no deploy needed.
+- `pipeline run <folder:string>` - run a cascade: from --from (a root OR any mid-DAG model), fan downstream up to the --to end node(s)
+  - `--from <script:string>` - Start script (short name or path). May be any node, including a mid-DAG model — that node plus its transitive downstream runs, upstream is NOT re-run (dbt `--select model+`). Defaults to the folder's sole schedule/manual root.
+  - `--to <node:string>` - End node(s) to stop at — script names/paths or asset URIs (e.g. datatable://main/staged). Repeatable or comma-separated. Omit to run the full downstream.
+  - `--dry-run` - Print the topological run plan without executing.
+  - `--json` - Output the plan as JSON (for piping to jq).
+  - `--local` - Run the local working-tree scripts via preview (no deploy) instead of the deployed versions; the graph is built from local files.
+  - `--upload <binding:string>` - Bind an object to a data_upload/webhook entry point so it runs in the cascade, as SCRIPT[:PARAM]=SOURCE (SOURCE is a local file or an s3://key). Local files are uploaded to the workspace store; the S3Object param is inferred when the script has exactly one. Repeatable.
+  - `--arg <binding:string>` - Pass a plain run arg to a script in the cascade, as SCRIPT:PARAM=VALUE (VALUE is parsed as JSON when possible, else taken as a string — e.g. daily_report:partition=2026-07-02). Repeatable.
+  - `--partition <value:string>` - Partition value for `// partitioned` scripts in the run (e.g. 2026-06-30) — use it to backfill a past slice. With --local, time kinds (daily/hourly/weekly/monthly) default to the current UTC period when omitted; `dynamic` always needs it. Deployed runs without it defer to backend run-start resolution.
+- `pipeline docs <folder:string>` - generate PIPELINE.md (+ AGENTS.md pointer) describing a folder's pipeline graph and datatable schemas, for an editor / agentic loop
+  - `--local` - Build the graph from local working-tree files instead of the deployed workspace.
+- `pipeline dev [folder:string]` - Live-preview a data pipeline from local files: watch an `f/<folder>` of `// pipeline` scripts, push the working-tree graph to the dev page, and run the cascade via preview (no deploy).
+  - `--port <port:number>` - Port for the dev WebSocket server.
+  - `--no-open` - Do not open the browser automatically.
+  - `--frontend <origin:string>` - Origin serving the /pipeline_dev page (e.g. http://localhost:3000 for a locally-run frontend). Defaults to the workspace remote; use it when the remote's deployed frontend predates the dev page.
 
 ### protection-rules
 
@@ -744,13 +766,19 @@ workspace related commands
   - `--branch <branch:string>` - Git branch to associate (default: workspace name)
 - `workspace unbind` - Remove baseUrl and workspaceId from a workspace entry
   - `--workspace <name:string>` - Workspace to unbind
-- `workspace fork [workspace_name:string] [workspace_id:string]` - Create a forked workspace
+- `workspace fork [workspace_name:string] [workspace_id:string]` - Create a forked workspace from its parent workspace.
+
+The parent is resolved from your current git branch, not from the active profile: run this from a git repo checked out on the branch mapped to the parent workspace in wmill.yaml's `workspaces:` section (a fork branch of it resolves to the same parent). `wmill workspace switch` does not change which workspace is forked.
+
+Arguments (omit both to be prompted interactively):
+  [workspace_name]  Friendly display name for the fork, shown in the UI. May contain spaces, so quote it in the shell (e.g. "My Fork"). Max 50 chars. Defaults to "<parent workspace name>'s fork".
+  [workspace_id]    Id for the fork. Must be a slug (no spaces or special characters) and is automatically prefixed with `wm-fork-`, so pass just the bare slug (e.g. `my-fork` becomes `wm-fork-my-fork`). This id also determines the fork's git branch name. Defaults to a slug derived from the name — or, when you are converting an existing branch into the fork branch, from that branch.
   - `--create-workspace-name <workspace_name:string>` - Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.
   - `--color <color:string>` - Workspace color (hex code, e.g. #ff0000)
   - `--datatable-behavior <behavior:string>` - How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)
   - `--from-branch <branch:string>` - Non-interactive override for the 'turn my current working branch into the fork' workflow: base the fork on <branch> (its bound workspace is the parent) and rename the current branch onto wm-fork/<branch>/<id>. Usually unneeded — from a working branch `wmill workspace fork` offers this interactively; from a base branch it creates a fresh fork branch.
   - `-y --yes` - Skip interactive prompts (defaults datatable behavior to 'skip'). On a non-base branch, requires --from-branch since the base branch can't be prompted for.
-- `workspace delete-fork <fork_name:string>` - Delete a forked workspace and git branch
+- `workspace delete-fork <fork_name:string>` - Delete a forked workspace
   - `-y --yes` - Skip confirmation prompt
 - `workspace merge` - Compare and deploy changes between a fork and its parent workspace
   - `--direction <direction:string>` - Deploy direction: to-parent or to-fork
diff --git a/system_prompts/auto-generated/flow.md b/system_prompts/auto-generated/flow.md
index 97d0d5143a..08bcc2d641 100644
--- a/system_prompts/auto-generated/flow.md
+++ b/system_prompts/auto-generated/flow.md
@@ -139,8 +139,11 @@ input_transforms:
 
 ## Approval / Suspend Structure
 
+An approval step is a normal **script** step (`type: rawscript` or `type: script`) that is turned into an approval by adding a module-level `suspend`. Its script calls `wmill.getResumeUrls(approver)` to generate the secret resume/cancel URLs and returns them so they can be sent to the approver(s) (Slack, email, etc.) or approved from the run page.
+
 - `suspend` belongs on the flow module object itself, as a sibling of `id` and `value`
 - Never put `suspend` inside `value`
+- Do NOT use `type: identity` for an approval step. An identity step suspends but never produces the resume URLs, so approvers have no link to act on — it is not a functional approval.
 
 Correct shape:
 
@@ -156,10 +159,23 @@ Correct shape:
             type: string
         required: [comment]
   value:
-    type: identity
+    type: rawscript
+    language: bun
+    input_transforms:
+      approver:
+        type: static
+        value: ''
+    content: |
+      import * as wmill from "windmill-client"
+
+      export async function main(approver?: string) {
+        const urls = await wmill.getResumeUrls(approver)
+        // send urls.resume / urls.cancel to the approver(s), e.g. via Slack or email
+        return urls
+      }
 ```
 
-Incorrect shape:
+Incorrect shape (suspend misplaced inside `value`):
 
 ```yaml
 - id: request_approval
@@ -169,6 +185,16 @@ Incorrect shape:
       required_events: 1
 ```
 
+Incorrect shape (identity has no resume URLs — not a real approval):
+
+```yaml
+- id: request_approval
+  suspend:
+    required_events: 1
+  value:
+    type: identity
+```
+
 ## Branch Result Scope Rules
 
 - Inside a branch, you may reference earlier outer steps and earlier steps in the same branch
@@ -295,4 +321,4 @@ Reference a specific resource using `$res:` prefix:
 
 ## OpenFlow Schema
 
-{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \"yellow\", \"#ffff00\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default `flow`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}
\ No newline at end of file
+{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \"yellow\", \"#ffff00\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"},"reasoning_effort":{"type":"string","description":"Provider-native reasoning effort token (e.g. 'low', 'high', 'none') for models that support extended thinking. Optional; unset leaves the provider default."}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, reasoning_token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default `flow`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}
\ No newline at end of file
diff --git a/system_prompts/auto-generated/index.d.ts b/system_prompts/auto-generated/index.d.ts
index f7d8d632b4..8333db7bdc 100644
--- a/system_prompts/auto-generated/index.d.ts
+++ b/system_prompts/auto-generated/index.d.ts
@@ -3,5 +3,6 @@ export declare function getScriptPrompt(language: string): string;
 export declare function getFlowPrompt(): string;
 export declare function getResourcePrompt(): string;
 export declare function getRawAppPrompt(): string;
+export declare function getPipelinePrompt(): string;
 export declare function getDatatableSdkReference(language?: string): string;
 export declare function getWorkflowAsCodePrompt(language?: string): string;
diff --git a/system_prompts/auto-generated/index.ts b/system_prompts/auto-generated/index.ts
index 6ee3e20f4a..2e2a88cae6 100644
--- a/system_prompts/auto-generated/index.ts
+++ b/system_prompts/auto-generated/index.ts
@@ -54,6 +54,11 @@ export function getRawAppPrompt(): string {
   return prompts.RAW_APP_BASE;
 }
 
+// Helper for data pipeline authoring (chat consumers)
+export function getPipelinePrompt(): string {
+  return prompts.PIPELINE_BASE;
+}
+
 // Helper to get the datatable SQL SDK reference (wmill.datatable()).
 // Pass a language to get only that SDK; omit it to get both.
 export function getDatatableSdkReference(language?: string): string {
diff --git a/system_prompts/auto-generated/prompts.d.ts b/system_prompts/auto-generated/prompts.d.ts
index 32ddcdc4bd..e74555504e 100644
--- a/system_prompts/auto-generated/prompts.d.ts
+++ b/system_prompts/auto-generated/prompts.d.ts
@@ -1,34 +1,37 @@
-export declare const SCRIPT_BASE = "# Windmill Script Writing Guide\n\n## General Principles\n\n- Scripts must export a main function (do not call it)\n- Libraries are installed automatically - do not show installation instructions\n- Credentials and configuration are stored in resources and passed as parameters\n- The windmill client (`wmill`) provides APIs for interacting with the platform\n\n## Function Naming\n\n- Main function: `main` (or `preprocessor` for preprocessor scripts)\n- Must be async for TypeScript variants\n\n## Return Values\n\n- Scripts can return any JSON-serializable value\n- Return values become available to subsequent flow steps via `results.step_id`\n\n## Preprocessor Scripts\n\nPreprocessor scripts process raw trigger data from various sources (webhook, custom HTTP route, SQS, WebSocket, Kafka, NATS, MQTT, Postgres, or email) before passing it to the flow. This separates the trigger logic from the flow logic and keeps the auto-generated UI clean.\n\nThe returned object determines the parameter values passed to the flow.\ne.g., `{ b: 1, a: 2 }` calls the flow with `a = 2` and `b = 1`, assuming the flow has two inputs called `a` and `b`.\n\nThe preprocessor receives a single parameter called `event`.\n";
-export declare const FLOW_BASE = "# Windmill Flow Building Guide\n\n## OpenFlow Schema\n\nThe OpenFlow schema (openflow.openapi.yaml) is the source of truth for flow structure. Refer to OPENFLOW_SCHEMA for the complete type definitions.\n\n## Reserved Module IDs\n\n- `failure` - Reserved for failure handler module\n- `preprocessor` - Reserved for preprocessor module\n- `Input` - Reserved for flow input reference\n\n## Hard Structural Rules\n\nThese are strict Windmill schema rules. Follow them exactly.\n\n- `value.modules` is only for normal sequential steps\n- `value.preprocessor_module` and `value.failure_module` are special top-level fields inside `value`, not entries in `value.modules`\n- If a flow needs a preprocessor, create `value.preprocessor_module` with `id: preprocessor`\n- If a flow needs a failure handler, create `value.failure_module` with `id: failure`\n- Do NOT create regular modules inside `value.modules` named `preprocessor` or `failure`\n- `preprocessor_module` and `failure_module` only support `script` or `rawscript`\n- `preprocessor_module` runs before normal modules and cannot reference `results.*`\n- `failure_module` can use the `error` object with `error.message`, `error.step_id`, `error.name`, and `error.stack`\n\nCorrect shape:\n\n```yaml\nvalue:\n  preprocessor_module:\n    id: preprocessor\n    value:\n      type: rawscript\n      ...\n  failure_module:\n    id: failure\n    value:\n      type: rawscript\n      ...\n  modules:\n    - id: process_event\n      value:\n        type: rawscript\n        ...\n```\n\nIncorrect shape:\n\n```yaml\nvalue:\n  modules:\n    - id: preprocessor\n      ...\n    - id: process_event\n      ...\n    - id: failure\n      ...\n```\n\n## Module ID Rules\n\n- Must be unique across the entire flow\n- Use underscores, not spaces (e.g., `fetch_data` not `fetch data`)\n- Use descriptive names that reflect the step's purpose\n\n## Common Mistakes to Avoid\n\n- Missing `input_transforms` - Rawscript parameters won't receive values without them\n- Referencing future steps - `results.step_id` only works for steps that execute before the current one\n- Duplicate module IDs - Each module ID must be unique in the flow\n\n## Data Flow Between Steps\n\n- `flow_input.property` - Access flow input parameters\n- `results.step_id` - Access output from a previous step only when that step result is in scope\n- `results.step_id.property` - Access specific property from a previous step output only when that step result is in scope\n- `flow_input.iter.value` - Current iteration value when inside a loop (`forloopflow` or `whileloopflow`)\n- `flow_input.iter.index` - Current loop index when inside a loop (`forloopflow` or `whileloopflow`)\n\n## Loop Structure Rules\n\n- For `whileloopflow`, use module-level `stop_after_if` on the loop module itself when the loop should stop after an iteration result\n- Do NOT put `stop_after_if` inside `value` of a `whileloopflow`\n- `stop_after_all_iters_if` is for checks after the whole loop finishes, not the normal per-iteration break condition\n- When a `whileloopflow` carries state forward between iterations, use `flow_input.iter.value` as the current loop value and provide an explicit first-iteration fallback when needed\n- Use `flow_input.iter.index` only when the loop logic is truly based on the iteration index, not as a replacement for the current loop value\n- If the user asks for a final scalar/object after a loop, add a normal step after the loop that extracts the final value from the loop result instead of returning the whole loop result array\n\nCorrect `whileloopflow` shape:\n\n```yaml\n- id: loop_until_done\n  stop_after_if:\n    expr: result.done === true\n    skip_if_stopped: false\n  value:\n    type: whileloopflow\n    skip_failures: false\n    modules:\n      - id: advance_state\n        value:\n          type: rawscript\n          input_transforms:\n            state:\n              type: javascript\n              expr: flow_input.iter && flow_input.iter.value !== undefined ? flow_input.iter.value : flow_input.initial_state\n- id: return_final_state\n  value:\n    type: rawscript\n    input_transforms:\n      final_state:\n        type: javascript\n        expr: results.loop_until_done[results.loop_until_done.length - 1]\n```\n\nIncorrect `whileloopflow` patterns:\n\n```yaml\n- id: loop_until_done\n  value:\n    type: whileloopflow\n    stop_after_if:\n      expr: result.done === true\n```\n\n```yaml\ninput_transforms:\n  state:\n    type: javascript\n    expr: flow_input.iter.index\n```\n\n```yaml\ninput_transforms:\n  final_state:\n    type: javascript\n    expr: results.loop_until_done\n```\n\n## Approval / Suspend Structure\n\n- `suspend` belongs on the flow module object itself, as a sibling of `id` and `value`\n- Never put `suspend` inside `value`\n\nCorrect shape:\n\n```yaml\n- id: request_approval\n  suspend:\n    required_events: 1\n    resume_form:\n      schema:\n        type: object\n        properties:\n          comment:\n            type: string\n        required: [comment]\n  value:\n    type: identity\n```\n\nIncorrect shape:\n\n```yaml\n- id: request_approval\n  value:\n    type: rawscript\n    suspend:\n      required_events: 1\n```\n\n## Branch Result Scope Rules\n\n- Inside a branch, you may reference earlier outer steps and earlier steps in the same branch\n- Outside a `branchone`, do NOT reference ids of steps that only exist inside its branches or default branch. Use `results.<branchone_module_id>` instead\n- Outside a `branchall`, do NOT reference ids of steps inside its branches. Use `results.<branchall_module_id>` instead\n- If downstream steps need a stable shape after a branch, make each branch return the same fields\n- When needed, add a normalization step immediately after the branch and consume `results.<branch_module_id>` there\n\nCorrect after `branchone`:\n\n```yaml\n- id: route_order\n  value:\n    type: branchone\n    ...\n- id: send_confirmation\n  value:\n    input_transforms:\n      routed:\n        type: javascript\n        expr: results.route_order\n```\n\nIncorrect after `branchone`:\n\n```yaml\nexpr: results.create_shipment\nexpr: results.create_backorder\n```\n\nCorrect after `branchall`:\n\n```yaml\n- id: enrich_parallel\n  value:\n    type: branchall\n    parallel: true\n    ...\n- id: combine_data\n  value:\n    input_transforms:\n      enrichments:\n        type: javascript\n        expr: results.enrich_parallel\n```\n\n## Input Transforms\n\nEvery rawscript module needs `input_transforms` to map function parameters to values:\n\nStatic transform (fixed value):\n{\"param_name\": {\"type\": \"static\", \"value\": \"fixed_string\"}}\n\nJavaScript transform (dynamic expression):\n{\"param_name\": {\"type\": \"javascript\", \"expr\": \"results.previous_step.data\"}}\n\n## Resource References\n\n- For flow inputs: Use type `\"object\"` with format `\"resource-{type}\"` (e.g., `\"resource-postgresql\"`)\n- For step inputs: Use static value `\"$res:path/to/resource\"`\n\n## Final Structural Self-Check\n\nBefore finalizing a flow, verify:\n\n- any preprocessor is in `value.preprocessor_module`\n- any failure handler is in `value.failure_module`\n- any approval step has module-level `suspend`\n- no downstream step references inner branch step ids from outside the branch\n\n## S3 Object Operations\n\nWindmill provides built-in support for S3-compatible storage operations.\n\nTo accept an S3 object as flow input:\n\n```json\n{\n  \"type\": \"object\",\n  \"properties\": {\n    \"file\": {\n      \"type\": \"object\",\n      \"format\": \"resource-s3_object\",\n      \"description\": \"File to process\"\n    }\n  }\n}\n```\n\n## Using Resources in Flows\n\nOn Windmill, credentials and configuration are stored in resources. Resource types define the format of the resource.\n\n### As Flow Input\n\nIn the flow schema, set the property type to `\"object\"` with format `\"resource-{type}\"`:\n\n```json\n{\n  \"type\": \"object\",\n  \"properties\": {\n    \"database\": {\n      \"type\": \"object\",\n      \"format\": \"resource-postgresql\",\n      \"description\": \"Database connection\"\n    }\n  }\n}\n```\n\n### As Step Input (Static Reference)\n\nReference a specific resource using `$res:` prefix:\n\n```json\n{\n  \"database\": {\n    \"type\": \"static\",\n    \"value\": \"$res:f/folder/my_database\"\n  }\n}\n```\n";
-export declare const RESOURCES_BASE = "# Windmill Resources\n\nResources store credentials and configuration for external services.\n\n## File Format\n\nResource files use the pattern: `{path}.resource.json`\n\nExample: `f/databases/postgres_prod.resource.json`\n\n## Resource Structure\n\n```json\n{\n  \"value\": {\n    \"host\": \"db.example.com\",\n    \"port\": 5432,\n    \"user\": \"admin\",\n    \"password\": \"$var:g/all/db_password\",\n    \"dbname\": \"production\"\n  },\n  \"description\": \"Production PostgreSQL database\",\n  \"resource_type\": \"postgresql\"\n}\n```\n\n## Required Fields\n\n- `value` - Object containing the resource configuration\n- `resource_type` - Name of the resource type (e.g., \"postgresql\", \"slack\")\n\n## Variable References\n\nReference variables in resource values:\n\n```json\n{\n  \"value\": {\n    \"api_key\": \"$var:g/all/api_key\",\n    \"secret\": \"$var:u/admin/secret\"\n  }\n}\n```\n\n**Reference formats:**\n- `$var:g/all/name` - Global variable\n- `$var:u/username/name` - User variable\n- `$var:f/folder/name` - Folder variable\n\n## Resource References\n\nReference other resources:\n\n```json\n{\n  \"value\": {\n    \"database\": \"$res:f/databases/postgres\"\n  }\n}\n```\n\n## Common Resource Types\n\n### PostgreSQL\n```json\n{\n  \"resource_type\": \"postgresql\",\n  \"value\": {\n    \"host\": \"localhost\",\n    \"port\": 5432,\n    \"user\": \"postgres\",\n    \"password\": \"$var:g/all/pg_password\",\n    \"dbname\": \"windmill\",\n    \"sslmode\": \"prefer\"\n  }\n}\n```\n\n### MySQL\n```json\n{\n  \"resource_type\": \"mysql\",\n  \"value\": {\n    \"host\": \"localhost\",\n    \"port\": 3306,\n    \"user\": \"root\",\n    \"password\": \"$var:g/all/mysql_password\",\n    \"database\": \"myapp\"\n  }\n}\n```\n\n### Slack\n```json\n{\n  \"resource_type\": \"slack\",\n  \"value\": {\n    \"token\": \"$var:g/all/slack_token\"\n  }\n}\n```\n\n### AWS S3\n```json\n{\n  \"resource_type\": \"s3\",\n  \"value\": {\n    \"bucket\": \"my-bucket\",\n    \"region\": \"us-east-1\",\n    \"accessKeyId\": \"$var:g/all/aws_access_key\",\n    \"secretAccessKey\": \"$var:g/all/aws_secret_key\"\n  }\n}\n```\n\n### HTTP/API\n```json\n{\n  \"resource_type\": \"http\",\n  \"value\": {\n    \"baseUrl\": \"https://api.example.com\",\n    \"headers\": {\n      \"Authorization\": \"Bearer $var:g/all/api_token\"\n    }\n  }\n}\n```\n\n### Kafka\n```json\n{\n  \"resource_type\": \"kafka\",\n  \"value\": {\n    \"brokers\": \"broker1:9092,broker2:9092\",\n    \"sasl_mechanism\": \"PLAIN\",\n    \"security_protocol\": \"SASL_SSL\",\n    \"username\": \"$var:g/all/kafka_user\",\n    \"password\": \"$var:g/all/kafka_password\"\n  }\n}\n```\n\n### NATS\n```json\n{\n  \"resource_type\": \"nats\",\n  \"value\": {\n    \"servers\": [\"nats://localhost:4222\"],\n    \"user\": \"$var:g/all/nats_user\",\n    \"password\": \"$var:g/all/nats_password\"\n  }\n}\n```\n\n### MQTT\n```json\n{\n  \"resource_type\": \"mqtt\",\n  \"value\": {\n    \"host\": \"mqtt.example.com\",\n    \"port\": 8883,\n    \"username\": \"$var:g/all/mqtt_user\",\n    \"password\": \"$var:g/all/mqtt_password\",\n    \"tls\": true\n  }\n}\n```\n\n## Custom Resource Types\n\nCreate custom resource types with JSON Schema:\n\n```json\n{\n  \"name\": \"custom_api\",\n  \"schema\": {\n    \"type\": \"object\",\n    \"properties\": {\n      \"base_url\": {\"type\": \"string\", \"format\": \"uri\"},\n      \"api_key\": {\"type\": \"string\"},\n      \"timeout\": {\"type\": \"integer\", \"default\": 30}\n    },\n    \"required\": [\"base_url\", \"api_key\"]\n  },\n  \"description\": \"Custom API connection\"\n}\n```\n\nSave as: `custom_api.resource-type.json`\n\n## OAuth Resources\n\nOAuth resources are managed through the Windmill UI and marked:\n\n```json\n{\n  \"is_oauth\": true,\n  \"account\": 123\n}\n```\n\nOAuth tokens are automatically refreshed by Windmill.\n\n## Using Resources in Scripts\n\n### TypeScript (Bun/Deno)\n```typescript\nexport async function main(db: RT.Postgresql) {\n  // db contains the resource values\n  const { host, port, user, password, dbname } = db;\n}\n```\n\n### Python\n```python\nclass postgresql(TypedDict):\n    host: str\n    port: int\n    user: str\n    password: str\n    dbname: str\n\ndef main(db: postgresql):\n    # db contains the resource values\n    pass\n```\n\n## CLI Commands\n\n```bash\n# List resources\nwmill resource list\n\n# List resource types with schemas\nwmill resource-type list --schema\n\n# Get specific resource type schema\nwmill resource-type get postgresql\n\n# Push resources (tell the user to run this, do NOT run it yourself)\nwmill sync push\n```\n";
-export declare const RAW_APP_BASE = "# Windmill Raw Apps\n\nRaw apps let you build custom frontends with React, Svelte, or Vue that connect to Windmill backend runnables and datatables.\n\n## App shape\n\nA raw app has three logical parts:\n\n- **Frontend** \u2014 bundled with esbuild from `index.tsx` as the entrypoint. Files include the entrypoint, components (`App.tsx`), styles, etc.\n- **Backend runnables** \u2014 server-side scripts the frontend calls, each addressed by a unique key.\n- **Data** \u2014 optional whitelisted datatables (managed PostgreSQL) that the backend runnables can query. The frontend never queries the database directly; backend runnables are the only bridge.\n\n## Frontend\n\n### Entrypoint\n\n`index.tsx` is the bundling entrypoint. It typically renders a top-level `App` component. The bundler is esbuild.\n\n### Generated bindings (`wmill.d.ts` / `wmill.ts`)\n\nThe frontend imports a generated module that mirrors the backend runnables. **Never write to it directly** \u2014 it gets regenerated whenever backend runnables change. Modifying it by hand will be overwritten.\n\n### Calling backend runnables\n\nImport the generated bindings and call the runnable like a function:\n\n```typescript\nimport { backend } from './wmill';\n\n// Call a backend runnable\nconst user = await backend.get_user({ user_id: '123' });\n```\n\nThe frontend cannot reach datatables, workspace items, or external services on its own \u2014 it goes through `backend.<key>(args)` for everything server-side.\n\n## Backend runnables\n\nEach runnable has a unique key (used to call it from the frontend) and one of four types:\n\n| Type | What it is |\n|---|---|\n| `inline` | Custom code stored on the app itself. Most common for app-specific logic. |\n| `script` | Reference to an existing workspace script by path. |\n| `flow` | Reference to an existing workspace flow by path. |\n| `hubscript` | Reference to a hub script by path. |\n\n### Inline runnables\n\nInline runnables carry their own source code. For file-based raw apps, the runnable language is determined by the backend file extension. The script must expose a `main` function as its entrypoint.\n\n**TypeScript example** (`backend/get_user.ts`):\n\n```typescript\nimport * as wmill from 'windmill-client';\n\nexport async function main(user_id: string) {\n  const sql = wmill.datatable();\n  const user = await sql`SELECT * FROM users WHERE id = ${user_id}`.fetchOne();\n  return user;\n}\n```\n\n**Python example** (`backend/get_user.py`):\n\n```python\nimport wmill\n\ndef main(user_id: str):\n    db = wmill.datatable()\n    user = db.query('SELECT * FROM users WHERE id = $1', user_id).fetch_one()\n    return user\n```\n\n### Path runnables (script / flow / hubscript)\n\nWhen `type` is `script`, `flow`, or `hubscript`, the runnable just stores a `path` to an existing workspace or hub item \u2014 no inline code. The referenced item's input/output schema becomes the runnable's surface.\n\n### Static inputs\n\n`staticInputs` is an optional `Record<string, any>` for arguments not overridable from the frontend. Useful with path runnables to pre-fill some args while leaving the rest to the frontend caller.\n\n## Data Tables\n\nData tables are PostgreSQL databases managed by Windmill. Backend runnables query them via the `wmill` client; the frontend never queries them directly.\n\n### Critical rules\n\n1. **Whitelisted tables only**: a runnable can only query tables listed in the app's `data.tables` config. Tables not in this list are not accessible.\n2. **Add tables before using**: queries against unlisted tables fail at runtime. When you introduce a new table, register it in `data.tables` first.\n3. **Use the configured datatable/schema**: the app's `data` config sets the default datatable and schema; reference them consistently across runnables.\n\n### Querying in TypeScript (Bun/Deno)\n\n```typescript\nimport * as wmill from 'windmill-client';\n\nexport async function main(user_id: string) {\n  const sql = wmill.datatable();  // Or: wmill.datatable('other_datatable')\n\n  // Parameterized queries (safe from SQL injection)\n  const user = await sql`SELECT * FROM users WHERE id = ${user_id}`.fetchOne();\n  const users = await sql`SELECT * FROM users WHERE active = ${true}`.fetch();\n\n  // Insert/Update\n  await sql`INSERT INTO users (name, email) VALUES (${name}, ${email})`;\n  await sql`UPDATE users SET name = ${newName} WHERE id = ${user_id}`;\n\n  return user;\n}\n```\n\n### Querying in Python\n\n```python\nimport wmill\n\ndef main(user_id: str):\n    db = wmill.datatable()  # Or: wmill.datatable('other_datatable')\n\n    # Use $1, $2, etc. for parameters\n    user = db.query('SELECT * FROM users WHERE id = $1', user_id).fetch_one()\n    users = db.query('SELECT * FROM users WHERE active = $1', True).fetch()\n\n    # Insert/Update\n    db.query('INSERT INTO users (name, email) VALUES ($1, $2)', name, email)\n    db.query('UPDATE users SET name = $1 WHERE id = $2', new_name, user_id)\n\n    return user\n```\n\n## Best Practices\n\n1. **Check existing tables** before creating new ones \u2014 reuse beats schema growth.\n2. **Use parameterized queries** \u2014 never concatenate user input into SQL.\n3. **Keep runnables focused** \u2014 one function per runnable; small surface area.\n4. **Use descriptive keys** \u2014 `get_user`, not `a`.\n5. **Always whitelist tables** \u2014 adding a runnable that queries a new table requires the table to be in `data.tables` first.\n";
-export declare const WORKFLOW_AS_CODE_BASE = "# Windmill Workflow-as-Code Writing Guide\n\n## Scope\n\nUse this guide when writing or modifying Windmill Workflow-as-Code (WAC) scripts.\nWAC is authored as a Windmill script and deployed with the normal script workflow. It is not an OpenFlow YAML flow.\n\nSupported WAC authoring targets:\n- Bun TypeScript scripts that import from `windmill-client`\n- Python 3 scripts that import from `wmill`\n\n## File Shape\n\nBun TypeScript:\n\n```typescript\nimport {\n  task,\n  taskScript,\n  taskFlow,\n  step,\n  sleep,\n  waitForApproval,\n  getResumeUrls,\n  parallel,\n  workflow,\n} from \"windmill-client\";\n\nconst process = task(async (x: string): Promise<string> => {\n  return `processed: ${x}`;\n});\n\nexport const main = workflow(async (x: string) => {\n  const result = await process(x);\n  return { result };\n});\n```\n\nPython:\n\n```python\nfrom wmill import task, task_script, task_flow, step, sleep, wait_for_approval, get_resume_urls, parallel, workflow\n\n@task()\nasync def process(x: str) -> str:\n    return f\"processed: {x}\"\n\n@workflow\nasync def main(x: str):\n    result = await process(x)\n    return {\"result\": result}\n```\n\nRules:\n- Do not call `main`.\n- Bun TypeScript should export the workflow entrypoint, preferably `export const main = workflow(async (...) => { ... })`.\n- Python must use `@workflow` on an async top-level function, usually `main`.\n- Define task functions and `taskScript`/`task_script` or `taskFlow`/`task_flow` assignments at module top level with stable names.\n- Use the exact SDK names. Do not alias `workflow`, `task`, `taskScript`, `taskFlow`, `step`, `sleep`, `waitForApproval`, `task_script`, `task_flow`, or `wait_for_approval`; the WAC parser recognizes these names directly.\n\n## Checkpoint And Replay Model\n\nThe parent workflow may rerun from the top after any suspension, retry, approval, or child task completion. Completed durable steps are replayed from the checkpoint.\n\nPut every side effect or non-deterministic value behind a durable WAC boundary:\n- Use `task()` / `@task()` for substantial work that should run as its own child job.\n- Use `taskScript()` / `task_script()` for an existing script or a relative module file.\n- Use `taskFlow()` / `task_flow()` for an existing Windmill flow.\n- Use `step(name, fn)` for lightweight inline work whose result must be checkpointed.\n- Use `sleep(seconds)` for server-side sleeps that do not hold a worker.\n- Use `waitForApproval()` / `wait_for_approval()` for external approval suspension.\n\nNever put API calls, database writes, notifications, random values, timestamps, or irreversible changes directly in the top-level workflow body. The workflow body can be rerun. Put those operations in a task or in `step()`.\n\nBranching on task or step results is safe because those results are checkpointed. Branching on current time, random data, environment reads, or external state is unsafe unless the value is first captured with `step()`.\n\n## Tasks\n\nUse `task()` / `@task()` for inline functions that become workflow steps:\n\n```typescript\nconst enrich = task(async (customerId: string) => {\n  return await fetchCustomer(customerId);\n});\n```\n\n```python\n@task(timeout=600, tag=\"etl\")\nasync def enrich(customer_id: str):\n    return await fetch_customer(customer_id)\n```\n\nIn TypeScript, prefer assigning each task to a named top-level const. In Python, prefer top-level async functions decorated with `@task()` or `@task`.\n\nFor existing scripts:\n\n```typescript\nconst helper = taskScript(\"./helper.ts\");\nconst existing = taskScript(\"f/data/extract\", { timeout: 600 });\nconst value = await helper({ input: x });\n```\n\n```python\nhelper = task_script(\"./helper.py\")\nexisting = task_script(\"f/data/extract\", timeout=600)\nvalue = await helper(input=x)\n```\n\nFor existing flows:\n\n```typescript\nconst pipeline = taskFlow(\"f/etl/pipeline\");\nconst output = await pipeline({ input: data });\n```\n\n```python\npipeline = task_flow(\"f/etl/pipeline\")\noutput = await pipeline(input=data)\n```\n\n## Inline Steps\n\nUse `step()` for lightweight inline values that must not change during replay:\n\n```typescript\nconst urls = await step(\"get_urls\", () => getResumeUrls());\nconst startedAt = await step(\"started_at\", () => new Date().toISOString());\n```\n\n```python\nurls = await step(\"get_urls\", lambda: get_resume_urls())\n```\n\nUse stable, descriptive step names. Do not generate step names dynamically.\n\n## Parallelism\n\nTo run independent work in parallel, start task promises/coroutines before awaiting them together:\n\n```typescript\nconst [a, b] = await Promise.all([process(\"a\"), process(\"b\")]);\nconst many = await parallel(items, process, { concurrency: 5 });\n```\n\n```python\nimport asyncio\n\na, b = await asyncio.gather(process(\"a\"), process(\"b\"))\nmany = await parallel(items, process, concurrency=5)\n```\n\nOnly parallelize independent steps. Do not read the result of a task before it is awaited.\n\n## Approvals\n\nGenerate resume URLs inside `step()` before sending them:\n\n```typescript\nconst urls = await step(\"get_urls\", () => getResumeUrls());\nawait step(\"notify\", () => sendApprovalEmail(urls.approvalPage));\nconst approval = await waitForApproval({ timeout: 3600 });\n```\n\n```python\nurls = await step(\"get_urls\", lambda: get_resume_urls())\nawait step(\"notify\", lambda: send_approval_email(urls[\"approvalPage\"]))\napproval = await wait_for_approval(timeout=3600)\n```\n\n`selfApproval: false` and `self_approval=False` are Enterprise-only approval behavior. Do not use them unless the user asks for that behavior.\n\n## Error Handling\n\nLet task errors fail the workflow unless the user asks for recovery logic.\n\nPython: `except Exception` is safe around WAC calls because internal suspension inherits from `BaseException`. Avoid bare `except:` in workflow code. If the user asks for recovery logic around failed child work, catch `TaskError` from `wmill` for task failures.\n\nTypeScript: avoid broad `try/catch` around WAC SDK calls. The SDK uses an internal suspension error during initial dispatch; catching it can break workflow suspension. If a broad catch is unavoidable, rethrow internal suspension errors before handling business errors.\n";
-export declare const FLOW_CHAT_SPECIAL_MODULES = "## Special Modules\n\n- Use `set_preprocessor_module` to add, replace, or remove the top-level `value.preprocessor_module`\n- Use `set_failure_module` to add, replace, or remove the top-level `value.failure_module`\n- Use `set_flow_json` only when you are replacing the whole flow, including normal modules and optional special modules\n\n**Example - Update only the special modules:**\n```javascript\nset_preprocessor_module({\n  module: JSON.stringify({\n    id: \"preprocessor\",\n    value: {\n      type: \"rawscript\",\n      language: \"bun\",\n      content: \"export async function preprocessor(payload: string) { const trimmed = payload.trim(); if (!trimmed) { throw new Error('payload must not be empty'); } return { payload: trimmed }; }\",\n      input_transforms: {\n        payload: { type: \"javascript\", expr: \"flow_input.payload\" }\n      }\n    }\n  })\n})\n\nset_failure_module({\n  module: JSON.stringify({\n    id: \"failure\",\n    value: {\n      type: \"rawscript\",\n      language: \"bun\",\n      content: \"export async function main(message: string, name: string, step_id: string) { return { message, name, step_id }; }\",\n      input_transforms: {\n        message: { type: \"javascript\", expr: \"error.message\" },\n        name: { type: \"javascript\", expr: \"error.name\" },\n        step_id: { type: \"javascript\", expr: \"error.step_id\" }\n      }\n    }\n  })\n})\n```\n";
-export declare const SDK_TYPESCRIPT = "# TypeScript SDK (windmill-client)\n\nImport: import * as wmill from 'windmill-client'\n\nworkerHasInternalServer(): boolean\n\n/**\n * Initialize the Windmill client with authentication token and base URL\n * @param token - Authentication token (defaults to WM_TOKEN env variable)\n * @param baseUrl - API base URL (defaults to BASE_INTERNAL_URL or BASE_URL env variable)\n */\nsetClient(token?: string, baseUrl?: string): void\n\n/**\n * Create a client configuration from env variables\n * @returns client configuration\n */\ngetWorkspace(): string\n\n/**\n * Get a resource value by path\n * @param path path of the resource,  default to internal state path\n * @param undefinedIfEmpty if the resource does not exist, return undefined instead of throwing an error\n * @returns resource value\n */\nasync getResource(path?: string, undefinedIfEmpty?: boolean): Promise<any>\n\n/**\n * Get the true root job id\n * @param jobId job id to get the root job id from (default to current job)\n * @returns root job id\n */\nasync getRootJobId(jobId?: string): Promise<string>\n\n/**\n * @deprecated Use runScriptByPath or runScriptByHash instead\n */\nasync runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>\n\n/**\n * Run a script synchronously by its path and wait for the result\n * @param path - Script path in Windmill\n * @param args - Arguments to pass to the script\n * @param verbose - Enable verbose logging\n * @returns Script execution result\n */\nasync runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>\n\n/**\n * Run a script synchronously by its hash and wait for the result\n * @param hash_ - Script hash in Windmill\n * @param args - Arguments to pass to the script\n * @param verbose - Enable verbose logging\n * @returns Script execution result\n */\nasync runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>\n\n/**\n * Append a text to the result stream\n * @param text text to append to the result stream\n */\nappendToResultStream(text: string): void\n\n/**\n * Stream to the result stream\n * @param stream stream to stream to the result stream\n */\nasync streamResult(stream: AsyncIterable<string>): Promise<void>\n\n/**\n * Run a flow synchronously by its path and wait for the result\n * @param path - Flow path in Windmill\n * @param args - Arguments to pass to the flow\n * @param verbose - Enable verbose logging\n * @returns Flow execution result\n */\nasync runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>\n\n/**\n * Wait for a job to complete and return its result\n * @param jobId - ID of the job to wait for\n * @param verbose - Enable verbose logging\n * @returns Job result when completed\n */\nasync waitJob(jobId: string, verbose: boolean = false): Promise<any>\n\n/**\n * Get the result of a completed job\n * @param jobId - ID of the completed job\n * @returns Job result\n */\nasync getResult(jobId: string): Promise<any>\n\n/**\n * Get the result of a job if completed, or its current status\n * @param jobId - ID of the job\n * @returns Object with started, completed, success, and result properties\n */\nasync getResultMaybe(jobId: string): Promise<any>\n\n/**\n * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead\n */\nasync runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>\n\n/**\n * Run a script asynchronously by its path\n * @param path - Script path in Windmill\n * @param args - Arguments to pass to the script\n * @param scheduledInSeconds - Schedule execution for a future time (in seconds)\n * @returns Job ID of the created job\n */\nasync runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>\n\n/**\n * Run a script asynchronously by its hash\n * @param hash_ - Script hash in Windmill\n * @param args - Arguments to pass to the script\n * @param scheduledInSeconds - Schedule execution for a future time (in seconds)\n * @returns Job ID of the created job\n */\nasync runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>\n\n/**\n * Run a flow asynchronously by its path\n * @param path - Flow path in Windmill\n * @param args - Arguments to pass to the flow\n * @param scheduledInSeconds - Schedule execution for a future time (in seconds)\n * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)\n * @returns Job ID of the created job\n */\nasync runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>\n\n/**\n * Resolve a resource value in case the default value was picked because the input payload was undefined\n * @param obj resource value or path of the resource under the format `$res:path`\n * @returns resource value\n */\nasync resolveDefaultResource(obj: any): Promise<any>\n\n/**\n * Get the state file path from environment variables\n * @returns State path string\n */\ngetStatePath(): string\n\n/**\n * Set a resource value by path\n * @param path path of the resource to set, default to state path\n * @param value new value of the resource to set\n * @param initializeToTypeIfNotExist if the resource does not exist, initialize it with this type\n */\nasync setResource(value: any, path?: string, initializeToTypeIfNotExist?: string): Promise<void>\n\n/**\n * Set the state\n * @param state state to set\n * @deprecated use setState instead\n */\nasync setInternalState(state: any): Promise<void>\n\n/**\n * Set the state\n * @param state state to set\n * @param path Optional state resource path override. Defaults to `getStatePath()`.\n */\nasync setState(state: any, path?: string): Promise<void>\n\n/**\n * Set the progress\n * Progress cannot go back and limited to 0% to 99% range\n * @param percent Progress to set in %\n * @param jobId? Job to set progress for\n */\nasync setProgress(percent: number, jobId?: any): Promise<void>\n\n/**\n * Get the progress\n * @param jobId? Job to get progress from\n * @returns Optional clamped between 0 and 100 progress value\n */\nasync getProgress(jobId?: any): Promise<number | null>\n\n/**\n * Set a flow user state\n * @param key key of the state\n * @param value value of the state\n */\nasync setFlowUserState(key: string, value: any, errorIfNotPossible?: boolean): Promise<void>\n\n/**\n * Get a flow user state\n * @param path path of the variable\n */\nasync getFlowUserState(key: string, errorIfNotPossible?: boolean): Promise<any>\n\n/**\n * Get the internal state\n * @deprecated use getState instead\n */\nasync getInternalState(): Promise<any>\n\n/**\n * Get the state shared across executions\n * @param path Optional state resource path override. Defaults to `getStatePath()`.\n */\nasync getState(path?: string): Promise<any>\n\n/**\n * Get a variable by path\n * @param path path of the variable\n * @returns variable value\n */\nasync getVariable(path: string): Promise<string>\n\n/**\n * Set a variable by path, create if not exist\n * @param path path of the variable\n * @param value value of the variable\n * @param isSecretIfNotExist if the variable does not exist, create it as secret or not (default: false)\n * @param descriptionIfNotExist if the variable does not exist, create it with this description (default: \"\")\n */\nasync setVariable(path: string, value: string, isSecretIfNotExist?: boolean, descriptionIfNotExist?: string): Promise<void>\n\n/**\n * Build a PostgreSQL connection URL from a database resource\n * @param path - Path to the database resource\n * @returns PostgreSQL connection URL string\n */\nasync databaseUrlFromResource(path: string): Promise<string>\n\nasync polarsConnectionSettings(s3_resource_path: string | undefined): Promise<any>\n\nasync duckdbConnectionSettings(s3_resource_path: string | undefined): Promise<any>\n\n/**\n * Get S3 client settings from a resource or workspace default\n * @param s3_resource_path - Path to S3 resource (uses workspace default if undefined)\n * @returns S3 client configuration settings\n */\nasync denoS3LightClientSettings(s3_resource_path: string | undefined): Promise<DenoS3LightClientSettings>\n\n/**\n * Load the content of a file stored in S3. If the s3ResourcePath is undefined, it will default to the workspace S3 resource.\n * \n * ```typescript\n * let fileContent = await wmill.loadS3FileContent(inputFile)\n * // if the file is a raw text file, it can be decoded and printed directly:\n * const text = new TextDecoder().decode(fileContentStream)\n * console.log(text);\n * ```\n */\nasync loadS3File(s3object: S3Object, s3ResourcePath: string | undefined = undefined): Promise<Uint8Array | undefined>\n\n/**\n * Load the content of a file stored in S3 as a stream. If the s3ResourcePath is undefined, it will default to the workspace S3 resource.\n * \n * ```typescript\n * let fileContentBlob = await wmill.loadS3FileStream(inputFile)\n * // if the content is plain text, the blob can be read directly:\n * console.log(await fileContentBlob.text());\n * ```\n */\nasync loadS3FileStream(s3object: S3Object, s3ResourcePath: string | undefined = undefined): Promise<Blob | undefined>\n\n/**\n * Persist a file to the S3 bucket. If the s3ResourcePath is undefined, it will default to the workspace S3 resource.\n * \n * ```typescript\n * const s3object = await writeS3File(s3Object, \"Hello Windmill!\")\n * const fileContentAsUtf8Str = (await s3object.toArray()).toString('utf-8')\n * console.log(fileContentAsUtf8Str)\n * ```\n */\nasync writeS3File(s3object: S3Object | undefined, fileContent: string | Blob, s3ResourcePath: string | undefined = undefined, contentType: string | undefined = undefined, contentDisposition: string | undefined = undefined): Promise<S3Object>\n\n/**\n * Sign S3 objects to be used by anonymous users in public apps\n * @param s3objects s3 objects to sign\n * @returns signed s3 objects\n */\nasync signS3Objects(s3objects: S3Object[]): Promise<S3Object[]>\n\n/**\n * Sign S3 object to be used by anonymous users in public apps\n * @param s3object s3 object to sign\n * @returns signed s3 object\n */\nasync signS3Object(s3object: S3Object): Promise<S3Object>\n\n/**\n * Generate a presigned public URL for an array of S3 objects.\n * If an S3 object is not signed yet, it will be signed first.\n * @param s3Objects s3 objects to sign\n * @returns list of signed public URLs\n */\nasync getPresignedS3PublicUrls(s3Objects: S3Object[], { baseUrl }: { baseUrl?: string } = {}): Promise<string[]>\n\n/**\n * Generate a presigned public URL for an S3 object. If the S3 object is not signed yet, it will be signed first.\n * @param s3Object s3 object to sign\n * @returns signed public URL\n */\nasync getPresignedS3PublicUrl(s3Objects: S3Object, { baseUrl }: { baseUrl?: string } = {}): Promise<string>\n\n/**\n * Get URLs needed for resuming a flow after this step\n * @param approver approver name\n * @param flowLevel if true, generate resume URLs for the parent flow instead of the specific step.\n *                  This allows pre-approvals that can be consumed by any later suspend step in the same flow.\n * @returns approval page UI URL, resume and cancel API URLs for resuming the flow\n */\nasync getResumeUrls(approver?: string, flowLevel?: boolean): Promise<{\n  approvalPage: string;\n  resume: string;\n  cancel: string;\n}>\n\n/**\n * @deprecated use getResumeUrls instead\n */\ngetResumeEndpoints(approver?: string): Promise<{\n  approvalPage: string;\n  resume: string;\n  cancel: string;\n}>\n\n/**\n * Get an OIDC jwt token for auth to external services (e.g: Vault, AWS) (ee only)\n * @param audience audience of the token\n * @param expiresIn Optional number of seconds until the token expires\n * @returns jwt token\n */\nasync getIdToken(audience: string, expiresIn?: number): Promise<string>\n\n/**\n * Convert a base64-encoded string to Uint8Array\n * @param data - Base64-encoded string\n * @returns Decoded Uint8Array\n */\nbase64ToUint8Array(data: string): Uint8Array\n\n/**\n * Convert a Uint8Array to base64-encoded string\n * @param arrayBuffer - Uint8Array to encode\n * @returns Base64-encoded string\n */\nuint8ArrayToBase64(arrayBuffer: Uint8Array): string\n\n/**\n * Get email from workspace username\n * This method is particularly useful for apps that require the email address of the viewer.\n * Indeed, in the viewer context, WM_USERNAME is set to the username of the viewer but WM_EMAIL is set to the email of the creator of the app.\n * @param username\n * @returns email address\n */\nasync usernameToEmail(username: string): Promise<string>\n\n/**\n * Sends an interactive approval request via Slack, allowing optional customization of the message, approver, and form fields.\n * \n * **[Enterprise Edition Only]** To include form fields in the Slack approval request, go to **Advanced -> Suspend -> Form**\n * and define a form. Learn more at [Windmill Documentation](https://www.windmill.dev/docs/flows/flow_approval#form).\n * \n * @param {Object} options - The configuration options for the Slack approval request.\n * @param {string} options.slackResourcePath - The path to the Slack resource in Windmill.\n * @param {string} options.channelId - The Slack channel ID where the approval request will be sent.\n * @param {string} [options.message] - Optional custom message to include in the Slack approval request.\n * @param {string} [options.approver] - Optional user ID or name of the approver for the request.\n * @param {DefaultArgs} [options.defaultArgsJson] - Optional object defining or overriding the default arguments to a form field.\n * @param {Enums} [options.dynamicEnumsJson] - Optional object overriding the enum default values of an enum form field.\n * @param {string} [options.resumeButtonText] - Optional text for the resume button.\n * @param {string} [options.cancelButtonText] - Optional text for the cancel button.\n * \n * @returns {Promise<void>} Resolves when the Slack approval request is successfully sent.\n * \n * @throws {Error} If the function is not called within a flow or flow preview.\n * @throws {Error} If the `JobService.getSlackApprovalPayload` call fails.\n * \n * **Usage Example:**\n * ```typescript\n * await requestInteractiveSlackApproval({\n *   slackResourcePath: \"/u/alex/my_slack_resource\",\n *   channelId: \"admins-slack-channel\",\n *   message: \"Please approve this request\",\n *   approver: \"approver123\",\n *   defaultArgsJson: { key1: \"value1\", key2: 42 },\n *   dynamicEnumsJson: { foo: [\"choice1\", \"choice2\"], bar: [\"optionA\", \"optionB\"] },\n *   resumeButtonText: \"Resume\",\n *   cancelButtonText: \"Cancel\",\n * });\n * ```\n * \n * **Note:** This function requires execution within a Windmill flow or flow preview.\n */\nasync requestInteractiveSlackApproval({ slackResourcePath, channelId, message, approver, defaultArgsJson, dynamicEnumsJson, resumeButtonText, cancelButtonText, }: SlackApprovalOptions): Promise<void>\n\n/**\n * Sends an interactive approval request via Teams, allowing optional customization of the message, approver, and form fields.\n * \n * **[Enterprise Edition Only]** To include form fields in the Teams approval request, go to **Advanced -> Suspend -> Form**\n * and define a form. Learn more at [Windmill Documentation](https://www.windmill.dev/docs/flows/flow_approval#form).\n * \n * @param {Object} options - The configuration options for the Teams approval request.\n * @param {string} options.teamName - The Teams team name where the approval request will be sent.\n * @param {string} options.channelName - The Teams channel name where the approval request will be sent.\n * @param {string} [options.message] - Optional custom message to include in the Teams approval request.\n * @param {string} [options.approver] - Optional user ID or name of the approver for the request.\n * @param {DefaultArgs} [options.defaultArgsJson] - Optional object defining or overriding the default arguments to a form field.\n * @param {Enums} [options.dynamicEnumsJson] - Optional object overriding the enum default values of an enum form field.\n * \n * @returns {Promise<void>} Resolves when the Teams approval request is successfully sent.\n * \n * @throws {Error} If the function is not called within a flow or flow preview.\n * @throws {Error} If the `JobService.getTeamsApprovalPayload` call fails.\n * \n * **Usage Example:**\n * ```typescript\n * await requestInteractiveTeamsApproval({\n *   teamName: \"admins-teams\",\n *   channelName: \"admins-teams-channel\",\n *   message: \"Please approve this request\",\n *   approver: \"approver123\",\n *   defaultArgsJson: { key1: \"value1\", key2: 42 },\n *   dynamicEnumsJson: { foo: [\"choice1\", \"choice2\"], bar: [\"optionA\", \"optionB\"] },\n * });\n * ```\n * \n * **Note:** This function requires execution within a Windmill flow or flow preview.\n */\nasync requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>\n\n/**\n * Parse an S3 object from URI string or record format\n * @param s3Object - S3 object as URI string (s3://storage/key) or record\n * @returns S3 object record with storage and s3 key\n */\nparseS3Object(s3Object: S3Object): S3ObjectRecord\n\nsetWorkflowCtx(ctx: WorkflowCtx | null): void\n\nasync sleep(seconds: number): Promise<void>\n\nasync step<T>(name: string, fn: () => T | Promise<T>): Promise<T>\n\n/**\n * Create a task that dispatches to a separate Windmill script.\n * \n * @example\n * const extract = taskScript(\"f/data/extract\");\n * // inside workflow: await extract({ url: \"https://...\" })\n */\ntaskScript(path: string, options?: TaskOptions): (...args: any[]) => PromiseLike<any>\n\n/**\n * Create a task that dispatches to a separate Windmill flow.\n * \n * @example\n * const pipeline = taskFlow(\"f/etl/pipeline\");\n * // inside workflow: await pipeline({ input: data })\n */\ntaskFlow(path: string, options?: TaskOptions): (...args: any[]) => PromiseLike<any>\n\n/**\n * Mark an async function as a workflow-as-code entry point.\n * \n * The function must be **deterministic**: given the same inputs it must call\n * tasks in the same order on every replay. Branching on task results is fine\n * (results are replayed from checkpoint), but branching on external state\n * (current time, random values, external API calls) must use `step()` to\n * checkpoint the value so replays see the same result.\n */\nworkflow<T>(fn: (...args: any[]) => Promise<T>): void\n\n/**\n * Suspend the workflow and wait for an external approval.\n * \n * Use `getResumeUrls()` (wrapped in `step()`) to obtain resume/cancel/approvalPage\n * URLs before calling this function.\n * \n * @example\n * const urls = await step(\"urls\", () => getResumeUrls());\n * await step(\"notify\", () => sendEmail(urls.approvalPage));\n * const { value, approver } = await waitForApproval({ timeout: 3600 });\n */\nwaitForApproval(options?: { timeout?: number; form?: object; selfApproval?: boolean; }): PromiseLike<{ value: any; approver: string; approved: boolean }>\n\n/**\n * Process items in parallel with optional concurrency control.\n * \n * Each item is processed by calling `fn(item)`, which should be a task().\n * Items are dispatched in batches of `concurrency` (default: all at once).\n * \n * @example\n * const process = task(async (item: string) => { ... });\n * const results = await parallel(items, process, { concurrency: 5 });\n */\nasync parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?: { concurrency?: number },): Promise<R[]>\n\n/**\n * Commit Kafka offsets for a trigger with auto_commit disabled.\n * @param triggerPath - Path to the Kafka trigger (from event.wm_trigger.trigger_path)\n * @param topic - Kafka topic name (from event.topic)\n * @param partition - Partition number (from event.partition)\n * @param offset - Message offset to commit (from event.offset)\n */\nasync commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>\n\n/**\n * Create a SQL template function for PostgreSQL/datatable queries\n * @param name - Database/datatable name (default: \"main\")\n * @returns SQL template function for building parameterized queries\n * @example\n * let sql = wmill.datatable()\n * let name = 'Robin'\n * let age = 21\n * await sql`\n *   SELECT * FROM friends\n *     WHERE name = ${name} AND age = ${age}::int\n * `.fetch()\n */\ndatatable(name: string = \"main\"): DatatableSqlTemplateFunction\n\n/**\n * Create a SQL template function for DuckDB/ducklake queries\n * @param name - DuckDB database name (default: \"main\")\n * @returns SQL template function for building parameterized queries\n * @example\n * let sql = wmill.ducklake()\n * let name = 'Robin'\n * let age = 21\n * await sql`\n *   SELECT * FROM friends\n *     WHERE name = ${name} AND age = ${age}\n * `.fetch()\n */\nducklake(name: string = \"main\"): SqlTemplateFunction\n";
-export declare const SDK_PYTHON = "# Python SDK (wmill)\n\nImport: import wmill\n\ndef worker_has_internal_server() -> bool\n\ndef get_mocked_api() -> Optional[dict]\n\n# Get the HTTP client instance.\n# \n# Returns:\n#     Configured httpx.Client for API requests\ndef get_client() -> httpx.Client\n\n# Make an HTTP GET request to the Windmill API.\n# \n# Args:\n#     endpoint: API endpoint path\n#     raise_for_status: Whether to raise an exception on HTTP errors\n#     **kwargs: Additional arguments passed to httpx.get\n# \n# Returns:\n#     HTTP response object\ndef get(endpoint, raise_for_status = True, **kwargs) -> httpx.Response\n\n# Make an HTTP POST request to the Windmill API.\n# \n# Args:\n#     endpoint: API endpoint path\n#     raise_for_status: Whether to raise an exception on HTTP errors\n#     **kwargs: Additional arguments passed to httpx.post\n# \n# Returns:\n#     HTTP response object\ndef post(endpoint, raise_for_status = True, **kwargs) -> httpx.Response\n\n# Create a new authentication token.\n# \n# Args:\n#     duration: Token validity duration (default: 1 day)\n# \n# Returns:\n#     New authentication token string\ndef create_token(duration = dt.timedelta(days=1)) -> str\n\n# Create a script job and return its job id.\n# \n# .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.\ndef run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None) -> str\n\n# Create a script job by path and return its job id.\ndef run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None) -> str\n\n# Create a script job by hash and return its job id.\ndef run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None) -> str\n\n# Create a flow job and return its job id.\ndef run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True) -> str\n\n# Run script synchronously and return its result.\n# \n# .. deprecated:: Use run_script_by_path or run_script_by_hash instead.\ndef run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any\n\n# Run script by path synchronously and return its result.\ndef run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any\n\n# Run script by hash synchronously and return its result.\ndef run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any\n\n# Run a script on the current worker without creating a job.\n# \n# On agent workers (no internal server), falls back to running a normal\n# preview job and waiting for the result.\ndef run_inline_script_preview(content: str, language: str, args: dict = None) -> Any\n\n# Wait for a job to complete and return its result.\n# \n# Args:\n#     job_id: ID of the job to wait for\n#     timeout: Maximum time to wait (seconds or timedelta)\n#     verbose: Enable verbose logging\n#     cleanup: Register cleanup handler to cancel job on exit\n#     assert_result_is_not_none: Raise exception if result is None\n# \n# Returns:\n#     Job result when completed\n# \n# Raises:\n#     TimeoutError: If timeout is reached\n#     Exception: If job fails\ndef wait_job(job_id, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False)\n\n# Cancel a specific job by ID.\n# \n# Args:\n#     job_id: UUID of the job to cancel\n#     reason: Optional reason for cancellation\n# \n# Returns:\n#     Response message from the cancel endpoint\ndef cancel_job(job_id: str, reason: str = None) -> str\n\n# Cancel currently running executions of the same script.\ndef cancel_running() -> dict\n\n# Get job details by ID.\n# \n# Args:\n#     job_id: UUID of the job\n# \n# Returns:\n#     Job details dictionary\ndef get_job(job_id: str) -> dict\n\n# Get the root job ID for a flow hierarchy.\n# \n# Args:\n#     job_id: Job ID (defaults to current WM_JOB_ID)\n# \n# Returns:\n#     Root job ID\ndef get_root_job_id(job_id: str | None = None) -> dict\n\n# Get an OIDC JWT token for authentication to external services.\n# \n# Args:\n#     audience: Token audience (e.g., \"vault\", \"aws\")\n#     expires_in: Optional expiration time in seconds\n# \n# Returns:\n#     JWT token string\ndef get_id_token(audience: str, expires_in: int | None = None) -> str\n\n# Get the status of a job.\n# \n# Args:\n#     job_id: UUID of the job\n# \n# Returns:\n#     Job status: \"RUNNING\", \"WAITING\", or \"COMPLETED\"\ndef get_job_status(job_id: str) -> JobStatus\n\n# Get the result of a completed job.\n# \n# Args:\n#     job_id: UUID of the completed job\n#     assert_result_is_not_none: Raise exception if result is None\n# \n# Returns:\n#     Job result\ndef get_result(job_id: str, assert_result_is_not_none: bool = True) -> Any\n\n# Get a variable value by path.\n# \n# Args:\n#     path: Variable path in Windmill\n# \n# Returns:\n#     Variable value as string\ndef get_variable(path: str) -> str\n\n# Set a variable value by path, creating it if it doesn't exist.\n# \n# Args:\n#     path: Variable path in Windmill\n#     value: Variable value to set\n#     is_secret: Whether the variable should be secret (default: False)\ndef set_variable(path: str, value: str, is_secret: bool = False) -> None\n\n# Get a resource value by path.\n# \n# Args:\n#     path: Resource path in Windmill\n#     none_if_undefined: Return None instead of raising if not found\n#     interpolated: if variables and resources are fully unrolled\n# \n# Returns:\n#     Resource value dictionary or None\ndef get_resource(path: str, none_if_undefined: bool = False, interpolated: bool = True) -> dict | None\n\n# Set a resource value by path, creating it if it doesn't exist.\n# \n# Args:\n#     value: Resource value to set\n#     path: Resource path in Windmill\n#     resource_type: Resource type for creation\ndef set_resource(value: Any, path: str, resource_type: str)\n\n# List resources from Windmill workspace.\n# \n# Args:\n#     resource_type: Optional resource type to filter by (e.g., \"postgresql\", \"mysql\", \"s3\")\n#     page: Optional page number for pagination\n#     per_page: Optional number of results per page\n#     \n# Returns:\n#     List of resource dictionaries\ndef list_resources(resource_type: str = None, page: int = None, per_page: int = None) -> list[dict]\n\n# Set the workflow state.\n# \n# Args:\n#     value: State value to set\n#     path: Optional state resource path override.\ndef set_state(value: Any, path: str | None = None) -> None\n\n# Get the workflow state.\n# \n# Args:\n#     path: Optional state resource path override.\n# \n# Returns:\n#     State value or None if not set\ndef get_state(path: str | None = None) -> Any\n\n# Set job progress percentage (0-99).\n# \n# Args:\n#     value: Progress percentage\n#     job_id: Job ID (defaults to current WM_JOB_ID)\ndef set_progress(value: int, job_id: Optional[str] = None)\n\n# Get job progress percentage.\n# \n# Args:\n#     job_id: Job ID (defaults to current WM_JOB_ID)\n# \n# Returns:\n#     Progress value (0-100) or None if not set\ndef get_progress(job_id: Optional[str] = None) -> Any\n\n# Set the user state of a flow at a given key\ndef set_flow_user_state(key: str, value: Any) -> None\n\n# Get the user state of a flow at a given key\ndef get_flow_user_state(key: str) -> Any\n\n# Get the Windmill server version.\n# \n# Returns:\n#     Version string\ndef version()\n\n# Convenient helpers that takes an S3 resource as input and returns the settings necessary to\n# initiate an S3 connection from DuckDB\ndef get_duckdb_connection_settings(s3_resource_path: str = '') -> DuckDbConnectionSettings | None\n\n# Convenient helpers that takes an S3 resource as input and returns the settings necessary to\n# initiate an S3 connection from Polars\ndef get_polars_connection_settings(s3_resource_path: str = '') -> PolarsConnectionSettings\n\n# Convenient helpers that takes an S3 resource as input and returns the settings necessary to\n# initiate an S3 connection using boto3\ndef get_boto3_connection_settings(s3_resource_path: str = '') -> Boto3ConnectionSettings\n\n# Load a file from the workspace s3 bucket and returns its content as bytes.\n# \n# '''python\n# from wmill import S3Object\n# \n# s3_obj = S3Object(s3=\"/path/to/my_file.txt\")\n# my_obj_content = client.load_s3_file(s3_obj)\n# file_content = my_obj_content.decode(\"utf-8\")\n# '''\ndef load_s3_file(s3object: S3Object | str, s3_resource_path: str | None) -> bytes\n\n# Load a file from the workspace s3 bucket and returns the bytes stream.\n# \n# '''python\n# from wmill import S3Object\n# \n# s3_obj = S3Object(s3=\"/path/to/my_file.txt\")\n# with wmill.load_s3_file_reader(s3object, s3_resource_path) as file_reader:\n#     print(file_reader.read())\n# '''\ndef load_s3_file_reader(s3object: S3Object | str, s3_resource_path: str | None) -> BufferedReader\n\n# Write a file to the workspace S3 bucket\n# \n# '''python\n# from wmill import S3Object\n# \n# s3_obj = S3Object(s3=\"/path/to/my_file.txt\")\n# \n# # for an in memory bytes array:\n# file_content = b'Hello Windmill!'\n# client.write_s3_file(s3_obj, file_content)\n# \n# # for a file:\n# with open(\"my_file.txt\", \"rb\") as my_file:\n#     client.write_s3_file(s3_obj, my_file)\n# '''\ndef write_s3_file(s3object: S3Object | str | None, file_content: BufferedReader | bytes, s3_resource_path: str | None, content_type: str | None = None, content_disposition: str | None = None) -> S3Object\n\n# Permanently delete a file from the workspace S3 bucket.\n# \n# '''python\n# from wmill import S3Object\n# \n# s3_obj = S3Object(s3=\"/path/to/my_file.txt\")\n# client.delete_s3_object(s3_obj)\n# '''\ndef delete_s3_object(s3object: S3Object | str, s3_resource_path: str | None = None) -> None\n\n# Sign S3 objects for use by anonymous users in public apps.\n# \n# Args:\n#     s3_objects: List of S3 objects to sign\n# \n# Returns:\n#     List of signed S3 objects\ndef sign_s3_objects(s3_objects: list[S3Object | str]) -> list[S3Object]\n\n# Sign a single S3 object for use by anonymous users in public apps.\n# \n# Args:\n#     s3_object: S3 object to sign\n# \n# Returns:\n#     Signed S3 object\ndef sign_s3_object(s3_object: S3Object | str) -> S3Object\n\n# Generate presigned public URLs for an array of S3 objects.\n# If an S3 object is not signed yet, it will be signed first.\n# \n# Args:\n#     s3_objects: List of S3 objects to sign\n#     base_url: Optional base URL for the presigned URLs (defaults to WM_BASE_URL)\n# \n# Returns:\n#     List of signed public URLs\n# \n# Example:\n#     >>> s3_objs = [S3Object(s3=\"/path/to/file1.txt\"), S3Object(s3=\"/path/to/file2.txt\")]\n#     >>> urls = client.get_presigned_s3_public_urls(s3_objs)\ndef get_presigned_s3_public_urls(s3_objects: list[S3Object | str], base_url: str | None = None) -> list[str]\n\n# Generate a presigned public URL for an S3 object.\n# If the S3 object is not signed yet, it will be signed first.\n# \n# Args:\n#     s3_object: S3 object to sign\n#     base_url: Optional base URL for the presigned URL (defaults to WM_BASE_URL)\n# \n# Returns:\n#     Signed public URL\n# \n# Example:\n#     >>> s3_obj = S3Object(s3=\"/path/to/file.txt\")\n#     >>> url = client.get_presigned_s3_public_url(s3_obj)\ndef get_presigned_s3_public_url(s3_object: S3Object | str, base_url: str | None = None) -> str\n\n# Get the current user information.\n# \n# Returns:\n#     User details dictionary\ndef whoami() -> dict\n\n# Get the current user information (alias for whoami).\n# \n# Returns:\n#     User details dictionary\ndef user() -> dict\n\n# Get the state resource path from environment.\n# \n# Returns:\n#     State path string\ndef state_path() -> str\n\n# Get the workflow state.\n# \n# Returns:\n#     State value or None if not set\ndef state() -> Any\n\n# Set the state in the shared folder using pickle\ndef set_shared_state_pickle(value: Any, path: str = 'state.pickle') -> None\n\n# Get the state in the shared folder using pickle\ndef get_shared_state_pickle(path: str = 'state.pickle') -> Any\n\n# Set the state in the shared folder using pickle\ndef set_shared_state(value: Any, path: str = 'state.json') -> None\n\n# Get the state in the shared folder using pickle\ndef get_shared_state(path: str = 'state.json') -> None\n\n# Get URLs needed for resuming a flow after suspension.\n# \n# Args:\n#     approver: Optional approver name\n#     flow_level: If True, generate resume URLs for the parent flow instead of the\n#         specific step. This allows pre-approvals that can be consumed by any later\n#         suspend step in the same flow.\n# \n# Returns:\n#     Dictionary with approvalPage, resume, and cancel URLs\ndef get_resume_urls(approver: str = None, flow_level: bool = None) -> dict\n\n# Sends an interactive approval request via Slack, allowing optional customization of the message, approver, and form fields.\n# \n# **[Enterprise Edition Only]** To include form fields in the Slack approval request, use the \"Advanced -> Suspend -> Form\" functionality.\n# Learn more at: https://www.windmill.dev/docs/flows/flow_approval#form\n# \n# :param slack_resource_path: The path to the Slack resource in Windmill.\n# :type slack_resource_path: str\n# :param channel_id: The Slack channel ID where the approval request will be sent.\n# :type channel_id: str\n# :param message: Optional custom message to include in the Slack approval request.\n# :type message: str, optional\n# :param approver: Optional user ID or name of the approver for the request.\n# :type approver: str, optional\n# :param default_args_json: Optional dictionary defining or overriding the default arguments for form fields.\n# :type default_args_json: dict, optional\n# :param dynamic_enums_json: Optional dictionary overriding the enum default values of enum form fields.\n# :type dynamic_enums_json: dict, optional\n# \n# :raises Exception: If the function is not called within a flow or flow preview.\n# :raises Exception: If the required flow job or flow step environment variables are not set.\n# \n# :return: None\n# \n# **Usage Example:**\n#     >>> client.request_interactive_slack_approval(\n#     ...     slack_resource_path=\"/u/alex/my_slack_resource\",\n#     ...     channel_id=\"admins-slack-channel\",\n#     ...     message=\"Please approve this request\",\n#     ...     approver=\"approver123\",\n#     ...     default_args_json={\"key1\": \"value1\", \"key2\": 42},\n#     ...     dynamic_enums_json={\"foo\": [\"choice1\", \"choice2\"], \"bar\": [\"optionA\", \"optionB\"]},\n#     ... )\n# \n# **Notes:**\n# - This function must be executed within a Windmill flow or flow preview.\n# - The function checks for required environment variables (`WM_FLOW_JOB_ID`, `WM_FLOW_STEP_ID`) to ensure it is run in the appropriate context.\ndef request_interactive_slack_approval(slack_resource_path: str, channel_id: str, message: str = None, approver: str = None, default_args_json: dict = None, dynamic_enums_json: dict = None) -> None\n\n# Get email from workspace username\n# This method is particularly useful for apps that require the email address of the viewer.\n# Indeed, in the viewer context WM_USERNAME is set to the username of the viewer but WM_EMAIL is set to the email of the creator of the app.\ndef username_to_email(username: str) -> str\n\n# Send a message to a Microsoft Teams conversation with conversation_id, where success is used to style the message\ndef send_teams_message(conversation_id: str, text: str, success: bool = True, card_block: dict = None)\n\n# Get a DataTable client for SQL queries.\n# \n# Args:\n#     name: Database name (default: \"main\")\n# \n# Returns:\n#     DataTableClient instance\ndef datatable(name: str = 'main')\n\n# Get a DuckLake client for DuckDB queries.\n# \n# Args:\n#     name: Database name (default: \"main\")\n# \n# Returns:\n#     DucklakeClient instance\ndef ducklake(name: str = 'main')\n\ndef init_global_client(f)\n\ndef deprecate(in_favor_of: str)\n\n# Get the current workspace ID.\n# \n# Returns:\n#     Workspace ID string\ndef get_workspace() -> str\n\ndef get_version() -> str\n\n# Run a script synchronously by hash and return its result.\n# \n# Args:\n#     hash: Script hash\n#     args: Script arguments\n#     verbose: Enable verbose logging\n#     assert_result_is_not_none: Raise exception if result is None\n#     cleanup: Register cleanup handler to cancel job on exit\n#     timeout: Maximum time to wait\n# \n# Returns:\n#     Script result\ndef run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any\n\n# Run a script synchronously by path and return its result.\n# \n# Args:\n#     path: Script path\n#     args: Script arguments\n#     verbose: Enable verbose logging\n#     assert_result_is_not_none: Raise exception if result is None\n#     cleanup: Register cleanup handler to cancel job on exit\n#     timeout: Maximum time to wait\n# \n# Returns:\n#     Script result\ndef run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any\n\n# Convenient helpers that takes an S3 resource as input and returns the settings necessary to\n# initiate an S3 connection from DuckDB\ndef duckdb_connection_settings(s3_resource_path: str = '') -> DuckDbConnectionSettings\n\n# Convenient helpers that takes an S3 resource as input and returns the settings necessary to\n# initiate an S3 connection from Polars\ndef polars_connection_settings(s3_resource_path: str = '') -> PolarsConnectionSettings\n\n# Convenient helpers that takes an S3 resource as input and returns the settings necessary to\n# initiate an S3 connection using boto3\ndef boto3_connection_settings(s3_resource_path: str = '') -> Boto3ConnectionSettings\n\n# Get the state resource path from environment.\n# \n# Returns:\n#     State path string\ndef get_state_path() -> str\n\n# Parse resource syntax from string.\ndef parse_resource_syntax(s: str) -> Optional[str]\n\n# Parse S3 object from string or S3Object format.\ndef parse_s3_object(s3_object: S3Object | str) -> S3Object\n\n# Parse variable syntax from string.\ndef parse_variable_syntax(s: str) -> Optional[str]\n\n# Append a text to the result stream.\n# \n# Args:\n#     text: text to append to the result stream\ndef append_to_result_stream(text: str) -> None\n\n# Stream to the result stream.\n# \n# Args:\n#     stream: stream to stream to the result stream\ndef stream_result(stream) -> None\n\n# Execute a SQL query against the DataTable.\n# \n# Args:\n#     sql: SQL query string with $1, $2, etc. placeholders\n#     *args: Positional arguments to bind to query placeholders\n# \n# Returns:\n#     SqlQuery instance for fetching results\ndef query(sql: str, *args) -> SqlQuery\n\n# Execute query and fetch results.\n# \n# Args:\n#     result_collection: Optional result collection mode\n# \n# Returns:\n#     Query results\ndef fetch(result_collection: str | None = None)\n\n# Execute query and fetch first row of results.\n# \n# Returns:\n#     First row of query results\ndef fetch_one()\n\n# Execute query and fetch first row of results. Return result as a scalar value.\n# \n# Returns:\n#     First row of query result as a scalar value\ndef fetch_one_scalar()\n\n# Execute query and don't return any results.\n#         \ndef execute()\n\n# DuckDB executor requires explicit argument types at declaration\n# These types exist in both DuckDB and Postgres\n# Check that the types exist if you plan to extend this function for other SQL engines.\ndef infer_sql_type(value) -> str\n\ndef parse_sql_client_name(name: str) -> tuple[str, Optional[str]]\n\n# Decorator that marks a function as a workflow task.\n# \n# Works in both WAC v1 (sync, HTTP-based dispatch) and WAC v2\n# (async, checkpoint/replay) modes:\n# \n# - **v2 (inside @workflow)**: dispatches as a checkpoint step.\n# - **v1 (WM_JOB_ID set, no @workflow)**: dispatches via HTTP API.\n# - **Standalone**: executes the function body directly.\n# \n# Usage::\n# \n#     @task\n#     async def extract_data(url: str): ...\n# \n#     @task(path=\"f/external_script\", timeout=600, tag=\"gpu\")\n#     async def run_external(x: int): ...\ndef task(_func = None, path: Optional[str] = None, tag: Optional[str] = None, timeout: Optional[int] = None, cache_ttl: Optional[int] = None, priority: Optional[int] = None, concurrency_limit: Optional[int] = None, concurrency_key: Optional[str] = None, concurrency_time_window_s: Optional[int] = None)\n\n# Create a task that dispatches to a separate Windmill script.\n# \n# Usage::\n# \n#     extract = task_script(\"f/data/extract\", timeout=600)\n# \n#     @workflow\n#     async def main():\n#         data = await extract(url=\"https://...\")\ndef task_script(path: str, timeout: Optional[int] = None, tag: Optional[str] = None, cache_ttl: Optional[int] = None, priority: Optional[int] = None, concurrency_limit: Optional[int] = None, concurrency_key: Optional[str] = None, concurrency_time_window_s: Optional[int] = None)\n\n# Create a task that dispatches to a separate Windmill flow.\n# \n# Usage::\n# \n#     pipeline = task_flow(\"f/etl/pipeline\", priority=10)\n# \n#     @workflow\n#     async def main():\n#         result = await pipeline(input=data)\ndef task_flow(path: str, timeout: Optional[int] = None, tag: Optional[str] = None, cache_ttl: Optional[int] = None, priority: Optional[int] = None, concurrency_limit: Optional[int] = None, concurrency_key: Optional[str] = None, concurrency_time_window_s: Optional[int] = None)\n\n# Decorator marking an async function as a workflow-as-code entry point.\n# \n# The function must be **deterministic**: given the same inputs it must call\n# tasks in the same order on every replay. Branching on task results is fine\n# (results are replayed from checkpoint), but branching on external state\n# (current time, random values, external API calls) must use ``step()`` to\n# checkpoint the value so replays see the same result.\ndef workflow(func)\n\n# Execute ``fn`` inline and checkpoint the result.\n# \n# On replay the cached value is returned without re-executing ``fn``.\n# Use for lightweight deterministic operations (timestamps, random IDs,\n# config reads) that should not incur the overhead of a child job.\nasync def step(name: str, fn)\n\n# Server-side sleep \u2014 suspend the workflow for the given duration without holding a worker.\n# \n# Inside a @workflow, the parent job suspends and auto-resumes after ``seconds``.\n# Outside a workflow, falls back to ``asyncio.sleep``.\nasync def sleep(seconds: int)\n\n# Suspend the workflow and wait for an external approval.\n# \n# Use ``get_resume_urls()`` (wrapped in ``step()``) to obtain\n# resume/cancel/approval URLs before calling this function.\n# \n# Returns a dict with ``value`` (form data), ``approver``, and ``approved``.\n# \n# Args:\n#     timeout: Approval timeout in seconds (default 1800).\n#     form: Optional form schema for the approval page.\n#     self_approval: Whether the user who triggered the flow can approve it (default True).\n# \n# Example::\n# \n#     urls = await step(\"urls\", lambda: get_resume_urls())\n#     await step(\"notify\", lambda: send_email(urls[\"approvalPage\"]))\n#     result = await wait_for_approval(timeout=3600)\nasync def wait_for_approval(timeout: int = 1800, form: dict | None = None, self_approval: bool = True) -> dict\n\n# Process items in parallel with optional concurrency control.\n# \n# Each item is processed by calling ``fn(item)``, which should be a @task.\n# Items are dispatched in batches of ``concurrency`` (default: all at once).\n# \n# Example::\n# \n#     @task\n#     async def process(item: str):\n#         ...\n# \n#     results = await parallel(items, process, concurrency=5)\nasync def parallel(items, fn, concurrency: Optional[int] = None)\n\n# Commit Kafka offsets for a trigger with auto_commit disabled.\n# \n# Args:\n#     trigger_path: Path to the Kafka trigger (from event['wm_trigger']['trigger_path'])\n#     topic: Kafka topic name (from event['topic'])\n#     partition: Partition number (from event['partition'])\n#     offset: Message offset to commit (from event['offset'])\ndef commit_kafka_offsets(trigger_path: str, topic: str, partition: int, offset: int) -> None\n\n";
-export declare const WAC_SDK_TYPESCRIPT = "## TypeScript Workflow-as-Code API (windmill-client)\n\nImport: `import { workflow, task, taskScript, taskFlow, step, sleep, waitForApproval, getResumeUrls, parallel } from \"windmill-client\"`\n\n```typescript\nexport interface TaskOptions {\n  timeout?: number;\n  tag?: string;\n  cache_ttl?: number;\n  priority?: number;\n  concurrency_limit?: number;\n  concurrency_key?: string;\n  concurrency_time_window_s?: number;\n}\n\n/**\n * Get URLs needed for resuming a flow after this step\n * @param approver approver name\n * @param flowLevel if true, generate resume URLs for the parent flow instead of the specific step.\n *                  This allows pre-approvals that can be consumed by any later suspend step in the same flow.\n * @returns approval page UI URL, resume and cancel API URLs for resuming the flow\n */\nexport async function getResumeUrls(approver?: string, flowLevel?: boolean): Promise<{ approvalPage: string; resume: string; cancel: string; }>\n\n/**\n * Wrap an async function as a workflow task.\n *\n * @example\n * const extract_data = task(async (url: string) => { ... });\n * const run_external = task(\"f/external_script\", async (x: number) => { ... });\n *\n * Inside a `workflow()`, calling a task dispatches it as a step.\n * Outside a workflow, the function body executes directly.\n */\nexport function task<T extends (...args: any[]) => Promise<any>>(fnOrPath: T | string, maybeFnOrOptions?: T | TaskOptions, maybeOptions?: TaskOptions,): T\n\n/**\n * Create a task that dispatches to a separate Windmill script.\n *\n * @example\n * const extract = taskScript(\"f/data/extract\");\n * // inside workflow: await extract({ url: \"https://...\" })\n */\nexport function taskScript(path: string, options?: TaskOptions): (...args: any[]) => PromiseLike<any>\n\n/**\n * Create a task that dispatches to a separate Windmill flow.\n *\n * @example\n * const pipeline = taskFlow(\"f/etl/pipeline\");\n * // inside workflow: await pipeline({ input: data })\n */\nexport function taskFlow(path: string, options?: TaskOptions): (...args: any[]) => PromiseLike<any>\n\n/**\n * Mark an async function as a workflow-as-code entry point.\n *\n * The function must be **deterministic**: given the same inputs it must call\n * tasks in the same order on every replay. Branching on task results is fine\n * (results are replayed from checkpoint), but branching on external state\n * (current time, random values, external API calls) must use `step()` to\n * checkpoint the value so replays see the same result.\n */\nexport function workflow<T>(fn: (...args: any[]) => Promise<T>)\n\nexport async function step<T>(name: string, fn: () => T | Promise<T>): Promise<T>\n\nexport async function sleep(seconds: number): Promise<void>\n\n/**\n * Suspend the workflow and wait for an external approval.\n *\n * Use `getResumeUrls()` (wrapped in `step()`) to obtain resume/cancel/approvalPage\n * URLs before calling this function.\n *\n * @example\n * const urls = await step(\"urls\", () => getResumeUrls());\n * await step(\"notify\", () => sendEmail(urls.approvalPage));\n * const { value, approver } = await waitForApproval({ timeout: 3600 });\n */\nexport function waitForApproval(options?: { timeout?: number; form?: object; selfApproval?: boolean; }): PromiseLike<{ value: any; approver: string; approved: boolean }>\n\n/**\n * Process items in parallel with optional concurrency control.\n *\n * Each item is processed by calling `fn(item)`, which should be a task().\n * Items are dispatched in batches of `concurrency` (default: all at once).\n *\n * @example\n * const process = task(async (item: string) => { ... });\n * const results = await parallel(items, process, { concurrency: 5 });\n */\nexport async function parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?: { concurrency?: number },): Promise<R[]>\n```\n";
-export declare const WAC_SDK_PYTHON = "## Python Workflow-as-Code API (wmill)\n\nImport: `from wmill import workflow, task, task_script, task_flow, step, sleep, wait_for_approval, get_resume_urls, parallel, TaskError`\n\n```python\n# Raised when a WAC task step failed.\n#\n# Attributes:\n#     step_key: The checkpoint key of the failed step.\n#     child_job_id: The UUID of the failed child job.\n#     result: The error result from the child job.\nclass TaskError(Exception):\n    def __init__(self, message: str, *, step_key: str = '', child_job_id: str = '', result = None)\n\n# Get URLs needed for resuming a flow after suspension.\n#\n# Args:\n#     approver: Optional approver name\n#     flow_level: If True, generate resume URLs for the parent flow instead of the\n#         specific step. This allows pre-approvals that can be consumed by any later\n#         suspend step in the same flow.\n#\n# Returns:\n#     Dictionary with approvalPage, resume, and cancel URLs\ndef get_resume_urls(approver: str = None, flow_level: bool = None) -> dict\n\n# Decorator that marks a function as a workflow task.\n#\n# Works in both WAC v1 (sync, HTTP-based dispatch) and WAC v2\n# (async, checkpoint/replay) modes:\n#\n# - **v2 (inside @workflow)**: dispatches as a checkpoint step.\n# - **v1 (WM_JOB_ID set, no @workflow)**: dispatches via HTTP API.\n# - **Standalone**: executes the function body directly.\n#\n# Usage::\n#\n#     @task\n#     async def extract_data(url: str): ...\n#\n#     @task(path=\"f/external_script\", timeout=600, tag=\"gpu\")\n#     async def run_external(x: int): ...\ndef task(_func = None, *, path: Optional[str] = None, tag: Optional[str] = None, timeout: Optional[int] = None, cache_ttl: Optional[int] = None, priority: Optional[int] = None, concurrency_limit: Optional[int] = None, concurrency_key: Optional[str] = None, concurrency_time_window_s: Optional[int] = None)\n\n# Create a task that dispatches to a separate Windmill script.\n#\n# Usage::\n#\n#     extract = task_script(\"f/data/extract\", timeout=600)\n#\n#     @workflow\n#     async def main():\n#         data = await extract(url=\"https://...\")\ndef task_script(path: str, *, timeout: Optional[int] = None, tag: Optional[str] = None, cache_ttl: Optional[int] = None, priority: Optional[int] = None, concurrency_limit: Optional[int] = None, concurrency_key: Optional[str] = None, concurrency_time_window_s: Optional[int] = None)\n\n# Create a task that dispatches to a separate Windmill flow.\n#\n# Usage::\n#\n#     pipeline = task_flow(\"f/etl/pipeline\", priority=10)\n#\n#     @workflow\n#     async def main():\n#         result = await pipeline(input=data)\ndef task_flow(path: str, *, timeout: Optional[int] = None, tag: Optional[str] = None, cache_ttl: Optional[int] = None, priority: Optional[int] = None, concurrency_limit: Optional[int] = None, concurrency_key: Optional[str] = None, concurrency_time_window_s: Optional[int] = None)\n\n# Decorator marking an async function as a workflow-as-code entry point.\n#\n# The function must be **deterministic**: given the same inputs it must call\n# tasks in the same order on every replay. Branching on task results is fine\n# (results are replayed from checkpoint), but branching on external state\n# (current time, random values, external API calls) must use ``step()`` to\n# checkpoint the value so replays see the same result.\ndef workflow(func)\n\n# Execute ``fn`` inline and checkpoint the result.\n#\n# On replay the cached value is returned without re-executing ``fn``.\n# Use for lightweight deterministic operations (timestamps, random IDs,\n# config reads) that should not incur the overhead of a child job.\nasync def step(name: str, fn)\n\n# Server-side sleep \u2014 suspend the workflow for the given duration without holding a worker.\n#\n# Inside a @workflow, the parent job suspends and auto-resumes after ``seconds``.\n# Outside a workflow, falls back to ``asyncio.sleep``.\nasync def sleep(seconds: int)\n\n# Suspend the workflow and wait for an external approval.\n#\n# Use ``get_resume_urls()`` (wrapped in ``step()``) to obtain\n# resume/cancel/approval URLs before calling this function.\n#\n# Returns a dict with ``value`` (form data), ``approver``, and ``approved``.\n#\n# Args:\n#     timeout: Approval timeout in seconds (default 1800).\n#     form: Optional form schema for the approval page.\n#     self_approval: Whether the user who triggered the flow can approve it (default True).\n#\n# Example::\n#\n#     urls = await step(\"urls\", lambda: get_resume_urls())\n#     await step(\"notify\", lambda: send_email(urls[\"approvalPage\"]))\n#     result = await wait_for_approval(timeout=3600)\nasync def wait_for_approval(timeout: int = 1800, form: dict | None = None, self_approval: bool = True) -> dict\n\n# Process items in parallel with optional concurrency control.\n#\n# Each item is processed by calling ``fn(item)``, which should be a @task.\n# Items are dispatched in batches of ``concurrency`` (default: all at once).\n#\n# Example::\n#\n#     @task\n#     async def process(item: str):\n#         ...\n#\n#     results = await parallel(items, process, concurrency=5)\nasync def parallel(items, fn, *, concurrency: Optional[int] = None)\n```\n";
-export declare const DATATABLE_SDK_TYPESCRIPT = "## TypeScript Datatable API (windmill-client)\n\nImport: `import * as wmill from 'windmill-client'`\n\nSQL statement object with query content, arguments, and execution methods\n```typescript\ntype SqlStatement<T> = {\n  /** Raw SQL content with formatted arguments */\n  content: string;\n\n  /** Argument values keyed by parameter name */\n  args: Record<string, any>;\n\n  /**\n  * Execute the SQL query and return results\n  * @param params - Optional parameters including result collection mode\n  * @returns Query results based on the result collection mode\n  */\n  fetch<ResultCollectionT extends ResultCollection = \"last_statement_all_rows\">(\n  params?: FetchParams<ResultCollectionT | ResultCollection> // The union is for auto-completion\n  ): Promise<SqlResult<T, ResultCollectionT>>;\n\n  /**\n  * Execute the SQL query and return only the first row\n  * @param params - Optional parameters\n  * @returns First row of the query result\n  */\n  fetchOne(\n  params?: Omit<FetchParams<\"last_statement_first_row\">, \"resultCollection\">\n  ): Promise<SqlResult<T, \"last_statement_first_row\">>;\n\n  /**\n  * Execute the SQL query and return only the first row as a scalar value\n  * @param params - Optional parameters\n  * @returns First row of the query result\n  */\n  fetchOneScalar(\n  params?: Omit<\n  FetchParams<\"last_statement_first_row_scalar\">,\n  \"resultCollection\"\n  >\n  ): Promise<SqlResult<T, \"last_statement_first_row_scalar\">>;\n\n  /**\n  * Execute the SQL query without fetching rows\n  * @param params - Optional parameters\n  */\n  execute(\n  params?: Omit<FetchParams<\"last_statement_first_row\">, \"resultCollection\">\n  ): Promise<void>;\n};\n```\n\n```typescript\n// Template tag function: sql`SELECT * FROM table WHERE id = ${id}`.fetch()\ninterface DatatableSqlTemplateFunction {\n  // Tagged template usage:\n  <T = any>(strings: TemplateStringsArray, ...values: any[]): SqlStatement<T>;\n  query<T = any>(sql: string, ...params: any[]): SqlStatement<T>;\n};\n```\n\nCreate a SQL template function for PostgreSQL/datatable queries\n@param name - Database/datatable name (default: \"main\")\n@returns SQL template function for building parameterized queries\n@example\nlet sql = wmill.datatable()\nlet name = 'Robin'\nlet age = 21\nawait sql`\n  SELECT * FROM friends\n    WHERE name = ${name} AND age = ${age}::int\n`.fetch()\n```typescript\nfunction datatable(name: string = \"main\"): DatatableSqlTemplateFunction\n```\n";
-export declare const DATATABLE_SDK_PYTHON = "## Python Datatable API (wmill)\n\nImport: `import wmill`\n\n# Get a DataTable client for SQL queries.\n# \n# Args:\n#     name: Database name (default: \"main\")\n# \n# Returns:\n#     DataTableClient instance\ndef datatable(name: str = 'main') -> DataTableClient\n\n# Client for executing SQL queries against Windmill DataTables.\nclass DataTableClient:\n    # Initialize DataTableClient.\n    # \n    # Args:\n    #     client: Windmill client instance\n    #     name: DataTable name\n    def __init__(client: Windmill, name: str)\n\n    # Execute a SQL query against the DataTable.\n    # \n    # Args:\n    #     sql: SQL query string with $1, $2, etc. placeholders\n    #     *args: Positional arguments to bind to query placeholders\n    # \n    # Returns:\n    #     SqlQuery instance for fetching results\n    def query(sql: str, *args) -> SqlQuery\n\n\n# Query result handler for DataTable and DuckLake queries.\nclass SqlQuery:\n    # Initialize SqlQuery.\n    # \n    # Args:\n    #     sql: SQL query string\n    #     fetch_fn: Function to execute the query\n    def __init__(sql: str, fetch_fn)\n\n    # Execute query and fetch results.\n    # \n    # Args:\n    #     result_collection: Optional result collection mode\n    # \n    # Returns:\n    #     Query results\n    def fetch(result_collection: str | None = None)\n\n    # Execute query and fetch first row of results.\n    # \n    # Returns:\n    #     First row of query results\n    def fetch_one()\n\n    # Execute query and fetch first row of results. Return result as a scalar value.\n    # \n    # Returns:\n    #     First row of query result as a scalar value\n    def fetch_one_scalar()\n\n    # Execute query and don't return any results.\n    #         \n    def execute()\n\n\n";
-export declare const OPENFLOW_SCHEMA = "## OpenFlow Schema\n\n{\"OpenFlow\":{\"type\":\"object\",\"description\":\"Top-level flow definition containing metadata, configuration, and the flow structure\",\"properties\":{\"summary\":{\"type\":\"string\",\"description\":\"Short description of what this flow does\"},\"description\":{\"type\":\"string\",\"description\":\"Detailed documentation for this flow\"},\"value\":{\"$ref\":\"#/components/schemas/FlowValue\"},\"schema\":{\"type\":\"object\",\"description\":\"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')\"},\"on_behalf_of_email\":{\"type\":\"string\",\"description\":\"The flow will be run with the permissions of the user with this email.\"}},\"required\":[\"summary\",\"value\"]},\"FlowValue\":{\"type\":\"object\",\"description\":\"The flow structure containing modules and optional preprocessor/failure handlers\",\"properties\":{\"modules\":{\"type\":\"array\",\"description\":\"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch\",\"items\":{\"$ref\":\"#/components/schemas/FlowModule\"}},\"failure_module\":{\"description\":\"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types\",\"$ref\":\"#/components/schemas/FlowModule\"},\"preprocessor_module\":{\"description\":\"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results\",\"$ref\":\"#/components/schemas/FlowModule\"},\"same_worker\":{\"type\":\"boolean\",\"description\":\"If true, all steps run on the same worker for better performance\"},\"concurrent_limit\":{\"type\":\"number\",\"description\":\"Maximum number of concurrent executions of this flow\"},\"concurrency_key\":{\"type\":\"string\",\"description\":\"Expression to group concurrent executions (e.g., by user ID)\"},\"concurrency_time_window_s\":{\"type\":\"number\",\"description\":\"Time window in seconds for concurrent_limit\"},\"debounce_delay_s\":{\"type\":\"integer\",\"description\":\"Delay in seconds to debounce flow executions\"},\"debounce_key\":{\"type\":\"string\",\"description\":\"Expression to group debounced executions\"},\"debounce_args_to_accumulate\":{\"type\":\"array\",\"description\":\"Arguments to accumulate across debounced executions\",\"items\":{\"type\":\"string\"}},\"max_total_debouncing_time\":{\"type\":\"integer\",\"description\":\"Maximum total time in seconds that a job can be debounced\"},\"max_total_debounces_amount\":{\"type\":\"integer\",\"description\":\"Maximum number of times a job can be debounced\"},\"skip_expr\":{\"type\":\"string\",\"description\":\"JavaScript expression to conditionally skip the entire flow\"},\"cache_ttl\":{\"type\":\"number\",\"description\":\"Cache duration in seconds for flow results\"},\"cache_ignore_s3_path\":{\"type\":\"boolean\"},\"delete_after_secs\":{\"type\":\"integer\",\"description\":\"If set, delete the flow job's args, result and logs after this many seconds following job completion\"},\"flow_env\":{\"type\":\"object\",\"description\":\"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).\",\"additionalProperties\":{}},\"priority\":{\"type\":\"number\",\"description\":\"Execution priority (higher numbers run first)\"},\"early_return\":{\"type\":\"string\",\"description\":\"JavaScript expression to return early from the flow\"},\"chat_input_enabled\":{\"type\":\"boolean\",\"description\":\"Whether this flow accepts chat-style input\"},\"notes\":{\"type\":\"array\",\"description\":\"Sticky notes attached to the flow\",\"items\":{\"$ref\":\"#/components/schemas/FlowNote\"}},\"groups\":{\"type\":\"array\",\"description\":\"Semantic groups of modules for organizational purposes\",\"items\":{\"$ref\":\"#/components/schemas/FlowGroup\"}}},\"required\":[\"modules\"]},\"Retry\":{\"type\":\"object\",\"description\":\"Retry configuration for failed module executions\",\"properties\":{\"constant\":{\"type\":\"object\",\"description\":\"Retry with constant delay between attempts\",\"properties\":{\"attempts\":{\"type\":\"integer\",\"description\":\"Number of retry attempts\"},\"seconds\":{\"type\":\"integer\",\"description\":\"Seconds to wait between retries\"}}},\"exponential\":{\"type\":\"object\",\"description\":\"Retry with exponential backoff (delay doubles each time)\",\"properties\":{\"attempts\":{\"type\":\"integer\",\"description\":\"Number of retry attempts\"},\"multiplier\":{\"type\":\"integer\",\"description\":\"Multiplier for exponential backoff\"},\"seconds\":{\"type\":\"integer\",\"minimum\":1,\"description\":\"Initial delay in seconds\"},\"random_factor\":{\"type\":\"integer\",\"minimum\":0,\"maximum\":100,\"description\":\"Random jitter percentage (0-100) to avoid thundering herd\"}}},\"retry_if\":{\"$ref\":\"#/components/schemas/RetryIf\"}}},\"FlowNote\":{\"type\":\"object\",\"description\":\"A sticky note attached to a flow for documentation and annotation\",\"properties\":{\"id\":{\"type\":\"string\",\"description\":\"Unique identifier for the note\"},\"text\":{\"type\":\"string\",\"description\":\"Content of the note\"},\"position\":{\"type\":\"object\",\"description\":\"Position of the note in the flow editor\",\"properties\":{\"x\":{\"type\":\"number\",\"description\":\"X coordinate\"},\"y\":{\"type\":\"number\",\"description\":\"Y coordinate\"}},\"required\":[\"x\",\"y\"]},\"size\":{\"type\":\"object\",\"description\":\"Size of the note in the flow editor\",\"properties\":{\"width\":{\"type\":\"number\",\"description\":\"Width in pixels\"},\"height\":{\"type\":\"number\",\"description\":\"Height in pixels\"}},\"required\":[\"width\",\"height\"]},\"color\":{\"type\":\"string\",\"description\":\"Color of the note (e.g., \\\"yellow\\\", \\\"#ffff00\\\")\"},\"type\":{\"type\":\"string\",\"enum\":[\"free\",\"group\"],\"description\":\"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes\"},\"locked\":{\"type\":\"boolean\",\"default\":false,\"description\":\"Whether the note is locked and cannot be edited or moved\"},\"contained_node_ids\":{\"type\":\"array\",\"items\":{\"type\":\"string\"},\"description\":\"For group notes, the IDs of nodes contained within this group\"}},\"required\":[\"id\",\"text\",\"color\",\"type\"]},\"FlowGroup\":{\"type\":\"object\",\"description\":\"A semantic group of flow modules for organizational purposes. Does not affect execution \\u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.\",\"properties\":{\"summary\":{\"type\":\"string\",\"description\":\"Display name for this group\"},\"note\":{\"type\":\"string\",\"description\":\"Markdown note shown below the group header\"},\"autocollapse\":{\"type\":\"boolean\",\"default\":false,\"description\":\"If true, this group is collapsed by default in the flow editor. UI hint only.\"},\"start_id\":{\"type\":\"string\",\"description\":\"ID of the first flow module in this group (topological entry point)\"},\"end_id\":{\"type\":\"string\",\"description\":\"ID of the last flow module in this group (topological exit point)\"},\"color\":{\"type\":\"string\",\"description\":\"Color for the group in the flow editor\"}},\"required\":[\"start_id\",\"end_id\"]},\"RetryIf\":{\"type\":\"object\",\"description\":\"Conditional retry based on error or result\",\"properties\":{\"expr\":{\"type\":\"string\",\"description\":\"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables\"}},\"required\":[\"expr\"]},\"StopAfterIf\":{\"type\":\"object\",\"description\":\"Early termination condition for a module\",\"properties\":{\"skip_if_stopped\":{\"type\":\"boolean\",\"description\":\"If true, following steps are skipped when this condition triggers\"},\"expr\":{\"type\":\"string\",\"description\":\"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop\"},\"error_message\":{\"type\":\"string\",\"nullable\":true,\"description\":\"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised.\"}},\"required\":[\"expr\"]},\"FlowModule\":{\"type\":\"object\",\"description\":\"A single step in a flow. Can be a script, subflow, loop, or branch\",\"properties\":{\"id\":{\"type\":\"string\",\"description\":\"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)\"},\"value\":{\"$ref\":\"#/components/schemas/FlowModuleValue\"},\"stop_after_if\":{\"description\":\"Early termination condition evaluated after this step completes\",\"$ref\":\"#/components/schemas/StopAfterIf\"},\"stop_after_all_iters_if\":{\"description\":\"For loops only - early termination condition evaluated after all iterations complete\",\"$ref\":\"#/components/schemas/StopAfterIf\"},\"skip_if\":{\"type\":\"object\",\"description\":\"Conditionally skip this step based on previous results or flow inputs\",\"properties\":{\"expr\":{\"type\":\"string\",\"description\":\"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'\"}},\"required\":[\"expr\"]},\"sleep\":{\"description\":\"Delay before executing this step (in seconds or as expression)\",\"$ref\":\"#/components/schemas/InputTransform\"},\"cache_ttl\":{\"type\":\"number\",\"description\":\"Cache duration in seconds for this step's results\"},\"cache_ignore_s3_path\":{\"type\":\"boolean\"},\"timeout\":{\"description\":\"Maximum execution time in seconds (static value or expression)\",\"$ref\":\"#/components/schemas/InputTransform\"},\"delete_after_secs\":{\"type\":\"integer\",\"description\":\"If set, delete the step's args, result and logs after this many seconds following job completion\"},\"summary\":{\"type\":\"string\",\"description\":\"Short description of what this step does\"},\"mock\":{\"type\":\"object\",\"description\":\"Mock configuration for testing without executing the actual step\",\"properties\":{\"enabled\":{\"type\":\"boolean\",\"description\":\"If true, return mock value instead of executing\"},\"return_value\":{\"description\":\"Value to return when mocked\"}}},\"suspend\":{\"type\":\"object\",\"description\":\"Configuration for approval/resume steps that wait for user input\",\"properties\":{\"required_events\":{\"type\":\"integer\",\"description\":\"Number of approvals required before continuing\"},\"timeout\":{\"type\":\"integer\",\"description\":\"Timeout in seconds before auto-continuing or canceling\"},\"resume_form\":{\"type\":\"object\",\"description\":\"Form schema for collecting input when resuming\",\"properties\":{\"schema\":{\"type\":\"object\",\"description\":\"JSON Schema for the resume form\"}}},\"user_auth_required\":{\"type\":\"boolean\",\"description\":\"If true, only authenticated users can approve\"},\"user_groups_required\":{\"description\":\"Expression or list of groups that can approve\",\"$ref\":\"#/components/schemas/InputTransform\"},\"self_approval_disabled\":{\"type\":\"boolean\",\"description\":\"If true, the user who started the flow cannot approve\"},\"hide_cancel\":{\"type\":\"boolean\",\"description\":\"If true, hide the cancel button on the approval form\"},\"continue_on_disapprove_timeout\":{\"type\":\"boolean\",\"description\":\"If true, continue flow on timeout instead of canceling\"}}},\"priority\":{\"type\":\"number\",\"description\":\"Execution priority for this step (higher numbers run first)\"},\"continue_on_error\":{\"type\":\"boolean\",\"description\":\"If true, flow continues even if this step fails\"},\"retry\":{\"description\":\"Retry configuration if this step fails\",\"$ref\":\"#/components/schemas/Retry\"},\"debouncing\":{\"description\":\"Debounce configuration for this step (EE only)\",\"type\":\"object\",\"properties\":{\"debounce_delay_s\":{\"type\":\"integer\",\"description\":\"Delay in seconds to debounce this step's executions across flow runs\"},\"debounce_key\":{\"type\":\"string\",\"description\":\"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>\"},\"debounce_args_to_accumulate\":{\"type\":\"array\",\"description\":\"Array-type arguments to accumulate across debounced executions\",\"items\":{\"type\":\"string\"}},\"max_total_debouncing_time\":{\"type\":\"integer\",\"description\":\"Maximum total time in seconds before forced execution\"},\"max_total_debounces_amount\":{\"type\":\"integer\",\"description\":\"Maximum number of debounces before forced execution\"}}}},\"required\":[\"value\",\"id\"]},\"InputTransform\":{\"description\":\"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs\",\"oneOf\":[{\"$ref\":\"#/components/schemas/StaticTransform\"},{\"$ref\":\"#/components/schemas/JavascriptTransform\"},{\"$ref\":\"#/components/schemas/AiTransform\"}],\"discriminator\":{\"propertyName\":\"type\",\"mapping\":{\"static\":\"#/components/schemas/StaticTransform\",\"javascript\":\"#/components/schemas/JavascriptTransform\",\"ai\":\"#/components/schemas/AiTransform\"}}},\"StaticTransform\":{\"type\":\"object\",\"description\":\"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'\",\"properties\":{\"value\":{\"description\":\"The static value. For resources, use format '$res:path/to/resource'\"},\"type\":{\"type\":\"string\",\"enum\":[\"static\"]}},\"required\":[\"type\"]},\"JavascriptTransform\":{\"type\":\"object\",\"description\":\"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value\",\"properties\":{\"expr\":{\"type\":\"string\",\"description\":\"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)\"},\"type\":{\"type\":\"string\",\"enum\":[\"javascript\"]}},\"required\":[\"expr\",\"type\"]},\"AiTransform\":{\"type\":\"object\",\"description\":\"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.\",\"properties\":{\"type\":{\"type\":\"string\",\"enum\":[\"ai\"]}},\"required\":[\"type\"]},\"AIProviderKind\":{\"type\":\"string\",\"description\":\"Supported AI provider types\",\"enum\":[\"openai\",\"azure_openai\",\"anthropic\",\"mistral\",\"deepseek\",\"googleai\",\"groq\",\"openrouter\",\"togetherai\",\"customai\",\"aws_bedrock\"]},\"ProviderConfig\":{\"type\":\"object\",\"description\":\"Complete AI provider configuration with resource reference and model selection\",\"properties\":{\"kind\":{\"$ref\":\"#/components/schemas/AIProviderKind\"},\"resource\":{\"type\":\"string\",\"description\":\"Resource reference in format '$res:{resource_path}' pointing to provider credentials\"},\"model\":{\"type\":\"string\",\"description\":\"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')\"}},\"required\":[\"kind\",\"resource\",\"model\"]},\"StaticProviderTransform\":{\"type\":\"object\",\"description\":\"Static provider configuration passed directly to the AI agent\",\"properties\":{\"value\":{\"$ref\":\"#/components/schemas/ProviderConfig\"},\"type\":{\"type\":\"string\",\"enum\":[\"static\"]}},\"required\":[\"type\",\"value\"]},\"ProviderTransform\":{\"description\":\"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined\",\"oneOf\":[{\"$ref\":\"#/components/schemas/StaticProviderTransform\"},{\"$ref\":\"#/components/schemas/JavascriptTransform\"},{\"$ref\":\"#/components/schemas/AiTransform\"}],\"discriminator\":{\"propertyName\":\"type\",\"mapping\":{\"static\":\"#/components/schemas/StaticProviderTransform\",\"javascript\":\"#/components/schemas/JavascriptTransform\",\"ai\":\"#/components/schemas/AiTransform\"}}},\"MemoryOff\":{\"type\":\"object\",\"description\":\"No conversation memory/context\",\"properties\":{\"kind\":{\"type\":\"string\",\"enum\":[\"off\"]}},\"required\":[\"kind\"]},\"MemoryAuto\":{\"type\":\"object\",\"description\":\"Automatic context management\",\"properties\":{\"kind\":{\"type\":\"string\",\"enum\":[\"auto\"]},\"context_length\":{\"type\":\"integer\",\"description\":\"Maximum number of messages to retain in context\"},\"memory_id\":{\"type\":\"string\",\"description\":\"Identifier for persistent memory across agent invocations\"}},\"required\":[\"kind\"]},\"MemoryMessage\":{\"type\":\"object\",\"description\":\"A single message in conversation history\",\"properties\":{\"role\":{\"type\":\"string\",\"enum\":[\"user\",\"assistant\",\"system\"]},\"content\":{\"type\":\"string\"}},\"required\":[\"role\",\"content\"]},\"MemoryManual\":{\"type\":\"object\",\"description\":\"Explicit message history\",\"properties\":{\"kind\":{\"type\":\"string\",\"enum\":[\"manual\"]},\"messages\":{\"type\":\"array\",\"items\":{\"$ref\":\"#/components/schemas/MemoryMessage\"}}},\"required\":[\"kind\",\"messages\"]},\"MemoryConfig\":{\"description\":\"Conversation memory configuration\",\"oneOf\":[{\"$ref\":\"#/components/schemas/MemoryOff\"},{\"$ref\":\"#/components/schemas/MemoryAuto\"},{\"$ref\":\"#/components/schemas/MemoryManual\"}],\"discriminator\":{\"propertyName\":\"kind\",\"mapping\":{\"off\":\"#/components/schemas/MemoryOff\",\"auto\":\"#/components/schemas/MemoryAuto\",\"manual\":\"#/components/schemas/MemoryManual\"}}},\"StaticMemoryTransform\":{\"type\":\"object\",\"description\":\"Static memory configuration passed directly to the AI agent\",\"properties\":{\"value\":{\"$ref\":\"#/components/schemas/MemoryConfig\"},\"type\":{\"type\":\"string\",\"enum\":[\"static\"]}},\"required\":[\"type\",\"value\"]},\"MemoryTransform\":{\"description\":\"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined\",\"oneOf\":[{\"$ref\":\"#/components/schemas/StaticMemoryTransform\"},{\"$ref\":\"#/components/schemas/JavascriptTransform\"},{\"$ref\":\"#/components/schemas/AiTransform\"}],\"discriminator\":{\"propertyName\":\"type\",\"mapping\":{\"static\":\"#/components/schemas/StaticMemoryTransform\",\"javascript\":\"#/components/schemas/JavascriptTransform\",\"ai\":\"#/components/schemas/AiTransform\"}}},\"FlowModuleValue\":{\"description\":\"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type\",\"oneOf\":[{\"$ref\":\"#/components/schemas/RawScript\"},{\"$ref\":\"#/components/schemas/PathScript\"},{\"$ref\":\"#/components/schemas/PathFlow\"},{\"$ref\":\"#/components/schemas/ForloopFlow\"},{\"$ref\":\"#/components/schemas/WhileloopFlow\"},{\"$ref\":\"#/components/schemas/BranchOne\"},{\"$ref\":\"#/components/schemas/BranchAll\"},{\"$ref\":\"#/components/schemas/Identity\"},{\"$ref\":\"#/components/schemas/AiAgent\"}],\"discriminator\":{\"propertyName\":\"type\",\"mapping\":{\"rawscript\":\"#/components/schemas/RawScript\",\"script\":\"#/components/schemas/PathScript\",\"flow\":\"#/components/schemas/PathFlow\",\"forloopflow\":\"#/components/schemas/ForloopFlow\",\"whileloopflow\":\"#/components/schemas/WhileloopFlow\",\"branchone\":\"#/components/schemas/BranchOne\",\"branchall\":\"#/components/schemas/BranchAll\",\"identity\":\"#/components/schemas/Identity\",\"aiagent\":\"#/components/schemas/AiAgent\"}}},\"RawScript\":{\"type\":\"object\",\"description\":\"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms\",\"properties\":{\"input_transforms\":{\"type\":\"object\",\"description\":\"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments\",\"additionalProperties\":{\"$ref\":\"#/components/schemas/InputTransform\"}},\"content\":{\"type\":\"string\",\"description\":\"The script source code. Should export a 'main' function\"},\"language\":{\"type\":\"string\",\"description\":\"Programming language for this script\",\"enum\":[\"deno\",\"bun\",\"python3\",\"go\",\"bash\",\"powershell\",\"postgresql\",\"mysql\",\"bigquery\",\"snowflake\",\"mssql\",\"oracledb\",\"graphql\",\"nativets\",\"php\",\"rust\",\"ansible\",\"csharp\",\"nu\",\"java\",\"ruby\",\"rlang\",\"duckdb\"]},\"path\":{\"type\":\"string\",\"description\":\"Optional path for saving this script\"},\"lock\":{\"type\":\"string\",\"description\":\"Lock file content for dependencies\"},\"type\":{\"type\":\"string\",\"enum\":[\"rawscript\"]},\"tag\":{\"type\":\"string\",\"description\":\"Worker group tag for execution routing\"},\"concurrent_limit\":{\"type\":\"number\",\"description\":\"Maximum concurrent executions of this script\"},\"concurrency_time_window_s\":{\"type\":\"number\",\"description\":\"Time window for concurrent_limit\"},\"custom_concurrency_key\":{\"type\":\"string\",\"description\":\"Custom key for grouping concurrent executions\"},\"is_trigger\":{\"type\":\"boolean\",\"description\":\"If true, this script is a trigger that can start the flow\"},\"assets\":{\"type\":\"array\",\"description\":\"External resources this script accesses (S3 objects, resources, etc.)\",\"items\":{\"type\":\"object\",\"required\":[\"path\",\"kind\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the asset\"},\"kind\":{\"type\":\"string\",\"description\":\"Type of asset\",\"enum\":[\"s3object\",\"resource\",\"ducklake\",\"datatable\",\"volume\"]},\"access_type\":{\"type\":\"string\",\"nullable\":true,\"description\":\"Access level for this asset\",\"enum\":[\"r\",\"w\",\"rw\"]},\"alt_access_type\":{\"type\":\"string\",\"nullable\":true,\"description\":\"Alternative access level\",\"enum\":[\"r\",\"w\",\"rw\"]}}}}},\"required\":[\"type\",\"content\",\"language\",\"input_transforms\"]},\"PathScript\":{\"type\":\"object\",\"description\":\"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code\",\"properties\":{\"input_transforms\":{\"type\":\"object\",\"description\":\"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments\",\"additionalProperties\":{\"$ref\":\"#/components/schemas/InputTransform\"}},\"path\":{\"type\":\"string\",\"description\":\"Path to the script in the workspace (e.g., 'f/scripts/send_email')\"},\"hash\":{\"type\":\"string\",\"description\":\"Optional specific version hash of the script to use\"},\"type\":{\"type\":\"string\",\"enum\":[\"script\"]},\"tag_override\":{\"type\":\"string\",\"description\":\"Override the script's default worker group tag\"},\"is_trigger\":{\"type\":\"boolean\",\"description\":\"If true, this script is a trigger that can start the flow\"}},\"required\":[\"type\",\"path\",\"input_transforms\"]},\"PathFlow\":{\"type\":\"object\",\"description\":\"Reference to an existing flow by path. Use this to call another flow as a subflow\",\"properties\":{\"input_transforms\":{\"type\":\"object\",\"description\":\"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments\",\"additionalProperties\":{\"$ref\":\"#/components/schemas/InputTransform\"}},\"path\":{\"type\":\"string\",\"description\":\"Path to the flow in the workspace (e.g., 'f/flows/process_user')\"},\"type\":{\"type\":\"string\",\"enum\":[\"flow\"]}},\"required\":[\"type\",\"path\",\"input_transforms\"]},\"ForloopFlow\":{\"type\":\"object\",\"description\":\"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations\",\"properties\":{\"modules\":{\"type\":\"array\",\"description\":\"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'\",\"items\":{\"$ref\":\"#/components/schemas/FlowModule\"}},\"iterator\":{\"description\":\"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'\",\"$ref\":\"#/components/schemas/InputTransform\"},\"skip_failures\":{\"type\":\"boolean\",\"description\":\"If true, iteration failures don't stop the loop. Failed iterations return null\"},\"type\":{\"type\":\"string\",\"enum\":[\"forloopflow\"]},\"parallel\":{\"type\":\"boolean\",\"description\":\"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency\"},\"parallelism\":{\"description\":\"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression\",\"$ref\":\"#/components/schemas/InputTransform\"},\"squash\":{\"type\":\"boolean\"}},\"required\":[\"modules\",\"iterator\",\"skip_failures\",\"type\"]},\"WhileloopFlow\":{\"type\":\"object\",\"description\":\"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination\",\"properties\":{\"modules\":{\"type\":\"array\",\"description\":\"Steps to execute in each iteration. Use stop_after_if to control when the loop ends\",\"items\":{\"$ref\":\"#/components/schemas/FlowModule\"}},\"skip_failures\":{\"type\":\"boolean\",\"description\":\"If true, iteration failures don't stop the loop. Failed iterations return null\"},\"type\":{\"type\":\"string\",\"enum\":[\"whileloopflow\"]},\"parallel\":{\"type\":\"boolean\",\"description\":\"If true, iterations run concurrently (use with caution in while loops)\"},\"parallelism\":{\"description\":\"Maximum number of concurrent iterations when parallel=true\",\"$ref\":\"#/components/schemas/InputTransform\"},\"squash\":{\"type\":\"boolean\"}},\"required\":[\"modules\",\"skip_failures\",\"type\"]},\"BranchOne\":{\"type\":\"object\",\"description\":\"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes\",\"properties\":{\"branches\":{\"type\":\"array\",\"description\":\"Array of branches to evaluate in order. The first branch with expr evaluating to true executes\",\"items\":{\"type\":\"object\",\"properties\":{\"summary\":{\"type\":\"string\",\"description\":\"Short description of this branch condition\"},\"expr\":{\"type\":\"string\",\"description\":\"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins\"},\"modules\":{\"type\":\"array\",\"description\":\"Steps to execute if this branch's expr is true\",\"items\":{\"$ref\":\"#/components/schemas/FlowModule\"}}},\"required\":[\"modules\",\"expr\"]}},\"default\":{\"type\":\"array\",\"description\":\"Steps to execute if no branch expressions match\",\"items\":{\"$ref\":\"#/components/schemas/FlowModule\"}},\"type\":{\"type\":\"string\",\"enum\":[\"branchone\"]}},\"required\":[\"branches\",\"default\",\"type\"]},\"BranchAll\":{\"type\":\"object\",\"description\":\"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently\",\"properties\":{\"branches\":{\"type\":\"array\",\"description\":\"Array of branches that all execute (either in parallel or sequentially)\",\"items\":{\"type\":\"object\",\"properties\":{\"summary\":{\"type\":\"string\",\"description\":\"Short description of this branch's purpose\"},\"skip_failure\":{\"type\":\"boolean\",\"description\":\"If true, failure in this branch doesn't fail the entire flow\"},\"modules\":{\"type\":\"array\",\"description\":\"Steps to execute in this branch\",\"items\":{\"$ref\":\"#/components/schemas/FlowModule\"}}},\"required\":[\"modules\"]}},\"type\":{\"type\":\"string\",\"enum\":[\"branchall\"]},\"parallel\":{\"type\":\"boolean\",\"description\":\"If true, all branches execute concurrently. If false, they execute sequentially\"}},\"required\":[\"branches\",\"type\"]},\"AgentTool\":{\"type\":\"object\",\"description\":\"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool\",\"properties\":{\"id\":{\"type\":\"string\",\"description\":\"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')\"},\"summary\":{\"type\":\"string\",\"description\":\"Short description of what this tool does (shown to the AI)\"},\"value\":{\"$ref\":\"#/components/schemas/ToolValue\"}},\"required\":[\"id\",\"value\"]},\"ToolValue\":{\"description\":\"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference\",\"oneOf\":[{\"$ref\":\"#/components/schemas/FlowModuleTool\"},{\"$ref\":\"#/components/schemas/McpToolValue\"},{\"$ref\":\"#/components/schemas/WebsearchToolValue\"}],\"discriminator\":{\"propertyName\":\"tool_type\",\"mapping\":{\"flowmodule\":\"#/components/schemas/FlowModuleTool\",\"mcp\":\"#/components/schemas/McpToolValue\",\"websearch\":\"#/components/schemas/WebsearchToolValue\"}}},\"FlowModuleTool\":{\"description\":\"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module\",\"allOf\":[{\"type\":\"object\",\"properties\":{\"tool_type\":{\"type\":\"string\",\"enum\":[\"flowmodule\"]}},\"required\":[\"tool_type\"]},{\"$ref\":\"#/components/schemas/FlowModuleValue\"}]},\"WebsearchToolValue\":{\"type\":\"object\",\"description\":\"A tool implemented as a websearch tool. The AI can call this like any other websearch tool\",\"properties\":{\"tool_type\":{\"type\":\"string\",\"enum\":[\"websearch\"]}},\"required\":[\"tool_type\"]},\"McpToolValue\":{\"type\":\"object\",\"description\":\"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers\",\"properties\":{\"tool_type\":{\"type\":\"string\",\"enum\":[\"mcp\"]},\"resource_path\":{\"type\":\"string\",\"description\":\"Path to the MCP resource/server configuration\"},\"include_tools\":{\"type\":\"array\",\"description\":\"Whitelist of specific tools to include from this MCP server\",\"items\":{\"type\":\"string\"}},\"exclude_tools\":{\"type\":\"array\",\"description\":\"Blacklist of tools to exclude from this MCP server\",\"items\":{\"type\":\"string\"}}},\"required\":[\"tool_type\",\"resource_path\"]},\"AiAgent\":{\"type\":\"object\",\"description\":\"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task\",\"properties\":{\"input_transforms\":{\"type\":\"object\",\"description\":\"Input parameters for the AI agent mapped to their values\",\"properties\":{\"provider\":{\"$ref\":\"#/components/schemas/ProviderTransform\"},\"output_type\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"Output format type.\\nValid values: 'text' (default) - plain text response, 'image' - image generation\\n\"},\"user_message\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax.\"},\"system_prompt\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"System instructions that guide the AI's behavior, persona, and response style. Optional.\"},\"streaming\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"Boolean. If true, stream the AI response incrementally.\\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\\n\"},\"memory\":{\"$ref\":\"#/components/schemas/MemoryTransform\"},\"output_schema\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\\n\"},\"user_attachments\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"Array of file references (images or PDFs) for the AI agent.\\nFormat: Array<{ bucket: string, key: string }> - S3 object references\\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\\n\"},\"max_completion_tokens\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"Integer. Maximum number of tokens the AI will generate in its response.\\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\\n\"},\"temperature\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"Float. Controls randomness/creativity of responses.\\nRange: 0.0 to 2.0 (provider-dependent)\\n- 0.0 = deterministic, focused responses\\n- 0.7 = balanced (common default)\\n- 1.0+ = more creative/random\\n\"},\"max_iterations\":{\"allOf\":[{\"$ref\":\"#/components/schemas/InputTransform\"}],\"description\":\"Number. Limits how many times the agent can loop through reasoning and tool use.\\nRange: 1-1000.\\n\"}},\"required\":[\"provider\",\"user_message\",\"output_type\"]},\"tools\":{\"type\":\"array\",\"description\":\"Array of tools the agent can use. The agent decides which tools to call based on the task\",\"items\":{\"$ref\":\"#/components/schemas/AgentTool\"}},\"type\":{\"type\":\"string\",\"enum\":[\"aiagent\"]},\"omit_output_from_conversation\":{\"type\":\"boolean\",\"default\":false,\"description\":\"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled.\"},\"parallel\":{\"type\":\"boolean\",\"description\":\"If true, the agent can execute multiple tool calls in parallel\"}},\"required\":[\"tools\",\"type\",\"input_transforms\"]},\"Identity\":{\"type\":\"object\",\"description\":\"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder\",\"properties\":{\"type\":{\"type\":\"string\",\"enum\":[\"identity\"]},\"flow\":{\"type\":\"boolean\",\"description\":\"If true, marks this as a flow identity (special handling)\"}},\"required\":[\"type\"]},\"FlowStatus\":{\"type\":\"object\",\"properties\":{\"step\":{\"type\":\"integer\"},\"modules\":{\"type\":\"array\",\"items\":{\"$ref\":\"#/components/schemas/FlowStatusModule\"}},\"user_states\":{\"additionalProperties\":true},\"preprocessor_module\":{\"allOf\":[{\"$ref\":\"#/components/schemas/FlowStatusModule\"}]},\"failure_module\":{\"allOf\":[{\"$ref\":\"#/components/schemas/FlowStatusModule\"},{\"type\":\"object\",\"properties\":{\"parent_module\":{\"type\":\"string\"}}}]},\"retry\":{\"type\":\"object\",\"properties\":{\"fail_count\":{\"type\":\"integer\"},\"failed_jobs\":{\"type\":\"array\",\"items\":{\"type\":\"string\",\"format\":\"uuid\"}}}}},\"required\":[\"step\",\"modules\",\"failure_module\"]},\"FlowStatusModule\":{\"type\":\"object\",\"properties\":{\"type\":{\"type\":\"string\",\"enum\":[\"WaitingForPriorSteps\",\"WaitingForEvents\",\"WaitingForExecutor\",\"InProgress\",\"Success\",\"Failure\"]},\"id\":{\"type\":\"string\"},\"job\":{\"type\":\"string\",\"format\":\"uuid\"},\"count\":{\"type\":\"integer\"},\"progress\":{\"type\":\"integer\"},\"iterator\":{\"type\":\"object\",\"properties\":{\"index\":{\"type\":\"integer\"},\"itered\":{\"type\":\"array\",\"items\":{}},\"itered_len\":{\"type\":\"integer\"},\"args\":{}}},\"flow_jobs\":{\"type\":\"array\",\"items\":{\"type\":\"string\"}},\"flow_jobs_success\":{\"type\":\"array\",\"items\":{\"type\":\"boolean\"}},\"flow_jobs_duration\":{\"type\":\"object\",\"properties\":{\"started_at\":{\"type\":\"array\",\"items\":{\"type\":\"string\"}},\"duration_ms\":{\"type\":\"array\",\"items\":{\"type\":\"integer\"}}}},\"branch_chosen\":{\"type\":\"object\",\"properties\":{\"type\":{\"type\":\"string\",\"enum\":[\"branch\",\"default\"]},\"branch\":{\"type\":\"integer\"}},\"required\":[\"type\"]},\"branchall\":{\"type\":\"object\",\"properties\":{\"branch\":{\"type\":\"integer\"},\"len\":{\"type\":\"integer\"}},\"required\":[\"branch\",\"len\"]},\"approvers\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"properties\":{\"resume_id\":{\"type\":\"integer\"},\"approver\":{\"type\":\"string\"}},\"required\":[\"resume_id\",\"approver\"]}},\"failed_retries\":{\"type\":\"array\",\"items\":{\"type\":\"string\",\"format\":\"uuid\"}},\"skipped\":{\"type\":\"boolean\"},\"agent_actions\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"oneOf\":[{\"type\":\"object\",\"properties\":{\"job_id\":{\"type\":\"string\",\"format\":\"uuid\"},\"function_name\":{\"type\":\"string\"},\"type\":{\"type\":\"string\",\"enum\":[\"tool_call\"]},\"module_id\":{\"type\":\"string\"}},\"required\":[\"job_id\",\"function_name\",\"type\",\"module_id\"]},{\"type\":\"object\",\"properties\":{\"call_id\":{\"type\":\"string\",\"format\":\"uuid\"},\"function_name\":{\"type\":\"string\"},\"resource_path\":{\"type\":\"string\"},\"type\":{\"type\":\"string\",\"enum\":[\"mcp_tool_call\"]},\"arguments\":{\"type\":\"object\"}},\"required\":[\"call_id\",\"function_name\",\"resource_path\",\"type\"]},{\"type\":\"object\",\"properties\":{\"type\":{\"type\":\"string\",\"enum\":[\"web_search\"]}},\"required\":[\"type\"]},{\"type\":\"object\",\"properties\":{\"type\":{\"type\":\"string\",\"enum\":[\"message\"]}},\"required\":[\"content\",\"type\"]}]}},\"agent_actions_success\":{\"type\":\"array\",\"items\":{\"type\":\"boolean\"}}},\"required\":[\"type\"]}}";
-export declare const CLI_COMMANDS = "# Windmill CLI Commands\n\nThe Windmill CLI (`wmill`) provides commands for managing scripts, flows, apps, and other resources.\n\n## Global Options\n\n- `--workspace <workspace:string>` - Specify the target workspace. This overrides the default workspace.\n- `--debug --verbose` - Show debug/verbose logs\n- `--show-diffs` - Show diff informations when syncing (may show sensitive informations)\n- `--token <token:string>` - Specify an API token. This will override any stored token.\n- `--base-url <baseUrl:string>` - Specify the base URL of the API. If used, --token and --workspace are required and no local remote/workspace already set will be used.\n- `--config-dir <configDir:string>` - Specify a custom config directory. Overrides WMILL_CONFIG_DIR environment variable and default ~/.config location.\n\n## Commands\n\n### app\n\napp related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `app list` - list all apps\n  - `--json` - Output as JSON (for piping to jq)\n- `app get <path:string>` - get an app's details\n  - `--json` - Output as JSON (for piping to jq)\n- `app push [file_path:string] [remote_path:string]` - push a local app. With no args, infers the app from the current directory and the remote path from its location relative to wmill.yaml.\n- `app dev [app_folder:string]` - Start a development server for building apps with live reload and hot module replacement\n  - `--port <port:number>` - Port to run the dev server on (will find next available port if occupied)\n  - `--host <host:string>` - Host to bind the dev server to\n  - `--entry <entry:string>` - Entry point file (default: index.ts for Svelte/Vue, index.tsx otherwise)\n  - `--no-open` - Don't automatically open the browser\n- `app lint [app_folder:string]` - Lint a raw app folder to validate structure and buildability\n  - `--fix` - Attempt to fix common issues (not implemented yet)\n- `app new` - create a new raw app from a template\n  - `--summary <summary:string>` - App summary (short description). Skips the prompt when provided. Triggers non-interactive mode.\n  - `--path <path:string>` - App path (e.g., f/folder/my_app or u/username/my_app). Skips the prompt when provided. Triggers non-interactive mode.\n  - `--framework <framework:string>` - Framework template: react19 | react18 | svelte5 | vue. Skips the prompt when provided. Triggers non-interactive mode.\n  - `--datatable <datatable:string>` - Datatable to wire up. Without this flag in non-interactive mode, no datatable is configured.\n  - `--schema <schema:string>` - Schema to use with --datatable. Created (CREATE SCHEMA IF NOT EXISTS) if it doesn't already exist.\n  - `--overwrite` - Overwrite the target directory if it already exists, without prompting.\n  - `--no-open-in-desktop` - Do not prompt to open the new app in Claude Desktop.\n- `app generate-agents [app_folder:string]` - regenerate AGENTS.md and DATATABLES.md from remote workspace\n- `app set-permissioned-as <path:string> <email:string>` - Set the on_behalf_of_email for an app (requires admin or wm_deployers group)\n\n### audit\n\nView audit logs (requires admin)\n\n**Subcommands:**\n\n- `audit list` - List audit log entries\n- `audit get <id:string>` - Get a specific audit log entry\n  - `--json` - Output as JSON (for piping to jq)\n\n### config\n\nShow all available wmill.yaml configuration options\n\n**Options:**\n- `--json` - Output as JSON for programmatic consumption\n\n**Subcommands:**\n\n- `config migrate` - Migrate wmill.yaml from gitBranches/environments to workspaces format\n\n### datatable\n\ndatatable related commands\n\n**Subcommands:**\n\n- `datatable list` - list all datatables in the workspace\n  - `--json` - Output as JSON (for piping to jq)\n- `datatable run <sql:string>` - run a SQL query on a datatable\n  - `-n --name <name:string>` - Datatable name (default: main)\n  - `-s --silent` - Output only the final result as JSON. Useful for scripting.\n- `datatable serve` - Serve all datatables as a Postgres-wire endpoint (psql, DBeaver, pgAdmin); the client picks the datatable via the database name in its connection string\n  - `--port <port:number>` - Port to listen on (default: first free port in 5433-5500)\n  - `--host <host:string>` - Bind address (default: 127.0.0.1)\n  - `--password <password:string>` - Password for Postgres clients (default: generate a random password at startup)\n- `datatable psql` - Start a serve listener and launch psql connected to it\n  - `-n --name <name:string>` - Datatable to connect psql to (default: main)\n  - `--port <port:number>` - Port the proxy listens on (default: first free port in 5433-5500)\n  - `--host <host:string>` - Bind address for the proxy (default: 127.0.0.1)\n  - `--password <password:string>` - Password for the temporary Postgres proxy (default: generate a random password at startup)\n\n### dependencies\n\nworkspace dependencies related commands\n\n**Alias:** `deps`\n\n**Subcommands:**\n\n- `dependencies push <file_path:string>` - Push workspace dependencies from a local file\n\n### dev\n\nWatch local file changes and live-reload the dev page for preview. Does NOT deploy to the remote workspace \u2014 use wmill sync push for that.\n\n**Options:**\n- `--includes <pattern...:string>` - Filter paths given a glob pattern or path\n- `--proxy-port <port:number>` - Port for a localhost reverse proxy to the remote Windmill server\n- `--path <path:string>` - Watch a specific windmill path (e.g., u/admin/my_script or f/my_flow)\n- `--no-open` - Do not open the browser automatically\n\n### docs\n\nSearch Windmill documentation.\n\n**Arguments:** `<query:string>`\n\n**Options:**\n- `--json` - Output results as JSON.\n\n### ducklake\n\nducklake related commands\n\n**Subcommands:**\n\n- `ducklake list` - list all ducklakes in the workspace\n  - `--json` - Output as JSON (for piping to jq)\n- `ducklake run <sql:string>` - run a SQL query on a ducklake\n  - `-n --name <name:string>` - Ducklake name (default: main)\n  - `-s --silent` - Output only the final result as JSON. Useful for scripting.\n\n### flow\n\nflow related commands\n\n**Options:**\n- `--show-archived` - Enable archived flows in output\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `flow list` - list all flows\n  - `--show-archived` - Enable archived flows in output\n  - `--json` - Output as JSON (for piping to jq)\n- `flow get <path:string>` - get a flow's details\n  - `--json` - Output as JSON (for piping to jq)\n- `flow push <file_path:string> <remote_path:string>` - push a local flow spec. This overrides any remote versions.\n  - `--message <message:string>` - Deployment message\n- `flow run <path:string>` - run a flow by path.\n  - `-d --data <data:string>` - Inputs specified as a JSON string or a file using @<filename> or stdin using @-.\n  - `-s --silent` - Do not ouput anything other then the final output. Useful for scripting.\n- `flow preview <flow_path:string>` - preview a local flow without deploying it. Runs the flow definition from local files and uses local PathScripts by default.\n  - `-d --data <data:string>` - Inputs specified as a JSON string or a file using @<filename> or stdin using @-.\n  - `-s --silent` - Do not output anything other then the final output. Useful for scripting.\n  - `--remote` - Use deployed workspace scripts for PathScript steps instead of local files.\n- `flow new <flow_path:string>` - create a new empty flow\n  - `--summary <summary:string>` - flow summary\n  - `--description <description:string>` - flow description\n- `flow bootstrap <flow_path:string>` - create a new empty flow (alias for new)\n  - `--summary <summary:string>` - flow summary\n  - `--description <description:string>` - flow description\n- `flow history <path:string>` - Show version history for a flow\n  - `--json` - Output as JSON (for piping to jq)\n- `flow show-version <path:string> <version:string>` - Show a specific version of a flow\n  - `--json` - Output as JSON (for piping to jq)\n- `flow set-permissioned-as <path:string> <email:string>` - Set the on_behalf_of_email for a flow (requires admin or wm_deployers group)\n\n### folder\n\nfolder related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `folder list` - list all folders\n  - `--json` - Output as JSON (for piping to jq)\n- `folder get <name:string>` - get a folder's details\n  - `--json` - Output as JSON (for piping to jq)\n- `folder new <name:string>` - create a new folder locally\n  - `--summary <summary:string>` - folder summary\n- `folder push <name:string>` - push a local folder to the remote by name. This overrides any remote versions.\n- `folder add-missing` - create default folder.meta.yaml for all subdirectories of f/ that are missing one\n  - `-y, --yes` - skip confirmation prompt\n- `folder show-rules <name:string>` - Show default_permissioned_as rules for a folder. Use --test-path to see which rule matches a given item path.\n  - `--test-path <path:string>` - Test which rule matches this item path (e.g. f/prod/jobs/my_script)\n  - `--json` - Output as JSON\n\n### generate-metadata\n\nGenerate metadata (locks, schemas) for all scripts, flows, and apps\n\n**Arguments:** `[folder:string]`\n\n**Options:**\n- `--yes` - Skip confirmation prompt\n- `--dry-run` - Show what would be updated without making changes\n- `--lock-only` - Re-generate only the lock files\n- `--schema-only` - Re-generate only script schemas (skips flows and apps)\n- `--skip-scripts` - Skip processing scripts\n- `--skip-flows` - Skip processing flows\n- `--skip-apps` - Skip processing apps\n- `--strict-folder-boundaries` - Only update items inside the specified folder (requires folder argument)\n- `--parallel <n:number>` - Number of items to process in parallel\n- `-i --includes <patterns:file[]>` - Comma separated patterns to specify which files to include\n- `-e --excludes <patterns:file[]>` - Comma separated patterns to specify which files to exclude\n\n**Subcommands:**\n\n- `generate-metadata rehash [folder:string]`\n  - `--skip-scripts` - Skip processing scripts\n  - `--skip-flows` - Skip processing flows\n  - `--skip-apps` - Skip processing apps\n  - `--parallel <n:number>` - Number of items to process in parallel\n  - `-i --includes <patterns:file[]>` - Comma separated patterns to specify which files to include\n  - `-e --excludes <patterns:file[]>` - Comma separated patterns to specify which files to exclude\n\n### gitsync-settings\n\nManage git-sync settings between local wmill.yaml and Windmill backend\n\n**Subcommands:**\n\n- `gitsync-settings pull` - Pull git-sync settings from Windmill backend to local wmill.yaml\n  - `--repository <repo:string>` - Specify repository path (e.g., u/user/repo)\n  - `--default` - Write settings to top-level defaults instead of overrides\n  - `--replace` - Replace existing settings (non-interactive mode)\n  - `--override` - Add branch-specific override (non-interactive mode)\n  - `--diff` - Show differences without applying changes\n  - `--json-output` - Output in JSON format\n  - `--with-backend-settings <json:string>` - Use provided JSON settings instead of querying backend (for testing)\n  - `--yes` - Skip interactive prompts and use default behavior\n  - `--promotion <branch:string>` - Use promotionOverrides from the specified branch instead of regular overrides\n- `gitsync-settings push` - Push git-sync settings from local wmill.yaml to Windmill backend\n  - `--repository <repo:string>` - Specify repository path (e.g., u/user/repo)\n  - `--diff` - Show what would be pushed without applying changes\n  - `--json-output` - Output in JSON format\n  - `--with-backend-settings <json:string>` - Use provided JSON settings instead of querying backend (for testing)\n  - `--yes` - Skip interactive prompts and use default behavior\n  - `--promotion <branch:string>` - Use promotionOverrides from the specified branch instead of regular overrides\n\n### group\n\nManage workspace groups\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `group list` - List all groups in the workspace\n  - `--json` - Output as JSON (for piping to jq)\n- `group get <name:string>` - Get group details and members\n  - `--json` - Output as JSON (for piping to jq)\n- `group create <name:string>` - Create a new group\n  - `--summary <summary:string>` - Group summary/description\n- `group delete <name:string>` - Delete a group\n- `group add-user <name:string> <username:string>` - Add a user to a group\n- `group remove-user <name:string> <username:string>` - Remove a user from a group\n\n### hub\n\nHub related commands. EXPERIMENTAL. INTERNAL USE ONLY.\n\n**Subcommands:**\n\n- `hub pull` - pull any supported definitions. EXPERIMENTAL.\n\n### init\n\nBootstrap a windmill project with a wmill.yaml file\n\n**Options:**\n- `--use-default` - Use default settings without checking backend\n- `--use-backend` - Use backend git-sync settings if available\n- `--repository <repo:string>` - Specify repository path (e.g., u/user/repo) when using backend settings\n- `--bind-profile` - Automatically bind active workspace profile to current Git branch\n- `--no-bind-profile` - Skip workspace profile binding prompt\n\n### instance\n\nsync local with a remote instance or the opposite (push or pull)\n\n**Subcommands:**\n\n- `instance add [instance_name:string] [remote:string] [token:string]` - Add a new instance\n- `instance remove <instance:string:instance>` - Remove an instance\n- `instance switch <instance:string:instance>` - Switch the current instance\n- `instance pull` - Pull instance settings, users, configs, instance groups and overwrite local\n  - `--yes` - Pull without needing confirmation\n  - `--dry-run` - Perform a dry run without making changes\n  - `--skip-users` - Skip pulling users\n  - `--skip-settings` - Skip pulling settings\n  - `--skip-configs` - Skip pulling configs (worker groups)\n  - `--skip-groups` - Skip pulling instance groups\n  - `--include-workspaces` - Also pull workspaces\n  - `--folder-per-instance` - Create a folder per instance\n  - `--instance <instance:string>` - Name of the instance to pull from, override the active instance\n  - `--prefix <prefix:string>` - Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces\n  - `--prefix-settings` - Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance\n- `instance push` - Push instance settings, users, configs, group and overwrite remote\n  - `--yes` - Push without needing confirmation\n  - `--dry-run` - Perform a dry run without making changes\n  - `--skip-users` - Skip pushing users\n  - `--skip-settings` - Skip pushing settings\n  - `--skip-configs` - Skip pushing configs (worker groups)\n  - `--skip-groups` - Skip pushing instance groups\n  - `--include-workspaces` - Also push workspaces\n  - `--folder-per-instance` - Create a folder per instance\n  - `--instance <instance:string>` - Name of the instance to push to, override the active instance\n  - `--prefix <prefix:string>` - Prefix of the local workspaces folders to push\n  - `--prefix-settings` - Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance\n- `instance whoami` - Display information about the currently logged-in user\n- `instance get-config` - Dump the current instance config (global settings + worker configs) as YAML\n  - `-o, --output-file <file:string>` - Write YAML to a file instead of stdout\n  - `--show-secrets` - Include sensitive fields (license key, JWT secret) without prompting\n  - `--instance <instance:string>` - Name of the instance, override the active instance\n- `instance connect-slack`\n  - `--bot-token <bot_token:string>` - Slack bot token (xoxb-...)\n  - `--team-id <team_id:string>` - Slack team id\n  - `--team-name <team_name:string>` - Slack team name\n  - `--instance <instance:string>` - Instance profile to connect against (defaults to the active instance)\n\n### job\n\nManage jobs (list, inspect, cancel)\n\n**Subcommands:**\n\n- `job list` - List recent jobs\n- `job get <id:string>` - Get job details. For flows: shows step tree with sub-job IDs\n  - `--json` - Output as JSON (for piping to jq)\n- `job result <id:string>` - Get the result of a completed job (machine-friendly)\n- `job logs <id:string>` - Get job logs. For flows: aggregates all step logs\n- `job cancel <id:string>` - Cancel a running or queued job\n  - `--reason <reason:string>` - Reason for cancellation\n- `job rerun <id:string>` - Re-run a completed job with the same args. Prints the new job UUID on stdout.\n- `job restart <id:string>` - Restart a completed flow at a given top-level step. Prints the new flow job UUID on stdout.\n  - `--step <stepId:string>` - Top-level step id to restart the flow from\n  - `--iteration <n:number>` - For a top-level branchall or for-loop step, the iteration to restart at\n\n### jobs\n\nPull completed and queued jobs from workspace\n\n**Arguments:** `[workspace:string]`\n\n**Options:**\n- `-c, --completed-output <file:string>` - Completed jobs output file (default: completed_jobs.json)\n- `-q, --queued-output <file:string>` - Queued jobs output file (default: queued_jobs.json)\n- `--skip-worker-check` - Skip checking for active workers before export\n\n**Subcommands:**\n\n- `jobs pull`\n- `jobs push`\n\n### lint\n\nValidate Windmill flow, schedule, and trigger YAML files in a directory\n\n**Arguments:** `[directory:string]`\n\n**Options:**\n- `--json` - Output results in JSON format\n- `--fail-on-warn` - Exit with code 1 when warnings are emitted\n- `--locks-required` - Fail if scripts or flow inline scripts that need locks have no locks\n- `-w, --watch` - Watch for file changes and re-lint automatically\n\n### protection-rules\n\n**Subcommands:**\n\n- `protection-rules pull [workspace:string]` - Pull protection rules from Windmill into protection-rules.yaml for a workspace\n  - `--all` - Pull every workspace defined in wmill.yaml\n  - `--dry-run` - Show what would change without writing the file\n  - `--json-output` - Output in JSON format\n- `protection-rules push [workspace:string]` - Push protection rules from protection-rules.yaml to Windmill for a workspace (full reconcile: creates, updates, and deletes)\n  - `--all` - Push every workspace defined in protection-rules.yaml\n  - `--dry-run` - Show what would change without applying\n  - `--json-output` - Output in JSON format\n  - `--yes` - Skip the confirmation prompt (including deletions)\n\n### queues\n\nList all queues with their metrics\n\n**Arguments:** `[workspace:string] the optional workspace to filter by (default to all workspaces)`\n\n**Options:**\n- `--instance [instance]` - Name of the instance to push to, override the active instance\n- `--base-url [baseUrl]` - If used with --token, will be used as the base url for the instance\n\n### refresh\n\nRefresh wmill-managed project files (AGENTS.cli.md and skills)\n\n**Subcommands:**\n\n- `refresh prompts` - Refresh AGENTS.cli.md and managed skills. User-owned AGENTS.md and CLAUDE.md are never overwritten unless you opt in.\n  - `--yes` - Non-interactive: skip the migration prompt for existing AGENTS.md / CLAUDE.md without the expected include; defaults to appending the include.\n\n### resource\n\nresource related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `resource list` - list all resources\n  - `--json` - Output as JSON (for piping to jq)\n- `resource get <path:string>` - get a resource's details\n  - `--json` - Output as JSON (for piping to jq)\n- `resource new <path:string>` - create a new resource locally\n- `resource push <file_path:string> <remote_path:string>` - push a local resource spec. This overrides any remote versions.\n\n### resource-type\n\nresource type related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `resource-type list` - list all resource types\n  - `--schema` - Show schema in the output\n  - `--json` - Output as JSON (for piping to jq)\n- `resource-type get <path:string>` - get a resource type's details\n  - `--json` - Output as JSON (for piping to jq)\n- `resource-type new <name:string>` - create a new resource type locally\n- `resource-type push <file_path:string> <name:string>` - push a local resource spec. This overrides any remote versions.\n- `resource-type generate-namespace` - Create a TypeScript definition file with the RT namespace generated from the resource types\n\n### schedule\n\nschedule related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `schedule list` - list all schedules\n  - `--json` - Output as JSON (for piping to jq)\n- `schedule get <path:string>` - get a schedule's details\n  - `--json` - Output as JSON (for piping to jq)\n- `schedule new <path:string>` - create a new schedule locally\n- `schedule push <file_path:string> <remote_path:string>` - push a local schedule spec. This overrides any remote versions.\n- `schedule enable <path:string>` - Enable a schedule\n  - `--force` - Bypass the fork-conflict warning when the parent workspace has the same schedule (acknowledges that both crons will fire)\n- `schedule disable <path:string>` - Disable a schedule\n- `schedule set-permissioned-as <path:string> <email:string>` - Set the email (run-as user) for a schedule (requires admin or wm_deployers group)\n\n### script\n\nscript related commands\n\n**Options:**\n- `--show-archived` - Show archived scripts instead of active ones\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `script list` - list all scripts\n  - `--show-archived` - Show archived scripts instead of active ones\n  - `--json` - Output as JSON (for piping to jq)\n- `script push <path:file>` - push a local script spec. This overrides any remote versions. Use the script file (.ts, .js, .py, .sh)\n  - `--message <message:string>` - Deployment message\n- `script get <path:file>` - get a script's details\n  - `--json` - Output as JSON (for piping to jq)\n- `script show <path:file>` - show a script's content (alias for get)\n- `script run <path:file>` - run a script by path\n  - `-d --data <data:file>` - Inputs specified as a JSON string or a file using @<filename> or stdin using @-.\n  - `-s --silent` - Do not output anything other then the final output. Useful for scripting.\n- `script preview <path:file>` - preview a local script without deploying it. Supports both regular and codebase scripts.\n  - `-d --data <data:file>` - Inputs specified as a JSON string or a file using @<filename> or stdin using @-.\n  - `-s --silent` - Do not output anything other than the final output. Useful for scripting.\n- `script new <path:file> <language:string>` - create a new script\n  - `--summary <summary:string>` - script summary\n  - `--description <description:string>` - script description\n- `script bootstrap <path:file> <language:string>` - create a new script (alias for new)\n  - `--summary <summary:string>` - script summary\n  - `--description <description:string>` - script description\n- `script set-permissioned-as <path:string> <email:string>` - Set the on_behalf_of_email for a script (requires admin or wm_deployers group)\n- `script history <path:string>` - show version history for a script\n  - `--json` - Output as JSON (for piping to jq)\n\n### sync\n\nsync local with a remote workspaces or the opposite (push or pull)\n\n**Subcommands:**\n\n- `sync pull` - Pull any remote changes and apply them locally.\n  - `--yes` - Pull without needing confirmation\n  - `--dry-run` - Show changes that would be pulled without actually pushing\n  - `--plain-secrets` - Pull secrets as plain text\n  - `--json` - Use JSON instead of YAML\n  - `--skip-variables` - Skip syncing variables (including secrets)\n  - `--skip-secrets` - Skip syncing only secrets variables\n  - `--include-secrets` - Include secrets in sync (overrides skipSecrets in wmill.yaml)\n  - `--skip-resources` - Skip syncing  resources\n  - `--skip-resource-types` - Skip syncing  resource types\n  - `--skip-scripts` - Skip syncing scripts\n  - `--skip-flows` - Skip syncing flows\n  - `--skip-apps` - Skip syncing apps\n  - `--skip-folders` - Skip syncing folders\n  - `--skip-workspace-dependencies` - Skip syncing workspace dependencies\n  - `--skip-scripts-metadata` - Skip syncing scripts metadata, focus solely on logic\n  - `--include-schedules` - Include syncing  schedules\n  - `--include-triggers` - Include syncing triggers\n  - `--include-users` - Include syncing users\n  - `--include-groups` - Include syncing groups\n  - `--include-settings` - Include syncing workspace settings\n  - `--include-key` - Include workspace encryption key\n  - `--skip-branch-validation` - Skip git branch validation and prompts\n  - `--json-output` - Output results in JSON format\n  - `-i --includes <patterns:file[]>` - Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Overrides wmill.yaml includes\n  - `-e --excludes <patterns:file[]>` - Comma separated patterns to specify which file to NOT take into account. Overrides wmill.yaml excludes\n  - `--extra-includes <patterns:file[]>` - Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy\n  - `--repository <repo:string>` - Specify repository path (e.g., u/user/repo) when multiple repositories exist\n  - `--promotion <branch:string>` - Use promotionOverrides from the specified branch instead of regular overrides\n  - `--branch, --env <branch:string>` - [Deprecated: use --workspace] Override the current git branch/environment\n- `sync push` - Push any local changes and apply them remotely.\n  - `--yes` - Push without needing confirmation\n  - `--dry-run` - Show changes that would be pushed without actually pushing\n  - `--plain-secrets` - Push secrets as plain text\n  - `--json` - Use JSON instead of YAML\n  - `--skip-variables` - Skip syncing variables (including secrets)\n  - `--skip-secrets` - Skip syncing only secrets variables\n  - `--include-secrets` - Include secrets in sync (overrides skipSecrets in wmill.yaml)\n  - `--skip-resources` - Skip syncing  resources\n  - `--skip-resource-types` - Skip syncing  resource types\n  - `--skip-scripts` - Skip syncing scripts\n  - `--skip-flows` - Skip syncing flows\n  - `--skip-apps` - Skip syncing apps\n  - `--skip-folders` - Skip syncing folders\n  - `--skip-workspace-dependencies` - Skip syncing workspace dependencies\n  - `--skip-scripts-metadata` - Skip syncing scripts metadata, focus solely on logic\n  - `--include-schedules` - Include syncing schedules\n  - `--include-triggers` - Include syncing triggers\n  - `--include-users` - Include syncing users\n  - `--include-groups` - Include syncing groups\n  - `--include-settings` - Include syncing workspace settings\n  - `--include-key` - Include workspace encryption key\n  - `--skip-branch-validation` - Skip git branch validation and prompts\n  - `--json-output` - Output results in JSON format\n  - `-i --includes <patterns:file[]>` - Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string)\n  - `-e --excludes <patterns:file[]>` - Comma separated patterns to specify which file to NOT take into account.\n  - `--extra-includes <patterns:file[]>` - Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy\n  - `--message <message:string>` - Include a message that will be added to all scripts/flows/apps updated during this push\n  - `--parallel <number>` - Number of changes to process in parallel\n  - `--repository <repo:string>` - Specify repository path (e.g., u/user/repo) when multiple repositories exist\n  - `--branch, --env <branch:string>` - [Deprecated: use --workspace] Override the current git branch/environment\n  - `--lint` - Run lint validation before pushing\n  - `--locks-required` - Fail if scripts or flow inline scripts that need locks have no locks\n  - `--auto-metadata` - Automatically regenerate stale metadata (locks and schemas) before pushing\n  - `--accept-overriding-permissioned-as-with-self` - Accept that items with a different permissioned_as will be updated with your own user\n\n### token\n\nManage API tokens\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `token list` - List API tokens\n  - `--json` - Output as JSON (for piping to jq)\n- `token create` - Create a new API token\n  - `--label <label:string>` - Token label\n  - `--expiration <expiration:string>` - Token expiration (ISO 8601 timestamp)\n- `token delete <token_prefix:string>` - Delete a token by its prefix\n\n### trigger\n\ntrigger related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `trigger list` - list all triggers\n  - `--json` - Output as JSON (for piping to jq)\n- `trigger get <path:string>` - get a trigger's details\n  - `--json` - Output as JSON (for piping to jq)\n  - `--kind <kind:string>` - Trigger kind (http, websocket, kafka, nats, postgres, mqtt, sqs, gcp, azure, email). Recommended for faster lookup\n- `trigger new <path:string>` - create a new trigger locally\n  - `--kind <kind:string>` - Trigger kind (required: http, websocket, kafka, nats, postgres, mqtt, sqs, gcp, azure, email)\n- `trigger push <file_path:string> <remote_path:string>` - push a local trigger spec. This overrides any remote versions.\n- `trigger set-permissioned-as <path:string> <email:string>` - Set the email (run-as user) for a trigger (requires admin or wm_deployers group)\n  - `--kind <kind:string>` - Trigger kind (required: http, websocket, kafka, nats, postgres, mqtt, sqs, gcp, azure, email)\n\n### user\n\nuser related commands\n\n**Subcommands:**\n\n- `user add <email:string> [password:string]` - Create a user\n  - `--superadmin` - Specify to make the new user superadmin.\n  - `--company <company:string>` - Specify to set the company of the new user.\n  - `--name <name:string>` - Specify to set the name of the new user.\n- `user remove <email:string>` - Delete a user\n- `user create-token` - Create a new API token for the authenticated user\n  - `--email <email:string>` - Specify credentials to use for authentication. This will not be stored. It will only be used to exchange for a token with the API server, which will not be stored either.\n  - `--password <password:string>` - Specify credentials to use for authentication. This will not be stored. It will only be used to exchange for a token with the API server, which will not be stored either.\n\n### variable\n\nvariable related commands\n\n**Options:**\n- `--json` - Output as JSON (for piping to jq)\n\n**Subcommands:**\n\n- `variable list` - list all variables\n  - `--json` - Output as JSON (for piping to jq)\n- `variable get <path:string>` - get a variable's details\n  - `--json` - Output as JSON (for piping to jq)\n- `variable new <path:string>` - create a new variable locally\n- `variable push <file_path:string> <remote_path:string>` - Push a local variable spec. This overrides any remote versions.\n  - `--plain-secrets` - Push secrets as plain text\n- `variable add <value:string> <remote_path:string>` - Create a new variable on the remote. This will update the variable if it already exists.\n  - `--plain-secrets` - Push secrets as plain text\n  - `--public` - Legacy option, use --plain-secrets instead\n\n### version\n\nShow version information\n\n### worker-groups\n\ndisplay worker groups, pull and push worker groups configs\n\n**Subcommands:**\n\n- `worker-groups pull` - Pull worker groups (similar to `wmill instance pull --skip-users --skip-settings --skip-groups`)\n  - `--instance` - Name of the instance to push to, override the active instance\n  - `--base-url` - Base url to be passed to the instance settings instead of the local one\n  - `--yes` - Pull without needing confirmation\n- `worker-groups push` - Push worker groups (similar to `wmill instance push --skip-users --skip-settings --skip-groups`)\n  - `--instance [instance]` - Name of the instance to push to, override the active instance\n  - `--base-url [baseUrl]` - If used with --token, will be used as the base url for the instance\n  - `--yes` - Push without needing confirmation\n\n### workers\n\nList all workers grouped by worker groups\n\n**Options:**\n- `--instance [instance]` - Name of the instance to push to, override the active instance\n- `--base-url [baseUrl]` - If used with --token, will be used as the base url for the instance\n\n### workspace\n\nworkspace related commands\n\n**Alias:** `profile`\n\n**Subcommands:**\n\n- `workspace switch <workspace_name:string:workspace>` - Switch to another workspace\n- `workspace add [workspace_name:string] [workspace_id:string] [remote:string]` - Add a workspace\n  - `-c --create` - Create the workspace if it does not exist\n  - `--create-workspace-name <workspace_name:string>` - Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.\n  - `--create-username <username:string>` - Specify your own username in the newly created workspace. Ignored if --create is not specified, the workspace already exists or automatic username creation is enabled on the instance.\n- `workspace remove <workspace_name:string>` - Remove a workspace\n- `workspace whoami` - Show the currently active user\n- `workspace list` - List local workspace profiles\n- `workspace list-remote` - List workspaces on the remote server that you have access to\n  - `--as-superadmin` - List ALL workspaces on the instance (requires the token to belong to a superadmin/devops user)\n- `workspace list-forks` - List forked workspaces on the remote server\n- `workspace bind` - Create or update a workspace entry in wmill.yaml from the active profile\n  - `--workspace <name:string>` - Workspace name (default: current branch or workspaceId)\n  - `--branch <branch:string>` - Git branch to associate (default: workspace name)\n- `workspace unbind` - Remove baseUrl and workspaceId from a workspace entry\n  - `--workspace <name:string>` - Workspace to unbind\n- `workspace fork [workspace_name:string] [workspace_id:string]` - Create a forked workspace\n  - `--create-workspace-name <workspace_name:string>` - Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.\n  - `--color <color:string>` - Workspace color (hex code, e.g. #ff0000)\n  - `--datatable-behavior <behavior:string>` - How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)\n  - `-y --yes` - Skip interactive prompts (defaults datatable behavior to 'skip')\n- `workspace delete-fork <fork_name:string>` - Delete a forked workspace and git branch\n  - `-y --yes` - Skip confirmation prompt\n- `workspace merge` - Compare and deploy changes between a fork and its parent workspace\n  - `--direction <direction:string>` - Deploy direction: to-parent or to-fork\n  - `--all` - Deploy all changed items including conflicts\n  - `--skip-conflicts` - Skip items modified in both workspaces\n  - `--include <items:string>` - Comma-separated kind:path items to include (e.g. script:f/test/main,flow:f/my/flow)\n  - `--exclude <items:string>` - Comma-separated kind:path items to exclude\n  - `--preserve-on-behalf-of` - Preserve original on_behalf_of/permissioned_as values\n  - `-y --yes` - Non-interactive mode (deploy without prompts)\n- `workspace connect-slack` - Non-interactively connect Slack to the active workspace using a pre-minted bot token (xoxb-...). Produces the same artifacts as the UI OAuth flow: workspace_settings fields, g/slack group, f/slack_bot folder, and the encrypted bot token variable + resource at f/slack_bot/bot_token.\n  - `--bot-token <bot_token:string>` - Slack bot token (xoxb-...)\n  - `--team-id <team_id:string>` - Slack team id\n  - `--team-name <team_name:string>` - Slack team name\n- `workspace disconnect-slack`\n\n";
-export declare const LANG_BASH = "# Bash\n\n## Structure\n\nDo not include `#!/bin/bash`. Arguments are obtained as positional parameters:\n\n```bash\n# Get arguments\nvar1=\"$1\"\nvar2=\"$2\"\n\necho \"Processing $var1 and $var2\"\n\n# Return JSON by echoing to stdout\necho \"{\\\"result\\\": \\\"$var1\\\", \\\"count\\\": $var2}\"\n```\n\n**Important:**\n- Do not include shebang (`#!/bin/bash`)\n- Arguments are always strings\n- Access with `$1`, `$2`, etc.\n\n## Output\n\nThe script output is captured as the result. For structured data, output valid JSON:\n\n```bash\nname=\"$1\"\ncount=\"$2\"\n\n# Output JSON result\ncat << EOF\n{\n  \"name\": \"$name\",\n  \"count\": $count,\n  \"timestamp\": \"$(date -Iseconds)\"\n}\nEOF\n```\n\n## Environment Variables\n\nEnvironment variables set in Windmill are available:\n\n```bash\n# Access environment variable\necho \"Workspace: $WM_WORKSPACE\"\necho \"Job ID: $WM_JOB_ID\"\n```\n";
-export declare const LANG_BIGQUERY = "# BigQuery\n\nArguments use `@name` syntax.\n\nName the parameters by adding comments before the statement:\n\n```sql\n-- @name1 (string)\n-- @name2 (int64) = 0\nSELECT * FROM users WHERE name = @name1 AND age > @name2;\n```\n\n## Receiving an S3Object as a script parameter\n\nDeclare the arg with type `(s3object)`. Windmill renders an S3 file picker for\nit, downloads the file, and binds it as a `STRING` JSON parameter \u2014 Parquet/CSV\nfiles are decoded server-side into a JSON array of records, JSON/JSONL pass\nthrough. Consume with `JSON_EXTRACT_ARRAY` / `JSON_VALUE`:\n\n```sql\n-- @file (s3object)\nSELECT\n  CAST(JSON_VALUE(row, '$.id') AS INT64) AS id,\n  JSON_VALUE(row, '$.name') AS name\nFROM UNNEST(JSON_EXTRACT_ARRAY(@file)) AS row;\n```\n\n## Streaming query results to S3\n\nAdd a `-- s3` directive at the top of the script to stream the result set to S3\ninstead of returning rows. Windmill writes the file and returns its `S3Object`\nas the script result.\n\n```sql\n-- s3 prefix=exports/users format=parquet\nSELECT id, name FROM users;\n```\n\nAll keys are optional: `prefix` (object key prefix), `storage` (named storage \u2014\nomit to use the workspace default), `format` (`json` (default), `parquet`, or\n`csv`). Use this for large result sets \u2014 rows stream directly to S3 instead of\nbeing buffered, bypassing the 10000-row return cap.\n";
-export declare const LANG_BUN = "# TypeScript (Bun)\n\nBun runtime with full npm ecosystem and fastest execution.\n\n## Structure\n\nExport a single **async** function called `main`:\n\n```typescript\nexport async function main(param1: string, param2: number) {\n  // Your code here\n  return { result: param1, count: param2 };\n}\n```\n\nDo not call the main function. Libraries are installed automatically.\n\n## Resource Types\n\nOn Windmill, credentials and configuration are stored in resources and passed as parameters to main.\n\nUse the `RT` namespace for resource types:\n\n```typescript\nexport async function main(stripe: RT.Stripe) {\n  // stripe contains API key and config from the resource\n}\n```\n\nOnly use resource types if you need them to satisfy the instructions. Always use the RT namespace.\n\nBefore using a resource type, check the `rt.d.ts` file in the project root to see all available resource types and their fields. This file is generated by `wmill resource-type generate-namespace`.\n\n## Imports\n\n```typescript\nimport Stripe from \"stripe\";\nimport { someFunction } from \"some-package\";\n```\n\n## Windmill Client\n\nImport the windmill client for platform interactions:\n\n```typescript\nimport * as wmill from \"windmill-client\";\n```\n\nSee the SDK documentation for available methods.\n\n## Preprocessor Scripts\n\nFor preprocessor scripts, the function should be named `preprocessor` and receives an `event` parameter:\n\n```typescript\ntype Event = {\n  kind:\n    | \"webhook\"\n    | \"http\"\n    | \"websocket\"\n    | \"kafka\"\n    | \"email\"\n    | \"nats\"\n    | \"postgres\"\n    | \"sqs\"\n    | \"mqtt\"\n    | \"gcp\";\n  body: any;\n  headers: Record<string, string>;\n  query: Record<string, string>;\n};\n\nexport async function preprocessor(event: Event) {\n  return {\n    param1: event.body.field1,\n    param2: event.query.id,\n  };\n}\n```\n\n## S3 Object Operations\n\nWindmill provides built-in support for S3-compatible storage operations. The `wmill.S3Object` type covers both the `s3://storage/key` URI form (`s3:///key` for the workspace default storage) and the `{ s3, storage? }` record form \u2014 always use it instead of redefining your own.\n\n### Receiving an S3Object as a script parameter\n\n```typescript\nimport * as wmill from \"windmill-client\";\n\nexport async function main(file: wmill.S3Object) {\n  const content = await wmill.loadS3File(file);\n  // ...\n}\n```\n\n### S3 operations\n\n```typescript\nimport * as wmill from \"windmill-client\";\n\n// Load file content from S3\nconst content: Uint8Array = await wmill.loadS3File(s3object);\n\n// Load file as stream\nconst blob: Blob = await wmill.loadS3FileStream(s3object);\n\n// Write file to S3\nconst result: wmill.S3Object = await wmill.writeS3File(\n  s3object, // Target path (or undefined to auto-generate)\n  fileContent, // string or Blob\n  s3ResourcePath // Optional: specific S3 resource to use\n);\n```\n";
-export declare const LANG_BUNNATIVE = "# TypeScript (Bun Native)\n\nNative TypeScript execution with fetch only - no external imports allowed.\n\n## Structure\n\nExport a single **async** function called `main`:\n\n```typescript\nexport async function main(param1: string, param2: number) {\n  // Your code here\n  return { result: param1, count: param2 };\n}\n```\n\nDo not call the main function.\n\n## Resource Types\n\nOn Windmill, credentials and configuration are stored in resources and passed as parameters to main.\n\nUse the `RT` namespace for resource types:\n\n```typescript\nexport async function main(stripe: RT.Stripe) {\n  // stripe contains API key and config from the resource\n}\n```\n\nOnly use resource types if you need them to satisfy the instructions. Always use the RT namespace.\n\nBefore using a resource type, check the `rt.d.ts` file in the project root to see all available resource types and their fields. This file is generated by `wmill resource-type generate-namespace`.\n\n## Imports\n\n**No imports allowed.** Use the globally available `fetch` function:\n\n```typescript\nexport async function main(url: string) {\n  const response = await fetch(url);\n  return await response.json();\n}\n```\n\n## Windmill Client\n\nThe windmill client is not available in native TypeScript mode. Use fetch to call APIs directly.\n\n## Preprocessor Scripts\n\nFor preprocessor scripts, the function should be named `preprocessor` and receives an `event` parameter:\n\n```typescript\ntype Event = {\n  kind:\n    | \"webhook\"\n    | \"http\"\n    | \"websocket\"\n    | \"kafka\"\n    | \"email\"\n    | \"nats\"\n    | \"postgres\"\n    | \"sqs\"\n    | \"mqtt\"\n    | \"gcp\";\n  body: any;\n  headers: Record<string, string>;\n  query: Record<string, string>;\n};\n\nexport async function preprocessor(event: Event) {\n  return {\n    param1: event.body.field1,\n    param2: event.query.id,\n  };\n}\n```\n\n## S3 Object Operations\n\nWindmill provides built-in support for S3-compatible storage operations. The `wmill.S3Object` type covers both the `s3://storage/key` URI form (`s3:///key` for the workspace default storage) and the `{ s3, storage? }` record form \u2014 always use it instead of redefining your own.\n\n### Receiving an S3Object as a script parameter\n\n```typescript\nimport * as wmill from \"windmill-client\";\n\nexport async function main(file: wmill.S3Object) {\n  const content = await wmill.loadS3File(file);\n  // ...\n}\n```\n\n### S3 operations\n\n```typescript\nimport * as wmill from \"windmill-client\";\n\n// Load file content from S3\nconst content: Uint8Array = await wmill.loadS3File(s3object);\n\n// Load file as stream\nconst blob: Blob = await wmill.loadS3FileStream(s3object);\n\n// Write file to S3\nconst result: wmill.S3Object = await wmill.writeS3File(\n  s3object, // Target path (or undefined to auto-generate)\n  fileContent, // string or Blob\n  s3ResourcePath // Optional: specific S3 resource to use\n);\n```\n";
-export declare const LANG_CSHARP = "# C#\n\nThe script must contain a public static `Main` method inside a class:\n\n```csharp\npublic class Script\n{\n    public static object Main(string name, int count)\n    {\n        return new { Name = name, Count = count };\n    }\n}\n```\n\n**Important:**\n- Class name is irrelevant\n- Method must be `public static`\n- Return type can be `object` or specific type\n\n## NuGet Packages\n\nAdd packages using the `#r` directive at the top:\n\n```csharp\n#r \"nuget: Newtonsoft.Json, 13.0.3\"\n#r \"nuget: RestSharp, 110.2.0\"\n\nusing Newtonsoft.Json;\nusing RestSharp;\n\npublic class Script\n{\n    public static object Main(string url)\n    {\n        var client = new RestClient(url);\n        var request = new RestRequest();\n        var response = client.Get(request);\n        return JsonConvert.DeserializeObject(response.Content);\n    }\n}\n```\n";
-export declare const LANG_DENO = "# TypeScript (Deno)\n\nDeno runtime with npm support via `npm:` prefix and native Deno libraries.\n\n## Structure\n\nExport a single **async** function called `main`:\n\n```typescript\nexport async function main(param1: string, param2: number) {\n  // Your code here\n  return { result: param1, count: param2 };\n}\n```\n\nDo not call the main function. Libraries are installed automatically.\n\n## Resource Types\n\nOn Windmill, credentials and configuration are stored in resources and passed as parameters to main.\n\nUse the `RT` namespace for resource types:\n\n```typescript\nexport async function main(stripe: RT.Stripe) {\n  // stripe contains API key and config from the resource\n}\n```\n\nOnly use resource types if you need them to satisfy the instructions. Always use the RT namespace.\n\nBefore using a resource type, check the `rt.d.ts` file in the project root to see all available resource types and their fields. This file is generated by `wmill resource-type generate-namespace`.\n\n## Imports\n\n```typescript\n// npm packages use npm: prefix\nimport Stripe from \"npm:stripe\";\nimport { someFunction } from \"npm:some-package\";\n\n// Deno standard library\nimport { serve } from \"https://deno.land/std/http/server.ts\";\n```\n\n## Windmill Client\n\nImport the windmill client for platform interactions:\n\n```typescript\nimport * as wmill from \"windmill-client\";\n```\n\nSee the SDK documentation for available methods.\n\n## Preprocessor Scripts\n\nFor preprocessor scripts, the function should be named `preprocessor` and receives an `event` parameter:\n\n```typescript\ntype Event = {\n  kind:\n    | \"webhook\"\n    | \"http\"\n    | \"websocket\"\n    | \"kafka\"\n    | \"email\"\n    | \"nats\"\n    | \"postgres\"\n    | \"sqs\"\n    | \"mqtt\"\n    | \"gcp\";\n  body: any;\n  headers: Record<string, string>;\n  query: Record<string, string>;\n};\n\nexport async function preprocessor(event: Event) {\n  return {\n    param1: event.body.field1,\n    param2: event.query.id,\n  };\n}\n```\n\n## S3 Object Operations\n\nWindmill provides built-in support for S3-compatible storage operations. The `wmill.S3Object` type covers both the `s3://storage/key` URI form (`s3:///key` for the workspace default storage) and the `{ s3, storage? }` record form \u2014 always use it instead of redefining your own.\n\n### Receiving an S3Object as a script parameter\n\n```typescript\nimport * as wmill from \"windmill-client\";\n\nexport async function main(file: wmill.S3Object) {\n  const content = await wmill.loadS3File(file);\n  // ...\n}\n```\n\n### S3 operations\n\n```typescript\nimport * as wmill from \"windmill-client\";\n\n// Load file content from S3\nconst content: Uint8Array = await wmill.loadS3File(s3object);\n\n// Load file as stream\nconst blob: Blob = await wmill.loadS3FileStream(s3object);\n\n// Write file to S3\nconst result: wmill.S3Object = await wmill.writeS3File(\n  s3object, // Target path (or undefined to auto-generate)\n  fileContent, // string or Blob\n  s3ResourcePath // Optional: specific S3 resource to use\n);\n```\n";
-export declare const LANG_DUCKDB = "# DuckDB\n\nArguments are defined with comments and used with `$name` syntax:\n\n```sql\n-- $name (text) = default\n-- $age (integer)\nSELECT * FROM users WHERE name = $name AND age > $age;\n```\n\n## Ducklake Integration\n\nAttach Ducklake for data lake operations:\n\n```sql\n-- Main ducklake\nATTACH 'ducklake' AS dl;\n\n-- Named ducklake\nATTACH 'ducklake://my_lake' AS dl;\n\n-- Then query\nSELECT * FROM dl.schema.table;\n```\n\n## External Database Connections\n\nConnect to external databases using resources:\n\n```sql\nATTACH '$res:path/to/resource' AS db (TYPE postgres);\nSELECT * FROM db.schema.table;\n```\n\n## S3 File Operations\n\nRead files from S3 storage:\n\n```sql\n-- Default storage\nSELECT * FROM read_csv('s3:///path/to/file.csv');\n\n-- Named storage\nSELECT * FROM read_csv('s3://storage_name/path/to/file.csv');\n\n-- Parquet files\nSELECT * FROM read_parquet('s3:///path/to/file.parquet');\n\n-- JSON files\nSELECT * FROM read_json('s3:///path/to/file.json');\n```\n\n### Receiving an S3Object as a script parameter\n\nDeclare the arg with type `(s3object)`. Windmill renders an S3 file picker for it\nand binds the arg as the bare `s3://storage/key` URI, which DuckDB's reader\nfunctions consume directly:\n\n```sql\n-- $file (s3object)\nSELECT * FROM read_parquet($file);\n```\n\nWorks with any DuckDB reader: `read_csv($file)`, `read_json($file)`, etc.\n\n### Writing query results to S3\n\nDuckDB writes to S3 natively via `COPY ... TO`:\n\n```sql\nCOPY (SELECT * FROM users) TO 's3:///exports/users.parquet' (FORMAT PARQUET);\n```\n\nUse this instead of the `-- s3` streaming directive supported by the other SQL\ndialects \u2014 that directive is not available in DuckDB.\n";
-export declare const LANG_GO = "# Go\n\n## Structure\n\nThe file package must be `inner` and export a function called `main`:\n\n```go\npackage inner\n\nfunc main(param1 string, param2 int) (map[string]interface{}, error) {\n    return map[string]interface{}{\n        \"result\": param1,\n        \"count\":  param2,\n    }, nil\n}\n```\n\n**Important:**\n- Package must be `inner`\n- Return type must be `({return_type}, error)`\n- Function name is `main` (lowercase)\n\n## Return Types\n\nThe return type can be any Go type that can be serialized to JSON:\n\n```go\npackage inner\n\ntype Result struct {\n    Name  string `json:\"name\"`\n    Count int    `json:\"count\"`\n}\n\nfunc main(name string, count int) (Result, error) {\n    return Result{\n        Name:  name,\n        Count: count,\n    }, nil\n}\n```\n\n## Error Handling\n\nReturn errors as the second return value:\n\n```go\npackage inner\n\nimport \"errors\"\n\nfunc main(value int) (string, error) {\n    if value < 0 {\n        return \"\", errors.New(\"value must be positive\")\n    }\n    return \"success\", nil\n}\n```\n";
-export declare const LANG_GRAPHQL = "# GraphQL\n\n## Structure\n\nWrite GraphQL queries or mutations. Arguments can be added as query parameters:\n\n```graphql\nquery GetUser($id: ID!) {\n  user(id: $id) {\n    id\n    name\n    email\n  }\n}\n```\n\n## Variables\n\nVariables are passed as script arguments and automatically bound to the query:\n\n```graphql\nquery SearchProducts($query: String!, $limit: Int = 10) {\n  products(search: $query, first: $limit) {\n    edges {\n      node {\n        id\n        name\n        price\n      }\n    }\n  }\n}\n```\n\n## Mutations\n\n```graphql\nmutation CreateUser($input: CreateUserInput!) {\n  createUser(input: $input) {\n    id\n    name\n    createdAt\n  }\n}\n```\n";
-export declare const LANG_JAVA = "# Java\n\nThe script must contain a Main public class with a `public static main()` method:\n\n```java\npublic class Main {\n    public static Object main(String name, int count) {\n        java.util.Map<String, Object> result = new java.util.HashMap<>();\n        result.put(\"name\", name);\n        result.put(\"count\", count);\n        return result;\n    }\n}\n```\n\n**Important:**\n- Class must be named `Main`\n- Method must be `public static Object main(...)`\n- Return type is `Object` or `void`\n\n## Maven Dependencies\n\nAdd dependencies using comments at the top:\n\n```java\n//requirements:\n//com.google.code.gson:gson:2.10.1\n//org.apache.httpcomponents:httpclient:4.5.14\n\nimport com.google.gson.Gson;\n\npublic class Main {\n    public static Object main(String input) {\n        Gson gson = new Gson();\n        return gson.fromJson(input, Object.class);\n    }\n}\n```\n";
-export declare const LANG_MSSQL = "# Microsoft SQL Server (MSSQL)\n\nArguments use `@P1`, `@P2`, etc.\n\nName the parameters by adding comments before the statement:\n\n```sql\n-- @P1 name1 (varchar)\n-- @P2 name2 (int) = 0\nSELECT * FROM users WHERE name = @P1 AND age > @P2;\n```\n\n## Receiving an S3Object as a script parameter\n\nDeclare the arg with type `(s3object)`. Windmill renders an S3 file picker for\nit, downloads the file, and binds it as `nvarchar(max)` JSON text \u2014 Parquet/CSV\nfiles are decoded server-side into a JSON array of records, JSON/JSONL pass\nthrough. Consume with `OPENJSON`:\n\n```sql\n-- @P1 file (s3object)\nSELECT id, name\nFROM OPENJSON(@P1)\nWITH (id INT, name NVARCHAR(200));\n```\n\n## Streaming query results to S3\n\nAdd a `-- s3` directive at the top of the script to stream the result set to S3\ninstead of returning rows. Windmill writes the file and returns its `S3Object`\nas the script result.\n\n```sql\n-- s3 prefix=exports/users format=parquet\nSELECT id, name FROM users;\n```\n\nAll keys are optional: `prefix` (object key prefix), `storage` (named storage \u2014\nomit to use the workspace default), `format` (`json` (default), `parquet`, or\n`csv`). Use this for large result sets \u2014 rows stream directly to S3 instead of\nbeing buffered as the script return value.\n";
-export declare const LANG_MYSQL = "# MySQL\n\nArguments use `?` placeholders.\n\nName the parameters by adding comments before the statement:\n\n```sql\n-- ? name1 (text)\n-- ? name2 (int) = 0\nSELECT * FROM users WHERE name = ? AND age > ?;\n```\n\n## Receiving an S3Object as a script parameter\n\nDeclare the arg with type `(s3object)`. Windmill renders an S3 file picker for\nit, downloads the file, and binds it as JSON text \u2014 Parquet/CSV files are\ndecoded server-side into a JSON array of records, JSON/JSONL pass through.\nConsume with `JSON_TABLE`:\n\n```sql\n-- ? file (s3object)\nSELECT id, name\nFROM JSON_TABLE(?, '$[*]'\n  COLUMNS (id INT PATH '$.id', name VARCHAR(200) PATH '$.name')\n) AS r;\n```\n\n## Streaming query results to S3\n\nAdd a `-- s3` directive at the top of the script to stream the result set to S3\ninstead of returning rows. Windmill writes the file and returns its `S3Object`\nas the script result.\n\n```sql\n-- s3 prefix=exports/users format=parquet\nSELECT id, name FROM users;\n```\n\nAll keys are optional: `prefix` (object key prefix), `storage` (named storage \u2014\nomit to use the workspace default), `format` (`json` (default), `parquet`, or\n`csv`). Use this for large result sets \u2014 rows stream directly to S3 instead of\nbeing buffered as the script return value.\n";
-export declare const LANG_NATIVETS = "# TypeScript (Native)\n\nNative TypeScript execution with fetch only - no external imports allowed.\n\n## Structure\n\nExport a single **async** function called `main`:\n\n```typescript\nexport async function main(param1: string, param2: number) {\n  // Your code here\n  return { result: param1, count: param2 };\n}\n```\n\nDo not call the main function.\n\n## Resource Types\n\nOn Windmill, credentials and configuration are stored in resources and passed as parameters to main.\n\nUse the `RT` namespace for resource types:\n\n```typescript\nexport async function main(stripe: RT.Stripe) {\n  // stripe contains API key and config from the resource\n}\n```\n\nOnly use resource types if you need them to satisfy the instructions. Always use the RT namespace.\n\nBefore using a resource type, check the `rt.d.ts` file in the project root to see all available resource types and their fields. This file is generated by `wmill resource-type generate-namespace`.\n\n## Imports\n\n**No imports allowed.** Use the globally available `fetch` function:\n\n```typescript\nexport async function main(url: string) {\n  const response = await fetch(url);\n  return await response.json();\n}\n```\n\n## Windmill Client\n\nThe windmill client is not available in native TypeScript mode. Use fetch to call APIs directly.\n\n## Preprocessor Scripts\n\nFor preprocessor scripts, the function should be named `preprocessor` and receives an `event` parameter:\n\n```typescript\ntype Event = {\n  kind:\n    | \"webhook\"\n    | \"http\"\n    | \"websocket\"\n    | \"kafka\"\n    | \"email\"\n    | \"nats\"\n    | \"postgres\"\n    | \"sqs\"\n    | \"mqtt\"\n    | \"gcp\";\n  body: any;\n  headers: Record<string, string>;\n  query: Record<string, string>;\n};\n\nexport async function preprocessor(event: Event) {\n  return {\n    param1: event.body.field1,\n    param2: event.query.id\n  };\n}\n```\n";
-export declare const LANG_PHP = "# PHP\n\n## Structure\n\nThe script must start with `<?php` and contain at least one function called `main`:\n\n```php\n<?php\n\nfunction main(string $param1, int $param2) {\n    return [\"result\" => $param1, \"count\" => $param2];\n}\n```\n\n## Resource Types\n\nOn Windmill, credentials and configuration are stored in resources and passed as parameters to main.\n\nYou need to **redefine** the type of the resources that are needed before the main function. Always check if the class already exists using `class_exists`:\n\n```php\n<?php\n\nif (!class_exists('Postgresql')) {\n    class Postgresql {\n        public string $host;\n        public int $port;\n        public string $user;\n        public string $password;\n        public string $dbname;\n    }\n}\n\nfunction main(Postgresql $db) {\n    // $db contains the database connection details\n}\n```\n\nThe resource type name has to be exactly as specified.\n\n## Library Dependencies\n\nSpecify library dependencies as comments before the main function:\n\n```php\n<?php\n\n// require:\n// guzzlehttp/guzzle\n// stripe/stripe-php@^10.0\n\nfunction main() {\n    // Libraries are available\n}\n```\n\nOne dependency per line. No need to require autoload, it is already done.\n";
-export declare const LANG_POSTGRESQL = "# PostgreSQL\n\nArguments are obtained directly in the statement with `$1::{type}`, `$2::{type}`, etc.\n\nName the parameters by adding comments at the beginning of the script (without specifying the type):\n\n```sql\n-- $1 name1\n-- $2 name2 = default_value\nSELECT * FROM users WHERE name = $1::TEXT AND age > $2::INT;\n```\n\n## Receiving an S3Object as a script parameter\n\nDeclare the arg with type `(s3object)`. Windmill renders an S3 file picker for\nit, downloads the file, and binds it as a `jsonb` parameter \u2014 Parquet/CSV files\nare decoded server-side into a JSON array of records, JSON/JSONL pass through.\nConsume with `jsonb_to_recordset` (or any `jsonb` API):\n\n```sql\n-- $1 file (s3object)\nSELECT *\nFROM jsonb_to_recordset($1::jsonb) AS r(id INT, name TEXT);\n```\n\n## Streaming query results to S3\n\nAdd a `-- s3` directive at the top of the script to stream the result set to S3\ninstead of returning rows. Windmill writes the file and returns its `S3Object`\nas the script result.\n\n```sql\n-- s3 prefix=exports/users format=parquet\nSELECT id, name FROM users;\n```\n\nAll keys are optional: `prefix` (object key prefix), `storage` (named storage \u2014\nomit to use the workspace default), `format` (`json` (default), `parquet`, or\n`csv`). Use this for large result sets \u2014 rows stream directly to S3 instead of\nbeing buffered as the script return value.\n";
-export declare const LANG_POWERSHELL = "# PowerShell\n\n## Structure\n\nArguments are obtained by calling the `param` function on the first line:\n\n```powershell\nparam($Name, $Count = 0, [int]$Age)\n\n# Your code here\nWrite-Output \"Processing $Name, count: $Count, age: $Age\"\n\n# Return object\n@{\n    name = $Name\n    count = $Count\n    age = $Age\n}\n```\n\n## Parameter Types\n\nYou can specify types for parameters:\n\n```powershell\nparam(\n    [string]$Name,\n    [int]$Count = 0,\n    [bool]$Enabled = $true,\n    [array]$Items\n)\n\n@{\n    name = $Name\n    count = $Count\n    enabled = $Enabled\n    items = $Items\n}\n```\n\n## Return Values\n\nReturn values by outputting them at the end of the script:\n\n```powershell\nparam($Input)\n\n$result = @{\n    processed = $true\n    data = $Input\n    timestamp = Get-Date -Format \"o\"\n}\n\n$result\n```\n";
-export declare const LANG_PYTHON3 = "# Python\n\n## Structure\n\nThe script must contain at least one function called `main`:\n\n```python\ndef main(param1: str, param2: int):\n    # Your code here\n    return {\"result\": param1, \"count\": param2}\n```\n\nDo not call the main function. Libraries are installed automatically.\n\n## Resource Types\n\nOn Windmill, credentials and configuration are stored in resources and passed as parameters to main.\n\nYou need to **redefine** the type of the resources that are needed before the main function as TypedDict:\n\n```python\nfrom typing import TypedDict\n\nclass postgresql(TypedDict):\n    host: str\n    port: int\n    user: str\n    password: str\n    dbname: str\n\ndef main(db: postgresql):\n    # db contains the database connection details\n    pass\n```\n\n**Important rules:**\n\n- The resource type name must be **IN LOWERCASE**\n- Only include resource types if they are actually needed\n- If an import conflicts with a resource type name, **rename the imported object, not the type name**\n- Make sure to import TypedDict from typing **if you're using it**\n\n## Imports\n\nLibraries are installed automatically. Do not show installation instructions.\n\n```python\nimport requests\nimport pandas as pd\nfrom datetime import datetime\n```\n\nIf an import name conflicts with a resource type:\n\n```python\n# Wrong - don't rename the type\nimport stripe as stripe_lib\nclass stripe_type(TypedDict): ...\n\n# Correct - rename the import\nimport stripe as stripe_sdk\nclass stripe(TypedDict):\n    api_key: str\n```\n\n## Windmill Client\n\nImport the windmill client for platform interactions:\n\n```python\nimport wmill\n```\n\nSee the SDK documentation for available methods.\n\n## Preprocessor Scripts\n\nFor preprocessor scripts, the function should be named `preprocessor` and receives an `event` parameter:\n\n```python\nfrom typing import TypedDict, Literal, Any\n\nclass Event(TypedDict):\n    kind: Literal[\"webhook\", \"http\", \"websocket\", \"kafka\", \"email\", \"nats\", \"postgres\", \"sqs\", \"mqtt\", \"gcp\"]\n    body: Any\n    headers: dict[str, str]\n    query: dict[str, str]\n\ndef preprocessor(event: Event):\n    # Transform the event into flow input parameters\n    return {\n        \"param1\": event[\"body\"][\"field1\"],\n        \"param2\": event[\"query\"][\"id\"]\n    }\n```\n\n## S3 Object Operations\n\nWindmill provides built-in support for S3-compatible storage operations.\n\n### Receiving an S3Object as a script parameter\n\nTo accept a file from S3 as input to a script, type the parameter with `S3Object` (imported from `wmill`):\n\n```python\nimport wmill\nfrom wmill import S3Object\n\ndef main(file: S3Object):\n    content = wmill.load_s3_file(file)\n    # ...\n```\n\n### S3 operations\n\n```python\nimport wmill\n\n# Load file content from S3\ncontent: bytes = wmill.load_s3_file(s3object)\n\n# Load file as stream reader\nreader: BufferedReader = wmill.load_s3_file_reader(s3object)\n\n# Write file to S3\nresult: S3Object = wmill.write_s3_file(\n    s3object,           # Target path (or None to auto-generate)\n    file_content,       # bytes or BufferedReader\n    s3_resource_path,   # Optional: specific S3 resource\n    content_type,       # Optional: MIME type\n    content_disposition # Optional: Content-Disposition header\n)\n```\n";
-export declare const LANG_RLANG = "# R\n\n## Structure\n\nDefine a `main` function using `<-` or `=` assignment. Parameters become the script inputs:\n\n```r\nlibrary(dplyr)\nlibrary(jsonlite)\n\nmain <- function(x, name = \"default\", flag = TRUE) {\n    df <- tibble(x = x, name = name)\n    result <- df %>% mutate(greeting = paste(\"Hello\", name))\n    return(toJSON(result, auto_unbox = TRUE))\n}\n```\n\n**Important:**\n- The `main` function is required\n- Use `library()` to load packages \u2014 they are resolved and installed automatically\n- `jsonlite` is always available (used internally for argument parsing)\n- Return values must be JSON-serializable\n\n## Parameters\n\nR types map to Windmill types:\n- `numeric` \u2192 float/int\n- `character` \u2192 string\n- `logical` \u2192 bool (use `TRUE`/`FALSE`)\n- `list` \u2192 object/dict\n- `NULL` \u2192 null\n\nDefault values are inferred from the function signature:\n\n```r\nmain <- function(\n    name,              # required string\n    count = 10,        # optional int, default 10\n    verbose = FALSE    # optional bool, default FALSE\n) {\n    # ...\n}\n```\n\n## Resources and Variables\n\nUse the built-in Windmill helpers (no import needed):\n\n```r\nmain <- function() {\n    # Get a variable\n    api_key <- get_variable(\"f/my_folder/api_key\")\n\n    # Get a resource (returns a list)\n    db <- get_resource(\"f/my_folder/postgres_config\")\n    host <- db$host\n    port <- db$port\n\n    return(list(host = host, port = port))\n}\n```\n\n## Output\n\nReturn any JSON-serializable value from `main`. The return value becomes the step result:\n\n```r\nmain <- function(x) {\n    # Return a scalar\n    return(x + 1)\n\n    # Or a list (becomes JSON object)\n    return(list(result = x + 1, status = \"ok\"))\n}\n```\n\n## Annotations\n\nControl execution behavior with comment annotations:\n\n```r\n#renv_verbose = true        # Show verbose renv output during resolution\n#renv_install_verbose = true # Show verbose output during package installation\n#sandbox = true              # Run in nsjail sandbox (requires nsjail)\n```\n";
-export declare const LANG_RUST = "# Rust\n\n## Structure\n\nThe script must contain a function called `main` with proper return type:\n\n```rust\nuse anyhow::anyhow;\nuse serde::Serialize;\n\n#[derive(Serialize, Debug)]\nstruct ReturnType {\n    result: String,\n    count: i32,\n}\n\nfn main(param1: String, param2: i32) -> anyhow::Result<ReturnType> {\n    Ok(ReturnType {\n        result: param1,\n        count: param2,\n    })\n}\n```\n\n**Important:**\n- Arguments should be owned types\n- Return type must be serializable (`#[derive(Serialize)]`)\n- Return type is `anyhow::Result<T>`\n\n## Dependencies\n\nPackages must be specified with a partial cargo.toml at the beginning of the script:\n\n```rust\n//! ```cargo\n//! [dependencies]\n//! anyhow = \"1.0.86\"\n//! reqwest = { version = \"0.11\", features = [\"json\"] }\n//! tokio = { version = \"1\", features = [\"full\"] }\n//! ```\n\nuse anyhow::anyhow;\n// ... rest of the code\n```\n\n**Note:** Serde is already included, no need to add it again.\n\n## Async Functions\n\nIf you need to handle async functions (e.g., using tokio), keep the main function sync and create the runtime inside:\n\n```rust\n//! ```cargo\n//! [dependencies]\n//! anyhow = \"1.0.86\"\n//! tokio = { version = \"1\", features = [\"full\"] }\n//! reqwest = { version = \"0.11\", features = [\"json\"] }\n//! ```\n\nuse anyhow::anyhow;\nuse serde::Serialize;\n\n#[derive(Serialize, Debug)]\nstruct Response {\n    data: String,\n}\n\nfn main(url: String) -> anyhow::Result<Response> {\n    let rt = tokio::runtime::Runtime::new()?;\n    rt.block_on(async {\n        let resp = reqwest::get(&url).await?.text().await?;\n        Ok(Response { data: resp })\n    })\n}\n```\n";
-export declare const LANG_SNOWFLAKE = "# Snowflake\n\nArguments use `?` placeholders.\n\nName the parameters by adding comments before the statement:\n\n```sql\n-- ? name1 (text)\n-- ? name2 (number) = 0\nSELECT * FROM users WHERE name = ? AND age > ?;\n```\n\n## Receiving an S3Object as a script parameter\n\nDeclare the arg with type `(s3object)`. Windmill renders an S3 file picker for\nit, downloads the file, and binds it as JSON text \u2014 Parquet/CSV files are\ndecoded server-side into a JSON array of records, JSON/JSONL pass through.\nWrap the bind with `PARSE_JSON(?)` and walk it with `LATERAL FLATTEN`:\n\n```sql\n-- ? file (s3object)\nSELECT\n  v.value:id::NUMBER AS id,\n  v.value:name::STRING AS name\nFROM LATERAL FLATTEN(input => PARSE_JSON(?)) v;\n```\n\n## Streaming query results to S3\n\nAdd a `-- s3` directive at the top of the script to stream the result set to S3\ninstead of returning rows. Windmill writes the file and returns its `S3Object`\nas the script result.\n\n```sql\n-- s3 prefix=exports/users format=parquet\nSELECT id, name FROM users;\n```\n\nAll keys are optional: `prefix` (object key prefix), `storage` (named storage \u2014\nomit to use the workspace default), `format` (`json` (default), `parquet`, or\n`csv`). Use this for large result sets \u2014 rows stream directly to S3 instead of\nbeing buffered, bypassing the 10000-row return cap.\n";
+// Auto-generated by generate.py - DO NOT EDIT
+
+export declare const SCRIPT_BASE: string;
+export declare const FLOW_BASE: string;
+export declare const RESOURCES_BASE: string;
+export declare const RAW_APP_BASE: string;
+export declare const PIPELINE_BASE: string;
+export declare const WORKFLOW_AS_CODE_BASE: string;
+export declare const FLOW_CHAT_SPECIAL_MODULES: string;
+export declare const SDK_TYPESCRIPT: string;
+export declare const SDK_PYTHON: string;
+export declare const WAC_SDK_TYPESCRIPT: string;
+export declare const WAC_SDK_PYTHON: string;
+export declare const DATATABLE_SDK_TYPESCRIPT: string;
+export declare const DATATABLE_SDK_PYTHON: string;
+export declare const OPENFLOW_SCHEMA: string;
+export declare const CLI_COMMANDS: string;
+export declare const LANG_ANSIBLE: string;
+export declare const LANG_BASH: string;
+export declare const LANG_BIGQUERY: string;
+export declare const LANG_BUN: string;
+export declare const LANG_BUNNATIVE: string;
+export declare const LANG_CSHARP: string;
+export declare const LANG_DENO: string;
+export declare const LANG_DUCKDB: string;
+export declare const LANG_GO: string;
+export declare const LANG_GRAPHQL: string;
+export declare const LANG_JAVA: string;
+export declare const LANG_MSSQL: string;
+export declare const LANG_MYSQL: string;
+export declare const LANG_PHP: string;
+export declare const LANG_POSTGRESQL: string;
+export declare const LANG_POWERSHELL: string;
+export declare const LANG_PYTHON3: string;
+export declare const LANG_RLANG: string;
+export declare const LANG_RUST: string;
+export declare const LANG_SNOWFLAKE: string;
diff --git a/system_prompts/auto-generated/prompts.ts b/system_prompts/auto-generated/prompts.ts
index b9659d4bbe..43b09cfe14 100644
--- a/system_prompts/auto-generated/prompts.ts
+++ b/system_prompts/auto-generated/prompts.ts
@@ -170,8 +170,11 @@ input_transforms:
 
 ## Approval / Suspend Structure
 
+An approval step is a normal **script** step (\`type: rawscript\` or \`type: script\`) that is turned into an approval by adding a module-level \`suspend\`. Its script calls \`wmill.getResumeUrls(approver)\` to generate the secret resume/cancel URLs and returns them so they can be sent to the approver(s) (Slack, email, etc.) or approved from the run page.
+
 - \`suspend\` belongs on the flow module object itself, as a sibling of \`id\` and \`value\`
 - Never put \`suspend\` inside \`value\`
+- Do NOT use \`type: identity\` for an approval step. An identity step suspends but never produces the resume URLs, so approvers have no link to act on — it is not a functional approval.
 
 Correct shape:
 
@@ -187,10 +190,23 @@ Correct shape:
             type: string
         required: [comment]
   value:
-    type: identity
+    type: rawscript
+    language: bun
+    input_transforms:
+      approver:
+        type: static
+        value: ''
+    content: |
+      import * as wmill from "windmill-client"
+
+      export async function main(approver?: string) {
+        const urls = await wmill.getResumeUrls(approver)
+        // send urls.resume / urls.cancel to the approver(s), e.g. via Slack or email
+        return urls
+      }
 \`\`\`
 
-Incorrect shape:
+Incorrect shape (suspend misplaced inside \`value\`):
 
 \`\`\`yaml
 - id: request_approval
@@ -200,6 +216,16 @@ Incorrect shape:
       required_events: 1
 \`\`\`
 
+Incorrect shape (identity has no resume URLs — not a real approval):
+
+\`\`\`yaml
+- id: request_approval
+  suspend:
+    required_events: 1
+  value:
+    type: identity
+\`\`\`
+
 ## Branch Result Scope Rules
 
 - Inside a branch, you may reference earlier outer steps and earlier steps in the same branch
@@ -587,6 +613,8 @@ A raw app has three logical parts:
 
 \`index.tsx\` is the bundling entrypoint. It typically renders a top-level \`App\` component. The bundler is esbuild.
 
+**Always begin every React file (\`.tsx\`/\`.jsx\`) that uses JSX with \`import React from 'react'\`.** esbuild uses the classic JSX transform, so \`React\` must be in scope wherever JSX appears — a missing import compiles fine but throws \`React is not defined\` at runtime, leaving a blank screen.
+
 ### Generated bindings (\`wmill.d.ts\` / \`wmill.ts\`)
 
 The frontend imports a generated module that mirrors the backend runnables. **Never write to it directly** — it gets regenerated whenever backend runnables change. Modifying it by hand will be overwritten.
@@ -708,6 +736,68 @@ def main(user_id: str):
 5. **Always whitelist tables** — adding a runnable that queries a new table requires the table to be in \`data.tables\` first.
 `;
 
+export const PIPELINE_BASE = `# Data pipeline authoring
+
+A **data pipeline** is NOT a flow. A flow is one runnable that orchestrates steps internally. A data pipeline is a set of **independent scripts**, each deployed on its own, that form a DAG by reading and writing shared **storage assets** (DuckLake tables, data tables, S3 objects, volumes, resources) and by declaring execution **triggers**. The pipeline is visualized and edited at \`/pipeline/<folder>\`; every node is a normal workspace script that happens to carry pipeline annotations. When the user asks for a "data pipeline" (or to "ingest / transform / materialize" data across steps), build pipeline-annotated scripts — do NOT build a flow.
+
+## What makes a script a pipeline node
+
+A script joins the pipeline when its source begins with the \`pipeline\` annotation as a top-of-file comment, **written in the script's own comment syntax** — \`//\` for TS/JS (bun), \`--\` for SQL (DuckDB/Postgres), \`#\` for Python/Bash. So it's \`-- pipeline\` in a DuckDB node, \`# pipeline\` in a Python node, \`// pipeline\` in a bun node. Every annotation below uses that same prefix (the \`//\` shown is the TS form). All other wiring is expressed as annotation comments near the top of the file:
+
+- \`// on <ref>\` — declares an execution-DAG **input** (what triggers/feeds this node). \`<ref>\` is either:
+  - an **asset URI** (the node runs when that asset is produced upstream): \`ducklake://main/orders\`, \`datatable://main/users\`, \`s3://<key>\`, \`$res:f/folder/my_resource\`, \`volume://name/path\`.
+  - a **native trigger kind**: \`schedule\`, \`webhook\`, \`email\`, \`kafka\`, \`mqtt\`, \`nats\`, \`postgres\`, \`sqs\`, \`gcp\`, or \`data_upload\` (a user-uploaded S3 file). For these the actual trigger row (cron, topic, …) is created separately; the annotation only declares the binding.
+- **Outputs** are inferred from what the body writes — a \`CREATE TABLE\`, a \`wmill.writeS3File(...)\`, a DuckLake/datatable write. To declare a managed output explicitly, use \`// materialize <asset-uri>\`.
+- Optional badges: \`// partitioned <daily|hourly|weekly|monthly|dynamic>\`, \`// freshness <duration>\` (e.g. \`1h\`), \`// tag <worker-tag>\`, \`// retry <count> [delay]\`, \`// data_test <kind> ...\`.
+
+## Materialize (the managed output)
+
+> **\`// materialize\` is DuckDB-only**, and its target must be a DuckLake table (\`ducklake://<name>/<table>\`). Deploy **rejects** \`// materialize\` on any other language (\`python3\`, \`bun\`, \`postgresql\`) or a non-DuckLake target. For a non-DuckDB node, do **not** use \`// materialize\` — write the output via the SDK (\`wmill.writeS3File(...)\`, a postgresql \`CREATE TABLE\`, ducklake helpers, …) and let it be inferred. Use \`duckdb\` when a node should materialize a DuckLake table.
+
+\`// materialize <asset-uri>\` tells the runtime to write the node's output table **for you**: write the body as a single \`SELECT\` and the runtime wraps it in the create/replace — do **not** also write your own \`CREATE TABLE\` / \`INSERT\`. Write strategy:
+
+- no option → **replace** the whole table each run (full refresh; the only mode whose output columns may change);
+- \`// materialize <uri> append\` → INSERT-append rows (incremental);
+- \`// materialize <uri> key=<col>\` → merge/upsert on \`<col>\`.
+
+\`// materialize manual <uri>\` opts **out** of managed writes — the script writes its own DDL and the annotation only records the output asset for lineage.
+
+\`materialize\` pairs with partitioning for incremental pipelines: a \`// partitioned <daily|hourly|weekly|monthly|dynamic>\` node runs **once per partition** (append/merge into a fixed-schema table), and the \`{partition}\` token inside any asset URI is substituted with the current partition value at run time.
+
+\`materialize\` is an output **declaration** on a node — not a command. There is no "materialize run".
+
+## How to build one in chat
+
+1. Put every node in the **same folder**: \`f/<folder>/<name>\`. The folder is the pipeline.
+2. Author each node as a **script draft** with \`write_script\` (or \`edit_script\`), language chosen for the work: \`duckdb\` or \`postgresql\` for SQL-shaped data work, \`bun\`/\`python3\` for general transforms. SQL-heavy lakehouse steps usually use \`duckdb\`.
+3. Start each body with \`// pipeline\`, then the \`// on\` input declarations, then the transform that writes the output.
+4. **Chain nodes by asset URI**: read an upstream node's output asset, then \`// on <that-same-uri>\` in the downstream node so the edge forms. Reuse exact asset paths from existing nodes rather than inventing parallel ones.
+5. Leave nodes as drafts unless the user asks to deploy. A pipeline only "runs" once its scripts are deployed and their triggers exist.
+
+When the user already has the \`/pipeline/<folder>\` editor open, prefer the dedicated \`build_pipeline_node\` / \`edit_pipeline_node\` tools (they stage reviewable, canvas-highlighted proposals). Outside the editor, use the standard script-draft tools with the annotations above.
+
+## Example (DuckDB → DuckLake, scheduled ingest + downstream transform)
+
+Node \`f/sales/orders_ingest\` (runs on a schedule, materializes a DuckLake table):
+
+\`\`\`sql
+-- pipeline
+-- on schedule
+-- materialize ducklake://main/orders
+SELECT * FROM read_csv('s3://raw/orders/*.csv')
+\`\`\`
+
+Node \`f/sales/orders_daily\` (runs when \`orders\` is produced, writes a rollup):
+
+\`\`\`sql
+-- pipeline
+-- on ducklake://main/orders
+-- materialize ducklake://main/orders_daily
+SELECT date_trunc('day', ts) AS day, count(*) AS n
+FROM ducklake.main.orders GROUP BY 1
+\`\`\`
+`;
+
 export const WORKFLOW_AS_CODE_BASE = `# Windmill Workflow-as-Code Writing Guide
 
 ## Scope
@@ -965,25 +1055,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -1002,9 +1094,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -1031,25 +1124,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -1057,9 +1152,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -1379,13 +1475,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -1455,6 +1544,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (\`s3://storage/key\`, \`s3:///key\`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -1487,6 +1587,29 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize \`selectSql\` into a ducklake table for one
+ * partition (or the whole table when \`partition\` is omitted) — the client-side
+ * equivalent of the \`// materialize\` engine.
+ * With \`uniqueKey\` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → \`CREATE OR REPLACE\`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.upsertPartition({ table, selectSql, partition }).execute()\`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call \`.execute()\` to run it:
+ * \`await wmill.appendPartition({ table, selectSql, partition }).execute()\`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
 `;
 
 export const SDK_PYTHON = `# Python SDK (wmill)
@@ -1537,27 +1660,27 @@ def create_token(duration = dt.timedelta(days=1)) -> str
 # Create a script job and return its job id.
 # 
 # .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.
-def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by path and return its job id.
-def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by hash and return its job id.
-def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a flow job and return its job id.
-def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True) -> str
+def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True, tag: str = None) -> str
 
 # Run script synchronously and return its result.
 # 
 # .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
-def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by path synchronously and return its result.
-def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by hash synchronously and return its result.
-def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run a script on the current worker without creating a job.
 # 
@@ -1975,10 +2098,11 @@ def get_version() -> str
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Run a script synchronously by path and return its result.
 # 
@@ -1989,10 +2113,11 @@ def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = Fals
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Convenient helpers that takes an S3 resource as input and returns the settings necessary to
 # initiate an S3 connection from DuckDB
@@ -2015,7 +2140,11 @@ def get_state_path() -> str
 # Parse resource syntax from string.
 def parse_resource_syntax(s: str) -> Optional[str]
 
-# Parse S3 object from string or S3Object format.
+# Parse S3 object from a \`s3://<storage>/<key>\` URI string (\`s3:///<key>\`
+# for the default storage) or S3Object format. Any other string raises
+# rather than falling back to an auto-generated key: an auto key is
+# requested by omitting the object, and a fallback would silently misplace
+# the upload on any typo.
 def parse_s3_object(s3_object: S3Object | str) -> S3Object
 
 # Parse variable syntax from string.
@@ -2043,6 +2172,27 @@ def stream_result(stream) -> None
 #     SqlQuery instance for fetching results
 def query(sql: str, *args) -> SqlQuery
 
+# Idempotently materialize the rows of \`select_sql\` into ducklake
+# \`table\` for one \`partition\` (or the whole table when \`partition\` is
+# None). Client-side equivalent of the \`// materialize\` engine: with
+# \`unique_key\` it upserts within the slice (delete-by-key + insert);
+# without it, it replaces (whole table → CREATE OR REPLACE; partition →
+# delete the partition + insert). Re-running the same slice is safe — the
+# backfill / failure-recovery contract.
+# 
+# The partition value is bound as a DuckDB arg (never string-interpolated)
+# so it cannot inject SQL. \`select_sql\` is trusted (your own query).
+def upsert_partition(table: str, select_sql: str, partition: str = None, unique_key: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# INSERT-only materialization (no dedup / no replace) for an immutable
+# event-log table — for one \`partition\`, or the whole table when
+# \`partition\` is None. NOTE: unlike \`upsert_partition\`, re-running the same
+# slice duplicates rows — use only for append-only sources.
+def append_partition(table: str, select_sql: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# Read a materialized ducklake table, optionally a single partition.
+def read(table: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
 # Execute query and fetch results.
 # 
 # Args:
@@ -2550,7 +2700,7 @@ class SqlQuery:
 
 export const OPENFLOW_SCHEMA = `## OpenFlow Schema
 
-{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \\"yellow\\", \\"#ffff00\\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \\u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\\nValid values: 'text' (default) - plain text response, 'image' - image generation\\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\\nFormat: Array<{ bucket: string, key: string }> - S3 object references\\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\\nRange: 0.0 to 2.0 (provider-dependent)\\n- 0.0 = deterministic, focused responses\\n- 0.7 = balanced (common default)\\n- 1.0+ = more creative/random\\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\\nRange: 1-1000.\\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default \`flow\`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}`;
+{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \\"yellow\\", \\"#ffff00\\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \\u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"},"reasoning_effort":{"type":"string","description":"Provider-native reasoning effort token (e.g. 'low', 'high', 'none') for models that support extended thinking. Optional; unset leaves the provider default."}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\\nValid values: 'text' (default) - plain text response, 'image' - image generation\\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\\nStreaming events include: token_delta, reasoning_token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\\nFormat: Array<{ bucket: string, key: string }> - S3 object references\\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\\nRange: 0.0 to 2.0 (provider-dependent)\\n- 0.0 = deterministic, focused responses\\n- 0.7 = balanced (common default)\\n- 1.0+ = more creative/random\\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\\nRange: 1-1000.\\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default \`flow\`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}`;
 
 export const CLI_COMMANDS = `# Windmill CLI Commands
 
@@ -2631,6 +2781,13 @@ datatable related commands
 - \`datatable run <sql:string>\` - run a SQL query on a datatable
   - \`-n --name <name:string>\` - Datatable name (default: main)
   - \`-s --silent\` - Output only the final result as JSON. Useful for scripting.
+- \`datatable migrate\` - manage datatable migrations
+  - \`datatable migrate new <name:string>\` - scaffold a new migration (.up.sql / .down.sql files)
+    - \`-d --datatable <datatable:string>\` - Target datatable (default: main)
+  - \`datatable migrate up\` - apply all pending migrations to the main datatable (or one via --datatable)
+    - \`-d --datatable <datatable:string>\` - Target datatable (default: main)
+  - \`datatable migrate down\` - roll back the most recent migration on the main datatable (or one via --datatable)
+    - \`-d --datatable <datatable:string>\` - Target datatable (default: main)
 - \`datatable create [name:string]\` - register a datatable database in the workspace (default: instance-backed 'main') so scripts can use datatable://<name>
   - \`--resource <resource:string>\` - Back the datatable with an existing postgresql resource path instead of the instance database
   - \`--force\` - Allow adding to a workspace that already has datatables (fork metadata on existing ones is not preserved)
@@ -2899,19 +3056,18 @@ Manage jobs (list, inspect, cancel)
 
 ### jobs
 
-Pull completed and queued jobs from workspace
-
-**Arguments:** \`[workspace:string]\`
-
-**Options:**
-- \`-c, --completed-output <file:string>\` - Completed jobs output file (default: completed_jobs.json)
-- \`-q, --queued-output <file:string>\` - Queued jobs output file (default: queued_jobs.json)
-- \`--skip-worker-check\` - Skip checking for active workers before export
+Manage jobs (import/export)
 
 **Subcommands:**
 
-- \`jobs pull\`
-- \`jobs push\`
+- \`jobs pull [workspace:string]\` - Pull completed and queued jobs from workspace
+  - \`-c, --completed-output <file:string>\` - Completed jobs output file (default: completed_jobs.json)
+  - \`-q, --queued-output <file:string>\` - Queued jobs output file (default: queued_jobs.json)
+  - \`--skip-worker-check\` - Skip checking for active workers before export
+- \`jobs push [workspace:string]\` - Push completed and queued jobs to workspace
+  - \`-c, --completed-file <file:string>\` - Completed jobs input file (default: completed_jobs.json)
+  - \`-q, --queued-file <file:string>\` - Queued jobs input file (default: queued_jobs.json)
+  - \`--skip-worker-check\` - Skip checking for active workers before import
 
 ### lint
 
@@ -2973,6 +3129,22 @@ inspect asset-driven pipelines (scripts marked \`// pipeline\`, wired by \`// on
   - \`--json\` - Output as JSON (for piping to jq)
 - \`pipeline show <folder:string>\` - render a pipeline folder's DAG (sources, lineage, subscriptions) in the terminal
   - \`--json\` - Output the raw asset graph as JSON
+  - \`--local\` - Build the graph from local working-tree files (// pipeline scripts) instead of the deployed workspace — no deploy needed.
+- \`pipeline run <folder:string>\` - run a cascade: from --from (a root OR any mid-DAG model), fan downstream up to the --to end node(s)
+  - \`--from <script:string>\` - Start script (short name or path). May be any node, including a mid-DAG model — that node plus its transitive downstream runs, upstream is NOT re-run (dbt \`--select model+\`). Defaults to the folder's sole schedule/manual root.
+  - \`--to <node:string>\` - End node(s) to stop at — script names/paths or asset URIs (e.g. datatable://main/staged). Repeatable or comma-separated. Omit to run the full downstream.
+  - \`--dry-run\` - Print the topological run plan without executing.
+  - \`--json\` - Output the plan as JSON (for piping to jq).
+  - \`--local\` - Run the local working-tree scripts via preview (no deploy) instead of the deployed versions; the graph is built from local files.
+  - \`--upload <binding:string>\` - Bind an object to a data_upload/webhook entry point so it runs in the cascade, as SCRIPT[:PARAM]=SOURCE (SOURCE is a local file or an s3://key). Local files are uploaded to the workspace store; the S3Object param is inferred when the script has exactly one. Repeatable.
+  - \`--arg <binding:string>\` - Pass a plain run arg to a script in the cascade, as SCRIPT:PARAM=VALUE (VALUE is parsed as JSON when possible, else taken as a string — e.g. daily_report:partition=2026-07-02). Repeatable.
+  - \`--partition <value:string>\` - Partition value for \`// partitioned\` scripts in the run (e.g. 2026-06-30) — use it to backfill a past slice. With --local, time kinds (daily/hourly/weekly/monthly) default to the current UTC period when omitted; \`dynamic\` always needs it. Deployed runs without it defer to backend run-start resolution.
+- \`pipeline docs <folder:string>\` - generate PIPELINE.md (+ AGENTS.md pointer) describing a folder's pipeline graph and datatable schemas, for an editor / agentic loop
+  - \`--local\` - Build the graph from local working-tree files instead of the deployed workspace.
+- \`pipeline dev [folder:string]\` - Live-preview a data pipeline from local files: watch an \`f/<folder>\` of \`// pipeline\` scripts, push the working-tree graph to the dev page, and run the cascade via preview (no deploy).
+  - \`--port <port:number>\` - Port for the dev WebSocket server.
+  - \`--no-open\` - Do not open the browser automatically.
+  - \`--frontend <origin:string>\` - Origin serving the /pipeline_dev page (e.g. http://localhost:3000 for a locally-run frontend). Defaults to the workspace remote; use it when the remote's deployed frontend predates the dev page.
 
 ### protection-rules
 
@@ -3298,13 +3470,19 @@ workspace related commands
   - \`--branch <branch:string>\` - Git branch to associate (default: workspace name)
 - \`workspace unbind\` - Remove baseUrl and workspaceId from a workspace entry
   - \`--workspace <name:string>\` - Workspace to unbind
-- \`workspace fork [workspace_name:string] [workspace_id:string]\` - Create a forked workspace
+- \`workspace fork [workspace_name:string] [workspace_id:string]\` - Create a forked workspace from its parent workspace.
+
+The parent is resolved from your current git branch, not from the active profile: run this from a git repo checked out on the branch mapped to the parent workspace in wmill.yaml's \`workspaces:\` section (a fork branch of it resolves to the same parent). \`wmill workspace switch\` does not change which workspace is forked.
+
+Arguments (omit both to be prompted interactively):
+  [workspace_name]  Friendly display name for the fork, shown in the UI. May contain spaces, so quote it in the shell (e.g. "My Fork"). Max 50 chars. Defaults to "<parent workspace name>'s fork".
+  [workspace_id]    Id for the fork. Must be a slug (no spaces or special characters) and is automatically prefixed with \`wm-fork-\`, so pass just the bare slug (e.g. \`my-fork\` becomes \`wm-fork-my-fork\`). This id also determines the fork's git branch name. Defaults to a slug derived from the name — or, when you are converting an existing branch into the fork branch, from that branch.
   - \`--create-workspace-name <workspace_name:string>\` - Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.
   - \`--color <color:string>\` - Workspace color (hex code, e.g. #ff0000)
   - \`--datatable-behavior <behavior:string>\` - How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)
   - \`--from-branch <branch:string>\` - Non-interactive override for the 'turn my current working branch into the fork' workflow: base the fork on <branch> (its bound workspace is the parent) and rename the current branch onto wm-fork/<branch>/<id>. Usually unneeded — from a working branch \`wmill workspace fork\` offers this interactively; from a base branch it creates a fresh fork branch.
   - \`-y --yes\` - Skip interactive prompts (defaults datatable behavior to 'skip'). On a non-base branch, requires --from-branch since the base branch can't be prompted for.
-- \`workspace delete-fork <fork_name:string>\` - Delete a forked workspace and git branch
+- \`workspace delete-fork <fork_name:string>\` - Delete a forked workspace
   - \`-y --yes\` - Skip confirmation prompt
 - \`workspace merge\` - Compare and deploy changes between a fork and its parent workspace
   - \`--direction <direction:string>\` - Deploy direction: to-parent or to-fork
diff --git a/system_prompts/auto-generated/script.md b/system_prompts/auto-generated/script.md
index 89d8e62cfa..408f1354b7 100644
--- a/system_prompts/auto-generated/script.md
+++ b/system_prompts/auto-generated/script.md
@@ -1468,25 +1468,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -1505,9 +1507,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -1534,25 +1537,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -1560,9 +1565,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -1882,13 +1888,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -1958,6 +1957,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (`s3://storage/key`, `s3:///key`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -1991,6 +2001,29 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  */
 ducklake(name: string = "main"): SqlTemplateFunction
 
+/**
+ * Idempotently materialize `selectSql` into a ducklake table for one
+ * partition (or the whole table when `partition` is omitted) — the client-side
+ * equivalent of the `// materialize` engine.
+ * With `uniqueKey` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → `CREATE OR REPLACE`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.upsertPartition({ table, selectSql, partition }).execute()`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.appendPartition({ table, selectSql, partition }).execute()`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
+
 
 # Python SDK (wmill)
 
@@ -2040,27 +2073,27 @@ def create_token(duration = dt.timedelta(days=1)) -> str
 # Create a script job and return its job id.
 # 
 # .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.
-def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by path and return its job id.
-def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by hash and return its job id.
-def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a flow job and return its job id.
-def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True) -> str
+def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True, tag: str = None) -> str
 
 # Run script synchronously and return its result.
 # 
 # .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
-def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by path synchronously and return its result.
-def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by hash synchronously and return its result.
-def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run a script on the current worker without creating a job.
 # 
@@ -2478,10 +2511,11 @@ def get_version() -> str
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Run a script synchronously by path and return its result.
 # 
@@ -2492,10 +2526,11 @@ def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = Fals
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Convenient helpers that takes an S3 resource as input and returns the settings necessary to
 # initiate an S3 connection from DuckDB
@@ -2518,7 +2553,11 @@ def get_state_path() -> str
 # Parse resource syntax from string.
 def parse_resource_syntax(s: str) -> Optional[str]
 
-# Parse S3 object from string or S3Object format.
+# Parse S3 object from a `s3://<storage>/<key>` URI string (`s3:///<key>`
+# for the default storage) or S3Object format. Any other string raises
+# rather than falling back to an auto-generated key: an auto key is
+# requested by omitting the object, and a fallback would silently misplace
+# the upload on any typo.
 def parse_s3_object(s3_object: S3Object | str) -> S3Object
 
 # Parse variable syntax from string.
@@ -2546,6 +2585,27 @@ def stream_result(stream) -> None
 #     SqlQuery instance for fetching results
 def query(sql: str, *args) -> SqlQuery
 
+# Idempotently materialize the rows of `select_sql` into ducklake
+# `table` for one `partition` (or the whole table when `partition` is
+# None). Client-side equivalent of the `// materialize` engine: with
+# `unique_key` it upserts within the slice (delete-by-key + insert);
+# without it, it replaces (whole table → CREATE OR REPLACE; partition →
+# delete the partition + insert). Re-running the same slice is safe — the
+# backfill / failure-recovery contract.
+# 
+# The partition value is bound as a DuckDB arg (never string-interpolated)
+# so it cannot inject SQL. `select_sql` is trusted (your own query).
+def upsert_partition(table: str, select_sql: str, partition: str = None, unique_key: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# INSERT-only materialization (no dedup / no replace) for an immutable
+# event-log table — for one `partition`, or the whole table when
+# `partition` is None. NOTE: unlike `upsert_partition`, re-running the same
+# slice duplicates rows — use only for append-only sources.
+def append_partition(table: str, select_sql: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# Read a materialized ducklake table, optionally a single partition.
+def read(table: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
 # Execute query and fetch results.
 # 
 # Args:
diff --git a/system_prompts/auto-generated/sdks/python.md b/system_prompts/auto-generated/sdks/python.md
index e0b1bd3dfd..c750f03bcf 100644
--- a/system_prompts/auto-generated/sdks/python.md
+++ b/system_prompts/auto-generated/sdks/python.md
@@ -46,27 +46,27 @@ def create_token(duration = dt.timedelta(days=1)) -> str
 # Create a script job and return its job id.
 # 
 # .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.
-def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by path and return its job id.
-def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by hash and return its job id.
-def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a flow job and return its job id.
-def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True) -> str
+def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True, tag: str = None) -> str
 
 # Run script synchronously and return its result.
 # 
 # .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
-def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by path synchronously and return its result.
-def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by hash synchronously and return its result.
-def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run a script on the current worker without creating a job.
 # 
@@ -484,10 +484,11 @@ def get_version() -> str
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Run a script synchronously by path and return its result.
 # 
@@ -498,10 +499,11 @@ def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = Fals
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Convenient helpers that takes an S3 resource as input and returns the settings necessary to
 # initiate an S3 connection from DuckDB
@@ -524,7 +526,11 @@ def get_state_path() -> str
 # Parse resource syntax from string.
 def parse_resource_syntax(s: str) -> Optional[str]
 
-# Parse S3 object from string or S3Object format.
+# Parse S3 object from a `s3://<storage>/<key>` URI string (`s3:///<key>`
+# for the default storage) or S3Object format. Any other string raises
+# rather than falling back to an auto-generated key: an auto key is
+# requested by omitting the object, and a fallback would silently misplace
+# the upload on any typo.
 def parse_s3_object(s3_object: S3Object | str) -> S3Object
 
 # Parse variable syntax from string.
@@ -552,6 +558,27 @@ def stream_result(stream) -> None
 #     SqlQuery instance for fetching results
 def query(sql: str, *args) -> SqlQuery
 
+# Idempotently materialize the rows of `select_sql` into ducklake
+# `table` for one `partition` (or the whole table when `partition` is
+# None). Client-side equivalent of the `// materialize` engine: with
+# `unique_key` it upserts within the slice (delete-by-key + insert);
+# without it, it replaces (whole table → CREATE OR REPLACE; partition →
+# delete the partition + insert). Re-running the same slice is safe — the
+# backfill / failure-recovery contract.
+# 
+# The partition value is bound as a DuckDB arg (never string-interpolated)
+# so it cannot inject SQL. `select_sql` is trusted (your own query).
+def upsert_partition(table: str, select_sql: str, partition: str = None, unique_key: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# INSERT-only materialization (no dedup / no replace) for an immutable
+# event-log table — for one `partition`, or the whole table when
+# `partition` is None. NOTE: unlike `upsert_partition`, re-running the same
+# slice duplicates rows — use only for append-only sources.
+def append_partition(table: str, select_sql: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# Read a materialized ducklake table, optionally a single partition.
+def read(table: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
 # Execute query and fetch results.
 # 
 # Args:
diff --git a/system_prompts/auto-generated/sdks/typescript.md b/system_prompts/auto-generated/sdks/typescript.md
index ff57632eef..8100929776 100644
--- a/system_prompts/auto-generated/sdks/typescript.md
+++ b/system_prompts/auto-generated/sdks/typescript.md
@@ -35,25 +35,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -72,9 +74,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -101,25 +104,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -127,9 +132,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -449,13 +455,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -525,6 +524,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (`s3://storage/key`, `s3:///key`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -557,3 +567,26 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize `selectSql` into a ducklake table for one
+ * partition (or the whole table when `partition` is omitted) — the client-side
+ * equivalent of the `// materialize` engine.
+ * With `uniqueKey` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → `CREATE OR REPLACE`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.upsertPartition({ table, selectSql, partition }).execute()`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.appendPartition({ table, selectSql, partition }).execute()`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
diff --git a/system_prompts/auto-generated/skills/cli-commands/SKILL.md b/system_prompts/auto-generated/skills/cli-commands/SKILL.md
index 0afcda0f5a..3a61a67c12 100644
--- a/system_prompts/auto-generated/skills/cli-commands/SKILL.md
+++ b/system_prompts/auto-generated/skills/cli-commands/SKILL.md
@@ -82,6 +82,13 @@ datatable related commands
 - `datatable run <sql:string>` - run a SQL query on a datatable
   - `-n --name <name:string>` - Datatable name (default: main)
   - `-s --silent` - Output only the final result as JSON. Useful for scripting.
+- `datatable migrate` - manage datatable migrations
+  - `datatable migrate new <name:string>` - scaffold a new migration (.up.sql / .down.sql files)
+    - `-d --datatable <datatable:string>` - Target datatable (default: main)
+  - `datatable migrate up` - apply all pending migrations to the main datatable (or one via --datatable)
+    - `-d --datatable <datatable:string>` - Target datatable (default: main)
+  - `datatable migrate down` - roll back the most recent migration on the main datatable (or one via --datatable)
+    - `-d --datatable <datatable:string>` - Target datatable (default: main)
 - `datatable create [name:string]` - register a datatable database in the workspace (default: instance-backed 'main') so scripts can use datatable://<name>
   - `--resource <resource:string>` - Back the datatable with an existing postgresql resource path instead of the instance database
   - `--force` - Allow adding to a workspace that already has datatables (fork metadata on existing ones is not preserved)
@@ -350,19 +357,18 @@ Manage jobs (list, inspect, cancel)
 
 ### jobs
 
-Pull completed and queued jobs from workspace
-
-**Arguments:** `[workspace:string]`
-
-**Options:**
-- `-c, --completed-output <file:string>` - Completed jobs output file (default: completed_jobs.json)
-- `-q, --queued-output <file:string>` - Queued jobs output file (default: queued_jobs.json)
-- `--skip-worker-check` - Skip checking for active workers before export
+Manage jobs (import/export)
 
 **Subcommands:**
 
-- `jobs pull`
-- `jobs push`
+- `jobs pull [workspace:string]` - Pull completed and queued jobs from workspace
+  - `-c, --completed-output <file:string>` - Completed jobs output file (default: completed_jobs.json)
+  - `-q, --queued-output <file:string>` - Queued jobs output file (default: queued_jobs.json)
+  - `--skip-worker-check` - Skip checking for active workers before export
+- `jobs push [workspace:string]` - Push completed and queued jobs to workspace
+  - `-c, --completed-file <file:string>` - Completed jobs input file (default: completed_jobs.json)
+  - `-q, --queued-file <file:string>` - Queued jobs input file (default: queued_jobs.json)
+  - `--skip-worker-check` - Skip checking for active workers before import
 
 ### lint
 
@@ -424,6 +430,22 @@ inspect asset-driven pipelines (scripts marked `// pipeline`, wired by `// on <s
   - `--json` - Output as JSON (for piping to jq)
 - `pipeline show <folder:string>` - render a pipeline folder's DAG (sources, lineage, subscriptions) in the terminal
   - `--json` - Output the raw asset graph as JSON
+  - `--local` - Build the graph from local working-tree files (// pipeline scripts) instead of the deployed workspace — no deploy needed.
+- `pipeline run <folder:string>` - run a cascade: from --from (a root OR any mid-DAG model), fan downstream up to the --to end node(s)
+  - `--from <script:string>` - Start script (short name or path). May be any node, including a mid-DAG model — that node plus its transitive downstream runs, upstream is NOT re-run (dbt `--select model+`). Defaults to the folder's sole schedule/manual root.
+  - `--to <node:string>` - End node(s) to stop at — script names/paths or asset URIs (e.g. datatable://main/staged). Repeatable or comma-separated. Omit to run the full downstream.
+  - `--dry-run` - Print the topological run plan without executing.
+  - `--json` - Output the plan as JSON (for piping to jq).
+  - `--local` - Run the local working-tree scripts via preview (no deploy) instead of the deployed versions; the graph is built from local files.
+  - `--upload <binding:string>` - Bind an object to a data_upload/webhook entry point so it runs in the cascade, as SCRIPT[:PARAM]=SOURCE (SOURCE is a local file or an s3://key). Local files are uploaded to the workspace store; the S3Object param is inferred when the script has exactly one. Repeatable.
+  - `--arg <binding:string>` - Pass a plain run arg to a script in the cascade, as SCRIPT:PARAM=VALUE (VALUE is parsed as JSON when possible, else taken as a string — e.g. daily_report:partition=2026-07-02). Repeatable.
+  - `--partition <value:string>` - Partition value for `// partitioned` scripts in the run (e.g. 2026-06-30) — use it to backfill a past slice. With --local, time kinds (daily/hourly/weekly/monthly) default to the current UTC period when omitted; `dynamic` always needs it. Deployed runs without it defer to backend run-start resolution.
+- `pipeline docs <folder:string>` - generate PIPELINE.md (+ AGENTS.md pointer) describing a folder's pipeline graph and datatable schemas, for an editor / agentic loop
+  - `--local` - Build the graph from local working-tree files instead of the deployed workspace.
+- `pipeline dev [folder:string]` - Live-preview a data pipeline from local files: watch an `f/<folder>` of `// pipeline` scripts, push the working-tree graph to the dev page, and run the cascade via preview (no deploy).
+  - `--port <port:number>` - Port for the dev WebSocket server.
+  - `--no-open` - Do not open the browser automatically.
+  - `--frontend <origin:string>` - Origin serving the /pipeline_dev page (e.g. http://localhost:3000 for a locally-run frontend). Defaults to the workspace remote; use it when the remote's deployed frontend predates the dev page.
 
 ### protection-rules
 
@@ -749,13 +771,19 @@ workspace related commands
   - `--branch <branch:string>` - Git branch to associate (default: workspace name)
 - `workspace unbind` - Remove baseUrl and workspaceId from a workspace entry
   - `--workspace <name:string>` - Workspace to unbind
-- `workspace fork [workspace_name:string] [workspace_id:string]` - Create a forked workspace
+- `workspace fork [workspace_name:string] [workspace_id:string]` - Create a forked workspace from its parent workspace.
+
+The parent is resolved from your current git branch, not from the active profile: run this from a git repo checked out on the branch mapped to the parent workspace in wmill.yaml's `workspaces:` section (a fork branch of it resolves to the same parent). `wmill workspace switch` does not change which workspace is forked.
+
+Arguments (omit both to be prompted interactively):
+  [workspace_name]  Friendly display name for the fork, shown in the UI. May contain spaces, so quote it in the shell (e.g. "My Fork"). Max 50 chars. Defaults to "<parent workspace name>'s fork".
+  [workspace_id]    Id for the fork. Must be a slug (no spaces or special characters) and is automatically prefixed with `wm-fork-`, so pass just the bare slug (e.g. `my-fork` becomes `wm-fork-my-fork`). This id also determines the fork's git branch name. Defaults to a slug derived from the name — or, when you are converting an existing branch into the fork branch, from that branch.
   - `--create-workspace-name <workspace_name:string>` - Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.
   - `--color <color:string>` - Workspace color (hex code, e.g. #ff0000)
   - `--datatable-behavior <behavior:string>` - How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)
   - `--from-branch <branch:string>` - Non-interactive override for the 'turn my current working branch into the fork' workflow: base the fork on <branch> (its bound workspace is the parent) and rename the current branch onto wm-fork/<branch>/<id>. Usually unneeded — from a working branch `wmill workspace fork` offers this interactively; from a base branch it creates a fresh fork branch.
   - `-y --yes` - Skip interactive prompts (defaults datatable behavior to 'skip'). On a non-base branch, requires --from-branch since the base branch can't be prompted for.
-- `workspace delete-fork <fork_name:string>` - Delete a forked workspace and git branch
+- `workspace delete-fork <fork_name:string>` - Delete a forked workspace
   - `-y --yes` - Skip confirmation prompt
 - `workspace merge` - Compare and deploy changes between a fork and its parent workspace
   - `--direction <direction:string>` - Deploy direction: to-parent or to-fork
diff --git a/system_prompts/auto-generated/skills/raw-app/SKILL.md b/system_prompts/auto-generated/skills/raw-app/SKILL.md
index 292f93a7fd..624fdc97ac 100644
--- a/system_prompts/auto-generated/skills/raw-app/SKILL.md
+++ b/system_prompts/auto-generated/skills/raw-app/SKILL.md
@@ -251,6 +251,8 @@ A raw app has three logical parts:
 
 `index.tsx` is the bundling entrypoint. It typically renders a top-level `App` component. The bundler is esbuild.
 
+**Always begin every React file (`.tsx`/`.jsx`) that uses JSX with `import React from 'react'`.** esbuild uses the classic JSX transform, so `React` must be in scope wherever JSX appears — a missing import compiles fine but throws `React is not defined` at runtime, leaving a blank screen.
+
 ### Generated bindings (`wmill.d.ts` / `wmill.ts`)
 
 The frontend imports a generated module that mirrors the backend runnables. **Never write to it directly** — it gets regenerated whenever backend runnables change. Modifying it by hand will be overwritten.
diff --git a/system_prompts/auto-generated/skills/write-flow/SKILL.md b/system_prompts/auto-generated/skills/write-flow/SKILL.md
index 8c8057d48f..360b0d1ec9 100644
--- a/system_prompts/auto-generated/skills/write-flow/SKILL.md
+++ b/system_prompts/auto-generated/skills/write-flow/SKILL.md
@@ -225,8 +225,11 @@ input_transforms:
 
 ## Approval / Suspend Structure
 
+An approval step is a normal **script** step (`type: rawscript` or `type: script`) that is turned into an approval by adding a module-level `suspend`. Its script calls `wmill.getResumeUrls(approver)` to generate the secret resume/cancel URLs and returns them so they can be sent to the approver(s) (Slack, email, etc.) or approved from the run page.
+
 - `suspend` belongs on the flow module object itself, as a sibling of `id` and `value`
 - Never put `suspend` inside `value`
+- Do NOT use `type: identity` for an approval step. An identity step suspends but never produces the resume URLs, so approvers have no link to act on — it is not a functional approval.
 
 Correct shape:
 
@@ -242,10 +245,23 @@ Correct shape:
             type: string
         required: [comment]
   value:
-    type: identity
+    type: rawscript
+    language: bun
+    input_transforms:
+      approver:
+        type: static
+        value: ''
+    content: |
+      import * as wmill from "windmill-client"
+
+      export async function main(approver?: string) {
+        const urls = await wmill.getResumeUrls(approver)
+        // send urls.resume / urls.cancel to the approver(s), e.g. via Slack or email
+        return urls
+      }
 ```
 
-Incorrect shape:
+Incorrect shape (suspend misplaced inside `value`):
 
 ```yaml
 - id: request_approval
@@ -255,6 +271,16 @@ Incorrect shape:
       required_events: 1
 ```
 
+Incorrect shape (identity has no resume URLs — not a real approval):
+
+```yaml
+- id: request_approval
+  suspend:
+    required_events: 1
+  value:
+    type: identity
+```
+
 ## Branch Result Scope Rules
 
 - Inside a branch, you may reference earlier outer steps and earlier steps in the same branch
@@ -381,4 +407,4 @@ Reference a specific resource using `$res:` prefix:
 
 ## OpenFlow Schema
 
-{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \"yellow\", \"#ffff00\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default `flow`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}
\ No newline at end of file
+{"OpenFlow":{"type":"object","description":"Top-level flow definition containing metadata, configuration, and the flow structure","properties":{"summary":{"type":"string","description":"Short description of what this flow does"},"description":{"type":"string","description":"Detailed documentation for this flow"},"value":{"$ref":"#/components/schemas/FlowValue"},"schema":{"type":"object","description":"JSON Schema for flow inputs. Use this to define input parameters, their types, defaults, and validation. For resource inputs, set type to 'object' and format to 'resource-<type>' (e.g., 'resource-stripe')"},"on_behalf_of_email":{"type":"string","description":"The flow will be run with the permissions of the user with this email."}},"required":["summary","value"]},"FlowValue":{"type":"object","description":"The flow structure containing modules and optional preprocessor/failure handlers","properties":{"modules":{"type":"array","description":"Array of steps that execute in sequence. Each step can be a script, subflow, loop, or branch","items":{"$ref":"#/components/schemas/FlowModule"}},"failure_module":{"description":"Special module that executes when the flow fails. Receives error object with message, name, stack, and step_id. Must have id 'failure'. Only supports script/rawscript types","$ref":"#/components/schemas/FlowModule"},"preprocessor_module":{"description":"Special module that runs before the first step on external triggers. Must have id 'preprocessor'. Only supports script/rawscript types. Cannot reference other step results","$ref":"#/components/schemas/FlowModule"},"same_worker":{"type":"boolean","description":"If true, all steps run on the same worker for better performance"},"preserve_step_tags":{"type":"boolean","description":"If true and the flow runs on a custom worker tag, steps that declare their own non-empty tag run on it instead of inheriting the flow tag. Steps without their own tag still inherit the flow tag."},"concurrent_limit":{"type":"number","description":"Maximum number of concurrent executions of this flow"},"concurrency_key":{"type":"string","description":"Expression to group concurrent executions (e.g., by user ID)"},"concurrency_time_window_s":{"type":"number","description":"Time window in seconds for concurrent_limit"},"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce flow executions"},"debounce_key":{"type":"string","description":"Expression to group debounced executions"},"debounce_args_to_accumulate":{"type":"array","description":"Arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds that a job can be debounced"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of times a job can be debounced"},"skip_expr":{"type":"string","description":"JavaScript expression to conditionally skip the entire flow"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for flow results"},"cache_ignore_s3_path":{"type":"boolean"},"delete_after_secs":{"type":"integer","description":"If set, delete the flow job's args, result and logs after this many seconds following job completion"},"flow_env":{"type":"object","description":"Environment variables available to all steps. Values can be strings, JSON values, or special references: '$var:path' (workspace variable) or '$res:path' (resource).","additionalProperties":{}},"priority":{"type":"number","description":"Execution priority (higher numbers run first)"},"early_return":{"type":"string","description":"JavaScript expression to return early from the flow"},"chat_input_enabled":{"type":"boolean","description":"Whether this flow accepts chat-style input"},"notes":{"type":"array","description":"Sticky notes attached to the flow","items":{"$ref":"#/components/schemas/FlowNote"}},"groups":{"type":"array","description":"Semantic groups of modules for organizational purposes","items":{"$ref":"#/components/schemas/FlowGroup"}}},"required":["modules"]},"Retry":{"type":"object","description":"Retry configuration for failed module executions","properties":{"constant":{"type":"object","description":"Retry with constant delay between attempts","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"seconds":{"type":"integer","description":"Seconds to wait between retries"}}},"exponential":{"type":"object","description":"Retry with exponential backoff (delay doubles each time)","properties":{"attempts":{"type":"integer","description":"Number of retry attempts"},"multiplier":{"type":"integer","description":"Multiplier for exponential backoff"},"seconds":{"type":"integer","minimum":1,"description":"Initial delay in seconds"},"random_factor":{"type":"integer","minimum":0,"maximum":100,"description":"Random jitter percentage (0-100) to avoid thundering herd"}}},"retry_if":{"$ref":"#/components/schemas/RetryIf"}}},"FlowNote":{"type":"object","description":"A sticky note attached to a flow for documentation and annotation","properties":{"id":{"type":"string","description":"Unique identifier for the note"},"text":{"type":"string","description":"Content of the note"},"position":{"type":"object","description":"Position of the note in the flow editor","properties":{"x":{"type":"number","description":"X coordinate"},"y":{"type":"number","description":"Y coordinate"}},"required":["x","y"]},"size":{"type":"object","description":"Size of the note in the flow editor","properties":{"width":{"type":"number","description":"Width in pixels"},"height":{"type":"number","description":"Height in pixels"}},"required":["width","height"]},"color":{"type":"string","description":"Color of the note (e.g., \"yellow\", \"#ffff00\")"},"type":{"type":"string","enum":["free","group"],"description":"Type of note - 'free' for standalone notes, 'group' for notes that group other nodes"},"locked":{"type":"boolean","default":false,"description":"Whether the note is locked and cannot be edited or moved"},"contained_node_ids":{"type":"array","items":{"type":"string"},"description":"For group notes, the IDs of nodes contained within this group"}},"required":["id","text","color","type"]},"FlowGroup":{"type":"object","description":"A semantic group of flow modules for organizational purposes. Does not affect execution \u2014 modules remain in their original position in the flow. Groups provide naming and collapsibility in the editor. Members are computed dynamically from all nodes on paths between start_id and end_id.","properties":{"summary":{"type":"string","description":"Display name for this group"},"note":{"type":"string","description":"Markdown note shown below the group header"},"autocollapse":{"type":"boolean","default":false,"description":"If true, this group is collapsed by default in the flow editor. UI hint only."},"start_id":{"type":"string","description":"ID of the first flow module in this group (topological entry point)"},"end_id":{"type":"string","description":"ID of the last flow module in this group (topological exit point)"},"color":{"type":"string","description":"Color for the group in the flow editor"}},"required":["start_id","end_id"]},"RetryIf":{"type":"object","description":"Conditional retry based on error or result","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to retry. Has access to 'result' and 'error' variables"}},"required":["expr"]},"StopAfterIf":{"type":"object","description":"Early termination condition for a module","properties":{"skip_if_stopped":{"type":"boolean","description":"If true, following steps are skipped when this condition triggers"},"expr":{"type":"string","description":"JavaScript expression evaluated after the module runs. Can use 'result' (step's result) or 'flow_input'. Return true to stop"},"error_message":{"type":"string","nullable":true,"description":"Custom error message when stopping with an error. Mutually exclusive with skip_if_stopped. If set to a non-empty string, the flow stops with this error. If empty string, a default error message is used. If null or omitted, no error is raised."},"error_include_result":{"type":"boolean","description":"When stopping with an error (error_message set), embed the stopping step's own result inside the raised error object (as error.result) instead of discarding it. The top-level result stays { error }. Defaults to false."}},"required":["expr"]},"FlowModule":{"type":"object","description":"A single step in a flow. Can be a script, subflow, loop, or branch","properties":{"id":{"type":"string","description":"Unique identifier for this step. Used to reference results via 'results.step_id'. Must be a valid identifier (alphanumeric, underscore, hyphen)"},"value":{"$ref":"#/components/schemas/FlowModuleValue"},"stop_after_if":{"description":"Early termination condition evaluated after this step completes","$ref":"#/components/schemas/StopAfterIf"},"stop_after_all_iters_if":{"description":"For loops only - early termination condition evaluated after all iterations complete","$ref":"#/components/schemas/StopAfterIf"},"skip_if":{"type":"object","description":"Conditionally skip this step based on previous results or flow inputs","properties":{"expr":{"type":"string","description":"JavaScript expression that returns true to skip. Can use 'flow_input' or 'results.<step_id>'"}},"required":["expr"]},"sleep":{"description":"Delay before executing this step (in seconds or as expression)","$ref":"#/components/schemas/InputTransform"},"cache_ttl":{"type":"number","description":"Cache duration in seconds for this step's results"},"cache_ignore_s3_path":{"type":"boolean"},"timeout":{"description":"Maximum execution time in seconds (static value or expression)","$ref":"#/components/schemas/InputTransform"},"delete_after_secs":{"type":"integer","description":"If set, delete the step's args, result and logs after this many seconds following job completion"},"summary":{"type":"string","description":"Short description of what this step does"},"mock":{"type":"object","description":"Mock configuration for testing without executing the actual step","properties":{"enabled":{"type":"boolean","description":"If true, return mock value instead of executing"},"return_value":{"description":"Value to return when mocked"}}},"suspend":{"type":"object","description":"Configuration for approval/resume steps that wait for user input","properties":{"required_events":{"type":"integer","description":"Number of approvals required before continuing"},"timeout":{"type":"integer","description":"Timeout in seconds before auto-continuing or canceling"},"resume_form":{"type":"object","description":"Form schema for collecting input when resuming","properties":{"schema":{"type":"object","description":"JSON Schema for the resume form"}}},"user_auth_required":{"type":"boolean","description":"If true, only authenticated users can approve"},"user_groups_required":{"description":"Expression or list of groups that can approve","$ref":"#/components/schemas/InputTransform"},"self_approval_disabled":{"type":"boolean","description":"If true, the user who started the flow cannot approve"},"hide_cancel":{"type":"boolean","description":"If true, hide the cancel button on the approval form"},"continue_on_disapprove_timeout":{"type":"boolean","description":"If true, continue flow on timeout instead of canceling"}}},"priority":{"type":"number","description":"Execution priority for this step (higher numbers run first)"},"continue_on_error":{"type":"boolean","description":"If true, flow continues even if this step fails"},"retry":{"description":"Retry configuration if this step fails","$ref":"#/components/schemas/Retry"},"debouncing":{"description":"Debounce configuration for this step (EE only)","type":"object","properties":{"debounce_delay_s":{"type":"integer","description":"Delay in seconds to debounce this step's executions across flow runs"},"debounce_key":{"type":"string","description":"Expression to group debounced executions. Supports $workspace and $args[name]. Default: $workspace/flow/<flow_path>-<step_id>"},"debounce_args_to_accumulate":{"type":"array","description":"Array-type arguments to accumulate across debounced executions","items":{"type":"string"}},"max_total_debouncing_time":{"type":"integer","description":"Maximum total time in seconds before forced execution"},"max_total_debounces_amount":{"type":"integer","description":"Maximum number of debounces before forced execution"}}}},"required":["value","id"]},"InputTransform":{"description":"Maps input parameters for a step. Can be a static value or a JavaScript expression that references previous results or flow inputs","oneOf":[{"$ref":"#/components/schemas/StaticTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"StaticTransform":{"type":"object","description":"Static value passed directly to the step. Use for hardcoded values or resource references like '$res:path/to/resource'","properties":{"value":{"description":"The static value. For resources, use format '$res:path/to/resource'"},"type":{"type":"string","enum":["static"]}},"required":["type"]},"JavascriptTransform":{"type":"object","description":"JavaScript expression evaluated at runtime. Can reference previous step results via 'results.step_id' or flow inputs via 'flow_input.property'. Inside loops, use 'flow_input.iter.value' for the current iteration value","properties":{"expr":{"type":"string","description":"JavaScript expression returning the value. Available variables - results (object with all previous step results), flow_input (flow inputs), flow_input.iter (in loops)"},"type":{"type":"string","enum":["javascript"]}},"required":["expr","type"]},"AiTransform":{"type":"object","description":"Value resolved by the AI runtime for this input. The AI engine decides how to satisfy the parameter.","properties":{"type":{"type":"string","enum":["ai"]}},"required":["type"]},"AIProviderKind":{"type":"string","description":"Supported AI provider types","enum":["openai","azure_openai","azure_foundry","anthropic","mistral","deepseek","googleai","groq","openrouter","togetherai","customai","aws_bedrock"]},"ProviderConfig":{"type":"object","description":"Complete AI provider configuration with resource reference and model selection","properties":{"kind":{"$ref":"#/components/schemas/AIProviderKind"},"resource":{"type":"string","description":"Resource reference in format '$res:{resource_path}' pointing to provider credentials"},"model":{"type":"string","description":"Model identifier (e.g., 'gpt-4', 'claude-3-opus-20240229', 'gemini-pro')"},"reasoning_effort":{"type":"string","description":"Provider-native reasoning effort token (e.g. 'low', 'high', 'none') for models that support extended thinking. Optional; unset leaves the provider default."}},"required":["kind","resource","model"]},"StaticProviderTransform":{"type":"object","description":"Static provider configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/ProviderConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"ProviderTransform":{"description":"Provider configuration - can be static (ProviderConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticProviderTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticProviderTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"MemoryOff":{"type":"object","description":"No conversation memory/context","properties":{"kind":{"type":"string","enum":["off"]}},"required":["kind"]},"MemoryAuto":{"type":"object","description":"Automatic context management","properties":{"kind":{"type":"string","enum":["auto"]},"context_length":{"type":"integer","description":"Maximum number of messages to retain in context"},"memory_id":{"type":"string","description":"Identifier for persistent memory across agent invocations"}},"required":["kind"]},"MemoryMessage":{"type":"object","description":"A single message in conversation history","properties":{"role":{"type":"string","enum":["user","assistant","system"]},"content":{"type":"string"}},"required":["role","content"]},"MemoryManual":{"type":"object","description":"Explicit message history","properties":{"kind":{"type":"string","enum":["manual"]},"messages":{"type":"array","items":{"$ref":"#/components/schemas/MemoryMessage"}}},"required":["kind","messages"]},"MemoryConfig":{"description":"Conversation memory configuration","oneOf":[{"$ref":"#/components/schemas/MemoryOff"},{"$ref":"#/components/schemas/MemoryAuto"},{"$ref":"#/components/schemas/MemoryManual"}],"discriminator":{"propertyName":"kind","mapping":{"off":"#/components/schemas/MemoryOff","auto":"#/components/schemas/MemoryAuto","manual":"#/components/schemas/MemoryManual"}}},"StaticMemoryTransform":{"type":"object","description":"Static memory configuration passed directly to the AI agent","properties":{"value":{"$ref":"#/components/schemas/MemoryConfig"},"type":{"type":"string","enum":["static"]}},"required":["type","value"]},"MemoryTransform":{"description":"Memory configuration - can be static (MemoryConfig), JavaScript expression, or AI-determined","oneOf":[{"$ref":"#/components/schemas/StaticMemoryTransform"},{"$ref":"#/components/schemas/JavascriptTransform"},{"$ref":"#/components/schemas/AiTransform"}],"discriminator":{"propertyName":"type","mapping":{"static":"#/components/schemas/StaticMemoryTransform","javascript":"#/components/schemas/JavascriptTransform","ai":"#/components/schemas/AiTransform"}}},"FlowModuleValue":{"description":"The actual implementation of a flow step. Can be a script (inline or referenced), subflow, loop, branch, or special module type","oneOf":[{"$ref":"#/components/schemas/RawScript"},{"$ref":"#/components/schemas/PathScript"},{"$ref":"#/components/schemas/PathFlow"},{"$ref":"#/components/schemas/ForloopFlow"},{"$ref":"#/components/schemas/WhileloopFlow"},{"$ref":"#/components/schemas/BranchOne"},{"$ref":"#/components/schemas/BranchAll"},{"$ref":"#/components/schemas/Identity"},{"$ref":"#/components/schemas/AiAgent"}],"discriminator":{"propertyName":"type","mapping":{"rawscript":"#/components/schemas/RawScript","script":"#/components/schemas/PathScript","flow":"#/components/schemas/PathFlow","forloopflow":"#/components/schemas/ForloopFlow","whileloopflow":"#/components/schemas/WhileloopFlow","branchone":"#/components/schemas/BranchOne","branchall":"#/components/schemas/BranchAll","identity":"#/components/schemas/Identity","aiagent":"#/components/schemas/AiAgent"}}},"RawScript":{"type":"object","description":"Inline script with code defined directly in the flow. Use 'bun' as default language if unspecified. The script receives arguments from input_transforms","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"content":{"type":"string","description":"The script source code. Should export a 'main' function"},"language":{"type":"string","description":"Programming language for this script","enum":["deno","bun","python3","go","bash","powershell","postgresql","mysql","bigquery","snowflake","mssql","oracledb","graphql","nativets","php","rust","ansible","csharp","nu","java","ruby","rlang","duckdb"]},"path":{"type":"string","description":"Optional path for saving this script"},"lock":{"type":"string","description":"Lock file content for dependencies"},"type":{"type":"string","enum":["rawscript"]},"tag":{"type":"string","description":"Worker group tag for execution routing"},"concurrent_limit":{"type":"number","description":"Maximum concurrent executions of this script"},"concurrency_time_window_s":{"type":"number","description":"Time window for concurrent_limit"},"custom_concurrency_key":{"type":"string","description":"Custom key for grouping concurrent executions"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"},"assets":{"type":"array","description":"External resources this script accesses (S3 objects, resources, etc.)","items":{"type":"object","required":["path","kind"],"properties":{"path":{"type":"string","description":"Path to the asset"},"kind":{"type":"string","description":"Type of asset","enum":["s3object","resource","ducklake","datatable","volume"]},"access_type":{"type":"string","nullable":true,"description":"Access level for this asset","enum":["r","w","rw"]},"alt_access_type":{"type":"string","nullable":true,"description":"Alternative access level","enum":["r","w","rw"]}}}}},"required":["type","content","language","input_transforms"]},"PathScript":{"type":"object","description":"Reference to an existing script by path. Use this when calling a previously saved script instead of writing inline code","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the script's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the script in the workspace (e.g., 'f/scripts/send_email')"},"hash":{"type":"string","description":"Optional specific version hash of the script to use"},"type":{"type":"string","enum":["script"]},"tag_override":{"type":"string","description":"Override the script's default worker group tag"},"is_trigger":{"type":"boolean","description":"If true, this script is a trigger that can start the flow"}},"required":["type","path","input_transforms"]},"PathFlow":{"type":"object","description":"Reference to an existing flow by path. Use this to call another flow as a subflow","properties":{"input_transforms":{"type":"object","description":"Map of parameter names to their values (static or JavaScript expressions). These become the subflow's input arguments","additionalProperties":{"$ref":"#/components/schemas/InputTransform"}},"path":{"type":"string","description":"Path to the flow in the workspace (e.g., 'f/flows/process_user')"},"type":{"type":"string","enum":["flow"]}},"required":["type","path","input_transforms"]},"ForloopFlow":{"type":"object","description":"Executes nested modules in a loop over an iterator. Inside the loop, use 'flow_input.iter.value' to access the current iteration value, and 'flow_input.iter.index' for the index. Supports parallel execution for better performance on I/O-bound operations","properties":{"modules":{"type":"array","description":"Steps to execute for each iteration. These can reference the iteration value via 'flow_input.iter.value'","items":{"$ref":"#/components/schemas/FlowModule"}},"iterator":{"description":"JavaScript expression that returns an array to iterate over. Can reference 'results.step_id' or 'flow_input'","$ref":"#/components/schemas/InputTransform"},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["forloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (faster for I/O-bound operations). Use with parallelism to control concurrency"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true. Limits resource usage. Can be static number or expression","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","iterator","skip_failures","type"]},"WhileloopFlow":{"type":"object","description":"Executes nested modules repeatedly while a condition is true. The loop checks the condition after each iteration. Use stop_after_if on modules to control loop termination","properties":{"modules":{"type":"array","description":"Steps to execute in each iteration. Use stop_after_if to control when the loop ends","items":{"$ref":"#/components/schemas/FlowModule"}},"skip_failures":{"type":"boolean","description":"If true, iteration failures don't stop the loop. Failed iterations return null"},"type":{"type":"string","enum":["whileloopflow"]},"parallel":{"type":"boolean","description":"If true, iterations run concurrently (use with caution in while loops)"},"parallelism":{"description":"Maximum number of concurrent iterations when parallel=true","$ref":"#/components/schemas/InputTransform"},"squash":{"type":"boolean"}},"required":["modules","skip_failures","type"]},"BranchOne":{"type":"object","description":"Conditional branching where only the first matching branch executes. Branches are evaluated in order, and the first one with a true expression runs. If no branches match, the default branch executes","properties":{"branches":{"type":"array","description":"Array of branches to evaluate in order. The first branch with expr evaluating to true executes","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch condition"},"expr":{"type":"string","description":"JavaScript expression that returns boolean. Can use 'results.step_id' or 'flow_input'. First true expr wins"},"modules":{"type":"array","description":"Steps to execute if this branch's expr is true","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules","expr"]}},"default":{"type":"array","description":"Steps to execute if no branch expressions match","items":{"$ref":"#/components/schemas/FlowModule"}},"type":{"type":"string","enum":["branchone"]}},"required":["branches","default","type"]},"BranchAll":{"type":"object","description":"Parallel branching where all branches execute simultaneously. Unlike BranchOne, all branches run regardless of conditions. Useful for executing independent tasks concurrently","properties":{"branches":{"type":"array","description":"Array of branches that all execute (either in parallel or sequentially)","items":{"type":"object","properties":{"summary":{"type":"string","description":"Short description of this branch's purpose"},"skip_failure":{"type":"boolean","description":"If true, failure in this branch doesn't fail the entire flow"},"modules":{"type":"array","description":"Steps to execute in this branch","items":{"$ref":"#/components/schemas/FlowModule"}}},"required":["modules"]}},"type":{"type":"string","enum":["branchall"]},"parallel":{"type":"boolean","description":"If true, all branches execute concurrently. If false, they execute sequentially"}},"required":["branches","type"]},"AgentTool":{"type":"object","description":"A tool available to an AI agent. Can be a flow module or an external MCP (Model Context Protocol) tool","properties":{"id":{"type":"string","description":"Unique identifier for this tool. Cannot contain spaces - use underscores instead (e.g., 'get_user_data' not 'get user data')"},"summary":{"type":"string","description":"Short description of what this tool does (shown to the AI)"},"value":{"$ref":"#/components/schemas/ToolValue"}},"required":["id","value"]},"ToolValue":{"description":"The implementation of a tool. Can be a flow module (script/flow) or an MCP tool reference","oneOf":[{"$ref":"#/components/schemas/FlowModuleTool"},{"$ref":"#/components/schemas/McpToolValue"},{"$ref":"#/components/schemas/WebsearchToolValue"}],"discriminator":{"propertyName":"tool_type","mapping":{"flowmodule":"#/components/schemas/FlowModuleTool","mcp":"#/components/schemas/McpToolValue","websearch":"#/components/schemas/WebsearchToolValue"}}},"FlowModuleTool":{"description":"A tool implemented as a flow module (script, flow, etc.). The AI can call this like any other flow module","allOf":[{"type":"object","properties":{"tool_type":{"type":"string","enum":["flowmodule"]}},"required":["tool_type"]},{"$ref":"#/components/schemas/FlowModuleValue"}]},"WebsearchToolValue":{"type":"object","description":"A tool implemented as a websearch tool. The AI can call this like any other websearch tool","properties":{"tool_type":{"type":"string","enum":["websearch"]}},"required":["tool_type"]},"McpToolValue":{"type":"object","description":"Reference to an external MCP (Model Context Protocol) tool. The AI can call tools from MCP servers","properties":{"tool_type":{"type":"string","enum":["mcp"]},"resource_path":{"type":"string","description":"Path to the MCP resource/server configuration"},"include_tools":{"type":"array","description":"Whitelist of specific tools to include from this MCP server","items":{"type":"string"}},"exclude_tools":{"type":"array","description":"Blacklist of tools to exclude from this MCP server","items":{"type":"string"}}},"required":["tool_type","resource_path"]},"AiAgent":{"type":"object","description":"AI agent step that can use tools to accomplish tasks. The agent receives inputs and can call any of its configured tools to complete the task","properties":{"input_transforms":{"type":"object","description":"Input parameters for the AI agent mapped to their values","properties":{"provider":{"$ref":"#/components/schemas/ProviderTransform"},"output_type":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Output format type.\nValid values: 'text' (default) - plain text response, 'image' - image generation\n"},"user_message":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"The user's prompt/message to the AI agent. Supports variable interpolation with flow.input syntax."},"system_prompt":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"System instructions that guide the AI's behavior, persona, and response style. Optional."},"streaming":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Boolean. If true, stream the AI response incrementally.\nStreaming events include: token_delta, reasoning_token_delta, tool_call, tool_call_arguments, tool_execution, tool_result\n"},"memory":{"$ref":"#/components/schemas/MemoryTransform"},"output_schema":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"JSON Schema object defining structured output format. Used when you need the AI to return data in a specific shape.\nSupports standard JSON Schema properties: type, properties, required, items, enum, pattern, minLength, maxLength, minimum, maximum, etc.\nExample: { type: 'object', properties: { name: { type: 'string' }, age: { type: 'integer' } }, required: ['name'] }\n"},"user_attachments":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Array of file references (images or PDFs) for the AI agent.\nFormat: Array<{ bucket: string, key: string }> - S3 object references\nExample: [{ bucket: 'my-bucket', key: 'documents/report.pdf' }]\n"},"max_completion_tokens":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Integer. Maximum number of tokens the AI will generate in its response.\nRange: 1 to 4,294,967,295. Typical values: 256-4096 for most use cases.\n"},"temperature":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Float. Controls randomness/creativity of responses.\nRange: 0.0 to 2.0 (provider-dependent)\n- 0.0 = deterministic, focused responses\n- 0.7 = balanced (common default)\n- 1.0+ = more creative/random\n"},"max_iterations":{"allOf":[{"$ref":"#/components/schemas/InputTransform"}],"description":"Number. Limits how many times the agent can loop through reasoning and tool use.\nRange: 1-1000.\n"}},"required":["provider","user_message","output_type"]},"tools":{"type":"array","description":"Array of tools the agent can use. The agent decides which tools to call based on the task","items":{"$ref":"#/components/schemas/AgentTool"}},"type":{"type":"string","enum":["aiagent"]},"tag":{"type":"string","description":"Worker group tag for execution routing. If not set, the AI agent step runs on the flow's tag (default `flow`)"},"omit_output_from_conversation":{"type":"boolean","default":false,"description":"If true, this AI agent step does not persist its assistant or tool messages to the flow conversation when chat mode is enabled."},"parallel":{"type":"boolean","description":"If true, the agent can execute multiple tool calls in parallel"}},"required":["tools","type","input_transforms"]},"Identity":{"type":"object","description":"Pass-through module that returns its input unchanged. Useful for flow structure or as a placeholder","properties":{"type":{"type":"string","enum":["identity"]},"flow":{"type":"boolean","description":"If true, marks this as a flow identity (special handling)"}},"required":["type"]},"FlowStatus":{"type":"object","properties":{"step":{"type":"integer"},"modules":{"type":"array","items":{"$ref":"#/components/schemas/FlowStatusModule"}},"user_states":{"additionalProperties":true},"preprocessor_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"}]},"failure_module":{"allOf":[{"$ref":"#/components/schemas/FlowStatusModule"},{"type":"object","properties":{"parent_module":{"type":"string"}}}]},"retry":{"type":"object","properties":{"fail_count":{"type":"integer"},"failed_jobs":{"type":"array","items":{"type":"string","format":"uuid"}}}}},"required":["step","modules","failure_module"]},"FlowStatusModule":{"type":"object","properties":{"type":{"type":"string","enum":["WaitingForPriorSteps","WaitingForEvents","WaitingForExecutor","InProgress","Success","Failure"]},"id":{"type":"string"},"job":{"type":"string","format":"uuid"},"count":{"type":"integer"},"progress":{"type":"integer"},"iterator":{"type":"object","properties":{"index":{"type":"integer"},"itered":{"type":"array","items":{}},"itered_len":{"type":"integer"},"args":{}}},"flow_jobs":{"type":"array","items":{"type":"string"}},"flow_jobs_success":{"type":"array","items":{"type":"boolean"}},"flow_jobs_duration":{"type":"object","properties":{"started_at":{"type":"array","items":{"type":"string"}},"duration_ms":{"type":"array","items":{"type":"integer"}}}},"branch_chosen":{"type":"object","properties":{"type":{"type":"string","enum":["branch","default"]},"branch":{"type":"integer"}},"required":["type"]},"branchall":{"type":"object","properties":{"branch":{"type":"integer"},"len":{"type":"integer"}},"required":["branch","len"]},"approvers":{"type":"array","items":{"type":"object","properties":{"resume_id":{"type":"integer"},"approver":{"type":"string"}},"required":["resume_id","approver"]}},"failed_retries":{"type":"array","items":{"type":"string","format":"uuid"}},"skipped":{"type":"boolean"},"agent_actions":{"type":"array","items":{"type":"object","oneOf":[{"type":"object","properties":{"job_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"type":{"type":"string","enum":["tool_call"]},"module_id":{"type":"string"}},"required":["job_id","function_name","type","module_id"]},{"type":"object","properties":{"call_id":{"type":"string","format":"uuid"},"function_name":{"type":"string"},"resource_path":{"type":"string"},"type":{"type":"string","enum":["mcp_tool_call"]},"arguments":{"type":"object"}},"required":["call_id","function_name","resource_path","type"]},{"type":"object","properties":{"type":{"type":"string","enum":["web_search"]}},"required":["type"]},{"type":"object","properties":{"type":{"type":"string","enum":["message"]}},"required":["content","type"]}]}},"agent_actions_success":{"type":"array","items":{"type":"boolean"}}},"required":["type"]}}
\ No newline at end of file
diff --git a/system_prompts/auto-generated/skills/write-script-bun/SKILL.md b/system_prompts/auto-generated/skills/write-script-bun/SKILL.md
index 0b656c1f75..7dcaec30bc 100644
--- a/system_prompts/auto-generated/skills/write-script-bun/SKILL.md
+++ b/system_prompts/auto-generated/skills/write-script-bun/SKILL.md
@@ -206,25 +206,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -243,9 +245,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -272,25 +275,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -298,9 +303,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -620,13 +626,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -696,6 +695,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (`s3://storage/key`, `s3:///key`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -728,3 +738,26 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize `selectSql` into a ducklake table for one
+ * partition (or the whole table when `partition` is omitted) — the client-side
+ * equivalent of the `// materialize` engine.
+ * With `uniqueKey` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → `CREATE OR REPLACE`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.upsertPartition({ table, selectSql, partition }).execute()`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.appendPartition({ table, selectSql, partition }).execute()`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
diff --git a/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md b/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md
index 4759590606..86c3bfd010 100644
--- a/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md
+++ b/system_prompts/auto-generated/skills/write-script-bunnative/SKILL.md
@@ -206,25 +206,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -243,9 +245,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -272,25 +275,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -298,9 +303,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -620,13 +626,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -696,6 +695,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (`s3://storage/key`, `s3:///key`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -728,3 +738,26 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize `selectSql` into a ducklake table for one
+ * partition (or the whole table when `partition` is omitted) — the client-side
+ * equivalent of the `// materialize` engine.
+ * With `uniqueKey` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → `CREATE OR REPLACE`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.upsertPartition({ table, selectSql, partition }).execute()`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.appendPartition({ table, selectSql, partition }).execute()`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
diff --git a/system_prompts/auto-generated/skills/write-script-deno/SKILL.md b/system_prompts/auto-generated/skills/write-script-deno/SKILL.md
index bab600af98..f7f3a517db 100644
--- a/system_prompts/auto-generated/skills/write-script-deno/SKILL.md
+++ b/system_prompts/auto-generated/skills/write-script-deno/SKILL.md
@@ -206,25 +206,27 @@ async getRootJobId(jobId?: string): Promise<string>
 /**
  * @deprecated Use runScriptByPath or runScriptByHash instead
  */
-async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScript(path: string | null = null, hash_: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its path and wait for the result
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByPath(path: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Run a script synchronously by its hash and wait for the result
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
-async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runScriptByHash(hash_: string, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Append a text to the result stream
@@ -243,9 +245,10 @@ async streamResult(stream: AsyncIterable<string>): Promise<void>
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
-async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false): Promise<any>
+async runFlow(path: string | null = null, args: Record<string, any> | null = null, verbose: boolean = false, tag: string | null = null): Promise<any>
 
 /**
  * Wait for a job to complete and return its result
@@ -272,25 +275,27 @@ async getResultMaybe(jobId: string): Promise<any>
 /**
  * @deprecated Use runScriptByPathAsync or runScriptByHashAsync instead
  */
-async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptAsync(path: string | null, hash_: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its path
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByPathAsync(path: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a script asynchronously by its hash
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null): Promise<string>
+async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = null, scheduledInSeconds: number | null = null, tag: string | null = null): Promise<string>
 
 /**
  * Run a flow asynchronously by its path
@@ -298,9 +303,10 @@ async runScriptByHashAsync(hash_: string, args: Record<string, any> | null = nul
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
-async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true): Promise<string>
+async runFlowAsync(path: string | null, args: Record<string, any> | null, scheduledInSeconds: number | null = null, // can only be set to false if this the job will be fully await and not concurrent with any other job // as otherwise the child flow and its own child will store their state in the parent job which will // lead to incorrectness and failures doNotTrackInParent: boolean = true, tag: string | null = null): Promise<string>
 
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
@@ -620,13 +626,6 @@ async requestInteractiveSlackApproval({ slackResourcePath, channelId, message, a
  */
 async requestInteractiveTeamsApproval({ teamName, channelName, message, approver, defaultArgsJson, dynamicEnumsJson, }: TeamsApprovalOptions): Promise<void>
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-parseS3Object(s3Object: S3Object): S3ObjectRecord
-
 setWorkflowCtx(ctx: WorkflowCtx | null): void
 
 async sleep(seconds: number): Promise<void>
@@ -696,6 +695,17 @@ async parallel<T, R>(items: T[], fn: (item: T) => PromiseLike<R> | R, options?:
  */
 async commitKafkaOffsets(triggerPath: string, topic: string, partition: number, offset: number,): Promise<void>
 
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (`s3://storage/key`, `s3:///key`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+parseS3Object(s3Object: S3Object): S3ObjectRecord
+
 /**
  * Create a SQL template function for PostgreSQL/datatable queries
  * @param name - Database/datatable name (default: "main")
@@ -728,3 +738,26 @@ datatable(name: string = "main"): DatatableSqlTemplateFunction
  * let sql = wmill.ducklake("my_lake:analytics")
  */
 ducklake(name: string = "main"): SqlTemplateFunction
+
+/**
+ * Idempotently materialize `selectSql` into a ducklake table for one
+ * partition (or the whole table when `partition` is omitted) — the client-side
+ * equivalent of the `// materialize` engine.
+ * With `uniqueKey` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → `CREATE OR REPLACE`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.upsertPartition({ table, selectSql, partition }).execute()`.
+ */
+upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any>
+
+/**
+ * INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ * 
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.appendPartition({ table, selectSql, partition }).execute()`.
+ */
+appendPartition(opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,): SqlStatement<any>
diff --git a/system_prompts/auto-generated/skills/write-script-python3/SKILL.md b/system_prompts/auto-generated/skills/write-script-python3/SKILL.md
index b07f3c0d59..49c0ab057f 100644
--- a/system_prompts/auto-generated/skills/write-script-python3/SKILL.md
+++ b/system_prompts/auto-generated/skills/write-script-python3/SKILL.md
@@ -231,27 +231,27 @@ def create_token(duration = dt.timedelta(days=1)) -> str
 # Create a script job and return its job id.
 # 
 # .. deprecated:: Use run_script_by_path_async or run_script_by_hash_async instead.
-def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_async(path: str = None, hash_: str = None, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by path and return its job id.
-def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_path_async(path: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a script job by hash and return its job id.
-def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None) -> str
+def run_script_by_hash_async(hash_: str, args: dict = None, scheduled_in_secs: int = None, tag: str = None) -> str
 
 # Create a flow job and return its job id.
-def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True) -> str
+def run_flow_async(path: str, args: dict = None, scheduled_in_secs: int = None, do_not_track_in_parent: bool = True, tag: str = None) -> str
 
 # Run script synchronously and return its result.
 # 
 # .. deprecated:: Use run_script_by_path or run_script_by_hash instead.
-def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script(path: str = None, hash_: str = None, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by path synchronously and return its result.
-def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_path(path: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run script by hash synchronously and return its result.
-def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False) -> Any
+def run_script_by_hash(hash_: str, args: dict = None, timeout: dt.timedelta | int | float | None = None, verbose: bool = False, cleanup: bool = True, assert_result_is_not_none: bool = False, tag: str = None) -> Any
 
 # Run a script on the current worker without creating a job.
 # 
@@ -669,10 +669,11 @@ def get_version() -> str
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Run a script synchronously by path and return its result.
 # 
@@ -683,10 +684,11 @@ def run_script_sync(hash: str, args: Dict[str, Any] = None, verbose: bool = Fals
 #     assert_result_is_not_none: Raise exception if result is None
 #     cleanup: Register cleanup handler to cancel job on exit
 #     timeout: Maximum time to wait
+#     tag: Override the worker tag the job runs on
 # 
 # Returns:
 #     Script result
-def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None) -> Any
+def run_script_by_path_sync(path: str, args: Dict[str, Any] = None, verbose: bool = False, assert_result_is_not_none: bool = True, cleanup: bool = True, timeout: dt.timedelta = None, tag: str = None) -> Any
 
 # Convenient helpers that takes an S3 resource as input and returns the settings necessary to
 # initiate an S3 connection from DuckDB
@@ -709,7 +711,11 @@ def get_state_path() -> str
 # Parse resource syntax from string.
 def parse_resource_syntax(s: str) -> Optional[str]
 
-# Parse S3 object from string or S3Object format.
+# Parse S3 object from a `s3://<storage>/<key>` URI string (`s3:///<key>`
+# for the default storage) or S3Object format. Any other string raises
+# rather than falling back to an auto-generated key: an auto key is
+# requested by omitting the object, and a fallback would silently misplace
+# the upload on any typo.
 def parse_s3_object(s3_object: S3Object | str) -> S3Object
 
 # Parse variable syntax from string.
@@ -737,6 +743,27 @@ def stream_result(stream) -> None
 #     SqlQuery instance for fetching results
 def query(sql: str, *args) -> SqlQuery
 
+# Idempotently materialize the rows of `select_sql` into ducklake
+# `table` for one `partition` (or the whole table when `partition` is
+# None). Client-side equivalent of the `// materialize` engine: with
+# `unique_key` it upserts within the slice (delete-by-key + insert);
+# without it, it replaces (whole table → CREATE OR REPLACE; partition →
+# delete the partition + insert). Re-running the same slice is safe — the
+# backfill / failure-recovery contract.
+# 
+# The partition value is bound as a DuckDB arg (never string-interpolated)
+# so it cannot inject SQL. `select_sql` is trusted (your own query).
+def upsert_partition(table: str, select_sql: str, partition: str = None, unique_key: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# INSERT-only materialization (no dedup / no replace) for an immutable
+# event-log table — for one `partition`, or the whole table when
+# `partition` is None. NOTE: unlike `upsert_partition`, re-running the same
+# slice duplicates rows — use only for append-only sources.
+def append_partition(table: str, select_sql: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
+# Read a materialized ducklake table, optionally a single partition.
+def read(table: str, partition: str = None, partition_col: str = '_wm_partition', schema: str = None)
+
 # Execute query and fetch results.
 # 
 # Args:
diff --git a/system_prompts/base/flow-base.md b/system_prompts/base/flow-base.md
index 17f46333f3..def01a3535 100644
--- a/system_prompts/base/flow-base.md
+++ b/system_prompts/base/flow-base.md
@@ -139,8 +139,11 @@ input_transforms:
 
 ## Approval / Suspend Structure
 
+An approval step is a normal **script** step (`type: rawscript` or `type: script`) that is turned into an approval by adding a module-level `suspend`. Its script calls `wmill.getResumeUrls(approver)` to generate the secret resume/cancel URLs and returns them so they can be sent to the approver(s) (Slack, email, etc.) or approved from the run page.
+
 - `suspend` belongs on the flow module object itself, as a sibling of `id` and `value`
 - Never put `suspend` inside `value`
+- Do NOT use `type: identity` for an approval step. An identity step suspends but never produces the resume URLs, so approvers have no link to act on — it is not a functional approval.
 
 Correct shape:
 
@@ -156,10 +159,23 @@ Correct shape:
             type: string
         required: [comment]
   value:
-    type: identity
+    type: rawscript
+    language: bun
+    input_transforms:
+      approver:
+        type: static
+        value: ''
+    content: |
+      import * as wmill from "windmill-client"
+
+      export async function main(approver?: string) {
+        const urls = await wmill.getResumeUrls(approver)
+        // send urls.resume / urls.cancel to the approver(s), e.g. via Slack or email
+        return urls
+      }
 ```
 
-Incorrect shape:
+Incorrect shape (suspend misplaced inside `value`):
 
 ```yaml
 - id: request_approval
@@ -169,6 +185,16 @@ Incorrect shape:
       required_events: 1
 ```
 
+Incorrect shape (identity has no resume URLs — not a real approval):
+
+```yaml
+- id: request_approval
+  suspend:
+    required_events: 1
+  value:
+    type: identity
+```
+
 ## Branch Result Scope Rules
 
 - Inside a branch, you may reference earlier outer steps and earlier steps in the same branch
diff --git a/system_prompts/base/pipeline-base.md b/system_prompts/base/pipeline-base.md
new file mode 100644
index 0000000000..a0f2e2492a
--- /dev/null
+++ b/system_prompts/base/pipeline-base.md
@@ -0,0 +1,60 @@
+# Data pipeline authoring
+
+A **data pipeline** is NOT a flow. A flow is one runnable that orchestrates steps internally. A data pipeline is a set of **independent scripts**, each deployed on its own, that form a DAG by reading and writing shared **storage assets** (DuckLake tables, data tables, S3 objects, volumes, resources) and by declaring execution **triggers**. The pipeline is visualized and edited at `/pipeline/<folder>`; every node is a normal workspace script that happens to carry pipeline annotations. When the user asks for a "data pipeline" (or to "ingest / transform / materialize" data across steps), build pipeline-annotated scripts — do NOT build a flow.
+
+## What makes a script a pipeline node
+
+A script joins the pipeline when its source begins with the `pipeline` annotation as a top-of-file comment, **written in the script's own comment syntax** — `//` for TS/JS (bun), `--` for SQL (DuckDB/Postgres), `#` for Python/Bash. So it's `-- pipeline` in a DuckDB node, `# pipeline` in a Python node, `// pipeline` in a bun node. Every annotation below uses that same prefix (the `//` shown is the TS form). All other wiring is expressed as annotation comments near the top of the file:
+
+- `// on <ref>` — declares an execution-DAG **input** (what triggers/feeds this node). `<ref>` is either:
+  - an **asset URI** (the node runs when that asset is produced upstream): `ducklake://main/orders`, `datatable://main/users`, `s3://<key>`, `$res:f/folder/my_resource`, `volume://name/path`.
+  - a **native trigger kind**: `schedule`, `webhook`, `email`, `kafka`, `mqtt`, `nats`, `postgres`, `sqs`, `gcp`, or `data_upload` (a user-uploaded S3 file). For these the actual trigger row (cron, topic, …) is created separately; the annotation only declares the binding.
+- **Outputs** are inferred from what the body writes — a `CREATE TABLE`, a `wmill.writeS3File(...)`, a DuckLake/datatable write. To declare a managed output explicitly, use `// materialize <asset-uri>`.
+- Optional badges: `// partitioned <daily|hourly|weekly|monthly|dynamic>`, `// freshness <duration>` (e.g. `1h`), `// tag <worker-tag>`, `// retry <count> [delay]`, `// data_test <kind> ...`.
+
+## Materialize (the managed output)
+
+> **`// materialize` is DuckDB-only**, and its target must be a DuckLake table (`ducklake://<name>/<table>`). Deploy **rejects** `// materialize` on any other language (`python3`, `bun`, `postgresql`) or a non-DuckLake target. For a non-DuckDB node, do **not** use `// materialize` — write the output via the SDK (`wmill.writeS3File(...)`, a postgresql `CREATE TABLE`, ducklake helpers, …) and let it be inferred. Use `duckdb` when a node should materialize a DuckLake table.
+
+`// materialize <asset-uri>` tells the runtime to write the node's output table **for you**: write the body as a single `SELECT` and the runtime wraps it in the create/replace — do **not** also write your own `CREATE TABLE` / `INSERT`. Write strategy:
+
+- no option → **replace** the whole table each run (full refresh; the only mode whose output columns may change);
+- `// materialize <uri> append` → INSERT-append rows (incremental);
+- `// materialize <uri> key=<col>` → merge/upsert on `<col>`.
+
+`// materialize manual <uri>` opts **out** of managed writes — the script writes its own DDL and the annotation only records the output asset for lineage.
+
+`materialize` pairs with partitioning for incremental pipelines: a `// partitioned <daily|hourly|weekly|monthly|dynamic>` node runs **once per partition** (append/merge into a fixed-schema table), and the `{partition}` token inside any asset URI is substituted with the current partition value at run time.
+
+`materialize` is an output **declaration** on a node — not a command. There is no "materialize run".
+
+## How to build one in chat
+
+1. Put every node in the **same folder**: `f/<folder>/<name>`. The folder is the pipeline.
+2. Author each node as a **script draft** with `write_script` (or `edit_script`), language chosen for the work: `duckdb` or `postgresql` for SQL-shaped data work, `bun`/`python3` for general transforms. SQL-heavy lakehouse steps usually use `duckdb`.
+3. Start each body with `// pipeline`, then the `// on` input declarations, then the transform that writes the output.
+4. **Chain nodes by asset URI**: read an upstream node's output asset, then `// on <that-same-uri>` in the downstream node so the edge forms. Reuse exact asset paths from existing nodes rather than inventing parallel ones.
+5. Leave nodes as drafts unless the user asks to deploy. A pipeline only "runs" once its scripts are deployed and their triggers exist.
+
+When the user already has the `/pipeline/<folder>` editor open, prefer the dedicated `build_pipeline_node` / `edit_pipeline_node` tools (they stage reviewable, canvas-highlighted proposals). Outside the editor, use the standard script-draft tools with the annotations above.
+
+## Example (DuckDB → DuckLake, scheduled ingest + downstream transform)
+
+Node `f/sales/orders_ingest` (runs on a schedule, materializes a DuckLake table):
+
+```sql
+-- pipeline
+-- on schedule
+-- materialize ducklake://main/orders
+SELECT * FROM read_csv('s3://raw/orders/*.csv')
+```
+
+Node `f/sales/orders_daily` (runs when `orders` is produced, writes a rollup):
+
+```sql
+-- pipeline
+-- on ducklake://main/orders
+-- materialize ducklake://main/orders_daily
+SELECT date_trunc('day', ts) AS day, count(*) AS n
+FROM ducklake.main.orders GROUP BY 1
+```
diff --git a/system_prompts/base/raw-app.md b/system_prompts/base/raw-app.md
index 04103e434b..004302cc74 100644
--- a/system_prompts/base/raw-app.md
+++ b/system_prompts/base/raw-app.md
@@ -16,6 +16,8 @@ A raw app has three logical parts:
 
 `index.tsx` is the bundling entrypoint. It typically renders a top-level `App` component. The bundler is esbuild.
 
+**Always begin every React file (`.tsx`/`.jsx`) that uses JSX with `import React from 'react'`.** esbuild uses the classic JSX transform, so `React` must be in scope wherever JSX appears — a missing import compiles fine but throws `React is not defined` at runtime, leaving a blank screen.
+
 ### Generated bindings (`wmill.d.ts` / `wmill.ts`)
 
 The frontend imports a generated module that mirrors the backend runnables. **Never write to it directly** — it gets regenerated whenever backend runnables change. Modifying it by hand will be overwritten.
diff --git a/system_prompts/generate.py b/system_prompts/generate.py
index ecae4b3bb0..dac36ad97a 100644
--- a/system_prompts/generate.py
+++ b/system_prompts/generate.py
@@ -340,13 +340,54 @@ def extract_description(section: str) -> str | None:
     return ''.join(_unquote_js_string(p) for p in parts).strip() or None
 
 
-def parse_command_block(content: str, file_path: Path | None = None) -> dict:
+def extract_named_command_block(content: str, var_name: str) -> str | None:
+    """Return the chained-call body of `const <var_name> = new Command() ...`,
+    from just after `new Command()` up to the next top-level statement.
+
+    Returns None when the var isn't a *direct* `new Command()` (e.g. it's wrapped
+    in a helper call like `auditListOptions(new Command()...)`), so callers can
+    fall back to a looser match.
+    """
+    m = re.search(
+        r'const\s+' + re.escape(var_name) + r'\s*=\s*new\s+Command\(\)'
+        r'([\s\S]*?)(?=\n(?:const|let|var|async|function|export)\b)',
+        content,
+    )
+    return m.group(1) if m else None
+
+
+def extract_exported_command_block(content: str) -> str | None:
+    """Return the chained-call body of the command that is `export default`ed.
+
+    A command file may define helper `new Command()` groups (assigned to local
+    consts and mounted as nested subcommands via `.command("x", localCmd)`)
+    *before* the exported command. Anchoring on the first `new Command()` in the
+    file would merge those helpers into the top-level command, so resolve the
+    exported variable first and only then fall back to the first `new Command()`
+    (which covers inline/wrapped exports).
+    """
+    export_match = re.search(r'export\s+default\s+(\w+)\s*;', content)
+    if export_match:
+        block = extract_named_command_block(content, export_match.group(1))
+        if block is not None:
+            return block
+    command_match = re.search(
+        r'(?:const\s+command\s*=\s*)?new\s+Command\(\)([\s\S]*?)(?=export\s+default)',
+        content,
+    )
+    return command_match.group(1) if command_match else None
+
+
+def parse_command_block(
+    content: str, file_path: Path | None = None, block: str | None = None
+) -> dict:
     """
     Parse a Cliffy Command() definition block and extract metadata.
     Returns a dict with: description, options, subcommands, arguments, alias
 
     If file_path is provided, imported subcommands will be resolved by parsing
-    the imported files.
+    the imported files. `block` may be passed to parse a specific pre-extracted
+    command body (used to recurse into locally-defined nested command groups).
     """
     result = {
         'description': '',
@@ -357,15 +398,11 @@ def parse_command_block(content: str, file_path: Path | None = None) -> dict:
     }
 
     # Find the command block
-    command_match = re.search(
-        r'(?:const\s+command\s*=\s*)?new\s+Command\(\)([\s\S]*?)(?=export\s+default)',
-        content
-    )
-    if not command_match:
+    if block is None:
+        block = extract_exported_command_block(content)
+    if block is None:
         return result
 
-    block = command_match.group(1)
-
     # Find where subcommands start
     first_subcommand_pos = block.find('.command(')
     if first_subcommand_pos == -1:
@@ -451,12 +488,31 @@ def parse_command_block(content: str, file_path: Path | None = None) -> dict:
                             'name': cmd_name,
                             'description': imported_cmd.get('description', ''),
                             'arguments': imported_cmd.get('arguments', ''),
-                            'options': imported_cmd.get('options', [])
+                            'options': imported_cmd.get('options', []),
+                            'subcommands': imported_cmd.get('subcommands', []),
                         })
                         continue
                     except Exception as e:
                         print(f"  Warning: Could not parse imported command {second_arg}: {e}")
             cmd_desc = ''
+        elif second_arg and re.search(
+            r'const\s+' + re.escape(second_arg) + r'\s*=\s*new\s+Command\(\)', content
+        ):
+            # Locally-defined command group mounted as a subcommand
+            # (e.g. `.command("migrate", migrateCommand)`): recurse into its
+            # definition so its own subcommands/options are captured.
+            nested_block = extract_named_command_block(content, second_arg)
+            if nested_block is not None:
+                nested = parse_command_block(content, file_path, block=nested_block)
+                result['subcommands'].append({
+                    'name': cmd_name,
+                    'description': nested.get('description', ''),
+                    'arguments': nested.get('arguments', ''),
+                    'options': nested.get('options', []),
+                    'subcommands': nested.get('subcommands', []),
+                })
+                continue
+            cmd_desc = ''
         else:
             cmd_desc = ''
 
@@ -628,6 +684,16 @@ def generate_cli_commands_markdown(cli_data: dict) -> str:
                         for opt in sub['options']:
                             md += f"  - `{opt['flag']}` - {opt['description']}\n"
 
+                    # Nested sub-subcommands (e.g. `datatable migrate new`)
+                    for subsub in sub.get('subcommands', []):
+                        ss_args = f" {subsub['arguments']}" if subsub.get('arguments') else ""
+                        md += f"  - `{cmd['name']} {sub_name} {subsub['name']}{ss_args}`"
+                        if subsub.get('description'):
+                            md += f" - {subsub['description']}"
+                        md += "\n"
+                        for opt in subsub.get('options', []):
+                            md += f"    - `{opt['flag']}` - {opt['description']}\n"
+
                 md += "\n"
 
     return md
@@ -689,6 +755,21 @@ def generate_ts_exports(prompts: dict[str, str]) -> str:
     return ts
 
 
+def generate_ts_declarations(prompts: dict[str, str]) -> str:
+    """Generate the .d.ts for prompts.ts.
+
+    Each export is declared as a plain `string` rather than a string-literal
+    type so the declaration file does not embed (and drift against) the prompt
+    contents — those live only in prompts.ts.
+    """
+    dts = "// Auto-generated by generate.py - DO NOT EDIT\n\n"
+
+    for name in prompts.keys():
+        dts += f"export declare const {name}: string;\n"
+
+    return dts
+
+
 # =============================================================================
 # Schema File Generation
 # =============================================================================
@@ -2354,6 +2435,7 @@ def main():
     flow_base = read_markdown_file(base_dir / "flow-base.md")
     resources_base = read_markdown_file(base_dir / "resources.md")
     raw_app_base = read_markdown_file(base_dir / "raw-app.md")
+    pipeline_base = read_markdown_file(base_dir / "pipeline-base.md")
     workflow_as_code_base = read_markdown_file(base_dir / "workflow-as-code.md")
     flow_cli = read_markdown_file(base_dir / "flow-cli.md")
     flow_chat_special_modules = read_markdown_file(base_dir / "flow-chat-special-modules.md")
@@ -2420,6 +2502,7 @@ def main():
         'FLOW_BASE': flow_base,
         'RESOURCES_BASE': resources_base,
         'RAW_APP_BASE': raw_app_base,
+        'PIPELINE_BASE': pipeline_base,
         'WORKFLOW_AS_CODE_BASE': workflow_as_code_base,
         'FLOW_CHAT_SPECIAL_MODULES': flow_chat_special_modules,
 
@@ -2447,6 +2530,7 @@ def main():
     # Generate TypeScript exports
     ts_exports = generate_ts_exports(prompts)
     (OUTPUT_GENERATED_DIR / "prompts.ts").write_text(ts_exports)
+    (OUTPUT_GENERATED_DIR / "prompts.d.ts").write_text(generate_ts_declarations(prompts))
 
     # Generate complete script.md (all languages combined)
     script_md_parts = [script_base]
@@ -2518,6 +2602,11 @@ export function getRawAppPrompt(): string {
   return prompts.RAW_APP_BASE;
 }
 
+// Helper for data pipeline authoring (chat consumers)
+export function getPipelinePrompt(): string {
+  return prompts.PIPELINE_BASE;
+}
+
 // Helper to get the datatable SQL SDK reference (wmill.datatable()).
 // Pass a language to get only that SDK; omit it to get both.
 export function getDatatableSdkReference(language?: string): string {
@@ -2570,6 +2659,7 @@ export declare function getScriptPrompt(language: string): string;
 export declare function getFlowPrompt(): string;
 export declare function getResourcePrompt(): string;
 export declare function getRawAppPrompt(): string;
+export declare function getPipelinePrompt(): string;
 export declare function getDatatableSdkReference(language?: string): string;
 export declare function getWorkflowAsCodePrompt(language?: string): string;
 """
@@ -2615,6 +2705,7 @@ export declare function getWorkflowAsCodePrompt(language?: string): string;
     print(f"  - auto-generated/sdks/wac-python.md")
     print(f"  - auto-generated/cli/cli-commands.md (auto-generated from CLI source)")
     print(f"  - auto-generated/prompts.ts")
+    print(f"  - auto-generated/prompts.d.ts")
     print(f"  - auto-generated/index.ts")
     print(f"  - auto-generated/script.md")
     print(f"  - auto-generated/flow.md")
diff --git a/typescript-client/build.jsr.sh b/typescript-client/build.jsr.sh
index 6dd8968b8f..a8e3cdc390 100755
--- a/typescript-client/build.jsr.sh
+++ b/typescript-client/build.jsr.sh
@@ -15,6 +15,6 @@ cp "${script_dirpath}/sqlUtils.ts" "${script_dirpath}/src/"
 echo "" >> "${script_dirpath}/src/index.ts"
 echo 'export type { DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
 echo "" >> "${script_dirpath}/src/index.ts"
-echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, deleteS3File, signS3Objects, signS3Object, getPresignedS3PublicUrls, getPresignedS3PublicUrl, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult, datatable, ducklake, type DatatableSqlTemplateFunction, type SqlTemplateFunction, type S3Object, type S3ObjectRecord, type S3ObjectURI } from "./client";' >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, deleteS3File, signS3Objects, signS3Object, getPresignedS3PublicUrls, getPresignedS3PublicUrl, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult, datatable, ducklake, upsertPartition, appendPartition, type DucklakeMaterializeOptions, type SqlStatement, type DatatableSqlTemplateFunction, type SqlTemplateFunction, type S3Object, type S3ObjectRecord, type S3ObjectURI } from "./client";' >> "${script_dirpath}/src/index.ts"
 
 
diff --git a/typescript-client/build.sh b/typescript-client/build.sh
index beb44f448c..b3bd5b5c1c 100755
--- a/typescript-client/build.sh
+++ b/typescript-client/build.sh
@@ -40,7 +40,7 @@ cp "${script_dirpath}/sqlUtils.ts" "${script_dirpath}/src/"
 echo "" >> "${script_dirpath}/src/index.ts"
 echo 'export type { DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
 echo "" >> "${script_dirpath}/src/index.ts"
-echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, deleteS3File, signS3Objects, signS3Object, getPresignedS3PublicUrls, getPresignedS3PublicUrl, task, taskScript, taskFlow, workflow, step, sleep, parallel, waitForApproval, type TaskOptions, WorkflowCtx, _workflowCtx, setWorkflowCtx, StepSuspend, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, type Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult, datatable, ducklake, type DatatableSqlTemplateFunction, type SqlTemplateFunction, type S3Object, type S3ObjectRecord, type S3ObjectURI, commitKafkaOffsets } from "./client";' >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, deleteS3File, signS3Objects, signS3Object, getPresignedS3PublicUrls, getPresignedS3PublicUrl, task, taskScript, taskFlow, workflow, step, sleep, parallel, waitForApproval, type TaskOptions, WorkflowCtx, _workflowCtx, setWorkflowCtx, StepSuspend, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, type Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult, datatable, ducklake, upsertPartition, appendPartition, type DucklakeMaterializeOptions, type SqlStatement, type DatatableSqlTemplateFunction, type SqlTemplateFunction, type S3Object, type S3ObjectRecord, type S3ObjectURI, commitKafkaOffsets } from "./client";' >> "${script_dirpath}/src/index.ts"
 
 # Build default export by combining client utilities + services
 # This preserves backward compatibility for `import wmill from "windmill-client"`
@@ -99,6 +99,8 @@ import {
   streamResult,
   datatable,
   ducklake,
+  upsertPartition,
+  appendPartition,
   SHARED_FOLDER,
   getWorkspace,
   getStatePath,
@@ -185,6 +187,8 @@ const wmill = {
   streamResult,
   datatable,
   ducklake,
+  upsertPartition,
+  appendPartition,
   SHARED_FOLDER,
   getWorkspace,
   getStatePath,
diff --git a/typescript-client/client.d.ts b/typescript-client/client.d.ts
index e789353e27..1fa1ed1ca6 100644
--- a/typescript-client/client.d.ts
+++ b/typescript-client/client.d.ts
@@ -22,6 +22,10 @@ export {
 export {
   datatable,
   ducklake,
+  upsertPartition,
+  appendPartition,
+  type DucklakeMaterializeOptions,
+  type SqlStatement,
   type SqlTemplateFunction,
   type DatatableSqlTemplateFunction,
 } from "./sqlUtils";
@@ -56,7 +60,8 @@ export declare function runScript(
   path?: string | null,
   hash_?: string | null,
   args?: Record<string, any> | null,
-  verbose?: boolean
+  verbose?: boolean,
+  tag?: string | null
 ): Promise<any>;
 export declare function waitJob(jobId: string, verbose?: boolean): Promise<any>;
 export declare function getResult(jobId: string): Promise<any>;
@@ -66,7 +71,8 @@ export declare function runScriptAsync(
   path: string | null,
   hash_: string | null,
   args: Record<string, any> | null,
-  scheduledInSeconds?: number | null
+  scheduledInSeconds?: number | null,
+  tag?: string | null
 ): Promise<string>;
 /**
  * Resolve a resource value in case the default value was picked because the input payload was undefined
diff --git a/typescript-client/client.ts b/typescript-client/client.ts
index f388ff6457..5d2342471b 100644
--- a/typescript-client/client.ts
+++ b/typescript-client/client.ts
@@ -16,10 +16,12 @@ import { OpenAPI } from "./core/OpenAPI";
 import {
   DenoS3LightClientSettings,
   S3ObjectRecord,
+  parseS3Object,
   type S3Object,
 } from "./s3Types";
 
 export {
+  parseS3Object,
   type S3Object,
   type S3ObjectRecord,
   type S3ObjectURI,
@@ -27,8 +29,12 @@ export {
 export {
   datatable,
   ducklake,
+  upsertPartition,
+  appendPartition,
   type SqlTemplateFunction,
   type DatatableSqlTemplateFunction,
+  type DucklakeMaterializeOptions,
+  type SqlStatement,
 } from "./sqlUtils";
 
 // Services are NOT re-exported here to enable tree-shaking
@@ -71,7 +77,7 @@ function getPublicBaseUrl(): string {
   return getEnv("WM_BASE_URL") ?? "http://localhost:3000";
 }
 
-const getEnv = (key: string) => {
+export const getEnv = (key: string) => {
   if (typeof window === "undefined") {
     // node
     return process?.env?.[key];
@@ -149,7 +155,8 @@ export async function runScript(
   path: string | null = null,
   hash_: string | null = null,
   args: Record<string, any> | null = null,
-  verbose: boolean = false
+  verbose: boolean = false,
+  tag: string | null = null
 ): Promise<any> {
   console.warn(
     "runScript is deprecated. Use runScriptByPath or runScriptByHash instead."
@@ -157,14 +164,15 @@ export async function runScript(
   if (path && hash_) {
     throw new Error("path and hash_ are mutually exclusive");
   }
-  return _runScriptInternal(path, hash_, args, verbose);
+  return _runScriptInternal(path, hash_, args, verbose, tag);
 }
 
 async function _runScriptInternal(
   path: string | null = null,
   hash_: string | null = null,
   args: Record<string, any> | null = null,
-  verbose: boolean = false
+  verbose: boolean = false,
+  tag: string | null = null
 ): Promise<any> {
   args = args || {};
 
@@ -179,7 +187,7 @@ async function _runScriptInternal(
     }
   }
 
-  const jobId = await _runScriptAsyncInternal(path, hash_, args);
+  const jobId = await _runScriptAsyncInternal(path, hash_, args, null, tag);
   return await waitJob(jobId, verbose);
 }
 
@@ -188,14 +196,16 @@ async function _runScriptInternal(
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
 export async function runScriptByPath(
   path: string,
   args: Record<string, any> | null = null,
-  verbose: boolean = false
+  verbose: boolean = false,
+  tag: string | null = null
 ): Promise<any> {
-  return _runScriptInternal(path, null, args, verbose);
+  return _runScriptInternal(path, null, args, verbose, tag);
 }
 
 /**
@@ -203,14 +213,16 @@ export async function runScriptByPath(
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Script execution result
  */
 export async function runScriptByHash(
   hash_: string,
   args: Record<string, any> | null = null,
-  verbose: boolean = false
+  verbose: boolean = false,
+  tag: string | null = null
 ): Promise<any> {
-  return _runScriptInternal(null, hash_, args, verbose);
+  return _runScriptInternal(null, hash_, args, verbose, tag);
 }
 
 /**
@@ -236,12 +248,14 @@ export async function streamResult(stream: AsyncIterable<string>) {
  * @param path - Flow path in Windmill
  * @param args - Arguments to pass to the flow
  * @param verbose - Enable verbose logging
+ * @param tag - Override the worker tag the job runs on
  * @returns Flow execution result
  */
 export async function runFlow(
   path: string | null = null,
   args: Record<string, any> | null = null,
-  verbose: boolean = false
+  verbose: boolean = false,
+  tag: string | null = null
 ): Promise<any> {
   args = args || {};
 
@@ -249,7 +263,7 @@ export async function runFlow(
     console.info(`running \`${path}\` synchronously with args:`, args);
   }
 
-  const jobId = await runFlowAsync(path, args, null, false);
+  const jobId = await runFlowAsync(path, args, null, false, tag);
   return await waitJob(jobId, verbose);
 }
 
@@ -364,7 +378,8 @@ export async function runScriptAsync(
   path: string | null,
   hash_: string | null,
   args: Record<string, any> | null,
-  scheduledInSeconds: number | null = null
+  scheduledInSeconds: number | null = null,
+  tag: string | null = null
 ): Promise<string> {
   console.warn(
     "runScriptAsync is deprecated. Use runScriptByPathAsync or runScriptByHashAsync instead."
@@ -373,14 +388,15 @@ export async function runScriptAsync(
   if (path && hash_) {
     throw new Error("path and hash_ are mutually exclusive");
   }
-  return _runScriptAsyncInternal(path, hash_, args, scheduledInSeconds);
+  return _runScriptAsyncInternal(path, hash_, args, scheduledInSeconds, tag);
 }
 
 async function _runScriptAsyncInternal(
   path: string | null = null,
   hash_: string | null = null,
   args: Record<string, any> | null = null,
-  scheduledInSeconds: number | null = null
+  scheduledInSeconds: number | null = null,
+  tag: string | null = null
 ): Promise<string> {
   // Create a script job and return its job id.
   args = args || {};
@@ -390,6 +406,10 @@ async function _runScriptAsyncInternal(
     params["scheduled_in_secs"] = scheduledInSeconds;
   }
 
+  if (tag) {
+    params["tag"] = tag;
+  }
+
   let parentJobId = getEnv("WM_JOB_ID");
   if (parentJobId !== undefined) {
     params["parent_job"] = parentJobId;
@@ -427,14 +447,16 @@ async function _runScriptAsyncInternal(
  * @param path - Script path in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
 export async function runScriptByPathAsync(
   path: string,
   args: Record<string, any> | null = null,
-  scheduledInSeconds: number | null = null
+  scheduledInSeconds: number | null = null,
+  tag: string | null = null
 ): Promise<string> {
-  return _runScriptAsyncInternal(path, null, args, scheduledInSeconds);
+  return _runScriptAsyncInternal(path, null, args, scheduledInSeconds, tag);
 }
 
 /**
@@ -442,14 +464,16 @@ export async function runScriptByPathAsync(
  * @param hash_ - Script hash in Windmill
  * @param args - Arguments to pass to the script
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
 export async function runScriptByHashAsync(
   hash_: string,
   args: Record<string, any> | null = null,
-  scheduledInSeconds: number | null = null
+  scheduledInSeconds: number | null = null,
+  tag: string | null = null
 ): Promise<string> {
-  return _runScriptAsyncInternal(null, hash_, args, scheduledInSeconds);
+  return _runScriptAsyncInternal(null, hash_, args, scheduledInSeconds, tag);
 }
 
 /**
@@ -458,6 +482,7 @@ export async function runScriptByHashAsync(
  * @param args - Arguments to pass to the flow
  * @param scheduledInSeconds - Schedule execution for a future time (in seconds)
  * @param doNotTrackInParent - If false, tracks state in parent job (only use when fully awaiting the job)
+ * @param tag - Override the worker tag the job runs on
  * @returns Job ID of the created job
  */
 export async function runFlowAsync(
@@ -467,7 +492,8 @@ export async function runFlowAsync(
   // can only be set to false if this the job will be fully await and not concurrent with any other job
   // as otherwise the child flow and its own child will store their state in the parent job which will
   // lead to incorrectness and failures
-  doNotTrackInParent: boolean = true
+  doNotTrackInParent: boolean = true,
+  tag: string | null = null
 ): Promise<string> {
   // Create a script job and return its job id.
 
@@ -478,6 +504,10 @@ export async function runFlowAsync(
     params["scheduled_in_secs"] = scheduledInSeconds;
   }
 
+  if (tag) {
+    params["tag"] = tag;
+  }
+
   if (!doNotTrackInParent) {
     let parentJobId = getEnv("WM_JOB_ID");
     if (parentJobId !== undefined) {
@@ -1477,17 +1507,6 @@ function parseResourceSyntax(s: string | undefined) {
   if (s?.startsWith("res://")) return s.substring(6);
 }
 
-/**
- * Parse an S3 object from URI string or record format
- * @param s3Object - S3 object as URI string (s3://storage/key) or record
- * @returns S3 object record with storage and s3 key
- */
-export function parseS3Object(s3Object: S3Object): S3ObjectRecord {
-  if (typeof s3Object === "object") return s3Object;
-  const match = s3Object.match(/^s3:\/\/([^/]*)\/(.*)$/);
-  return { storage: match?.[1] || undefined, s3: match?.[2] ?? "" };
-}
-
 function parseVariableSyntax(s: string) {
   if (s.startsWith("var://")) return s.substring(6);
 }
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 3f5ebe702d..280be5e53f 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.733.1",
+  "version": "1.753.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./sqlUtils.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index a9fe521bb2..46bbda8c03 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.733.1",
+  "version": "1.753.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "homepage": "https://github.com/windmill-labs/windmill/tree/main/typescript-client#readme",
diff --git a/typescript-client/s3Types.d.ts b/typescript-client/s3Types.d.ts
index 4903edc8ff..57a4af2222 100644
--- a/typescript-client/s3Types.d.ts
+++ b/typescript-client/s3Types.d.ts
@@ -14,3 +14,4 @@ export type DenoS3LightClientSettings = {
     secretKey?: string;
     pathStyle?: boolean;
 };
+export declare function parseS3Object(s3Object: S3Object): S3ObjectRecord;
diff --git a/typescript-client/s3Types.ts b/typescript-client/s3Types.ts
index e9af9b2d30..d2049570f8 100644
--- a/typescript-client/s3Types.ts
+++ b/typescript-client/s3Types.ts
@@ -4,7 +4,8 @@
 export type S3Object = S3ObjectURI | S3ObjectRecord;
 
 /**
- * S3 object URI in the format `s3://storage/key`
+ * S3 object URI in the format `s3://storage/key` (`s3:///key` targets the
+ * workspace default storage)
  */
 export type S3ObjectURI = `s3://${string}/${string}`;
 
@@ -39,3 +40,26 @@ export type DenoS3LightClientSettings = {
   /** Use path-style URLs instead of virtual-hosted style */
   pathStyle?: boolean;
 };
+
+/**
+ * Parse an S3 object from URI string or record format
+ * @param s3Object - S3 object as URI string (`s3://storage/key`, `s3:///key`
+ *   for the default storage) or record. Any other string throws rather than
+ *   falling back to an auto-generated key: an auto key is requested by
+ *   omitting the object, and a fallback would silently misplace the upload
+ *   on any typo.
+ * @returns S3 object record with storage and s3 key
+ */
+export function parseS3Object(s3Object: S3Object): S3ObjectRecord {
+  if (typeof s3Object === "object") return s3Object;
+  const match = s3Object.match(/^s3:\/\/([^/]*)\/(.+)$/);
+  if (match) return { storage: match[1] || undefined, s3: match[2] };
+  if (s3Object.startsWith("s3://")) {
+    throw new Error(
+      `Invalid s3 object URI ${JSON.stringify(s3Object)}: expected s3://<storage>/<key> with a non-empty key (s3:///<key> for the default storage)`
+    );
+  }
+  throw new Error(
+    `Invalid s3 object ${JSON.stringify(s3Object)}: expected an s3://<storage>/<key> URI (e.g. "s3:///${s3Object}" for key "${s3Object}" in the default storage) or { s3: <key> }`
+  );
+}
diff --git a/typescript-client/sqlUtils.d.ts b/typescript-client/sqlUtils.d.ts
index 7ff4041792..c791c8833d 100644
--- a/typescript-client/sqlUtils.d.ts
+++ b/typescript-client/sqlUtils.d.ts
@@ -87,3 +87,18 @@ export interface DatatableSqlTemplateFunction extends SqlTemplateFunction {
 
 export declare function datatable(name: string): DatatableSqlTemplateFunction;
 export declare function ducklake(name: string): SqlTemplateFunction;
+
+export interface DucklakeMaterializeOptions {
+  ducklake?: string;
+  table: string;
+  selectSql: string;
+  partition?: string;
+  uniqueKey?: string;
+  partitionCol?: string;
+}
+export declare function upsertPartition(
+  opts: DucklakeMaterializeOptions,
+): SqlStatement<any>;
+export declare function appendPartition(
+  opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,
+): SqlStatement<any>;
diff --git a/typescript-client/sqlUtils.ts b/typescript-client/sqlUtils.ts
index abe596ce03..85c563095b 100644
--- a/typescript-client/sqlUtils.ts
+++ b/typescript-client/sqlUtils.ts
@@ -1,4 +1,5 @@
-import { getWorkspace, workerHasInternalServer } from "./client";
+import { getEnv, getWorkspace, workerHasInternalServer } from "./client";
+import { OpenAPI } from "./core/OpenAPI";
 import { JobService } from "./services.gen";
 
 type ResultCollection =
@@ -385,6 +386,185 @@ export function ducklake(name: string = "main"): SqlTemplateFunction {
   return buildSqlTemplateFunction(ducklakeProvider(n, schema));
 }
 
+/** Options for the ducklake materialization helpers. `partition` is bound as a
+ * DuckDB arg (never interpolated); `selectSql`, `table`, `schema`, `uniqueKey`
+ * are trusted structural SQL inlined via `raw`. */
+export interface DucklakeMaterializeOptions {
+  /** ducklake name (default "main"), optionally "name:schema". */
+  ducklake?: string;
+  /** target table within the ducklake. */
+  table: string;
+  /** the SELECT producing the rows for this slice. */
+  selectSql: string;
+  /** the partition value (bound). Omit for a whole-table materialization — no
+   * partition column, and replace becomes a `CREATE OR REPLACE TABLE`. */
+  partition?: string;
+  /** dedup key → upsert in slice (delete-by-key + insert); omit → replace (delete partition + insert). */
+  uniqueKey?: string;
+  /** physical partition column (default "_wm_partition"). */
+  partitionCol?: string;
+}
+
+/** Idempotently materialize `selectSql` into a ducklake table for one
+ * partition (or the whole table when `partition` is omitted) — the client-side
+ * equivalent of the `// materialize` engine.
+ * With `uniqueKey` it upserts the slice (delete-by-key + insert); otherwise it
+ * replaces it (whole table → `CREATE OR REPLACE`; partition → delete + insert).
+ * Safe to re-run for the same partition (backfill / failure-recovery).
+ *
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.upsertPartition({ table, selectSql, partition }).execute()`. */
+export function upsertPartition(opts: DucklakeMaterializeOptions): SqlStatement<any> {
+  return finishMaterialize(buildUpsertStatement(opts), opts);
+}
+function buildUpsertStatement(opts: DucklakeMaterializeOptions): SqlStatement<any> {
+  let { name: n, schema } = parseName(opts.ducklake ?? "main");
+  let sql = buildSqlTemplateFunction(ducklakeProvider(n, schema));
+  let pcol = sql.raw(opts.partitionCol ?? "_wm_partition");
+  let t = sql.raw(`dl.${opts.table}`);
+  let body = sql.raw(opts.selectSql);
+  // Whole-table (no partition): no partition column. Replace rebuilds the table
+  // with CREATE OR REPLACE (handles schema changes); merge upserts by key.
+  if (opts.partition === undefined) {
+    if (opts.uniqueKey) {
+      let uk = sql.raw(opts.uniqueKey);
+      return sql`CREATE TABLE IF NOT EXISTS ${t} AS SELECT * FROM (${body}) WHERE false;
+BEGIN TRANSACTION;
+DELETE FROM ${t} WHERE ${uk} IN (SELECT ${uk} FROM (${body}));
+INSERT INTO ${t} SELECT * FROM (${body});
+COMMIT;`;
+    }
+    return sql`CREATE OR REPLACE TABLE ${t} AS SELECT * FROM (${body});`;
+  }
+  if (opts.uniqueKey) {
+    let uk = sql.raw(opts.uniqueKey);
+    // Upsert via delete-by-key + insert (not MERGE — DuckLake's MERGE fails
+    // writing the first rows of a fresh partition).
+    return sql`CREATE TABLE IF NOT EXISTS ${t} AS SELECT *, CAST(NULL AS VARCHAR) AS ${pcol} FROM (${body}) WHERE false;
+ALTER TABLE ${t} SET PARTITIONED BY (${pcol});
+BEGIN TRANSACTION;
+DELETE FROM ${t} WHERE ${pcol} = ${opts.partition} AND ${uk} IN (SELECT ${uk} FROM (${body}));
+INSERT INTO ${t} SELECT *, ${opts.partition} AS ${pcol} FROM (${body});
+COMMIT;`;
+  }
+  return sql`CREATE TABLE IF NOT EXISTS ${t} AS SELECT *, CAST(NULL AS VARCHAR) AS ${pcol} FROM (${body}) WHERE false;
+ALTER TABLE ${t} SET PARTITIONED BY (${pcol});
+BEGIN TRANSACTION;
+DELETE FROM ${t} WHERE ${pcol} = ${opts.partition};
+INSERT INTO ${t} SELECT *, ${opts.partition} AS ${pcol} FROM (${body});
+COMMIT;`;
+}
+
+/** INSERT-only materialization (no dedup/replace) for append-only tables.
+ * Re-running the same partition duplicates rows — use only for immutable
+ * event-log sources.
+ *
+ * Returns a lazy statement — call `.execute()` to run it:
+ * `await wmill.appendPartition({ table, selectSql, partition }).execute()`. */
+export function appendPartition(
+  opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,
+): SqlStatement<any> {
+  return finishMaterialize(buildAppendStatement(opts), opts);
+}
+function buildAppendStatement(
+  opts: Omit<DucklakeMaterializeOptions, "uniqueKey">,
+): SqlStatement<any> {
+  let { name: n, schema } = parseName(opts.ducklake ?? "main");
+  let sql = buildSqlTemplateFunction(ducklakeProvider(n, schema));
+  let pcol = sql.raw(opts.partitionCol ?? "_wm_partition");
+  let t = sql.raw(`dl.${opts.table}`);
+  let body = sql.raw(opts.selectSql);
+  // Whole-table (no partition): insert into the bare table, no partition column.
+  if (opts.partition === undefined) {
+    return sql`CREATE TABLE IF NOT EXISTS ${t} AS SELECT * FROM (${body}) WHERE false;
+INSERT INTO ${t} SELECT * FROM (${body});`;
+  }
+  return sql`CREATE TABLE IF NOT EXISTS ${t} AS SELECT *, CAST(NULL AS VARCHAR) AS ${pcol} FROM (${body}) WHERE false;
+ALTER TABLE ${t} SET PARTITIONED BY (${pcol});
+INSERT INTO ${t} SELECT *, ${opts.partition} AS ${pcol} FROM (${body});`;
+}
+
+// In pipeline context (WM_PIPELINE), wrap a materialize statement so a
+// successful run captures the slice's row count + snapshot and records
+// materialized_partition state — making SDK materializations appear in the grid
+// like `// materialize` ones. Outside a pipeline it's a passthrough (no record).
+function finishMaterialize(
+  stmt: SqlStatement<any>,
+  opts: Pick<DucklakeMaterializeOptions, "ducklake" | "table" | "partition" | "partitionCol">,
+): SqlStatement<any> {
+  if (getEnv("WM_PIPELINE") !== "true") return stmt;
+  let { name: n, schema } = parseName(opts.ducklake ?? "main");
+  let sql = buildSqlTemplateFunction(ducklakeProvider(n, schema));
+  let t = sql.raw(`dl.${opts.table}`);
+  let pcol = opts.partitionCol ?? "_wm_partition";
+  let where =
+    opts.partition !== undefined
+      ? sql.raw(`WHERE ${pcol} = '${String(opts.partition).replace(/'/g, "''")}'`)
+      : sql.raw("");
+  let summary = sql`SELECT (SELECT count(*) FROM ${t} ${where}) AS rows, (SELECT max(snapshot_id) FROM ducklake_snapshots('dl')) AS snapshot_id`;
+  // Asset path mirrors the `// materialize` engine: <lake>/<schema>.<table> for
+  // an explicit schema, else <lake>/<table> — so the grid lookup matches and
+  // distinct schemas don't collide under one state key.
+  let assetPath = schema ? `${n}/${schema}.${opts.table}` : `${n}/${opts.table}`;
+  let partition = opts.partition ?? "";
+  let run = async () => {
+    try {
+      await stmt.execute();
+    } catch (e) {
+      await recordMaterialization(assetPath, partition, "failed", null, null, String(e));
+      throw e;
+    }
+    let snapshot_id: number | null = null;
+    let row_count: number | null = null;
+    try {
+      let s: any = await summary.fetchOne();
+      snapshot_id = s?.snapshot_id ?? null;
+      row_count = s?.rows ?? null;
+    } catch {
+      /* summary read is best-effort */
+    }
+    await recordMaterialization(assetPath, partition, "materialized", snapshot_id, row_count, null);
+  };
+  return {
+    ...stmt,
+    execute: (() => run()) as any,
+    fetch: (() => run()) as any,
+    fetchOne: (() => run()) as any,
+    fetchOneScalar: (() => run()) as any,
+  };
+}
+
+async function recordMaterialization(
+  assetPath: string,
+  partition: string,
+  status: string,
+  snapshot_id: number | null,
+  row_count: number | null,
+  error: string | null,
+): Promise<void> {
+  try {
+    await fetch(`${OpenAPI.BASE}/w/${getWorkspace()}/assets/record_materialization`, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${OpenAPI.TOKEN as string}`,
+      },
+      body: JSON.stringify({
+        asset_kind: "ducklake",
+        asset_path: assetPath,
+        partition,
+        status,
+        snapshot_id,
+        row_count,
+        job_id: getEnv("WM_JOB_ID") ?? null,
+        error,
+      }),
+    });
+  } catch {
+    // best-effort; never fail the user's materialization
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Utilities
 // ---------------------------------------------------------------------------
diff --git a/typescript-client/tests/s3Types.test.ts b/typescript-client/tests/s3Types.test.ts
new file mode 100644
index 0000000000..6f67a6493c
--- /dev/null
+++ b/typescript-client/tests/s3Types.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, test } from "bun:test";
+import { parseS3Object } from "../s3Types";
+
+describe("parseS3Object", () => {
+  test("bare string throws with the s3:/// hint", () => {
+    // A bare key is rejected rather than silently uploading under an
+    // auto-generated name; the error points at the s3:/// spelling.
+    expect(() => parseS3Object("dir/file.json" as any)).toThrow(
+      /s3:\/\/\/dir\/file\.json/
+    );
+  });
+
+  test("triple-slash URI targets the default storage", () => {
+    expect(parseS3Object("s3:///dir/file.json")).toEqual({
+      storage: undefined,
+      s3: "dir/file.json",
+    });
+  });
+
+  test("full URI splits storage and key", () => {
+    expect(parseS3Object("s3://bucket/dir/f")).toEqual({
+      storage: "bucket",
+      s3: "dir/f",
+    });
+  });
+
+  test("malformed s3:// URI throws", () => {
+    // `s3://x` has no key part — fail loudly instead of silently misplacing
+    // the object.
+    expect(() => parseS3Object("s3://broken" as any)).toThrow(
+      /Invalid s3 object/
+    );
+  });
+
+  test("empty-key URIs throw", () => {
+    // An empty key is never a valid target: it would fall back to an
+    // auto-generated key, which is requested by omitting the object.
+    expect(() => parseS3Object("s3:///" as any)).toThrow(/Invalid s3 object/);
+    expect(() => parseS3Object("s3://bucket/")).toThrow(/Invalid s3 object/);
+  });
+
+  test("empty string throws (omit the object for an auto-generated key)", () => {
+    expect(() => parseS3Object("" as any)).toThrow(/Invalid s3 object/);
+  });
+
+  test("record form passes through", () => {
+    expect(parseS3Object({ s3: "x", storage: "b" })).toEqual({
+      s3: "x",
+      storage: "b",
+    });
+  });
+});
diff --git a/version.txt b/version.txt
index 71cc29b78b..ab8ba721b4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.733.1
+1.753.0